summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/bibtex/bib/beebe/typeset.bib49
-rw-r--r--Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-en.bst4
-rw-r--r--Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-fr.bst4
-rw-r--r--Master/texmf-dist/doc/fonts/gelasiomath/README11
-rw-r--r--Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.pdfbin0 -> 123573 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.tex168
-rw-r--r--Master/texmf-dist/doc/fonts/gelasiomath/newtx-gel-subs.tex17
-rw-r--r--Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.ltx3
-rw-r--r--Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.pdfbin209755 -> 210229 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/lete-sans-math/README.md6
-rw-r--r--Master/texmf-dist/doc/fonts/lete-sans-math/unimath-lete.pdfbin1937725 -> 1897653 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/OFL.txt93
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/README.md41
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/U14400.pdfbin0 -> 741333 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/lppl1-3c.txt416
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.pdfbin0 -> 126315 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.tex180
-rw-r--r--Master/texmf-dist/doc/fonts/newtx/README9
-rw-r--r--Master/texmf-dist/doc/fonts/simpleicons/bindings.tex148
-rw-r--r--Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdfbin2581340 -> 2545130 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/simpleicons/simpleicons.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/xcharter-math/README.md28
-rw-r--r--Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.ltx61
-rw-r--r--Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.pdfbin201881 -> 206035 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/xcharter-math/unimath-xcharter.pdfbin1862620 -> 1825149 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/README.md2
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hntbin620033 -> 620020 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hntbin745156 -> 745144 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hntbin444875 -> 444867 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hntbin453729 -> 453833 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hntbin476803 -> 476784 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hntbin548944 -> 549042 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hntbin470999 -> 470989 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hntbin487685 -> 487785 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hntbin828138 -> 828110 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hntbin568460 -> 568458 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hntbin712329 -> 712514 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hntbin730712 -> 731032 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hntbin383065 -> 383053 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hntbin418778 -> 418765 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hntbin393447 -> 393438 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hntbin394218 -> 394206 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hntbin806109 -> 806105 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hntbin824010 -> 824007 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hntbin789118 -> 789103 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hntbin948482 -> 948479 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hntbin904968 -> 904965 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hntbin407769 -> 407766 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hntbin733434 -> 733431 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hntbin741537 -> 741534 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hntbin909790 -> 909786 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hntbin1057100 -> 1057095 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hntbin1158528 -> 1158523 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hntbin1107169 -> 1107166 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hntbin728931 -> 728926 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hntbin601780 -> 601777 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hntbin402219 -> 402211 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hntbin519890 -> 519878 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hntbin391100 -> 391090 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hntbin588039 -> 588023 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hntbin2128389 -> 2128059 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/index.html5
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/index.pdfbin151691 -> 151802 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hntbin817887 -> 817883 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hntbin1568620 -> 1568599 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hntbin466177 -> 466175 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hntbin510418 -> 510409 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hntbin696337 -> 696325 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hntbin411335 -> 411326 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hntbin492269 -> 492258 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hntbin406835 -> 406825 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hntbin503532 -> 503518 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hntbin444602 -> 444596 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hntbin523657 -> 523645 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hntbin0 -> 1818565 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hntbin0 -> 497733 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hntbin480022 -> 480015 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hntbin703127 -> 703121 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hntbin346863 -> 346856 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hntbin502636 -> 502625 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hntbin376130 -> 376122 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hntbin451072 -> 451060 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hntbin368462 -> 368455 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hntbin397416 -> 397404 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hntbin1284930 -> 1286651 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hntbin2182753 -> 2182740 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hntbin437655 -> 437653 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hntbin1028614 -> 1029743 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hntbin1625083 -> 1625074 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hntbin450716 -> 450713 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hntbin429290 -> 429279 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hntbin590280 -> 590266 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hntbin386789 -> 386777 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hntbin561630 -> 561616 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hntbin400734 -> 400727 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hntbin403360 -> 403340 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hntbin385420 -> 385411 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hntbin487820 -> 487806 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hntbin444039 -> 444032 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hntbin522787 -> 522888 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hntbin453293 -> 453283 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hntbin591508 -> 591493 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/twill.hntbin675792 -> 675856 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hntbin488700 -> 488689 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/weave.hntbin654048 -> 654030 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/webman.hntbin584924 -> 585159 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdfbin2340413 -> 2344346 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdfbin4249910 -> 4251718 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/README.md2
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdfbin623160 -> 629416 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdfbin1328094 -> 1327941 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdfbin141590 -> 145326 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdfbin283447 -> 283980 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdfbin226908 -> 231562 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdfbin363918 -> 364470 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdfbin221560 -> 225044 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdfbin381223 -> 381756 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdfbin1147605 -> 1147761 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdfbin412398 -> 417800 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdfbin838251 -> 838763 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdfbin357558 -> 357792 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdfbin50755 -> 52986 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdfbin162580 -> 162976 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdfbin84828 -> 86829 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdfbin193924 -> 194209 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdfbin275286 -> 275286 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdfbin250940 -> 250940 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdfbin306863 -> 306863 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdfbin334571 -> 334571 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdfbin156353 -> 156353 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdfbin270067 -> 270067 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdfbin368828 -> 368795 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdfbin267573 -> 267573 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdfbin303640 -> 303640 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdfbin378717 -> 378717 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdfbin443746 -> 443746 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdfbin413937 -> 413920 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdfbin247190 -> 247190 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdfbin404270 -> 404270 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdfbin213056 -> 216902 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdfbin461117 -> 461387 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdfbin199563 -> 202774 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdfbin555750 -> 556019 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdfbin4392415 -> 4392280 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/index.html5
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/index.pdfbin151150 -> 151266 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdfbin1212142 -> 1216755 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdfbin3230882 -> 3231757 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdfbin266243 -> 266243 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdfbin277099 -> 280945 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdfbin704913 -> 705180 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdfbin145028 -> 148214 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdfbin370482 -> 370755 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdfbin134208 -> 137496 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdfbin327391 -> 327409 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdfbin203350 -> 206765 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdfbin389071 -> 389351 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdfbin0 -> 4179204 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdfbin0 -> 300726 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdfbin314420 -> 318016 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdfbin789931 -> 789955 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdfbin156200 -> 158662 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdfbin402193 -> 402456 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdfbin121083 -> 124016 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdfbin317801 -> 318062 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdfbin94494 -> 96842 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdfbin258988 -> 259019 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdfbin3381944 -> 2723866 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdfbin5401461 -> 5402637 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdfbin197838 -> 198043 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdfbin1855165 -> 1869694 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdfbin3613707 -> 3614612 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdfbin325778 -> 325778 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdfbin190726 -> 194586 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdfbin469694 -> 469704 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdfbin175756 -> 179394 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdfbin473927 -> 474185 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdfbin76451 -> 78866 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdfbin191691 -> 191709 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdfbin157546 -> 160857 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdfbin360549 -> 360811 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdfbin127618 -> 130255 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdfbin311153 -> 311712 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdfbin257973 -> 262160 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdfbin580493 -> 580773 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdfbin839309 -> 839862 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdfbin461212 -> 289149 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdfbin764839 -> 765097 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdfbin316118 -> 316276 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdfbin2339296 -> 2353558 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdfbin4246841 -> 4248217 bytes
-rw-r--r--Master/texmf-dist/doc/generic/lt3luabridge/CHANGES.md74
-rw-r--r--Master/texmf-dist/doc/generic/lt3luabridge/README.md5
-rw-r--r--Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg2
-rw-r--r--Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdfbin497075 -> 505015 bytes
-rw-r--r--Master/texmf-dist/doc/generic/markdown/CHANGES.md35
-rw-r--r--Master/texmf-dist/doc/generic/markdown/README.md2
-rw-r--r--Master/texmf-dist/doc/generic/markdown/VERSION2
-rw-r--r--Master/texmf-dist/doc/generic/markdown/markdown.html57
-rw-r--r--Master/texmf-dist/doc/generic/markdown/markdown.pdfbin1124699 -> 1114115 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/README27
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib157
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdfbin22756751 -> 23064303 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex83
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/Changes6
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/README5
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib35
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdfbin0 -> 229201 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex1155
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdfbin513402 -> 585632 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex36
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news24.pdfbin98554 -> 99744 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news24.tex6
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex6
-rw-r--r--Master/texmf-dist/doc/info/mf2pt1.info359
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/beautybook-cn.pdfbin6212741 -> 6154021 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/beautybook-cn.tex52
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/beautybook-en.pdfbin3584660 -> 3608208 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/beautybook-en.tex56
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/inner_pics/beautybook-logo.pngbin0 -> 34323 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/inner_pics/hummingbird-8013214.jpgbin0 -> 5569816 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/inner_pics/logo.pngbin25086 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/inner_pics/mystery-1599527.jpgbin0 -> 1688394 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c10.pdfbin0 -> 3365 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c11.pdfbin0 -> 3672 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c9.pdfbin0 -> 3827 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-publist/README9
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdfbin414056 -> 419434 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex195
-rw-r--r--Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.pdfbin167712 -> 167985 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.tex41
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/README.md12
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.pdfbin112323 -> 120472 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.tex5
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article.pdfbin176709 -> 190173 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.pdfbin38737 -> 38874 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-template.tex19
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/rcs-gabarit.tex21
-rw-r--r--Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdfbin346722 -> 346756 bytes
-rw-r--r--Master/texmf-dist/doc/latex/colortbl/colortbl.pdfbin312925 -> 313437 bytes
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdfbin183663 -> 191562 bytes
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex59
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdfbin1466206 -> 1472616 bytes
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex66
-rw-r--r--Master/texmf-dist/doc/latex/dashrulex/README.md12
-rw-r--r--Master/texmf-dist/doc/latex/dashrulex/dashrulex.pdfbin58940 -> 57746 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex41
-rw-r--r--Master/texmf-dist/doc/latex/delimset/README.txt4
-rw-r--r--Master/texmf-dist/doc/latex/delimset/delimset.pdfbin327877 -> 376509 bytes
-rw-r--r--Master/texmf-dist/doc/latex/delimset/dlmssamp.tex69
-rw-r--r--Master/texmf-dist/doc/latex/dtk/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdfbin80200 -> 80230 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex3
-rw-r--r--Master/texmf-dist/doc/latex/dynkin-diagrams/README4
-rw-r--r--Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.bib64
-rw-r--r--Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdfbin894840 -> 908783 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex93
-rw-r--r--Master/texmf-dist/doc/latex/easybook/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin622167 -> 625940 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex69
-rw-r--r--Master/texmf-dist/doc/latex/esami/README6
-rw-r--r--Master/texmf-dist/doc/latex/esami/VERSION2
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdfbin483307 -> 500412 bytes
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex4
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdfbin492308 -> 508695 bytes
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex4
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie1.parametri.tex4
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie2.parametri.tex4
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie3.parametri.tex4
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie4.parametri.tex4
-rw-r--r--Master/texmf-dist/doc/latex/esami/doc/examples/testA-xetex-sol.sol.tex84
-rw-r--r--Master/texmf-dist/doc/latex/fancyhdr/README2
-rw-r--r--Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdfbin875225 -> 880397 bytes
-rw-r--r--Master/texmf-dist/doc/latex/heria/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/heria/heria-proposal.pdfbin313877 -> 311049 bytes
-rw-r--r--Master/texmf-dist/doc/latex/heria/heria-proposal.tex6
-rw-r--r--Master/texmf-dist/doc/latex/heria/heria.pdfbin303966 -> 301201 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog.txt9
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/backref.pdfbin206469 -> 206469 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref-doc.html54
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref-doc.pdfbin318600 -> 318416 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref-doc.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref-linktarget.pdfbin439109 -> 438491 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref.pdfbin2341341 -> 2341312 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/nameref.pdfbin172475 -> 172475 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/xr-hyper.pdfbin304784 -> 303974 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfc-a-answer.pdfbin112749 -> 113078 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfc-a-blank.pdfbin98857 -> 99214 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfc-b-answer.pdfbin112707 -> 112978 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfc-b-blank.pdfbin98922 -> 99233 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfe-a-answer.pdfbin69901 -> 69509 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfe-a-blank.pdfbin66139 -> 65749 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfe-b-answer.pdfbin69943 -> 69556 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/examfe-b-blank.pdfbin66167 -> 65775 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdfbin85122 -> 85441 bytes
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.pdfbin924647 -> 931263 bytes
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.tex19
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-asetukset.tex64
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-erikoiset.tex9
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-merkintakieli.tex149
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-rakenne.tex318
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-valmistautuminen.tex2
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/tavutusvihjeet.tex1
-rw-r--r--Master/texmf-dist/doc/latex/kaytannollista-latexia/versio.tex2
-rw-r--r--Master/texmf-dist/doc/latex/lastpage/README2
-rw-r--r--Master/texmf-dist/doc/latex/lastpage/lastpage-example.pdfbin130201 -> 130263 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lastpage/lastpage-example.tex28
-rw-r--r--Master/texmf-dist/doc/latex/lastpage/lastpage.pdfbin440278 -> 465434 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lie-hasse/README4
-rw-r--r--Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.pdfbin573306 -> 631928 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.tex123
-rw-r--r--Master/texmf-dist/doc/latex/lni/CHANGELOG.md7
-rw-r--r--Master/texmf-dist/doc/latex/lni/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/lni/lni-author-template.tex13
-rw-r--r--Master/texmf-dist/doc/latex/lni/lni.pdfbin377695 -> 377652 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdfbin486984 -> 484515 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex117
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/acknowledgments.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/biography.tex5
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/chapter1.tex21
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex4
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex10
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mydesign.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/README.md19
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree_two_departments.pdfbin0 -> 132206 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree_two_departments.tex129
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_two_degrees.tex2
-rwxr-xr-xMaster/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/cover_compile.sh31
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdfbin486372 -> 482879 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdfbin319692 -> 350734 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdfbin151566 -> 153678 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdfbin455381 -> 462305 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdfbin171619 -> 173819 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdfbin269937 -> 279552 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdfbin316317 -> 320853 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdfbin159877 -> 163413 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdfbin161667 -> 165290 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdfbin158014 -> 161633 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex14
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex15
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex10
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex14
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex14
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex15
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex14
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt2
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex14
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex14
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex14
-rwxr-xr-xMaster/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh72
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdfbin94846 -> 108765 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex364
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/CHANGELOG622
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS27
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/README.md43
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.pdfbin320611 -> 123425 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.tex1449
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/signature.pngbin0 -> 13746 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/template.tex71
-rw-r--r--Master/texmf-dist/doc/latex/moloch/CHANGELOG.md15
-rw-r--r--Master/texmf-dist/doc/latex/moloch/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/moloch/moloch.pdfbin276169 -> 295500 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moloch/moloch.tex58
-rw-r--r--Master/texmf-dist/doc/latex/moremath/MANIFEST.md26
-rw-r--r--Master/texmf-dist/doc/latex/moremath/README.md48
-rw-r--r--Master/texmf-dist/doc/latex/moremath/moremath-doc.pdfbin0 -> 945345 bytes
-rw-r--r--Master/texmf-dist/doc/latex/msu-thesis/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/msu-thesis/docs/msu-thesis.tex6
-rw-r--r--Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdfbin117627 -> 117738 bytes
-rw-r--r--Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-chapterbib-testfile.pdfbin140074 -> 140074 bytes
-rw-r--r--Master/texmf-dist/doc/latex/overarrows/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/overarrows/overarrows-doc.sty41
-rw-r--r--Master/texmf-dist/doc/latex/overarrows/overarrows.pdfbin554421 -> 597885 bytes
-rw-r--r--Master/texmf-dist/doc/latex/passopt/README.md18
-rw-r--r--Master/texmf-dist/doc/latex/passopt/passopt.pdfbin0 -> 52494 bytes
-rw-r--r--Master/texmf-dist/doc/latex/passopt/passopt.tex103
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/pdfx.pdfbin2442175 -> 2674056 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfx/pdfx.xmpdata33
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/README8
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_O.tex33
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_density.tex18
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_periodgroup.tex57
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex5
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdfbin7457011 -> 7570685 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.tex8
-rw-r--r--Master/texmf-dist/doc/latex/pgf-spectra/README29
-rw-r--r--Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.pdfbin2384961 -> 2388018 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.tex22
-rw-r--r--Master/texmf-dist/doc/latex/photobook/Makefile22
-rw-r--r--Master/texmf-dist/doc/latex/photobook/README.md7
-rw-r--r--Master/texmf-dist/doc/latex/photobook/photobook.pdfbin145475 -> 145644 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdfbin73089 -> 71193 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex7
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-chinese.pdfbin42567 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-japanese.pdfbin22935 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-korean.pdfbin20381 -> 20230 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-odia.pdfbin65705 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-thai.pdfbin13858 -> 14190 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex128
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/examples.pdfbin147509 -> 147304 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/examples.tex7
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdfbin381269 -> 386065 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex91
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/test-welsh.pdfbin8886 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdf (renamed from Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf)bin10330568 -> 10823654 bytes
-rw-r--r--Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zipbin5699724 -> 5704195 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdfbin1788630 -> 1793092 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zipbin260715 -> 277006 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdfbin74004 -> 80800 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prtec/PRTEC19-template.pdfbin355572 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prtec/PRTEC24-template.pdfbin0 -> 391935 bytes
-rw-r--r--Master/texmf-dist/doc/latex/prtec/PRTEC24-template.tex (renamed from Master/texmf-dist/doc/latex/prtec/PRTEC19-template.tex)63
-rw-r--r--Master/texmf-dist/doc/latex/prtec/README.md10
-rw-r--r--Master/texmf-dist/doc/latex/prtec/sample-figure.pdfbin171646 -> 149248 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randexam/randexam-a-answer.pdfbin49886 -> 49579 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randexam/randexam-a-blank.pdfbin41751 -> 41376 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randexam/randexam-b-answer.pdfbin49948 -> 49565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randexam/randexam-b-blank.pdfbin41687 -> 41319 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randexam/randexam.pdfbin63636 -> 63481 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randexam/randexam.tex2
-rw-r--r--Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.pdfbin197707 -> 200069 bytes
-rw-r--r--Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.tex100
-rw-r--r--Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.pdfbin126738 -> 126842 bytes
-rw-r--r--Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.tex16
-rw-r--r--Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.pdfbin158322 -> 160890 bytes
-rw-r--r--Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.tex16
-rw-r--r--Master/texmf-dist/doc/latex/responsive/README4
-rw-r--r--Master/texmf-dist/doc/latex/responsive/responsive-doc.pdfbin77546 -> 75970 bytes
-rw-r--r--Master/texmf-dist/doc/latex/responsive/responsive-doc.tex5
-rw-r--r--Master/texmf-dist/doc/latex/sepfootnotes/README7
-rw-r--r--Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.pdfbin218406 -> 223965 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.tex16
-rw-r--r--Master/texmf-dist/doc/latex/spbmark/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/spbmark/spbmark.pdfbin93123 -> 92984 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spbmark/spbmark.tex112
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/LICENSE6
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/README.md3
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/RELEASE-HOWTO.md51
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/index.md4
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/shear-transform.mp6
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.pdfbin181403 -> 181403 bytes
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.tex8
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/synthslant-minimal-test.tex39
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/synthslant.gst44
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/synthslant.ist13
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/synthslant.pdfbin796407 -> 840480 bytes
-rw-r--r--Master/texmf-dist/doc/latex/synthslant/title.mp6
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md40
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdfbin274323 -> 137729 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin447103 -> 287734 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdfbin438130 -> 247127 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib6
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex12
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex18
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex43
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex8
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex7
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty4
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skincatalog.tex37
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex23
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex21
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex137
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.vignette.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin4859487 -> 4856594 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex20
-rw-r--r--Master/texmf-dist/doc/latex/texvc/texvc.pdfbin246091 -> 307351 bytes
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md14
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdfbin407055 -> 407059 bytes
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdfbin1190791 -> 1193751 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/README.md13
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-circle.tex1648
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-ellipse.tex45
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-line.tex789
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-matrices.tex8
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-misc.tex8
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-point.tex355
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-regular.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-triangle.tex2050
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-vectors.tex8
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-examples.tex2360
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-indepthstudy.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-intersection.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-main.tex10
-rw-r--r--Master/texmf-dist/doc/latex/tkz-elements/tkz-elements.pdfbin704147 -> 817269 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdfbin746493 -> 1222359 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex84
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdfbin804095 -> 1309490 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex146
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdfbin551993 -> 551956 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdfbin601729 -> 601729 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex14
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.pdfbin561720 -> 561720 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib2
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdfbin570473 -> 570469 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco2
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdfbin559903 -> 559903 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdfbin571287 -> 571306 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex10
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdfbin622886 -> 622755 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex13
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdfbin536150 -> 536366 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdfbin655660 -> 655625 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex9
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdfbin527627 -> 527804 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdfbin563701 -> 563701 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdfbin621517 -> 621493 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex13
-rw-r--r--Master/texmf-dist/doc/latex/tuda-ci/README.md9
-rw-r--r--Master/texmf-dist/doc/latex/typog/LICENSE415
-rw-r--r--Master/texmf-dist/doc/latex/typog/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/typog/RELEASE-HOWTO.md51
-rw-r--r--Master/texmf-dist/doc/latex/typog/crooked-paragraphs.mp10
-rw-r--r--Master/texmf-dist/doc/latex/typog/index.md5
-rw-r--r--Master/texmf-dist/doc/latex/typog/slant-angle.mp10
-rw-r--r--Master/texmf-dist/doc/latex/typog/smooth-parshapes.mp10
-rw-r--r--Master/texmf-dist/doc/latex/typog/teximan2latex.sed30
-rw-r--r--Master/texmf-dist/doc/latex/typog/title.mp10
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-example.pdfbin392419 -> 402037 bytes
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-example.tex250
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-grep.1.pdfbin511632 -> 514141 bytes
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-grep.pl.in682
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-grep.pod284
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-grep.version.sed3
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-minimal-test.tex50
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog-without-microtype-test.tex (renamed from Master/texmf-dist/doc/latex/typog/typog-nomt.tex)53
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog.gst48
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog.ist17
-rw-r--r--Master/texmf-dist/doc/latex/typog/typog.pdfbin902362 -> 996908 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/README.md63
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/avantpropos.tex4
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/chapitre1-articles.tex2
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/chapitre2-articles.tex2
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-articles.tex71
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-cotutelle.tex60
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat.tex60
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-articles.tex75
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-bidiplomation.tex64
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise.tex64
-rw-r--r--Master/texmf-dist/doc/latex/ulthese/ulthese.pdfbin256822 -> 132685 bytes
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/unbtex-example.pdfbin581659 -> 592915 bytes
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/unbtex-example.tex27
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/unbtex-example/anexo-b.tex3
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo2.tex10
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo3.tex10
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo4.tex4
-rw-r--r--Master/texmf-dist/doc/latex/unbtex/unbtex-example/referencias.bib4
-rw-r--r--Master/texmf-dist/doc/latex/wrapstuff-doc-en/README.md11
-rw-r--r--Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.pdfbin0 -> 344457 bytes
-rw-r--r--Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.tex264
-rw-r--r--Master/texmf-dist/doc/lualatex/longmath/README6
-rw-r--r--Master/texmf-dist/doc/lualatex/longmath/longmath-doc.cls4
-rw-r--r--Master/texmf-dist/doc/lualatex/longmath/longmath-doc.lua2
-rw-r--r--Master/texmf-dist/doc/lualatex/longmath/longmath-doc.pdfbin175384 -> 165236 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/longmath/longmath-doc.tex68
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/README42
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/Ch-1-15.tex1312
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/Ch-16-30.tex2061
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/book-mathematics.tex44
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/candide.tex61
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/euler.tex512
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/handout-euler.tex29
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/handout-polynomes-deg2.tex27
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/polynome-deg2.tex557
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/puissance-cercle.tex713
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/recurrence.tex189
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/rel-bin.tex443
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/examples/schoolwork.tex238
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-en.pdfbin0 -> 160307 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-en.tex753
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-fr.pdfbin0 -> 169741 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-fr.tex786
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/NEWS21
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/luamplib.pdfbin213718 -> 239222 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex69
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex42
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/README6
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdfbin699725 -> 700023 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdfbin1143479 -> 1143849 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx30
-rw-r--r--Master/texmf-dist/doc/luatex/luaxml/README2
-rw-r--r--Master/texmf-dist/doc/luatex/luaxml/luaxml.pdfbin119150 -> 124725 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luaxml/luaxml.tex92
-rw-r--r--Master/texmf-dist/doc/man/man1/epstopdf.man1.pdfbin29667 -> 29695 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/repstopdf.man1.pdfbin29667 -> 29695 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/typog-grep.1397
-rw-r--r--Master/texmf-dist/doc/man/man1/typog-grep.man1.pdfbin38115 -> 44396 bytes
-rw-r--r--Master/texmf-dist/doc/support/latexindent/README2
-rw-r--r--Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json2
-rw-r--r--Master/texmf-dist/doc/support/latexindent/latexindent.pdfbin1297627 -> 1274095 bytes
-rw-r--r--Master/texmf-dist/doc/support/latexindent/latexindent.tex11
-rw-r--r--Master/texmf-dist/doc/support/mf2pt1/ChangeLog19
-rw-r--r--Master/texmf-dist/doc/support/mf2pt1/README2
-rw-r--r--Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdfbin183116 -> 182727 bytes
-rw-r--r--Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi16
-rw-r--r--Master/texmf-dist/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty11
-rw-r--r--Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdfbin1060881 -> 1149582 bytes
-rw-r--r--Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex2399
-rw-r--r--Master/texmf-dist/dvips/pst-node/pst-node.pro6
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc76
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc30
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfour.enc20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc90
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc90
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc110
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc96
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc90
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc78
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc38
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsthree.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconstwo.enc10
-rw-r--r--Master/texmf-dist/fonts/map/dvips/gelasiomath/GelasioMath.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map923
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map923
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map923
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map923
-rw-r--r--Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map923
-rw-r--r--Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map923
-rw-r--r--Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map923
-rw-r--r--Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath-Bold.otfbin127792 -> 128184 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath.otfbin438864 -> 440268 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/simpleicons/SimpleIcons.otfbin2496988 -> 2462528 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math-Bold.otfbin142936 -> 145720 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math.otfbin363004 -> 363276 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Bold-tlf-ot1G.tfmbin0 -> 6928 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.tfmbin0 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Italic-tlf-ot1G.tfmbin0 -> 6716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Regular-tlf-ot1G.tfmbin0 -> 6984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBMI.tfmbin0 -> 1500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBRM.tfmbin0 -> 1144 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathMI.tfmbin0 -> 1500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathRM.tfmbin0 -> 732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmi.tfmbin0 -> 3280 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmia.tfmbin0 -> 2396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmi.tfmbin0 -> 3228 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmia.tfmbin0 -> 2508 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconseight.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfive.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfour.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsnine.tfmbin1236 -> 1236 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsoneone.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonethree.tfmbin752 -> 532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonetwo.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonezero.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsseven.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconssix.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsthree.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconstwo.tfmbin1232 -> 1232 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/luwiantype/LuwianFont.ttfbin0 -> 374184 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBMI.pfbbin0 -> 37167 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBRM.pfbbin0 -> 29839 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathMI.pfbbin0 -> 32286 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathRM.pfbbin0 -> 14922 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/simpleicons/SimpleIcons.pfbbin2309959 -> 2275600 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Bold-tlf-ot1G.vfbin0 -> 984 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.vfbin0 -> 932 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Italic-tlf-ot1G.vfbin0 -> 988 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Regular-tlf-ot1G.vfbin0 -> 988 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmi.vfbin0 -> 2456 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmia.vfbin0 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmi.vfbin0 -> 2452 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmia.vfbin0 -> 2320 bytes
-rw-r--r--Master/texmf-dist/ls-R241
-rw-r--r--Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp2
-rw-r--r--Master/texmf-dist/metapost/profcollege/PfCMonde.mp75
-rw-r--r--Master/texmf-dist/metapost/profcollege/PfCObjets.mp53
-rwxr-xr-xMaster/texmf-dist/scripts/epstopdf/epstopdf.pl10
-rw-r--r--Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm3
-rw-r--r--Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm4
-rwxr-xr-xMaster/texmf-dist/scripts/latexindent/defaultSettings.yaml2
-rwxr-xr-xMaster/texmf-dist/scripts/latexindent/latexindent.pl2
-rw-r--r--Master/texmf-dist/scripts/markdown/markdown-cli.lua8
-rwxr-xr-xMaster/texmf-dist/scripts/mf2pt1/mf2pt1.pl8
-rwxr-xr-xMaster/texmf-dist/scripts/texlive-extra/texconfig.sh323
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/extractbb.lua110
-rwxr-xr-xMaster/texmf-dist/scripts/typog/typog-grep.pl166
-rw-r--r--Master/texmf-dist/source/generic/lt3luabridge/lt3luabridge.dtx87
-rw-r--r--Master/texmf-dist/source/generic/markdown/docstrip.cfg4
-rw-r--r--Master/texmf-dist/source/generic/markdown/markdown.dtx330
-rw-r--r--Master/texmf-dist/source/generic/markdown/markdown.ins1
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog10
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex7
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex4
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex18
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-article.dtx979
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-bst-en.dbj (renamed from Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-bst-en.dbj)2
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-bst-fr.dbj (renamed from Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-bst-fr.dbj)2
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-class.dbj (renamed from Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-class.dbj)2
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs (renamed from Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-english.mbs)6
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-french.mbs (renamed from Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-french.mbs)6
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs (renamed from Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.mbs)3
-rw-r--r--Master/texmf-dist/source/latex/colortbl/colortbl.dtx34
-rw-r--r--Master/texmf-dist/source/latex/delimset/delimset.dtx1202
-rw-r--r--Master/texmf-dist/source/latex/delimset/delimset.ins4
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx157
-rw-r--r--Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx232
-rw-r--r--Master/texmf-dist/source/latex/heria/heria.dtx151
-rw-r--r--Master/texmf-dist/source/latex/heria/heria.ins4
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hluatex.dtx4
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx2
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx2
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx9
-rw-r--r--Master/texmf-dist/source/latex/hyperref/xr-hyper.dtx2
-rw-r--r--Master/texmf-dist/source/latex/lastpage/lastpage.drv13
-rw-r--r--Master/texmf-dist/source/latex/lastpage/lastpage.dtx179
-rw-r--r--Master/texmf-dist/source/latex/lastpage/lastpage.ins20
-rw-r--r--Master/texmf-dist/source/latex/lni/lni.dtx103
-rw-r--r--Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx2
-rw-r--r--Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx187
-rw-r--r--Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx19
-rw-r--r--Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx42
-rw-r--r--Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx58
-rw-r--r--Master/texmf-dist/source/latex/moremath/moremath.dtx5515
-rw-r--r--Master/texmf-dist/source/latex/moremath/moremath.ins66
-rw-r--r--Master/texmf-dist/source/latex/overarrows/overarrows.dtx1142
-rw-r--r--Master/texmf-dist/source/latex/pdfx/pdfx.dtx1536
-rw-r--r--Master/texmf-dist/source/latex/pdfx/pdfx.ins4
-rw-r--r--Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx8728
-rw-r--r--Master/texmf-dist/source/latex/synthslant/Makefile133
-rw-r--r--Master/texmf-dist/source/latex/synthslant/synthslant.dtx752
-rw-r--r--Master/texmf-dist/source/latex/synthslant/synthslant.ins21
-rw-r--r--Master/texmf-dist/source/latex/texvc/Makefile17
-rw-r--r--Master/texmf-dist/source/latex/texvc/texvc.dtx48
-rw-r--r--Master/texmf-dist/source/latex/texvc/texvc.ins84
-rw-r--r--Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx46
-rw-r--r--Master/texmf-dist/source/latex/typog/Makefile183
-rw-r--r--Master/texmf-dist/source/latex/typog/typog.dtx3217
-rw-r--r--Master/texmf-dist/source/latex/typog/typog.ins30
-rw-r--r--Master/texmf-dist/source/latex/ulthese/ulthese.dtx2046
-rw-r--r--Master/texmf-dist/source/latex/ulthese/ulthese.ins43
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/Makefile1
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/luamplib.dtx1495
-rw-r--r--Master/texmf-dist/tex/context/third/markdown/t-markdown.tex2
-rw-r--r--Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex2
-rw-r--r--Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.sty6
-rw-r--r--Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.tex67
-rw-r--r--Master/texmf-dist/tex/generic/lt3luabridge/t-lt3luabridge.tex2
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdown.tex99
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex2
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex2
-rw-r--r--Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex23
-rw-r--r--Master/texmf-dist/tex/generic/pst-node/pst-node.tex61
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex27
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht9
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht27
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/beautybook-EN.cls1197
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/beautybook.cls (renamed from Master/texmf-dist/tex/latex/beautybook/beautybook-CN.cls)359
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty8
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty195
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty107
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty82
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty56
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx37
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx55
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx97
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx62
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/chemformula-ru/chemformula-ru.sty24
-rw-r--r--Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls83
-rw-r--r--Master/texmf-dist/tex/latex/colortbl/colortbl.sty26
-rw-r--r--Master/texmf-dist/tex/latex/customenvs/customenvs.sty177
-rw-r--r--Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty4
-rw-r--r--Master/texmf-dist/tex/latex/delimset/delimset.sty262
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-url.sty6
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.cls4
-rw-r--r--Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty219
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty153
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/esami/esami.sty1
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty51
-rw-r--r--Master/texmf-dist/tex/latex/gelasiomath/gelasiomath.sty295
-rw-r--r--Master/texmf-dist/tex/latex/gelasiomath/ly1mingelasio.fd91
-rw-r--r--Master/texmf-dist/tex/latex/gelasiomath/omlzgelmi.fd30
-rw-r--r--Master/texmf-dist/tex/latex/gelasiomath/ot1mingelasio.fd78
-rw-r--r--Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd51
-rw-r--r--Master/texmf-dist/tex/latex/gelasiomath/untxmia.fd139
-rw-r--r--Master/texmf-dist/tex/latex/heria/heria.cls39
-rw-r--r--Master/texmf-dist/tex/latex/heria/hi-methodology.tex2
-rw-r--r--Master/texmf-dist/tex/latex/heria/hi-workplan.tex21
-rw-r--r--Master/texmf-dist/tex/latex/heria/hi-wp-description.tex6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipson.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdviwind.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hluatex.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hpdftex.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htexture.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtex.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hxetex.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty7
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hypertex.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/nohyperref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pd1enc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pdfmark.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/psdextra.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puarenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puenc-extra.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puvnenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty2
-rw-r--r--Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls8
-rw-r--r--Master/texmf-dist/tex/latex/lastpage/lastpage.sty11
-rw-r--r--Master/texmf-dist/tex/latex/lastpage/lastpage209.sty9
-rw-r--r--Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty11
-rw-r--r--Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty11
-rw-r--r--Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty54
-rw-r--r--Master/texmf-dist/tex/latex/lete-sans-math/lete-sans-math.sty10
-rw-r--r--Master/texmf-dist/tex/latex/lie-hasse/lie-hasse.sty976
-rw-r--r--Master/texmf-dist/tex/latex/lni/lni.cls80
-rw-r--r--Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty1035
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdown.sty3
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty2
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty2
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty2
-rw-r--r--Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls246
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls142
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty45
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty45
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty50
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty39
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty48
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyvi.sty203
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorcerulean.sty32
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty12
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex35
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty8
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty14
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty54
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty40
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty60
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty30
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty57
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty29
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadvii.sty226
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty26
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty91
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty17
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconssymbols.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty29
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty408
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty42
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty44
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty42
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecontemporary.sty63
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty29
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty47
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty47
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvverticaltimeline.sty79
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/tweaklist.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty128
-rw-r--r--Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty19
-rw-r--r--Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty42
-rw-r--r--Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty38
-rw-r--r--Master/texmf-dist/tex/latex/moremath/moremath.sty1224
-rw-r--r--Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls8
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty6
-rw-r--r--Master/texmf-dist/tex/latex/overarrows/overarrows.sty456
-rw-r--r--Master/texmf-dist/tex/latex/passopt/passopt.sty56
-rw-r--r--Master/texmf-dist/tex/latex/pdfx/pdfx.sty256
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty52
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.data.tex236
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex37
-rw-r--r--Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.data.LSE.tex20
-rw-r--r--Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.sty13
-rw-r--r--Master/texmf-dist/tex/latex/photobook/photobook.cls46
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty23
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/cal-util.def2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf (renamed from Master/texmf-dist/tex/latex/polyglossia/gloss-acadien.ldf)4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf21
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf320
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf70
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf99
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf44
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf10
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf20
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf93
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf54
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf28
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf24
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf6
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf74
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf6
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf85
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf324
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf37
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf45
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf184
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf144
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf69
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf40
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf358
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf24
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf22
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf30
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf420
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf160
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf23
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf237
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf8
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf85
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf32
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf65
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf38
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf20
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf49
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf96
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf20
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf28
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf57
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf35
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf120
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf8
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf59
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf128
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf30
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf10
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf80
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf84
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf97
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf30
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf26
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf77
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf116
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf423
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf31
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/hijrical.sty2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua (renamed from Master/texmf-dist/tex/latex/polyglossia/polyglossia-korean.lua)196
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua18
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua31
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua13
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty1889
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex543
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex20
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex60
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex244
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex26
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex18
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCInfixRPN.sty538
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex1
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex10
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex22
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex501
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex8
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex185
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex62
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex114
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex6
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex928
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty50
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty3
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex144
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex63
-rw-r--r--Master/texmf-dist/tex/latex/prtec/prtec.cls204
-rw-r--r--Master/texmf-dist/tex/latex/pst-node/pst-node.sty11
-rw-r--r--Master/texmf-dist/tex/latex/randexam/randexam.cls13
-rw-r--r--Master/texmf-dist/tex/latex/resolsysteme/ResolSysteme.sty3
-rw-r--r--Master/texmf-dist/tex/latex/responsive/responsive.sty12
-rw-r--r--Master/texmf-dist/tex/latex/sepfootnotes/sepfootnotes.sty132
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex5759
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex5759
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd2
-rw-r--r--Master/texmf-dist/tex/latex/spbmark/spbmark.sty21
-rw-r--r--Master/texmf-dist/tex/latex/synthslant/synthslant.sty41
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex23
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex48
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex8
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex21
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex36
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex4
-rw-r--r--Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty140
-rw-r--r--Master/texmf-dist/tex/latex/texvc/texvc.sty4
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls30
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty29
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua13
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua20
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua49
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty179
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa2008.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa2008.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2008.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2023.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa2008.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2008.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2023.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo20
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo20
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo18
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo20
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo20
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo20
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls23
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls8
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls84
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo84
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls118
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls42
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo2
-rw-r--r--Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg19
-rw-r--r--Master/texmf-dist/tex/latex/typog/typog.sty484
-rw-r--r--Master/texmf-dist/tex/latex/ulthese/ulthese.cls75
-rw-r--r--Master/texmf-dist/tex/latex/unbtex/unbtex.cls85
-rw-r--r--Master/texmf-dist/tex/latex/xcharter-math/xcharter-otf.sty4
-rw-r--r--Master/texmf-dist/tex/lualatex/longmath/longmath.lua13
-rw-r--r--Master/texmf-dist/tex/lualatex/longmath/longmath.sty11
-rw-r--r--Master/texmf-dist/tex/lualatex/tango/tango.cls2182
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua609
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/lltjext.sty8
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty103
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua7
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty51
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty319
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty11
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty24
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty113
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua14
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua95
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua88
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua221
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua4167
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua13
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown.lua19
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex2
-rw-r--r--Master/texmf-dist/tex4ht/base/unix/tex4ht.env9
-rw-r--r--Master/texmf-dist/tex4ht/base/win32/tex4ht.env8
-rw-r--r--Master/texmf-dist/web2c/updmap.cfg3
1340 files changed, 77103 insertions, 37381 deletions
diff --git a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib
index c48e3472e05..caaf4be8fcc 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/typeset.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/typeset.bib
@@ -2,9 +2,9 @@
%%% ====================================================================
%%% BibTeX-file{
%%% author = "Nelson H. F. Beebe",
-%%% version = "2.86",
-%%% date = "03 June 2024",
-%%% time = "09:25:41 MDT",
+%%% version = "2.87",
+%%% date = "03 July 2024",
+%%% time = "13:12:33 MDT",
%%% filename = "typeset.bib",
%%% address = "University of Utah
%%% Department of Mathematics, 110 LCB
@@ -14,7 +14,7 @@
%%% telephone = "+1 801 581 5254",
%%% FAX = "+1 801 581 4148",
%%% URL = "https://www.math.utah.edu/~beebe",
-%%% checksum = "54592 26896 129038 1214427",
+%%% checksum = "38119 26929 129193 1215986",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -39,7 +39,7 @@
%%% and PDF (Portable Document Format), and
%%% sgml.bib covers SGML and HTML.
%%%
-%%% At version 2.86, the year coverage looked
+%%% At version 2.87, the year coverage looked
%%% like this:
%%%
%%% 1881 ( 1) 1929 ( 1) 1977 ( 12)
@@ -81,7 +81,7 @@
%%% 1918 ( 0) 1966 ( 6) 2014 ( 2)
%%% 1919 ( 1) 1967 ( 9) 2015 ( 4)
%%% 1920 ( 1) 1968 ( 4) 2016 ( 1)
-%%% 1921 ( 1) 1969 ( 9) 2017 ( 5)
+%%% 1921 ( 1) 1969 ( 10) 2017 ( 5)
%%% 1922 ( 0) 1970 ( 8) 2018 ( 3)
%%% 1923 ( 1) 1971 ( 11) 2019 ( 7)
%%% 1924 ( 0) 1972 ( 9) 2020 ( 1)
@@ -92,7 +92,7 @@
%%% 19xx ( 3)
%%% 20xx ( 2)
%%%
-%%% Article: 351
+%%% Article: 352
%%% Book: 330
%%% InCollection: 5
%%% InProceedings: 56
@@ -104,7 +104,7 @@
%%% Proceedings: 33
%%% TechReport: 38
%%%
-%%% Total entries: 910
+%%% Total entries: 911
%%%
%%% This bibliography has been collected from
%%% bibliographies in the author's personal
@@ -2019,6 +2019,39 @@
language = "German",
}
+@Article{Berns:1969:DFT,
+ author = "Gerald M. Berns",
+ title = "Description of {FORMAT}, a text-processing program",
+ journal = j-CACM,
+ volume = "12",
+ number = "3",
+ pages = "141--146",
+ month = mar,
+ year = "1969",
+ CODEN = "CACMA2",
+ DOI = "https://doi.org/10.1145/362875.362877",
+ ISSN = "0001-0782 (print), 1557-7317 (electronic)",
+ ISSN-L = "0001-0782",
+ bibdate = "Fri Nov 25 18:20:25 MST 2005",
+ bibsource = "http://www.acm.org/pubs/contents/journals/cacm/;
+ https://www.math.utah.edu/pub/tex/bib/cacm1960.bib;
+ https://www.math.utah.edu/pub/tex/bib/typeset.bib",
+ abstract = "FORMAT is a production program which facilitates the
+ editing and printing of ``finished'' documents directly
+ on the printer of a relatively small (64k) computer
+ system. It features good performance, totally free-form
+ input, very flexible formatting capabilities including
+ up to eight columns per page, automatic capitalization,
+ aids for index construction, and a minimum of nontext
+ items. It is written entirely in FORTRAN IV.",
+ acknowledgement = ack-nhfb,
+ classcodes = "C7230 (Publishing and reproduction)",
+ corpsource = "IBM, Washington Scientific Center, Wheaton, MD, USA",
+ fjournal = "Communications of the ACM",
+ journal-URL = "https://dl.acm.org/loi/cacm",
+ keywords = "printing",
+}
+
@InProceedings{Brown:1969:EMT,
author = "C. L. Brown",
booktitle = "Proceedings of the American Society for Information
diff --git a/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-en.bst b/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-en.bst
index 934aba12f93..702e3f85f13 100644
--- a/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-en.bst
+++ b/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-en.bst
@@ -8,7 +8,7 @@
%% cjs-rcs-english.mbs (with options: `exlang,ay,nat,lang,nm-rev,jnrlst,keyxyr,blkyear,dt-beg,yr-par,yrp-per,note-yr,trtit-b,num-xser,numser,ser-ed,pre-edn,isbn,url-doi,english,abr,ednx,ord,etal-xc,url,url-blk,nfss,,{}')
%% cjs-rcs-merlin.mbs (with options: `tail,exlang,ay,nat,lang,nm-rev,jnrlst,keyxyr,blkyear,dt-beg,yr-par,yrp-per,note-yr,trtit-b,num-xser,numser,ser-ed,pre-edn,isbn,url-doi,english,abr,ednx,ord,etal-xc,url,url-blk,nfss,,{}')
%%
-%% Copyright (C) 2023 Statistical Society of Canada | Société
+%% Copyright (C) 2023-2024 Statistical Society of Canada | Société
%% canadienne de statistique
%%
%% This file may be distributed and/or modified under the conditions
@@ -216,7 +216,7 @@ FUNCTION {space.word}
% Each function has a name bbl.xxx where xxx is the English word.
%-------------------------------------------------------------------
% Begin module:
- % \ProvidesFile{cjs-rcs-english.mbs}[2023/11/29 v1.0 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-english.mbs}[2024/07/14 v1.1 (VG, PWD)]
% The language selected here is ENGLISH
FUNCTION {bbl.and}
diff --git a/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-fr.bst b/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-fr.bst
index 1f826d9b59a..163d4fd63a1 100644
--- a/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-fr.bst
+++ b/Master/texmf-dist/bibtex/bst/cjs-rcs-article/cjs-rcs-fr.bst
@@ -8,7 +8,7 @@
%% cjs-rcs-french.mbs (with options: `exlang,ay,nat,lang,vonx,nm-rev1,jnrlst,keyxyr,blkyear,dt-beg,yr-per,note-yr,tit-qq,qt-g,qx,trtit-b,vnum-nr,volp-com,pgsep-s,jwdpg,jwdvol,num-xser,numser,ser-vol,ser-ed,pg-bk,pre-pub,pre-edn,isbn,url-doi,edparxc,edby,blk-com,blknt,french,pp,ed,abr,ord,and-xcom,etal-xc,url,url-blk,nfss,,{}')
%% cjs-rcs-merlin.mbs (with options: `tail,exlang,ay,nat,lang,vonx,nm-rev1,jnrlst,keyxyr,blkyear,dt-beg,yr-per,note-yr,tit-qq,qt-g,qx,trtit-b,vnum-nr,volp-com,pgsep-s,jwdpg,jwdvol,num-xser,numser,ser-vol,ser-ed,pg-bk,pre-pub,pre-edn,isbn,url-doi,edparxc,edby,blk-com,blknt,french,pp,ed,abr,ord,and-xcom,etal-xc,url,url-blk,nfss,,{}')
%%
-%% Copyright (C) 2023 Statistical Society of Canada | Société
+%% Copyright (C) 2023-2024 Statistical Society of Canada | Société
%% canadienne de statistique
%%
%% This file may be distributed and/or modified under the conditions
@@ -222,7 +222,7 @@ FUNCTION {space.word}
% Each function has a name bbl.xxx where xxx is the English word.
%-------------------------------------------------------------------
% Begin module:
- % \ProvidesFile{cjs-rcs-french.mbs}[2023/11/29 v1.0 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-french.mbs}[2024/07/14 v1.1 (VG, PWD)]
% The language selected here is FRENCH
FUNCTION {bbl.and}
diff --git a/Master/texmf-dist/doc/fonts/gelasiomath/README b/Master/texmf-dist/doc/fonts/gelasiomath/README
new file mode 100644
index 00000000000..d0139acde11
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/gelasiomath/README
@@ -0,0 +1,11 @@
+This small package provides math support for the Gelasio text fonts, based on the newtxmath symbols with Roman letters taken from Gelasio and Greek letters taken from XCharter magnified by 1.02. Newtx, version 1.752 or higher, must be installed and its map file enabled. The package also provides small caps based on XCharter for Gelasio as well as pdflatex access to some of its small figures---numerators, denominators and inferiors. A modified OT1 (TLF only) is also provided for use as math operators, with Greek upper case taken from XCharter. The font files in this package are in pfb format, licensed under the SIL OFL, version 1.1. All other LaTeX support files are subject to the LaTeX Project Public License. See
+http://www.ctan.org/license/lppl1.3 for the details of that license.
+Copyright (c) 2024 Michael Sharpe
+
+Current version: 1.00 2024-07-05
+
+
+
+
+
+Maintainer: Michael Sharpe, msharpe@ucsd.edu \ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.pdf b/Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.pdf
new file mode 100644
index 00000000000..0d0157bcf66
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.tex b/Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.tex
new file mode 100644
index 00000000000..8aabb656d7b
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/gelasiomath/gelasiomath-doc.tex
@@ -0,0 +1,168 @@
+% !TEX TS-program = lualatexmk
+%!TEX encoding = UTF-8 Unicode
+
+\documentclass[11pt]{article}
+\usepackage{geometry} % See geometry.pdf to learn the layout options. There are lots.
+\geometry{letterpaper} % ... or a4paper or a5paper or ...
+\RequirePackage{etoolbox,trace,bm}
+
+%\geometry{landscape} % Activate for for rotated page geometry
+\usepackage[parfill]{parskip}
+\usepackage{graphicx,fonttable}
+\usepackage{array,booktabs}
+\usepackage[T1]{fontenc} % Active encoding for use in math text
+\usepackage[type1,sfdefault,scale=1]{sourcesanspro}% used by \mathsf
+\usepackage[scaled=.98,varqu,varl]{zi4} % for \mathtt
+\usepackage[vvarbb]{gelasiomath}
+
+\iftutex\setmonofont{inconsolata.otf}\fi
+%\else
+%\RequirePackage{pdftexcmds}
+%\usepackage{zi4}
+%\fi
+%\usepackage[gelasio]{newtx}
+%\usepackage{xchsc}
+\usepackage{booktabs}
+%\setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Gill Sans}
+%\setmonofont[Scale=MatchLowercase]{Andale Mono}
+
+\title{Gelasiomath}
+\author{Michael Sharpe}
+%\date{} % Activate to display a given date or no date
+
+\begin{document}
+\maketitle
+The newest versions of {\tt newtx.sty} and {\tt newtxmath.sty}
+and the new {\tt gelasiomath.sty}
+provide support for the {\tt Gelasio} text fonts and the associated {\tt gelasio} package. Its main features are:
+\begin{itemize}
+\item
+Math support for {\tt gelasio};
+\item small caps (regular, italic, bold and bold italic) for {\tt gelasio} by means of a work-around using {\tt XCharter} small caps enlarged by 2\%;
+\item access to numerator, denominator and inferior figures from {\tt pdflatex}. (The {\tt Gelasio} fonts have these figures but {\tt gelasio.sty} does not offer support for them under {\tt pdflatex}.)
+\item
+Math figures are lining, rather than simply following the text figure style, which is, by default, oldstyle. E.g., \verb|$1X$| gives $1X$, not 1$X$.
+\end{itemize}
+
+The simplest and most capable way to use these support macros is through the small {\tt gelasiomath} package, which works with all LaTeX engines.
+\begin{verbatim}
+\usepackage[<options>]{gelasiomath}
+\end{verbatim}
+The only options handled directly by {\tt gelasiomath} are {\tt scale} and {\tt scosf}. The {\tt scale} option sets appropriate scales for {\tt gelasio}, {\tt xcharter} and {\tt newtxmath}, taking into account that {\tt gelasio} requires a reduction by the factor {\tt.92} to match {\tt newtxmath}. Option {\tt scosf} specifies that figures in amall caps should be transformed to oldstyle, no matter what the figure style for {\tt gelasio} was set to.
+
+All other options added to {\tt gelasiomath} are passed along to {\tt gelasio} and {\tt newtxmath}.
+E.g., to use {\tt gelasio} with lining figures except in small caps, at its natural size with matching math scale, you could write
+\begin{verbatim}
+\usepackage[scale=1.087,lining,scosf]{gelasiomath}
+\end{verbatim}
+
+%The basic method to load {\tt gelasio} with math support is to include in your preamble the lines
+%\begin{verbatim}
+%\usepackage[scale=.92]{gelasio}
+%\usepackage[gelasio]{newtxmath}
+%\end{verbatim}
+%or just
+%\begin{verbatim}
+%\usepackage[gelasio]{newtx}
+%\end{verbatim}
+%Loading using {\tt newtx} is preferred as it offers scaling both text and math without fiddling arithmetic as well as other enhancements described below. For the remainder of this description, I'll assume you are making use of {\tt newtx}.
+
+%To add support for XCharter small caps, add to your preamble the line
+%\begin{verbatim}
+%\usepackage{xchsc}
+%\end{verbatim}
+%No options are available.
+
+%I recommend applying \verb|\textsc| and \verb|\scshape| only to text, not figures, as {\tt XCharter} figures do not match {\tt Gelasio} figures very well. For example:\\
+
+The insertion of {\tt xcharter} small caps is complicated by the fact that xcharter capital letters are not a good match for gelasio capitals, and figures are an even worse mismatch. In {\tt gelasiomath}, LaTeX's font switch \verb|\scshape| is redefined to {\tt xcharter} small caps at the appropriate scale, and this in turn leads to a corresponding change of the macro \verb|\textsc|. The following table illustrates the problems with capitals and figures.
+
+\begin{center}
+ \begin{tabular}{@{} ccc @{}}
+ \toprule
+ Source & Typeset source & Comments \\
+ \midrule
+ Reg. 2345 \verb|{\scshape| SmCap 2345\verb|}|& Reg. 2345 {\scshape SmCap 2345} & figures do not match \\
+ Reg. 2345 \verb|{\scshape| SmCap\verb|}| 2345& Reg. 2345 {\scshape SmCap} 2345 & Caps not good match \\
+ S\verb|{\scshape| mall\verb|}| C\verb|{\scshape| ap\verb|}|& S{\scshape mall} C{\scshape ap}& Better IMO\\
+ \bottomrule
+ \end{tabular}
+\end{center}
+
+The macro \verb|\textsc| is left as is and a new macro \verb|\textSC| is defined so as to exclude capitals and figures from the font change to {\tt xcharter}, making use of an {\tt expl3 regex} method I learned from a posting by Enrico Gregorio. (The regex tries to find all capitals in the argument string---this depends on the use of macros to specify non-ASCII capitals.) I found no way to make an equivalent font switch \verb|\SCshape|. The following lines compare the effects of \verb|\textSC| versus \verb|\textsc| for regular, italic, bold and bold italic.
+
+
+\textSC{Small Caps 2345} v. \textsc{Small Caps 2345}\\
+{\itshape \textSC{Small Caps 2345} v. \textsc{Small Caps 2345}}\\
+{\bfseries \textSC{Small Caps 2345} v. \textsc{Small Caps 2345}}\\
+{\bfseries\itshape \textSC{Small Caps 2345} v. \textsc{Small Caps 2345}}
+
+Users of XeLaTeX/LuaLaTeX will have to contend with irritating LaTeX Font Warnings about \verb|TU/Gelasio(?)/m/sc[it]| being undefined, but the output will be correct.
+
+{\bfseries\textSC{New Text Commands}:}
+\begin{itemize}
+\item
+In unicode tex, font switches \verb|\nufigures|, \verb|\defigures| and \verb|\infigures| are defined for numerators, denominators and inferiors as well as the corresponding macros \verb|\textnum|, \verb|\textde|, and \verb|\textinf|.
+\item (All engines)
+\verb|\textlf|, \verb|\texttlf|, \verb|\textosf|, \verb|\texttosf| give their arguments in lining figures, tabular lining figures, oldstyle figures and tabular oldstyle figures respectively.
+\item For {\tt pdflatex}, macros \verb|\textnum|, \verb|\textde|, and \verb|\textinf| are provided, but not the corresponding font switch commands. (These work by changing the baseline of the superior figures.)
+\item A \verb|\textfrac| macro is provided, intended for regular weight only. E.g., \verb|\textfrac{3}{16}| gives \textfrac{3}{16} and \verb|\textfrac[2]{3}{16}| gives \textfrac[2]{3}{16}.
+\item
+There is a stacked fraction macro, \verb|\textsfrac|. E.g.,
+\verb|\textsfrac[1]{7}{32}| gives \textsfrac[1]{7}{32}. See the documentation for {\tt newtx} for details about the options available. The small denominator figures have configurable size and are made available for general use with the macro \verb|\textsmde|.
+\end{itemize}
+See the documentation for the {\tt newtx} package for detailed information about math typesetting, bearing in mind that {\tt gelasiomath} takes care of loading {\tt gelasio} and {\tt newtxmath}. Here is a sample basic preamble using unicode latex.
+
+\begin{verbatim}
+% !TEX TS-program = lualatex
+\documentclass[11pt,leqno]{article}
+\usepackage[margin=1in]{geometry}
+\usepackage[parfill]{parskip}
+\usepackage{array,booktabs}
+\usepackage[T1]{fontenc} % Active encoding for use in math text
+\usepackage[type1,sfdefault,scale=1]{sourcesanspro}% used by \mathsf
+\usepackage[scaled=.98,varqu,varl]{zi4} % for \mathtt
+% the next line loads fontspec
+\usepackage[amsthm,vvarbb,scosf]{gelasiomath}
+%\setmonofont and \setsansfont could be set here if
+% necessary for use in text passages
+\end{verbatim}
+Here is a well-known nonsense fragment from \emph{The TeXBook.}
+
+With a price of \pounds 148, almost anything can be found \textsc{Floating In \textbf{Fields}.} --- ?`But aren't Kafka's
+Schlo{\ss} and {\AE}sop's {\OE}uvres often \emph{na{\"\i}ve} vis-\`{a}-vis
+the d{\ae}monic ph{\oe}nix's official r\^{o}le in fluffy souffl\'{e}s?
+
+\newcommand\ibinom[2]{\genfrac\lbrace\rbrace{0pt}{}{#1}{#2}}
+% \section*{...}
+The following is borrowed from \emph{The \LaTeX\ Companion Third Edition}.
+
+First some large operators both in text:
+\smash{$ \iiint\limits_{\mathcal{Q}} f(x,y,z)\,dx\,dy\,dz $} and
+ $ \prod_{\gamma\in\Gamma_{\widetilde{C}}}
+ \partial(\widetilde{X}_\gamma) $; and also on display:
+
+\begin{equation} \begin{split} \iiiint\limits_{\mathbf{Q}} f(w,x,y,z)dwdxdydz
+ & \leq \oint_{\bm{\partial Q}} f’ \left( \max \left\lbrace
+ \frac{\lVert w \rVert}{\lvert w^2 + x^2 \rvert} ;
+ \frac{\lVert z \rVert}{\lvert y^2 + z^2 \rvert} ;
+ \frac{\lVert w \oplus z \rVert}{\lVert x \oplus y \rVert}
+ \right\rbrace \right) \\
+ & \precapprox \biguplus_{\mathbb{Q} \Subset \bar{\mathbf{Q}}}
+ \left[ f^{\ast} \left(
+ \frac{\left\lmoustache\mathbb{Q}(t)\right\rmoustache}
+ {\sqrt {1 - t^2}}
+ \right) \right]_{t=\alpha}^{t=\vartheta} - ( \Delta + \nu - v )^3
+ \end{split} \end{equation}
+
+For $x$ in the open interval $ \left] -1, 1 \right[ $ the infinite
+ sum in Equation~(2) is convergent; however, this does
+ not hold throughout the closed interval $ \left[ -1, 1 \right] $.
+
+ \begin{equation}
+ (1 - x)^{-k} = 1 + \sum_{j=1}^{\infty} (-1)^j \ibinom{k}{j} x^j
+ \text{\quad for $k \in \mathbb{N}$; $k \neq 0$.} %\label{eq:binom1}
+ \end{equation}
+
+%\fonttable{Gelasio-Regular-tlf-ot1}
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/gelasiomath/newtx-gel-subs.tex b/Master/texmf-dist/doc/fonts/gelasiomath/newtx-gel-subs.tex
new file mode 100644
index 00000000000..2e6f5722576
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/gelasiomath/newtx-gel-subs.tex
@@ -0,0 +1,17 @@
+{f}{-2.5}
+{j}{-2.5}
+{p}{-2.5}
+{y}{-1.5}
+{A}{-2.5}
+{B}{-1}
+{D}{-1}
+{H}{-1}
+{I}{-1}
+{K}{-1}
+{L}{-1}
+{M}{-1}
+{N}{-0.5}
+{P}{-1}
+{X}{-1}
+{\rho}{-2}
+{\beta}{2} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.ltx b/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.ltx
index 3075db7835e..f89d716c94c 100644
--- a/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.ltx
+++ b/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.ltx
@@ -49,7 +49,7 @@
\author{Chenjing Bu --- Daniel Flipo\\
\url{https://github.com/abccsss/LeteSansMath}}
-\newcommand*{\version}{0.40}
+\newcommand*{\version}{0.41}
\setlength{\parindent}{0pt}
\setlength{\parskip}{12pt plus 3pt minus 3pt}
@@ -287,6 +287,7 @@ and $\varphi$ instead of $\epsilon$ and $\phi$, you can add option
cv08 & $\sigma$ & $\varsigma$ & \cmd{sigma} \\
cv09 & $\theta$ & $\vartheta$ & \cmd{theta} \\
cv10 & $\Theta$ & $\varTheta$ & \cmd{Theta}\\
+ cv11 & $g$ & $\mitvarg$ & g \\
\hline
\end{tabular}
\end{table}
diff --git a/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.pdf b/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.pdf
index cec5302d510..c07728e637f 100644
--- a/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.pdf
+++ b/Master/texmf-dist/doc/fonts/lete-sans-math/LeteSansMath.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/lete-sans-math/README.md b/Master/texmf-dist/doc/fonts/lete-sans-math/README.md
index 2ed767a4dc6..f06c61df8b8 100644
--- a/Master/texmf-dist/doc/fonts/lete-sans-math/README.md
+++ b/Master/texmf-dist/doc/fonts/lete-sans-math/README.md
@@ -59,7 +59,11 @@ Either version 1.3c or, at your option, any later version.
Fonts renamed from "Lato Math" to "Lete Sans Math" due to the
Reserved Font Name clause on the Lato fonts.
Package "lato-math" renamed as "lete-sans-math".
-
+
+* v.0.41
+ Added feature cv11 to provide a single-storey variant for lowercase g
+ (upright, italic, bold, bolditalic).
+
---
Copyright 2024 Chenjing Bu, Daniel Flipo.
https://github.com/abccsss/LeteSansMath/
diff --git a/Master/texmf-dist/doc/fonts/lete-sans-math/unimath-lete.pdf b/Master/texmf-dist/doc/fonts/lete-sans-math/unimath-lete.pdf
index 6c646cca6b9..0d88c234c79 100644
--- a/Master/texmf-dist/doc/fonts/lete-sans-math/unimath-lete.pdf
+++ b/Master/texmf-dist/doc/fonts/lete-sans-math/unimath-lete.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/luwiantype/OFL.txt b/Master/texmf-dist/doc/fonts/luwiantype/OFL.txt
new file mode 100644
index 00000000000..9513c84d1d3
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/luwiantype/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/anatolian-hieroglyphs)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Master/texmf-dist/doc/fonts/luwiantype/README.md b/Master/texmf-dist/doc/fonts/luwiantype/README.md
new file mode 100644
index 00000000000..0f69525bca1
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/luwiantype/README.md
@@ -0,0 +1,41 @@
+LuwianType Package v1.2
+==================
+2024/07/15
+
+Maintainer: Jonathan Walls
+
+jonathan.walls@ling-phil.ox.ac.uk
+
+___________________________
+
+The LuwianType package allows for typing in Hieroglyphic Luwian in LaTeX documents, using relatively simple commands based on the Latin transcriptions of the various signs. It also includes some formatting commands designed to allow boustrophedon and columns, as well as shorthands for symbols commonly used in transcriptions.
+
+The luwiantype-doc.tex file is the LaTeX version of the documentation which can be run as a testing ground for new users.
+
+__________________________
+
+
+Copyright 2024 Jonathan Walls
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
+
+The latest version of this license is in
+ https://www.latex-project.org/lppl/lppl-1-3c.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Jonathan Walls.
+
+This work consists of the files luwiantype.sty, luwiantype-doc.tex and the derived file luwiantype-doc.pdf.
+
+The LuwianFont.ttf file consists of the Google Noto Sans Anatolian Hieroglyphs font, distributed under the terms of the included Open Font License.
+
+
+Version history:
+1.2 - updated to resolve some minor typos and command formatting
+1.1 - updated to comply with CTAN formatting requirements, adjustments to licensing
+
diff --git a/Master/texmf-dist/doc/fonts/luwiantype/U14400.pdf b/Master/texmf-dist/doc/fonts/luwiantype/U14400.pdf
new file mode 100644
index 00000000000..793842562ef
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/luwiantype/U14400.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/luwiantype/lppl1-3c.txt b/Master/texmf-dist/doc/fonts/luwiantype/lppl1-3c.txt
new file mode 100644
index 00000000000..1b57559a832
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/luwiantype/lppl1-3c.txt
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2008 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % https://www.latex-project.org/lppl.txt
+ % and version 1.3c or later is part of all distributions of LaTeX
+ % version 2008 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
diff --git a/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.pdf b/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.pdf
new file mode 100644
index 00000000000..406fb8fab0a
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.tex b/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.tex
new file mode 100644
index 00000000000..1529b12e4e1
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.tex
@@ -0,0 +1,180 @@
+%% Copyright 2024 Jonathan Walls
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% https://www.latex-project.org/lppl/lppl-1-3c.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Jonathan Walls.
+%
+% This work consists of the files luwiantype.sty, luwiantype-doc.tex
+% and the derived file luwiantype-doc.pdf.
+%
+%
+% Version history:
+% 1.2 - updated to resolve some minor typos and command formatting
+% 1.1 - updated to comply with CTAN formatting requirements, adjustments to licensing
+
+\documentclass[12pt,A4]{article}
+\usepackage{fontspec}
+\usepackage{polyglossia}
+\usepackage[notes,backend=biber]{biblatex-chicago}
+\usepackage{csquotes}
+
+\usepackage{expex}
+\setdefaultlanguage{english}
+\usepackage{lua-ul, luacolor}
+\usepackage{hyperref}
+\setmainfont{Charis SIL}
+\usepackage{luwiantype}
+\usepackage{float}
+
+\title{The LuwianType Package}
+\author{Jonathan Walls}
+
+\begin{document}
+\maketitle
+
+\section{Introduction}
+
+This package aims to allow platform-agnostic typing in Luwian hieroglyphs using LaTeX. It is based on the Noto Sans Anatolian Hieroglyphic font by Google, and incorporates functionality from the fontspec, stackengine, and graphicx packages in order to create a system for the aforementioned purpose.
+
+\section{Setup}
+The system aims to be maximally user-friendly (to the extent that LaTeX ever is), allowing more-or-less free typing using Latin characters as LaTeX commands which are then converted to hieroglyphic text in the PDF. To begin, in the project folders, one must include:
+\begin{enumerate}
+ \item The Fonts folder containing the necessary fonts
+ \item The luwiantype.sty file containing the commands necessary for the Unicode conversions.
+\end{enumerate}
+
+In the preamble of the main.tex file (or however you name your main project file), one must also include the following line to import the package:\small
+\begin{verbatim}
+\usepackage{luwiantype}
+\end{verbatim}
+\normalsize\newpage
+This will incorporate the fontspec package allowing switching to the Unicode font, bring in the LuwianType functionality from the .sty file, and create a
+\begin{verbatim}
+ \Luwian
+\end{verbatim}
+command which will allow easy switching to the cuneiform typing mode. To switch back, simply use the \verb|\Lat| command.
+
+\section{Usage}
+\subsection{Basic Hieroglyphic Typing}
+To use the package, in a given section, you can trigger the cuneiform writing mode by using the \verb|\Luwian| command as listed above. Each character is designated by an uppercase command (to differentiate it from other stock LaTeX commands), and subscripts for sign variants are given in brackets. Typing is made fairly easy by simply turning on caps lock. An example of use is shown below:
+\begin{verbatim}
+ \Luwian\DEUS\KU\AVIS\PA\PA\SA\Lat
+\end{verbatim}
+This displays the hieroglyphic inline text corresponding to:
+\\
+
+\noindent(DEUS)ku-AVIS-pa-pa-sa
+
+ \noindent\Luwian\DEUS\KU\AVIS\PA\PA\SA\\\Lat
+
+Luwian of course is written in boustrophedon pattern, and the graphicx package has been utilized to create a \verb|\boust{}| command which takes arguments and then mirrors the text for R-to-L reading as shown:
+
+\begin{verbatim}
+ \Luwian\boust{\DEUS\KU\AVIS\PA\PA\SA}\\
+\end{verbatim}
+ \Luwian\boust{\DEUS\KU\AVIS\PA\PA\SA}\\\Lat
+
+\newpage Luwian, however, was written not in strict linear fashion, but included columns as well. This, naturally, is much more easily reproduced in physical media than in text, but the stackengine package allows us to approximate the look and feel of real Luwian text, should this be required. For this purpose, we have the \verb|\gstack{{\argi} {\argii} {\etc}}| command which stacks glyphs in a ``glyph stack," with as many glyphs as needed.
+
+ \begin{verbatim}
+ \Luwian\gstack{{\DEUS} {\KU} {\AVIS}}\gstack{{\PA} {\PA} {\SA}}
+ \HUGE\gstack{{ } {\REX}}
+ \end{verbatim}
+ \Luwian\gstack{{\DEUS} {\KU} {\AVIS}}\gstack{{\PA} {\PA} {\SA}}\HUGE\gstack{{ } {\REX}}\Lat\\
+
+In this example, we can see the two glyph stacks, with each glyph in brackets and separated by a space in the \verb|\gstack| command, shown next to each other, as well as a following stack made up of a single large REX sign and an empty argument. Often, single signs may be written large and take up an entire column, which is best approximated by what is shown above. Here, the font size is changed with \verb|\HUGE|, and a space argument is fed into the glyph stack to help with spacing. This system is very flexible, and able to relatively neatly approximate the look of most Luwian text.\\
+
+To change between S\'A and S\`A, use the following syntax:
+\begin{verbatim}
+ \SA[2]
+ \SA[3]
+ %the base SA character can be had with
+ \SA
+\end{verbatim}
+Thus \Luwian\SA[2], \SA[3], \SA,\setmainfont{Charis SIL}\normalsize in order.
+
+Commands which correspond to numbers, i.e., 1, 2, etc., are in the LaTeX code with
+\begin{verbatim}
+ \ONE
+ \TWO
+\end{verbatim}
+as LaTeX does not allow numeric characters in command names. Signs with varying vowels like \textit{wa/i} have both vowels in the command name, unseparated, as in \verb|\WAI|. Those signs which are compound, such as LITUUS+na will be designated without any break between the signs as \verb|\LITUUSNA|, except on the rare occasion where a distinction needs to be made between two signs joined by . or +, in which case the latter is designated \verb|PLUS| in the command name. The signs which do not have a standard reading such as \Luwian\LIII\Lat will be designated by an L (Laroche) and the appropriate Laroche number in roman numerals, as in \verb|\LIII|. The special signs for word divisions, logograms, and personal identifiers are \Luwian\VIRIIA \Lat\verb|\VIRIIA|, \Luwian\LOGS \Lat\verb|\LOGS| ("logogram start"), \Luwian\LOGE \Lat\verb|\LOGE| ("logogram end"), and \Luwian\PERS \Lat\verb|\PERS|.
+
+\subsection{Formatting Transcriptions}
+This package also contains a number of commands which are useful for formatting transcriptions of Luwian, which follows conventions that are often tedious to work through. Some of these will create special characters often used in such transcriptions, as in the following table.
+
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{cc}
+ \textbf{Command} & \textbf{Effect} \\ \hline
+ \verb|\badeq| (``bad equal") & \badeq\\
+ \verb|\hl| (``half left") & \hl\\
+ \verb|\hr| (``half right") & \hr\\
+ \end{tabular}
+\end{table}
+
+Some other commands are included which serve to facilitate formatting, as shown in the following table.
+
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{cc}
+ \textbf{Command} & \textbf{Effect} \\ \hline
+ \verb|\tsup{}| & \tsup{M}\\
+ \verb|\tsub{}| & \tsub{2}\\
+ \end{tabular}
+\end{table}
+
+\verb|\tsup| and \verb|\tsub| create super- and subscripts, respectively.
+
+\subsection{Working with expex}
+
+If one is using the expex package for interlinear translation or example glossing, the easiest thing to do is to define a new glw level as shown in this example:
+\color{red}
+\begin{verbatim}
+\defineglwlevels{luw}
+\begingl[glwordalign=center,glhangstyle=none, aboveglftskip=0pt,
+ everygla=\normalfont, everyglluw=\Luwian]
+\end{verbatim}\color{black}
+\begin{verbatim}
+\gla REX \textsuperscript{I}t\'a-i-t\'a-sa EGO-wa/i-mi
+(VIR\textsubscript{2})HEROS (VIR\textsubscript{2})pa-l\'a/\'i-s\`a-ti-[n\'i]-za-sa
+REX a-wa/i x mi-i-*a//
+\end{verbatim}\color{red}
+\begin{verbatim}
+\glluw {\REX} {\PERS\TA[2]\I\TA[2]\SA} {\EGO\WAI\MI} {\VIR[2]\HEROS}
+{\VIR[2]\PA\LAI[2]\SA[3]\TI\NI[2]\ZA\SA} {\REX} {\A\WAI} x {\MI\I\A}//
+\end{verbatim}\color{black}
+\begin{verbatim}
+\glb hantawattis Taitas amu\badeq wa\badeq mi hastalis Falistinizzas
+hantawattis a\badeq wa x ammi//
+\glc king.nom Taitas I.quot.myself Hero Falistina.nom king.nom and.quot x
+my.dat//
+\glft I am King Taitas, Hero, Falistinian king, and I\newline//
+\endgl
+\end{verbatim}
+
+Note the section at the beginning which defines a ``luw" (Luwian) glw level, which needs to be done only once at the beginning of the document, and note also the \verb|evergylluw=\Luwian| specification in the parameters which assigns the entire line to be in Luwian hieroglyphs. You may of course omit one of the transcription levels, in which case you can simply add the specification to the a, b, or c level instead. This code will produce the following output:\\
+
+\defineglwlevels{luw}
+
+\begingl[glwordalign=center,glhangstyle=none, aboveglftskip=0pt, everygla=\normalfont, everyglluw=\Luwian]
+\gla REX \textsuperscript{I}t\'a-i-t\'a-sa EGO-wa/i-mi (VIR\textsubscript{2})HEROS (VIR\textsubscript{2})pa-l\'a/\'i-s\`a-ti-[n\'i]-za-sa REX a-wa/i x mi-i-*a//
+\glluw {\REX} {\PERS\TA[2]\I\TA[2]\SA} {\EGO\WAI\MI} {\VIR[2]\HEROS} {\VIR[2]\PA\LAI[2]\SA[3]\TI\NI[2]\ZA\SA} {\REX} {\A\WAI} x {\MI\I\A}//
+\glb hantawattis Taitas amu\badeq wa\badeq mi hastalis Falistinizzas hantawattis a\badeq wa x ammi//
+\glc king.nom Taitas I.quot.myself Hero Falistina.nom king.nom and.quot x my.dat//
+\glft I am King Taitas, Hero, Falistinian king, and I\newline//
+\endgl
+
+Happy Luwian!
+\end{document}
+
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README
index e8c037ee2d3..99873acf792 100644
--- a/Master/texmf-dist/doc/fonts/newtx/README
+++ b/Master/texmf-dist/doc/fonts/newtx/README
@@ -1,10 +1,17 @@
This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
-Current version: 1.75 2024-06-20
+Current version: 1.752 2024-07-05
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.752
+Small addition to newtxmath so that with option gelasio, the operator
+fd is changed to ot1mingelasio.fd, whose fonts have XCharter Greek upper case.
+
+Changes in version 1.751
+Reworked the scaling calculations in newtx.sty to repair the handling of the scaling of sans text.
+
Changes in version 1.75
Added code to newtx.sty and newtxmath.sty to support gelasio small caps, additional
figure in pdflatex and math. (Best to use gelasiomath.sty as the interface as it adds
diff --git a/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex b/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex
index 0644724ff58..3419a4196dc 100644
--- a/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex
+++ b/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex
@@ -601,16 +601,6 @@
\showcaseicon{axios}{simpleicon\{axios\}}
- \showcaseicon{azureartifacts}{simpleicon\{azureartifacts\}}
-
- \showcaseicon{azuredataexplorer}{simpleicon\{azuredataexplorer\}}
-
- \showcaseicon{azuredevops}{simpleicon\{azuredevops\}}
-
- \showcaseicon{azurefunctions}{simpleicon\{azurefunctions\}}
-
- \showcaseicon{azurepipelines}{simpleicon\{azurepipelines\}}
-
\showcaseicon{babel}{simpleicon\{babel\}}
\showcaseicon{babelio}{simpleicon\{babelio\}}
@@ -1021,6 +1011,8 @@
\showcaseicon{chromecast}{simpleicon\{chromecast\}}
+ \showcaseicon{chromewebstore}{simpleicon\{chromewebstore\}}
+
\showcaseicon{chrysler}{simpleicon\{chrysler\}}
\showcaseicon{chupachups}{simpleicon\{chupachups\}}
@@ -1317,8 +1309,6 @@
\showcaseicon{crystal}{simpleicon\{crystal\}}
- \showcaseicon{csharp}{simpleicon\{csharp\}}
-
\showcaseicon{css3}{simpleicon\{css3\}}
\showcaseicon{cssdesignawards}{simpleicon\{cssdesignawards\}}
@@ -1359,8 +1349,6 @@
\showcaseicon{dailymotion}{simpleicon\{dailymotion\}}
- \showcaseicon{daimler}{simpleicon\{daimler\}}
-
\showcaseicon{daisyui}{simpleicon\{daisyui\}}
\showcaseicon{dapr}{simpleicon\{dapr\}}
@@ -1395,8 +1383,6 @@
\showcaseicon{datastax}{simpleicon\{datastax\}}
- \showcaseicon{dataverse}{simpleicon\{dataverse\}}
-
\showcaseicon{datefns}{simpleicon\{datefns\}}
\showcaseicon{datev}{simpleicon\{datev\}}
@@ -1463,8 +1449,6 @@
\showcaseicon{derspiegel}{simpleicon\{derspiegel\}}
- \showcaseicon{designernews}{simpleicon\{designernews\}}
-
\showcaseicon{deutschebahn}{simpleicon\{deutschebahn\}}
\showcaseicon{deutschebank}{simpleicon\{deutschebank\}}
@@ -1539,8 +1523,6 @@
\showcaseicon{docusaurus}{simpleicon\{docusaurus\}}
- \showcaseicon{docusign}{simpleicon\{docusign\}}
-
\showcaseicon{dogecoin}{simpleicon\{dogecoin\}}
\showcaseicon{doi}{simpleicon\{doi\}}
@@ -1613,8 +1595,6 @@
\showcaseicon{dwm}{simpleicon\{dwm\}}
- \showcaseicon{dynamics365}{simpleicon\{dynamics365\}}
-
\showcaseicon{dynatrace}{simpleicon\{dynatrace\}}
\showcaseicon{e}{simpleicon\{e\}}
@@ -2269,8 +2249,6 @@
\showcaseicon{googledocs}{simpleicon\{googledocs\}}
- \showcaseicon{googledomains}{simpleicon\{googledomains\}}
-
\showcaseicon{googledrive}{simpleicon\{googledrive\}}
\showcaseicon{googleearth}{simpleicon\{googleearth\}}
@@ -2285,8 +2263,6 @@
\showcaseicon{googlegemini}{simpleicon\{googlegemini\}}
- \showcaseicon{googlehangouts}{simpleicon\{googlehangouts\}}
-
\showcaseicon{googlehome}{simpleicon\{googlehome\}}
\showcaseicon{googlekeep}{simpleicon\{googlekeep\}}
@@ -2301,22 +2277,16 @@
\showcaseicon{googlemessages}{simpleicon\{googlemessages\}}
- \showcaseicon{googlemybusiness}{simpleicon\{googlemybusiness\}}
-
\showcaseicon{googlenearby}{simpleicon\{googlenearby\}}
\showcaseicon{googlenews}{simpleicon\{googlenews\}}
- \showcaseicon{googleoptimize}{simpleicon\{googleoptimize\}}
-
\showcaseicon{googlepay}{simpleicon\{googlepay\}}
\showcaseicon{googlephotos}{simpleicon\{googlephotos\}}
\showcaseicon{googleplay}{simpleicon\{googleplay\}}
- \showcaseicon{googlepodcasts}{simpleicon\{googlepodcasts\}}
-
\showcaseicon{googlepubsub}{simpleicon\{googlepubsub\}}
\showcaseicon{googlescholar}{simpleicon\{googlescholar\}}
@@ -2607,12 +2577,6 @@
\showcaseicon{iberia}{simpleicon\{iberia\}}
- \showcaseicon{ibm}{simpleicon\{ibm\}}
-
- \showcaseicon{ibmcloud}{simpleicon\{ibmcloud\}}
-
- \showcaseicon{ibmwatson}{simpleicon\{ibmwatson\}}
-
\showcaseicon{iced}{simpleicon\{iced\}}
\showcaseicon{iceland}{simpleicon\{iceland\}}
@@ -2741,8 +2705,6 @@
\showcaseicon{internetcomputer}{simpleicon\{internetcomputer\}}
- \showcaseicon{internetexplorer}{simpleicon\{internetexplorer\}}
-
\showcaseicon{intigriti}{simpleicon\{intigriti\}}
\showcaseicon{intuit}{simpleicon\{intuit\}}
@@ -3001,6 +2963,8 @@
\showcaseicon{kodi}{simpleicon\{kodi\}}
+ \showcaseicon{koenigsegg}{simpleicon\{koenigsegg\}}
+
\showcaseicon{kofax}{simpleicon\{kofax\}}
\showcaseicon{kofi}{simpleicon\{kofi\}}
@@ -3455,44 +3419,6 @@
\showcaseicon{micropython}{simpleicon\{micropython\}}
- \showcaseicon{microsoft}{simpleicon\{microsoft\}}
-
- \showcaseicon{microsoftacademic}{simpleicon\{microsoftacademic\}}
-
- \showcaseicon{microsoftaccess}{simpleicon\{microsoftaccess\}}
-
- \showcaseicon{microsoftazure}{simpleicon\{microsoftazure\}}
-
- \showcaseicon{microsoftbing}{simpleicon\{microsoftbing\}}
-
- \showcaseicon{microsoftedge}{simpleicon\{microsoftedge\}}
-
- \showcaseicon{microsoftexcel}{simpleicon\{microsoftexcel\}}
-
- \showcaseicon{microsoftexchange}{simpleicon\{microsoftexchange\}}
-
- \showcaseicon{microsoftonedrive}{simpleicon\{microsoftonedrive\}}
-
- \showcaseicon{microsoftonenote}{simpleicon\{microsoftonenote\}}
-
- \showcaseicon{microsoftoutlook}{simpleicon\{microsoftoutlook\}}
-
- \showcaseicon{microsoftpowerpoint}{simpleicon\{microsoftpowerpoint\}}
-
- \showcaseicon{microsoftsharepoint}{simpleicon\{microsoftsharepoint\}}
-
- \showcaseicon{microsoftsqlserver}{simpleicon\{microsoftsqlserver\}}
-
- \showcaseicon{microsoftstore}{simpleicon\{microsoftstore\}}
-
- \showcaseicon{microsoftteams}{simpleicon\{microsoftteams\}}
-
- \showcaseicon{microsofttranslator}{simpleicon\{microsofttranslator\}}
-
- \showcaseicon{microsoftvisio}{simpleicon\{microsoftvisio\}}
-
- \showcaseicon{microsoftword}{simpleicon\{microsoftword\}}
-
\showcaseicon{microstation}{simpleicon\{microstation\}}
\showcaseicon{microstrategy}{simpleicon\{microstrategy\}}
@@ -3509,8 +3435,6 @@
\showcaseicon{minds}{simpleicon\{minds\}}
- \showcaseicon{minecraft}{simpleicon\{minecraft\}}
-
\showcaseicon{minetest}{simpleicon\{minetest\}}
\showcaseicon{mini}{simpleicon\{mini\}}
@@ -3555,8 +3479,6 @@
\showcaseicon{modx}{simpleicon\{modx\}}
- \showcaseicon{mojangstudios}{simpleicon\{mojangstudios\}}
-
\showcaseicon{moleculer}{simpleicon\{moleculer\}}
\showcaseicon{momenteo}{simpleicon\{momenteo\}}
@@ -3591,6 +3513,8 @@
\showcaseicon{moonrepo}{simpleicon\{moonrepo\}}
+ \showcaseicon{moq}{simpleicon\{moq\}}
+
\showcaseicon{moqups}{simpleicon\{moqups\}}
\showcaseicon{morrisons}{simpleicon\{morrisons\}}
@@ -3993,6 +3917,8 @@
\showcaseicon{org}{simpleicon\{org\}}
+ \showcaseicon{organicmaps}{simpleicon\{organicmaps\}}
+
\showcaseicon{origin}{simpleicon\{origin\}}
\showcaseicon{osano}{simpleicon\{osano\}}
@@ -4243,9 +4169,9 @@
\showcaseicon{playstation5}{simpleicon\{playstation5\}}
- \showcaseicon{playstationvita}{simpleicon\{playstationvita\}}
+ \showcaseicon{playstationportable}{simpleicon\{playstationportable\}}
- \showcaseicon{playwright}{simpleicon\{playwright\}}
+ \showcaseicon{playstationvita}{simpleicon\{playstationvita\}}
\showcaseicon{pleroma}{simpleicon\{pleroma\}}
@@ -4325,22 +4251,8 @@
\showcaseicon{postmates}{simpleicon\{postmates\}}
- \showcaseicon{powerapps}{simpleicon\{powerapps\}}
-
- \showcaseicon{powerautomate}{simpleicon\{powerautomate\}}
-
- \showcaseicon{powerbi}{simpleicon\{powerbi\}}
-
- \showcaseicon{powerfx}{simpleicon\{powerfx\}}
-
- \showcaseicon{powerpages}{simpleicon\{powerpages\}}
-
\showcaseicon{powers}{simpleicon\{powers\}}
- \showcaseicon{powershell}{simpleicon\{powershell\}}
-
- \showcaseicon{powervirtualagents}{simpleicon\{powervirtualagents\}}
-
\showcaseicon{prdotco}{simpleicon\{prdotco\}}
\showcaseicon{preact}{simpleicon\{preact\}}
@@ -4653,6 +4565,8 @@
\showcaseicon{redox}{simpleicon\{redox\}}
+ \showcaseicon{redsys}{simpleicon\{redsys\}}
+
\showcaseicon{redux}{simpleicon\{redux\}}
\showcaseicon{reduxsaga}{simpleicon\{reduxsaga\}}
@@ -4679,7 +4593,7 @@
\showcaseicon{render}{simpleicon\{render\}}
- \showcaseicon{renovatebot}{simpleicon\{renovatebot\}}
+ \showcaseicon{renovate}{simpleicon\{renovate\}}
\showcaseicon{renpy}{simpleicon\{renpy\}}
@@ -5085,10 +4999,6 @@
\showcaseicon{skypack}{simpleicon\{skypack\}}
- \showcaseicon{skype}{simpleicon\{skype\}}
-
- \showcaseicon{skypeforbusiness}{simpleicon\{skypeforbusiness\}}
-
\showcaseicon{skyrock}{simpleicon\{skyrock\}}
\showcaseicon{slack}{simpleicon\{slack\}}
@@ -5509,6 +5419,8 @@
\showcaseicon{teamviewer}{simpleicon\{teamviewer\}}
+ \showcaseicon{techcrunch}{simpleicon\{techcrunch\}}
+
\showcaseicon{ted}{simpleicon\{ted\}}
\showcaseicon{teepublic}{simpleicon\{teepublic\}}
@@ -5861,6 +5773,8 @@
\showcaseicon{unity}{simpleicon\{unity\}}
+ \showcaseicon{unjs}{simpleicon\{unjs\}}
+
\showcaseicon{unlicense}{simpleicon\{unlicense\}}
\showcaseicon{unocss}{simpleicon\{unocss\}}
@@ -5987,14 +5901,6 @@
\showcaseicon{visa}{simpleicon\{visa\}}
- \showcaseicon{visualbasic}{simpleicon\{visualbasic\}}
-
- \showcaseicon{visualstudio}{simpleicon\{visualstudio\}}
-
- \showcaseicon{visualstudioappcenter}{simpleicon\{visualstudioappcenter\}}
-
- \showcaseicon{visualstudiocode}{simpleicon\{visualstudiocode\}}
-
\showcaseicon{visx}{simpleicon\{visx\}}
\showcaseicon{vite}{simpleicon\{vite\}}
@@ -6119,6 +6025,8 @@
\showcaseicon{webgl}{simpleicon\{webgl\}}
+ \showcaseicon{webgpu}{simpleicon\{webgpu\}}
+
\showcaseicon{weblate}{simpleicon\{weblate\}}
\showcaseicon{webmin}{simpleicon\{webmin\}}
@@ -6185,16 +6093,6 @@
\showcaseicon{winamp}{simpleicon\{winamp\}}
- \showcaseicon{windows}{simpleicon\{windows\}}
-
- \showcaseicon{windows10}{simpleicon\{windows10\}}
-
- \showcaseicon{windows95}{simpleicon\{windows95\}}
-
- \showcaseicon{windowsterminal}{simpleicon\{windowsterminal\}}
-
- \showcaseicon{windowsxp}{simpleicon\{windowsxp\}}
-
\showcaseicon{wipro}{simpleicon\{wipro\}}
\showcaseicon{wire}{simpleicon\{wire\}}
@@ -6251,14 +6149,8 @@
\showcaseicon{x}{simpleicon\{x\}}
- \showcaseicon{xamarin}{simpleicon\{xamarin\}}
-
- \showcaseicon{xaml}{simpleicon\{xaml\}}
-
\showcaseicon{xampp}{simpleicon\{xampp\}}
- \showcaseicon{xbox}{simpleicon\{xbox\}}
-
\showcaseicon{xcode}{simpleicon\{xcode\}}
\showcaseicon{xdadevelopers}{simpleicon\{xdadevelopers\}}
@@ -6297,8 +6189,6 @@
\showcaseicon{yaml}{simpleicon\{yaml\}}
- \showcaseicon{yammer}{simpleicon\{yammer\}}
-
\showcaseicon{yandexcloud}{simpleicon\{yandexcloud\}}
\showcaseicon{yarn}{simpleicon\{yarn\}}
diff --git a/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdf b/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdf
index a8fbad1628c..13f78e3cb53 100644
--- a/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdf
+++ b/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.tex b/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.tex
index e69c67e283a..56df7284081 100644
--- a/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.tex
+++ b/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.tex
@@ -14,7 +14,7 @@
Simple Icons (Font)\\%
Inesh Bose (\LaTeX{} package)%
}
-\date{12.4.0 -- \today}\maketitle
+\date{13.1.0 -- \today}\maketitle
This package provides \LaTeX{} support for the Simple Icons logos.
To use Simple Icons in your document, include the package with |\usepackage{simpleicons}|.
diff --git a/Master/texmf-dist/doc/fonts/xcharter-math/README.md b/Master/texmf-dist/doc/fonts/xcharter-math/README.md
index 4c6ac09be90..dd290bb8dc5 100644
--- a/Master/texmf-dist/doc/fonts/xcharter-math/README.md
+++ b/Master/texmf-dist/doc/fonts/xcharter-math/README.md
@@ -8,16 +8,17 @@ with the XCharter text fonts.
## Contents
-* XCharter-Math.otf OpenType Math font
-* xcharter-otf.sty LaTeX style file
-* XCharter-Math.pdf Documentation in PDF format
-* XCharter-Math.ltx Source of XCharter-Math.pdf
-* unimath-xcharter.pdf Modified version of unimath-symbols.pdf
- showing available XCharter-Math symbols compared to
- LatinModern, STIXTwo, Erewhon, TeXGyrePagella,
- Libertinus and EBGaramond.
-* unimath-xcharter.ltx Source of unimath-xcharter.pdf
-* README.md (this file)
+* XCharter-Math.otf OpenType Math font
+* XCharter-Math-Bold.otf Bold variant (limited coverage)
+* xcharter-otf.sty LaTeX style file
+* XCharter-Math.pdf Documentation in PDF format
+* XCharter-Math.ltx Source of XCharter-Math.pdf
+* unimath-xcharter.pdf Modified version of unimath-symbols.pdf
+ showing available XCharter-Math symbols compared
+ to LatinModern, STIXTwo, Erewhon, TeXGyrePagella,
+ Libertinus and EBGaramond.
+* unimath-xcharter.ltx Source of unimath-xcharter.pdf
+* README.md (this file)
## Installation
@@ -41,7 +42,7 @@ Version 1.1. This license is available with a FAQ at:
http://scripts.sil.org/OFL
* The other files are distributed under the terms of the LaTeX Project
Public License from CTAN archives in directory macros/latex/base/lppl.txt.
-Either version 1.3 or, at your option, any later version.
+Either version 1.3c or, at your option, any later version.
## Changes
@@ -109,7 +110,10 @@ Either version 1.3 or, at your option, any later version.
with \leq, \geq.
- XCharter-Math-Bold: missing italic correction added for int.up,
int.v1, int.v1.up.
-
+* v0.63:
+ - Added lmoustache, rmoustache (U+23B0, U+23B1).
+ - Superscripts BbbE.st and BbbE.sst fixed (U+EA04, U+ED04).
+
---
Copyright 2022-2024 Daniel Flipo
E-mail: daniel (dot) flipo (at) free (dot) fr
diff --git a/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.ltx b/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.ltx
index 43a0d4fa87d..09ba4523467 100644
--- a/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.ltx
+++ b/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.ltx
@@ -34,7 +34,7 @@
\title{\decofourleft\,\XCotf\,\decofourright}
\author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
-\newcommand*{\version}{0.62}
+\newcommand*{\version}{0.63}
\begin{document}
\maketitle
@@ -85,15 +85,16 @@ otherwise you would get Latin Modern for text fonts.
As an alternative to load \XCotf{} you can type:\\[.5\baselineskip]
\verb+\usepackage[ +\textit{options}
-\footnote{Possible \textit{options} are \opt{loose}, \opt{no-text}, \opt{Scale=}
- or any of the options described in sections \ref{ssection-um},
+\footnote{Possible \textit{options} are \opt{loose}, \opt{no-text},
+ \opt{Scale=} or any of the options described in sections \ref{ssection-um},
\ref{ssection-cv} and \ref{ssection-ss}.}%
\verb+ ]{xcharter-otf}+\\[.5\baselineskip]
-it loads \pkg{unicode-math} with the default options, sets XCharter-Math
+it loads \pkg{unicode-math} with the default options, sets \XCotf{}
as maths font and XCharter Text fonts as Roman fonts
-(families \textit{sf} and \textit{tt} left unchanged) but does a bit more:
+(families \textit{sf} and \textit{tt} left unchanged) and does a bit more:
\begin{enumerate}
-\item it loads \pkg{realscripts} for better superscripts;
+\item it loads \pkg{realscripts} for better looking superscripts and footnote
+ calls;
\item it checks at \verb+\begin{document}+ if packages \pkg{amssymb} or
\pkg{latexsym} are loaded and issues warnings in case they are;
\item it provides aliases for glyphs named differently in Unicode, so that
@@ -119,9 +120,10 @@ specific options, f.i. \\
\section{What is provided?}
-\XCotf{} provides all glyphs supplied by \FGUT{} plus all glyphs available in
-the \pkg{amssymb} and \pkg{latexsym} packages and many more. Therefore, these
-two packages \emph{should not} be loaded as they might override \XCotf{} glyphs.
+\XCotf{} provides the most common \pkg{unicode-math} glyphs and all glyphs
+available in the \pkg{amssymb} and \pkg{latexsym} packages.
+Therefore, the latter two packages \emph{should not} be loaded as they might
+override \XCotf{} glyphs.
Sans-serif, typewriter and fraktur alphabets are borrowed from Latin Modern
fonts. See in section~\vref{ssec-math-alphabets} how to choose from other
@@ -179,8 +181,8 @@ Other possible customisation: $\nabla$ is printed upright and $\partial$ is
printed slanted by default, but \opt{nabla=italic} and
\opt{partial=upright} can change this.
-All these options are offered by the \pkg{unicode-math} package but they can
-be added to the \cmd{setmathfont} call%
+All these options are offered by the \pkg{unicode-math} package, they can
+be added to the \cmd{setmathfont} call as well%
\footnote{IMHO it is easier to add \emph{all options} to the \cmd{setmathfont}
command.}, for example:
@@ -209,7 +211,7 @@ $\symup{α}$, $\symup{β}$, $\symup{Γ}$,… for \cmd{alpha}, \cmd{beta},
\subsection{Character variants}
\label{ssection-cv}
-\XCotf{} provides fourteen ``Character Variants’’ options, listed on
+\XCotf{} provides fourteen ``Character Variants'' options, listed on
table~\vref{cv}, to choose between different glyphs for Greek characters
and some others. Alternative calligraphic capitals for E, Q
and T have been added (version~0.50) and an alternative italic v, easier
@@ -259,21 +261,21 @@ Similarly with \opt{math-style=french}, \verb+\epsilon+ and \verb+\phi+
are output as $\symup{\varepsilon}$ and $\symup{\varphi}$ (upright).
Please note that curly braces are mandatory whenever more than one
-``Character Variant’’ is selected.
+``Character Variant'' is selected.
Note about \cmd{hbar} (v\,0.43): \pkg{unicode-math} defines \cmd{hbar} as
\cmd{hslash} (U+210F) while \pkg{amsmath} provides two different glyphs
-(italic h with horizontal or diagonal stroke).\\
-\pkg{XCharter Math} now follows \pkg{unicode-math}; the italic h with horizontal
-stroke can be printed using \cmd{hslash} or \cmd{hbar} together with character
-variant \texttt{cv01} or with \cmd{mithbar} (replacement for AMS’ command
-\cmd{hbar}).
+(italic $h$ with horizontal or diagonal stroke).\\
+\pkg{xcharter math} now follows \pkg{unicode-math}; the italic $h$ with
+horizontal stroke can be printed using \cmd{hslash} or \cmd{hbar} together
+with character variant \texttt{cv01} or with \cmd{mithbar} (replacement
+for AMS’ command \cmd{hbar}).
\subsection{Stylistic sets}
\label{ssection-ss}
-\XCotf{} provides five ``Stylistic Sets’’ options to choose between different
+\XCotf{} provides five ``Stylistic Sets'' options to choose between different
glyphs for families of maths symbols.
\verb+StylisticSet=4+, alias%
@@ -331,7 +333,7 @@ their smaller variants, see table~\vref{ss05}.
symbols, as shown in table~\vref{ss06}.
\verb+StylisticSet=7+, alias \verb+Style=parallelslant+, converts
-``parallel’’ symbols into their slanted variants, see table~\vref{ss07}.
+``parallel'' symbols into their slanted variants, see table~\vref{ss07}.
\begin{table}[ht]
\centering
\caption{Stylistic Sets 6 and 7}
@@ -425,10 +427,10 @@ To get oldstyle numbers in maths, the feature \texttt{+onum} is available:
$0123456789, \symbf{0123456789}$
\setmathfont{XCharter-Math.otf}
-\subsection{Standard \LaTeX{} math commands}
+\subsection{Standard LaTeX math commands}
\label{ssec-math-commands}
-All standard \LaTeX{} maths commands, all \pkg{amssymb} commands and all
+All standard LaTeX maths commands, all \pkg{amssymb} commands and all
\pkg{latexsym} commands are supported by \XCotf{}, for some of them loading
\pkg{xcharter-otf.sty} is required.
@@ -522,7 +524,8 @@ Various wide accents are also supported:
All the extensible arrows provided by the \pkg{mathtools} package are
available in the \XCotf{} font (loading \pkg{xcharter-otf.sty} is required),
f.i.:
-\[X \xLeftrightarrow{above} Y \xhookrightarrow[under]{} Z\xmapsto{above} W\]
+\[X \xLeftrightarrow{\text{above}} Y \xhookrightarrow[\text{under}]{}
+ Z\xmapsto{\text{above}} W\]
\subsection{Mathematical alphabets}
\label{ssec-math-alphabets}
@@ -587,7 +590,7 @@ $\symtt{ABCDE...XYZ abcde...xyz}$
$\symtt{ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz}$
\end{itemize}
-Like Latin Modern, \pkg{XCharter-Math} provides only four lowercase latin
+Like Latin Modern, \pkg{xcharter-math} provides only four lowercase latin
letters in script (or calligraphic) shape: $\mscre$, $\mscrg$, $\ell$,
$\mscro$ (\verb+\mscre+, \verb+\mscrg+, \verb+\ell+, \verb+\mscro+).
@@ -600,13 +603,15 @@ from another maths font if needed, i.e.
\subsection{Bold variant}
+\setmathfont{XCharter-Math.otf}[BoldFont=XCharter-Math-Bold.otf]
In case short maths formulas have to be printed in section titles,
-a \emph{limited} bold variant has been added in version~0.35. Example of usage:\\
+a \emph{limited} bold variant has been added in version~0.35.
+Example of usage: \quad\textbf{\boldmath Einstein’s equation $E=mc^2$}\\
\verb+\setmathfont{XCharter-Math-Bold.otf}[version=bold, +\textit{options}\verb+]+\\
\verb+\section{\mathversion{bold} Einstein’s equation $E=mc^2$}+
It is also possible to use the \verb+\boldmath+ command:\\
-\verb+\setmathfont{XCharter-Math-Regular.otf}[BoldFont=XCharter-Math-Bold.otf]+\\
+\verb+\setmathfont{XCharter-Math.otf}[BoldFont=XCharter-Math-Bold.otf]+\\
\verb+\section{\boldmath Einstein’s equation $E=mc^2$}+
\subsection{Missing symbols}
@@ -627,7 +632,7 @@ scaling is possible, multiple character ranges are separated with commas:\\
\verb+\setmathfont{Asana-Math.otf}[range={"294A-"2951,"2964,"2ABB-"2ABE}]+
Let’s mention \pkg{albatross}, a useful tool to find out the list of fonts
-providing a given glyph: f.i. type in a terminal ``\texttt{albatross U+2964}’’,
+providing a given glyph: f.i. type in a terminal ``\texttt{albatross U+2964}'',
see the manpage or \file{albatross-manual.pdf}.
\section{Acknowledgements}
@@ -637,7 +642,7 @@ OpenType format.
I am grateful to George Williams and his co-workers for providing and
maintaining FontForge and to Ulrik Vieth for his illuminating paper published
-in TUGboat~2009 Volume~30 about Open Type Math.
+in TUGboat~2009 Volume~30 about OpenType Math.
\bigskip
diff --git a/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.pdf b/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.pdf
index 0d797d078d2..501ffbff4ce 100644
--- a/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.pdf
+++ b/Master/texmf-dist/doc/fonts/xcharter-math/XCharter-Math.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/xcharter-math/unimath-xcharter.pdf b/Master/texmf-dist/doc/fonts/xcharter-math/unimath-xcharter.pdf
index 7125c9c20d8..a375861be9a 100644
--- a/Master/texmf-dist/doc/fonts/xcharter-math/unimath-xcharter.pdf
+++ b/Master/texmf-dist/doc/fonts/xcharter-math/unimath-xcharter.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/README.md b/Master/texmf-dist/doc/generic/knuth-hint/README.md
index ee62dccaa2a..2871f311770 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/README.md
+++ b/Master/texmf-dist/doc/generic/knuth-hint/README.md
@@ -21,4 +21,4 @@ The “License” of the `knuth-hint` package is “Public Domain” and it cove
the contents of this package, _not_ the various (and varying) “free software”
licenses of the presented software codes.
-This is version “2.2” of the `knuth-hint` package — 2024-03-16, Andreas Scherer.
+This is version “2.4” of the `knuth-hint` package — 2024-07-10, Andreas Scherer.
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt
index e5c76be4b78..af386a05bdb 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt
index 2e69c2120ef..5ab7689272b 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt
index 8a061693528..f2d9da77475 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt
index dc2e6464874..24ba1efaff4 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt
index e12b8a33668..de95e4b943e 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt
index 2d516e598c0..9a96197992f 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt
index 6048e785175..e6287e16af7 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt
index 5e824be2670..bf9129299a2 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt
index 8f413813a2f..204772d939f 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt
index d6523093010..cbc875f35e9 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt
index 2461ca986bf..0d86f949476 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt
index 53b2217e48e..2ec505001e6 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt
index b8cbae7dcae..0f6e69a63ac 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt
index aaf28e60e4c..a1c52bc602d 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt
index 42a979c0f34..5c749f76221 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt
index b1def8c2be6..d56b7dc7c93 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt
index e854b5cac6c..25d99a83130 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt
index 6bea192135b..3dbbcf25e98 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt
index 70bc65040c1..36c678088c6 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt
index 4affc611d31..995f7ee94c7 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt
index 69b0a6190aa..49cd9b214c4 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt
index 575b99bee2f..10923cbe630 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt
index cb68aa0fd14..ebc91808ccb 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt
index 9fec56f15b8..9cc71b83163 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt
index 2208a5908d8..fcbafe804de 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt
index 66a9491861f..9b5a1a2d9fe 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt
index f0d476ae604..8a080af0fe7 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt
index 2d23f2e6a60..dcd90d53185 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt
index 423b12ccc29..e250acf6d3e 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt
index b1a301b57ce..448a2d05920 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt
index a873a4fd3f6..91535effb91 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt
index d4143c4281d..09354d32f76 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt
index fcdf539b8b2..96bcc0d073a 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt
index 5998ed5aef7..c3557f37509 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt
index 8a5cb8d4cc4..05ff4ca503e 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/index.html b/Master/texmf-dist/doc/generic/knuth-hint/index.html
index 78b58c2d120..729f2c83c9b 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/index.html
+++ b/Master/texmf-dist/doc/generic/knuth-hint/index.html
@@ -301,6 +301,9 @@ href="tie/tie.hnt"><code>TIE</code></a>+<a
href="tie/tie-changes.hnt"><code>chg</code></a> <span>]</span></p></li>
<li><p><code>hitex/</code> <span>[</span> <a
href="hitex/hitex.hnt"><code>HiTeX</code></a> <span>]</span></p></li>
+<li><p><code>mp/</code> <span>[</span> <a
+href="mp/mp.hnt"><code>MP</code></a> <a
+href="mp/mpost.hnt"><code>MPOST</code></a> <span>]</span></p></li>
</ul>
<h2 id="errata-for-computers-typesetting-by-donald-e.-knuth">Errata for
“Computers &amp; Typesetting” by Donald E. Knuth</h2>
@@ -337,6 +340,6 @@ early 2014</a></p></li>
</ul></li>
</ul>
<h2 id="happy-cweb-programming">Happy C/WEB Programming!</h2>
-<p>2024-03-16 Andreas Scherer</p>
+<p>2024-07-09 Andreas Scherer</p>
</body>
</html>
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/index.pdf b/Master/texmf-dist/doc/generic/knuth-hint/index.pdf
index 63f7fe051d2..69a8c3e14d7 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/index.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-hint/index.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt
index 4417e9901cb..e6c956616d1 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt
index 1afd231b71e..c96e0613ff7 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt
index ce8cf0e61ee..3382522847f 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt
index 9acebf05e58..458affe998e 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt
index d7cf17f9d50..dcaba4f5161 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt
index ea1defaf64d..ffb63848324 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt
index b6f60cbaa12..1879e40b853 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt
index 437ba9fe60f..324740fd5dd 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt
index 1c2df72eec1..5e3e38dd722 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt
index 6b76611ecaa..7babd18f2a2 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt
index fb513a2a133..b70f1314abd 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hnt
new file mode 100644
index 00000000000..052014216f4
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hnt
new file mode 100644
index 00000000000..b9e969072dd
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt
index 057ed90238f..94a39fd26f8 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt
index d200c6c0738..ca6b0594926 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt
index 523add9b509..77950a826b5 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt
index a451e836d22..f3ca7c8ab8c 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt
index 95cdb945b3c..237e6a210ec 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt
index c4d4ba78908..39f8c4601c9 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt
index 382d09362d4..f086f5a9fc8 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt
index b1430e1d380..e407be00906 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt
index 3b43c58d951..1440f73a23f 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt
index e29767f7be6..666c4d4a289 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt
index 79b62fc2b78..7b1a87f1853 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt
index 14c5b76456f..4192d154c7f 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt
index f95932650d4..b3f89d8de4a 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt
index 45a15b24350..c8bf5c45b2c 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt
index 7ca0d271c78..f7e1e4d709a 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt
index 9d0a2a13459..e8c992161a1 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt
index f8e3a2194f0..4124eb55b78 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt
index 8599fd7c236..ae31e25182b 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt
index 1a71d835232..f9eb390cafb 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt
index f4f59ab19f3..88faa6ec97a 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt
index 6007c4f7592..3c63decdd87 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt
index 24c22cd3110..e44c9e2dc90 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt
index 2c5e9d43c88..04b16f22f86 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt
index 3bdfa2d76a2..ebfc9397a06 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt
index 26ff176658a..505d0643634 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt
index dcbfa4d184c..e75bbac2923 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt
index b95532ae38d..a7d0373095a 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt
index bd8987be5a3..633989f2369 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt
index 60273e2deca..7549cf9f8f4 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt
index 02b010539a8..eec4f9a535b 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt
+++ b/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf
index addc6ca074b..b9cbe8f8c79 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf
index 5c2a1baa052..5c47d2464c7 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/README.md b/Master/texmf-dist/doc/generic/knuth-pdf/README.md
index 05c4af5d83f..0ae94e0eb01 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/README.md
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/README.md
@@ -23,4 +23,4 @@ licenses of the presented software codes.
In part `knuth-pdf` is an update and replacement for the `latex-tds` package.
-This is version “2.2” of the `knuth-pdf` package — 2024-03-16, Andreas Scherer.
+This is version “2.4” of the `knuth-pdf` package — 2024-07-10, Andreas Scherer.
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf
index eb132c79697..51afb728285 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf
index 8f7b06ef65b..e925af9e095 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf
index cd3043bcf09..b5d24bfff0f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf
index 74d9de89210..c00112ba6a3 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf
index 4c8bab8fbef..8294d6721ab 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf
index 96d5beff59b..fe92cb15379 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf
index 4fe552304b7..3fa90674ff5 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf
index 5586b05baf9..2321c56c31f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf
index 34333c5509c..b4ec76b58b6 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf
index 1e5780a6244..0f78fcf762f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf
index 3fecb996d35..228381d60d4 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf
index d4b27fda3cd..b6f051dfed0 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf
index 5d3578c3336..a81f0164ed1 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf
index 06282bcbc04..1aed4d9b987 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf
index 919204b1483..42fe0976ebc 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf
index 7f6fb035b79..bff5092b2b0 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf
index daa449f4366..91e9da35708 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf
index 8706ec864ca..844cead11f7 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf
index 1a879bd82a3..d8235bb8b27 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf
index bf53a97e6a8..5d4601997bc 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf
index 107192205a7..56ee96c487c 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf
index 8567ea2dea1..cced6e62616 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf
index fad47d4c428..3b55012174b 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf
index 1c24b632d30..7c579e8629f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf
index 0cbfd71d50f..85c84182b37 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf
index e992c1533e6..2e787bc2e1f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf
index 93f2d1db946..2b220d18bf6 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf
index 36290940496..4cf60accb7f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf
index 2fb55e82f9d..780eef75646 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf
index 3d229cb1b86..7e67495e260 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf
index 9bcefb9f5d1..62e8779bb5a 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf
index 98b32e18215..7f42019be4a 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf
index 82a6ac09cbd..3a3d94965ca 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf
index 81941dc1f68..544bf76c1e0 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf
index b3abb29f28a..7b82c521de0 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/index.html b/Master/texmf-dist/doc/generic/knuth-pdf/index.html
index 6670304e645..2dc82d621bd 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/index.html
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/index.html
@@ -295,6 +295,9 @@ href="tie/tie.pdf"><code>TIE</code></a>+<a
href="tie/tie-changes.pdf"><code>chg</code></a> <span>]</span></p></li>
<li><p><code>hitex/</code> <span>[</span> <a
href="hitex/hitex.pdf"><code>HiTeX</code></a> <span>]</span></p></li>
+<li><p><code>mp/</code> <span>[</span> <a
+href="mp/mp.pdf"><code>MP</code></a> <a
+href="mp/mpost.pdf"><code>MPOST</code></a> <span>]</span></p></li>
</ul>
<h2 id="errata-for-computers-typesetting-by-donald-e.-knuth">Errata for
“Computers &amp; Typesetting” by Donald E. Knuth</h2>
@@ -331,6 +334,6 @@ early 2014</a></p></li>
</ul></li>
</ul>
<h2 id="happy-cweb-programming">Happy C/WEB Programming!</h2>
-<p>2024-03-16 Andreas Scherer</p>
+<p>2024-07-09 Andreas Scherer</p>
</body>
</html>
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf
index 0debc240090..cdad14512ee 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf
index 980465451f8..a16ecb16e3f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf
index a4981be56bb..1fd069cfcda 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf
index d6fa8cde57e..b97414ec234 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf
index a42e872a813..8d300e9b3a4 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf
index 6ec2f1b39e5..b3b2dbc463f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf
index d31608e082b..cfa20619710 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf
index 658de054d5c..358babf99e6 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf
index 3044a6dfd61..bd3a31448cc 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf
index 946e7d93d32..99c425e27ea 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf
index 2787bde5edd..741f1d3b41e 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf
index bfb53791aee..456b4352190 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdf
new file mode 100644
index 00000000000..8db59988efc
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdf
new file mode 100644
index 00000000000..7dc8cc7838e
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf
index 175b9d3825a..059c71b9f16 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf
index cb23c2abdcf..d5e6a7de1a6 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf
index c0ac24a5bc7..9b24696e4e1 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf
index 32cdc74562a..b4aa6ebad87 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf
index fdd897165f8..0874fc69eae 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf
index 7246a18bc2f..7898be14054 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf
index b7422ecf9ef..86078c7dee9 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf
index fd70bc33c49..9d3e2822216 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf
index 941a3ff409c..e0d8340ff45 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf
index a77fbf388b7..42bf275b728 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf
index 742cd78b22f..d698e786296 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf
index 5047b9f720c..f4e81bf4d63 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf
index e82e47aea10..3068cc9edc8 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf
index 70bd03683ed..ac9f4eaa928 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf
index 0119a3b71b2..fbcedb9bde7 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf
index 610eb15cf62..a8a3cfc2d2a 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf
index 79b906d3bfe..6528a5c5b3f 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf
index dfc083ae720..3ca3b977e71 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf
index 1a3c866638c..922d39d91a7 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf
index 9c4e5df12ad..d2d46a32041 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf
index d46b9521dc7..9b0c58f22c1 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf
index 067b684a1a8..980ce9472c6 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf
index 8e8b95ef63a..563d5788f5a 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf
index 641ee72547e..db3830b5443 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf
index dac870d44d5..6f9ad6d8124 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf
index 27741dac9b1..0e6a77f36ca 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf
index 80d61da453e..e360148f2d8 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf
index 3d97d108ffe..85ee36841f7 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf
index 3095ba9b798..ce2315c2ae3 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf
index de6d6c1ecb3..eda4824bd9b 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf
index 02504c7faa0..32dd78f0502 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf
index f351e2931de..9ad6e9d383e 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/CHANGES.md b/Master/texmf-dist/doc/generic/lt3luabridge/CHANGES.md
new file mode 100644
index 00000000000..470ad7441dc
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/lt3luabridge/CHANGES.md
@@ -0,0 +1,74 @@
+# Changes
+
+## 2.2.0 (2024-07-03)
+
+Development:
+
+- Automatically determine value of `\c_luabridge_default_output_dirname_str`
+ based on the current output directory.
+ (witiko/markdown#457, #26, #27, reported by @hongy19)
+
+Continuous Integration:
+
+- Automatically test the library on both Linux and Windows.
+
+## 2.1.0 (2024-02-14)
+
+Development:
+
+- Define function `\luabridge_tl_set:Nn`.
+
+## 2.0.2 (2022-10-24)
+
+Fixes:
+
+- Fix tokenization in error-reporting code. (#17, #19)
+- Catch compilation errors in TeX engines other than LuaTeX. (#18, #20)
+
+Refactoring:
+
+- Remove useless uses of `\l_tmpb_tl`. (24e116d)
+
+## 2.0.1 (2022-08-16)
+
+Fixes:
+
+- Apply proper error handling when executing Lua via shell escape. (#15)
+
+## 2.0.0 (2022-08-08)
+
+Breaking Changes:
+
+- Use `\sys_get_shell:nnNTF` from l3sys instead of `\immediate\write18` and
+ `os.execute()`. (#13)
+ - Merges `\c_luabridge_method_write_eighteen_int` and
+ `\c_luabridge_method_os_execute_int` into
+ `\c_luabridge_method_shell_int`.
+ - Removes `\g_luabridge_standard_output_filename_str` and
+ `\c_luabridge_default_standard_output_filename_str`.
+
+Fixes:
+
+- Execute chunks that end with `end` or a Lua comment. (#11, #14)
+- Sandbox direct Lua access. (#11, #14)
+- Make nested calls defined behavior. (#8, #13)
+
+Refactoring:
+
+- Remove needless whitespaces in Lua code.
+- Replace (plain) TeX primitives with `\iow_*` l3file functions. (#1, #3,
+ latex3/latex3#1105, latex3/latex3#1114. latex3/latex3#1117)
+ - Many thanks to @josephwright, @u-fischer, and @FrankMittelbach at
+ latex3/latex3#1114, and Hans Hagen, @hmenke, and @mojca at
+ [dev-context][1] for helping to make l3file compatible with ConTeXt MkII.
+
+ [1]: https://mailman.ntg.nl/pipermail/dev-context/2022/003912.html
+ (A robust way of detecting ConTeXt from LaTeX3)
+
+## 1.0.1 (2022-06-27)
+
+This release includes PDF documentation of lt3luabridge.
+
+## 1.0.0 (2022-06-26)
+
+Initial release
diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/README.md b/Master/texmf-dist/doc/generic/lt3luabridge/README.md
index a9257f4e09d..2a8f4e5125f 100644
--- a/Master/texmf-dist/doc/generic/lt3luabridge/README.md
+++ b/Master/texmf-dist/doc/generic/lt3luabridge/README.md
@@ -23,3 +23,8 @@ available as a separate package.
[2]: https://www.ctan.org/pkg/markdown
[3]: https://github.com/witiko/markdown/pull/141
[4]: https://github.com/Witiko/lt3luabridge/actions
+
+## Additional information
+
+- Author: Vít Starý Novotný <witiko@mail.muni.cz>
+- License: LaTeX Project Public License (LPPL) 1.3c
diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg b/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg
index e562506f72c..7298ba5794e 100644
--- a/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg
+++ b/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg
@@ -1,6 +1,6 @@
\preamble
-Copyright (C) 2016-2024 Vít Novotný
+Copyright (C) 2016-2024 Vít Starý Novotný
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf b/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf
index 2972fad79fa..6370f4dbccc 100644
--- a/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf
+++ b/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/markdown/CHANGES.md b/Master/texmf-dist/doc/generic/markdown/CHANGES.md
index 550989a936f..922aadff91c 100644
--- a/Master/texmf-dist/doc/generic/markdown/CHANGES.md
+++ b/Master/texmf-dist/doc/generic/markdown/CHANGES.md
@@ -1,5 +1,34 @@
# Changes
+## 3.6.2 (2024-07-14)
+
+Fixes:
+
+- Fix the interplay between inline notes and square brackets.
+ (#453, #456, reported by @nopria, contributed by @lostenderman)
+- Fix the interplay between lists and citations.
+ (witiko/expltools#3, #460, #461, contributed by @lostenderman)
+- Do not override the `outputDir` option if if has been defined
+ before loading the package and pass it to lt3luabridge library.
+ (#457, #459)
+
+Documentation:
+
+- Fix various typos. (#454, contributed by @mbertucci47)
+- Add file `DEPENDS.txt`. (#462, #463, 93bb7e18)
+
+Continuous Integration:
+
+- Only test latest TeX Live in pull requests. (81927ca1)
+
+Unit Tests:
+
+- Test the `outputDir` plain TeX option. (#457, #459)
+
+Libraries:
+
+- Update `tinyyaml` to v0.4.4-1-g197632c. (1e83ac94)
+
## 3.6.1 (2024-06-20)
Fixes:
@@ -704,7 +733,7 @@ Development:
- Add support for strike-throughs, fenced divs, subscripts, superscripts,
and fancy lists. (#149, #160, #162, #168, #170)
-- Add facade in front of expl3 inferface for YAML metadata. (#118, #175)
+- Add facade in front of expl3 interface for YAML metadata. (#118, #175)
- Add `\setupmarkdown` and `\inputmarkdown` commands to ConTeXt. (#17, #176)
Fixes:
@@ -784,7 +813,7 @@ Docker:
Documentation:
-- Remove disfunctional badges for Docker from `README.md`. (ad00b58, 707cad9)
+- Remove dysfunctional badges for Docker from `README.md`. (ad00b58, 707cad9)
- Link to TUG's version of the TUG 2021 video in `README.md`. (1462411)
Miscellaneous:
@@ -1045,7 +1074,7 @@ Fixes:
Fixes:
- String text and parenthetical citations. (e6026c1)
-- Escape autolink labels even when hybrid mode is enabled. (repored by @iwelch,
+- Escape autolink labels even when hybrid mode is enabled. (reported by @iwelch,
693e134)
- Protect LaTeX strong emphasis renderer prototype and make it detect font.
(reported by @iwelch, 89a031a)
diff --git a/Master/texmf-dist/doc/generic/markdown/README.md b/Master/texmf-dist/doc/generic/markdown/README.md
index 1aaa42ed9ee..2a02ee9736e 100644
--- a/Master/texmf-dist/doc/generic/markdown/README.md
+++ b/Master/texmf-dist/doc/generic/markdown/README.md
@@ -18,7 +18,7 @@ Markdown
The Markdown package converts [CommonMark][] markup to TeX commands. The
functionality is provided both as a Lua module, and as plain TeX, LaTeX, and
ConTeXt macro packages that can be used to directly typeset TeX documents
-containing markdown markup. Unlike other convertors, the Markdown package does
+containing markdown markup. Unlike other converters, the Markdown package does
not require any external programs, and makes it easy to redefine how each and
every markdown element is rendered. Creative abuse of the markdown syntax is
encouraged. 😉
diff --git a/Master/texmf-dist/doc/generic/markdown/VERSION b/Master/texmf-dist/doc/generic/markdown/VERSION
index e15dd6a469c..c2b2c7e0ab9 100644
--- a/Master/texmf-dist/doc/generic/markdown/VERSION
+++ b/Master/texmf-dist/doc/generic/markdown/VERSION
@@ -1 +1 @@
-3.6.1-0-g5a45a922 (2024-06-20)
+3.6.2-0-g6c30af7e (2024-07-14)
diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.html b/Master/texmf-dist/doc/generic/markdown/markdown.html
index f16477d9488..81e62b20443 100644
--- a/Master/texmf-dist/doc/generic/markdown/markdown.html
+++ b/Master/texmf-dist/doc/generic/markdown/markdown.html
@@ -4,7 +4,7 @@
<meta charset="utf-8" />
<meta name="generator" content="pandoc" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
- <meta name="author" content="Vít Starý Novotný" />
+ <meta name="author" content="Vít Starý Novotný, Andrej Genčur" />
<title>Markdown Package User Manual</title>
<style>
code{white-space: pre-wrap;}
@@ -92,8 +92,8 @@
<body>
<header id="title-block-header">
<h1 class="title">Markdown Package User Manual</h1>
-<p class="author">Vít Starý Novotný</p>
-<p class="date">3.6.1-0-g5a45a922 2024-06-20</p>
+<p class="author">Vít Starý Novotný, Andrej Genčur</p>
+<p class="date">3.6.2-0-g6c30af7e 2024-07-14</p>
</header>
<nav id="TOC" role="doc-toc">
<ul>
@@ -191,7 +191,7 @@ class="tex">T<sub>e</sub>X</span>, <span
class="latex">L<sup>a</sup>T<sub>e</sub>X</span>, and Con<span
class="tex">T<sub>e</sub>X</span>t macro packages that can be used to
directly typeset <span class="tex">T<sub>e</sub>X</span> documents
-containing markdown markup. Unlike other convertors, the Markdown
+containing markdown markup. Unlike other converters, the Markdown
package does not require any external programs, and makes it easy to
redefine how each and every markdown element is rendered. Creative abuse
of the markdown syntax is encouraged. <i class="em em-wink"></i></p>
@@ -227,10 +227,10 @@ class="tex">T<sub>e</sub>X</span> distribution, you will need to install
it.</p>
<p>From <a href="https://github.com/witiko/markdown/releases"
title="Releases - witiko/markdown">Releases</a>, download <a
-href="https://github.com/witiko/markdown/releases/download/3.6.1/markdown.zip"
-title="Release 3.6.1 - witiko/markdown">an archive
+href="https://github.com/witiko/markdown/releases/download/3.6.2/markdown.zip"
+title="Release 3.6.2 - witiko/markdown">an archive
<code>markdown.zip</code> for this version of the Markdown package
-(3.6.1)</a> or a different version that you wish to install. Then, unzip
+(3.6.2)</a> or a different version that you wish to install. Then, unzip
the archive. If you downloaded an archive for a different version of the
Markdown package, you should now locate a file named
<code>markdown.html</code> with the user manual for that version, open
@@ -4720,7 +4720,7 @@ markdown markup freely.</p>
<dd>
<p>Enable the escaping of special plain <span
class="tex">T<sub>e</sub>X</span> characters outside verbatim
-environments, so that they are not interpretted by <span
+environments, so that they are not interpreted by <span
class="tex">T<sub>e</sub>X</span>. This is encouraged when typesetting
automatically generated content or markdown documents that were not
prepared with this package in mind.</p>
@@ -8288,7 +8288,7 @@ options directly from <span
class="latex">L<sup>a</sup>T<sub>e</sub>X</span>. For example, to set
the <code>\markdownOptionInputTempFileName</code> plain <span
class="tex">T<sub>e</sub>X</span> option to
-<code>helper-script.lua</code>, we would inclde the following code in
+<code>helper-script.lua</code>, we would include the following code in
our <span class="latex">L<sup>a</sup>T<sub>e</sub>X</span> document:</p>
<div class="sourceCode" id="cb477"><pre
class="sourceCode tex"><code class="sourceCode latex"><span id="cb477-1"><a href="#cb477-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\markdownSetup</span>{</span>
@@ -9077,12 +9077,12 @@ contain the following text:</p>
class="header-section-number">2.3.1.6</span> Code Block Renderers</h4>
<p>The <code>\markdownRendererInputVerbatim</code> macro represents a
code block. The macro receives a single argument that corresponds to the
-filename of a file contaning the code block contents.</p>
+filename of a file containing the code block contents.</p>
<p>The <code>\markdownRendererInputFencedCode</code> macro represents a
fenced code block. This macro will only be produced, when the
<strong><code>fencedCode</code></strong> option is enabled. The macro
receives three arguments that correspond to the filename of a file
-contaning the code block contents, the fully escaped code fence
+containing the code block contents, the fully escaped code fence
infostring that can be directly typeset, and the raw code fence
infostring that can be used outside typesetting.</p>
<h5 class="unnumbered" id="latex-example-62"><span
@@ -9841,7 +9841,7 @@ nutrient-rich, and produced on an industrial scale.</p>
<h4 data-number="2.3.1.11" id="ellipsis-renderer"><span
class="header-section-number">2.3.1.11</span> Ellipsis Renderer</h4>
<p>The <code>\markdownRendererEllipsis</code> macro replaces any
-occurance of ASCII ellipses in the input text. This macro will only be
+occurrence of ASCII ellipses in the input text. This macro will only be
produced, when the <strong><code>smartEllipses</code></strong> option is
enabled. The macro receives no arguments.</p>
<h5 class="unnumbered" id="plain-tex-example-30">Plain <span
@@ -11581,14 +11581,14 @@ item).</p>
class="header-section-number">2.3.1.31</span> Raw Content Renderers</h4>
<p>The <code>\markdownRendererInputRawInline</code> macro represents an
inline raw span. The macro receives two arguments: the filename of a
-file contaning the inline raw span contents and the raw attribute that
+file containing the inline raw span contents and the raw attribute that
designates the format of the inline raw span. This macro will only be
produced, when the <strong><code>rawAttribute</code></strong> option is
enabled.</p>
<p>The <code>\markdownRendererInputRawBlock</code> macro represents a
raw block. The macro receives two arguments: the filename of a file
-contaning the raw block and the raw attribute that designates the format
-of the raw block. This macro will only be produced, when the
+containing the raw block and the raw attribute that designates the
+format of the raw block. This macro will only be produced, when the
<strong><code>rawAttribute</code></strong> and
<strong><code>fencedCode</code></strong> options are enabled.</p>
<h5 class="unnumbered" id="latex-example-89"><span
@@ -12140,7 +12140,7 @@ class="sourceCode tex"><code class="sourceCode latex"><span id="cb646-1"><a href
<span id="cb646-35"><a href="#cb646-35" aria-hidden="true" tabindex="-1"></a><span class="fu">\markdownSetup</span>{</span>
<span id="cb646-36"><a href="#cb646-36" aria-hidden="true" tabindex="-1"></a> renderers = {</span>
<span id="cb646-37"><a href="#cb646-37" aria-hidden="true" tabindex="-1"></a> table = {<span class="co">%</span></span>
-<span id="cb646-38"><a href="#cb646-38" aria-hidden="true" tabindex="-1"></a> This is a table with caption <span class="fu">\emph</span>{#1} that is #3 colums wide</span>
+<span id="cb646-38"><a href="#cb646-38" aria-hidden="true" tabindex="-1"></a> This is a table with caption <span class="fu">\emph</span>{#1} that is #3 columns wide</span>
<span id="cb646-39"><a href="#cb646-39" aria-hidden="true" tabindex="-1"></a> and #2 rows long.</span>
<span id="cb646-40"><a href="#cb646-40" aria-hidden="true" tabindex="-1"></a> <span class="fu">\rowCounter</span>=0<span class="co">%</span></span>
<span id="cb646-41"><a href="#cb646-41" aria-hidden="true" tabindex="-1"></a> <span class="fu">\def\rowTotal</span>{#2}<span class="co">%</span></span>
@@ -12167,18 +12167,19 @@ class="sourceCode sh"><code class="sourceCode bash"><span id="cb647-1"><a href="
contain the following text:</p>
<blockquote>
<p>This is a table with caption <em>Demonstration of pipe table
-syntax</em> that is 4 colums wide and 4 rows long. As for the alignment,
-column number 1 is right-aligned, column number 2 is left-aligned,
-column number 3 has default alignment, and column number 4 is centered.
-In row 1, column number 1 says <em>Right</em>, column number 2 says
-<em>Left</em>, column number 3 says <em>Default</em>, and column number
-4 says <em>Center</em>. In row 2, column number 1 says <em>12</em>,
-column number 2 says <em>12</em>, column number 3 says <em>12</em>, and
-column number 4 says <em>12</em>. In row 3, column number 1 says
-<em>123</em>, column number 2 says <em>123</em>, column number 3 says
-<em>123</em>, and column number 4 says <em>123</em>. In row 4, column
-number 1 says <em>1</em>, column number 2 says <em>1</em>, column number
-3 says <em>1</em>, and column number 4 says <em>1</em>.</p>
+syntax</em> that is 4 columns wide and 4 rows long. As for the
+alignment, column number 1 is right-aligned, column number 2 is
+left-aligned, column number 3 has default alignment, and column number 4
+is centered. In row 1, column number 1 says <em>Right</em>, column
+number 2 says <em>Left</em>, column number 3 says <em>Default</em>, and
+column number 4 says <em>Center</em>. In row 2, column number 1 says
+<em>12</em>, column number 2 says <em>12</em>, column number 3 says
+<em>12</em>, and column number 4 says <em>12</em>. In row 3, column
+number 1 says <em>123</em>, column number 2 says <em>123</em>, column
+number 3 says <em>123</em>, and column number 4 says <em>123</em>. In
+row 4, column number 1 says <em>1</em>, column number 2 says <em>1</em>,
+column number 3 says <em>1</em>, and column number 4 says
+<em>1</em>.</p>
</blockquote>
<h4 data-number="2.3.1.40" id="tex-math-renderers"><span
class="header-section-number">2.3.1.40</span> <span
diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.pdf b/Master/texmf-dist/doc/generic/markdown/markdown.pdf
index 40adf14658a..3787cdbe80a 100644
--- a/Master/texmf-dist/doc/generic/markdown/markdown.pdf
+++ b/Master/texmf-dist/doc/generic/markdown/markdown.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/Changes b/Master/texmf-dist/doc/generic/pst-diffraction/Changes
index 9f4fe42b2ba..d40c814ac75 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/Changes
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/Changes
@@ -1,4 +1,7 @@
pst-diffraction.tex --------
+2.06a 2024-07-15 - small fix in the documentation
+2.06 2024-07-10 - fix for missing contrast option for \psdiffractionCircular (Keno Wehr)
+2.05 2024-07-10 - removed unused optional argument gamma
2.04a 2024-06-29 - bugfix for the documentation header
- removed german and french docs
2.04 2010-01-05 - fix bug with missing \space for keywords
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/README b/Master/texmf-dist/doc/generic/pst-diffraction/README
index 86d7c0bb597..3d95ca6feb4 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/README
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/README
@@ -1,7 +1,7 @@
%% Package `pst-diffraction.tex'
%%
-%% Manuel Luque (ml _at_ pstricks.de) (France)
-%% Herbert Voss (hv _at_ pstricks.de) (Germany)
+%% Manuel Luque (France)
+%% Herbert Voss (hvoss _at_ tug.org) (Germany)
%%
%% 2024-06-29
%%
@@ -19,24 +19,14 @@ Save the files
pst-diffraction.sty
pst-diffraction.tex
-pst-diffraction.pro
in any place, where latex or any other TeX program will find it.
-The pro file should go into $TEXMF$/dvips/pstricks/.
-
-pst-diffraction uses the extended version of the keyval package. So
-be sure that you
-- have installed xkeyval with the special pst-xkey
- (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
-- do not load another package after pst-diffraction, which loads
- the old keyval.sty or pst-key.tex
You can run the documentation with
-make DE
-make E
-make FR
-or for all make all ;-) this will take a lot of time, because
+make
+
+or for all make all ;-) this may take some time, because
the images are very big.
If you like to get the documentation file in another format run
@@ -50,8 +40,7 @@ to get a PostScript file. But pay attention, that the pst-diffraction
files are saved in the above mentioned way, before you run
latex on the documentation file.
-The intermediate DVI file works only with viewers which can
-interprete the embedded PostScript code.
+Running the files with lualatex is possible, but may take a lot of
+time in fact of the heavy calculations.
-For another PDF output read the introduction from
-the documentation.
+hvoss@tug.org
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
index 737b6dbba99..0d2ecefe777 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
@@ -1,45 +1,105 @@
-@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
+@STRING{tugboat = {TUGboat} }
+@STRING{dtk = {Die {\TeX}nische Komödie} }
+@STRING{bretter = {Bretter, die die Welt bedeuten } }
+
+@Book{companion,
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Voß},
+ title = {The {\LaTeX} Graphics Companion},
+ publisher = {Lehmanns Media},
+ edition = {2},
+ date = {2022},
+ location = {Berlin},
+ note={Preprint of the english version, 2nd edition}
+}
+
+@Article{girou:01:,
+ author = {Denis Girou},
+ title = {Présentation de PSTricks},
+ journal = {Cahier {GUT}enberg},
+ year = 1994,
+ volume = {16},
+ month = apr,
+ pages = {21-70}
+}
+
+@Article{girou:02:,
+ author = {Timothy Van Zandt and Denis Girou},
+ title = {Inside {PST}ricks},
+ journal = TUGboat,
+ year = 1994,
+ volume = {15},
+ month = sep,
+ pages = {239-246}
+}
@Book{PostScript,
Author = {Kollock, Nikolai G.},
- Title = {PostScript richtig eingesetzt: vom Konzept zum
- praktischen Einsatz},
+ Title = {PostScript richtig eingesetzt: vom Konzept zum praktischen Einsatz},
Publisher = {IWT},
Address = {Vaterstetten},
year = 1989,
}
-@Manual{pstricks,
- Title = {PSTricks - {\PS} macros for Generic TeX},
- Author = {Timothy Van Zandt},
- Organization = {},
- Address = {\url{http://www.tug.org/application/PSTricks}},
- Note = {},
- year = 1993,
+@ctan{multido,
+title = {The Multido package},
+subtitle = {A loop facility for Generic TeX},
+author = {Van Zandt, Timothy and Voß, Herbert and Niepraschk, Rolf},
+url = {macros/latex/multido},
+urldate = {2018-09-01},
+version = {1.42}
}
-@Manual{pdftricks,
- Title = {PSTricks Support for pdf},
- Author = {Herbert Voss},
- Organization = {},
- Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
- Note = {},
- year = 2002,
+@Book{PSTricks2,
+ author = {Herbert Voß},
+ title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+ edition = {7},
+ publisher = {DANTE {\eV} and Lehmanns Media},
+ date = {2016},
+ address = {Heidelberg and Hamburg}
}
-@Manual{miwi,
- Title = {References for \TeX{} and Friends},
- Author = {Michael Wiedmann and Peter Karp},
- Organization = {},
- Address = {\url{http://www.miwie.org/tex-refs/}},
- Note = {},
- year = 2003,
+@Book{PSTricksE,
+ author = {Herbert Voß},
+ title = {\texttt{PSTricks} -- Graphics and PostScript for \LaTeX},
+ edition = {1},
+ publisher = {UIT},
+ date = {2011},
+ address = {Cambridge -- UK}
+}
+
+@Book{LTXquick,
+ author = {Herbert Voß},
+ title = {{\LaTeX} quick reference},
+ edition = {1},
+ publisher = {UIT},
+ year = {2012},
+ address = {Cambridge -- UK}
+}
+
+@Book{presentations,
+ author = {Herbert Voß},
+ title = {Presentations with \LaTeX},
+ edition = {2},
+ publisher = {DANTE {\eV} and Lehmanns Media},
+ year = {2019},
+ address = {Heidelberg and Berlin}
}
+@Book{tbt,
+ author = {Victor Eijkhout},
+ title = {\TeX\ by Topic -- {A} \TeX{}nician Reference},
+ edition = {1},
+ publisher = {DANTE {\eV} and Lehmanns Media},
+ year = {2014},
+ address = {Heidelberg and Berlin}
+}
+
+
+
@Article{dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
+ author = {Herbert Voß},
title = {Die mathematischen {F}unktionen von {P}ostscript},
journal = dtk,
year = 2002,
@@ -49,7 +109,6 @@
month = mar,
pages = {40-47},
annote = bretter,
- keywords = {},
abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
darum geht zu beurteilen, was es denn nun im eigentlichen
@@ -61,31 +120,30 @@
gezeigt. }
}
-@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
- title = {The {\LaTeX} {G}raphics {C}ompanion},
- publisher = {{Addison-Wesley Publishing Company}},
- edition = 2,
- year = {2007},
- address = {Reading, Mass.}
+
+@Book{PostScript,
+ Author = {Kollock, Nikolai G.},
+ Title = {PostScript richtig eingesetzt: vom Konzept zum
+ praktischen Einsatz},
+ Publisher = {IWT},
+ Address = {Vaterstetten},
+ year = 1989,
}
-@Book{PSTricks2,
- author = {Herbert Vo\ss},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {4.},
- publisher = {DANTE -- Lehmanns},
- year = {2007},
- address = {Heidelberg/Hamburg}
+@online{pstricks,
+ Title = {PSTricks - {\PS} macros for Generic TeX},
+ Author = {Timothy Van Zandt},
+ Organization = {},
+ url = {http://www.tug.org/application/PSTricks},
+ year = 1993,
}
-@Book{LaTeXRef,
- author = {Herbert Vo\ss},
- title = {\LaTeX\ Referenz},
- edition = {1.},
- publisher = {DANTE -- Lehmanns},
- year = {2007},
- address = {Heidelberg/Hamburg}
+
+@online{pdftricks,
+ Title = {PSTricks Support for pdf},
+ Author = {Herbert Voß},
+ url = {http://PSTricks.de/pdf/pdfoutput.phtml},
+ year = 2002,
}
@Book{diffraction,
@@ -107,12 +165,11 @@
publisher = {Society of {P}hoto {O}ptical}
}
-@Manual{Fresnel,
+@online{Fresnel,
Title = {Augustin Fresnel},
Author = {Manuel Luque},
Organization = {},
- Address = {\url{http://melusine.eu.org/syracuse/mluque/fresnel/augustin/fresnel.html}},
- Note = {},
+ url = {http://melusine.eu.org/syracuse/mluque/fresnel/augustin/fresnel.html},
year = 2004
}
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf
index 33256a5b76f..d6e0b803aca 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex
index f38f06f02e3..382907d86cc 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex
@@ -1,13 +1,16 @@
%% $Id: pst-diffraction-docE.tex 134 2009-09-27 12:28:50Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
- headexclude,footexclude,oneside]{pst-doc}
-\usepackage{pst-grad,pst-diffraction}
-\let\pstDiffractionFV\fileversion
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+ headinclude=false,footinclude=false,twoside,english]{pst-doc}
-\usepackage{libertinus}
+%\usepackage{libertinus}
\usepackage{biblatex}
\addbibresource{pst-diffraction-doc.bib}
+\usepackage{xurl,pst-grad,pst-diffraction}
+\let\pstDiffractionFV\fileversion
+
+
+
\lstset{pos=t,wide=true,language=PSTricks,
morekeywords={psdiffractionRectangle,psdiffractionCircle,psdiffractionCircular},basicstyle=\footnotesize\ttfamily}
\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
@@ -16,6 +19,15 @@
frame=single}
\newcommand*\psp{\texttt{pspicture}\xspace}
%
+
+\renewcommand\bgImage{%
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[f=10,showFunc=true]
+\end{pspicture}
+}
+
+\def\eV{e.\kern-1pt{}V\kern-1pt}
+
\begin{document}
\title{\texttt{pst-diffraction}}
@@ -24,21 +36,18 @@ apertures; v.\pstDiffractionFV}
\author{Manuel Luque \\ Herbert Vo\ss}
\docauthor{Herbert Voß}
\date{\today}
-\maketitle
+%\maketitle
+\settitle
\tableofcontents
-
-\clearpage
-
-\begin{abstract}
-\noindent
+\psset{unit=1cm}
\vfill\noindent
Thanks to: Julien Cubizolles,
Doris Wagner,
Timothy Van Zandt, Keno Wehr,
Michael Zedler.
-\end{abstract}
+
\section{Optical setup}
@@ -136,7 +145,7 @@ By default the settings are as follows:
\begin{tabular}{@{}lll@{}}
\Lkeyword{a}=0.2e-3 in m; & \Lkeyword{k}=1; & \Lkeyword{f}=5 in m;\\
-\Lkeyword{lambda}=650 in nm; & \Lkeyword{pixel}=0.5; & \Lkeyword{contrast}=38, greates value;\\
+\Lkeyword{lambda}=650 in nm; & \Lkeyword{pixel}=0.5; & \Lkeyword{contrast}=38, greatest value;\\
\Lkeyword{colorMode}=3; & \Lkeyword{IIID}=\false.
\end{tabular}
@@ -156,7 +165,7 @@ By default the settings are as follows:
\end{pspicture}
\hfill
\begin{pspicture}(-1.5,-2.5)(3.5,3.5)
-\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]% for Alpha see package pst-3dplot
\end{pspicture}
\end{lstlisting}
@@ -200,6 +209,7 @@ By default the settings are as follows:
\hfill
\begin{pspicture}(-1.5,-2)(3.5,3)
\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+% % for Alpha see package pst-3dplot
\end{pspicture}
\end{lstlisting}
@@ -211,6 +221,7 @@ By default the settings are as follows:
\hfill
\begin{pspicture}(-3.5,-1)(3.5,4)
\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+% % for Alpha see package pst-3dplot
\end{pspicture}
\begin{lstlisting}[style=example]
@@ -220,6 +231,7 @@ By default the settings are as follows:
\hfill
\begin{pspicture}(-3.5,-1)(3.5,4)
\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+% % for Alpha see package pst-3dplot
\end{pspicture}
\end{lstlisting}
@@ -230,7 +242,7 @@ It is also possible to render the diffraction pattern of two congruent rectangle
by using the option \Lkeyword{twoSlit}.
By default this option is deactivated.
The distance of the two rectangles is specified by the option $s$.
-The default for $s$ is $12e^{-3}\,\mathrm{m}$.
+The default for $s$ is $12\cdot10^{-3}\,\mathrm{m}$.
\begin{center}
@@ -249,12 +261,14 @@ The default for $s$ is $12e^{-3}\,\mathrm{m}$.
\begin{center}
\begin{pspicture}(-2,-1)(4,4)
\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+% % for Alpha see package pst-3dplot
\end{pspicture}
\end{center}
\begin{lstlisting}[pos=t,style=example,wide=false]
\begin{pspicture}(-2,-1)(4,4)
\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+% % for Alpha see package pst-3dplot
\end{pspicture}
\end{lstlisting}
@@ -271,9 +285,9 @@ cropped if its height exceeds the margin of the environment \Lenv{pspicture*}).
\hspace*{-1cm}%
\begin{LTXexample}[pos=t,style=example,wide=false]
-\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\begin{pspicture*}(-3.5,-3.5)(3.5,3.5)
\psdiffractionCircular[r=0.5e-3,f=10,pixel=0.5,lambda=520]
-\end{pspicture}
+\end{pspicture*}
%
\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
\psdiffractionCircular[IIID,r=0.5e-3,f=10,pixel=0.5,lambda=520]
@@ -281,6 +295,20 @@ cropped if its height exceeds the margin of the environment \Lenv{pspicture*}).
\end{LTXexample}
+\begin{LTXexample}[pos=t,style=example,wide=false]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[f=10]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[f=10,showFunc=true]
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Diffraction from two circular apertures}
Only the case of equal radii is provided, this common radius can be defined like in the
@@ -291,7 +319,7 @@ Furthermore one has to give the half distance of the circles measured from their
The rendering process could take some time in this case\dots
-\begin{pspicture}(-3,-3.5)(3.5,3.5)
+\begin{pspicture}(-3.5,-3.5)(4,3.5)
\psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
\end{pspicture}
%
@@ -312,7 +340,7 @@ The rendering process could take some time in this case\dots
\hspace*{-1cm}%
-\begin{pspicture}(-3,-3)(3.5,4)
+\begin{pspicture}(-4,-3)(4,4)
\psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
\end{pspicture}
%
@@ -336,21 +364,22 @@ or $d=\frac{2r}{1.22}$ (see
\url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}).
\hspace*{-1cm}%
-\begin{pspicture}(-3,-3.5)(3,3.5)
+\begin{pspicture}(-4,-3.5)(3,4.5)
\psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
\end{pspicture}
%
-\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\begin{pspicture}(-5,-2)(3.5,3)
\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
\end{pspicture}
+\bigskip
\begin{lstlisting}[style=example]
\begin{pspicture}(-3,-3.5)(3,3.5)
\psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
\end{pspicture}
%
-\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\begin{pspicture}(-5,-1.5)(3.5,3)
\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
\end{pspicture}
\end{lstlisting}
@@ -377,7 +406,7 @@ option \Lkeyword{colorMode}=0.
\makebox[\linewidth]{%
\begin{pspicture}(-3,-3)(3,2.5)
-\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
+\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=18]
\end{pspicture}
\quad
\begin{pspicture}(-3,-3)(3,2.5)
@@ -391,7 +420,7 @@ option \Lkeyword{colorMode}=0.
\begin{lstlisting}[style=example]
\begin{pspicture}(-3,-3)(3,2.5)
-\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
+\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=18]
\end{pspicture}
\quad
\begin{pspicture}(-3,-3)(3,2.5)
@@ -433,9 +462,8 @@ option \Lkeyword{colorMode}=0.
-\clearpage
-\section{List of all optional arguments for \texttt{pst-diff}}
-\Loption{pst-diff} is the short form for the keywords in the package \LPack{pst-diffraction}.
+\section{List of all optional arguments for \texttt{pst-diffraction}}
+%\Loption{pst-diff} is the short form for the keywords in the package \LPack{pst-diffraction}.
\xkvview{family=pst-diff,columns={key,type,default}}
@@ -444,7 +472,6 @@ option \Lkeyword{colorMode}=0.
\raggedright
\nocite{*}
\printbibliography
-%\bibliography{pst-diffraction-doc}
\printindex
diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes
index cac34e69124..6ef6294b360 100644
--- a/Master/texmf-dist/doc/generic/pst-node/Changes
+++ b/Master/texmf-dist/doc/generic/pst-node/Changes
@@ -1,5 +1,7 @@
----- pst-node.tex
-1.43 2021-09-15 - fix for lualatex and empty value in \psk@nrot
+1.45 2024-07-10 - fix \algparnode (Erich Schmidt)
+1.44 2024-07-04 - modified \psparnode and \algparnode (Erich Schmidt)
+1.43 2022-10-31 - fix for lualatex and empty value in \psk@nrot
1.42a 2020-04-01 - fix typo in the documentation
1.42 2019-03-03 - bugfix for \rnode inside \psframebox*
1.41 2017-12-30 - added \psnpolygon
@@ -56,12 +58,14 @@
----- pst-node.sty
+1.02 2024-07-10 - update package versions (hv)
1.01 2012-09-18 - update package versions (hv)
1.00 2011-06-05 - make ancient variant 97 available (hv)
2008-12-12 first version (hv)
----- pst-node.pro
+1.15a 2024-07-10 - typos
1.15 2014-01-27 - comment out empty lines
1.14 2012-09-18 - add subroutines for global dict
1.13 2011-11-21 - fix bug for xelatex and scaling
diff --git a/Master/texmf-dist/doc/generic/pst-node/README b/Master/texmf-dist/doc/generic/pst-node/README
index 3f4fd08e595..29b62ef30c4 100644
--- a/Master/texmf-dist/doc/generic/pst-node/README
+++ b/Master/texmf-dist/doc/generic/pst-node/README
@@ -1,13 +1,10 @@
-This version of pst-node uses the xkeyval package, the extended
-version of keyval.
-
Save the files pst-node.sty|.tex|.pro in a directory, which is part of your
local TeX node. Then do not forget to run texhash to update this node
if these packages are new to your TeX distribution.
For more information see the documentation of your LaTeX distribution
on installing packages into your LaTeX distribution or the
TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
+(https://texfaq.org/#installing).
pst-node needs pstricks, which should be part of your
local TeX installation, otherwise get it from a CTAN server, f.ex.
diff --git a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib
new file mode 100644
index 00000000000..f2a5d82e847
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib
@@ -0,0 +1,35 @@
+@Manual{pstricks2007,
+ Title = {PSTricks - {\PS} macros for Generic TeX. Version 1.5},
+ Author = {Timothy Van Zandt},
+ Organization = {},
+ Address =
+ {\url{http://www.tug.org/tex-archive/graphics/pstricks/base/doc/pst-user.pdf}},
+ Note = {},
+ year = 2007,
+}
+
+
+@Manual{siart,
+ Title = {Befehls\"ubersicht f\"ur \texttt{PSTricks} (Version
+ 0.93},
+ Author = {Uwe Siart},
+ Organization = {},
+ Address =
+ {\url{http://www.siart.de/typografie/pstricks-referenz.pdf}},
+ Note = {},
+ year = 2009,
+}
+
+
+
+
+@Book{PSTricks2,
+ author = {Herbert Vo\ss},
+ title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+ edition = {fünfte},
+ publisher = {DANTE -- Lehmanns},
+ year = {2008},
+ address = {Heidelberg/Hamburg}
+}
+
+
diff --git a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf
new file mode 100644
index 00000000000..cb72a62b43e
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex
new file mode 100644
index 00000000000..8ca96eab4e7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex
@@ -0,0 +1,1155 @@
+%% $Id: psmatrix-docDE.tex 696 2017-12-30 19:01:07Z herbert $
+\listfiles
+\documentclass[11pt,ngerman,a4paper,BCOR10mm,DIV12,bibliography=totoc,parskip,smallheadings,
+ headexclude,footexclude,oneside]{pst-doc}
+\usepackage[utf8]{inputenc}
+\usepackage{babel}
+
+%\setlength{\parindent}{0pt}
+%\setlength{\parskip}{1ex plus 0.2ex minus 0.1ex}
+
+\usepackage{pst-node,pst-grad,pstricks-add,pst-blur,float}
+\def\tab#1{\tabular{@{}l@{}}#1\endtabular}
+\def\OptEinh{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Einheit}}\kern1pt}
+
+\let\myFV\fileversion
+
+\usepackage{tabularx}
+\usepackage{longtable}
+
+\addbibresource{\jobname.bib}
+
+
+\lstset{explpreset={pos=l,rframe=},frame=,backgroundcolor=\color{white},literate={ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
+ {Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
+ {ß}{\ss}1}
+
+
+\usepackage{bibgerm}
+
+%\psset{subgriddiv=0,gridlabels=7pt,gridcolor=black!15}
+%\hypersetup{pdfauthor={Christine Roemer},pdftitle={psmatrix}}
+%
+\def\bgImage{\hspace*{1cm}%
+\begin{psmatrix}[colsep=0.8cm,rowsep=0.4cm,mcol=c,emnode=r]
+ & & semantische Ebene & &
+ \psshadowbox[framearc=0.25]{Bedeutung}\\
+ & & morphologische Ebene & & \\
+[name=A]\tab{pragmatische\\Ebene} & [name=B]& & & \\
+ & & syntaktische Ebene & & \\
+ & & \tab{phonetisch-phonologische Ebene\\graphische Ebene}
+ & & \psshadowbox[framearc=0.25]{Formativ}
+\end{psmatrix}
+\psset{nodesep=3pt,arrowscale=1.5,arrows=->,
+ armA=6mm,angleB=180}
+\ncline{A}{B}
+\ncangles{A}{1,3} \ncangles{A}{2,3}
+\ncangles{A}{4,3} \ncangles{A}{5,3}
+\ncline{1,3}{1,5} \ncline{5,3}{5,5}
+\ncline{<->}{1,5}{5,5}%
+}
+
+\lstset{basicstyle=\ttfamily\footnotesize}
+
+\begin{document}
+\author{Timothy van Zandt\\Herbert Vo\ss}
+\docauthor{Christine R\"omer}
+\date{\today}
+\title{Schematische \"Ubersichten mit \texttt{psmatrix}}
+
+\maketitle%
+
+\tableofcontents
+
+\clearpage
+\begin{abstract}
+Mit der
+\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} k\"onnen au{\ss}erhalb
+einer mathematischen
+Umgebung vielfältige schematische \"Ubersichten gesetzt werden. Das Makro \texttt{psmatrix}
+wird nicht extra geladen. Es ist in verschiedene Pakete des
+PSTricks-Verbundes\index{PSTricks-Verbund}
+(\texttt{pstricks,\\pst-node,pst-grad})\index{pstricks@\texttt{pstricks}}
+\index{pst-node@\texttt{pst-node}} \index{pst-grad@\texttt{pst-grad}} integriert
+ und wird mit ihnen aufgerufen.
+
+\vfill\noindent
+Danke f\"ur die Unterst\"utzung bei der Erstellung dieser Dokumentation an Herbert Vo\ss.
+\end{abstract}
+
+
+\section{Einf\"uhrung}
+
+Mit der
+\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} k\"onnen
+au{\ss}erhalb einer mathematischen
+Umgebung schematische \"Ubersichten gesetzt werden. Sie basiert auf dem
+Tabellenmakro \texttt{array}\index{array@\texttt{array}} und gleicht ihm deshalb in der
+Syntax. Es hat jedoch nicht dessen
+Einschr\"ankungen bez\"uglich Verbindungen über die Zellen und Zeilen hinweg. Das Makro
+\texttt{psmatrix}
+wird nicht extra geladen. Es ist in verschiedene Pakete des
+PSTricks-Verbundes\index{PSTricks-Verbund}
+(\texttt{pstricks,\\pst-node,pst-grad})\index{pstricks@\texttt{pstricks}}
+\index{pst-node@\texttt{pst-node}} \index{pst-grad@\texttt{pst-grad}} integriert und
+wird mit ihnen aufgerufen.
+
+\section{Erstellen einer Matrix}
+\subsection{Einordnung}
+
+Das Makro \bs{\texttt{psmatrix}} arbeitet sowohl in einer \TeX - als auch
+\LaTeX-Umgebung:
+
+\begin{BDef}
+\Lcs{psmatrix}\OptArgs \ldots\ \Lcs{endpsmatrix} & \% TeX-Version\\
+\LBEG{psmatrix}\OptArgs \ldots \ \LEND{psmatrix} & \% LaTeX-Version
+\end{BDef}
+
+Da mit der \TeX-Version einige Einschr\"ankungen verbunden sind, wird nur auf
+die \LaTeX-Variante eingegangen. Das Grundprinzip des Strukturaufbaus
+stellt eine Knoten- und Knotenverbindungszuordnung dar. Diese kann mehrfach
+geschachtelt und sowohl bei der Knotenbelegung als auch
+Verbindungsdarstellung in verschiedener Weise ausgestalltet werden. Dazu
+stellt der PSTricksverbund zahlreiche Makros bereit.
+
+\subsection{Matrixgrundstruktur}\index{Matrixgrundstruktur}
+
+Die Knoten werden in der Art einer Tabelle innerhalb der
+\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} angeordnet.
+
+\begin{LTXexample}[width=.3\linewidth]
+\begin{psmatrix}[rowsep=0.2cm]
+1 & 2 & 3 \\
+X & Y & Z
+\end{psmatrix}
+\end{LTXexample}
+
+
+\section{Zuordnung Knoten zu Verbindungen}
+
+Die Matrix entsteht durch die Zuordnung von Knoten zu Verbindungen. Die
+Knoten werden in die Zellen in der \texttt{psmatrix}-Umgebung eingetragen
+(siehe obiges Beispiel). Nach \bs{\texttt{end}}\{\texttt{psmatrix}\} werden die gew\"unschten
+Linien definiert. Grunds\"atzlich geschieht dies nach dem Schema
+
+\psframebox{\bs
+nc\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Verbindung}}
+[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
+\{Koordinaten ZelleA\}\{Koordinaten ZelleB\}}
+
+Die Koordinaten\index{Zellen-Koordinaten} werden, wenn den Zellen keine
+Namen gegeben werden (siehe
+Parameter \texttt{name}),
+durch abz\"ahlen gewonnen: jeweils erst die Zeile und danach durch Komma abgetrennt
+die Zelle.
+
+\vspace{4mm}
+\begin{LTXexample}[width=.3\linewidth]
+\begin{psmatrix}[rowsep=0.2cm]
+1 & 2 & 3 \\
+X & Y & Z
+\end{psmatrix}
+\ncline[linecolor=red]{1,1}{2,2}
+\ncline[linecolor=green]{1,3}{2,2}
+\ncline[linestyle=dotted]{<-}{1,2}{2,1}
+\ncline[linestyle=dashed]{->}{1,2}{2,3}
+\end{LTXexample}
+
+
+\section{Knotenparameter}
+\subsection{mnode}\index{mnode@\texttt{mnode}}
+
+Der Parameter \texttt{mnode=<Knotenart>} legt die Knotenart fest. Das kann lokal für
+einzelne Knoten oder global für die ganze Matrix erfolgen (siehe folgende
+Beispiele). Dazu muss neben
+dem Paket \texttt{pstricks}\index{pstricks@\texttt{pstricks}} auch
+\texttt{pst-node}\index{pst-node@\texttt{pst-node}} geladen werden.
+
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm]
+1 & 2 \\
+X & Y
+\end{psmatrix}
+\end{LTXexample}
+
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm]
+1 & 2 \\
+[mnode=dia] X & Y
+\end{psmatrix}
+\end{LTXexample}
+
+Folgende \textbf{Knotenarten}\index{Knotenarten} stehen zur Verf\"ugung. Ihr Aufruf erfolgt mit
+\texttt{mnode=} über die in Klammern angegebenen K\"urzel.
+
+\begin{compactitem}
+ \item \texttt{Rnode} (R):\index{Rnode@\texttt{Rnode} (R)}
+ Es wird damit das Eingetragene zur Basislinie
+ positioniert. Mittels Optionen kann dies variiert werden.
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[rowsep=0.2cm,linecolor=blue,radius=0.5]
+X & [mnode=R,vref=0pt] Y
+\end{psmatrix}
+\ncline{1,1}{1,2}
+\end{LTXexample}
+
+\item \texttt{Cnode} (C):\index{Cnode@\texttt{Cnode} (C)} Ungef\"ullte Kreise werden gesetzt.
+Deren Radius mit dem Parameter \texttt{radius}\index{radius@\texttt{radius}} modifiziert
+werden kann. Es muss irgendetwas eingetragen werden, was dann aber nicht erscheint.
+\vspace{2mm}
+\begin{LTXexample}[width=.3\linewidth]
+\begin{psmatrix}[mnode=C,rowsep=0.2cm,linecolor=blue,radius=0.5]
+ X & Y
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+\item \texttt{pnode} (p):\index{pnode@\texttt{pnode} (p)} Ein Knoten mit dem Radius Null, ein
+leerer Knoten (siehe folgendes Beispiel, wo der Knoten 1 leer gesetzt wird).
+
+\item \texttt{Circlenode}
+(Circle):\index{Circlenode@\texttt{Circlenode} (Circle)} Ein Knoten, der von einem Kreis
+umschlossen
+wird, dessen Umfang richtet sich nach dem Inhalt. Er kann mit der Option
+\texttt{radius} modifiziert werden (siehe obiges Beispiel).
+
+\vspace{2mm}
+\begin{LTXexample}[width=.42\linewidth]
+\begin{psmatrix}[mnode=Circle,radius=1cm,rowsep=0.2cm]
+ X & Y \\
+[mnode=p] 1 & 2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+\item \texttt{dianode} (dia):\index{dianode@\texttt{dianode} (dia)} Ein Knoten, der von
+einer Raute umschlossen
+wird, deren Umfang richtet sich nach dem Inhalt
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=dia,rowsep=0.2cm,colsep=0.7cm]
+ X & Y \\
+ 1 & 2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+\item \texttt{dotnode} (dot):\index{Rnode@\texttt{dotnode} (dot)} Es wird im unmarkierten
+Fall ein gef\"ullter Kreisknoten gesetzt, der
+u.\,a. \"uber den Parameter \texttt{dotscale} gesteuert
+werden kann.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=dot,rowsep=0.2cm]
+[mnode=dot,dotscale=3] X & Y \\
+[mnode=dot,dotscale=2,dotstyle=triangle]1&2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+\item \texttt{rnode} (r):\index{Rnode@\texttt{rnode} (r)}
+Unterscheidet sich von \bs{rnode} (R) in der
+Festlegung des Knotenzentrums, das ohne optionale Parameter das Zentrum
+der umgebenden Box ist. Eingesetzter "`Text"' erscheint pur.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=r,rowsep=0.2cm]
+ X & Y \\
+ 1 & 2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+
+
+\item \texttt{fnode} (f):\index{fnode@\texttt{fnode} (f)} Ein leerer
+Rahmen, dessen Gr\"o{"s}e \"uber
+\texttt{framesize=} und
+Koordinatenfestlegungen beeinflusst werden kann.%\footnote{Diese Funktion
+%ist bisher nur eingeschr\"ankt nutzbar, die K\"astchen einer Zeile werden nicht getrennt.
+%Mit "`Text"' gef\"ullte K\"astchen k\"onnen einfach mit \bs{\texttt{fbox}\{
+%\}} oder \bs{\texttt{psframebox}\{ \}} gesetzt werden.}
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=f,rowsep=0.2cm]
+ X & Y \\
+ 1 & 2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+
+\item \texttt{circlenode}
+(circle):\index{circlenode@\texttt{circlenode} (circle)} Entspricht
+weitgehend \texttt{Circlenode}. Es
+kann aber nicht der Radius ge\"andert werden.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm]
+ X & Y \\
+ 1 & 2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+\item \texttt{ovalnode} (oval):\index{ovalnode@\texttt{ovalnode} (oval)} Ovaler Knoten,
+dessen Gr\"o"se aus dem Inhalt resultiert.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=oval,rowsep=0.2cm,colsep=0.7cm]
+ XX & YY \\
+ 1 & 2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+
+\item \texttt{trinode} (tri):\index{trinode@\texttt{trinode} (tri)}
+Dreieck, dessen Gr\"o"se aus dem Inhalt resultiert.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[mnode=tri,rowsep=0.2cm,colsep=0.7cm]
+ X & Y \\
+ 1 & 2
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+Mit der Option \texttt{trimode}\index{trimode@\texttt{trimode}} kann die Lage der Dreiecke verändert
+werden. Die Sternversion verkleinert die Basis und erzeugt aus
+stumpfwinkligen (Winkel zwischen 90 und 180 Grad) spitzwinkelige (kleiner
+als 90 Grad) Dreiecke.
+\vspace{2mm}
+\begin{table}[H]
+\centering
+\caption{Ver\"anderung der Dreieckslage}
+\begin{tabular}{@{}ll@{}}
+Befehl & Lage des Dreiecks \\ \hline
+\texttt{trimode=U} & Spitze oben \\
+\texttt{trimode=D} & Spitze unten \\
+\texttt{trimode=R} & Spitze rechts \\
+\texttt{trimode=L} & Spitze links
+\end{tabular}
+\end{table}
+
+\vspace{2mm}
+\begin{LTXexample}[width=.25\linewidth]
+\begin{pspicture}(0,-2)(3,2)
+\begin{psmatrix}[mnode=tri,rowsep=0.2cm,colsep=0.7cm]
+ [trimode=U] Dreieck \\
+ [trimode=*D]Dreieck
+\end{psmatrix}
+\end{pspicture}
+\end{LTXexample}
+\vspace{2mm}
+
+
+ \item \texttt{no node} (none):\index{no node@\texttt{no node} (none)} Ohne Knoten, was für das
+ Einf\"ugen von Verbindungslinien sinnvoll sein kann.
+
+
+\end{compactitem}
+
+
+
+\subsection{emnode}\index{emnode@\texttt{emnode}}
+
+Mit \texttt{emnode} k\"onnen verschiedene Arten (Parameter wie bei
+\texttt{mnode} von Knoten für "`leere"' Zellen gesetzt
+werden. Es muss also nichts in die Zellen eingetragen werden. Wie
+nachfolgendes Beispiel auch belegt, kann es dabei auf der rechten Seite zu
+fehlerhaften Ausgaben kommen, weil
+\bs{pst-node}\index{pst-node@\texttt{pst-node}} da noch nicht v\"ollig korrekt
+arbeitet.
+
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[emnode=circle,rowsep=0.2cm,colsep=2cm]
+ & \\
+ &
+\end{psmatrix}
+\end{LTXexample}
+\vspace{2mm}
+
+\subsection{nodealign}\index{nodealign@\texttt{nodealign}}
+
+Der Parameter \texttt{nodealign} kann in [\texttt{nodealign=true}]
+abge\"andert werden, um das Zentrum des Knotens auf die Basisebene zu
+verschieben (vgl. \cite[S.\,259]{PSTricks2}).
+
+\section{Parameter zu Zellen und Zeilen}
+
+\subsection{name}\index{name@\texttt{name}}
+
+Der Parameter \texttt{name} erm\"oglicht es, jeder Zelle einen
+selbstgew\"ahlten Namen zu geben, der am Anfang einer Zelle eingef\"ugt werden
+muss. Dies kann beim Setzen von Linien die
+Arbeit erleichtern, man muss dann nicht die Positionen ausz\"ahlen.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.4\linewidth]
+\begin{psmatrix}[emnode=r,colsep=0.4cm,
+ rowsep=0.4cm]
+ & [name=A] Buch & \\
+[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->}
+\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
+\end{LTXexample}
+\vspace{2mm}
+
+
+Au"serdem ist es \"uber diese Zellenfestlegung m\"oglich, auch \Lcs{pcline} und
+\Lcs{psline} in einer Matrixumgebung zu benutzen. Diese nehmen die
+Koordinatenargumente (hier gleich Zellennamen) aber in runden Klammern, wie
+in dem folgenden Beispiel zu sehen ist.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.45\linewidth]
+\begin{psmatrix}[emnode=r,colsep=1cm,
+ rowsep=0.4cm]
+[name=A]Buch \psspan{3} & \\[1cm]
+[name=B]Fachbuch & [name=C]Lehrbuch &
+[name=D]Roman
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->,linecolor=red}
+\psline(A)(C)
+\pcline(A)(B)
+\nbput*[nrot=:D]{\footnotesize \texttt{pcline}}
+\ncline{A}{D}
+\naput*[nrot=:U]{\footnotesize \texttt{ncline}}
+\end{LTXexample}
+
+\Lcs{pcline} geht immer vom Zentrum aus und kann nicht an einer
+Umgebungsbox beginnen oder aufh\"oren. Sie kann deshalb von
+\texttt{nodesep} nicht beeinflusst werden. Andere Parameter --
+beispielsweise \texttt{offset=},\index{offset@\texttt{offset}} der eine vertikale Verschiebung
+erm\"oglicht, -- k\"onnen das aber schon. \Lcs{psline}
+reagiert wiederum darauf nicht.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.3\linewidth]
+\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm]
+[name=A]Fachbuch & \\[1cm]
+ & [name=C]Roman
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=<-,linecolor=red,offset=0.3cm}
+\pcline(A)(C)
+\pcline(C)(A)
+\end{LTXexample}
+
+\begin{LTXexample}[width=.3\linewidth]
+\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm]
+ [name=A] Fachbuch & \\[1cm]
+ & [name=C] Roman
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->,linecolor=red,offset=1cm}
+\psline(A)(C)
+\psline(C)(A)
+\end{LTXexample}
+
+
+
+\subsection{mcol}\index{mcol@\texttt{mcol}}
+
+Mit \texttt{mcol} kann lokal und global der horizontale
+Zellenabstand\index{Zellenabstand!horizontal}
+mit den Optionen \texttt{l,r,c} modifiziert werden.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.4\linewidth]
+\begin{psmatrix}[emnode=r,colsep=0.4cm,
+ rowsep=0.4cm,mcol=r]
+ & [name=A] Buch & \\
+[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->}
+\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
+\end{LTXexample}
+\vspace{2mm}
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{psmatrix}[emnode=r,colsep=0.4cm,
+ rowsep=0.4cm,mcol=l]
+ & [name=A]Buch & \\
+[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->}
+\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
+\end{LTXexample}
+
+\subsection{rowsep und colsep}\index{Abstand!Zellen und Zeilen}
+
+Mit \texttt{rowsep}\index{rowsep@\texttt{rowsep}} kann man den
+vertikalen und mit \texttt{colsep}\index{colsep@\texttt{colsep}}
+den horizontalen Abstand zwischen
+den Zeilen bzw. Zellen regulieren; welchen hinzuf\"ugen oder mit einem
+negativen Wert reduzieren (siehe Beispiele bei \texttt{name}).
+
+\subsection{mnodesize}\index{mnodesize@\texttt{mnodesize}}
+
+Im Defaultfall wird die Breite der Zellen\index{Zelle!Breite} von deren Inhalt bestimmt;
+innerhalb einer Zellenspalte von der mit dem gr\"o"sten Umfang. Mit
+\texttt{mnodesize=} kann allen Spalten dieselbe Breite gegeben werden.
+Dabei ist zu beachten, dass kein automatischen
+Zeilenumbruch\index{Zelle!Zeilenumbruch} in den Zellen
+erfolgt. Man kann in eine Zelle jedoch mehrere Zeilen über eine Tabelle
+einbringen.
+
+\begin{LTXexample}[width=.52\linewidth]
+\begin{psmatrix}[emnode=r,
+colsep=-0.4cm,rowsep=0.6cm,
+mnodesize=3cm]
+& [name=A]
+ \begin{tabular}{c}Grafische\\Grundelemente\end{tabular} & \\
+[name=B]Linien & [name=C]Polygone &
+[name=D]Rahmen
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->}
+\ncline{A}{B} \ncline{A}{C}
+\ncline{A}{D}
+\end{LTXexample}
+
+Wenn der von \texttt{mnodesize=} festgelegte Raum nicht ausreichend ist
+erweitert sich einfach die Zelle.
+
+\subsection{psspan}\index{psspan@\texttt{psspan}}
+
+Mit \texttt{psspan\{n\}} k\"onnen Zellen analog zu
+\bs{multicolumn}\index{multicolumn@\texttt{\textbackslash{multicolumn}}} mehrere
+Zellen\index{Zellen!zusammenfassen} zusammengefasst werden.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{psmatrix}[emnode=r,colsep=0.4cm,
+rowsep=0.4cm]
+[name=A]Buch \psspan{3} & \\
+[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->}
+\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
+\end{LTXexample}
+
+
+\section{Knotenverbindungen}\index{Knotenverbindung}
+
+Die Knotenverbindungen beginnen in der Regel mit \texttt{nc} und haben die Syntax:
+
+\begin{BDef}
+\bs{Knotenverbindung}\OptArgs\{Pfeile\}\{KnotenA\}\{KnotenB\}
+\end{BDef}
+
+Sie gehen von einem Knoten zu einem anderen, wenn es nicht anders festgelegt
+wurde, ist die Zielorientierung die Knotenmitte.
+
+Die Knotenverbindungen können über eine Reihe von Parametern geändert
+werden (vgl. \cite[S.\,43\,f]{PSTricks2} und \cite{siart}). Einige, die für das Zeichnen von
+Strukturen besonders relevant sind, werden in der nachfolgenden Tabelle
+aufgelistet:\index{Knotenverbindung!Parameter}
+
+\begin{table}[H]
+\centering
+\caption{Parameter f\"ur Knotenverbindungen}
+\begin{tabular}{@{}lll@{}}
+Name & Werte & Vorgabe \\ \hline
+\texttt{linewidth} & <Wert>\OptEinh\ & 0.8pt \\
+\texttt{linecolor} & <Farbe> & black \\
+\texttt{linestyle} & none|solid|dotted|dashed & solid \\
+\texttt{shadow} & <an (true)/aus (false)> & false \\
+\texttt{shadowsize} & <Wert>\OptEinh\ & 3pt \\
+\texttt{shadowangle} & <Winkel> & $-$45 \\
+\texttt{shadowcolor} & <Farbe> & darkgray \\
+\texttt{arrows} & <Pfeiltyp> & -- \\
+\texttt{doubleline} & <true/false> & false
+\end{tabular}
+\end{table}
+
+\subsection{ncline}
+
+Mit \Lcs{ncline} wird eine direkte Linie von einem Knoten zum anderen
+gezogen\footnote{Wenn Sie das nächste Beispiel mit den
+folgenden Beispielen vergleichen, können Sie auch sehen, dass eine bessere
+Positionierung in einer einfachen Box über die Umgebung
+\bs{\texttt{pspicture}}
+m\"oglich ist. Zumal ohne diese Umgebung die Kurvenlinien \"uber die Box
+hinausragen w\"urden, wie dies im ersten Beispiel zu \texttt{ncdiag} der
+Fall ist.}.
+
+\begin{LTXexample}[width=.35\linewidth]
+\begin{psmatrix}[emnode=r,colsep=2cm]
+ KnotenX & KnotenY
+\end{psmatrix}
+\ncline[linecolor=red]{1,1}{1,2}
+\end{LTXexample}
+
+
+\subsection{ncarc}\xLcs{ncarc}
+
+Eine Kurve verbindet die Knoten.
+
+\begin{LTXexample}[width=.35\linewidth]
+\begin{pspicture}(0,-0.5)(4,1)
+\begin{psmatrix}[emnode=r,colsep=2cm]
+ KnotenX & KnotenY
+\end{psmatrix}
+\ncarc[linecolor=red]{<->}{1,1}{1,2}
+\end{pspicture}
+\end{LTXexample}
+
+Mit der Option \texttt{arcangle=}\index{arcangle@\texttt{arcangle}} kann der
+Steigungswinkel\index{Steigungswinkel} erh\"oht werden.
+
+\begin{LTXexample}[width=.35\linewidth]
+\begin{pspicture}(0,-0.5)(4,1)
+\begin{psmatrix}[emnode=r,colsep=2cm]
+ KnotenX & KnotenY
+\end{psmatrix}
+\ncarc[arcangle=60,linecolor=red]{<->}{1,1}{1,2}
+\end{pspicture}
+\end{LTXexample}
+
+In der Sternchenversion wird der von der Kurve eingeschlossenen Raum mit
+der Linienfarbe ausgefüllt.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{pspicture}(0,-0.5)(4,1)
+\begin{psmatrix}[emnode=r,colsep=2cm]
+ KnotenX & KnotenY
+\end{psmatrix}
+\ncarc*[arcangle=60,linecolor=red]{<->}{1,1}{1,2}
+\end{pspicture}
+\end{LTXexample}
+
+
+\subsection{ncdiag}
+
+Mit \Lcs{ncdiag} wird eine Linie in drei Segmente "`zerlegt"'. Man kann
+diese Zerlegung über die Winkelfestlegungen (siehe folgendes Beispiel)
+steuern.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{psmatrix}[emnode=r,colsep=2cm]
+ KnotenX & KnotenY
+\end{psmatrix}
+\ncdiag[angleA=90,angleB=-90,linecolor=red]{<->}{1,1}{1,2}
+\end{LTXexample}
+
+Die Angabe \texttt{arm=0}\index{arm@\texttt{arm}} erzwingt eine gerade Linie.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{psmatrix}[emnode=r,colsep=2cm]
+ KnotenX & KnotenY
+\end{psmatrix}
+\ncdiag[angleA=-90,angleB=90,arm=0,linecolor=red]{<->}{1,1}{1,2}
+\end{LTXexample}
+
+\subsection{ncdiagg}
+
+\Lcs{ncdiagg} ist \Lcs{ncdiag} \"ahnlich. Für den Ausgangsknoten wird aber
+nur eine Verbindung gezeichnet.
+
+\begin{LTXexample}[width=.3\linewidth]
+\usepackage{pstricks-add}
+\begin{pspicture}(-1,-1)(4,6)
+ \circlenode{A}{A}\quad\circlenode{C}{C}
+ \rput(0,4){\circlenode{B}{B}}
+ \rput(1,5){\circlenode{D}{D}}
+ {\psset{arrowscale=2,linearc=0.2,
+ linecolor=red,armA=0.5,angleA=90}
+ \ncdiagg[lineAngle=-160]{->}{A}{B}
+ \ncput*[nrot=:U]{Linie I}
+ \ncdiagg[lineAngle=-160]{->}{C}{D}
+ \ncput*[nrot=:U]{Linie II}}
+\end{pspicture}
+\end{LTXexample}
+
+\subsection{ncbar}
+
+\Lcs{ncbar} arbeitet ähnlich wie \Lcs{ncdiag}. Zwei Knoten werden
+durch drei Linienteile verbunden.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{pspicture}(0,1)(4,-2)
+\begin{psmatrix}[emnode=r]
+\psset{arrowscale=2}
+Verbinde {\rnode{A}{KnotenX}} mit
+{\rnode{B}{KnotenY}}!
+\end{psmatrix}
+\ncbar[nodesep=3pt,angleA=-90,angleB=90,linecolor=red,arrows=<->,arrowscale=2,
+arm=0.8]{A}{B}
+\end{pspicture}
+\end{LTXexample}
+
+
+\subsection{ncbarr}
+
+\Lcs{ncbarr} verwendet f\"unf Liniensegmente und erstellt damit eine
+S-f\"ormige Verbindung.
+
+\begin{LTXexample}[width=.3\linewidth]
+\begin{psmatrix}
+ & \circlenode{X}{X}\\[1cm]
+ & \circlenode{Y}{Y}
+\end{psmatrix}
+\ncbarr[angleA=0,linecolor=red]{X}{Y}
+\end{LTXexample}
+
+
+\subsection{ncangle}
+
+\Lcs{ncangle} erm\"oglich genauer berechnete dreiteilige Linien. Es
+arbeitet analog zu \Lcs{ncdiag}.
+
+\begin{LTXexample}[width=.37\linewidth]
+\begin{pspicture}(0,1)(4,-1)
+\begin{psmatrix}[emnode=r,colsep=2cm,
+ rowsep=0.5cm]
+KnotenX & KnotenY \\
+\end{psmatrix}
+\ncdiag[angleA=-90,angleB=135,armA=1cm,armB=1cm,
+linearc=.5,linecolor=red]{->}{1,1}{1,2}
+\end{pspicture}
+\end{LTXexample}
+
+\subsection{ncangles}
+
+\Lcs{ncangles} produziert viergliedrige Linien.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{pspicture}(0,1)(4,-2.3)
+\begin{psmatrix}[emnode=r,colsep=2cm,
+ rowsep=0.5cm]
+\psframebox{\emph{KnotenX}} &
+\psframebox{\emph{KnotenY}}
+\end{psmatrix}
+\ncangles[angleA=-90,angleB=135,armA=1cm,
+ armB=1cm,
+linearc=.15,linecolor=red]{->}{1,1}{1,2}
+\rput[bl](-5,-0.7){armA}
+\rput[rB](-0.4,0.5){armB}
+\end{pspicture}
+\end{LTXexample}
+
+\subsection{ncloop}
+
+\Lcs{ncloop} setzt f\"unfgliedrige Linien. Gegenüber \Lcs{ncangles}
+kommt noch die Option \texttt{loopsize}\index{loopsize@\texttt{loopsize}} hinzu, die die
+H\"ohe für einen Loop (eine Schlinge) vorgibt.
+
+
+\begin{LTXexample}[width=.45\linewidth]
+\begin{pspicture}(-1.5,-1)(4,2)
+\rnode[lB]{A}{\psframebox{Knoten mit Schlinge}}
+\ncloop[angleB=180,loopsize=1,arm=.5,
+ linearc=.2,linecolor=red]{->}{A}{A}
+\ncput[npos=3.5,nrot=:U]{\psline{|<->|}%
+ (0.5,-0.2)(-0.5,-0.2)}
+\nbput[npos=3.5,nrot=:D,labelsep=.35cm]{%
+ {\small\texttt{loopsize}}}
+\end{pspicture}
+\end{LTXexample}
+
+\subsection{nccurve}
+
+\Lcs{nccurve} setzt eine B\`ezierkurve zwischen zwei Knoten, die über
+die Winkel \texttt{angleA} und \texttt{angleB} sowie den
+Kurvenparameter\index{Kurvenparameter}
+\texttt{ncurv}\index{nccurv@\texttt{nccurv}} gesteuert werden kann.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{psmatrix}[emnode=r,colsep=2cm,
+rowsep=0.5cm]
+{\rnode{A}{\psframebox{KnotenX}}} & \\
+& {\rnode{B}{\psframebox{KnotenY}}}
+\end{psmatrix}
+\nccurve[angleB=180,ncurv=0.9,
+linecolor=red]{A}{B}
+\end{LTXexample}
+
+\subsection{nccircle}
+
+\Lcs{nccircle} erzeugt \"uber einem Knoten einen ungef\"ullten oder gef\"ullten
+(Sternchenversion) Kreis.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.25\linewidth]
+\begin{pspicture}(-1,-1)(3,2)
+\begin{psmatrix}[emnode=r]
+\rnode{A}{herum}
+\end{psmatrix}
+\nccircle[nodesep=3pt,linecolor=red]{->}{A}{.8cm}
+\kern 5pt
+\end{pspicture}
+\end{LTXexample}
+
+\vspace{2mm}
+\begin{LTXexample}[width=.25\linewidth]
+\begin{pspicture}(-1,-1)(3,2)
+\begin{psmatrix}[emnode=r]
+\rnode{A}{dar\"uber}
+\end{psmatrix}
+\nccircle*[nodesep=3pt,linecolor=lightgray]{->}{A}{1cm}
+\kern 5pt
+\end{pspicture}
+\end{LTXexample}
+
+\subsection{offset}
+
+Die Option \texttt{offset}\index{offset@\texttt{offset}} verschiebt, wie
+schon bei den Erl\"auterungen zu dem Parameter \texttt{name} angesprochen,
+die Verbindungslinie parallel zum eigentlich festgelegten Verlauf. Dies ist
+besonders bei zwei Linien sinnvoll und effektiv.
+Wenn man jede Linien einzeln modifizieren m\"ochte, kann dies mit
+\texttt{offsetA}\index{offsetA@\texttt{offsetA}} und
+\texttt{offsetB}\index{offsetB@\texttt{offsetB}}
+geschehen. Beispielsweise, wenn von
+einem Knoten zwei Verbindungen ausgehen sollen.
+
+\vspace{2mm}
+\begin{LTXexample}[width=.2\linewidth]
+\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm]
+[name=A]Buch \\
+[name=B]Fachbuch \\
+[name=C]\LaTeX buch
+\end{psmatrix}
+\psset{nodesep=3pt,arrows=->,linecolor=red,offset=0.3cm}
+\pcline[offsetA=0.3cm](A)(B)
+\pcline[offsetB=-0.3cm](A)(C)
+\end{LTXexample}
+
+
+\section{Linien beschriften}\index{Linienbeschriftung}
+
+\subsection{Beschriftung einf\"ugen}
+
+\psframebox{\parbox{0.65\textwidth}{
+\bs ncput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*}
+[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
+\{Beschriftung auf der Linie\}\\
+\bs naput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*}
+[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
+\{Beschriftung \"uber der Linie\}\\
+\bs nbput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*}
+[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
+\{Beschriftung unter der Linie\}
+}}
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{pspicture}(0,1)(4,-2)
+\begin{psmatrix}[emnode=r]
+\psset{arrowscale=2}
+Verbinde {\rnode{A}{KnotenX}} mit
+{\rnode{B}{KnotenY}}!
+\end{psmatrix}
+\ncbar[nodesep=3pt,angleA=-90,angleB=90,
+linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
+{A}{B}
+\ncput*{auf}
+\naput*{\"uber}
+\nbput*{unter}
+\end{pspicture}
+\end{LTXexample}
+
+Die angegebene Sternchenversion ist besser geeignet, da sie die Linien
+überschreibt und damit die Beschriftungen besser sichtbar sind (vgl. mit
+der nachfolgenden Beispielversion ohne Sternchen). Das betrifft besonders
+die \texttt{naput}-Version.
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{pspicture}(0,1)(4,-2)
+\begin{psmatrix}[emnode=r]
+\psset{arrowscale=2}
+Verbinde {\rnode{A}{KnotenX}} mit
+{\rnode{B}{KnotenY}}!
+\end{psmatrix}
+\ncbar[nodesep=3pt,angleA=-90,angleB=90,
+linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
+{A}{B}
+\ncput{auf}
+\naput{\"uber}
+\nbput{unter}
+\end{pspicture}
+\end{LTXexample}
+
+Ohne die Angabe von Optionen wird die Beschriftung auf den sichtbaren
+Linienteil geschrieben. Sie orientiert sich dabei an der Linienmitte.
+Mit \texttt{npos=}\index{npos@\texttt{npos}} und
+\text{nrot=}\index{nrot@\texttt{nrot}} kann diese Orientierung ge\"andert werden.
+
+Mit \Lcs{psset}\{labelset=\} kann der Abstand zwischen Label und Linie
+reguliert werden. Wenn der Wert auf 0pt gesetzt wird (also direkt über oder
+unter der Linie, sollte f\"ur \Lcs{naput} bzw. \Lcs{nbput} nicht die
+Sternchenversion gew\"ahlt werden, die wahrscheinlich ohnehin nur f\"ur
+\Lcs{ncput} sinnvoll scheint. Die Nullversion ist immer dann zu nehmen,
+wenn es Probleme mit dem Sichtbarmachen des Labels gibt.
+
+\subsection{npos}
+
+\texttt{npos} ermöglicht die Platzierung der Beschriftung auf den
+verschiedenen Segmenten des entsprechenden Linientyps. Die Zahl gibt vor
+dem Punkt die Segmentnummer (0,1,2,\ldots) und nach dem Punkt den Abstand
+zum Segmentanfang an. Im folgenden Beispiel bekommt die Beschriftung den
+Wert 1.2 und steht damit auf dem zweiten Liniensegment 20\% vom
+Segmentanfang.
+
+\begin{table}[H]
+\centering
+\caption{Zusammenstellung der Kurzformen für die Drehwinkel}\label{tab:wind}
+ \begin{tabular}{@{}l|*{8}{>{\ttfamily}c}@{}}
+ \emph{Buchstabe} & U & L & D & R & N & W & S & E \\\hline
+ \emph{Bedeutung} & Up& Left&Down&Right&North&West&South&East\\
+ \emph{Enstprechung} &0&90&180&270&*0&*90&*180&*270
+%
+% \begin{tabular}{@{}>{\ttfamily}llr@{}}
+% \textrm{Buchstabe} & Bedeutung & Winkel\\\hline
+% U & Up & 0\\
+% L & Left & 90\\
+% D & Down & 180\\
+% R & Right & 270\\
+% N & North & *0\\
+% W & West & *90\\
+% S & South & *180\\
+% E & East & *270
+ \end{tabular}
+\end{table}
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{pspicture}(0,1)(4,-2)
+\begin{psmatrix}[emnode=r]
+\psset{arrowscale=2}
+Verbinde {\rnode{A}{KnotenX}} mit
+{\rnode{B}{KnotenY}}!
+\end{psmatrix}
+\ncbar[nodesep=3pt,angleA=-90,angleB=90,
+linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
+{A}{B}
+\ncput*[npos=1.2]{auf}
+\end{pspicture}
+\end{LTXexample}
+
+
+\subsection{nrot}
+
+\texttt{nrot=:Winkel/K\"urzel} erm\"oglicht es die Beschriftung zu
+drehen:
+
+\begin{table}[htb]
+\centering\tabcolsep=3pt
+\caption{Vergleich der verschiedenen Knotenverbindungen bez\"uglich ihrer
+Segmentanzahl}\label{tab:segmente}
+\hspace*{-1em}
+\begin{tabular}{@{} lccc | lccc @{}}
+\emph{Verbindung} & \emph{Segm.} & \emph{Bereich} & \emph{Vorgabe} &
+\emph{Verbindung} & \emph{Segm.} & \emph{Bereich} & \emph{Vorgabe}\\\hline
+ \Lcs{ncline} & $1$ & $0\leq npos\leq 1$ & $0.5$ &
+ \Lcs{nccurve} & $1$ & $0\leq npos\leq 1$ & $0.5$\\
+ \Lcs{ncarc} & $1$ & $0\leq npos\leq 1$ & $0.5$ &
+ \Lcs{ncbar} & $3$ & $0\leq npos\leq 3$ & $1.5$\\
+ \Lcs{ncdiag} & $3$ & $0\leq npos\leq 3$ & $1.5$ &
+ \Lcs{ncdiagg} & $2$ & $0\leq npos\leq 2$ & $0.5$\\
+ \Lcs{ncangle} & $3$ & $0\leq npos\leq 3$ & $1.5$ &
+ \Lcs{ncangles} & $4$ & $0\leq npos\leq 4$ & $1.5$\\
+ \Lcs{ncloop} & $5$ & $0\leq npos\leq 5$ & $2.5$ &
+ \Lcs{nccircle} & $1$ & $0\leq npos\leq 1$ & $0.5$\\
+\end{tabular}
+\end{table}
+
+
+\begin{LTXexample}[width=.4\linewidth]
+\begin{pspicture}(0,1)(4,-2)
+\begin{psmatrix}[emnode=r]
+\psset{arrowscale=2}
+Verbinde {\rnode{A}{KnotenX}} mit
+{\rnode{B}{KnotenY}}!
+\end{psmatrix}
+\ncbar[nodesep=3pt,angleA=-90,angleB=90,
+linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
+{A}{B}
+\ncput*[nrot=:L]{auf}
+\end{pspicture}
+\end{LTXexample}
+
+\section{Strukturbeispiele}
+
+
+
+Jetzt sollen noch einige wenige Beispiele von Struktur\"ubersichten
+vorgestellt werden, die von mir in der \texttt{pstmatrix}-Umgebung gesetzt wurden.
+
+\begin{figure}[H]\centering
+\begin{psmatrix}[colsep=0.8,rowsep=0.8]
+\psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]
+{$\left[\tabular{c}GF: /Pinguin/\\ WA: +N\endtabular\right]$}
+ & \psframebox[fillcolor=yellow!40,fillstyle=solid]{Vogel} \\
+\psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{\tabular{l}aufrecht\\ gehend\endtabular}
+ & \psshadowbox[fillcolor=red,fillstyle=solid,shadow=true,blur=true,shadowsize=5pt]{\textbf{Pinguin}} &
+ \psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{flugunfähig}\\
+ & \psframebox[fillcolor=green!40,fillstyle=solid]{Felsenpinguin}
+\end{psmatrix}
+\ncline{1,1}{2,2} \naput{s}
+\ncline{1,2}{2,2} \naput{ob}
+\ncline{2,1}{2,2} \naput{a}
+\ncline{2,2}{2,3} \naput{a}
+\ncline{2,2}{3,2} \naput{ub}
+\caption{Ein Frame}
+\end{figure}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
+\usepackage{pst-node,pst-blur}
+\begin{psmatrix}[colsep=0.8,rowsep=0.8]
+\psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]
+{$\left[\tabular{c}GF: /Pinguin/\\ WA: +N\endtabular\right]$}
+ & \psframebox[fillcolor=yellow!40,fillstyle=solid]{Vogel} \\
+\psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{\tabular{l}aufrecht\\ gehend\endtabular}
+ & \psshadowbox[fillcolor=red,fillstyle=solid,shadow=true,blur=true,shadowsize=5pt]{\textbf{Pinguin}} &
+ \psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{flugunfähig}\\
+ & \psframebox[fillcolor=green!40,fillstyle=solid]{Felsenpinguin}
+\end{psmatrix}
+\ncline{1,1}{2,2} \naput{s}
+\ncline{1,2}{2,2} \naput{ob}
+\ncline{2,1}{2,2} \naput{a}
+\ncline{2,2}{2,3} \naput{a}
+\ncline{2,2}{3,2} \naput{ub}
+\end{lstlisting}
+
+
+\begin{figure}[H]\centering
+\begin{psmatrix}[colsep=0.8,rowsep=0.8]
+\psset{shortput=nab,framesep=10pt}
+ \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Lebewesen} &
+ \psframebox[fillcolor=yellow!40,fillstyle=solid]{allgemeine Kategorisierung}\\
+ \psshadowbox[framearc=0.25,fillcolor=red!40,fillstyle=solid,doubleline=true]{\textbf{Löwe}}
+& \psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]{Basisebene}\\
+ \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Höhlenlöwe}
+& \psframebox[fillcolor=green!30,fillstyle=solid]{spezielle Kategorisierung}
+\end{psmatrix}
+\psset{nodesep=2pt,arrows=->}
+\ncline[arrowscale=2]{1,1}{2,1}
+\ncline[arrowscale=2]{2,1}{3,1}
+\caption{Eine konzeptuelle Kategorisierung}
+\end{figure}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
+\begin{psmatrix}[colsep=0.8,rowsep=0.8]
+\psset{shortput=nab,framesep=10pt}
+ \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Lebewesen} &
+ \psframebox[fillcolor=yellow!40,fillstyle=solid]{allgemeine Kategorisierung}\\
+ \psshadowbox[framearc=0.25,fillcolor=red!40,fillstyle=solid,doubleline=true]{\textbf{Löwe}}
+& \psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]{Basisebene}\\
+ \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Höhlenlöwe}
+& \psframebox[fillcolor=green!30,fillstyle=solid]{spezielle Kategorisierung}
+\end{psmatrix}
+\psset{nodesep=2pt,arrows=->}
+\ncline[arrowscale=2]{1,1}{2,1}
+\ncline[arrowscale=2]{2,1}{3,1}
+\end{lstlisting}
+
+\begin{figure}[H]\centering
+\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55}
+\begin{psmatrix}[colsep=0,rowsep=0.9]
+ & & \psframebox[fillcolor=blue!30]{Synchronie}\\
+ & \psframebox[fillcolor=red!30]{Sprache} & \\
+ & & \psframebox[fillcolor=blue!30]{Diachronie} \\
+\psframebox[fillcolor=red!30]{Menschliche Rede} & & \\
+ & \psframebox[fillcolor=red!30]{Sprechen} &
+ \end{psmatrix}
+ \psset{shadow=false}
+\ncline[arrows=->,arrowscale=2]{2,2}{1,3}
+\ncline[arrows=->,arrowscale=2]{2,2}{3,3}
+\ncline[arrows=->,arrowscale=2]{4,1}{2,2}
+\ncline[arrows=->,arrowscale=2]{4,1}{5,2}
+\caption{F. de Saussure zu Sprache}
+\end{figure}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
+\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55}
+\begin{psmatrix}[colsep=0,rowsep=0.9]
+ & & \psframebox[fillcolor=blue!30]{Synchronie}\\
+ & \psframebox[fillcolor=red!30]{Sprache} & \\
+ & & \psframebox[fillcolor=blue!30]{Diachronie} \\
+\psframebox[fillcolor=red!30]{Menschliche Rede} & & \\
+ & \psframebox[fillcolor=red!30]{Sprechen} &
+ \end{psmatrix}
+ \psset{shadow=false}
+\ncline[arrows=->,arrowscale=2]{2,2}{1,3}
+\ncline[arrows=->,arrowscale=2]{2,2}{3,3}
+\ncline[arrows=->,arrowscale=2]{4,1}{2,2}
+\ncline[arrows=->,arrowscale=2]{4,1}{5,2}
+\end{lstlisting}
+
+\begin{figure}[H] \centering
+\begin{psmatrix}[emnode=r,colsep=0.5cm,rowsep=0.5cm,mcol=c]
+ & & & & <Metall> & \\
+ & & & [mnode=oval] 18 & &\\
+ <WERKZEUG> & & & & & \\
+ & & & &[mnode=tri] 12 &\\
+ & & & & & <arbeiten> \\
+ & & [mnode=C,linestyle=dashed,radius=0.5,mcol=l] & & &\\
+ \fbox{12} & & & \fbox{51} & & \\
+ & \fbox{36} & & & <Hammer> &\\
+ <Feile> & & <Zange> & & &
+\end{psmatrix}
+\psset{arrowscale=2,labelsep=0pt}
+\ncline{->}{1,5}{2,4}
+\ncarc{->}{4,5}{2,4}\naput[npos=0.4]{OBJ}
+\ncarc{->}{6,3}{4,5}\naput[npos=0.4]{INSTR}
+\ncline{<->}{6,3}{3,1}
+\ncarc{->}{6,3}{7,1}\naput[npos=0.4]{UB}
+\ncarc{->}{6,3}{7,4}\naput[npos=0.4]{UB}
+\ncarc{->}{6,3}{8,2}\naput[npos=0.4]{UB}
+\ncarc{->}{9,1}{7,1} \ncarc{->}{9,3}{8,2}
+\ncarc{->}{8,5}{7,4} \ncline{->}{5,6}{4,5}
+\caption{Begriffliches Merkmalsnetz nach Hoffmann}
+\end{figure}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
+\begin{psmatrix}[emnode=r,colsep=0.5cm,rowsep=0.5cm,mcol=c]
+ & & & & <Metall> & \\
+ & & & [mnode=oval] 18 & &\\
+ <WERKZEUG> & & & & & \\
+ & & & &[mnode=tri] 12 &\\
+ & & & & & <arbeiten> \\
+ & & [mnode=C,linestyle=dashed,radius=0.5,mcol=l] & & &\\
+ \fbox{12} & & & \fbox{51} & & \\
+ & \fbox{36} & & & <Hammer> &\\
+ <Feile> & & <Zange> & & &
+\end{psmatrix}
+\psset{arrowscale=2,labelsep=0pt}
+\ncline{->}{1,5}{2,4}
+\ncarc{->}{4,5}{2,4}\naput[npos=0.4]{OBJ}
+\ncarc{->}{6,3}{4,5}\naput[npos=0.4]{INSTR}
+\ncline{<->}{6,3}{3,1}
+\ncarc{->}{6,3}{7,1}\naput[npos=0.4]{UB}
+\ncarc{->}{6,3}{7,4}\naput[npos=0.4]{UB}
+\ncarc{->}{6,3}{8,2}\naput[npos=0.4]{UB}
+\ncarc{->}{9,1}{7,1} \ncarc{->}{9,3}{8,2}
+\ncarc{->}{8,5}{7,4} \ncline{->}{5,6}{4,5}
+\end{lstlisting}
+
+\newpage
+\bgroup
+\appendix
+
+%\addcontentsline{toc}{section}{Literaturverzeichnis}
+
+\nocite{*}
+\raggedright
+
+\printbibliography
+\egroup
+\clearpage
+\addcontentsline{toc}{section}{Index}
+\printindex
+
+
+\end{document}
+
+
diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf
index 8be7b3ec525..f8bebfdf1e0 100644
--- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex
index 5ff16cb6cf5..a4d0faa9642 100644
--- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex
@@ -1,7 +1,8 @@
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{}
-%% $Id: pst-node-doc.tex 438 2022-01-31 17:45:26Z herbert $
-\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+%\RequirePackage{pdfmanagement-testphase}
+\DocumentMetadata{}
+%% $Id: pst-node-doc.tex 920 2024-07-11 07:41:04Z herbert $
+\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,
+ headings=small,
headinclude=false,footinclude=false,oneside]{pst-doc}
\listfiles
@@ -75,7 +76,8 @@ when also running the main package \LPack{pstricks} with this option.
\vfill
\noindent
-Thanks to: Marco Daniel; Denis Girou; Thomas Iyer; Rolf Niepraschk; Sebastian Rahtz; Andi Setiawan;
+Thanks to: Marco Daniel; Denis Girou; Thomas Iyer; Rolf Niepraschk; Sebastian Rahtz;
+Erich Schmidt; Andi Setiawan;
\end{abstract}
\clearpage
@@ -1356,7 +1358,7 @@ Here is how I used \Lcs{nput} to mark an angle in a previous example:
\end{pspicture}
\end{LTXexample}
-\clearpage%%%%%%%%%%%%%%%%%%%%%%%%%%
+%\clearpage%%%%%%%%%%%%%%%%%%%%%%%%%%
For the put macros there are several possibilities:
@@ -1411,7 +1413,7 @@ will produce the same effect as
\end{LTXexample}
-\clearpage%%%%%%%%%%%%%%%%%%%%%%%%%
+%\clearpage%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Normal behavior with rotation}
If there are a point $B$ of type node and a point $A$ of any type then
@@ -1589,7 +1591,7 @@ connections:
You can include the node connections inside the \Lcs{psmatrix}, in the last entry
and right before \Lcs{endpsmatrix}. One advantage to doing this is that
-\Lkeyset{shortput=tab} is the default within a \Lcs{psmatrix}.
+\Lkeyset{shortput=tab} is the default within a \Lcs{psmatrix}.\label{tab}
\begin{LTXexample}
$ \begin{psmatrix}
@@ -2489,13 +2491,12 @@ For example,
\end{pspicture}
\end{LTXexample}
-
\begin{BDef}
\Lcs{fnpnode}\Largb{xval}\Largb{expression in x}\Largb{nodename}
\end{BDef}
- sets a single node on the graph. Eg,
+ sets a single node on the graph, eg:
\begin{verbatim}
\fnpnode{.5}{x x 1 add mul 2 div}{P}
@@ -2507,7 +2508,12 @@ For example,
\end{verbatim}
If your expression in \texttt{t} is algebraic, you must specify the keyword \texttt{algebraic}, as in
- \Lcs{fnpnode}\verb|[algebraic]{0.5}{x*(x+1)/2}{P}|.
+
+
+\begin{verbatim}
+\fnpnode[algebraic]{0.5}{x*(x+1)/2}{P}
+\end{verbatim}
+
\begin{LTXexample}[width=.35\textwidth]
\begin{pspicture}[showgrid](-.5,-.5)(2.5,3)
@@ -2574,7 +2580,7 @@ turn a list of coordinates into a node sequence P0 P1 ...
\begin{LTXexample}[width=.35\textwidth]
\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
\pnodes{B}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
-%definesuP0..P3--now join them
+% defines P0..P3 -- now join them
\psnline[arrowscale=2]{-D>}(0,3){B}
\end{pspicture}
\end{LTXexample}
@@ -2635,7 +2641,7 @@ Conversion between any angle unit and radian unit
\begin{LTXexample}[width=.35\textwidth]
\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
-%defines P0..P3--now join them
+% defines P0..P3 -- now join them
\psncurve[arrowscale=2]{-D>}(0,3){P}
\end{pspicture}
\end{LTXexample}
@@ -2644,7 +2650,7 @@ Conversion between any angle unit and radian unit
\begin{LTXexample}[width=.35\textwidth]
\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
-%defines P0..P3--now join them
+% defines P0..P3 -- now join them
\psnccurve[arrowscale=2]{-D>}(0,3){P}
\end{pspicture}
\end{LTXexample}
@@ -2753,7 +2759,7 @@ line from \verb|<basept>+<nodexpr1>| to \verb|<basept>+<nodexpr2>|.
\curvepnode{2}{\pfn}{P}% sets P, Ptang
\normalvec(Ptang){Q}\uput[-45](P){P}
\psxline[linecolor=red]{<->}(P){-(Ptang)}{1.5(Ptang)}
-\psxline[linecolor=blue]{->}(P){}{.5(Q)}%can use } for {(0,0)}
+\psxline[linecolor=blue]{->}(P){}{.5(Q)}% can use {} for {(0,0)}
\end{pspicture}
\end{LTXexample}
\vspace{2pc}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf
index bbc7bf404d2..e102b8a602a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
index 3fb53580ab3..bf357b88d48 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
@@ -41,6 +41,12 @@ broken.
Added a test for \verb|lualatex| before the default linewidth and color are set.
See last line in \verb|pstricks.tex|
+Moved macro \Lcs{clipbox} to \Lcs{psclipbox} to prevent a clash with package
+\LPack{adjustbox}
+from Martin Scharrer.
+
+
+
\section{\LuaLaTeX}\label{lua}
This version has a stable basic support for the lua package
\LPack{luapstricks.lua}, available from \url{https://github.com/zauguin/luapstricks}.
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex b/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
index b5f9ba2c32c..d4e0329dd39 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
@@ -97,7 +97,7 @@
% 15. When lines are very short, linestyle=dash may cause an error.
% PATCH: Input this file.
%
-% 16. \clipbox does not work.
+% 16. \psclipbox does not work.
% PATCH: Input this file.
%
% 17. Various nodes are missing \leavevmode, which can cause irregularities
@@ -509,8 +509,8 @@
stroke>
% 16.
-\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
-\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}}
+\def\psclipbox{\@ifnextchar[{\psclipbox@}{\psclipbox@[\z@]}}
+\def\psclipbox@[#1]{\pst@makebox\psclipbox@@{#1}}
% 20.
\def\mixed@coor#1#2{%
diff --git a/Master/texmf-dist/doc/info/mf2pt1.info b/Master/texmf-dist/doc/info/mf2pt1.info
index 5666407401c..7667cbf3e49 100644
--- a/Master/texmf-dist/doc/info/mf2pt1.info
+++ b/Master/texmf-dist/doc/info/mf2pt1.info
@@ -1,6 +1,6 @@
-This is mf2pt1.info, produced by makeinfo version 6.8 from mf2pt1.texi.
+This is mf2pt1.info, produced by makeinfo version 7.1 from mf2pt1.texi.
-Copyright (C) 2005-2021 Scott Pakin
+Copyright © 2005-2024 Scott Pakin
@@ -27,9 +27,9 @@ File: mf2pt1.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
mf2pt1
******
-'mf2pt1' is a tool that lets font designers design PostScript Type 1
+‘mf2pt1’ is a tool that lets font designers design PostScript Type 1
fonts using the Metafont language. The same source file can be used to
-produce both Type 1 ('.pfb') and bitmap ('.pk') fonts.
+produce both Type 1 (‘.pfb’) and bitmap (‘.pk’) fonts.
* Menu:
@@ -63,12 +63,12 @@ in the name "Metafont"). Ideally, we would like to design a font using
the Metafont language, but produce PostScript Type 1 output instead of
bitmaps.
- 'mf2pt1' helps bridge the gap between Metafont and Type 1 fonts.
-'mf2pt1' facilitates producing PostScript Type 1 fonts from a Metafont
+ ‘mf2pt1’ helps bridge the gap between Metafont and Type 1 fonts.
+‘mf2pt1’ facilitates producing PostScript Type 1 fonts from a Metafont
source file. It is _not_, as the name may imply, an automatic converter
-of arbitrary Metafont fonts to Type 1 format. 'mf2pt1' imposes a number
+of arbitrary Metafont fonts to Type 1 format. ‘mf2pt1’ imposes a number
of restrictions on the Metafont input. If these restrictions are met,
-'mf2pt1' will produce valid Type 1 output.
+‘mf2pt1’ will produce valid Type 1 output.
* Menu:
@@ -81,26 +81,26 @@ File: mf2pt1.info, Node: Requirements, Next: Installation, Prev: Introduction
1.1 Requirements
================
-Before using 'mf2pt1', you will need to install the following programs:
+Before using ‘mf2pt1’, you will need to install the following programs:
Perl
- 'mf2pt1' is written in Perl. You will need a Perl interpreter to
+ ‘mf2pt1’ is written in Perl. You will need a Perl interpreter to
run it.
MetaPost
- 'mf2pt1' actually uses MetaPost, not Metafont, to produce
- PostScript output. Specifically, you will need the 'mpost'
- executable and the 'mfplain.mp' base file.
+ ‘mf2pt1’ actually uses MetaPost, not Metafont, to produce
+ PostScript output. Specifically, you will need the ‘mpost’
+ executable and the ‘mfplain.mp’ base file.
Type 1 Utilities
- Producing properly encoded Type 1 fonts is tricky. 'mf2pt1'
+ Producing properly encoded Type 1 fonts is tricky. ‘mf2pt1’
delegates the effort to the Type 1 Utilities, specifically, to the
- 't1asm' program within that suite.
+ ‘t1asm’ program within that suite.
FontForge (optional)
FontForge is a WYSIWYG, but scriptable, Type 1 font-editing
- program. Although FontForge is not strictly required for 'mf2pt1'
- to produce a Type 1 font, 'mf2pt1' uses FontForge when available to
+ program. Although FontForge is not strictly required for ‘mf2pt1’
+ to produce a Type 1 font, ‘mf2pt1’ uses FontForge when available to
autohint the generated Type 1 font, thereby making it look better
especially at lower resolutions.
@@ -115,7 +115,7 @@ the Type 1 utilities' home page is <https://www.lcdf.org/type/>.
designer to hint fonts manually for additional fine-tuning and to
convert among a variety of font formats, such as PostScript, TrueType,
and X Window fonts. FontForge is strongly recommended as a complement
-to 'mf2pt1'.
+to ‘mf2pt1’.

File: mf2pt1.info, Node: Installation, Prev: Requirements, Up: Introduction
@@ -123,51 +123,51 @@ File: mf2pt1.info, Node: Installation, Prev: Requirements, Up: Introduction
1.2 Installation
================
-To install 'mf2pt1', move the 'mf2pt1' executable someplace where your
+To install ‘mf2pt1’, move the ‘mf2pt1’ executable someplace where your
operating system can find it. If you're running Microsoft Windows, you
-should rename the program to 'mf2pt1.pl', so that Windows knows it's a
-Perl script. (Alternatively, if you have 'pl2bat', use that to produce
-a 'mf2pt1.bat' file, which you can run as simply 'mf2pt1'.)
+should rename the program to ‘mf2pt1.pl’, so that Windows knows it's a
+Perl script. (Alternatively, if you have ‘pl2bat’, use that to produce
+a ‘mf2pt1.bat’ file, which you can run as simply ‘mf2pt1’.)
- The next step is to produce a 'mf2pt1.mem' file from the supplied
-'mf2pt1.mp'. The command to do this differs from system to system but
+ The next step is to produce a ‘mf2pt1.mem’ file from the supplied
+‘mf2pt1.mp’. The command to do this differs from system to system but
is usually something like the following:
mpost -progname=mpost -ini mf2pt1 \\dump
- Move the resulting 'mf2pt1.mem' file someplace where MetaPost can
+ Move the resulting ‘mf2pt1.mem’ file someplace where MetaPost can
find it.
- The 'mf2pt1' documentation (what you're reading now) is written in
+ The ‘mf2pt1’ documentation (what you're reading now) is written in
Texinfo and can therefore easily be converted to a variety of formats:
-PDF ('mf2pt1.pdf')
+PDF (‘mf2pt1.pdf’)
texi2pdf mf2pt1.texi
-PostScript ('mf2pt1.ps')
+PostScript (‘mf2pt1.ps’)
texi2dvi mf2pt1.texi
dvips mf2pt1.dvi -o mf2pt1.ps
-HTML ('mf2pt1.html')
+HTML (‘mf2pt1.html’)
makeinfo --html mf2pt1.texi
-Info ('mf2pt1.info')
+Info (‘mf2pt1.info’)
makeinfo mf2pt1.texi
-N.B. The 'install-info' command is a convenient way to install
-'mf2pt1.info' on your system.
+N.B. The ‘install-info’ command is a convenient way to install
+‘mf2pt1.info’ on your system.
- On Unix, you may also want to generate an 'mf2pt1' man page. The man
-page is embedded within the 'mf2pt1' Perl script and can be extracted
-with 'pod2man':
+ On Unix, you may also want to generate an ‘mf2pt1’ man page. The man
+page is embedded within the ‘mf2pt1’ Perl script and can be extracted
+with ‘pod2man’:
- pod2man --center="User Commands" --date="4 December 2021" \
- --release="v2.7" mf2pt1 > mf2pt1.1
+ pod2man --center="User Commands" --date="6 July 2024" \
+ --release="v2.8" mf2pt1 > mf2pt1.1
-You can then move 'mf2pt1.1' into '/usr/man/man1' or any other man page
-directory. Note that the 'mf2pt1' man page is fairly rudimentary. It
+You can then move ‘mf2pt1.1’ into ‘/usr/man/man1’ or any other man page
+directory. Note that the ‘mf2pt1’ man page is fairly rudimentary. It
is primarily a list of the command-line options (*note Font
information::) and a pointer to the document that you're reading now.
@@ -177,7 +177,7 @@ File: mf2pt1.info, Node: Usage, Next: Future Work, Prev: Introduction, Up: T
2 Usage
*******
-'mf2pt1' is fairly straightforward to use. To process a Metafont source
+‘mf2pt1’ is fairly straightforward to use. To process a Metafont source
file, merely specify the filename:
mf2pt1 myfont.mf
@@ -185,30 +185,30 @@ file, merely specify the filename:
That simple command automatically performs all of the following
operations:
- 1. Read 'myfont.mf'.
+ 1. Read ‘myfont.mf’.
- 2. Use 'mpost' to convert each character to a separate Encapsulated
- PostScript (EPS) file named 'myfont.NUM'.
+ 2. Use ‘mpost’ to convert each character to a separate Encapsulated
+ PostScript (EPS) file named ‘myfont.NUM’.
3. Process and merge the EPS files into a single "disassembled" Type 1
- font called 'myfont.pt1'.
+ font called ‘myfont.pt1’.
- 4. Run 't1asm' from the Type 1 Utilities to convert the disassembled
- font into a true, binary Type 1 font called 'myfont.pfb'.
+ 4. Run ‘t1asm’ from the Type 1 Utilities to convert the disassembled
+ font into a true, binary Type 1 font called ‘myfont.pfb’.
- 5. Invoke 'fontforge' to apply rendering hints to 'myfont.pfb' and to
+ 5. Invoke ‘fontforge’ to apply rendering hints to ‘myfont.pfb’ and to
attempt to remove overlapping paths.
- The external programs launched by 'mf2pt1'--'mpost', 't1asm', and
-'fontforge'--can be overridden by setting the eponymous, uppercase
+ The external programs launched by ‘mf2pt1’--‘mpost’, ‘t1asm’, and
+‘fontforge’--can be overridden by setting the eponymous, uppercase
environment variable. For example, invoking FontForge's predecessor,
PfaEdit, instead of FontForge is simply a matter of setting the
-'FONTFORGE' environment variable to 'pfaedit' before invoking 'mf2pt1'.
-As a corollary, you can inhibit an 'mf2pt1' external program from
+‘FONTFORGE’ environment variable to ‘pfaedit’ before invoking ‘mf2pt1’.
+As a corollary, you can inhibit an ‘mf2pt1’ external program from
running by setting the corresponding environment variable to the name of
a nonexistent program. Arguments can be included in the environment
-variable's value. Hence, defining 'MPOST' to 'mpost -recorder', for
-instance, instructs 'mf2pt1' to run 'mpost' with the '-recorder' option.
+variable's value. Hence, defining ‘MPOST’ to ‘mpost -recorder’, for
+instance, instructs ‘mf2pt1’ to run ‘mpost’ with the ‘-recorder’ option.
* Menu:
@@ -224,46 +224,46 @@ File: mf2pt1.info, Node: Restrictions, Next: Font information, Prev: Usage,
2.1 Restrictions
================
-If 'mf2pt1' sounds too good to be true, it is--somewhat. 'mf2pt1' is
+If ‘mf2pt1’ sounds too good to be true, it is--somewhat. ‘mf2pt1’ is
not a general-purpose Metafont-to-Type 1 converter. Rather, it can
convert only certain Metafont constructs. This is not a showstopper for
-new fonts designed with 'mf2pt1' in mind, but it is unlikely that
-'mf2pt1' will work on an arbitrary Metafont source file.
+new fonts designed with ‘mf2pt1’ in mind, but it is unlikely that
+‘mf2pt1’ will work on an arbitrary Metafont source file.
- 'mf2pt1''s biggest restriction is that each glyph must be drawn
+ ‘mf2pt1’'s biggest restriction is that each glyph must be drawn
entirely from closed paths, using Metafont's *fill* and *unfill*
-commands. ('mf2pt1' has limited support for *draw* and *undraw*, but
+commands. (‘mf2pt1’ has limited support for *draw* and *undraw*, but
their use is currently discouraged. *filldraw* and *unfilldraw* issue a
warning message and invoke *draw* and *undraw*, respectively.) The
Type 1 format requires that these paths be nonoverlapping. The
following are some of the alternatives for removing path overlaps:
1. Install FontForge. As part of its final step in producing a Type 1
- font, 'mf2pt1' instructs FontForge to replace overlapping paths
+ font, ‘mf2pt1’ instructs FontForge to replace overlapping paths
with nonoverlapping paths.
2. Remove overlaps using Metafont code within the font program itself.
- A '.zip' file attachment to a 6 January 2005 article
+ A ‘.zip’ file attachment to a 6 January 2005 article
(https://tug.org/pipermail/metapost/2005-January/000080.html) by
Boguslaw Jackowski on the MetaPost mailing list (subject: "Re: all
intersections between two paths") includes a MetaPost library which
assists with that task. The library provides a *find_outlines*
command which can be used to define a path as the union of two
other paths. A number of MetaPost example programs are also
- included in the '.zip' file.
+ included in the ‘.zip’ file.
3. Design your fonts from the beginning without using overlapping
paths.
- A secondary restriction is that 'mf2pt1' redefines a number of Plain
+ A secondary restriction is that ‘mf2pt1’ redefines a number of Plain
Metafont commands, such as *beginchar*, *fill*, and *unfill*. Metafont
font programs which redefine or bypass these (using Metafont primitives)
-will not be convertible with 'mf2pt1'.
+will not be convertible with ‘mf2pt1’.
- A far less severe restriction is due to 'mf2pt1''s utilizing
+ A far less severe restriction is due to ‘mf2pt1’'s utilizing
MetaPost's Metafont interface instead of Metafont itself. The
-implication is that commands not defined by MetaPost's 'mfplain.mp'
-cannot be handled by 'mf2pt1', either. Very few fonts will have a
+implication is that commands not defined by MetaPost's ‘mfplain.mp’
+cannot be handled by ‘mf2pt1’, either. Very few fonts will have a
problem with this restriction but see the MetaPost manual for more
information.
@@ -279,7 +279,7 @@ These include features such as the font's x-height, quad width,
interword stretchability and shrinkability, and other design
characteristics that TeX makes use of. PostScript fonts utilize a
largely different set of font parameters, such as the underline position
-and thickness, font family name, and copyright notice. 'mf2pt1'
+and thickness, font family name, and copyright notice. ‘mf2pt1’
provides Metafont commands to define the PostScript font parameters in
the generated Type 1 font. These parameters should appear in the
Metafont source file as follows:
@@ -288,9 +288,9 @@ Metafont source file as follows:
...
fi
-'ps_output' is defined by 'mf2pt1' but not by Plain Metafont. Checking
+‘ps_output’ is defined by ‘mf2pt1’ but not by Plain Metafont. Checking
if it is known is the recommended way to determine if the font is being
-built under 'mf2pt1'.
+built under ‘mf2pt1’.
* Menu:
@@ -306,23 +306,23 @@ File: mf2pt1.info, Node: Parameters, Next: Command-line equivalents, Prev: Fo
----------------
The following list presents all of the font-information commands
-provided by 'mf2pt1' and describes what each command means. Commands
+provided by ‘mf2pt1’ and describes what each command means. Commands
marked with an asterisk are also defined by Plain Metafont and therefore
-do not need to be enveloped within a test for 'ps_output'.
+do not need to be enveloped within a test for ‘ps_output’.
*font_coding_scheme*
The mapping between character numbers and PostScript names. If
- this is the name of a file, 'mf2pt1' expects it to contain
+ this is the name of a file, ‘mf2pt1’ expects it to contain
PostScript code defining a font-encoding vector. *Note Custom font
encodings::, for an example of such a file. If
- *font_coding_scheme* is not the name of a file, 'mf2pt1' expects it
- to be one of the literal strings 'standard' (Adobe standard
- encoding), 'isolatin1' (ISO Latin 1 encoding), 'ot1' (TeX 7-bit
- encoding), 't1' (TeX 8-bit encoding), or 'asis' (encoding
+ *font_coding_scheme* is not the name of a file, ‘mf2pt1’ expects it
+ to be one of the literal strings ‘standard’ (Adobe standard
+ encoding), ‘isolatin1’ (ISO Latin 1 encoding), ‘ot1’ (TeX 7-bit
+ encoding), ‘t1’ (TeX 8-bit encoding), or ‘asis’ (encoding
integrated with the character programs using the *glyph_name*
command as described in *note Custom font encodings::). Anything
- else will generate a warning message and cause 'mf2pt1' to use
- 'standard' instead.
+ else will generate a warning message and cause ‘mf2pt1’ to use
+ ‘standard’ instead.
*font_comment*
A textual comment that will appear within the generated font. This
@@ -330,20 +330,20 @@ do not need to be enveloped within a test for 'ps_output'.
*font_family*
The family that this font belongs to. For example, "Utopia Bold
- Italic" belongs to the 'Utopia' family.
+ Italic" belongs to the ‘Utopia’ family.
*font_fixed_pitch*
Whether the font is monospaced (if *true*) or or proportionally
spaced (if *false*).
*font_identifier (*)*
- The full name of the font, e.g., 'Utopia Bold Italic'.
+ The full name of the font, e.g., ‘Utopia Bold Italic’.
*font_name*
The symbolic font name, used to load the font from a PostScript
document. Spaces are forbidden. Generally, the font name is of
- the form 'FAMILY-MODIFIERS'. For example, the font name of Utopia
- Bold Italic would be 'Utopia-BoldItalic'.
+ the form ‘FAMILY-MODIFIERS’. For example, the font name of Utopia
+ Bold Italic would be ‘Utopia-BoldItalic’.
*font_size (*)*
The font design size. This is specified in "sharped" units within
@@ -351,7 +351,7 @@ do not need to be enveloped within a test for 'ps_output'.
*font_slant (*)*
When specified with *font_slant*, the amount of slant per point.
- When specified with '--italicangle', the angle in counterclockwise
+ When specified with ‘--italicangle’, the angle in counterclockwise
degrees from the vertical (i.e., zero for an upright font, negative
for a right-slanting italic font).
@@ -369,18 +369,18 @@ do not need to be enveloped within a test for 'ps_output'.
16,777,215, with the "open" range being 4,000,000-4,999,999. All
IDs not in that range are allocated by contacting Adobe's UniqueID
Coordinator. (I don't believe a fee is involved, but I don't know
- for sure.) If a unique ID is not specified, 'mf2pt1' will not
+ for sure.) If a unique ID is not specified, ‘mf2pt1’ will not
write a unique ID to the file. Note that Adobe no longer
recommends including unique IDs in fonts.
*font_version*
The version number of the font. This should be of the form
- 'MMM.MMM', where MMM is the major version number and MMM is the
+ ‘MMM.MMM’, where MMM is the major version number and MMM is the
minor version number.
*font_weight*
The font weight. For example, the font weight of Utopia Bold
- Italic is 'Bold'.
+ Italic is ‘Bold’.

File: mf2pt1.info, Node: Command-line equivalents, Next: Default values, Prev: Parameters, Up: Font information
@@ -392,36 +392,36 @@ Each of the font-information commands listed in *note Parameters:: has a
command-line equivalent. Their use is discouraged but they are listed
here for completeness:
-*font_coding_scheme* '--encoding'
+*font_coding_scheme* ‘--encoding’
-*font_comment* '--comment'
+*font_comment* ‘--comment’
-*font_family* '--family'
+*font_family* ‘--family’
-*font_fixed_pitch* '--fixedpitch'
+*font_fixed_pitch* ‘--fixedpitch’
-*font_identifier* '--fullname'
+*font_identifier* ‘--fullname’
-*font_name* '--name'
+*font_name* ‘--name’
-*font_size* '--designsize'
+*font_size* ‘--designsize’
-*font_slant* '--italicangle'
+*font_slant* ‘--italicangle’
-*font_underline_position* '--underpos'
+*font_underline_position* ‘--underpos’
-*font_underline_thickness* '--underthick'
+*font_underline_thickness* ‘--underthick’
-*font_unique_id* '--uniqueid'
+*font_unique_id* ‘--uniqueid’
-*font_version* '--fontversion'
+*font_version* ‘--fontversion’
-*font_weight* '--weight'
+*font_weight* ‘--weight’
- A special case is '--fixedpitch' which does not take an argument.
-Rather, you should use '--fixedpitch' as the equivalent of
-'font_fixed_pitch true' and '--nofixedpitch' as the equivalent of
-'font_fixed_pitch false'.
+ A special case is ‘--fixedpitch’ which does not take an argument.
+Rather, you should use ‘--fixedpitch’ as the equivalent of
+‘font_fixed_pitch true’ and ‘--nofixedpitch’ as the equivalent of
+‘font_fixed_pitch false’.

File: mf2pt1.info, Node: Default values, Next: Parameter example, Prev: Command-line equivalents, Up: Font information
@@ -432,11 +432,11 @@ File: mf2pt1.info, Node: Default values, Next: Parameter example, Prev: Comma
The next table lists the Metafont type and default value of each of the
parameters listed in *note Parameters::.
-*font_coding_scheme* *string* '"standard"'
+*font_coding_scheme* *string* ‘"standard"’
-*font_comment* *string* '"Font converted to
+*font_comment* *string* ‘"Font converted to
Type 1 by mf2pt1, written
- by Scott Pakin."'
+ by Scott Pakin."’
*font_family* *string* (The value of
*font_identifier*)
@@ -444,7 +444,7 @@ parameters listed in *note Parameters::.
*font_fixed_pitch* *boolean* *false*
*font_identifier* *string* (The input filename,
- minus '.mf')
+ minus ‘.mf’)
*font_name* *string* (The value of
*font_family*, plus an
@@ -453,7 +453,7 @@ parameters listed in *note Parameters::.
with all spaces removed)
*font_size* *numeric* (Must be specified or
- 'mf2pt1' will abort with
+ ‘mf2pt1’ will abort with
an error message)
*font_slant* *numeric* 0
@@ -466,9 +466,9 @@ parameters listed in *note Parameters::.
the range
4000000-4999999)
-*font_version* *string* '"001.000"'
+*font_version* *string* ‘"001.000"’
-*font_weight* *string* '"Medium"'
+*font_weight* *string* ‘"Medium"’

@@ -478,11 +478,11 @@ File: mf2pt1.info, Node: Parameter example, Prev: Default values, Up: Font in
-----------------------
As an example, the following Metafont code shows the usage of all of the
-parameters that 'mf2pt1' accepts:
+parameters that ‘mf2pt1’ accepts:
if known ps_output:
font_coding_scheme "ot1";
- font_comment "Copyright (C) 2021 Scott Pakin.";
+ font_comment "Copyright (C) 2005-2024 Scott Pakin.";
font_family "Kerplotz";
font_fixed_pitch false;
font_identifier "Kerplotz Light Oblique";
@@ -492,8 +492,7 @@ if known ps_output:
font_slant 1/6;
font_underline_position -1pt#;
font_underline_thickness 1/2pt#;
- font_unique_id "4112233"; % Better to omit
- this.
+ font_unique_id "4112233"; % Better to omit this.
font_version "002.005";
font_weight "Light";
fi
@@ -501,12 +500,12 @@ fi
In the above, the *font_fixed_pitch* call could have been omitted, as it
defaults to *false*. Also, unless you've requested a unique ID from
Adobe, it's generally better not to assign *font_unique_id*; let
-'mf2pt1' choose a random value itself.
+‘mf2pt1’ choose a random value itself.
The same parameters can also be specified on the command line as
follows:
- mf2pt1 --encoding=ot1 --comment="Copyright (C) 2021 Scott Pakin."
+ mf2pt1 --encoding=ot1 --comment="Copyright (C) 2005-2024 Scott Pakin."
--family=Kerplotz --nofixedpitch --fullname="Kerplotz Light Oblique"
--name=Kerplotz-LightOblique --designsize=10 --italicangle=-9.5
--underpos=-100 --underthick=50 --uniqueid=4112233 --version=002.005
@@ -516,7 +515,7 @@ Note that a Metafont font slant of 1/6 is equal to a PostScript italic
angle of approximately -9.5. The conversion formula is slant =
-tan(angle). In addition, the underline position and thickness must be
multiplied by 1000/*font_size* to convert from the Metafont units that
-are used within the '.mf' file to the PostScript units that are used on
+are used within the ‘.mf’ file to the PostScript units that are used on
the command line.

@@ -526,29 +525,29 @@ File: mf2pt1.info, Node: Additional command-line options, Next: Custom font en
===================================
In addition to the command-line options for setting font parameters that
-were presented in *note Parameters::, 'mf2pt1' supports a '--rounding'
-option. While 'mf2pt1' normally rounds all font coordinates to the
-nearest integer, '--rounding' increases coordinate precision by
-instructing 'mf2pt1' to round instead to the nearest multiple of a given
-fractional number. For example, '--rounding=0.25' rounds the coordinate
+were presented in *note Parameters::, ‘mf2pt1’ supports a ‘--rounding’
+option. While ‘mf2pt1’ normally rounds all font coordinates to the
+nearest integer, ‘--rounding’ increases coordinate precision by
+instructing ‘mf2pt1’ to round instead to the nearest multiple of a given
+fractional number. For example, ‘--rounding=0.25’ rounds the coordinate
(7.4, 10.3) to (7.5, 10.25) while it would otherwise be rounded to the
less-precise (7, 10).
Large glyphs can be problematic in MetaPost and therefore in
-'mf2pt1'. Unlike Metafont, MetaPost does not honor 'mag' for magnifying
+‘mf2pt1’. Unlike Metafont, MetaPost does not honor ‘mag’ for magnifying
dimensions. Rather, the number of PostScript (a.k.a. "big") points per
-pixel--'bpppix'--is hardwired to 0.02 and all other dimensions ('mm',
-'in', 'pt', etc.) are expressed in terms of that. Consequently, glyphs
+pixel--‘bpppix’--is hardwired to 0.02 and all other dimensions (‘mm’,
+‘in’, ‘pt’, etc.) are expressed in terms of that. Consequently, glyphs
that multiply a large number of font units by a dimension are likely to
exceed 4096, the largest value that MetaPost can represent in its
fixed-point format. If numerical overflow becomes a problem you can use
-the '--bpppix' option to 'mf2pt1' to change the value of 'bpppix'. For
-example, specifying '--bpppix=0.2' enables a tenfold increase in maximum
+the ‘--bpppix’ option to ‘mf2pt1’ to change the value of ‘bpppix’. For
+example, specifying ‘--bpppix=0.2’ enables a tenfold increase in maximum
glyph size (with a corresponding decrease in precision).
- After generating a Type 1 font, 'mf2pt1' runs it through FontForge to
+ After generating a Type 1 font, ‘mf2pt1’ runs it through FontForge to
add hinting information, remove overlaps, and otherwise clean up the
-generated font. The '--ffscript' option specifies the filename of a
+generated font. The ‘--ffscript’ option specifies the filename of a
FontForge script to use instead of the default script, which is listed
below:
@@ -566,10 +565,10 @@ below:
See the FontForge documentation for an explanation of each of those
commands and a description of other commands made available to FontForge
-scripts. 'mf2pt1' runs the script with one argument ('$1'), which is
-the name of the generated '.pfb' file.
+scripts. ‘mf2pt1’ runs the script with one argument (‘$1’), which is
+the name of the generated ‘.pfb’ file.
- 'mf2pt1' also supports a '--help' option which summarizes all of the
+ ‘mf2pt1’ also supports a ‘--help’ option which summarizes all of the
program's command-line options.

@@ -579,12 +578,12 @@ File: mf2pt1.info, Node: Custom font encodings, Next: Restoring mfplain defaul
=========================
*note Parameters::, lists the font encodings currently supported by
-'mf2pt1' and mentions that an alternate encoding can be specified by
+‘mf2pt1’ and mentions that an alternate encoding can be specified by
providing the name of an encoding file. To elaborate, the following
example represents the contents of an encoding file which defines
a--largely useless nowadays--EBCDIC font encoding:
- '% Sample encoding vector: EBCDIC
+ ‘% Sample encoding vector: EBCDIC
% The encoding vector must have a name and be defined as a
PostScript array.
@@ -614,23 +613,23 @@ a--largely useless nowadays--EBCDIC font encoding:
/_a237 /_a238 /_a239 /zero /one /two /three /four /five /six /seven
/eight /nine /_a250 /_a251 /_a252 /_a253 /_a254 /_a255
% Don't forget to end the array.
- ] def'
+ ] def’
All entries in the encoding vector are PostScript "names" and
therefore must be prefixed with a slash. Unnamed characters such as
-control characters are commonly named '_aNUMBER', where NUMBER is the
+control characters are commonly named ‘_aNUMBER’, where NUMBER is the
decimal offset into the character table. Undefined characters are
-indicated by '.notdef'. In the EBCDIC example, the character at
-position 0 in the font will be named 'a0'; the character at position 1
-will be named 'a1'; the character at position 74 will be named
-'bracketleft'; the character at position 129 will be named 'a'; and so
+indicated by ‘.notdef’. In the EBCDIC example, the character at
+position 0 in the font will be named ‘a0’; the character at position 1
+will be named ‘a1’; the character at position 74 will be named
+‘bracketleft’; the character at position 129 will be named ‘a’; and so
forth.
Individual characters can be mapped to an encoding either numerically
or by executing a *glyph_name* command within a character definition.
For example, the following code overrides the character position passed
to *beginchar* (i.e., 123) with whatever character position the current
-encoding has designated for the 'ohungarumlaut' glyph:
+encoding has designated for the ‘ohungarumlaut’ glyph:
beginchar (123, cap_height#-1/2pt#, cap_height#, 0);
if known ps_output:
@@ -642,17 +641,17 @@ encoding has designated for the 'ohungarumlaut' glyph:

File: mf2pt1.info, Node: Restoring mfplain defaults, Prev: Custom font encodings, Up: Usage
-2.5 Restoring 'mfplain' defaults
+2.5 Restoring ‘mfplain’ defaults
================================
-'mf2pt1' normally redefines *filldraw* as *fill* and *unfilldraw* and
+‘mf2pt1’ normally redefines *filldraw* as *fill* and *unfilldraw* as
*unfill* because Type 1 fonts don't allow overlapping curves.
-Similarly, 'mf2pt1' redefines *pencircle* as a 20-gon to coerce MetaPost
+Similarly, ‘mf2pt1’ redefines *pencircle* as a 20-gon to coerce MetaPost
into drawing it using a filled instead of a stroked PostScript path.
If you know you'll be postprocessing your fonts using FontForge,
which can automatically convert overlapping paths to nonoverlapping
-paths, then you can restore the original 'mfplain.mp' definitions of
+paths, then you can restore the original ‘mfplain.mp’ definitions of
*filldraw*, *unfilldraw*, and *pencircle* as follows:
if known ps_output:
@@ -677,29 +676,29 @@ locations, using commands such as *define_corrected_pixels*,
completely different manner. Type 1 hints distinguish key character
features, such as stems and dots, from decorations which can be
discarded at low resolutions. The PostScript interpreter uses that
-information to determine how to map points to pixels. Although 'mf2pt1'
+information to determine how to map points to pixels. Although ‘mf2pt1’
employs FontForge to autohint the fonts it generates, the approach is
mechanical and unlikely to hint as well as a human can do manually. It
-would be convenient for 'mf2pt1' one day to provide Metafont commands
+would be convenient for ‘mf2pt1’ one day to provide Metafont commands
for *hstem*, *vstem*, *dotsection*, and the other Type 1 hints. That
way, hints will no longer need to be re-added manually every time
-'mf2pt1' regenerates a Type 1 font.
+‘mf2pt1’ regenerates a Type 1 font.
- Another future addition to 'mf2pt1' is the addition of more font
-encodings. The following are the encodings that 'mf2pt1' will most
+ Another future addition to ‘mf2pt1’ is the addition of more font
+encodings. The following are the encodings that ‘mf2pt1’ will most
likely accept:
-'TeXMathItalicEncoding'
+‘TeXMathItalicEncoding’
Upper- and lowercase Greek and Latin letters, old-style digits, and
a few symbols and accents.
-'TeXMathSymbolEncoding'
+‘TeXMathSymbolEncoding’
A variety of symbols, as well as calligraphic Latin majuscules.
-'TeXMathExtensionEncoding'
+‘TeXMathExtensionEncoding’
Variable-sized symbols, such as braces, integrals, and radicals.
-'AdobeExpert'
+‘AdobeExpert’
Small caps, currency symbols, old-style digits, and various
superior and inferior letters and digits.
@@ -710,43 +709,43 @@ Acknowledgments
***************
Many thanks are owed to Werner Lemberg for writing the code underlying
-the '--rounding' option; for introducing the *glyph_name* command and
-'asis' encoding vector; for providing the default FontForge script
+the ‘--rounding’ option; for introducing the *glyph_name* command and
+‘asis’ encoding vector; for providing the default FontForge script
listed in *note Additional command-line options::; for fixing some
-code-generation bugs in 'mf2pt1'; for finding a more robust way to dump
-'mf2pt1.mem'; for directing me to the overlap-removal code mentioned in
+code-generation bugs in ‘mf2pt1’; for finding a more robust way to dump
+‘mf2pt1.mem’; for directing me to the overlap-removal code mentioned in
*note Restrictions::; for supplying the _crossproduct_, _makeline_, and
-_is_clockwise_ functions used by 'mf2pt1.mp'; for proposing the
-'--bpppix' command-line option; and for suggesting various features and
-improvements to 'mf2pt1'. Thanks also go to Werner Lemberg and Boguslaw
-Jackowski for updating the *is_clockwise* function in 'mf2pt1.mp' to
+_is_clockwise_ functions used by ‘mf2pt1.mp’; for proposing the
+‘--bpppix’ command-line option; and for suggesting numerous features and
+improvements to ‘mf2pt1’. Thanks also go to Werner Lemberg and Boguslaw
+Jackowski for updating the *is_clockwise* function in ‘mf2pt1.mp’ to
work around a bug in MetaPost which relates to the *turningnumber*
command. Finally, thanks go to Ralf Stubner for providing the T1
encoding vector and for pointing out a typo in the generated font
programs; to Michael Zedler for alerting me to problems with
-'--encoding' and suggesting I modify that option to accept PostScript
-'.enc' files; and to Michael Ummels for fixing a couple of bugs that
+‘--encoding’ and suggesting I modify that option to accept PostScript
+‘.enc’ files; and to Michael Ummels for fixing a couple of bugs that
made character widths in the generated fonts slightly too large.

Tag Table:
-Node: Top628
-Node: Introduction1166
-Node: Requirements2998
-Node: Installation4731
-Node: Usage6545
-Node: Restrictions8449
-Node: Font information10827
-Node: Parameters12185
-Node: Command-line equivalents15660
-Node: Default values17141
-Node: Parameter example19361
-Node: Additional command-line options21370
-Node: Custom font encodings23710
-Node: Restoring mfplain defaults27160
-Node: Future Work28019
-Node: Acknowledgments29883
+Node: Top627
+Node: Introduction1177
+Node: Requirements3025
+Node: Installation4798
+Node: Usage6696
+Node: Restrictions8688
+Node: Font information11122
+Node: Parameters12496
+Node: Command-line equivalents16047
+Node: Default values17600
+Node: Parameter example19844
+Node: Additional command-line options21843
+Node: Custom font encodings24275
+Node: Restoring mfplain defaults27761
+Node: Future Work28635
+Node: Acknowledgments30535

End Tag Table
diff --git a/Master/texmf-dist/doc/latex/beautybook/README.md b/Master/texmf-dist/doc/latex/beautybook/README.md
index 78eb52617bc..00571853256 100644
--- a/Master/texmf-dist/doc/latex/beautybook/README.md
+++ b/Master/texmf-dist/doc/latex/beautybook/README.md
@@ -12,12 +12,12 @@
beautybook is designed for writing books, created by [Ethan Lu](https://github.com/BeautyLaTeX/latex-template) , and maintained by [Ethan Lu](https://github.com/BeautyLaTeX/latex-template). Just enjoy it! If you have any questions, suggestions or bug reports, you can create issues or contact me at h1479840692@outlook.com.
-If you are an English user, then please use a cls file with the "-EN" suffix and compile the english tex file with pdfLaTeX, and conversely, if you are a Chinese user, then remember, use a cls file with the "-CN" suffix and compile the chinese tex file with the XeLaTeX engine!
+If you are an English user, then please write '\documentclass[lang=en]{beautybook}' in the premble and compile the english tex file with pdfLaTeX, and conversely, if you are a Chinese user, then remember, write '\documentclass[lang=cn]{beautybook}' in the premble and compile the chinese tex file with the XeLaTeX engine!
---
## Version
-Release 2024-06-30.
+Release 2024-07-03.
---
## License
diff --git a/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.pdf b/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.pdf
index 7dadd8e3c9c..23690e698da 100644
--- a/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.pdf
+++ b/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.tex b/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.tex
index bbfa40c4ae8..7e30e048145 100644
--- a/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.tex
+++ b/Master/texmf-dist/doc/latex/beautybook/beautybook-cn.tex
@@ -1,7 +1,7 @@
%% This work is released under the LaTeX Project Public License, v1.3c or later.
% This template is made by Ethan Lu.
% Please use XeLaTeX engine!
-\documentclass[zihao=-4,fontset=windows]{beautybook-CN}
+\documentclass[lang=cn,zihao=-4,a4paper,fontset=windows]{beautybook}
% ---------------------------------------------------------------------------- %
% The Cover Theme Chosen %
% ---------------------------------------------------------------------------- %
@@ -19,7 +19,10 @@
\mathstyle={ % 数学字体键值列表
math-font=plain, %plain (默认数学字体); stix; mtpro2
}
-\setmainfont{Times New Roman}
+\RequirePackage{fontspec}
+\setmainfont{XITS}
+\setsansfont{DejaVu Sans}
+\setmonofont{Latin Modern Mono}
\renewcommand{\partial}{∂}
%% First one
\mynewtheorem{
@@ -243,12 +246,12 @@ sorting=nty
\begin{document}
\thispagestyle{empty}
\title{Beautybook模板简介}
-\subtitle{}
+\subtitle{这是一个副标题!}
\edition{First Edition}
-\bookseries{Illustrated by Ethan Lu}
+\bookseries{Ilustrated by Ethan Lu}
\author{Ethan Lu}
\pressname{Beautybook}
-\presslogo{inner_pics/logo.png}
+\presslogo{inner_pics/beautybook-logo.png}
\coverimage{inner_pics/coverimage.jpg}%ivy-ge998908f8_1280.jpg
\makecover
@@ -355,7 +358,29 @@ Beauty\LaTeX{} 系列模板是由我所做的书籍模板系列, 名叫\textbf{B
以下是最小工作示例:
\begin{lstlisting}
-\documentclass[zihao=-4,fontset=windows]{beautybook-CN}
+\documentclass[lang=cn,zihao=-4,a4paper,fontset=windows]{beautybook}
+% ---------------------------------------------------------------------------- %
+% The Cover Theme Chosen %
+% ---------------------------------------------------------------------------- %
+\definecolor{coverbgcolor}{HTML}{e0e0e0}
+\definecolor{coverfgcolor}{HTML}{1f3134} % The color of the background
+\definecolor{coverbar}{HTML}{7c9092} % The color of the left bar
+\definecolor{bottomcolor}{HTML}{2c4f54}
+\definecolor{nuanbai}{HTML}{f5f5f5}
+\coverstyle={ % 封面键值列表
+ cover-choose=cn, % cn ; en ; enfig ; birkar
+}
+% ---------------------------------------------------------------------------- %
+% The Cover Theme Chosen %
+% ---------------------------------------------------------------------------- %
+\mathstyle={ % 数学字体键值列表
+ math-font=plain, %plain (默认数学字体); stix; mtpro2
+}
+\RequirePackage{fontspec}
+\setmainfont{XITS}
+\setsansfont{DejaVu Sans}
+\setmonofont{Latin Modern Mono}
+\renewcommand{\partial}{∂}
\coverstyle={ % 封面键值列表
cover-choose=cn, % cn ; en ; enfig ; birkar
}
@@ -683,15 +708,15 @@ tlmgr update --self --all --reinstall-forcibly-removed
-\chapter{Beautybook 设置说明}
+\chapter{beautybook 设置说明}
-本模板英文版基于基础的 book 文类, 中文版则基于ctexbook文类,所以 book或者ctexbook 的选项对于本模板也是有效的。默认编码为 UTF-8,推荐使用 \TeX{} Live 编译。
+本模板英文版基于基础的 book 文类, 中文版则基于ctexbook文类,所以 book或者 ctexbook 的选项对于本模板也是有效的。默认编码为 UTF-8,推荐使用 \TeX{} Live 编译。
\section{语言模式}
-本模板内含两套基础语言环境, 分别为 中文的\lstinline{beautybook-CN.cls}、英文的\lstinline{beautybook-EN.cls}。改变语言环境会改变图表标题的引导词(图,表),文章结构词(比如目录,参考文献等),以及定理环境中的引导词(比如定理,引理等)。不同语言模式的启用如下:
+本模板内含两套基础语言环境, 分别为中文和英文。改变语言环境会改变图表标题的引导词(图,表),文章结构词(比如目录,参考文献等),以及定理环境中的引导词(比如定理,引理等)。不同语言模式的启用如下:
\begin{lstlisting}
-\documentclass{beautybook-CN} % 中文
-\documentclass{beautybook-EN} % 英文
+ \documentclass[lang=cn,zihao=-4,a4paper,fontset=windows]{beautybook} % 中文
+ \documentclass[lang=en]{beautybook} % 英文
\end{lstlisting}
除模板自带的两套语言设定之外,如果您需要使用其他语言, 可以通过更改cls文件中这几处解决, 分别为
@@ -700,7 +725,6 @@ tlmgr update --self --all --reinstall-forcibly-removed
\item 更改 part环境的名称 \lstinline{Part \thepart}为 \lstinline{(你的语言中part的翻译) \thepart}
\item 主文件,即当前文件导言区中的定理引导词
\item 更改chapter环境中的part名称如第一条所示
- \item 记住, 仅有亚洲语言环境可以使用ctexbook文类, 即基于\lstinline{beautybook-CN.cls}更改, 其他西语环境需要基于\lstinline{beautybook-EN.cls}更改.
\end{enumerate}
@@ -756,7 +780,7 @@ tlmgr update --self --all --reinstall-forcibly-removed
\subsection{徽标}
-本文用到的 Logo 为wiki随意找的springer经典马标, 可以自己查询下载出版社logo, 为免侵权,在更换图片的时候请选择合适合法的图片进行替换。
+本文用到的 Logo 为作者自行制作的beautybook专用Logo, 另外还可以使用自己的logo, 为免侵权,在更换图片的时候请选择合适合法的图片进行替换。
\subsection{自定义封面}
@@ -813,7 +837,7 @@ tlmgr update --self --all --reinstall-forcibly-removed
\subsubsection{个人版权的盒子共两种}
\begin{definition}[][名称][def label]
- 这是个人定制的盒子定制的定理环境,这是其中定义环境示例。注意:使用方法如下
+ 这是采用个人定制的盒子制作的定理环境,这是其中定义环境示例。注意:使用方法如下
\begin{itemize}
\item 如果你没有名称和标签,使用方法为
\begin{lstlisting}
diff --git a/Master/texmf-dist/doc/latex/beautybook/beautybook-en.pdf b/Master/texmf-dist/doc/latex/beautybook/beautybook-en.pdf
index 3203378b04f..e91e8bbe011 100644
--- a/Master/texmf-dist/doc/latex/beautybook/beautybook-en.pdf
+++ b/Master/texmf-dist/doc/latex/beautybook/beautybook-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/beautybook-en.tex b/Master/texmf-dist/doc/latex/beautybook/beautybook-en.tex
index 18c81b9fbf1..c9c6b9405d5 100644
--- a/Master/texmf-dist/doc/latex/beautybook/beautybook-en.tex
+++ b/Master/texmf-dist/doc/latex/beautybook/beautybook-en.tex
@@ -1,4 +1,11 @@
-\documentclass[12pt]{beautybook-EN}
+\documentclass[lang=en,12pt]{beautybook}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage{times} % Times New Roman Font
+\RequirePackage[T1]{fontenc}
+\RequirePackage{microtype}
+\RequirePackage{pgfplots}
+\tikzset{>=Stealth}
+\pgfplotsset{compat=1.18}
% ---------------------------------------------------------------------------- %
% The Cover Theme Chosen %
% ---------------------------------------------------------------------------- %
@@ -17,6 +24,11 @@
math-font=plain, % plain; stix; mtpro2
}
\usepackage{bm}
+\renewcommand*{\textfraction}{0.05}
+\renewcommand*{\topfraction}{0.9}
+\renewcommand*{\bottomfraction}{0.8}
+\renewcommand*{\floatpagefraction}{0.85}
+
% \overfullrule=1pt
% \RequirePackage[fontsize=13.5pt]{fontsize}
%% First one
@@ -240,12 +252,12 @@ sorting=nty
\begin{document}
\thispagestyle{empty}
\title{An Introduction to beautybook template}
-\subtitle{}
+\subtitle{A subtitle here}
\edition{First Edition}
-\bookseries{Illustrated by Ethan Lu}
+\bookseries{Ilustrated by Ethan Lu}
\author{Ethan Lu}
\pressname{beautybook}
-\presslogo{inner_pics/logo.png}
+\presslogo{inner_pics/beautybook-logo.png}
\coverimage{inner_pics/coverimage.jpg}%ivy-ge998908f8_1280.jpg
\makecover
@@ -346,7 +358,7 @@ The Project Addresses are the following.
\section{Installation and Maintenance of Template}
-There are two ways you can use this template. The first method is trivial that just download the zip of template from above channel, and then unzip and compile the main file in the archive (i.e. a file with a name like ``Beautybook-xx. tex"). The second way is uploading the zip of template to \texttt{overleaf} to comply.
+There are two ways you can use this template. The first method is trivial that just download the zip of template from above channel, and then unzip and compile the main file in the archive (i.e. a file with a name like ``beautybook-xx. tex"). The second way is uploading the zip of template to \texttt{overleaf} to comply.
Note that if you choose the second way, you must write \lstinline{math-font=plain} in the premble of the main file!
@@ -359,10 +371,17 @@ To install locally, follow above steps to download the latest version from GitHu
The following is an example of a minimal work:
\begin{lstlisting}
-\documentclass[12pt]{beautybook-EN}
-% ---------------------------------------------------------------------------- %
+\documentclass[lang=en,12pt]{beautybook}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage{times} % Times New Roman Font
+\RequirePackage[T1]{fontenc}
+\RequirePackage{microtype}
+\RequirePackage{pgfplots}
+\tikzset{>=Stealth}
+\pgfplotsset{compat=1.18}
+% ------------------------------------------------- %
% The Cover Theme Chosen %
-% ---------------------------------------------------------------------------- %
+% ------------------------------------------------- %
\definecolor{coverbgcolor}{HTML}{e0e0e0}
\definecolor{coverfgcolor}{HTML}{1f3134} % The color of the background
\definecolor{coverbar}{HTML}{7c9092} % The color of the left bar
@@ -601,8 +620,8 @@ sorting=nty
\edition{The Edition}
\bookseries{Illustrated by author}
\author{author}
-\pressname{press}
-\presslogo{inner_pics/logo.png}
+\pressname{beautybook}
+\presslogo{inner_pics/beautybook-logo.png}
\coverimage{inner_pics/coverimage.jpg}%ivy-ge998908f8_1280.jpg
\makecover
@@ -711,17 +730,17 @@ tlmgr update --self --all --reinstall-forcibly-removed
Please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \TeX{} distribution?} for more information.
-\chapter{The setting of Beautybook Template}
+\chapter{The setting of beautybook Template}
The English version of this template is based on the basic ``book" class, and the Chinese version is based on the ``ctexbook" class, so the option of book or ctexbook is also valid for this template. The default encoding is \texttt{UTF-8}, and it is recommended to compile with \TeX{} Live.
\section{Language Mode}
-This template includes two basic locales: \lstinline{Beautybook-CN.cls} in Chinese and \lstinline{Beautybook-EN.cls} in English. Changing the locales alters the headings (including figures and tables) of the chart title, the article formatting (such as table of contents and references), and the language used for theorem contexts (such as Theorem, Lemma, etc.). You can switch between these language modes using the following instructions in the top of the premble:
+This template includes two basic locales: Chinese and English. Changing the locales alters the headings (including figures and tables) of the chart title, the article formatting (such as table of contents and references), and the language used for theorem contexts (such as Theorem, Lemma, etc.). You can switch between these language modes using the following instructions in the top of the premble:
\begin{lstlisting}
-\documentclass{beautybook-CN} % chinese
-\documentclass{beautybook-EN} % english
+ \documentclass[lang=cn,zihao=-4,a4paper,fontset=windows]{beautybook} % chinese
+ \documentclass[lang=en,12pt]{beautybook} % english
\end{lstlisting}
In addition to the two language settings that come with the template, if you need to use another language, you can do so by modifying the \texttt{.cls} file as follows
@@ -729,7 +748,6 @@ In addition to the two language settings that come with the template, if you nee
\begin{enumerate}
\item Change the name of the part environment \lstinline{Part\ \thepart} to \lstinline{(translation of part in your language)\ \thepart}
\item Theorem environment guide words in premble, such as Theorem.
- \item Please remember that only Asian languages can be modified based on \lstinline{beautybook-CN.cls}, other foreign languages need to be modified based on \lstinline{beautybook-EN.cls}.
\end{enumerate}
\section{Theme Color}
@@ -880,19 +898,19 @@ Here is the effect of the theorem environment provided by amsthm.
\end{definition}
\begin{theorem}
- The usage is the same as above, refer to the tag \ref{def label} below or you can \autoref{def label}.
+ The usage is the same as above, refer to the tag \ref{def label} below or you can use \autoref{def label}.
\end{theorem}
\begin{lemma}
- The usage is the same as above, refer to the tag \ref{def label} below or you can \autoref{def label}.
+ The usage is the same as above, refer to the tag \ref{def label} below or you can use \autoref{def label}.
\end{lemma}
\begin{corollary}
- The usage is the same as above, refer to the tag \ref{def label} below or you can \autoref{def label}.
+ The usage is the same as above, refer to the tag \ref{def label} below or you can use \autoref{def label}.
\end{corollary}
\newpage
\begin{example}
- The usage is the same as above, refer to the tag \ref{def label} below or you can \autoref{def label}.
+ The usage is the same as above, refer to the tag \ref{def label} below or you can use \autoref{def label}.
\end{example}
\subsection*{Ancient style box}
\begin{fancybox}
diff --git a/Master/texmf-dist/doc/latex/beautybook/inner_pics/beautybook-logo.png b/Master/texmf-dist/doc/latex/beautybook/inner_pics/beautybook-logo.png
new file mode 100644
index 00000000000..9a1c819103b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beautybook/inner_pics/beautybook-logo.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/inner_pics/hummingbird-8013214.jpg b/Master/texmf-dist/doc/latex/beautybook/inner_pics/hummingbird-8013214.jpg
new file mode 100644
index 00000000000..424cd0909ff
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beautybook/inner_pics/hummingbird-8013214.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/inner_pics/logo.png b/Master/texmf-dist/doc/latex/beautybook/inner_pics/logo.png
deleted file mode 100644
index 470edd8a518..00000000000
--- a/Master/texmf-dist/doc/latex/beautybook/inner_pics/logo.png
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/inner_pics/mystery-1599527.jpg b/Master/texmf-dist/doc/latex/beautybook/inner_pics/mystery-1599527.jpg
new file mode 100644
index 00000000000..19c0518b005
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beautybook/inner_pics/mystery-1599527.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c10.pdf b/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c10.pdf
new file mode 100644
index 00000000000..76256c2f825
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c10.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c11.pdf b/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c11.pdf
new file mode 100644
index 00000000000..b100782f856
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c11.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c9.pdf b/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c9.pdf
new file mode 100644
index 00000000000..98d9e6a8640
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beautybook/inner_pics/titleimages/c9.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/README b/Master/texmf-dist/doc/latex/biblatex-publist/README
index 8d8b26f969f..f452a57a9f0 100644
--- a/Master/texmf-dist/doc/latex/biblatex-publist/README
+++ b/Master/texmf-dist/doc/latex/biblatex-publist/README
@@ -46,6 +46,15 @@ instructions.
== CHANGES ==
+* V. 2.12 (2024-07-16):
+ - Externalize localization to *.lbx files.
+ - Add \citeitemrange and \citesecitemrange commands.
+ - Fix error with section count on first run.
+
+* V. 2.11 (2024-07-02):
+ - Add \citesecitem and \citesecitem* commands.
+ - Support multiple sections in \GetSectionCount.
+
* V. 2.10 (2024-06-17):
- Add bibchecks to show only/no peer-reviewed items.
- Fix bibchecks to work with braced and non-braced values.
diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf
index a7dfe989e1e..1d58e50fd55 100644
--- a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex
index 788f3e6df05..a140ad01331 100644
--- a/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex
@@ -115,7 +115,7 @@
\thanks{Please report issues via \protect\url{https://github.com/jspitz/biblatex-publist}.}%
}
-\date{Version 2.10, 2024/06/17}
+\date{Version 2.12, 2024/07/16}
\maketitle
\begin{abstract}
@@ -200,7 +200,7 @@ forms of citing may break or not produce the expected result. The reason is that
The standard way of using the package is to load the style file via
\begin{lstlisting}[moretexcs={[1]{plauthorname}}]
-\usepackage[bibstyle=publist]{biblatex}
+\usepackage[style=publist]{biblatex}
\plauthorname[first name][von-part]{surname}
\end{lstlisting}
The \jcsmacro*{plauthorname} macro\footnote{The macro was named \jfcsmacro{omitname} until v.\,1.4
@@ -213,31 +213,27 @@ it defines the name(s) of the person(s) whose publications are listed.
By default, the author\slash editor name(s) will be omitted completely
for all publications which are authored or edited only by the specified person(s), as in:
-\begin{quote}
-\textbf{2012.} Some recent trends in gardening. In: \emph{Gardening
-Practice} 56, pp.~34--86.
-\end{quote}
+\begin{itemize}
+\item[{[1]}] \textbf{2012.} Some recent trends in gardening. In: \emph{Gardening
+ Practice} 56, pp.~34--86.
+\end{itemize}
If there are co-authors\slash co-editors, your name(s) will be filtered
out and the collaborators added in parentheses, as in:
-\begin{quote}
-\textbf{1987} (with John Doe and Mary Hall). Are there new trends
-in gardening? In: \emph{Gardening Practice} 24, pp.~10--15.
-\end{quote}
+\begin{itemize}
+\item[{[2]}] \textbf{1987} (with John Doe and Mary Hall). Are there new trends
+ in gardening? In: \emph{Gardening Practice} 24, pp.~10--15.
+\end{itemize}
If \joption{plauthorhandling=highlight} is used (see next section), the plauthor(s)
will be printed in bold face instead, as in:
-\begin{quote}
- Doe, John, \textbf{Myself, Me} and Hall, Mary, \textbf{1987}. Are there new trends
- in gardening? In: \emph{Gardening Practice} 24, pp.~10--15.
-\end{quote}
+\begin{itemize}
+\item[{[2]}] Doe, John, \textbf{Myself, Me} and Hall, Mary, \textbf{1987}. Are there new trends
+ in gardening? In: \emph{Gardening Practice} 24, pp.~10--15.
+\end{itemize}
%
Note that \jcsmacro{plauthorname} expects the name constituents as they are recorded in the
database (special characters are handled). The option \joption{plauthorfirstinit} (see next section),
however, allows you to pass only an initial character instead of a first name.
-If you want to refer to an item number, use \jcsmacro*{citeitem}\jmacro{\{<key>\}} within your publication list.
-This will print the item number in square brackets (like the \jfcsmacro{cite} command in numeric citation styles),
-but as opposed to normal \jfcsmacro{cite} it also considers all numbering tweaks you make via the \bpl\ options.
-
\subsection{Additional Options}\label{sec:addopts}
@@ -374,8 +370,8 @@ See section~\ref{sec:clicktitles} for details.
All options listed here should be passed directly to \bibltx\ via \jfcsmacro{usepackage} when loading \bibltx, and they apply to the whole
document.
-For most options, it is possible to change them (repeatedly) within the document. To this end, the macro
-\jcsmacro*[-3]{ExecutePublistOptions} is provided. It takes a comma-separated list of options as its mandatory argument
+For most options, it is possible to change them within the document via the macro
+\jcsmacro*[-3]{ExecutePublistOptions}. It takes a comma-separated list of options as mandatory argument
and can be used (repeatedly) in preamble or anywhere in the document body.
The executed options apply as of the next bibliography (\jfcsmacro{printbibliography}) that follows.
Options that \emph{cannot} be changed within a document that way are \joption{plnumbering} and \joption{pubstateextra},
@@ -385,6 +381,57 @@ Also note that with the \joption{plauthor*} options, as opposed to repeated \jcs
repeated setting of these name options respectively \emph{overwrite}, and not extend, the previous name settings.
+\subsection{Referring to Entries}\label{sec:citeitems}
+
+Even though publication lists usually do not include citations, there might be cases where you need to refer
+to specific entries within it. Especially with sectioned lists, it is arguably most advisable to refer to the items
+by their number, as otherwise your readers will have a hard time to find the item you are referring to.
+Of course, if you do not use global numbering, you should also specify the section the item is in, as in:
+``see [13] (sec.~4)''.
+
+Since \bpl\ plays all sorts of tricks with the numbering (see sec.~\ref{sec:numbers}), the reference needs to take these
+into account. The normal citation commands will often produce inadequate or even wrong output particularly in numeric
+style.
+To account for these peculiarities, the package ships its own cite style which is used if you load \bpl\ via
+\joption{style=publist} (but not with \joption{bibstyle=publist}!). The features described in what follows require
+this particular cite style.
+
+If you want to refer to an item number, use \jcsmacro*{citeitem}\jmacro{\{<key(s)>\}} within your publication list.%
+\footnote{As with the normal citation commands, the argument might also be a comma-separated list of keys.}
+This will print the item number in square brackets (like the \jfcsmacro{cite} command in numeric citation styles),
+but as opposed to normal \jfcsmacro{cite} it also considers all numbering tweaks you make via the \bpl\ options.
+Note, however, that with refsections (see sec.~\ref{sec:example}) \jcsmacro{citeitem} only works within a given
+refsection because the references in a refsection are unknown outside of its scope.
+
+If you want to refer to an item number from outside a refsection, you can use \jcsmacro*{citesecitem}\jmacro{\{<key(s)>\}}.
+This will try to access the number of the given entry from a stored list that is generated by \bpl.
+References of this kind only make sense, of course, with global numbering and if an entry only occurs once in the bibliography,
+since otherwise they would be too ambiguous. However, for locally numbered lists, there is the starred variant
+\jcsmacro*{citesecitem*}\jmacro{\{<key(s)>\}} which will append a reference to the section the item is in.
+By default, the form of this addition is ``(sec.~<no.>)'', with ``sec.'' being localized (see sec.~\ref{sec:auxmacros}
+on how to customize this).
+
+All these commands have counterparts which can be used to refer to a range of entries:
+\begin{itemize}
+ \setlength\itemsep{0pt}
+ \item \jcsmacro*{citeitemrange}\jmacro{\{<first key>\}}\jmacro{\{<last key>\}}
+ \item \jcsmacro*{citesecitemrange}\jmacro{\{<first key>\}}\jmacro{\{<last key>\}}
+ \item \jcsmacro*{citesecitemrange*}\jmacro{\{<first key>\}}\jmacro{\{<last key>\}}
+\end{itemize}
+%
+The range will by default be indicated by an en-dash ([12]--[17]), you can change this by redefining the
+macro \jcsmacro*{itemrangesep}.
+
+Note that due to the design of refsections, no hyperlinks can be generated for the item number with \jcsmacro{citesecitem}
+(or its starred and range counterparts) and the \textsf{hyperref} package being loaded; the section reference of the starred
+commands, however, is hyperlinked in this case.
+If you need hyperlinked item references, consider refsegments rather than refsections and the \jcsmacro{citeitem} command
+(although this will have other drawbacks).
+
+Of course, both \jcsmacro{citeitem} and \jcsmacro{citesecitem} presuppose that you do not disable numbering, and
+\jcsmacro{citesecitem*} requires numbered section headers.
+
+
\subsection{Numbers Games}\label{sec:numbers}
Among the peculiarities of publication lists is the greater variety of numbering conventions, as compared
@@ -474,12 +521,14 @@ The macro \jcsmacro*{GetTotalCount} outputs the total number of entries in your
If you want to output the number of publications per section (when employing \jfcsmacro{refsection}),
you can use the macro \jcsmacro*{GetSectionCount} which takes one optional argument, the section
-number. For instance,
+number or a comma-separated list of section numbers. For instance,
\begin{lstlisting}[moretexcs={[4]{GetSectionCount}}]
\GetSectionCount[1]
\end{lstlisting}
-outputs the number of items in the first section. If the optional argument is not given, the
-statistics for the current section is output (this requires the macro to be within a \jfcsmacro{refsection}).
+outputs the number of items in the first section, whereas \lstinline!\GetSectionCount[1,2]! outputs
+the sum of the numbers of items in the first and second section.
+If the optional argument is not given, the statistic for the current section is output
+(this requires the macro to be within a \jfcsmacro{refsection}).
Note that both values might require additional \LaTeX\ runs to get properly set. You will
get a package warning if additional runs are needed.
@@ -526,16 +575,16 @@ taken care of specifically.
With \joption{plauthorhandling=omit}, the \jfoption{maxnames} value specifies how many co-authors are added in parenthesis (the omitted
author name is not counted here). If the treshold is reached, \emph{et al.}\ (or the corresponding localized string) is appended (and the list truncated
to the \jfoption{minnames} value, \jfoption{1} by default). So you get something like:
-\begin{quote}
- \textbf{2020} (with John Doe et al.). What's up in gardening? In: \emph{Gardening Practice} 44, pp.~1--7.
-\end{quote}
+\begin{itemize}
+ \item[{[3]}] \textbf{2020} (with John Doe et al.). What's up in gardening? In: \emph{Gardening Practice} 44, pp.~1--7.
+\end{itemize}
%
With \joption{plauthorhandling=highlight}, \bpl\ outputs all publist authors, even if the \jfoption{maxnames} treshold has been reached.
However, other authors (beyond \jfoption{minnames}) are omitted. If they come before a publist author, this is indicated by [\ldots\unkern],
if authors follow after all publication list authors, \emph{et al.} is appended, as in:
-\begin{quote}
- Doe, John, [\ldots\unkern], \textbf{Myself, Me}, et al., \textbf{2020}. What's up in gardening? In: \emph{Gardening Practice} 44, pp.~1--7.
-\end{quote}
+\begin{itemize}
+ \item[{[3]}] Doe, John, [\ldots\unkern], \textbf{Myself, Me}, et al., \textbf{2020}. What's up in gardening? In: \emph{Gardening Practice} 44, pp.~1--7.
+\end{itemize}
%
The omission indicator, \jcsmacro*{plnameomission}, can be redefined. The default definition is:
\begin{lstlisting}[moretexcs={[4]{plnameomission,bibellipsis,addcomma,addspace}}]
@@ -663,6 +712,16 @@ The default definition is:
\newcommand*\plextrainfosep{\addsemicolon\addspace}
\end{lstlisting}
%
+The\jmcsmacro{secitemsecref} section reference with \jcsmacro{citesecitem*} is determined by
+\jcsmacro{secitemsecref}, which has the following default definition:
+\begin{lstlisting}[moretexcs={[2]{mkbibparens,secitemsecref,bibstring,addnbspace}}]
+\newcommand*\secitemsecref[1]{%
+ \mkbibparens{\bibstring{section}\addnbspace\ref{refsection:#1}}%
+}
+\end{lstlisting}
+%
+Redefine this macro if you need a different output.
+
The indendation of the bibliographic entries (lines > 1) can be adjusted by setting the length
\jmacro*{extralabel\-numberwidth} via \jfcsmacro{setlength} (default is \texttt{0pt}).
This might be needed for long bibliographies (> 99 entries) in order to adjust to the extra
@@ -715,31 +774,52 @@ are printed, so you might get redundant output. To control (e.\,g., omit) them,
\section{Localization}\label{sec:localization}
Since the package draws on \bibltx, it supports localization.
-The following additional localization keys (\jfcsmacro{bibstrings})
-are added by the package:
-\begin{itemize}
+The following additional localization keys (\texttt{bibstrings})
+are added by the package, in verbose and abbreviated form (depending
+on your setting of the \bibltx\ option \joption{abbreviate}):
+
+\begin{description}
\setlength{\itemsep}{0pt}
-\item \emph{impactfactor}: the expression \enquote{impact factor}.
-\item \emph{openaccess:true}: the expression \enquote{OpenAccess}.
-\item \emph{openaccess:gold}: the phrase \enquote{OpenAccess (gold)}.
-\item \emph{openaccess:green}: the phrase \enquote{OpenAccess (green)}.
-\item \emph{parttranslationof}: the expression \enquote{partial translation of}
+\item[impactfactor] the expression \enquote{impact factor} (short form: \enquote{JIF}).
+\item[openaccess:true] the expression \enquote{OpenAccess} (short form: \enquote{OA}).
+\item[openaccess:gold] the phrase \enquote{OpenAccess (gold)} (short form: \enquote{OA (gold)}).
+\item[{openaccess:green}] the phrase \enquote{OpenAccess (green)} (short form: \enquote{OA (green)}).
+\item[{parttranslationof}] the phrase \enquote{partial translation of} (short form: \enquote{part.\ trans.\ of})
for entries referring to partially translated work via \bibltx's
\enquote*{related entries} feature (see sec.~\ref{sec:partial-translations}).
-\item \emph{peerreview:sb}: the phrase \enquote{single blind peer review}.
-\item \emph{peerreview:db}: the phrase \enquote{double blind peer review}.
-\item \emph{peerreview:op}: the phrase \enquote{open peer review}.
-\item \emph{peerreview:co}: the phrase \enquote{collaborative peer review}.
-\item \emph{peerreview:cc}: the phrase \enquote{cascading peer review}.
-\item \emph{peerreview:tp}: the phrase \enquote{third-party peer review}.
-\item \emph{peerreview:pp}: the phrase \enquote{post-publication peer review}.
-\item \emph{peerreview:no}: the phrase \enquote{no peer review}.
-\item \emph{with}: the preposition \enquote{with} that precedes the list of
- co-authors by default (i.\,e., with \joption{plauthorhandling=omit}).
+\item[{peerreview:sb}] the phrase \enquote{single blind peer review} (short form: \enquote{single blind peer rev.}).
+\item[{peerreview:db}] the phrase \enquote{double blind peer review} (short form: \enquote{double blind peer rev.}).
+\item[{peerreview:op}] the phrase \enquote{open peer review} (short form: \enquote{open peer rev}).
+\item[{peerreview:co}] the phrase \enquote{collaborative peer review} (short form: \enquote{collab.\ peer rev.}).
+\item[{peerreview:cc}] the phrase \enquote{cascading peer review} (short form: \enquote{casc.\ peer rev.}).
+\item[{peerreview:tp}] the phrase \enquote{third-party peer review} (short form: \enquote{3rd-party peer rev.}).
+\item[{peerreview:pp}] the phrase \enquote{post-publication peer review} (short form: \enquote{post-pub.\ peer rev.}).
+\item[{peerreview:no}] the phrase \enquote{no peer review} (short form: \enquote{no peer rev.}).
+\item[{with}] the preposition \enquote{with} that precedes the list of
+ co-authors by default (i.\,e., with \joption{plauthorhandling=omit}) (short and verbose forms identical).
+\end{description}
+%
+Localization is provided in dedicated language definition files which follow
+the naming scheme, \texttt{<language>-publist.lbx}.
+The package currently ships such files for the following languages and their varieties:
+
+\begin{flushleft}
+\begin{itemize}
+\setlength{\itemsep}{0pt}
+ \item English (\texttt{american}, \texttt{australian}, \texttt{british},
+ \texttt{canadian}, \texttt{english}, \texttt{newzealand},
+ \texttt{UKenglish}, \texttt{USenglish})
+ \item French (\texttt{french})
+ \item German (\texttt{austrian}, \texttt{german}, \texttt{naustrian}, \texttt{ngerman},
+ \texttt{nswissgerman}, \texttt{swissgerman})
\end{itemize}
-Currently, these additional localization keys are available in the following
-languages: English, French and German.%
-\footnote{Please send suggestions for other languages to the package author.}
+\end{flushleft}
+%
+If you want to add support for other languages, you can simply copy one of the existing
+lbx files, name it \texttt{<yourlanguage>-publist.lbx} and adapt the localization keys.
+
+If you are confident enough, please send me your file so I can consider adding it to
+the package.
\section{Further Extensions}
@@ -979,6 +1059,21 @@ until further change).
\section{Revision Log}
\begin{description}
+ \item [{V. 2.12 (2024/07/16):}]~
+ \begin{itemize}
+ \item Externalize localization to \texttt{*.lbx} files.
+ \item Add \jcsmacro{citeitemrange} and \jcsmacro{citesecitemrange} commands
+ (see sec.~\ref{sec:citeitems}).
+ \item Fix error with section count on first run.
+ \end{itemize}
+
+ \item [{V. 2.11 (2024/07/02):}]~
+ \begin{itemize}
+ \item Add \jcsmacro{citesecitem} and \jcsmacro{citesecitem*} commands
+ (see sec.~\ref{sec:citeitems}).
+ \item Support multiple sections in \jcsmacro{GetSectionCount}.
+ \end{itemize}
+
\item [{V. 2.10 (2024/06/17):}]~
\begin{itemize}
\item Add bibchecks to show only/no peer-reviewed items
diff --git a/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.pdf b/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.pdf
index 09126f6cc1c..bed9614116a 100644
--- a/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.pdf
+++ b/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.tex b/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.tex
index 02edcbca417..192da90cb48 100644
--- a/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.tex
+++ b/Master/texmf-dist/doc/latex/chemformula-ru/chemformula-ru.tex
@@ -3,7 +3,6 @@
\geometry{total={180mm, 267mm}, centering}
\usepackage[russian]{babel}
-\usepackage{chemformula}
\usepackage[ch2Ch,cosh2ch]{chemformula-ru}
\usepackage{array,multicol}
@@ -11,7 +10,7 @@
\title{The \textsf{chemformula-ru} package}
\author{Alexey Kuznetsov}
-\date{01.03.2024}
+\date{10.07.2024}
\maketitle
\begin{multicols}{2}
@@ -23,9 +22,8 @@ Russian settings of the \textsf{babel} package \textsf{(russianb.ldf)} define th
\mbox{}\hfil\verb|$\ch x$|\ $\to\ \Ch x$.\\[.5ex]
Loading packages together leads to the error\\[1ex]
\mbox{}\hfil\verb|! LaTeX Error: Command \ch already defined.|\\[1ex]
-The \textsf{chemformula-ru} package ``neutralizes'' it by making the babel's command undefined.
-
-The package has two parameters to configure the printing of the hyperbolic cosine in Russian notation:\\[1ex]
+The \textsf{chemformula-ru} package loads the \textsf{chemformula} and ``neutralizes'' the error by making the babel's command undefined.
+Two it's parameters configure printing of the hyperbolic cosine in Russian notation:\\[1ex]
\begin{tabular}{>\sf l @{ ---\quad } p{.75\linewidth}}
cosh2ch & overrides the \verb|\cosh| command for printing:\linebreak
\verb|$\cosh x$| $\to \cosh x$. \\[1ex]
@@ -37,13 +35,12 @@ ch2Ch & defines a new \verb|\Ch| command for printing:\linebreak
\mbox{}\hfil\verb|\сh{|\textit{химическая фоормула}\verb|}|\\[.5ex]
для верстки химических формул:\\[.5ex]
\mbox{}\hfil\verb|\ch{H3PO4}| $\to$ \ch{H3PO4}.\\[.5ex]
-Русские настройки пакета \textsf{babel (russianb.ldf)} определяют одноименную команду для печати гиперболического косинуса:\\[-.5ex]
+Русские настройки пакета \textsf{babel (russianb.ldf)} определяют одноименную команду для печати гиперболического косинуса:\\[-.85\baselineskip]
\mbox{}\hfil\verb|$\ch x$|\ $\to\ \Ch x$.\\[.5ex]
Cовместная загрузка пакетов ведет к ошибке\\[1ex]
\mbox{}\hfil\verb|! LaTeX Error: Command \ch already defined.|\\[1ex]
-Пакет \textsf{chemformula-ru} <<нейтрализует>> ее, делая команду пакета \textsf{babel} неопределенной.
-
-Пакет имеет два параметра, настраивающих печать гиперболического косинуса в русских нотациях:\\[1ex]
+Пакет \textsf{chemformula-ru} загружает \textsf{chemformula} и <<нейтрализует>> ошибку, делая команду пакета \textsf{babel} неопределенной.
+Два его параметра настраивают печать гиперболического косинуса в русских нотациях:\\[1ex]
\begin{tabular}{>\sf l @{ --- } p{.8\linewidth}}
cosh2ch & переопределяет для печати команду \verb|\cosh|:\linebreak
\verb|$\cosh x$| $\to \cosh x$. \\[1ex]
@@ -52,10 +49,11 @@ ch2Ch & определяет для печати новую команду \verb
\end{tabular}
\end{multicols}
+\thispagestyle{empty}
+
\noindent\hrulefill
\begin{verbatim}
-
%% Redefine \cosh to print ch.
\DeclareOption{cosh2ch}{\def\cosh@ch{%
\DeclareRobustCommand\cosh{\mathop{\operator@font ch}\nolimits}}}
@@ -64,19 +62,22 @@ ch2Ch & определяет для печати новую команду \verb
\DeclareOption{ch2Ch}{\def\ch@Ch{%
\DeclareRobustCommand\Ch{\mathop{\operator@font ch}\nolimits}}}
+%% Pass all other options to the chemformula package.
+\DeclareOption*{\PassOptionsToPackage\CurrentOption{chemformula}}
+
\ProcessOptions\relax
+\RequirePackage{chemformula}
+
\BeforeBeginEnvironment{document}{
- \IfPackageLoadedTF{chemformula}{
- \IfPackageLoadedWithOptionsTF{babel}{russian}{
- \let\@Chem@Formula\ch \let\ch\undefined
- \AtBeginDocument{ \let\ch\@Chem@Formula
- \@ifundefined{cosh@ch}{\relax}{\cosh@ch}
- \@ifundefined{ch@Ch}{\relax}{\ch@Ch}
- }
- } { \relax }
- } { \relax }
-}
+ \let\@Chem@Formula\ch \let\ch\undefined
+ \AtBeginDocument{
+ \let\ch\@Chem@Formula
+ \@ifundefined{cosh@ch}{\relax}{\cosh@ch}
+ @ifundefined{ch@Ch}{\relax}{\ch@Ch}
+ } }
+
+\endinput
\end{verbatim}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/README.md b/Master/texmf-dist/doc/latex/cjs-rcs-article/README.md
index 69c983dbb73..e28620a02d2 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/README.md
+++ b/Master/texmf-dist/doc/latex/cjs-rcs-article/README.md
@@ -16,11 +16,12 @@ compatible with the traditional engine pdfLaTeX.
## Licence
LaTeX Project Public License, version 1.3c or (at your option) any
-later version.
+later version. The documentation is also licensed under CC BY-SA 4.0
+International.
## Version
-1.0 (2023-11-29)
+
## Author
@@ -103,7 +104,7 @@ version history of the bibliographic styles appears in
## Comments or suggestions
-The Gitlab [project repository](https://gitlab.com/cjs-rcs/cjs-rcs-article)
+The GitLab [project repository](https://gitlab.com/cjs-rcs/cjs-rcs-article)
is the best place to report bugs or to propose improvements to the
project.
@@ -127,11 +128,12 @@ grande partie compatible avec le moteur pdfLaTeX.
## Licence
LaTeX Project Public License, version 1.3c ou (à votre choix) toute
-version ultérieure.
+version ultérieure. La documentation est également publiée sous
+licence CC BY-SA 4.0 International.
## Version
-1.0 (2023-11-29)
+
## Auteur
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.pdf b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.pdf
index 5ec31c2669c..c64b7fa0a24 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.pdf
+++ b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.tex b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.tex
deleted file mode 100644
index b7f01a64fda..00000000000
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-%% Wrapper to set language to French
-%% (https://tex.stackexchange.com/a/28646).
-\expandafter\newif\csname ifenglish\endcsname
-\englishfalse
-\input{cjs-rcs-article.dtx}
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article.pdf b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article.pdf
index dc76f9053ec..4d9c8ae4f8d 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article.pdf
+++ b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.pdf b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.pdf
index af76f1c69e1..1cc15b18c7f 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.pdf
+++ b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-template.tex b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-template.tex
index 61d410f7a13..3ca3fda9b46 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-template.tex
+++ b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-template.tex
@@ -59,16 +59,16 @@
%% page automatically.
\begin{englishabstract}
<Insert your English abstract here. The abstract should be concise
- --- up to 10 lines long --- and descriptive. Avoid symbols as much
- as possible. Formulas are strongly discouraged, and citations
- should be avoided.>
+ (up to 10 lines long) and descriptive. Avoid symbols as much as
+ possible. Formulas are strongly discouraged, and citations should
+ be avoided.>
\end{englishabstract}
\begin{frenchabstract}
<Insérer le texte du résumé en français ici. Le résumé doit être
- concis --- une dizaine de lignes --- et descriptif. Éviter autant
- que possible les symboles. Les équations mathématiques sont
- fortement découragées et les citations sont à éviter.>
+ concis (une dizaine de lignes) et descriptif. Éviter autant que
+ possible les symboles. Les équations mathématiques sont fortement
+ déconseillées et les citations sont à éviter.>
[We will supply a French abstract for those authors who
can't prepare it themselves.]
\end{frenchabstract}
@@ -102,9 +102,10 @@
<Free form text>
\end{supplement}
- %% DATA SHARING (optional - comment out if unused). Describe how to
- %% access data that you wish to share. Provide a permanent link such
- %% as a Document Object Identifier (DOI) or an URL.
+ %% DATA SHARING (mandatory). In accordance with the Expect Data
+ %% Sharing editorial policy of Wiley, make a statement about the
+ %% availability or absence of shared data. Provide a permanent link
+ %% such as a Document Object Identifier (DOI) or an URL.
\begin{sharing}
<Free form text>
\end{sharing}
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/rcs-gabarit.tex b/Master/texmf-dist/doc/latex/cjs-rcs-article/rcs-gabarit.tex
index 78053a97542..1b5735334c1 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/rcs-gabarit.tex
+++ b/Master/texmf-dist/doc/latex/cjs-rcs-article/rcs-gabarit.tex
@@ -61,18 +61,18 @@
%% la page de titre automatiquement.
\begin{englishabstract}
<Insert your English abstract here. The abstract should be concise
- --- up to 10 lines long --- and descriptive. Avoid symbols as much
- as possible. Formulas are strongly discouraged, and citations
- should be avoided.>
+ (up to 10 lines long) and descriptive. Avoid symbols as much as
+ possible. Formulas are strongly discouraged, and citations should
+ be avoided.>
[Un résumé en anglais sera fourni pour les auteurs qui ne peuvent
le préparer eux-mêmes.]
\end{englishabstract}
\begin{frenchabstract}
<Insérer le texte du résumé en français ici. Le résumé doit être
- concis --- une dizaine de lignes --- et descriptif. Éviter autant
- que possible les symboles. Les équations mathématiques sont
- fortement découragées et les citations sont à éviter.>
+ concis (une dizaine de lignes) et descriptif. Éviter autant que
+ possible les symboles. Les équations mathématiques sont fortement
+ déconseillées et les citations sont à éviter.>
\end{frenchabstract}
%% MOTS-CLÉS. Fournir une liste de mots-clés en ordre alphabétique.
@@ -106,10 +106,11 @@
<Texte libre>
\end{supplement}
- %% PARTAGE DES DONNÉES (optionnel - commenter si inutilisé).
- %% Expliquer comment accéder à des données de l'article mises à
- %% disposition. Fournir un lien permanent, comme un identificateur
- %% d'objets numériques (DOI) ou une adresse URL.
+ %% PARTAGE DES DONNÉES (obligatoire). Conformément à la politique
+ %% éditoriale «Expect Data Sharing» de Wiley, vous devez indiquer
+ %% les conditions de partage des données de recherche, ou l'absence
+ %% de celles-ci, le cas échéant. Fournir un lien permanent, comme un
+ %% identificateur d'objets numériques (DOI) ou une adresse URL.
\begin{sharing}
<Texte libre>
\end{sharing}
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
index 57a1653f9c5..879d4b3f5ba 100644
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
index 9a2299528d4..6ebe2525c33 100644
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf
index d0d64760c9a..fe5aeba2978 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex
index 3e4ce0aa72d..321723f025a 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex
@@ -34,8 +34,8 @@
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.7}
-\def\TPdate{03/06/2024}
+\def\TPversion{0.1.8}
+\def\TPdate{13/07/2024}
\usepackage{tcolorbox}
\sethlcolor{lightgray!25}
\NewDocumentCommand\MontreCode{ m }{%
@@ -111,6 +111,7 @@
\section{History}
+\verb|v0.1.8|~:~~~~Score banner
\verb|v0.1.7|~:~~~~Small patch for \textsf{Vignette} macro (see \texttt{[fr]} documentation)
\verb|v0.1.6|~:~~~~Small patchs for \textsf{displayskip} + \textsf{pas-tableur} (see \texttt{[fr]} documentation)
@@ -430,6 +431,60 @@ The last argument, mandatory and between \MontreCode{(...)} give the list of cat
\pagebreak
+\pagebreak
+
+\section{Score banner}
+
+\subsection{Global use}
+
+The idea is to insert a score banner, with customizations.
+
+\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25]
+ScoreBanner[keys]{number}
+\end{codehigh}
+
+\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25]
+%default output
+\ScoreBanner{}
+\end{demohigh}
+
+\subsection{The macro}
+
+Available \MontreCode{keys} are :
+
+\begin{itemize}
+ \item \MontreCode{Height} : height of the banner (without the legend) ; \MontreCode{1} by default
+ \item \MontreCode{Ratio} : ratio of boxes ; \MontreCode{0.6} by default
+ \item \MontreCode{Symbols} : labels ; \MontreCode{A,B,C,D,E} by default
+ \item \MontreCode{Legend} : legend (uppercase) ; \MontreCode{score} by default ;
+ \item \MontreCode{Font} : global font ; \MontreCode{\textbackslash bfseries\textbackslash sffamily} by default
+ \item \MontreCode{ShowLegend} : boolean for the legend ; \MontreCode{false} by default ;
+ \item \MontreCode{Colors} : colors for boxes ;
+
+ \hfill\MontreCode{colorNS1,colorNS2,colorNS3,colorNS4,colorNS5} by default ;
+ \item \MontreCode{ScaleSymbols} : scale H/V of labels ; \MontreCode{1.25,1.65} by default ;
+ \item \MontreCode{Colbg} : background color for select box ; \MontreCode{white} by default.
+\end{itemize}
+
+\smallskip
+
+If the list of colors doesn't fill all the boxes, \MontreCode{lightgray} color is used.
+
+\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25]
+\ScoreBanner[Legend=Geometry,Height=2]{4}
+\end{demohigh}
+
+\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25,style/demo=yellow!25]
+%bg of lower part is yellow!25
+\def\lstcouleurs{colorNS1,colorNS2,colorNS3,colorNS4,colorNS5,purple}
+\ScoreBanner%
+ [ScaleSymbols={1.33,2},Height=3.25,ShowLegend=false,Ratio=0.75,
+ Symbols={1,2,3,4,5,6},Colors=\lstcouleurs,
+ Colbg=yellow!25]{1}
+\end{demohigh}
+
+\pagebreak
+
\section{SMS conversation}
\subsection{Global use}
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf
index b1280769998..47dce47918d 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex
index 2f74296c5d1..7a7293ec6ed 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex
@@ -39,8 +39,8 @@
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.7}
-\def\TPdate{03 juin 2024}
+\def\TPversion{0.1.8}
+\def\TPdate{13 juillet 2024}
\usepackage{tcolorbox}
\tcbuselibrary{listingsutf8}
\newtcblisting{DemoCode}[1]{%
@@ -66,10 +66,10 @@
keywordstyle={\color{violet}},%
classoffset=2,%
alsoletter={-},%
- morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems,\TableauCompetences,\CrayonDeCompetences,\StyleEnvtExo,\StyleEnvtExoDefaut,\TitreExo,\ipsum,EnvSMS,\SMSrec,\SMSenv,BoiteSimple,\SujetTitreExo,\CircledNumber,\AffVignette,\BoiteArrondie,\ChangerDisplaySkip,\celcouleur,\celfusion,\lignetxt,\colonnetxt,\celnumbreak,\celtxt},%
+ morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems,\TableauCompetences,\CrayonDeCompetences,\StyleEnvtExo,\StyleEnvtExoDefaut,\TitreExo,\ipsum,EnvSMS,\SMSrec,\SMSenv,BoiteSimple,\SujetTitreExo,\CircledNumber,\AffVignette,\BoiteArrondie,\ChangerDisplaySkip,\celcouleur,\celfusion,\lignetxt,\colonnetxt,\celnumbreak,\celtxt,\BandeauScore},%
keywordstyle={\color{green!50!black}},%
classoffset=3,%
- morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea,LargeurNivs,Niveaux,NoticeNiveaux,Titre,PolTitre,PolNotice,PolComp,LigneSep,CouleurNotice,CouleurNiveaux,CouleurFond,Note,Notice,PoliceCateg,PoliceBloc,Couleurs,LargeurBloc,Echelle,NoirBlanc,Libelle,EpTrait,Police,Type,ComplementTitre,Titre,CodeDebut,Couleur,EchelleImage,Decoration,Trait,Avatar,AffAvatar,NoirBlanc,CouleurE,CouleurR,CouleurFond,Hauteur,Largeur,PoliceTxt,CouleurTitre,AlignH,bg,txt,bthick,bcol,raise,Type,EspH,Fond,Texte,Style,Dense,Avant,AvantS,Apres,ApresS,Global,align,width},%
+ morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea,LargeurNivs,Niveaux,NoticeNiveaux,Titre,PolTitre,PolNotice,PolComp,LigneSep,CouleurNotice,CouleurNiveaux,CouleurFond,Note,Notice,PoliceCateg,PoliceBloc,Couleurs,LargeurBloc,Echelle,NoirBlanc,Libelle,EpTrait,Police,Type,ComplementTitre,Titre,CodeDebut,Couleur,EchelleImage,Decoration,Trait,Avatar,AffAvatar,NoirBlanc,CouleurE,CouleurR,CouleurFond,Hauteur,Largeur,PoliceTxt,CouleurTitre,AlignH,bg,txt,bthick,bcol,raise,Type,EspH,Fond,Texte,Style,Dense,Avant,AvantS,Apres,ApresS,Global,align,width,Legende,CouleurFond,Hauteur,Ratio,AffLegende,Couleurs,EchelleSymboles,Symboles},%
keywordstyle={\color{orange}}
},%
#1
@@ -799,6 +799,64 @@ L'argument, obligatoire et entre \MontreCode{\{...\}} est la liste des catégori
\pagebreak
+\section{Bandeau de score}
+
+\subsection{Principe et fonctionnement}
+
+L'idée est de proposer une commande pour insérer un bandeau de score, type \textit{nutriscore}.
+
+\smallskip
+
+La majorité des éléments sont personnalisables.
+
+\begin{DemoCode}{listing only}
+\BandeauScore[clés]{numéro}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%sortie par défaut
+\BandeauScore{}
+\end{DemoCode}
+
+\subsection{La commande}
+
+Les \MontreCode{clés} disponibles, à donner entre \MontreCode{[...]}, sont :
+
+\begin{itemize}
+ \item \MontreCode{Hauteur} : hauteur du bandeau (sans la légende) ; \MontreCode{1} par défaut
+ \item \MontreCode{Ratio} : rapport V/H des cases ; \MontreCode{0.6} par défaut
+ \item \MontreCode{Symboles} : contenu des cases ; \MontreCode{A,B,C,D,E} par défaut
+ \item \MontreCode{Legende} : texte de la légende (qui sera en majuscule) ; \MontreCode{score} par défaut ;
+ \item \MontreCode{Police} : Police globale ; \MontreCode{\textbackslash bfseries\textbackslash sffamily} par défaut
+ \item \MontreCode{AffLegende} : booléen pour afficher la légende ; \MontreCode{false} par défaut ;
+ \item \MontreCode{Couleurs} : couleurs des cases ;
+
+ \hfill\MontreCode{couleurNS1,couleurNS2,couleurNS3,couleurNS4,couleurNS5} par défaut ;
+ \item \MontreCode{EchelleSymboles} : échelle(s) H/V des symboles ; \MontreCode{1.25,1.65} par défaut ;
+ \item \MontreCode{CouleurFond} : couleur du fond (pour la case choisie) ; \MontreCode{white} par défaut.
+\end{itemize}
+
+L'argument obligatoire correspond quant à lui au numéro de la case à mettre en valeur (\MontreCode{vide} par défaut).
+
+\smallskip
+
+Si la liste des couleurs ne permet pas de remplir toutes les cases, la couleur \MontreCode{lightgray} est utilisée.
+
+\begin{DemoCode}{}
+\BandeauScore[Legende=Géométrie,Hauteur=2]{4}
+\end{DemoCode}
+
+\begin{DemoCode}{colbacklower=yellow!25}
+%le fond de la boîte a été défini sur yellow!25
+\def\lstcouleurs{couleurNS1,couleurNS2,couleurNS3,couleurNS4,couleurNS5,purple}
+\BandeauScore%
+ [EchelleSymboles={1.33,2},Hauteur=2,AffLegende=false,
+ Symboles={1,2,3,4,5,6},Couleurs=\lstcouleurs,
+ CouleurFond=yellow!25]{1}
+\end{DemoCode}
+
+\pagebreak
+
\section{Fenêtre type conversation instantanée}
\subsection{Principe et fonctionnement}
diff --git a/Master/texmf-dist/doc/latex/dashrulex/README.md b/Master/texmf-dist/doc/latex/dashrulex/README.md
index c0e441ac99a..2987c253cea 100644
--- a/Master/texmf-dist/doc/latex/dashrulex/README.md
+++ b/Master/texmf-dist/doc/latex/dashrulex/README.md
@@ -1,7 +1,15 @@
-# The dashrulex package
+# The `dashrulex` package
+Draw dashed rules (v1.01)
+## Abstract
The `dashrulex` package provides a flexible solution for drawing dashed rules in the body, and currently provides two commands `\hdashrule` and `\hanyrule`. It's written in LaTeX3 and can be used as an alternative to the `dashrule` package.
## License
+This work may be distributed and/or modified under the conditions of the CC-BY 4.0 License. The latest version of this license is in https://creativecommons.org/licenses/by/4.0/legalcode
-This work may be distributed and/or modified under the conditions of the CC-BY 4.0 License. The latest version of this license is in https://creativecommons.org/licenses/by/4.0/legalcode \ No newline at end of file
+## Website
+| [Gitee](https://gitee.com/texno3/dashrulex) | [Github](https://github.com/texno3/dashrulex) | [CTAN](https://ctan.org/pkg/dashrulex) |
+
+## Maintainer
+Qu Yi<br/>
+Email: toquyi@163.com \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/dashrulex/dashrulex.pdf b/Master/texmf-dist/doc/latex/dashrulex/dashrulex.pdf
index 376eb91c90b..901372004ed 100644
--- a/Master/texmf-dist/doc/latex/dashrulex/dashrulex.pdf
+++ b/Master/texmf-dist/doc/latex/dashrulex/dashrulex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex b/Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex
index 06655a53e68..42c8e14e433 100644
--- a/Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex
+++ b/Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex
@@ -1,16 +1,17 @@
\documentclass[load-preamble+]{cnltx-doc}
-\usepackage{setspace,hologo,dashrulex,tikz}
+\usepackage{setspace,hologo,enumitem,dashrulex,tikz}
\usepackage[noto]{newtxmath}
\setcnltx
{
package = dashrulex,
- title = the dashrulex package,
- version = v1.00c,
- date = 2024/03/25,
+ title = dashrulex,
+ version = v1.01,
+ date = 2024/07/16,
authors = Qu Yi,
info = Draw dashed rules,
email = toquyi@163.com,
+ url = https://github.com/texno3/dashrulex,
abstract =
{
The \pkg*{dashrulex} package provides a flexible solution for drawing dashed rules in the body, and currently provides two commands \cs{hdashrule} and \cs{hanyrule}. It's written in \hologo{LaTeX3} and can be used as an alternative to the \pkg*{dashrule} package.
@@ -37,9 +38,12 @@
\newsplitarg{\splitoarg}{[}{]}
\newsplitarg{\splitmarg}{\{}{\}}
\newsplitarg{\splitdarg}{(}{)}
-\newnote{\newtag}[1][New]{\textcolor{red}{\ding{73}\ #1}}
+\newnote{\newtag}[1]{\textcolor{red}{#1}}
\renewcommand{\emph}[1]{\textcolor{red}{#1}}
\renewcommand{\cnltx@write@lastname}{}
+\setlist{nosep,topsep = \smallskipamount}
+\setlist[description,1]{leftmargin = \parindent}
+\setlist[itemize,1]{leftmargin = *}
\makeatother
\begin{document}
@@ -49,7 +53,7 @@ Sometimes it is necessary to draw dashed rules when writing documents, such as g
\section{User commands}
\begin{commands}
\command{hdashrule}[\oarg{raise}\oarg{leader}\marg{width}\marg{thickness list}\marg{dash rules}]
- The command to draw horizontal dashed rules, based on the \cs{rule} command, and the same as the \cs{rule} command when the \meta{dash rules} are empty. \meta{raise} is the vertical offset of the rule. \meta{leader} is the alignment of the dashed line fill, which can be empty, \code{c}, or \code{x} (the default), corresponding to the \cs{leaders}, \cs{cleaders}, and \cs{xleaders} commands, respectively. \meta{width} is the length of the dotted line, which can be set to \cs{fill} when used to fill the remaining center of the current text line. \meta{thickness list} is a rule for the height of vertically oriented lines, separated by \textcolor{red}{commas} and written as \splitmeta{height 1}{height a}\code{,...}, where \meta{height 1} denotes the height of a solid line and \meta{height a} denotes the height of a blank space.\meta{dash rules} is expressed as \splitmeta[\code{|}]{length 1}{length a}\code{,}\splitmeta[\code{|}]{length 2}{length b}\code{,...}, where \meta{length 1} represents the length of the solid line and \meta{length a} represents the length of the blank space, such as \code{5pt|2pt,3pt}, if the blank space is empty, then it is equal to the solid line length.
+ The command to draw horizontal dashed rules, based on the \cs{rule} command, and the same as the \cs{rule} command when the \meta{dash rules} are empty. \meta{raise} is the vertical offset of the rule. \meta{leader} is the alignment of the dashed line fill, which can be empty, \code{c}, or \code{x} (the \textcolor{red}{default}), corresponding to the \cs{leaders}, \cs{cleaders}, and \cs{xleaders} commands, respectively. \meta{width} is the length of the dashed line, which can be set to \cs{fill} when used to fill the remaining part of the current text line. \meta{thickness list} is a rule for the height of \textcolor{red}{vertical} lines, separated by \textcolor{red}{commas} and written as \splitmeta{height 1}{height a}\code{,...}, where \meta{height 1} denotes the height of a solid line and \meta{height a} denotes the height of a blank space. \meta{dash rules} stands for \textcolor{red}{horizontal} dashed line rules, which expressed as \splitmeta[\code{|}]{length 1}{length a}\code{,}\splitmeta[\code{|}]{length 2}{length b}\code{,...}, where \meta{length 1} represents the length of the solid line and \meta{length a} represents the length of the blank space, such as \code{5pt|2pt,3pt}, if the blank space is empty, then it is equal to the solid line length.
\begin{example}
1X\rule{2cm}{1pt}x \\
2X\hdashrule{2cm}{1pt}{}x \\
@@ -58,31 +62,32 @@ Sometimes it is necessary to draw dashed rules when writing documents, such as g
5X\hdashrule[0.5ex]{4cm}{1pt}{1pt}x \\
6X\hdashrule[0.5ex]{4cm}{1pt}{3mm}x \\
7X\hdashrule[0.5ex]{4cm}{1mm}{3mm}x \\
- 8X\hdashrule[0.5ex]{4cm}{1mm}{3mm|3pt}x \\
- 9X\hdashrule[0.5ex]{4cm}{1mm}{3mm|3pt,1mm|2pt}x \\
- 10X\hdashrule[0.5ex]{4cm}{2pt,1pt,1pt}{3mm|3pt,1mm|2pt}x
+ 8X\hdashrule[0.5ex]{4cm-3mm}{1mm}{3mm}\vrulemod[0.5ex]{3mm}{1mm}x \\
+ 9X\hdashrule[0.5ex]{4cm}{1mm}{3mm|3pt}x \\
+ 10X\hdashrule[0.5ex]{4cm}{1mm}{3mm|3pt,1mm|2pt}x \\
+ 11X\hdashrule[0.5ex]{4cm}{2pt,1pt,1pt}{3mm|3pt,1mm|2pt}x
\end{example}
\command{vrulemod}[\oarg{raise}\oarg{height}\oarg{depth}\marg{width}\marg{thickness list}]
- The vertical component used to fill the dashed line. \meta{thickness list} is consistent with the \cs{hdashrule} command, \meta{width} represents the length of the component, and the three optional parameters are consistent with those of the \cs{raisebox} command.
+ The vertical model used to fill the dashed line. \meta{thickness list} is consistent with the \cs{hdashrule} command, \meta{width} represents the length of the component, and the three optional parameters are consistent with those of the \cs{raisebox} command.
\command{hanyrule}[\oarg{leader}\marg{width}\marg{symbol list}]
This command sets the length of the dotted rule and fills it with arbitrary symbols. \meta{symbol list} can be more than one symbol and they are separated by \textcolor{red}{commas}. Symbols are best packed in boxes of a certain length, as spacing between symbols is not provided.
\begin{example}
- \newcommand{\dblvmod}
+ \newcommand{\dblblock}
{%
- \tikz[color=blue]
+ \tikz[color=teal]
{
\draw[line width=0.8mm](0mm,1.1mm)--(3mm,1.1mm);
\draw[line width=0.3mm](0mm,0mm)--(3mm,0mm);
}%
}
- 1X\hanyrule[]{5cm}{\makebox[8pt][l]{$\cdot$}}x \\
- 2X\hanyrule[c]{5cm}{\makebox[8pt][l]{$\cdot$}}x \\
- 3X\hanyrule[x]{5cm}{\makebox[8pt][l]{$\cdot$}}x \\
- 4X\hanyrule[c]{5cm}{\makebox[8pt]{$\cdot$}}x \\
- 5X\hanyrule[x]{5cm}{\makebox[8pt]{$\cdot$}}x \\
+ 1X\hanyrule[]{5cm}{\makebox[8pt]{$\cdot$}}x \\
+ 2X\hanyrule[c]{5cm}{\makebox[8pt]{$\cdot$}}x \\
+ 3X\hanyrule[x]{5cm}{\makebox[8pt]{$\cdot$}}x \\
+ 4X\hanyrule[x]{5cm}{\makebox[8pt][l]{$\cdot$}}x \\
+ 5X\hanyrule[x]{5cm}{\makebox[8pt][r]{$\cdot$}}x \\
6X\hanyrule[x]{5cm}{\makebox[8pt]{$\cdot$},\makebox[8pt]{$\circ$}}x \\
7X\hanyrule[x]{5cm}{\makebox[5mm]{\vrulemod{3mm}{2pt,1pt,1pt}}}x \\
- 8X\hanyrule[x]{5cm}{\makebox[5mm]{\dblvmod}}x
+ 8X\hanyrule[x]{5cm}{\makebox[5mm]{\dblblock}}x
\end{example}
\end{commands}
diff --git a/Master/texmf-dist/doc/latex/delimset/README.txt b/Master/texmf-dist/doc/latex/delimset/README.txt
index 729b73fbbf3..9094d596248 100644
--- a/Master/texmf-dist/doc/latex/delimset/README.txt
+++ b/Master/texmf-dist/doc/latex/delimset/README.txt
@@ -1,5 +1,5 @@
-delimset v1.1
-Copyright 2016-2018 Niklas Beisert
+delimset v2.0
+Copyright 2016-2024 Niklas Beisert
delimset is a LaTeX2e package to typeset and declare sets of delimiters
in math mode whose size can be adjusted conveniently.
diff --git a/Master/texmf-dist/doc/latex/delimset/delimset.pdf b/Master/texmf-dist/doc/latex/delimset/delimset.pdf
index b964bea59d2..734ebf01db2 100644
--- a/Master/texmf-dist/doc/latex/delimset/delimset.pdf
+++ b/Master/texmf-dist/doc/latex/delimset/delimset.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/delimset/dlmssamp.tex b/Master/texmf-dist/doc/latex/delimset/dlmssamp.tex
index 8f93312e6ab..c27a338c5f6 100644
--- a/Master/texmf-dist/doc/latex/delimset/dlmssamp.tex
+++ b/Master/texmf-dist/doc/latex/delimset/dlmssamp.tex
@@ -6,7 +6,7 @@
%%
%% delimset.dtx (with options: `sample')
%%
-%% Copyright (C) 2016-2018 Niklas Beisert
+%% Copyright (C) 2016-2024 Niklas Beisert
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesFile{dlmssamp.tex}[2018/12/30 v1.1 sample for delimset]
+\ProvidesFile{dlmssamp.tex}[2024/07/17 v2.0 sample for delimset]
\documentclass[12pt]{article}
\usepackage[margin=2cm]{geometry}
@@ -28,11 +28,11 @@
sizes for default brackets:
\[
-\brk0{x},\quad
-\brk1{x},\quad
-\brk2{x},\quad
-\brk3{x},\quad
-\brk4{x}
+\brk^0{x},\quad
+\brk^1{x},\quad
+\brk^2{x},\quad
+\brk^3{x},\quad
+\brk^4{x}
\]
styles for default brackets:
@@ -45,7 +45,7 @@ styles for default brackets:
nested brackets:
\[
-\brk[c]2{\brk[s]!{\brk{ax+b}x+c}x+d}
+\brk[c]^2{\brk[s]!{\brk{ax+b}x+c}x+d}
\]
default absolute value, norm and default evaluations:
@@ -58,7 +58,7 @@ default absolute value, norm and default evaluations:
outer delimiter spacing:
\begin{align*}
-&\square\brk0{x}\square,&&\square\brk1{A^k}\square,
+&\square\brk^0{x}\square,&&\square\brk^1{A^k}\square,
\\
&\square\brk*{x}\square,&&\square\brk*{A^k}\square
\end{align*}
@@ -71,7 +71,7 @@ e^{\brk!{ax+b}}
delimiter declaration:
\DeclareMathDelimiterSet{\braket}[2]
- {\selectdelim[l]<#1\selectdelim|#2\selectdelim[r]>}
+ {\selectdeliml<#1\selectdelim|#2\selectdelimr>}
\[
\braket!{\psi}{\psi},
\quad
@@ -86,30 +86,34 @@ delimiter usage:
conditional set, alternative layouts:
\[
\delimpair\{{[m]|}\}!{2n}{n\in\mathbb{Z}},
-\qquad
+\quad
\delimpair\{{[b]|}\}!{2n}{n\in\mathbb{Z}},
-\qquad
+\quad
+\delimpair\{{[i]|}\}!{2n}{n\in\mathbb{Z}},
+\quad
\delimpair\{{[p]|}\}!{2n}{n\in\mathbb{Z}},
-\qquad
+\quad
\delimpair\{|\}!{2n}{n\in\mathbb{Z}},
-\qquad
-\delimpair\{{[.];}\}!{2n}{n\in\mathbb{Z}}
+\quad
+\delimpair\{{*;}\}!{2n}{n\in\mathbb{Z}}
\]
conditional set, alternative layouts with variable size:
\[
\delimpair\{{[m]|}\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
+\quad
\delimpair\{{[b]|}\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
+\quad
+\delimpair\{{[i]|}\}*{2n}{n\in\mathbb{Z}\big.},
+\quad
\delimpair\{{[p]|}\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
+\quad
\delimpair\{|\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
-\delimpair\{{[.];}\}*{2n}{n\in\mathbb{Z}\big.}
+\quad
+\delimpair\{{*;}\}*{2n}{n\in\mathbb{Z}\big.}
\]
delimiter definition:
-\newcommand{\comm}{\delimpair[{[.],}]}
+\newcommand{\comm}{\delimpair[{*,}]}
\[
\comm!{\comm{A}{B}}{C}
+\comm!{\comm{B}{C}}{A}
@@ -118,7 +122,7 @@ delimiter definition:
\]
alternative representation:
-\renewcommand{\comm}{\delimpair[{[.];}]}
+\renewcommand{\comm}{\delimpair[{*;}]}
\[
\comm!{\comm{A}{B}}{C}
+\comm!{\comm{B}{C}}{A}
@@ -126,6 +130,27 @@ alternative representation:
=0
\]
+display individual delimiters of a set:
+\renewcommand{\braket}{\delimpair<|>}
+\[
+\braket{A}{B}
+\to \braket( A \braket| B \braket),
+\quad
+\braket*( A\big. \braket*| B_{} \braket*),
+\quad
+\braket^1( A \braket^3| B \braket^2)
+\]
+
+placing indices before a bracket
+(does not work in variable-size mode because
+the final size is not available for the enclosed expressions):
+\DeclareMathDelimiterSet{\quadindex}[5]
+ {\selectdeliml.^{#2}_{#3}\mathord{}\selectdelim[o][
+ {#1}\selectdelim[o]]^{#4}_{#5}\selectdelimr.}
+\[
+\quadindex^2{\frac{x}{y}}{1}{2}{3}{4}
+\]
+
\end{document}
\endinput
%%
diff --git a/Master/texmf-dist/doc/latex/dtk/README.md b/Master/texmf-dist/doc/latex/dtk/README.md
index 836f916da47..c9e19e61f15 100644
--- a/Master/texmf-dist/doc/latex/dtk/README.md
+++ b/Master/texmf-dist/doc/latex/dtk/README.md
@@ -1,3 +1,7 @@
# dtk
LaTeX class for the journal »Die TeXnische Komödie« (new implementation).
+
+Authors: Rolf Niepraschk, Herbert Voß
+Licence: LaTeX Project Public License
+
diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
index 7b0b6ac913c..bdbf0bba869 100644
--- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
+++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex
index e4d31a57a68..77df7995635 100644
--- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex
+++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex
@@ -2,9 +2,6 @@
\addbibresource{beispiel.bib}% besser: \jobname.bib, wenn möglich
-\let\File\texttt
-\let\Package\texttt
-
\begin{document}
\title{Die \texttt{dtk}-Klasse, Version \DTKversion\ -- \DTKversiondate}
\Author{Mustermann}{Max}%
diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/README b/Master/texmf-dist/doc/latex/dynkin-diagrams/README
index e43f31e0b8e..5abe74143c4 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/README
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/README
@@ -1,6 +1,6 @@
Dynkin diagrams
-v3.1415926535897932384
-2 June 2023
+v3.14159265358979323846
+6 July 2024
Authors:
Ben McKay
diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.bib b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.bib
index 9660120699f..952e4a90bfd 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.bib
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.bib
@@ -1,6 +1,5 @@
% Encoding: ISO-8859-1
-
@Book{Adams:1996,
Title = {Lectures on exceptional {L}ie groups},
Author = {Adams, J. F.},
@@ -477,4 +476,67 @@ MRREVIEWER = {Stephen Gelbart},
url = {https://doi.org/10.1007/978-1-4612-0979-9},
}
+@Book{Knapp:2002,
+ author = {Knapp, Anthony W.},
+ publisher = {Birkh\"{a}user Boston, Inc., Boston, MA},
+ title = {Lie groups beyond an introduction},
+ year = {2002},
+ edition = {Second},
+ isbn = {0-8176-4259-5},
+ series = {Progress in Mathematics},
+ volume = {140},
+ mrclass = {22-01},
+ mrnumber = {1920389},
+ pages = {xviii+812},
+}
+
+@Article{Witt:1941,
+ author = {Witt, Ernst},
+ journal = {Abh. Math. Sem. Hansischen Univ.},
+ title = {Spiegelungsgruppen und {A}ufz\"ahlung halbeinfacher {L}iescher {R}inge},
+ year = {1941},
+ issn = {0025-5858},
+ pages = {289--322},
+ volume = {14},
+ doi = {10.1007/BF02940749},
+ fjournal = {Abhandlungen aus dem Mathematischen Seminar der Hansischen Universit\"at},
+ mrclass = {09.1X},
+ mrnumber = {5099},
+ mrreviewer = {O.\ F. G. Schilling},
+ url = {https://doi.org/10.1007/BF02940749},
+}
+
+@Article{Johnson.et.al.1999,
+ author = {Johnson, N. W. and Ratcliffe, J. G. and Kellerhals, R. and Tschantz, S. T.},
+ journal = {Transform. Groups},
+ title = {The size of a hyperbolic {C}oxeter simplex},
+ year = {1999},
+ issn = {1083-4362,1531-586X},
+ number = {4},
+ pages = {329--353},
+ volume = {4},
+ doi = {10.1007/BF01238563},
+ fjournal = {Transformation Groups},
+ mrclass = {20F55 (57M60)},
+ mrnumber = {1726696},
+ mrreviewer = {Andrei\ Yu.\ Vesnin},
+ url = {https://doi.org/10.1007/BF01238563},
+}
+
+@Book{McMullen.Schulte:2002,
+ author = {McMullen, Peter and Schulte, Egon},
+ publisher = {Cambridge University Press, Cambridge},
+ title = {Abstract regular polytopes},
+ year = {2002},
+ isbn = {0-521-81496-0},
+ series = {Encyclopedia of Mathematics and its Applications},
+ volume = {92},
+ doi = {10.1017/CBO9780511546686},
+ mrclass = {52B15 (20F55 51F15 51M20)},
+ mrnumber = {1965665},
+ mrreviewer = {Rade\ \v Zivaljevi\'c},
+ pages = {xiv+551},
+ url = {https://doi.org/10.1017/CBO9780511546686},
+}
+
@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf
index 2109c1ba1ce..dceef359361 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
index 5f4bb33e41e..b3f0be43412 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
@@ -1,7 +1,7 @@
\documentclass{amsart}
\title[The Dynkin diagrams package]%
{The Dynkin diagrams package \\
-Version 3.141\,592\,653\,589\,793\,238\,4}
+Version 3.141\,592\,653\,589\,793\,238\,46}
%% My name:
\makeatletter
\DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
@@ -20,7 +20,8 @@ Version 3.141\,592\,653\,589\,793\,238\,4}
\author{Ben \scotsMc{}Kay}
\address{School of Mathematical Sciences, University College Cork, Cork, Ireland}
\email{b.mckay@ucc.ie}
-\date{2 June 2023}
+\date{6 July 2024}
+\thanks{Thanks to Jeffrey Adams, Paul Aspinwall, Mikhail Borovoi, Fran Burstall, Michiel Van Couwenberghe, Xu Gao, Skip Garibaldi, Enrico Gregorio, Mamuka Jibladze, Tasho Kaletha, Jordan Lambert, Sriotchilism O'Zaic, Gopal Prasad, Anthony Pulido, Andres Sambarino, Paul Schwahn, Felix Weinstein, Niels Wen and Gordon Williams.}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenx}
\usepackage{etoolbox}
@@ -168,6 +169,11 @@ before upper={\widowpenalties=3 10000 10000 150}}
\begin{document}
\maketitle
+\renewcommand\do[1]{\dyn#1}
+\renewcommand{\wdtA}{3cm}
+\begin{dynkinTable}{The Dynkin diagrams of the reduced simple root systems \cite{Bourbaki:2002} pp. 265--290, plates I--IX}{2.25cm}{2.5cm}
+\docsvlist{A{},B{},C{},D{},E6,E7,E8,F4,G2}
+\end{dynkinTable}
\begin{center}
\begin{varwidth}{\textwidth}
\tableofcontents
@@ -176,6 +182,8 @@ before upper={\widowpenalties=3 10000 10000 150}}
\setlength{\arrayrulewidth}{1.5pt}
+\newpage
+
\section{Quick introduction}
\begin{tcolorbox}[title={Load the Dynkin diagram package (see options below)}]
\begin{Verbatim}
@@ -202,7 +210,6 @@ The Dynkin diagram of \(B_3\) is
\draw[very thick,red] (root 1) to [out=-45, in=-135] (root 3);
\end{dynkinDiagram}
\end{tcblisting}
-\newpage
\section{Interaction with \TikZ}
Inside a \TikZ environment, default behaviour is to draw from the origin, so you can draw around the diagram:
\begin{tcblisting}{title={Inside a \TikZ environment}}
@@ -228,15 +235,6 @@ The Dynkin diagram of \(B_3\) is
\end{tikzpicture}
\end{tcblisting}
-\newpage
-
-\renewcommand\do[1]{\dyn#1}
-\renewcommand{\wdtA}{3cm}
-\begin{dynkinTable}{The Dynkin diagrams of the reduced simple root systems \cite{Bourbaki:2002} pp. 265--290, plates I--IX}{2.25cm}{2.5cm}
-\docsvlist{A{},B{},C{},D{},E6,E7,E8,F4,G2}
-\end{dynkinTable}
-
-
\section{Set options globally}
\begin{tcolorbox}[title={Most options set globally \dots}]
@@ -251,6 +249,7 @@ The Dynkin diagram of \(B_3\) is
densely dashed}}
\end{Verbatim}
\end{tcolorbox}
+
You can also pass options to the package in \verb!\usepackage!.
\emph{Danger:} spaces in option names are replaced with hyphens: \texttt{edge length=1cm} is \texttt{edge-length=1cm} as a global option; moreover you should drop the extension \verb!/.style! on any option with spaces in its name (but not otherwise). For example,
\begin{tcolorbox}[title={\dots or pass global options to the package}]
@@ -275,6 +274,9 @@ The Dynkin diagram of \(B_3 \times A_2\) is \dynkins{B3|A2}.
The Dynkin diagram of \(B_3 \times A_2\) is
\begin{DynkinDiagrams}{B3|A2}\end{DynkinDiagrams}
\end{tcblisting}
+
+\newpage
+
Each factor can have its own options.
\begin{tcblisting}{title={Environment}}
The Dynkin diagram of \(B_3 \times A_2\) is
@@ -297,11 +299,11 @@ They are spaced out by the length of one edge between successive diagrams; chang
\endfoot
\endlastfoot
A_1\times A_1&\dynkins{A1|A1}&\texttt{\detokenize{\dynkins}\{A1|A1\}}\\
-A_2&\dynkins{A2}&\texttt{\detokenize{\dynkins}\{A2\}}\\
-B_2&\dynkins{B2}&\texttt{\detokenize{\dynkins}\{B2\}}\\
-C_2&\dynkins{C2}&\texttt{\detokenize{\dynkins}\{C2\}}\\
-D_2&\dynkins{D2}&\texttt{\detokenize{\dynkins}\{D2\}}\\
-G_2&\dynkins{G2}&\texttt{\detokenize{\dynkins}\{G2\}}\\
+A_2&\dynkin A2&\texttt{\detokenize{\dynkin} A2}\\
+B_2&\dynkin B2&\texttt{\detokenize{\dynkin} B2}\\
+C_2&\dynkin C2&\texttt{\detokenize{\dynkin} C2}\\
+D_2&\dynkin D2&\texttt{\detokenize{\dynkin} D2}\\
+G_2&\dynkin G2&\texttt{\detokenize{\dynkin} G2}\\
\end{longtable}
\section{Coxeter diagrams}
@@ -333,6 +335,35 @@ G_2&\dynkins{G2}&\texttt{\detokenize{\dynkins}\{G2\}}\\
[Coxeter,gonality=n]I{}}
\end{dynkinTable}
+\newpage
+
+Some people prefer Coxeter diagrams to have these labels appear on the bottom of the diagram, so say \verb!Coxeter above=false!, most likely as a global option.
+
+\pgfkeys{/Dynkin diagram,
+Coxeter above=false}
+
+\renewcommand\do[1]{\dyn#1}
+\begin{dynkinTable}{The Coxeter diagrams of the simple reflection groups}{2.25cm}{6cm}
+\forDynkinSemicolonsvlist{\do}{
+[Coxeter]A{};
+[Coxeter]B{};
+[Coxeter]C{};
+[Coxeter]D{};
+[Coxeter]E6;
+[Coxeter]E7;
+[Coxeter]E8;
+[Coxeter]F4;
+[Coxeter,gonality=n]G2;
+[Coxeter]H2;
+[Coxeter]H3;
+[Coxeter]H4;
+[Coxeter,gonality=n]I{}}
+\end{dynkinTable}
+
+\pgfkeys{/Dynkin diagram,
+Coxeter above=true}
+
+
\section{Satake diagrams}\label{section:Satake}
\begin{tcblisting}{title={Satake diagrams use the standard name instead of a rank}}
\(A_{IIIb}=\dynkin A{IIIb}\)
@@ -340,6 +371,8 @@ G_2&\dynkins{G2}&\texttt{\detokenize{\dynkins}\{G2\}}\\
We use a solid gray bar to denote the folding of a Dynkin diagram, rather than the usual double arrow, since the diagrams turn out simpler and easier to read.
+\newpage
+
\renewcommand\do[1]{\dyn#1}
\begin{dynkinTable}{The Satake diagrams of the real simple Lie algebras \cite{Helgason:2001} p. 532--534}{2.75cm}{3cm}
\docsvlist{A{I},A{II},A{IIIa},A{IIIb},A{IV},B{I},B{II},C{I},C{IIa},C{IIb},
@@ -968,7 +1001,7 @@ D_4 &
\dynkin[label,ordering=Kac]E6
\end{tcblisting}
Default is Bourbaki.
-Sources are Adams \cite{Adams:1996} p. 56--57, Bourbaki \cite{Bourbaki:2002} p. pp. 265--290 plates I-IX, Carter \cite{Carter:2005} p. 540--609, Dynkin \cite{Dynkin:1952}, Kac \cite{Kac:1990} p. 43.
+Sources are Adams \cite{Adams:1996} p. 56--57, Bourbaki \cite{Bourbaki:2002} p. 265--290 plates I-IX, Carter \cite{Carter:2005} p. 540--609, Dynkin \cite{Dynkin:1952} (reprinted, translated into English, in Dynkin \cite{Dynkin:2000} p. 180), Kac \cite{Kac:1990} p. 43.
\NewDocumentCommand\tablerow{mm}%
{%
@@ -1108,9 +1141,31 @@ D[3]4,E[2]6}
\renewcommand{\do}[1]{\dyn[extended,Coxeter]#1}
\begin{dynkinTable}{The extended (affine) Coxeter diagrams}{3cm}{6cm}
-\docsvlist{A{},B{},C{},D{},E6,E7,E8,F4,G2,H3,H4,I1}
+\docsvlist{A{},B{},C{},D{},E6,E7,E8,F4,G2,H2,H3,H4,I1}
\end{dynkinTable}
+
+\section{Witt symbols}
+
+The \emph{Witt symbol} \cite{Johnson.et.al.1999,McMullen.Schulte:2002,Witt:1941} is a different notation for the various series:
+\[
+\begin{array}{rll}
+\text{Witt symbol}&\text{Cartan symbol}\\
+P_{n+1}&A_n\\
+S_{n+1}&B_n\\
+R_{n+1}&C_n\\
+Q_{n+1}&D_n\\
+T_{n+1}&E_n&n=6,7,8\\
+U_5&F_4\\
+V_3&G_2\\
+W_2&I_1
+\end{array}
+\]
+\begin{tcblisting}{title={Witt symbols}}
+\dynkin[extended]P7, \dynkin[extended]Q7, \dynkin[extended]T7
+\end{tcblisting}
+
+
\newpage
\section{Kac style}
diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md
index 441d0bda0a0..72378fef178 100644
--- a/Master/texmf-dist/doc/latex/easybook/README.md
+++ b/Master/texmf-dist/doc/latex/easybook/README.md
@@ -1,5 +1,5 @@
# The `easybook` document class
-Easily typesetting Chinese theses or books (v2024cm)
+Easily typesetting Chinese theses or books (v2024cs)
## Abstract
`easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.
@@ -11,5 +11,5 @@ This work may be distributed and/or modified under the conditions of the LPPL-1.
| [Gitee](https://gitee.com/texno3/easybook) | [Github](https://github.com/texno3/easybook) | [CTAN](https://ctan.org/pkg/easybook) |
## Maintainer
-QuYi<br/>
+Qu Yi<br/>
Email: toquyi@163.com \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 09ef685a942..d336c3af6dd 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 343669865a2..2d98d894377 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024cm,
- date = 2024/06/24,
+ version = v2024cs,
+ date = 2024/07/15,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -57,10 +57,8 @@
\setlist[cnltxlist]
{
leftmargin = 0pt,
- labelwidth = 2em,
itemindent = -1em,
- labelsep = 0pt,
- listparindent = 2em,
+ listparindent = \parindent,
topsep = \smallskipamount,
itemsep = \smallskipamount,
partopsep = 0ex,
@@ -232,13 +230,13 @@
\end{frameverb}
\subsection{编译方式}
-假设您的 \TeX 源文件名为 \code{easybook.tex},需要使用参考文献和索引功能,并使用 \hologo{XeLaTeX} 和 \hologo{BibTeX} 引擎编译文档,那么需要在命令行中执行:
+假设您的 \TeX 源文件名为 \code{easybook-demo.tex},需要使用参考文献和索引功能,并使用 \hologo{XeLaTeX} 和 \hologo{BibTeX} 引擎编译文档,那么需要在命令行中执行:
\begin{frameverb}
- xelatex -shell-escape easybook
- bibtex easybook
- makeindex easybook
- xelatex -shell-escape easybook
- xelatex -shell-escape easybook
+ xelatex -shell-escape easybook-demo
+ bibtex easybook-demo
+ makeindex easybook-demo
+ xelatex -shell-escape easybook-demo
+ xelatex -shell-escape easybook-demo
\end{frameverb}
当然也可以使用 \code{latexmk} 及一些软件自带的编译工具,这里就不做介绍。 \\
$\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-shell-escape} 命令行选项。
@@ -510,9 +508,9 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\keyval{prenote}{参考文献前注}
该选项选择由 \cs{defbibnote} 所定义的前注,缺省状态下不打印任何前注。
\keyval{section}{整数}\Default{0}
- 只打印在指定文节中引用的条目。该参考文献节从1开始编号,所有在 \env*{refsection} 环境外给出的引用标记为第零节。
+ 只打印第 \meta{整数} 文节中引用的条目。该参考文献节从1开始编号,所有在 \env*{refsection} 环境外给出的引用标记为第零节。
\keyval{type}{条目类型}
- 指定条目的打印类型。
+ 只打印名为 \meta{条目类型} 的文献条目。
\keyval{filter}{过滤器名}
使用由 \cs{defbibfilter} 定义的 \option*{filter} 来过滤条目。
@@ -619,9 +617,9 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\begin{cnltxlist}[itemsep = 0ex]
\keyval{headruleskip}{页眉线间距}\dtag\Default*{0pt}
\keyval{footruleskip}{页脚线间距}\dtag\Default*{3.5pt}
- \kvsplit{hdivide}{左边距,版心文本宽度,右边距}\default{}
+ \kvsplit{hdivide}{左边距,版心宽度,右边距}\default{}
\kvsplit{hmargin}{左边距,右边距}\default{}
- \keyval{textheight}{版心文本高度}\default{}
+ \keyval{textheight}{版心高度}\default{}
\keychoice{nofoot}{true,\fbox{false}}\default{}
\begin{ctexexam}
\ctexset[geo]
@@ -761,11 +759,11 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
fnmarktext-format = \circledtext
}
\end{ctexexam}
- \command{defupfntmark}[\marg{脚注正文标记格式}]
+ \command{defupfntmark}[\marg{正文标记格式}]
定义脚注正文标记的格式,与正文标记编号命令 \cs{theupfootnote} 配合使用。
- \command{defdownfntmark}[\marg{脚注内容标记格式}]
+ \command{defdownfntmark}[\marg{内容标记格式}]
定义脚注内容标记的格式,与内容标记编号命令 \cs{thedownfootnote} 配合使用。
- \command{deffntpara}[\marg{脚注段落文本格式}]
+ \command{deffntpara}[\marg{段落文本格式}]
定义脚注段落文本的格式的命令。脚注段落文本由脚注内容标记和文本两部分组成,段落格式定义中参数 \code{\#1} 代表内容文本。
\command{notminipage}[\marg{普通页内容}\marg{迷你页内容}]
用于在定义脚注标记的命令中判断当前脚注是否处于迷你页而输出不同的内容。
@@ -990,16 +988,24 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\UseTocStyle{section}{fancy}{toc}
\tableofcontents[bilist = mix]
\end{ctexexam}
+
+ 除了上述选项还支持 \CTeX 键值列表所有路径的章节标题样式选项,下面仅列举几个选项例子。需要注意的是标题样式选项根据 \option{level} 选项中的\textbf{最后}一个标题命令判断键路径,所以这个标题命令名必须存在于 \CTeX 键值列表路径中,或带有 \code{\textcolor{cs}{bi}} 前缀表示双语标题。
\keyval{format}{目录标题格式}
- 设置目录标题的格式,在标题级别为 \code{chapter} 或者 \cls*{article} 模式且标题级别为 \code{section} 时有效。
+ 设置目录标题的格式。
+ \begin{ctexexam}
+ \tableofcontents[
+ level = \clearpage\bisection*,
+ format = \centering\sffamily\Large
+ ]
+ \end{ctexexam}
\keyval{aftername}{标签后代码}
- 目录标题的标签与内容之间插入的代码,生效情形同上。
+ 目录标题的标签与内容之间插入的代码。
\keyval{aftertitle}{标题后代码}
- 目录标题内容之后插入的代码,生效情形同上。
+ 目录标题内容之后插入的代码。
\keyval{break}{格式命令}
- 控制章节标题与之前正文的分隔关系。一般用于设置是否在标题之前分页或者设置行间罚点,生效情形同上。
+ 控制章节标题与之前正文的分隔关系。一般用于设置是否在标题之前分页或者设置行间罚点。
\keyval{pagestyle}{页面风格}\Default{empty}
- 目录标题所在页的页面格式,仅当目录以 \code{chapter} 级别输出时有效。除了上述选项还支持 \CTeX 键值列表路径 \module*{chapter} 或 \module*{section} 所有的章节标题样式选项。
+ 目录标题所在页的页面格式,仅当目录以 \code{chapter} 级别输出时有效。
\end{cnltxlist}
\subsection{双语章节标题和新建标题}
@@ -1046,6 +1052,12 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\lchapter{正常标题}
\lchapterentry{加入目录的标题}
\end{ctexexam}
+ \command{CopyTitleFormat}[\marg{条目名1}\marg{条目名2}]\newtagv{2024cq}%
+ 将名为 \meta{条目名2} 的章节标题命令除了编号/名字外的格式复制给名为 \meta{条目名1} 的标题命令。
+ \begin{ctexexam}
+ \ctexset{section/format = \sffamily\color{blue}}
+ \CopyTitleFormat{subsection}{section}
+ \end{ctexexam}
\end{cnltxlist}
\subsection[上标和下标]{上标和下标}
@@ -1437,8 +1449,17 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\item 新增统一设置所有目录格式时的条目类型排除命令 \cs{ExcludeEveryTocName}。
\end{version}
\shortversion{v = 2024cd,date = 2024/06/14,changes = 修复全局选项 \option{class} 无法正确切换单双面排版的问题。}
+ \begin{version}[v = 2024cf,date = 2024/06/16]
+ \fixed
+ \item 修复和改进新建章节/图表标题时目录层次深度的问题。
+ \changed
+ \item \module*{tools} 模块的图片路径选项 \option{figurepath} 可在正文中使用。
+ \end{version}
+ \shortversion{v = 2024ci,date = 2024/06/22,changes = 修复使用 \code{flush} 类型脚注报错。}
+ \shortversion{v = 2024co,date = 2024/07/06,changes = 目录命令的可选参数支持 \CTeX 键值列表所有路径的章节标题样式选项。}
+ \shortversion{v = 2024cq,date = 2024/07/12,changes = 新增章节标题格式复制命令 \cs{CopyTitleFormat}。}
\end{changelog}
\nocite{*}
-\AddToHook{cmd/printindex/before}{\clearpage}
+% \AddToHook{cmd/printindex/before}{\clearpage}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/esami/README b/Master/texmf-dist/doc/latex/esami/README
index 22f183f8d82..b1ef039c0ea 100644
--- a/Master/texmf-dist/doc/latex/esami/README
+++ b/Master/texmf-dist/doc/latex/esami/README
@@ -1,6 +1,6 @@
-The esami package v. 2.8
+The esami package v. 2.9
For generation of texts and solutions of exams in LaTeX
-2023/07/21
+2024/07/01
File: README
Author: Grazia Messineo and Salvatore Vassallo
@@ -14,7 +14,7 @@ varying in random order, with closed or open answer, matching, problems, and so
of each group are randomly scrambled across the exam and variants of each exercise are chosen
randomly from a file which contains them all and.
-Copyright: (C) 2008--2023 Grazia Messineo & Salvatore Vassallo
+Copyright: (C) 2008--2024 Grazia Messineo & Salvatore Vassallo
Licence: LPPL
FILES IN DISTRIBUTION
diff --git a/Master/texmf-dist/doc/latex/esami/VERSION b/Master/texmf-dist/doc/latex/esami/VERSION
index 64fbb8d2f3d..98dd0056296 100644
--- a/Master/texmf-dist/doc/latex/esami/VERSION
+++ b/Master/texmf-dist/doc/latex/esami/VERSION
@@ -1 +1 @@
-VERSION 2.8 DATE=July 17, 2023
+VERSION 2.9 DATE=July 1, 2024
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf
index d2d96db33a1..8f06ffc33ba 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex
index 44da55a4815..8adc1c17a1b 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-en.tex
@@ -81,6 +81,7 @@
\changes{Version 2.6}{2021/10/11}{Improved the spacing in \cmd{\FPsignpol}. Corrected the code to avoid some spourios spaces. }
\changes{Version 2.7}{2022/01/11}{Improved the spacing in \cmd{\sempli} and \cmd{\FPsignpol}. Corrected a misprint in the code.}
\changes{Versione 2.8}{2023/07/21}{Documentation modified to solve a problem with the Spanish Language.}
+\changes{Versione 2.9}{2024/07/03}{Loaded the package tagpdf-base to avoid an error on the measures of the boxes.}
%\IndexPrologue{\section*{Index} Numbers written in italic refer to the page where the item is described; underlined numebers refer to the line of code in which the item is described; other references are to the line of code where the item is used.}
\GlossaryPrologue{\section*{Changelog}}
\def\MacroFont{\fontencoding\encodingdefault
@@ -798,7 +799,8 @@ Inside this file you should use only one command, \cmd{\def \textbackslash eserc
\item[Version 2.5 (2018/05/06)] Corrected a misprint in the code. Improved the selection of random exercises.
\item[Version 2.6 (2021/10/11)] Improved the spacing in \cmd{\FPsignpol}. Corrected the code to avoid some spourios spaces.
\item[Version 2.7 (2021/10/11)] Improved the spacing in \cmd{\sempli} and \cmd{\FPsignpol}. Corrected a misprint in the code
-\item[Versione 2.8 (2023/07/21)] Documentation modified to solve a problem with the spanish language.
+\item[Version 2.8 (2023/07/21)] Documentation modified to solve a problem with the spanish language.
+\item[Version 2.89 ( 2024/07/03)] Loaded the package tagpdf-base to avoid an error on the measures of the boxes.
\end{description}
\bibliographystyle{plain}
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf
index c4c9c5f20e7..8b83d7bdf1c 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex
index 0a2b92414f3..dae29f96fe5 100644
--- a/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex
+++ b/Master/texmf-dist/doc/latex/esami/doc/esami-doc-it.tex
@@ -79,6 +79,8 @@
\changes{Versione 2.6}{2021/10/11}{Migliorata la spaziatura in \cmd{\FPsignpol}. Corretto il codice per eliminare alcuni spazi spuri.}
\changes{Versione 2.7}{2022/01/11}{Migliorata la spaziatura in \cmd{\sempli} e \cmd{\FPsignpol}. Corretto un errore nel codice}
\changes{Versione 2.8}{2023/07/21}{Modificata la documentazione per risolvere un problema con la lingua spagnola.}
+\changes{Versione 2.9}{2024/07/03}{Caricato il pacchetto tagpdf-base per evitare un errore sulle misure delle box.}
+
%\IndexPrologue{\section*{Indice} I numeri scritti in italico rimandano alla pagina dove è descritto l'item; i numeri sottolineati rimandano alla riga di codice in cui l'item è descritto; le altre referenze sono alla riga di codice dove l'item è usato.}
\GlossaryPrologue{\section*{Changelog}}
\def\MacroFont{\fontencoding\encodingdefault
@@ -800,7 +802,7 @@ Al suo interno si deve usare un solo comando, \cmd{\def \textbackslash esercizio
\item[Versione 2.6 (2021/10/11)] Migliorata la spaziatura in \cmd{\FPsignpol}. Corretto il codice per eliminare alcuni spazi spuri.
\item[Versione 2.7 (2022/01/11)] Migliorata la spaziatura in \cmd{\sempli} e \cmd{\FPsignpol}. Corretto un errore nel codice
\item[Versione 2.8 (2023/07/21)] Modificata la documentazione per risolvere un problema con la lingua spagnola.
-
+ \item[Versione 2.8 (2024/07/03)]Caricato il pacchetto tagpdf-base per evitare un errore sulle misure delle box.
\end{description}
diff --git a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie1.parametri.tex b/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie1.parametri.tex
deleted file mode 100644
index 107265dbc49..00000000000
--- a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie1.parametri.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-\FPeval{a}{round(12:0)}
-\FPeval{b}{round(13:0)}
-\FPeval{c}{round(3:0)}
-\FPeval{k}{round(4:0)}
diff --git a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie2.parametri.tex b/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie2.parametri.tex
deleted file mode 100644
index e736caa6a08..00000000000
--- a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie2.parametri.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-\FPeval{a}{round(14:0)}
-\FPeval{b}{round(15:0)}
-\FPeval{c}{round(2:0)}
-\FPeval{k}{round(5:0)}
diff --git a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie3.parametri.tex b/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie3.parametri.tex
deleted file mode 100644
index 98ef5100988..00000000000
--- a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie3.parametri.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-\FPeval{a}{round(12:0)}
-\FPeval{b}{round(15:0)}
-\FPeval{c}{round(2:0)}
-\FPeval{k}{round(4:0)}
diff --git a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie4.parametri.tex b/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie4.parametri.tex
deleted file mode 100644
index ab468d8a752..00000000000
--- a/Master/texmf-dist/doc/latex/esami/doc/examples/qftest5-fillinqiie4.parametri.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-\FPeval{a}{round(13:0)}
-\FPeval{b}{round(14:0)}
-\FPeval{c}{round(2:0)}
-\FPeval{k}{round(4:0)}
diff --git a/Master/texmf-dist/doc/latex/esami/doc/examples/testA-xetex-sol.sol.tex b/Master/texmf-dist/doc/latex/esami/doc/examples/testA-xetex-sol.sol.tex
new file mode 100644
index 00000000000..00cc5e002ca
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/esami/doc/examples/testA-xetex-sol.sol.tex
@@ -0,0 +1,84 @@
+\begin{minipage}{.33\textwidth}{\large\textbf{Soluzione\ Versione\ n. 1}}
+\begin{enumerate}
+\item\ref{e:1-file:test2-q:i}
+\item\ref{e:1-file:test3-q:ii}
+\item\ref{e:1-file:test2-q:ii}
+\item\ref{e:1-file:test2-q:iii}
+\item\ref{e:1-file:test3-q:i}
+\item\ref{e:1-file:test1-q:i}
+\item\ref{e:1-file:test9-q:ii}
+\item\ref{e:1-file:test14-q:i}
+\item\ref{e:1-file:test4-q:v}
+\item \makeatletter \input{qftest5-fillinqiie1.parametri}\makeatother
+ \FPsv [2]{b/k}
+\item\ref{e:1-file:test11-q:i}
+\item\ref{e:1-file:test11-q:ii}
+\par\end{enumerate}\vspace{3ex}
+\begin{enumerate}
+\item\ref{e:1-file:test12-q:i}
+\item\ref{e:1-file:test13-q:ii}
+\par\end{enumerate}\vspace{3ex}
+\end{minipage}
+\begin{minipage}{.33\textwidth}{\large\textbf{Soluzione\ Versione\ n. 2}}
+\begin{enumerate}
+\item\ref{e:2-file:test2-q:iii}
+\item\ref{e:2-file:test3-q:i}
+\item\ref{e:2-file:test2-q:ii}
+\item\ref{e:2-file:test3-q:iv}
+\item\ref{e:2-file:test2-q:i}
+\item\ref{e:2-file:test1-q:ii}
+\item \makeatletter \input{qftest5-fillinqiie2.parametri}\makeatother
+ \FPsv [2]{a/c}
+\item\ref{e:2-file:test9-q:iii}
+\item\ref{e:2-file:test14-q:i}
+\item\ref{e:2-file:test4-q:ii}
+\item\ref{e:2-file:test11-q:i}
+\item\ref{e:2-file:test11-q:ii}
+\par\end{enumerate}\vspace{3ex}
+\begin{enumerate}
+\item\ref{e:2-file:test13-q:iii}
+\item\ref{e:2-file:test12-q:iii}
+\par\end{enumerate}\vspace{3ex}
+\end{minipage}
+\begin{minipage}{.33\textwidth}{\large\textbf{Soluzione\ Versione\ n. 3}}
+\begin{enumerate}
+\item\ref{e:3-file:test2-q:iii}
+\item\ref{e:3-file:test3-q:i}
+\item\ref{e:3-file:test2-q:i}
+\item\ref{e:3-file:test3-q:ii}
+\item\ref{e:3-file:test2-q:ii}
+\item\ref{e:3-file:test14-q:i}
+\item \makeatletter \input{qftest5-fillinqiie3.parametri}\makeatother
+ \FPsv [2]{b/k}
+\item\ref{e:3-file:test4-q:iii}
+\item\ref{e:3-file:test1-q:i}
+\item\ref{e:3-file:test9-q:iv}
+\item\ref{e:3-file:test11-q:i}
+\item\ref{e:3-file:test11-q:ii}
+\par\end{enumerate}\vspace{3ex}
+\begin{enumerate}
+\item\ref{e:3-file:test12-q:i}
+\item\ref{e:3-file:test13-q:iv}
+\par\end{enumerate}\vspace{3ex}
+\end{minipage}
+\begin{minipage}{.33\textwidth}{\large\textbf{Soluzione\ Versione\ n. 4}}
+\begin{enumerate}
+\item\ref{e:4-file:test2-q:ii}
+\item\ref{e:4-file:test2-q:i}
+\item\ref{e:4-file:test3-q:i}
+\item\ref{e:4-file:test3-q:ii}
+\item\ref{e:4-file:test2-q:iii}
+\item\ref{e:4-file:test4-q:v}
+\item\ref{e:4-file:test9-q:iii}
+\item\ref{e:4-file:test1-q:ii}
+\item\ref{e:4-file:test14-q:i}
+\item \makeatletter \input{qftest5-fillinqiie4.parametri}\makeatother
+ \FPsv [2]{a/c}
+\item\ref{e:4-file:test11-q:i}
+\item\ref{e:4-file:test11-q:ii}
+\par\end{enumerate}\vspace{3ex}
+\begin{enumerate}
+\item\ref{e:4-file:test13-q:iii}
+\item\ref{e:4-file:test12-q:iii}
+\par\end{enumerate}\vspace{3ex}
+\end{minipage}
diff --git a/Master/texmf-dist/doc/latex/fancyhdr/README b/Master/texmf-dist/doc/latex/fancyhdr/README
index 4a7d219fdc0..0d655cb9a55 100644
--- a/Master/texmf-dist/doc/latex/fancyhdr/README
+++ b/Master/texmf-dist/doc/latex/fancyhdr/README
@@ -27,7 +27,7 @@ In order to latex the documentation you need to have a copy of
boxedminipage.sty (CTAN:/macros/latex/contrib/boxedminipage) and
refcount.sty (CTAN:/macros/latex/contrib/oberdiek/) installed.
-This is version 4.2 of fancyhdr.sty and extramarks.sty. They are
+This is version 4.3 of fancyhdr.sty and extramarks.sty. They are
described in the third edition of The LaTeX Companion.
Extramarks.sty has not been changed, except for the version and
copyright information.
diff --git a/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf b/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
index 9f781dad3ba..38bb822211e 100644
--- a/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
+++ b/Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/heria/README.md b/Master/texmf-dist/doc/latex/heria/README.md
index b3d5cf32b1c..664e9ae18bd 100644
--- a/Master/texmf-dist/doc/latex/heria/README.md
+++ b/Master/texmf-dist/doc/latex/heria/README.md
@@ -34,5 +34,5 @@ feature requests.
The `heria` class is distributed under the conditions of the [LaTeX
Project Public License](https://www.latex-project.org/lppl.txt),
-either version 1.3 of this license or (at your option) any later
+either version 1.3c of this license or (at your option) any later
version.
diff --git a/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf b/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf
index f8d64312a9a..60d99c6dab5 100644
--- a/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf
+++ b/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/heria/heria-proposal.tex b/Master/texmf-dist/doc/latex/heria/heria-proposal.tex
index 4d75dd73234..e929caeaafb 100644
--- a/Master/texmf-dist/doc/latex/heria/heria-proposal.tex
+++ b/Master/texmf-dist/doc/latex/heria/heria-proposal.tex
@@ -8,10 +8,10 @@
%%
%% This is a generated file.
%%
-%% Copyright 2023 Tristan Miller
+%% Copyright 2023, 2024 Tristan Miller
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
@@ -20,6 +20,8 @@
%%
\documentclass[showinstructions]{heria}
+\templateversion{3.4}
+
\title{Skeleton Horizon Europe Proposal}
\callname{insert call name}
\callidentifier{HORIZON-XX0-0000-XXXXX-00-XXXXX}
diff --git a/Master/texmf-dist/doc/latex/heria/heria.pdf b/Master/texmf-dist/doc/latex/heria/heria.pdf
index af4f0cd6275..71b47d5ed5e 100644
--- a/Master/texmf-dist/doc/latex/heria/heria.pdf
+++ b/Master/texmf-dist/doc/latex/heria/heria.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.txt b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.txt
index 7d8f3b3a248..0ff75108697 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.txt
@@ -1,3 +1,12 @@
+Version: 2024-07-10 v7.01j
+2024-07-10 Ulrike Fischer
+ * hyperref.dtx: define \HyOrg@addtoreset always for cleveref
+ compability with tagging code, see https://github.com/latex3/tagging-project/issues/2
+
+2024-06-02 Ulrike Fischer
+ * hyperref.dtx: enable use of onmousedown and onmouseup, issue #342
+
+Version: 2024-05-23 v7.01i
2024-05-25 Ulrike Fischer
* hyperref.dtx: load stringenc always to allow the use of pdfencoding in a group.
diff --git a/Master/texmf-dist/doc/latex/hyperref/README.md b/Master/texmf-dist/doc/latex/hyperref/README.md
index 7161209179e..335fb1f62b3 100644
--- a/Master/texmf-dist/doc/latex/hyperref/README.md
+++ b/Master/texmf-dist/doc/latex/hyperref/README.md
@@ -1,6 +1,6 @@
# README for hyperref bundle
-Version 2024-05-23 v7.01i
+Version 2024-07-10 v7.01j
## INTRODUCTION
diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
index ae783bd0cf1..5ec3d8b07f1 100644
--- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.html b/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.html
index 70741ce170b..0b918b602de 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.html
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.html
@@ -25,7 +25,7 @@ href="https://github.com/latex3/hyperref/issues" class="url" ><span
class="ec-lmvtt-10x-x-120">https://github.com/latex3/hyperref/issues</span></a><span
class="ec-lmr-12">)</span></div><br />
<div class="date" ><span
-class="ec-lmr-12">2024-05-23 v7.01i</span></div>
+class="ec-lmr-12">2024-07-10 v7.01j</span></div>
</div>
<h3 class="likesectionHead"><a
id="x1-1000"></a>Contents</h3>
@@ -1079,45 +1079,54 @@ class="td11"> <!--l. 604--><p class="noindent" >this
style="vertical-align:baseline;" id="TBL-2-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-8-1"
class="td11"> <span
class="ec-lmvtt-10">backref </span></td><td style="white-space:normal; text-align:left;" id="TBL-2-8-2"
-class="td11"> <!--l. 606--><p class="noindent" > </td></tr><tr
+class="td11"> <!--l. 606--><p class="noindent" >
+ </td></tr><tr
style="vertical-align:baseline;" id="TBL-2-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-9-1"
class="td11"> <span
class="ec-lmvtt-10">pagebackref </span></td> <td style="white-space:normal; text-align:left;" id="TBL-2-9-2"
-class="td11"> <!--l. 607--><p class="noindent" ></td>
+class="td11"> <!--l. 607--><p class="noindent" >
+ </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-10-1"
class="td11"> <span
class="ec-lmvtt-10">destlabel </span></td><td style="white-space:normal; text-align:left;" id="TBL-2-10-2"
-class="td11"> <!--l. 608--><p class="noindent" > </td></tr><tr
+class="td11"> <!--l. 608--><p class="noindent" >
+ </td></tr><tr
style="vertical-align:baseline;" id="TBL-2-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-11-1"
class="td11"> <span
class="ec-lmvtt-10">pdfusetitle </span></td> <td style="white-space:normal; text-align:left;" id="TBL-2-11-2"
-class="td11"> <!--l. 609--><p class="noindent" ></td>
+class="td11"> <!--l. 609--><p class="noindent" >
+ </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-12-1"
class="td11"> <span
class="ec-lmvtt-10">pdfpagelabels </span></td><td style="white-space:normal; text-align:left;" id="TBL-2-12-2"
-class="td11"> <!--l. 610--><p class="noindent" > </td>
+class="td11"> <!--l. 610--><p class="noindent" >
+ </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-13-1"
class="td11"> <span
class="ec-lmvtt-10">hyperfootnotes </span></td><td style="white-space:normal; text-align:left;" id="TBL-2-13-2"
-class="td11"> <!--l. 611--><p class="noindent" > </td>
+class="td11"> <!--l. 611--><p class="noindent" >
+ </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-14-1"
class="td11"> <span
class="ec-lmvtt-10">hyperfigures </span></td><td style="white-space:normal; text-align:left;" id="TBL-2-14-2"
-class="td11"> <!--l. 612--><p class="noindent" > </td>
+class="td11"> <!--l. 612--><p class="noindent" >
+ </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-15-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-15-1"
class="td11"> <span
class="ec-lmvtt-10">hyperindex </span></td><td style="white-space:normal; text-align:left;" id="TBL-2-15-2"
-class="td11"> <!--l. 613--><p class="noindent" > </td>
+class="td11"> <!--l. 613--><p class="noindent" >
+ </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-16-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-16-1"
class="td11"> <span
class="ec-lmvtt-10">encap </span></td><td style="white-space:normal; text-align:left;" id="TBL-2-16-2"
-class="td11"> <!--l. 614--><p class="noindent" > </td>
+class="td11"> <!--l. 614--><p class="noindent" >
+ </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-17-"><td style="white-space:nowrap; text-align:left;" id="TBL-2-17-1"
class="td11"> <span
@@ -1950,8 +1959,7 @@ class="td01"><span
class="ec-lmvtt-10">hyperfigures </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-2"
class="td11"> boolean </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-3"
class="td11"> </td><td style="white-space:normal; text-align:left;" id="TBL-8-2-4"
-class="td10">
- <!--l. 941--><p class="noindent" > </td>
+class="td10"> <!--l. 941--><p class="noindent" > </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-8-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-1"
class="td01"><span
@@ -3174,8 +3182,6 @@ class="td10">
<!--l. 1198--><p class="noindent" >The old page slides off the screen in the direction
specified by /Di, uncovering the new page in the
direction specified by /Di. </td>
-
-
</tr><tr
style="vertical-align:baseline;" id="TBL-13-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-13-12-1"
class="td01"><span
@@ -3184,6 +3190,8 @@ class="td11"> </td><td style="white-space:normal; text-align:left;
class="td10">
<!--l. 1201--><p class="noindent" >The new page gradually becomes visible through the old
one. </td>
+
+
</tr><tr
style="vertical-align:baseline;" id="TBL-13-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-13-13-1"
class="td01"> </td>
@@ -3709,8 +3717,7 @@ class="td10">
class="td01"> </td><td style="white-space:nowrap; text-align:left;" id="TBL-14-58-2"
class="td11"> <span
class="ec-lmri-10">hyperref </span></td><td style="white-space:normal; text-align:left;" id="TBL-14-58-3"
-class="td10">
- <!--l. 1293--><p class="noindent" > </td>
+class="td10"> <!--l. 1293--><p class="noindent" > </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-14-59-"><td style="white-space:nowrap; text-align:left;" id="TBL-14-59-1"
class="td01"><span
@@ -3850,8 +3857,6 @@ class="td11"> <span
class="ec-lmri-10">true </span></td><td style="white-space:normal; text-align:left;" id="TBL-14-75-3"
class="td10">
<!--l. 1313--><p class="noindent" >set PDF page labels </td>
-
-
</tr><tr
style="vertical-align:baseline;" id="TBL-14-76-"><td style="white-space:nowrap; text-align:left;" id="TBL-14-76-1"
class="td01"><span
@@ -3860,6 +3865,8 @@ class="td11"> <span
class="ec-lmri-10">empty </span></td><td style="white-space:normal; text-align:left;" id="TBL-14-76-3"
class="td10">
<!--l. 1314--><p class="noindent" >set layout of PDF pages </td>
+
+
</tr><tr
style="vertical-align:baseline;" id="TBL-14-77-"><td style="white-space:nowrap; text-align:left;" id="TBL-14-77-1"
class="td01"><span
@@ -4091,8 +4098,6 @@ class="td11"> <span
class="ec-lmri-10">true </span></td><td style="white-space:normal; text-align:left;" id="TBL-14-104-3"
class="td10">
<!--l. 1345--><p class="noindent" >set page size by special driver commands </td>
-
-
</tr><tr
style="vertical-align:baseline;" id="TBL-14-105-"><td style="white-space:nowrap; text-align:left;" id="TBL-14-105-1"
class="td01"><span
@@ -4101,6 +4106,8 @@ class="td11"> </td><td style="white-space:normal; text-align:l
class="td10">
<!--l. 1346--><p class="noindent" >use <span
class="ec-lmss-10">TeX4ht </span>backend </td>
+
+
</tr><tr
style="vertical-align:baseline;" id="TBL-14-106-"><td style="white-space:nowrap; text-align:left;" id="TBL-14-106-1"
class="td01"><span
@@ -4226,8 +4233,6 @@ class="ec-lmvtk-10">nextactionraw</span><span
class="ec-lmbx-10">:</span> </dt><dd
class="description">
<!--l. 1379--><p class="noindent" >The value of key <span class="obeylines-h"><code class="verb">/Next</code></span> of action dictionaries, see PDF specification.</dd></dl>
-
-
<!--l. 1383--><p class="noindent" ><span class="fbox"><!--tex4ht:inline--><div class="tabular"> <table id="TBL-16" class="tabular"
><colgroup id="TBL-16-1g"><col
@@ -4241,6 +4246,7 @@ class="ec-lmvtt-10">\href</span><span class="obeylines-h"><code class="verb">{</
class="ec-lmri-10">URL</span><span class="obeylines-h"><code class="verb">}{</code></span><span
class="ec-lmvtt-10">\nolinkurl</span><span class="obeylines-h"><code class="verb">{</code></span><span
class="ec-lmri-10">URL</span><span class="obeylines-h"><code class="verb">}}</code></span>. Depending on the driver <span class="obeylines-h"><code class="verb">\href</code></span> also tries to detect the link
+
type. Thus the result can be a url link, file link, &#x2026;. The implementation makes use of the <span
class="ec-lmss-10">url </span>package and
its commands can be used to format and fine tune the url, but the behaviour of <span
@@ -4360,8 +4366,6 @@ and the <span
class="ec-lmri-10">text </span>which is used as the link on the page.
<!--l. 1457--><p class="indent" > Note that in HTML parlance, the <span class="obeylines-h"><code class="verb">\hyperlink</code></span> command inserts a notional # in front of each link,
making it relative to the current testdocument; <span class="obeylines-h"><code class="verb">\href</code></span> expects a full URL.
-
-
<!--l. 1461--><p class="noindent" ><span class="fbox"><!--tex4ht:inline--><div class="tabular"> <table id="TBL-25" class="tabular"
><colgroup id="TBL-25-1g"><col
@@ -4372,6 +4376,8 @@ class="ec-lmvtt-10">\phantomsection </span></td>
</tr></table> </div></span>
<!--l. 1465--><p class="noindent" >This sets an anchor at this location. It works similar to <span class="obeylines-h"><code class="verb">\hypertarget{}{}</code></span> with an automatically chosen
anchor name. Often it is used in conjunction with <span class="obeylines-h"><code class="verb">\addcontentsline</code></span> for sectionlike things (index,
+
+
bibliography, preface). <span class="obeylines-h"><code class="verb">\addcontentsline</code></span> refers to the latest previous location where an anchor is set.
Example:
<blockquote class="quote">
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.pdf
index 51e6b0d29b9..1637285c01a 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.tex b/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.tex
index 55b0476967f..2f4ff93f807 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.tex
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref-doc.tex
@@ -166,7 +166,7 @@
}
\makeatother
\title{Hypertext marks in \hologo{LaTeX}: a manual for \xpackage{hyperref}}
-\date{2024-05-23 v7.01i}
+\date{2024-07-10 v7.01j}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref-linktarget.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref-linktarget.pdf
index f95e9380f60..3e29950cf1f 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref-linktarget.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref-linktarget.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 62ce7aba615..bb0f2a46aa3 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
index 47209adb7c7..4c4ea6606bf 100644
--- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/xr-hyper.pdf b/Master/texmf-dist/doc/latex/hyperref/xr-hyper.pdf
index 3b4395c0f6e..a5d0e690fc9 100644
--- a/Master/texmf-dist/doc/latex/hyperref/xr-hyper.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/xr-hyper.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfc-a-answer.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfc-a-answer.pdf
index f6f0a506494..e12e04e0475 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfc-a-answer.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfc-a-answer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfc-a-blank.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfc-a-blank.pdf
index 09d8a14b153..d033fe6d75d 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfc-a-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfc-a-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfc-b-answer.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfc-b-answer.pdf
index 2356b53690f..6497883408f 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfc-b-answer.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfc-b-answer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfc-b-blank.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfc-b-blank.pdf
index d9160a13edc..5682c2d24b9 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfc-b-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfc-b-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfe-a-answer.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfe-a-answer.pdf
index 6ac1d17806d..c029ef99ea2 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfe-a-answer.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfe-a-answer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfe-a-blank.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfe-a-blank.pdf
index 4192ead99f0..e2f4dac7e26 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfe-a-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfe-a-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfe-b-answer.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfe-b-answer.pdf
index bf5e9342eef..8e60df9eac5 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfe-b-answer.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfe-b-answer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/examfe-b-blank.pdf b/Master/texmf-dist/doc/latex/jnuexam/examfe-b-blank.pdf
index c37242241f3..03bcefee494 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/examfe-b-blank.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/examfe-b-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf b/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf
index 0cc01cc3f1b..c0a756123ca 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.pdf b/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.pdf
index 0f802f5bf8d..92e9769f85b 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.pdf
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.tex
index 643a5898fe9..b3294eb42a3 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/kaytannollista-latexia.tex
@@ -31,7 +31,7 @@
datezeros=false]{biblatex}
\usepackage{tikz}
\usepackage{totcount}
-\usepackage{nowidow} \setnowidow \setnoclub
+\usepackage[all]{nowidow}
\usepackage{hanging}
\usepackage{lettrine}
\usepackage{multicol}
@@ -94,7 +94,7 @@ SmallCapsFont={* Regular}, SmallCapsFeatures={Language=Default,
Letters=SmallCaps}]
\setmonofont{Libertinus Mono}[
-Scale=MatchLowercase, Ligatures={TeXReset, NoCommon},
+Scale=MatchLowercase, Ligatures={TeXOff, CommonOff},
FakeStretch=0.8, Numbers=SlashedZero]
\setmathfont{Libertinus Math}[Scale=MatchLowercase]
@@ -114,7 +114,7 @@ FakeStretch=0.8, Numbers=SlashedZero]
\newcommand{\versaalinum}{\addfontfeatures{Numbers=Uppercase}}
\newcommand{\murtoluku}[2]{{\addfontfeatures{Fractions=On}#1/#2}}
-\setlength{\emergencystretch}{1em}
+\setlength{\emergencystretch}{1.3em}
\setlength{\parindent}{1em}
\setlength{\bibhang}{\parindent}
@@ -173,7 +173,7 @@ columnsep=1em]
\begin{textblock*}{1cm}(-2em,3bp)
\small\seurausnuoli
\end{textblock*}
- \begin{minipage}{\linewidth}
+ \begin{minipage}{\textwidth}
\linespread{1}\small
}{%
\end{minipage}
@@ -188,18 +188,18 @@ columnsep=1em]
\end{list}}
\floatsetup{ style=plain, font={small}, justification=raggedright,
- margins=raggedright, captionskip=0ex, capposition=bottom }
+ margins=centering, captionskip=0ex, capposition=bottom }
\floatsetup[table]{ style=plain, captionskip=2ex }
\floatsetup[figure]{ style=plain, captionskip=2ex }
\captionsetup{ font={small, sf}, labelfont={bf}, textfont={},
- textformat=period, margin=.5em, justification=RaggedRight,
- singlelinecheck=off }
+ textformat=period, margin={.1em, 1.1em}, oneside,
+ justification=RaggedRight, singlelinecheck=off }
\newcommand{\leijutlk}[2]{%
\begin{table*}
- \floatbox{table}{\versaalinum #1}{#2}
+ \floatbox{table}[\FBwidth]{\versaalinum #1}{#2}
\end{table*}}
\newcommand{\leijukuva}[2]{%
@@ -215,7 +215,6 @@ columnsep=1em]
\setlength{\itemsep}{.2ex plus .2ex}
\setlength{\parsep}{0em}
\setlength{\topsep}{.2ex plus .2ex}
- \RaggedRight
}}{\end{list}}
\newenvironment{maaritelma}[1]{%
@@ -442,6 +441,7 @@ columnsep=1em]
\begin{list}{\textbullet}{
\setlength{\leftmargin}{1em}
+ \setlength{\labelsep}{.35em}
\setlength{\topsep}{0ex}
\setlength{\partopsep}{0ex}
\setlength{\itemsep}{0ex}
@@ -492,7 +492,6 @@ columnsep=1em]
ladottu eri väreillä: \komentox{teksti} ja \mkomentox{matematiikka}.}
\printindex[komennot]
\printindex[laskurit]
-\clearpage
\printindex[mitat]
\printindex[paketit]
\indexprologue{\noindent Tekstitilan ja matematiikkatilan ympäristöt on
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-asetukset.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-asetukset.tex
index 88c31f03f69..b9bfa55d7d3 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-asetukset.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-asetukset.tex
@@ -275,7 +275,7 @@ muokata sivun ylä- tai alatunnistetta eli verrattain pysyviä
tunnistetietoja, jotka toistuvat joka sivulla ylä- tai alareunassa.
Niiden muokkaamiseen käytetään \paketti{fancyhdr}\-/ pakettia, jonka
ohjeita on luvussa \ref{luku/ylä-ala-tunnisteet}. Sivun taustavärin
-asettamista käsitellään luvussa \ref{luku/korostus-värit}.
+asettamista käsitellään luvussa \ref{luku/sivun-väri}.
\subsection{Sivun koko ja marginaalit}
\label{luku/sivun-mitat}
@@ -886,6 +886,26 @@ toteutukseen.
\label{esim/fancyhdr-koko}
\end{esimerkki*}
+\subsection{Taustaväri}
+\label{luku/sivun-väri}
+
+Dokumentin sivun värin valitsemiseen sopii \pakettictan{xcolor}\-/
+paketti, jonka peruskäyttöön kannattaa tutustua luvussa
+\ref{luku/värit}. Sivulle voi asettaa taustavärin komennolla
+\komento{pagecolor}, joka vaihtaa värin nykyiselle ja seuraaville
+sivuille, kunnes väri vaihdetaan toiseksi tai poistetaan. Komennolle
+annetaan samanlaiset argumentit kuin muillekin värikomennoille (luku
+\ref{luku/värit}). Komento \komento{nopagecolor} poistaa taustavärin
+kokonaan eli palauttaa taustan oletustilaan.
+
+\komentoi{pagecolor}
+\komentoi{nopagecolor}
+\begin{koodilohkosis}
+\pagecolor{nimi} % sivun taustaväriksi ennalta määritelty ”nimi”
+\pagecolor[värimalli]{parametrit}
+\nopagecolor
+\end{koodilohkosis}
+
\section{Pdf-tiedosto}
\label{luku/pdf-asetukset}
@@ -1119,6 +1139,7 @@ komennoilla\footnote{Vaihtoehtoisesti fontit voi asettaa
TeX Gyre Chorus & kalligrafinen \\
\midrule
Libertinus Sans & groteski, humanistinen, kaksivahvuinen \\
+ Latin Modern Sans & groteski \\
TeX Gyre Heros & groteski, uusgroteski \\
DejaVu Sans & groteski, uusgroteski \\
TeX Gyre Adventor & groteski, geometrinen \\
@@ -1126,6 +1147,7 @@ komennoilla\footnote{Vaihtoehtoisesti fontit voi asettaa
Libertinus Mono & tasalevyinen \\
TeX Gyre Cursor & tasalevyinen \\
DejaVu Sans Mono & tasalevyinen \\
+ Latin Modern Mono & tasalevyinen \\
\bottomrule
\end{tabular}
}{
@@ -1227,7 +1249,7 @@ loppupuolella.
Letters=SmallCaps}]
\setmonofont{Libertinus Mono}[
- Scale=MatchLowercase, FakeStretch=0.8, Ligatures=NoCommon]
+ Scale=MatchLowercase, FakeStretch=0.8, Ligatures=CommonOff]
\end{koodilohko}
\caption{Libertinus\-/ kirjainperheiden asettaminen. Tässä
\englanti{Libertinus Serif} \=/perheen lihavoinniksi on valittu
@@ -1837,7 +1859,10 @@ käyttämällä valitsinta \koodi{Renderer} seuraavan esimerkin tavoin:
\noindent
Tavallisimpia \koodi{Renderer}\-/ valitsimen arvoja ovat
-\koodi{\mbox{Node}}, \koodi{Harf\-Buzz} ja \koodi{Open\-Type}.
+\koodi{\mbox{Node}}, \koodi{Harf\-Buzz} ja \koodi{Open\-Type}. Toisinaan
+\koodi{\mbox{Node}} on tuottanut paremman tuloksen kuin muut
+vaihtoehdot.
+
Lisätietoa voi lukea \paketti{fontspec}\-/ paketin ohjekirjan luvusta,
joka käsittelee Luatexin erityispiirteitä. Myös Xelatexissa (Xetex) on
fontteihin liittyviä ominaisuuksia, joita ei muissa kääntäjissä ole.
@@ -1867,7 +1892,7 @@ käsitellään tarkemmin luvussa \ref{luku/typo-liga}. Molemmat edellä
mainitut ligatuurityypit saa pois päältä seuraavalla asetuksella:
\begin{koodilohkosis}
-Ligatures={TeXReset, NoCommon}
+Ligatures={TeXOff, CommonOff}
\end{koodilohkosis}
\noindent
@@ -1890,13 +1915,13 @@ HyphenChar=None
\noindent
Yleensä tasalevyisestä kirjainperheestä kannattaa kytkeä typografiset
-ligatuurit pois päältä asetuksella \koodi{Liga\-tures=\katk No\-Common}.
-Tasalevyisen fontin ajatukseen nimenomaan kuuluu, että merkit ovat
-samanlevyisiä eikä yhden merkin tilaan sovi sulloa useampaa kirjainta.
-Kaikki tasalevyiset kirjainperheet eivät edes sisällä ligatuurimerkkejä,
-joten ominaisuus näyttää olevan automaattisesti pois päältä. Varmuuden
-vuoksi on kuitenkin hyvä lisätä asetus \koodi{Liga\-tures=\katk
- No\-Common} tasalevyiselle perheelle.
+ligatuurit pois päältä asetuksella \koodi{Liga\-tures=\katk
+ Common\-Off}. Tasalevyisen fontin ajatukseen nimenomaan kuuluu, että
+merkit ovat samanlevyisiä eikä yhden merkin tilaan sovi sulloa useampaa
+kirjainta. Kaikki tasalevyiset kirjainperheet eivät edes sisällä
+ligatuurimerkkejä, joten ominaisuus näyttää olevan automaattisesti pois
+päältä. Varmuuden vuoksi on kuitenkin hyvä lisätä asetus
+\koodi{Liga\-tures=\katk Common\-Off} tasalevyiselle perheelle.
Oletuksena tavutus on kytketty pois päältä tasalevyiseltä
kirjainperheeltä, koska sitä käytetään tavallisesti tietokoneisiin
@@ -1998,13 +2023,13 @@ fi f\textcompwordmark i
\noindent
Mikäli tavallisia ligatuureja ei halua käyttöön lainkaan, on parasta
valita jo kirjainperheen tai \=/leikkauksen käyttöönotossa asetus
-\koodi{Liga\-tures=\katk No\-Com\-mon}. Väliaikaisesti fontin asetuksiin
+\koodi{Liga\-tures=\katk Common\-Off}. Väliaikaisesti fontin asetuksiin
voi vaikuttaa komennolla \komento{addfontfeatures}, joka sekin on
\paketti{fontspec}\-/pakettiin sisältyvä komento.
\komentoi{addfontfeatures}
\begin{koodilohkosis}
-{\addfontfeatures{Ligatures=NoCommon} fi fl}
+{\addfontfeatures{Ligatures=CommonOff} fi fl}
\end{koodilohkosis}
\noindent
@@ -2013,8 +2038,8 @@ sisältää myös harvinaisempia ligatuureja, jotka täytyy erikseen kytkeä
päälle. Niiden tarkoituksena on esimerkiksi erityinen koristeellisuus
tai historiallisen kirjainleikkauksen jäljittely. Harvinaisia
ligatuureja ei ole tarkoitus käyttää joka tilanteessa vaan ainoastaan
-erityisestä syystä. Kuvassa \ref{kuva/ligatuurit} ja tässäkin
-tekstikappaleessa olevat {%
+erityisestä syystä. Kuvassa \ref{kuva/ligatuurit} ja tässäkin virkkeessä
+olevat {%
\newcommand{\hlig}[1]{{\addfontfeatures{Ligatures=Historic}#1}}%
\hlig{st}- ja \hlig{ct}\-/ligatuurit%
} on saatu fontin asetuksella \koodi{Liga\-tures=\katk His\-toric}.
@@ -2319,6 +2344,7 @@ math Mathematical Alphanumeric Symbols
\rivi{TeX Gyre Schola}{TeX Gyre Schola Math}
\rivi{TeX Gyre Termes}{TeX Gyre Termes Math}
\rivi{DejaVu Serif}{TeX Gyre Dejavu Math}
+ \rivi{DejaVu Serif}{DejaVu Serif}
\rivi{Garamond Libre}{Garamond Math}
\rivi{Latin Modern Roman}{Latin Modern Math}
\bottomrule
@@ -2334,8 +2360,8 @@ Taulukkoon \ref{tlk/matematiikka-fontteja} on koottu \englanti{Open
Type} \=/fontteja, joissa on yhteensopiva leipätekstin ja
matematiikkatilan kirjainperhe. Teknisesti kaikkia voi käyttää kaikkien
kanssa, mutta on tietenkin toivottavaa, että kirjainleikkaukset sopivat
-ulkoasultaan yhteen. Kaikki fontit ovat vapaita ja toimitetaan Tex Live
-\=/jakelun tai käyttöjärjestelmän mukana.
+ulkoasultaan yhteen. Kaikki taulukon fontit ovat vapaita ja toimitetaan
+Tex Live \=/jakelun tai käyttöjärjestelmän mukana.
\section{Kieli}
\label{luku/kieliasetukset}
@@ -3270,8 +3296,8 @@ merkityksellisten osien rajakohdasta. Tavurajakin voi sattua samaan
paikkaan, mutta tavutettaessa heittomerkki säilyy: \emph{show'-hun}.%
\footnote{Asiaa ei yleensä mainita kielenhuolto\-/oppaissa. Tieto
perustuu Kielikello\-/lehden 2/2006 artikkeliin:
- \kulmaurl{https://www.kielikello.fi/-/lainausmerkit-}. Viittauspäivä
- 6.7.2020.} Mikäli tällainen tavutuskohta halutaan mukaan, käytetään
+ \kulmaurl{https://kielikello.fi/lainausmerkit/}. Viittauspäivä
+ 5.5.2024.} Mikäli tällainen tavutuskohta halutaan mukaan, käytetään
sanassa tavallista tavutusvihjettä: \koodi{show'}\komento{-}\koodi{hun}.
Mieluummin ei kuitenkaan katkaista sanoja heittomerkin kohdalta.
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-erikoiset.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-erikoiset.tex
index c87d9c41501..b625e80d1b9 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-erikoiset.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-erikoiset.tex
@@ -191,7 +191,7 @@ sisältöelementtien (\englanti{inner}) ulkoasuun ja diojen reunoille
\providecommand{\teema}{}
\renewcommand{\teema}[2][,]{\mbox{\koodi{#2}#1}}
- \begin{tabularx}{\linewidth}{lL}
+ \begin{tabularx}{\textwidth}{lL}
\toprule
\ots{Komento} & \ots{Valmiita teemoja} \\
\rivi{usetheme}{
@@ -335,8 +335,7 @@ lisätietoihin. Muualla käytetään antiikvaa.
\leijutlk{
\providecommand{\rivi}{}
\renewcommand{\rivi}[2]{\koodi{#1} & #2 \\}
-
- \begin{tabularx}{\linewidth}{lL}
+ \begin{tabularx}{\textwidth}{lL}
\toprule
\ots{Valitsin} & \ots{Merkitys} \\
\midrule
@@ -425,8 +424,8 @@ otsikon teksti valkeaksi ja tausta siniseksi:
\noindent
Värien nimien täytyy olla ennalta määriteltyjä. Perusvärit
(\englanti{\koodi{white}, \koodi{blue}, \koodi{red}} ym.) on määritelty
-valmiiksi, mutta lisää värejä voi määritellä ohjeilla, joita kerrotaan
-luvussa \ref{luku/korostus-värit}.
+valmiiksi, mutta lisää värejä voi määritellä luvun \ref{luku/värit}
+ohjeilla.
Oletuksena luetelmaympäristöt \ymparisto{itemize} ja
\ymparisto{enumerate} latovat luetelmamerkit eri värillä kuin normaalin
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-merkintakieli.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-merkintakieli.tex
index 4c18794a421..7f1e589ae2b 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-merkintakieli.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-merkintakieli.tex
@@ -330,17 +330,17 @@ Edellä kuvatut Latexin omat lainausmerkkien merkintätavat (\koodi{''},
pois päältä fontin asetuksista eli \paketti{fontspec}\-/ pakettiin
kuuluvien toimintojen avulla. Fonteissa on yleensä oletuksena päällä
Tex\-/ligatuurit eli asetus \koodi{Liga\-tures=\katk TeX}, mutta sen saa
-poistettua asetuksella \koodi{Liga\-tures=\katk TeX\-Reset}. Asetusta
+poistettua asetuksella \koodi{Liga\-tures=\katk TeX\-Off}. Asetusta
muutetaan kirjainperheen määrittelyn yhteydessä tai väliaikaisesti
komennolla \komento{addfontfeatures}.
\komentoi{addfontfeatures}
\begin{koodilohkosis}
-{\addfontfeatures{Ligatures=TeXReset} `` '' >> '}
+{\addfontfeatures{Ligatures=TeXOff} `` '' >> '}
\end{koodilohkosis}
\begin{tulossis}
- {\addfontfeatures{Ligatures=TeXReset} `` '' >> '}
+ {\addfontfeatures{Ligatures=TeXOff} `` '' >> '}
\end{tulossis}
\noindent
@@ -419,16 +419,16 @@ yhdysmerkkiä, voi käyttää tasalevyistä fonttia
(\komento{texttt}\komentoarg{--}), joka oletuksena kytkee pois Latexin
ajatusviivatoiminnon. Saman asetuksen saa kyllä mihin tahansa fonttiin,
kun poistaa fontista niin sanotut Tex\-/ligatuurit asetuksella
-\koodi{Liga\-tures=\katk TeX\-Reset}. Väliaikaisesti asetus tehdään
+\koodi{Liga\-tures=\katk TeX\-Off}. Väliaikaisesti asetus tehdään
seuraavasti:
\komentoi{addfontfeatures}
\begin{koodilohkosis}
-{\addfontfeatures{Ligatures=TeXReset} -- ---}
+{\addfontfeatures{Ligatures=TeXOff} -- ---}
\end{koodilohkosis}
\begin{tulossis}
- {\addfontfeatures{Ligatures=TeXReset} -- ---}
+ {\addfontfeatures{Ligatures=TeXOff} -- ---}
\end{tulossis}
\noindent
@@ -2124,9 +2124,6 @@ kehysviivan etäisyys sisällöstä määritellään mitassa \mitta{fboxsep}.
\end{tulossis}
\noindent
-Värillisten laatikoiden ja kehysten tekemistä neuvotaan luvussa
-\ref{luku/korostus-värit}, joka käsittelee väriasioita muutenkin.
-
Tekstiä sisältävien laatikoiden korkeus vaihtelee kirjainten ja muiden
merkkien muodon mukaan. Esimerkiksi kirjainten ala- ja yläpidennykset
kasvattavat laatikon kokoa gemenalinjan yläpuolelle tai peruslinjan
@@ -2364,3 +2361,137 @@ kaksi seuraavista kirjaimista: \koodi{c} (\englanti{center}, keski),
arvoksi täysympyrän yksikkömäärä, ja oletusasetus on \koodi{units=\katk
360}. Jos haluaa käyttää radiaaneja, sopiva asetus on
\koodi{units=\katk 6.283185} (2π\,rad).
+
+\section{Tekstin ja laatikoiden värit}
+\label{luku/värit}
+
+Latexiin saa värit \pakettictan{xcolor}\-/ paketin
+avulla.\footnote{Toinen vaihtoehto on yksinkertaisempi väripaketti
+ \paketti{color}, joka sisältää värien käsittelyn perustoiminnot.} Se
+tarjoaa muun muassa komentoja, joilla tekstin väriä, tekstin taustaväriä
+tai sivun taustaväriä (luku \ref{luku/sivun-väri}) voi muuttaa. Lisäksi
+paketti sisältää värien sekoittamiseen ja muuntamiseen liittyvää
+tekniikkaa. Paketin komentojen avulla voi myös värittää taulukoiden
+(luku \ref{luku/taulukot}) rivit vuorottelevin värein.
+
+Omassa dokumentissa käytettävät värit on hyvä määritellä alussa.
+Määrittely tarkoittaa sitä, että annetaan väreille nimet -- esimerkiksi
+käyttötarkoituksen mukaan -- ja myöhemmin lähdedokumentissa viitataan
+väreihin käyttämällä alussa määriteltyjä nimiä. Näin väri on määritelty
+yhdessä paikassa ja sen muuttaminen on myöhemmin helppoa. On kyllä
+mahdollista käyttää värejä ilman etukäteismäärittelyäkin.
+
+\leijutlk{
+ \providecommand{\rivi}{}
+ \renewcommand{\rivi}[3]{\koodi{#1} & #2 & \koodi{#3}
+ & \textcolor[#1]{#3}{\rule{.9em}{.9em}} \\}
+ \begin{tabular}{llll}
+ \toprule
+ \ots{Malli}
+ & \ots{Parametrit}
+ & \multicolumn{2}{l}{\ots{Esimerkki}} \\
+ \midrule
+ \rivi{rgb}{punainen, vihreä, sininen}{1,.7,.3}
+ \rivi{HTML}{punainen vihreä sininen}{33aaf3}
+ \rivi{cmyk}{syaani, magenta, keltainen, musta}{.1,1,.5,0}
+ \rivi{hsb}{sävy, kylläisyys, kirkkaus}{.2,1,.6}
+ \rivi{gray}{harmaa}{.55}
+ \bottomrule
+ \end{tabular}
+}{
+ \caption{Erilaisia värimalleja ja niiden parametreja
+ \paketti{xcolor}\-/ paketissa}
+ \label{tlk/värimalleja}
+}
+
+Omat värit määritellään komennolla \komento{definecolor}. Se tarvitsee
+kolme argumenttia: värin nimen, värimallin ja värikoodin. Komennon
+argumenttien rakenne on seuraavanlainen:
+
+\komentoi{definecolor}
+\begin{koodilohkosis}
+\definecolor{nimi}{välimalli}{parametrit}
+\end{koodilohkosis}
+
+\noindent
+Komennon argumentti \koodi{nimi} on kirjoittajan itse valitsema nimi, ja
+se voi liittyä esimerkiksi värin käyttötarkoitukseen (''otsikko'') tai
+värin yleiseen nimeen (''keltainen''). Argumentti \koodi{väri\-malli}
+tarkoittaa värin ilmaisemisen tapaa. Niitä on useita erilaisia, mutta
+yleisimmät on koottu taulukkoon \ref{tlk/värimalleja}.
+
+Eri värimalleilla on eri määrä parametreja, joilla ilmaistaan värin
+ominaisuuksia. Kunkin parametrin arvo on yleensä desimaaliluku 0\==1,
+mutta \koodi{HTML}\-/ värimallissa parametrit ilmaistaan yhtenä kolmen
+kaksinumeroisen heksadesimaaliluvun sarjana \textsc{html}\-/
+merkintäkielen tavoin. Värin parametrit kirjoitetaan komennon
+argumenttiin \koodi{para\-metrit} ja ne erotetaan toisistaan pilkulla.
+Taulukon \ref{tlk/värimalleja} Esimerkki\-/sarakkeessa on parametrien
+antamisesta esimerkki. Muista värimalleista voi lukea
+\paketti{xcolor}\-/ paketin ohjekirjasta.
+
+Kun värit on määritelty, niitä voi käyttää eri komentojen yhteydessä.
+Tekstin väri vaihdetaan toiseksi komennolla \komento{color}, josta on
+kaksi erilaista versiota. Komento vaihtaa värin pysyvästi nykyisen
+ympäristön (luku \ref{luku/ympäristöt}) tai aaltosulkeilla (luku
+\ref{luku/aaltosulkeet}) rajatun alueen sisällä.
+
+\komentoi{color}
+\begin{koodilohkosis}
+\color{nimi} % väriksi ennalta määritelty ”nimi”
+\color[värimalli]{parametrit} % värimallin ja parametrien avulla
+\end{koodilohkosis}
+
+\noindent
+Toinen vaihtoehto on käyttää komentoa \komento{textcolor}, jolle
+annetaan edelliseen verrattuna vielä yksi argumentti lisää. Argumenttina
+on teksti, johon värin halutaan vaikuttavan. Vaikutusalueena on siis
+vain kyseinen teksti.
+
+\komentoi{textcolor}
+\begin{koodilohkosis}
+\textcolor{nimi}{teksti}
+\textcolor[värimalli]{parametrit}{teksti}
+\end{koodilohkosis}
+
+\noindent
+Tekstin taustaväri vaihdetaan komennoilla \komento{colorbox} ja
+\komento{fcolorbox}. Komennot luovat pienen laatikon (luku
+\ref{luku/laatikot-pienet}), jonka sisällä taustaväri on voimassa. Ensin
+mainittu komento vaihtaa vain taustavärin, ja jälkimmäinen sisältää
+lisäksi värillisen kehyksen, eli sille määritellään kaksi väriä.
+
+\begin{koodilohkosis}
+\colorbox{nimi}{teksti} % taustaväriksi ennalta määritelty ”nimi”
+\colorbox[värimalli]{parametrit}{teksti}
+\fcolorbox{nimi/kehys}{nimi/tausta}{teksti}
+\fcolorbox[värimalli]{parametrit/kehys}{parametrit/tausta}{teksti}
+\end{koodilohkosis}
+
+\noindent
+Kehystetyn laatikon kehysviivan leveys on mitassa \mitta{fboxrule} ja
+kehyksen etäisyys sisällöstä mitassa \mitta{fboxsep}. Seuraavassa on
+esimerkki useiden edellä mainittujen komentojen käytöstä. Tästä tuskin
+kannattaa ottaa mallia vakavaan typografiseen työhön.
+
+\komentoi{colorbox}
+\komentoi{color}
+\komentoi{definecolor}
+\komentoi{fcolorbox}
+\komentoi{setlength}
+\komentoi{textcolor}
+\mittai{fboxrule}
+\mittai{fboxsep}
+\begin{koodilohkosis}
+\definecolor{pun}{rgb}{1,.2,.2}
+\setlength{\fboxrule}{2bp} \setlength{\fboxsep}{1bp}
+\fcolorbox[gray]{.4}{.2}{\color[gray]{1}Tekstiä}
+\textcolor{pun}{voi korostaa} \colorbox{pun}{väreillä}.
+\end{koodilohkosis}
+
+\begin{tulossis}
+ \definecolor{pun}{rgb}{1,.2,.2}
+ \setlength{\fboxrule}{2bp} \setlength{\fboxsep}{1bp}
+ \fcolorbox[gray]{.4}{.2}{\color[gray]{1}Tekstiä}
+ \textcolor{pun}{voi korostaa} \colorbox{pun}{väreillä}.
+\end{tulossis}
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-rakenne.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-rakenne.tex
index 58e992b3ca7..8eccc972d5f 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-rakenne.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-rakenne.tex
@@ -121,6 +121,52 @@ Taulukossa on mainittu ensin Latexin omat komennot ja sitten
estävät sanojen tavuttamisen, kun taas \paketti{ragged2e}\-/ paketin
komennot sallivat tavutuksen normaalisti.
+\subsection{Optinen tasaus}
+
+Tekstin tasaamisessa halutaan toisinaan jättää jotkut merkit
+tasauskohdan ulkopuolelle. Esimerkiksi suurikokoisissa otsikoissa on
+joskus alussa lainausmerkki, joka halutaan latoa tasauskohdan vasemmalle
+puolelle, jotta eri riveillä olevat sanat saadaan tasaan.
+
+\begin{tulossis}
+ \Large\makebox[0bp][r]{''}Optinen tasaus \\
+ otsikossa''
+\end{tulossis}
+
+\noindent
+Tasauskohdan ulkopuolinen lainausmerkki voidaan toteuttaa leveydettömän
+laatikon avulla (luku \ref{luku/laatikot}). Lainausmerkki kirjoitetaan
+laatikkoon, jonka leveys on nolla ja jonka sisältö tasataan laatikon
+oikeaan reunaan. Tällöin laatikko ei vie yhtään tilaa, mutta sen sisältö
+ladotaan kyseisen kohdan vasemmalle puolelle.
+
+\komentoi{makebox}
+\begin{koodilohkosis}
+\makebox[0bp][r]{''}Optinen tasaus \\
+otsikossa''
+\end{koodilohkosis}
+
+\noindent
+Toisinaan keskitetyssä monirivisessä tekstissä tai otsikossa on rivin
+lopussa yhdysmerkki, mutta keskitys ehkä halutaan toteuttaa vain
+kirjainten perusteella ja jättää yhdysmerkki sen ulkopuolelle. Sellainen
+yhdysmerkki voidaan kirjoittaa leveydettömään laatikkoon, jolloin sitä
+ei huomioida keskittämisessä.
+
+\komentoi{makebox}
+\ymparistoi{center}
+\begin{koodilohkosis}
+\begin{center}
+ \Large Latex\makebox[0bp][l]{-} \\ opas
+\end{center}
+\end{koodilohkosis}
+
+\begin{tulossis}
+ \begin{center}
+ \Large Latex\makebox[0bp][l]{-} \\ opas
+ \end{center}
+\end{tulossis}
+
\subsection{Pystysuuntaiset välit}
\label{luku/pystysuuntaiset-välit}
@@ -1437,159 +1483,24 @@ seuraavalla tavalla:
\end{koodilohkosis}
\subsection{Värit}
-\label{luku/korostus-värit}
Eri värien käyttö voi sopia tekstin erilaisten osien korostamiseen.
-Esimerkiksi otsikot, taulukot tai leijuvat osat saa erottumaan
-selvemmin, kun niiden toteutuksessa käyttää värejä. Sen sijaan
-leipätekstin sisällä värejä täytynee käyttää hillitysti, sillä värikäs
-tekstipalsta näyttää rauhattomalta ja voi hidastaa lukemista.
-
-Latexiin saa värit \pakettictan{xcolor}\-/ paketin
-avulla.\footnote{Toinen vaihtoehto on yksinkertaisempi väripaketti
- \paketti{color}, joka sisältää värien käsittelyn perustoiminnot.} Se
-tarjoaa muun muassa komentoja, joilla tekstin väriä, tekstin taustaväriä
-tai sivun taustaväriä voi muuttaa. Lisäksi se sisältää värien
-sekoittamiseen ja muuntamiseen liittyvää tekniikkaa. Paketin komentojen
-avulla voi myös värittää taulukoiden (luku \ref{luku/taulukot}) rivit
-vuorottelevin värein.
-
-Omassa dokumentissa käytettävät värit on hyvä määritellä alussa.
-Määrittely tarkoittaa sitä, että annetaan väreille nimet -- esimerkiksi
-käyttötarkoituksen mukaan -- ja myöhemmin lähdedokumentissa viitataan
-väreihin käyttämällä alussa määriteltyjä nimiä. Näin väri on määritelty
-yhdessä paikassa ja sen muuttaminen on myöhemmin helppoa. On kyllä
-mahdollista käyttää värejä ilman etukäteismäärittelyäkin.
-
-\leijutlk{
- \providecommand{\rivi}{}
- \renewcommand{\rivi}[3]{\koodi{#1} & #2 & \koodi{#3}
- & \textcolor[#1]{#3}{\rule{.9em}{.9em}} \\}
- \begin{tabular}{llll}
- \toprule
- \ots{Malli}
- & \ots{Parametrit}
- & \multicolumn{2}{l}{\ots{Esimerkki}} \\
- \midrule
- \rivi{rgb}{punainen, vihreä, sininen}{1,.7,.3}
- \rivi{HTML}{punainen vihreä sininen}{33aaf3}
- \rivi{cmyk}{syaani, magenta, keltainen, musta}{.1,1,.5,0}
- \rivi{hsb}{sävy, kylläisyys, kirkkaus}{.2,1,.6}
- \rivi{gray}{harmaa}{.55}
- \bottomrule
- \end{tabular}
-}{
- \caption{Erilaisia värimalleja ja niiden parametreja
- \paketti{xcolor}\-/ paketissa}
- \label{tlk/värimalleja}
-}
-
-Omat värit määritellään komennolla \komento{definecolor}. Se tarvitsee
-kolme argumenttia: värin nimen, värimallin ja värikoodin. Komennon
-argumenttien rakenne on seuraavanlainen:
-
-\komentoi{definecolor}
-\begin{koodilohkosis}
-\definecolor{nimi}{välimalli}{parametrit}
-\end{koodilohkosis}
-
-\noindent
-Komennon argumentti \koodi{nimi} on kirjoittajan itse valitsema nimi,
-ja se voi liittyä esimerkiksi värin käyttötarkoitukseen (''nuoli'') tai
-värin yleiseen nimeen (''keltainen''). Argumentti \koodi{väri\-malli}
-tarkoittaa värin ilmaisemisen tapaa. Niitä on useita erilaisia, mutta
-yleisimmät on koottu taulukkoon \ref{tlk/värimalleja}.
-
-Eri värimalleilla on eri määrä parametreja, joilla ilmaistaan värin
-ominaisuuksia. Kunkin parametrin arvo on yleensä desimaaliluku 0\==1,
-mutta \koodi{HTML}\-/ värimallissa parametrit ilmaistaan yhtenä kolmen
-kaksinumeroisen heksadesimaaliluvun sarjana \textsc{html}\-/
-merkintäkielen tavoin. Värin parametrit kirjoitetaan komennon
-argumenttiin \koodi{para\-metrit} ja ne erotetaan toisistaan pilkulla.
-Taulukon \ref{tlk/värimalleja} Esimerkki\-/sarakkeessa on parametrien
-antamisesta esimerkki. Muista värimalleista voi lukea
-\paketti{xcolor}\-/ paketin ohjekirjasta.
-
-Kun värit on määritelty, niitä voi käyttää eri komentojen yhteydessä.
-Tekstin väri vaihdetaan toiseksi komennolla \komento{color}, josta on
-kaksi erilaista versiota. Komento vaihtaa värin pysyvästi nykyisen
-ympäristön (luku \ref{luku/ympäristöt}) tai aaltosulkeilla (luku
-\ref{luku/aaltosulkeet}) rajatun alueen sisällä.
-
-\komentoi{color}
-\begin{koodilohkosis}
-\color{nimi} % väriksi ennalta määritelty ”nimi”
-\color[värimalli]{parametrit} % värimallin ja parametrien avulla
-\end{koodilohkosis}
-
-\noindent
-Toinen vaihtoehto on käyttää komentoa \komento{textcolor}, jolle
-annetaan edelliseen verrattuna vielä yksi argumentti lisää. Argumenttina
-on teksti, johon värin halutaan vaikuttavan. Vaikutusalueena on siis
-vain kyseinen teksti.
-
-\komentoi{textcolor}
-\begin{koodilohkosis}
-\textcolor{nimi}{teksti}
-\textcolor[värimalli]{parametrit}{teksti}
-\end{koodilohkosis}
-
-\noindent
-Tekstin taustaväri vaihdetaan komennoilla \komento{colorbox} ja
-\komento{fcolorbox}. Komennot luovat laatikon, jonka sisällä taustaväri
-on voimassa. Ensin mainittu komento vaihtaa vain taustavärin, ja
-jälkimmäinen sisältää lisäksi värillisen kehyksen, eli sille
-määritellään kaksi väriä.
-
-\begin{koodilohkosis}
-\colorbox{nimi}{teksti} % taustaväriksi ennalta määritelty ”nimi”
-\colorbox[värimalli]{parametrit}{teksti}
-\fcolorbox{nimi(kehys)}{nimi(tausta)}{teksti}
-\fcolorbox[värimalli]{parametrit(kehys)}{parametrit(tausta)}{teksti}
-\end{koodilohkosis}
-
-\noindent
-Kehystetyn laatikon kehysviivan leveys on mitassa \mitta{fboxrule} ja
-kehyksen etäisyys sisällöstä mitassa \mitta{fboxsep}. Seuraavassa on
-esimerkki useiden edellä mainittujen komentojen käytöstä. Tästä tuskin
-kannattaa ottaa mallia vakavaan typografiseen työhön.
-
-\komentoi{colorbox}
-\komentoi{color}
-\komentoi{definecolor}
-\komentoi{fcolorbox}
-\komentoi{setlength}
-\komentoi{textcolor}
-\mittai{fboxrule}
-\mittai{fboxsep}
-\begin{koodilohkosis}
-\definecolor{pun}{rgb}{1,.2,.2}
-\setlength{\fboxrule}{2bp} \setlength{\fboxsep}{1bp}
-\fcolorbox[gray]{.4}{.2}{\color[gray]{1}Tekstiä}
-\textcolor{pun}{voi korostaa} \colorbox{pun}{väreillä}.
-\end{koodilohkosis}
-
-\begin{tulossis}
- \definecolor{pun}{rgb}{1,.2,.2}
- \setlength{\fboxrule}{2bp} \setlength{\fboxsep}{1bp}
- \fcolorbox[gray]{.4}{.2}{\color[gray]{1}Tekstiä}
- \textcolor{pun}{voi korostaa} \colorbox{pun}{väreillä}.
-\end{tulossis}
-
-\noindent
-Sivulle voi asettaa taustavärin komennolla \komento{pagecolor}.
-Taustäväri vaihtuu nykyiselle ja seuraaville sivuille, kunnes väri
-vaihdetaan toiseksi tai poistetaan. Komennolle annetaan samanlaiset
-argumentit kuin muillekin värikomennoille. Komento \komento{nopagecolor}
-poistaa taustavärin kokonaan eli palauttaa taustan oletustilaan.
-
-\komentoi{pagecolor}
-\komentoi{nopagecolor}
-\begin{koodilohkosis}
-\pagecolor{nimi} % sivun taustaväriksi ennalta määritelty ”nimi”
-\pagecolor[värimalli]{parametrit}
-\nopagecolor
-\end{koodilohkosis}
+Esimerkiksi otsikot (luku \ref{luku/otsikot}), taulukot (luku
+\ref{luku/taulukot}) tai leijuvat osat (luku \ref{luku/leijuosat}) saa
+erottumaan selvemmin, kun niiden toteutuksessa käyttää värejä. Sen
+sijaan leipätekstissä värejä kannattaa käyttää hillitymmin, sillä
+värikäs tekstipalsta näyttää rauhattomalta. Katse voi hakeutua
+poikkeavan värisiin osiin liian helposti, mikä hidastaa lukemista.
+Värien käsittelyn tekniikkaa käsitellään luvussa \ref{luku/värit} ja
+sivun taustaväriä luvussa \ref{luku/sivun-väri}.
+
+Tämän oppaan leipätekstissä on käytetty värejä Latexin komentojen ja
+muiden rakenteiden ilmaisemiseen, esimerkiksi \komentox{komento},
+\ymparistox{ympäristö} ja \mittax{mitta}. Värisävyt on melko tummia,
+jotta mustaa tekstiä sisältävä tekstipalsta näyttäisi verrattain
+tasaiselta eikä katse kiinnittyisi värillisiin kohtiin kovin helposti.
+Samanlaista ajatusta kannattanee toteuttaa muidenkin elementtien
+värittämisessä.
\section{Sivunvaihdot ja sivujen tasaaminen}
\label{luku/sivunvaihdot}
@@ -2661,12 +2572,44 @@ kirjaimia (a, b, c jne.).
\label{esim/labelitem-labelenum}
\end{esimerkki*}
+\leijutlk{
+ \providecommand{\rivi}{}
+ \renewcommand{\rivi}[3]{#1 & \uctunnus{#2} & #3 \\}
+ \begin{tabular}{cll}
+ \toprule
+ \multicolumn{2}{l}{\ots{Merkki ja Unicode-nimi}} & \ots{Komento} \\
+ \midrule
+ \rivi{\textbullet}{u+2022 bullet}{\komento{textbullet}}
+ \rivi{◦}{u+25e6 white bullet}{}
+ \rivi{$\circ$}{u+2218 ring operator}{\koodi{\$\mkomento{circ}\$}}
+ % \rivi{⁃}{u+2043 hyphen bullet}{}
+ % \rivi{▪}{u+25aa black small square}{}
+ \rivi{\rule[.3ex]{.5ex}{.5ex}}{}
+ {\komento{rule}\komentoargv{.3ex}\komentoarg{.5ex}\komentoarg{.5ex}}
+ \rivi{‣}{u+2023 triangular bullet}{}
+ \rivi{--}{u+2013 en dash}{\komento{textendash}, \koodi{--}}
+ \rivi{$\star$}{u+22c6 star operator}{\koodi{\$\mkomento{star}\$}}
+ \rivi{\textasteriskcentered}
+ {u+2217 asterisk operator} {\komento{textasteriskcentered}}
+ \rivi{\textperiodcentered}
+ {u+00b7 middle dot}{\komento{textperiodcentered}}
+ \bottomrule
+ \end{tabular}
+}{
+ \caption{Erilaisia luetelmamerkkejä. Komento-sarakkeen
+ \koodi{\$}\=/merkit ovat matematiikkatilan aloitus- ja
+ lopetuskomentoja}
+ \label{tlk/luetelmamerkkejä}
+}
+
Luetelmamerkit ja luetelmien numerointitavat ovat kirjoittajan
muutettavissa. Ympäristössä \ymparisto{itemize} luetelmamerkit tulevat
komennosta, joka alkaa sanoilla \komentox{label\-item} ja jatkuu
luetelman tasoa ilmaisevalla roomalaisella numerolla
\koodi{i}\==\koodi{iv}. Komennot voi määritellä uudelleen haluamallaan
tavalla, kuten esimerkki \ref{esim/labelitem-labelenum} osoittaa.
+Taulukkoon \ref{tlk/luetelmamerkkejä} on koottu erilaisia
+luetelmamerkkejä sekä Latex\-/ komentoja, joilla niitä voi tuottaa.
\ymparisto{enumerate}\-/ ympäristössä numeroidut kohdat tulevat
komennosta, joka alkaa sanoilla \komentox{label\-enum} ja jatkuu
@@ -2773,9 +2716,9 @@ vaikutetaan luetelman asetuksiin.
Edellisen esimerkin argumentti \koodi{merk\-ki} sisältää tekstiä tai
koodia, joka muodostaa luetelmakohdan merkin. Numeroimattomassa
luetelmassa siihen voi laittaa esimerkiksi luetelmaympyrän eli komennon
-\komento{textbullet} tai ajatusviivan (\koodi{--}). Numeroidussa
-luetelmassa siihen kirjoitetaan komento, joka latoo jonkin laskurin
-arvon.
+\komento{textbullet} tai ajatusviivan (\koodi{--}). Muita esimerkkejä on
+taulukossa \ref{tlk/luetelmamerkkejä}. Numeroidussa luetelmassa siihen
+kirjoitetaan komento, joka latoo jonkin laskurin arvon.
\ymparisto{list}\-/ ympäristön toinen argumentti \koodi{ase\-tuk\-set}
sisältää mitä hyvänsä koodia, jolla vaikutetaan ympäristön asetuksiin.
@@ -3701,7 +3644,7 @@ huolehtivat myös niiden ylä- ja alapuolisesta välistä paremmin kuin
Latexin omat viivakomennot.
Taulukon rivien taustan voi värittää \pakettictan{xcolor}\-/ paketin
-(luku \ref{luku/korostus-värit}) komentojen avulla. Varsinkin leveiden
+(luku \ref{luku/värit}) komentojen avulla. Varsinkin leveiden
taulukoiden lukemista voi helpottaa, jos rivien eri taustavärit
vuorottelevat. Tarkemmat tiedot selviävät paketin ohjekirjasta, mutta
seuraavan esimerkin avulla ominaisuutta pääsee kokeilemaan:
@@ -4515,7 +4458,7 @@ toisistaan erotettuja valitsimia ja niiden arvoja.
\leijutlk{
\providecommand{\rivi}{}
\renewcommand{\rivi}[2]{\koodi{#1} & #2 \\}
- \begin{tabularx}{\linewidth}{lL}
+ \begin{tabularx}{\textwidth}{lL}
\toprule
\ots{Valitsin} & \ots{Merkitys ja vaihtoehtoja} \\
\midrule
@@ -4589,7 +4532,7 @@ ympäristössä.
\leijutlk{
\providecommand{\rivi}{}
\renewcommand{\rivi}[2]{\koodi{#1} & #2 \\}
- \begin{tabularx}{\linewidth}{lL}
+ \begin{tabularx}{\textwidth}{lL}
\toprule
\ots{Valitsin} & \ots{Merkitys ja vaihtoehtoja} \\
\midrule
@@ -4742,9 +4685,11 @@ Niitä käytetään seuraavalla tavalla:
\end{koodilohkosis}
\begin{wrapfigure}{R}{5em}
- \begin{tikzpicture}[x=.5em, y=.5em]
- \draw [draw=black, fill=yellow, line width=1bp] (0,0) ellipse [x
- radius=4, y radius=2, rotate=30];
+ \begin{tikzpicture}[x=.5em, y=.5em,
+ tyyli/.style={draw=black, fill=yellow, line width=.6bp}]
+ \draw [tyyli] (0,0) ellipse [x radius=4, y radius=1.5, rotate=45];
+ \draw [tyyli] (-2,2) circle [radius=1];
+ \draw [tyyli] (2,-2) circle [radius=1];
\end{tikzpicture}
\caption{Tekstipalstaan upotettu kuva}
\label{kuva/wrapfig-esimerkki}
@@ -4886,8 +4831,8 @@ Ristiviittaukset vaativat, että Latex\-/ lähdedokumentti käännetään
kahdesti. Ensimmäisellä kääntämiskerralla \komento{label}\-/ komennolla
mainittujen kohteiden tiedot kirjoitetaan muistiin väliaikaistiedostoon.
Toisella kääntämiskerralla hyödynnetään väliaikaistiedostoa ja
-\komento{ref}-, \komento{pageref}\-/\ ja \komento{nameref}\-/ komentojen
-tilalle ladotaan viittauskohteen oikeat tiedot.
+komentojen \komento{ref}, \komento{pageref} ja \komento{nameref} tilalle
+ladotaan viittauskohteen oikeat tiedot.
\section{Alaviitteet}
\label{luku/alaviitteet}
@@ -4895,12 +4840,14 @@ tilalle ladotaan viittauskohteen oikeat tiedot.
Alaviitteet ovat sivun alareunassa olevia numeroituja tai muulla tavalla
merkittyjä huomautuksia. Niihin viitataan sanojen tai virkkeiden perässä
olevalla yläindeksinumerolla, \=/kirjaimella tai
-\=/symbolilla.\footnote{Tässä on esimerkki alaviitteestä.} Alaviitteiden
-tarkoituksena on lisätä tekstiin lähes huomaamaton lisätieto, joka ei
-häiritse lukemista. Se sopii asioille, joilla ei ole suurta merkitystä
-useimmille lukijoille tai jotka muuten sopivat huonosti leipätekstiin.
-Varsin usein myös tiedonlähteet ilmaistaan alaviitteiden
-avulla.\footcites[162]{kt_oik}[127--128]{typokk}
+\=/symbolilla.\footnote{Katso myös ylä- ja alaindeksejä käsittelevä luku
+ \ref{luku/ylä-alaindeksit}. Siellä mainitun \paketti{realscripts}\-/
+ paketin lataaminen on suositeltavaa, kun käyttää alaviitteitä.}
+Alaviitteiden tarkoituksena on lisätä tekstiin lähes huomaamaton
+lisätieto, joka ei häiritse lukemista. Se sopii asioille, joilla ei ole
+suurta merkitystä useimmille lukijoille tai jotka muuten sopivat
+huonosti leipätekstiin. Varsin usein myös tiedonlähteet ilmaistaan
+alaviitteiden avulla.\footcites[162]{kt_oik}[127--128]{typokk}
Alaviite tehdään komennolla \komento{footnote}, jonka argumentiksi
kirjoitetaan alaviitteeseen tuleva teksti. Oletuksena Latex latoo
@@ -5023,6 +4970,8 @@ väli hieman kasvaa.
\rivi{norule}{vaakasuuntainen erotinviiva pois}
\rivi{perpage}{numerointi sivukohtaiseksi}
\rivi{bottom}{alaviite aina sivun alareunaan}
+ \rivi{ragged}{alaviitteeseen automaattinen \komento{raggedright} tai
+ \komento{RaggedRight}}
\rivi{hang}{luetelmatyyppiset alaviitteet, riippuva sisennys}
\rivi{multiple}{useat peräkkäiset yläindeksinumerot}
\bottomrule
@@ -5047,6 +4996,22 @@ voi sijoittua joskus ylemmäksi, jos sivun alaosaan ladotaan leijuva osa
tai jos sivun alareunan tasaaminen on pois päältä
(\komento{raggedbottom}, luku \ref{luku/sivunvaihdot}).
+Valitsin \koodi{ragged} latoo alaviitteen tekstikappaleet
+liehureunaisena eli suorittaa automaattisesti komennon
+\komento{raggedright} tai \komento{RaggedRight} (luku
+\ref{luku/kappaleen-tasaus}). Monipuolisempi keino alaviitteen tyylin
+muokkaamiseen on komento \komento{footnotelayout}. Komennon voi
+määritellä itse haluamakseen, ja komennon määritelmään kirjoitetaan mitä
+hyvänsä komentoja, jotka halutaan suorittaa automaattisesti jokaisen
+alaviitetekstin alussa.
+
+\komentoi{footnotelayout}
+\komentoi{raggedright}
+\begin{koodilohkosis}
+\renewcommand{\footnotelayout}{\raggedright}
+\end{koodilohkosis}
+
+\noindent
Oletuksena alaviitekappaleet ladotaan samalla tavalla kuin
tekstikappaleet oletuksena muutenkin, eli alaviitteen ensimmäinen rivi
on sisennetty, ja sen alussa on alaviitteen numero. Seuraavia rivejä ei
@@ -5064,7 +5029,7 @@ valitsimella \koodi{hang}. Sisennyksen suuruuteen voi vaikuttaa mitan
\pakettii{footmisc}
\begin{koodilohkosis}
\usepackage[hang]{footmisc}
-\setlength{\footnotemargin}{1.5em}
+\setlength{\footnotemargin}{.8em}
\end{koodilohkosis}
\noindent
@@ -5472,7 +5437,8 @@ esimerkkiteos on peräisin esimerkistä \ref{esim/thebibliography}.
\bottomrule
\end{tabular}
}{
- \caption{\paketti{natbib}\-/paketin lähdeviittauskomentoja}
+ \caption{\paketti{natbib}\-/paketin
+ läh\-de\-viit\-taus\-ko\-men\-toja}
\label{tlk/natbib-cite}
}
@@ -6351,7 +6317,7 @@ asetuksia käsitellään luvussa \ref{luku/asiasanat-asetukset}.
\leijutlk{
\providecommand{\rivi}{}
\renewcommand{\rivi}[2]{\koodi{#1} & #2 \\}
- \begin{tabularx}{\linewidth}{lL}
+ \begin{tabularx}{\textwidth}{lL}
\toprule
\ots{Valitsin} & \ots{Merkitys} \\
\midrule
@@ -6730,7 +6696,7 @@ valitsimia ja niiden arvoja. Valitsimia on koottu taulukkoon
\leijutlk{
\providecommand{\rivi}{}
\renewcommand{\rivi}[2]{\koodi{#1} & #2 \\}
- \begin{tabularx}{\linewidth}{lL}
+ \begin{tabularx}{\textwidth}{lL}
\toprule
\ots{Valitsin} & \ots{Merkitys ja vaihtoehtoja} \\
\midrule
@@ -6862,7 +6828,7 @@ merkkivalikoimassa.
\leijutlk{
\providecommand{\rivi}{}
\renewcommand{\rivi}[2]{\koodi{#1} & #2 \\}
- \begin{tabularx}{\linewidth}{lL}
+ \begin{tabularx}{\textwidth}{lL}
\toprule
\ots{Valitsin} & \ots{Merkitys} \\
\midrule
@@ -7044,7 +7010,7 @@ ilmaistaan tällaisten lisätietojen avulla. Esimerkki
\ref{esim/tikz-asetuksia} havainnollistaa tavallisimpia valinnaisia
argumentteja. Värivalitsimien \koodi{draw} ja \koodi{fill} arvoksi voi
antaa mitä hyvänsä nimettyjä värejä, joita käsitellään tarkemmin luvussa
-\ref{luku/korostus-värit}.
+\ref{luku/värit}.
\begin{esimerkki*}
\ymparistoi{tikzpicture}
@@ -7151,13 +7117,13 @@ paketin omasta ohjekirjasta.
\end{tikzpicture}
\end{koodilohko}
- \begin{tulossis}
+ \begin{tulos}
\begin{tikzpicture}[x=1mm, y=1mm]
\node (ympyrä) at (0,0) [draw, circle] {vasen};
\node (suorakulmio) at (20,0) [draw, rectangle] {oikea};
\draw [->, shorten >=1mm] (ympyrä) to [out=45, in=135] (suorakulmio);
\end{tikzpicture}
- \end{tulossis}
+ \end{tulos}
\caption{Solmujen nimeäminen ja kytkeminen viivan avulla}
\label{esim/tikz-solmujen-yhdistäminen}
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-valmistautuminen.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-valmistautuminen.tex
index 027eb397fad..eda9ffd6b4e 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-valmistautuminen.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/luku-valmistautuminen.tex
@@ -386,7 +386,7 @@ Minun Latex-dokumenttini!
\end{esimerkki*}
Dokumentin alkuosaa riville 9 saakka kutsutaan esittelyosaksi
-(\englanti{preamble}). Tässä osassa ladataan tarvittavat paketit ja
+(\englanti{pre\-am\-ble}). Tässä osassa ladataan tarvittavat paketit ja
määritetään dokumentin asetuksia ja taustatietoja. Riviltä 10 alkaa
varsinainen tekstiosa eli dokumentin sivuille ladottava sisältö. Se osa
kirjoitetaan \ymparisto{document}\-/ ympäristön sisään eli riveillä 10
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/tavutusvihjeet.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/tavutusvihjeet.tex
index 19d78109d10..68c0120943c 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/tavutusvihjeet.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/tavutusvihjeet.tex
@@ -208,6 +208,7 @@ font-ti-koko-komen-to-jen
font-ti-komen-to-ja
foot-misc
foot-note
+foot-note-lay-out
foot-note-mark
foot-note-sep
foot-note-text
diff --git a/Master/texmf-dist/doc/latex/kaytannollista-latexia/versio.tex b/Master/texmf-dist/doc/latex/kaytannollista-latexia/versio.tex
index 93a754457b0..60bbc868ef4 100644
--- a/Master/texmf-dist/doc/latex/kaytannollista-latexia/versio.tex
+++ b/Master/texmf-dist/doc/latex/kaytannollista-latexia/versio.tex
@@ -1 +1 @@
-\newcommand{\versio}{2024.2}
+\newcommand{\versio}{2024.7}
diff --git a/Master/texmf-dist/doc/latex/lastpage/README b/Master/texmf-dist/doc/latex/lastpage/README
index 4545b13a601..b7c3c78bb26 100644
--- a/Master/texmf-dist/doc/latex/lastpage/README
+++ b/Master/texmf-dist/doc/latex/lastpage/README
@@ -1,4 +1,4 @@
-README for lastpage package, 2024-04-27, v2.1a
+README for lastpage package, 2024-07-07, v2.1c
TABLE OF CONTENTS
diff --git a/Master/texmf-dist/doc/latex/lastpage/lastpage-example.pdf b/Master/texmf-dist/doc/latex/lastpage/lastpage-example.pdf
index 6d1c748525f..db990f6942b 100644
--- a/Master/texmf-dist/doc/latex/lastpage/lastpage-example.pdf
+++ b/Master/texmf-dist/doc/latex/lastpage/lastpage-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lastpage/lastpage-example.tex b/Master/texmf-dist/doc/latex/lastpage/lastpage-example.tex
index a601fc1fd30..2fd859c44e7 100644
--- a/Master/texmf-dist/doc/latex/lastpage/lastpage-example.tex
+++ b/Master/texmf-dist/doc/latex/lastpage/lastpage-example.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -57,17 +56,17 @@
%% Tommy Muench + 2014-01-02
%% Hans-Klaus Muench + 2014-08-24
%%
-\documentclass[british]{article}[2023/05/17]% v1.4n Standard LaTeX document class
+\documentclass[british]{article}[2024/02/08]% v1.4n Standard LaTeX document class
\makeatletter
\@ifl@t@r\fmtversion{2022/11/01}{%
\AddToHook{enddocument/afterlastpage}[lastpage]{%
\message{^^JLaTeX Info: Executing hook `enddocument/afterlastpage'.}}%
}{\AtEndDocument{\message{^^JLaTeX Info: Executing hook `AtEndDocument'.}}%
}
-\usepackage[draft]{showkeys}[2023/07/08]% v3.19 Show cite and label keys (DPC, MH)
+\usepackage[draft]{showkeys}[2024/05/23]% v3.21 Show cite and label keys (DPC, MH)
%% Use final instead of draft to hide the keys. %%
\usepackage[pdfpagelabels=true,hyperindex=false]{hyperref}[2024-01-20]% v7.01h
-%% Hypertext links for LaTeX
+\@ifpackageloaded{hyperref}{% Hypertext links for LaTeX
\hypersetup{extension=pdf,%
plainpages=false,%
pdflang={en},%
@@ -78,9 +77,8 @@
pdfview=Fit,%
pdfstartview=Fit,%
pdfpagelayout=SinglePage%
-}
-\@ifpackageloaded{hyperref}{}{\usepackage{url}[2013/09/16]}% v3.4
-\usepackage{lastpage}[2024/04/27]% v2.1a
+}}{\usepackage{url}[2013/09/16]}% v3.4
+\usepackage{lastpage}[2024/07/07]% v2.1c
\renewcommand{\@evenfoot}{%
\normalsize\slshape \today\hfil \upshape %
page \thepage{} of \pageref{LastPage}}
@@ -92,7 +90,7 @@
\section*{Example for lastpage}
\markboth{Example for lastpage}{Example for lastpage}
This example demonstrates the use of package\newline
-\textsf{lastpage}, v2.1a as of 2024-04-27 (HMM; JPG).\newline
+\textsf{lastpage}, v2.1c as of 2024-07-07 (HMM; JPG).\newline
The package takes no options.\newline
For more details please see the documentation!\newline
@@ -117,7 +115,7 @@ trademark owner. There is no intention of infringement; the
usage is to the benefit of the trademark owner.\newline
\textbf{Tip}: Use \textit{logical page numbers}
-for the display of the pdf (in Adobe Acrobat Reader 2024.002.20687:
+for the display of the pdf (in Adobe Acrobat Reader 2024.002.20895:
Edit $>$ Preferences $>$ Page Display $>$
Page Content and Information: Use logical page numbers)!\newline
@@ -171,8 +169,8 @@ The code does not generally work even without hyperref.
\end{verbatim}
\end{quote}
-\noindent does work, because \verb|\lastpage@lastpage| contains the name
-of the page, \mbox{example:}
+\noindent does work (two compilations needed), because \verb|\lastpage@lastpage|
+contains the name of the page, \mbox{example:}
\begin{verbatim}
Page \thepage{} is (not) page \makeatletter\lastpage@lastpage\makeatother.
\end{verbatim}
diff --git a/Master/texmf-dist/doc/latex/lastpage/lastpage.pdf b/Master/texmf-dist/doc/latex/lastpage/lastpage.pdf
index 02cb1362b7f..9d224e6772e 100644
--- a/Master/texmf-dist/doc/latex/lastpage/lastpage.pdf
+++ b/Master/texmf-dist/doc/latex/lastpage/lastpage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lie-hasse/README b/Master/texmf-dist/doc/latex/lie-hasse/README
index e63a82cc605..1bd63c4cba2 100644
--- a/Master/texmf-dist/doc/latex/lie-hasse/README
+++ b/Master/texmf-dist/doc/latex/lie-hasse/README
@@ -2,9 +2,9 @@ ___________________________________
Lie Hasse
- v1.0
+ v1.01
- 3 February 2020
+ 9 July 2024
___________________________________
Authors : Ben McKay
diff --git a/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.pdf b/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.pdf
index 5be5791e7ff..ed444cc7d17 100644
--- a/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.pdf
+++ b/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.tex b/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.tex
index 82643fee141..762639c6038 100644
--- a/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.tex
+++ b/Master/texmf-dist/doc/latex/lie-hasse/lie-hasse.tex
@@ -1,5 +1,5 @@
\documentclass{amsart}
-\title[The Lie Hasse package]{The Lie Hasse package \\ Version 1.0}
+\title[The Lie Hasse package]{The Lie Hasse package \\ Version 1.01}
%% My name:
\makeatletter
\DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
@@ -19,8 +19,7 @@
\author{\authorsname}
\address{School of Mathematical Sciences, University College Cork, Cork, Ireland}
\email{b.mckay@ucc.ie}
-\date{3 February 2020}
-\usepackage{etex}
+\date{9 July 2024}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenx}
\usepackage{etoolbox}
@@ -87,7 +86,7 @@
root radius=.02cm,
edge length=.5cm,
edge quotes/.style={opacity=0}%
- ]{E}{8}%
+ ]E8%
\end{tikzpicture}%
\end{center}%
\begin{center}
@@ -106,26 +105,26 @@ This package draws the Hasse diagram of the poset of the positive simple roots o
\begin{document}
The Hasse diagram of \(F_4\) is
\begin{center}
-\hasse[edge length=1cm]{F}{4}
+\hasse F4
\end{center}
\end{document}
\end{Verbatim}
\end{tcolorbox}
\par\noindent{}The Hasse diagram of \(F_4\) is
\begin{center}
-\hasse[edge length=1cm]{F}{4}
+\hasse[edge length=1cm]F4
\end{center}
Each edge is labelled with the simple root by which vertices differ.
\begin{tcblisting}{title={Inside a \TikZ statement}}
-\(B_4\) has Dynkin diagram \tikz \dynkin[edge length=.35cm]{B}{4};, Hasse diagram
+\(B_4\) has Dynkin diagram \tikz \dynkin{B}{4};, Hasse diagram
\begin{center}
-\hasse[edge length=1cm]{B}{4}
+\hasse[edge length=1cm]B4
\end{center}
\end{tcblisting}
\begin{tcblisting}{title={Inside a Dynkin diagram environment, diagrams fit together}}
The Hasse diagram of \(B_4\) is
\begin{dynkinDiagram}[vertical shift=0,edge length=1cm]{B}{4}
-\hasse{B}{4}
+\hasse[edge length=1cm]B4
\end{dynkinDiagram}
\end{tcblisting}
We shut off the default vertical shift of the Dynkin diagram, so that it starts at the origin.
@@ -133,35 +132,26 @@ There is an option to \verb!\hasse! for this:
\begin{tcblisting}{title={Attaching the Dynkin diagram}}
The Hasse diagram of \(B_4\) is
\begin{center}
-\hasse[attach Dynkin diagram=true]{B}{4}
+\hasse[attach Dynkin diagram=true]B4
\end{center}
\end{tcblisting}
Unfortunately, attaching a Dynkin diagram looks terrible for \(D\) or \(E\) series, so a Dynkin diagram appears below.
\begin{tcblisting}{title={Attaching the Dynkin diagram}}
The Hasse diagram of \(D_5\) is
\begin{center}
-\hasse[attach Dynkin diagram=true]{D}{5}
+\hasse[attach Dynkin diagram=true]D5
\end{center}
\end{tcblisting}
\begin{tcblisting}{title={Inside a \TikZ environment}}
\begin{tikzpicture}
-\hasse{A}{4}
+\hasse A4
\draw (4;1) circle (5pt);
\draw[red] (2;3) circle (5pt);
\end{tikzpicture}
\end{tcblisting}
In this example, we see that the roots of the Hasse diagram are \TikZ{} nodes labelled \(g;i\) for grade \(g\) (i.e. \(g\) units up the page) and index \(i\) (i.e. \(i^{\text{th}}\) root of grade \(g\) drawn on the page, starting from the left).
-\section{Inherited options}
-The Lie Hasse package inherits options from the Dynkin diagrams package: the edge lengths are set with
-\begin{Verbatim}
-\tikzset{/Dynkin diagram/edge lengths=1.2cm}
-\end{Verbatim}
-and similarly the ordering of roots with
-\begin{Verbatim}
-\tikzset{/Dynkin diagram/ordering=Bourbaki}
-\end{Verbatim}
-
+\newpage
\section{Prettier}
The package includes a more elaborate \verb!\hasseDiagrams! command, taking a list of semicolon separated Dynkin diagram identfiers.
\begin{tcolorbox}[title={With some global options to make prettier diagrams}]
@@ -198,11 +188,20 @@ The package includes a more elaborate \verb!\hasseDiagrams! command, taking a li
\endgroup
Global options:
\begin{verbatim}
- edge/.style={ultra thick},
- edge quotes/.style={/Dynkin diagram/text style,auto,inner sep=2pt},
+\tikzset{/Lie Hasse,
+ edge/.style={ultra thick},
+ edge quotes/.style={
+ /Dynkin diagram/text style,
+ auto,
+ inner sep=2pt},
\end{verbatim}
allow to change the edges, and to change the way that labels are printed, and how close labels are to the edges.
-
+To give even greater control, the user can define a command \verb!\edgeQuote! of one argument, which is applied to the label placed on every edge of the Hasse diagram.
+The default is
+\begin{verbatim}
+\NewDocumentCommand\edgeQuote{m}{\contour{white}{#1}}
+\end{verbatim}
+which ensures that every label, which is black text by default, has a slight white outline to make it easier to read against a coloured background.
\section{Root order}
@@ -222,6 +221,10 @@ We can use this like:
\hasseDiagrams{[ordering=Carter]E6;[ordering=Dynkin]E6}
\hasseDiagrams{[ordering=Kac]E6}
\endgroup
+The Lie Hasse package inherits the ordering of roots from the Dynkin diagrams package, so we can set it with
+\begin{Verbatim}
+\tikzset{/Dynkin diagram/ordering=Bourbaki}
+\end{Verbatim}
\section{Graph height and width}
The \emph{height} of a Hasse diagram is the number of grades.
@@ -238,7 +241,7 @@ to store the height of \(G_2\) in a counter called \verb!\h!, and
\end{Verbatim}
to store the width of \(G_2\) at grade \(3\) in a counter called \verb!\w!.
-Once you use \verb!\dynkin{G}{2}! or \verb!\hasse{G}{2}! or the other commands, like
+Once you use \verb!\dynkin G2! or \verb!\hasse G2! or the other commands, like
\begin{Verbatim}
\rootSystemHeight[G][2]{\h}
\end{Verbatim}
@@ -260,7 +263,8 @@ The \verb!show height! option:
\hasseDiagrams{G2}
\end{Verbatim}
\tikzset{/Lie Hasse diagram,show name=true,show height=true}
-\hasseDiagrams{G2}
+\hasse G2
+
The \verb!show widths! option:
\begin{Verbatim}
\tikzset{/Lie Hasse diagram/show widths=true}
@@ -293,11 +297,11 @@ Here is the Dynkin diagram of \(E_8\), indicating the order of the roots in Cart
Here is the same Dynkin diagram, except showing, at each simple root, the coefficient of that simple root in the highest root.
\begin{Verbatim}
\rootSum[E][8]{29}{1}{\rs}
-\dynkin[labels=\rs,ordering=Carter,edge length=.35cm]{E}{8}
+\dynkin[expand labels=\rs,ordering=Carter,edge length=.35cm]{E}{8}
\end{Verbatim}
\rootSum[E][8]{29}{1}{\rs}
\begin{center}
-\dynkin[labels=\rs,ordering=Carter,edge length=.35cm]{E}{8}
+\dynkin[expand labels=\rs,ordering=Carter,edge length=.35cm]{E}{8}
\end{center}
The option \verb!for all roots! allows execution of code once on every root.
@@ -312,7 +316,7 @@ The option \verb!for all roots! allows execution of code once on every root.
root radius=.05cm
},
for all roots/.code 2 args={\drawRootAsDynkinSum{#1}{#2}}}
-\hasseDiagrams{D5}
+\hasse D5
\end{Verbatim}
\begingroup
\tikzset{/Lie Hasse diagram,
@@ -341,23 +345,23 @@ A simple example:
\end{Verbatim}
\newcommand{\foo}[2]%
{%
- \node[below,scale=.75] at (#1;#2) {\(#1,#2\)};%
+ \node[below,scale=.5] at (#1;#2) {\(#1,#2\)};%
}%
Inside a \TikZ{} or \verb!dynkinDiagram! environment:
\begin{Verbatim}
\tikzset{/Lie Hasse diagram/edge quotes/.style={opacity=0},
/Dynkin diagram/edge length=1.5cm}
\begin{tikzpicture}
- \hasse{D}{6}%
- \forAllPositiveRootsInHasseDiagram{\foo}%
+ \hasse D6%
+ \forAllPositiveRoots{\foo}%
\end{tikzpicture}
\end{Verbatim}
\begingroup
\tikzset{/Lie Hasse diagram/edge quotes/.style={opacity=0},
/Dynkin diagram/edge length=1.5cm}
\begin{tikzpicture}
- \hasse{D}{6}%
- \forAllPositiveRootsInHasseDiagram{\foo}%
+ \hasse D6%
+ \forAllPositiveRoots{\foo}%
\end{tikzpicture}
If you put this into the \verb!for all roots! option, it executes on its own:
@@ -378,19 +382,19 @@ Opposite sides of any square have the same edge label, by commutativity of addit
Hence we don't need to see every edge perfectly.
The three dimensional effect is the default:
\begin{Verbatim}
-\hasse{D}{4}\hasse{E}{6}
+\hasse D4\hasse E6
\end{Verbatim}
\begin{center}
-\hasse{D}{4}\hasse{E}{6}
+\hasse D4\hasse E6
\end{center}
We can turn it off:
\begin{Verbatim}
-\hasse[three D=false]{D}{4}
-\hasse[three D=false]{E}{6}
+\hasse[three D=false] D4
+\hasse[three D=false] E6
\end{Verbatim}
\begin{center}
-\hasse[three D=false]{D}{4}
-\hasse[three D=false]{E}{6}
+\hasse[three D=false] D4
+\hasse[three D=false] E6
\end{center}
or globally with \verb!\tikzset{/Lie Hasse diagram/three D=false}!.
@@ -430,9 +434,9 @@ You can change these:
\section{Label the simple roots}
Ringel \cite{Ringel:2013} labels his edges like
\begin{Verbatim}
-\hasseDiagrams{[labels={f,e,d,c,u,b,a}]E7}
+\hasse[labels={f,e,d,c,u,b,a}]E7
\end{Verbatim}
-\hasseDiagrams{[labels={f,e,d,c,u,b,a}]E7}
+\hasse[labels={f,e,d,c,u,b,a}]E7
\section{Parabolic subgroups}
This package offers nothing over Ringel's original pictures, except that the user can pick some simple roots whose associated edges are drawn differently.
@@ -440,47 +444,48 @@ The chosen simple roots are called \emph{compact}, following terminology from th
We let the reader explore the notation for parabolic subgroups in the Dynkin diagrams package, and use this to declare various roots compact.
\begin{Verbatim}
\tikzset{/Lie Hasse diagram,attach Dynkin diagram=true,three D=false}
-\hasseDiagrams{D{**x*x*x*}}
+\hasse D{**x*x*x*}
\end{Verbatim}
\begingroup
\tikzset{/Lie Hasse diagram,attach Dynkin diagram=true,three D=false}
-\hasseDiagrams{D{**x*x*x*}}
+\hasse D{**x*x*x*}
\endgroup
+
Our motivation comes from trying to identify the invariant vector subbundles of the tangent bundle of a rational homogeneous variety \cite{MathOverflow:123801}.
Such diagrams are often unreadable if we don't turn off the three dimensional graphics.
By default, noncompact root edges are not drawn.
\begingroup
\tikzset{/Lie Hasse diagram,attach Dynkin diagram=true,show name=false,three D=false}
\begin{Verbatim}
-\hasseDiagrams{E{*xx*x*}}
+\hasse E{*xx*x*}
\end{Verbatim}
-\hasseDiagrams{E{*xx*x*}}
+\hasse E{*xx*x*}
\begin{Verbatim}
-\hasseDiagrams{A{x*x*}}
+\hasse A{x*x*}
\end{Verbatim}
-\hasseDiagrams{A{x*x*}}
+\hasse A{x*x*}
\begin{Verbatim}
-\hasseDiagrams{[parabolic=113]B8}
+\hasse[parabolic=113]B8
\end{Verbatim}
-\hasseDiagrams{[parabolic=113]B8}
+\hasse[parabolic=113]B8
\begin{Verbatim}
-\hasseDiagrams{C{**xx*x**}}
+\hasse C{**xx*x**}
\end{Verbatim}
-\hasseDiagrams{C{**xx*x**}}
+\hasse C{**xx*x**}
\newpage
\begin{Verbatim}
-\hasseDiagrams{E{*x*x*x**}}
+\hasse E{*x*x*x**}
\end{Verbatim}
-\hasseDiagrams{E{*x*x*x**}}
+\hasse E{*x*x*x**}
\newpage
\begin{Verbatim}
-\hasseDiagrams{F{**xx}}
+\hasse F{**xx}
\end{Verbatim}
-\hasseDiagrams{F{**xx}}
+\hasse F{**xx}
\begin{Verbatim}
-\hasseDiagrams{G{*x}}
+\hasse G{*x}
\end{Verbatim}
-\hasseDiagrams{G{*x}}
+\hasse G{*x}
\endgroup
\section{Examples}
diff --git a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
index 84bff5fcc6e..5bb6f9697cd 100644
--- a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
## [Unreleased]
+## [1.9] - 2024-07-1
+### Added
+- Support for multiple affiliations
+
## [1.8.1] - 2024-01-08
### Changed
@@ -167,7 +171,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
First release of the revised files
-[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.8.1...HEAD
+[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.9...HEAD
+[1.9]: https://github.com/gi-ev/LNI/compare/v1.8.1...v1.9
[1.8.1]: https://github.com/gi-ev/LNI/compare/v1.8...v1.8.1
[1.8]: https://github.com/gi-ev/LNI/compare/v1.7...v1.8
[1.7]: https://github.com/gi-ev/LNI/compare/v1.6...v1.7
diff --git a/Master/texmf-dist/doc/latex/lni/README.md b/Master/texmf-dist/doc/latex/lni/README.md
index 31fbf3da10f..034ef480d86 100644
--- a/Master/texmf-dist/doc/latex/lni/README.md
+++ b/Master/texmf-dist/doc/latex/lni/README.md
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
lni -- A class for submissions to the ``Lecture Notes in Informatics''
(c) 2016-2024 Gesellschaft für Informatik (GI)
-Version: 1.8.1
+Version: 1.9
Maintainer: Martin Sievers
Email: martin.sievers@schoenerpublizieren.de
License: Released under the LaTeX Project Public License v1.3c or later
diff --git a/Master/texmf-dist/doc/latex/lni/lni-author-template.tex b/Master/texmf-dist/doc/latex/lni/lni-author-template.tex
index 411fea056ad..9a39a2d585b 100644
--- a/Master/texmf-dist/doc/latex/lni/lni-author-template.tex
+++ b/Master/texmf-dist/doc/latex/lni/lni-author-template.tex
@@ -19,12 +19,13 @@
\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen
Worten und noch mehr Buchstaben}
%% \subtitle{Untertitel / Subtitle} % if needed
-\author[1]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
-\author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
-\author[1]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
-\author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
-\affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
-\affil[2]{University\\Department\\Address\\Country}
+ \author[1,2]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
+ \author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
+ \author[3]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
+ \author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
+ \affil[1]{Universität 1\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+ \affil[2]{University 2 \\Department\\Address\\Country}
+ \affil[3]{University 3\\Department\\Address\\Country}
\maketitle
\begin{abstract}
diff --git a/Master/texmf-dist/doc/latex/lni/lni.pdf b/Master/texmf-dist/doc/latex/lni/lni.pdf
index ae032bd25bd..c3b50c0cd12 100644
--- a/Master/texmf-dist/doc/latex/lni/lni.pdf
+++ b/Master/texmf-dist/doc/latex/lni/lni.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf b/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf
index f0964659d8a..fffb7fbf43b 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex
index 2faced3b18e..4311237b489 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex
@@ -1,12 +1,11 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.11, 2023/11/02
+% Version: 1.13, 2024/07/03
%
-% Author: John H. Lienhard, copyright 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,8 +15,11 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
+% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[twoside]{mitthesis} %,fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
@@ -26,9 +28,9 @@
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,23 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+%\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+% \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -56,8 +69,17 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
+
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
@@ -65,9 +87,11 @@
%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
%\appto{\bibsetup}{\raggedright}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -79,19 +103,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -107,13 +121,13 @@
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use one or more of the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -128,7 +142,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -162,29 +176,31 @@
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
-% \Degree{Bachelor of Science in Physics}{Department of Physics}
-% \Degree{Master of Science in Physics}{}
-\Degree{Bachelor of Science in Mechanical Engineering}{Department of Mechanical Engineering}
+\Degree{Bachelor of Science in Physics}{Department of Physics}
+%\Degree{Master of Science in Physics}{}
+%\Degree{Bachelor of Science in Mechanical Engineering}{Department of Mechanical Engineering}
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
+%\Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
% \Supervisor{Secunda Castor}{Professor of Research}
% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
% \Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
\ThesisDate{May 18, 1876}
+
%%%%%% Choose whether to have a CREATIVE COMMONS License %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% If you are using a cc license, put details of your cc license here.
@@ -208,33 +224,34 @@
% (c) you can put the acceptor name and title onto two lines, rather than three like this:
%
% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
-% \Acceptor{Quarta Castor}{Professor and Graduate Officer, Department of Mechanical Engineering}{}
%
-% (d) you can change the font size of the the author name[s] with
+% (d) you can change the font size of the author name[s] with
%
% \AuthorNameSize{\normalsize}
%
-% (e) and you can omit any previous degrees from the title page, instead mentioning them in the Biosketch
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
-% can you this command to squash all of the vertical glue (stretchy space) with this command:
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
%
% \Squash
%
% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% The abstract environment creates all the required headings and footers.
% You only need to the text of the abstract in the file abstract.tex
@@ -242,24 +259,22 @@
\input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments}% .tex extension is presumed by \include
-
-\include{biography}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% If you want to use "double spacing", you should start here...
\include{chapter1}% .tex extension is presumed
-%\include{chapter2}
+% \include{chapter2}
%\include{chapter3}
%\include{chapter4}
@@ -270,9 +285,13 @@
\include{appendixa}
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
-\printbibliography[title={References},heading=bibintoc]
+\printbibliography[title={\refname},heading=bibintoc]
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/acknowledgments.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/acknowledgments.tex
index a1ceaacffd9..de4fcfd51d3 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/acknowledgments.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/acknowledgments.tex
@@ -1,11 +1,11 @@
%% acknowledgments.tex
% From mitthesis package
-% Version: 1.01, 2023/10/16
+% Version: 1.02, 2024/06/19
% Documentation: https://ctan.org/pkg/mitthesis
-
\chapter*{Acknowledgments}
-\addcontentsline{toc}{chapter}{Acknowledgments}
+\pdfbookmark[0]{Acknowledgments}{acknowledgments}
+
Write your acknowledgments here.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/biography.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/biography.tex
index 30e4784525d..6148c2f133a 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/biography.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/biography.tex
@@ -2,11 +2,12 @@
%% This section is optional
% From mitthesis package
-% Version: 1.01, 2023/10/16
+% Version: 1.02, 2024/06/19
% Documentation: https://ctan.org/pkg/mitthesis
\chapter*{Biographical Sketch}
-\addcontentsline{toc}{chapter}{Biographical Sketch}
+\pdfbookmark[0]{Biographical Sketch}{biosketch}
+
Silas Whitcomb Holman was born in Harvard, Massachusetts on January 20, 1856. He received his S.B. degree in Physics from MIT in 1876, and then joined the MIT Department of Physics as an Assistant. He became Instructor in Physics in 1880, Assistant Professor in 1882, Associate Professor in 1885, and Full Professor in 1893. Throughout this period, he struggled with increasingly severe rheumatoid arthritis. At length, he was defeated, becoming Professor Emeritus in 1897 and dying on April 1, 1900.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/chapter1.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/chapter1.tex
index cc7683744ec..481e96a4c4e 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/chapter1.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/chapter1.tex
@@ -1,5 +1,5 @@
% From mitthesis package
-% Version: 1.04, 2023/10/19
+% Version: 1.05, 2023/11/03
% Documentation: https://ctan.org/pkg/mitthesis
@@ -11,7 +11,7 @@
We begin with some ideas from the literature \cite{Fong2015,sharpe1}.
-\begin{equation}
+\begin{equation}\label{eqn:1}
\frac{\partial}{\partial t}\left[\rho\bigl(e + \lvert\vec{u}\rvert^2\big/2\bigr)\right] + \nabla\cdot\left[\rho\bigl(h + \lvert\vec{u}\rvert^2\big/2 \bigr)\vec{u}\right]
={}-\nabla \cdot \vec{q} + \rho \vec{u}\cdot\vec{g}+ \frac{\partial}{\partial x_j}\bigl(d_{ji}u_i\bigr)
\end{equation}
@@ -37,7 +37,8 @@ We begin with some ideas from the literature \cite{Fong2015,sharpe1}.
\lipsum[4]
-\subsection{Subsection~eqn.~\eqref{eqn:WT1}}
+%% note use of \ref* here to avoid placing a nested link in the table of contents
+\subsection[Subsection~eqn.~(\ref*{eqn:WT1})]{Subsection~eqn.~\eqref{eqn:WT1}}
\lipsum[5-6]
\subsubsection{A subsubsection}
@@ -84,9 +85,9 @@ L(\ifpdftex\bm{A}\else\symbfup{A}\fi) = \begin{pmatrix}
\ce{SO4^2- + Ba^2+ -> BaSO4 v} \\[0.5em]
\ce{Zn^2+
<=>[+ 2OH-][+ 2H+]
-$\underset{\text{amphoteric hydroxide}}{\ce{Zn(OH)2 v}}$
+$\underset{\textrm{amphoteric hydroxide}}{\ce{Zn(OH)2 v}}$
<=>[+ 2OH-][+ 2H+]
-$\underset{\text{tetrahydroxozincate}}{\ce{[Zn(OH)4]^2-}}$
+$\underset{\textrm{tetrahydroxozincate}}{\ce{[Zn(OH)4]^2-}}$
}
\end{gather}
These examples of chemical formul\ae\ are copied directly from the documentation of the \texttt{mhchem} package, which was used to typeset them.
@@ -94,7 +95,7 @@ These examples of chemical formul\ae\ are copied directly from the documentation
\section{Baroclinic generation of vorticity\label{sec:stratified-flow}}
Substitution of the particle acceleration and application Stokes theorem leads to the \textit{Kelvin-Bjerknes circulation theorem}, for
-$\rho \neq \text{fn}(p)$:
+$\rho \neq \textrm{fn}(p)$:
\begin{align}
\frac{d\Gamma}{dt} &{}= \frac{d}{dt} \int_{\mathcal{C}} \mathbf{u} \cdot d\mathbf{r}\\
&{}= \int_{\mathcal{C}} \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{r} + \underbrace{\int_{\mathcal{C}} \mathbf{u}\cdot d\biggl( \frac{d\mathbf{r}}{dt}\Biggr)}_{=\, 0} \\[-2pt]
@@ -130,11 +131,11 @@ Baroclinic generation of vorticity accounts for the sea breeze and various other
\\[-0.5em]
\toprule
\multicolumn{1}{@{\hspace*{1.5em}}c}{$x$\rule{0pt}{8pt}} &
-\multicolumn{1}{c}{$\text{erf}(x)$} &
-\multicolumn{1}{c!{\hspace*{3.em}}}{$\text{erfc}(x)$} &
+\multicolumn{1}{c}{$\textrm{erf}(x)$} &
+\multicolumn{1}{c!{\hspace*{3.em}}}{$\textrm{erfc}(x)$} &
\multicolumn{1}{c}{$x$} &
-\multicolumn{1}{c}{$\text{erf}(x)$} &
-\multicolumn{1}{c@{\hspace*{1.5em}}}{$\text{erfc}(x)$} \\ \midrule
+\multicolumn{1}{c}{$\textrm{erf}(x)$} &
+\multicolumn{1}{c@{\hspace*{1.5em}}}{$\textrm{erfc}(x)$} \\ \midrule
0.00 & 0.00000 & 1.00000 & 1.10 & 0.88021 & 0.11980 \\
0.05 & 0.05637 & 0.94363 & 1.20 & 0.91031 & 0.08969 \\
0.10 & 0.11246 & 0.88754 & 1.30 & 0.93401 & 0.06599 \\
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex
index 8795eb547e0..bc7ba62c916 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex
@@ -1,16 +1,16 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-defaultfonts.tex}[2023/09/12 v1.03 Load Computer/Latin Modern text and math fonts]
+\ProvidesFile{mitthesis-defaultfonts.tex}[2024/06/28 v1.04 Load Computer/Latin Modern text and math fonts]
%% Default fonts
%
\ifpdftex
- \typeout{^^JLoading Computer Modern text and math fonts (default for pdftex).^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Computer Modern text and math fonts (default for pdftex)}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading Latin Modern text and math fonts (default for unicode engines).^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Latin Modern text and math fonts (default for unicode engines)}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex
index 01fa981d78b..ebba9ab190a 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex
@@ -1,19 +1,19 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-fira-newtxsf.tex}[2023/09/12 v1.04 Load Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font]
+\ProvidesFile{mitthesis-fira-newtxsf.tex}[2024/06/28 v1.05 Load Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font]
%% Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font
%
\ifpdftex
- \typeout{^^JLoading Fira sans text font with newtx sans serif math font and Inconsolata typewriter^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Fira sans text font with newtx sans serif math font and Inconsolata typewriter}
\RequirePackage[sfdefault,scaled=0.90]{FiraSans} % sans serif text package %,scaled=.85
\RequirePackage[T1]{fontenc}
\RequirePackage[varqu,varl,scaled=1.05]{zi4} % inconsolata font for typewriter
\RequirePackage[scaled=1.05]{newtxsf} % sans serif math
\RequirePackage{bm}
\else
- \ClassWarning{mitnewthesis}{The fira-newtxsf font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{\ClassName}{The fira-newtxsf font set requires pdflatex. Defaulting to LMR fonts}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
% Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec in this case.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex
index 26ee2ab07bc..1535771f11f 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-heros-stix2.tex}[2023/09/12 v1.02 Load TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font]
+\ProvidesFile{mitthesis-heros-stix2.tex}[2024/06/28 v1.03 Load TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font]
%% TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font
%
@@ -12,11 +12,11 @@
% Install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The heros-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The heros-stix2 fontset requires a unicode engine. Defaulting to CMR fonts}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JTeX Gyre Heros (sans serif) text font with STIX2 math font and Inconsolata monospaced font.^^J}
+ \ClassNoteNoLine{\ClassName}{TeX Gyre Heros (sans serif) text font with STIX2 math font and Inconsolata monospaced font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex
index 57cf26f915b..41b2f561dff 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-libertine.tex}[2023/09/12 v1.02 Load Libertine and related fonts]
+\ProvidesFile{mitthesis-libertine.tex}[2024/06/28 v1.03 Load Libertine and related fonts]
%% Linux Libertine (serif) text font with newtxmath[libertine] (pdftex) or Libertinus (unicode) math font
%
@@ -10,7 +10,7 @@
% install these as system fonts on your computer
%
\ifpdftex
- \typeout{^^JLoading newtx-libertine text and math fonts with Insolata typewriter font^^J}
+ \ClassNoteNoLine{\ClassName}{Loading newtx-libertine text and math fonts with Insolata typewriter font}
\RequirePackage[lining,semibold]{libertine}
\RequirePackage[T1]{fontenc}
\RequirePackage[varqu,varl]{inconsolata}% typewriter
@@ -18,7 +18,7 @@
\RequirePackage[libertine,vvarbb]{newtxmath}
\RequirePackage{bm}% load after all math to give access to bold math
\else
- \typeout{^^JLoading Linux Libertine (serif) text font with Libertinus math font^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Linux Libertine (serif) text font with Libertinus math font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex
index 6466c369294..e18c72fd924 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex
@@ -1,11 +1,11 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-lucida.tex}[2023/09/12 v1.02 Load Lucida fonts]
+\ProvidesFile{mitthesis-lucida.tex}[2024/06/28 v1.03 Load Lucida fonts]
%% Lucida Bright and Lucida Bright Math fonts (available from the TeX Users Group)
-\typeout{^^JLucida Bright and Lucida Bright Math fonts^^J}
+\ClassNoteNoLine{\ClassName}{Lucida Bright and Lucida Bright Math fonts}
\ifpdftex
\RequirePackage[LY1]{fontenc}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex
index a599af35e21..b76428f383f 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex
@@ -1,20 +1,24 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-newtx-sans-text.tex}[2023/09/12 v1.02 Load newtx sans-serif text and regular math fonts]
+\ProvidesFile{mitthesis-newtx-sans-text.tex}[2024/06/68 v1.04 Load newtx sans-serif text and regular math fonts]
%% newtx package with sans-serif text (Helvetica-like text with Times-like math)
%
\ifpdftex
+ \ClassNoteNoLine{\ClassName}{Loading newtx sans-serif text and newtx serif math fonts}
\RequirePackage[T1]{fontenc}
\RequirePackage[subscriptcorrection,varvw,helvratio=0.91,defaultsups]{newtx}% upint for upright integrals
- \renewcommand{\familydefault}{\sfdefault}% use sans for main text
+ \AtEndPreamble{% added to accommodate v1.731 of newtx, 2023/11/03
+ \renewcommand{\familydefault}{\sfdefault}% use sans for main text
+% \renewcommand{\rmdefault}{\sfdefault}% uses sans for \textrm{}, if that's desired.
+ }
% these two commands enable hyphenation of the typewriter font - https://tex.stackexchange.com/a/204421/119566
% \input{t1ntxtt.fd}
% \DeclareFontFamily{\encodingdefault}{\ttdefault}{\hyphenchar\font=`\-} %
\RequirePackage{bm}% bold math
\else
- \ClassWarning{mitnewthesis}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{\ClassName}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
% Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec in this case.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex
index cc43427055b..b1541bbd051 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex
@@ -1,17 +1,17 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-newtx.tex}[2023/09/12 v1.03 Load newtx text and math fonts]
+\ProvidesFile{mitthesis-newtx.tex}[2024/06/28 v1.04 Load newtx text and math fonts]
\ifpdftex
- \typeout{^^JLoading newtx fonts with inconsolata typewriter^^J}
+ \ClassNoteNoLine{\ClassName}{Loading newtx fonts with inconsolata typewriter}
\RequirePackage[T1]{fontenc}
\RequirePackage[subscriptcorrection,varvw,helvratio=0.91]{newtx}% stix2, upint
\RequirePackage[varl,varqu,hyphenate,mono]{inconsolata}% sans typewriter font; mono = fixed word spacing, hyphenate = allow hyphenation
\RequirePackage{bm}
\let\textsuperscript\textsu% newtx changes the default superiors font; this is needed to get commas aligned in sequential footnotes
\else
- \ClassWarning{mitnewthesis}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{\ClassName}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
% Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec in this case.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex
index de3983fe4ee..c178ff233fa 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-stix2.tex}[2023/09/12 v1.03 Load STIX Two text and math fonts]
+\ProvidesFile{mitthesis-stix2.tex}[2024/06/28 v1.04 Load STIX Two text and math fonts]
%% STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font
%
@@ -12,11 +12,11 @@
% Install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font.^^J}
+ \ClassNoteNoLine{\ClassName}{Loading STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex
index 1e65724cc0b..ed2abc16557 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-termes-stix2.tex}[2023/09/12 v1.03 Load TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font]
+\ProvidesFile{mitthesis-termes-stix2.tex}[2024/10/28 v1.04 Load TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font]
%% TeX Gyre Termes text font and Heros sans serif font with STIX2 math font and Inconsolata monospaced font
%
@@ -12,11 +12,11 @@
% Install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The termes-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The termes-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font.^^J}
+ \ClassNoteNoLine{\ClassName}{Loading TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex
index 64fffb92643..fd1e15bab87 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-termes.tex}[2023/09/12 v1.03 Load TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font]
+\ProvidesFile{mitthesis-termes.tex}[2024/06/28 v1.04 Load TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font]
%% TeX Gyre Termes (Times-like) text font with Termes math font and Heros sans serif font and Cursor monospaced font
%
@@ -9,11 +9,11 @@
% install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The termes fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The termes fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font^^J}
+ \ClassNoteNoLine{\ClassName}{Loading TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
% unicode-math loads the fontspec package
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mydesign.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mydesign.tex
index 2a612d88a1f..ef715210744 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mydesign.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mydesign.tex
@@ -1,14 +1,14 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mydesign.tex}[2023/10/11 v1.03 Typographic design options for thesis]
+\ProvidesFile{mydesign.tex}[20234/06/28 v1.04 Typographic design options for thesis]
%%%%%%%%%% Color support %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Color package: xcolor.
%% Change this if you prefer something else
-\usepackage[hyperref,dvipsnames,svgnames,x11names]{xcolor}
+\usepackage[dvipsnames,svgnames,x11names]{xcolor}
%% can add option [table] to xcolor to use color in tables (see xcolor documentation)
@@ -57,7 +57,7 @@
\titleformat{\subsection}{\mathversion{bold}\normalfont\large\bfseries}{\thesubsection}{1em}{}
\titleformat{\subsubsection}{\mathversion{bold}\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{}
-% ==> NOT every font includes a bold math version, so you may need to use other math macros in the headings to get bold math <==
+% ==> NOT every font includes a bold math version, so you may need other math macros in the headings to get bold math <==
%%%%%%%%% Change page margins %%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/mitthesis/README.md b/Master/texmf-dist/doc/latex/mitthesis/README.md
index 9ead4e57e0b..c7035183044 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/README.md
+++ b/Master/texmf-dist/doc/latex/mitthesis/README.md
@@ -1,7 +1,7 @@
#mitthesis --- A LaTeX template for an MIT thesis#
- v1.11 dated 2023/11/02
+ v1.13 dated 2024/07/03
####Overview####
This class provides a LaTeX template to format an MIT thesis according to
@@ -53,9 +53,24 @@
---
####Change log####
+ v1.13 (03 July 2024)
+ - same as v1.12, except now includes the correct documentation
+
+ v1.12 (02 July 2024)
+ - add logic for one degree issued by two departments
+ - fix missing space in abstract block for multiple departments
+ - adjust second department layout on title and abstract pages
+ - table of contents revised
+ - revise documentation
+ - switch default citation style to numeric (from IEEE). Provide examples for IEEE and author/year styles.
+ - add \\AtEndPreamble{..} to mitthesis-newtx-sans-text.tex to accommodate v1.731 of newtx
+ - in chapter1.tex, replace \\text by \\textrm; fix nested link in section heading
+ - remove obsolete hyperref option from xcolor
+ - minor changes to log notes of fontset files
+ - code clean up
v1.11 (02 November 2023)
- - Revise all skips on cover page to better group material while allowing for glue compression as content increases; increase font size of author name; provide user macros for control cover page spacing and author name font.
+ - revise all skips on cover page to better group material while allowing for glue compression as content increases; increase font size of author name; provide user macros for control cover page spacing and author name font.
- use \\mdseries for linenumbers in all cases, rather than using the locally active series
- remove \\raggedright in favor of \\bibsetup for bibliography in MIT-Thesis.tex
- add backward compatibility for alt tag of \\includegraphics for pre-2021/11/15 distributions, add alt tag in chapter1.tex
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree_two_departments.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree_two_departments.pdf
new file mode 100644
index 00000000000..c10db9e046e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree_two_departments.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree_two_departments.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree_two_departments.tex
new file mode 100644
index 00000000000..cf4fce672e8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree_two_departments.tex
@@ -0,0 +1,129 @@
+% !TEX encoding = UTF-8 Unicode
+% !BIB TS-program = biber
+% !BIB program = biber
+
+% Author: John H. Lienhard (c) 2024. Reuse under the MIT license: https://ctan.org/license/mit
+% Version 1.01, 2024/06/25
+
+% Documentation: https://ctan.org/pkg/mitthesis
+
+%% Don't modify the \DocumentMetadata command unless you know what it does.
+%% If this command throws an "undefined" error, your latex system is out of date: try commenting this command out.
+\DocumentMetadata
+{
+ pdfstandard = a-2b,
+ pdfversion = 1.7,
+ lang = en-US,
+% debug = {xmp-export}, % output xmpi file to directly examine metadata
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\documentclass[]{mitthesis}
+%
+% option [twoside] gives facing-page behavior for printing; omitting it will eliminate even-numbered blank pages.
+% option [lineno] provides line numbers, as for editing
+% option [mydesign] loads titlesec, enumitem, caption, subcaption - you may edit the mydesign.tex file as you like it.
+% option [fontset] is a keyvalue which can be:
+% pdftex or unicode engines: defaultfonts, libertine, lucida
+% pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the latex font".
+% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
+% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
+
+
+%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Most of the document metadata is created automatically.
+% The following items should be adjusted to match your work. <================= !!!!!!!!!!
+
+\hypersetup{%
+ pdfsubject={Template for writing MIT theses with the mitthesis class},
+ % Change this to briefly state topic of your thesis
+%
+ pdfkeywords={Massachusetts Institute of Technology, MIT},
+ % Add keywords that will help search engines and libraries to find your work.
+ % Includes the name[s] of the author[s]
+ % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+%
+ pdfurl={},
+ % If you have a url for the thesis, put it here. Otherwise delete this.
+ % (MIT Libraries will put your thesis in DSPACE with a persistent url after you submit it.)
+%
+ pdfcontactemail={},
+ % You can put a [permanent] email address into the metadata, if you like.
+ % Otherwise delete this.
+%
+ pdfauthortitle={},
+ % If you have a title, you can include it here.
+}
+
+
+%%%%%%%%%%%%%% End preamble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{document}
+
+
+%%% edit the following commands to match your thesis %%%%%%%%%%
+
+\title{The Atomic Theory as Applied To Gases, with Some Experiments on the Viscosity of Air}
+
+% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
+% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
+
+% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+
+\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
+%\Author{Luisa Hernández}{Department of Research}%[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
+
+% For one degree issued by two departments, leave the degree argument blank for the second degree {}.
+\Degree{Master of Science in Computational Nuclear Materials}{Department of Nuclear Science and Engineering}
+\Degree{}{Center for Computational Science and Engineering}
+
+% If there is more than one supervisor, use the \Supervisor command for each.
+\Supervisor{Edward C. Pickering}{Professor of Physics}
+\Supervisor{Secunda Castor}{Professor of Research}
+%\Supervisor{Quintus Castor}{Professor of Log Dams}
+
+% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
+% If more than one department, use more than once
+% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.
+\Acceptor{Primus Castor}{Professor and Graduate Officer, Department of Physics}{}
+\Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Mechanical Engineering}{}
+%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Undergraduate Officer, Department of Mechanical Engineering}
+
+% In this example, several steps have been taken to make the content fit on the title page! The \Acceptors have been confined to two
+% lines in the above commands, the signature block font size is reduced, the skips are tightened, the author names use normal font size,
+% and Luisa's previous degrees are not shown.
+\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Tighten
+\AuthorNameSize{\normalsize}
+
+% Usage: \DegreeDate{Month}{year}
+% Valid degree months are September, February, or June.
+\DegreeDate{June}{1876}
+
+% Date that final thesis is submitted to department
+\ThesisDate{May 18, 1876}
+
+%%%%%% Choose whether to have a CREATIVE COMMONS License %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% If you are using a cc license, put details of your cc license here.
+% Omit this command if you are not using a cc license.
+%
+\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% Titlepage
+\maketitle
+
+% The abstract environment creates all the required headers and footnote.
+% You only need to add the text of the abstract itself in the file abstract.tex
+\begin{abstract}
+ \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+\end{abstract}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_two_degrees.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_two_degrees.tex
index 5e004fe1343..fd9fc21485e 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_two_degrees.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_two_degrees.tex
@@ -81,8 +81,8 @@
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
\Degree{Master of Science in Physics}{Department of Physics}
-%\Degree{Master of Science in Physics}{}
\Degree{Master of Science in Mechanical Engineering}{Department of Mechanical Engineering}
+%\Degree{Master of Science in Physics}{}
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/cover_compile.sh b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/cover_compile.sh
new file mode 100755
index 00000000000..da23571eff7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/cover_compile.sh
@@ -0,0 +1,31 @@
+#! /bin/bash
+
+# first run
+
+for i in *.tex;
+ do
+ if [ "$i" != "abstract.tex" ] ; then
+ pdflatex $i;
+ fi;
+ done
+
+# second run
+
+for i in *.tex;
+ do
+ if [ "$i" != "abstract.tex" ] ; then
+ pdflatex $i;
+ fi;
+ done
+
+# clean up
+
+mkdir pdffiles
+mv *.pdf pdffiles
+rm *.aux
+rm *.gz
+rm *.log
+
+
+
+
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf
index e55782bbb4a..c32bcc359c0 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf
index 2d802b2a0e5..f78b32a6d95 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf
index 09a93e218b6..0262aabdef1 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf
index 45b6d25430f..44d54df9460 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf
index 383bbfd3a9a..d667a4bed4c 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf
index 3c8fc160bac..9f22058aa02 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf
index 142d3afc0d6..fabf8cd29a6 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf
index 46b54f1a079..7c38f1d8287 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf
index e4306cb2377..c7993b99aa9 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf
index 93e1db44009..4affab86130 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex
index 8b34293ed2d..b6480ef9527 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,10 +246,12 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex
index d428bcadf1c..f2c8ed11584 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,12 +246,11 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
-% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
-% see the biblatex manual, section 3.14.3
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
%%%% Option for natbib %%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex
index 1ae057c0cd3..7e914bfa38e 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,9 +246,13 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
%
-\printbibliography[title={References},heading=bibintoc]
+\printbibliography[title={\refname},heading=bibintoc]
}
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex
index 8fa97df9b00..9198d8a489f 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,10 +246,12 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex
index 1af3c907540..3fd445d4ff2 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,10 +246,12 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex
index 87ad88c57e8..9729118c307 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,12 +246,11 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
-% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
-% see the biblatex manual, section 3.14.3
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
%%%% Option for natbib %%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex
index eb96cc7892d..e2cebe98acb 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,10 +246,12 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt
index c4d5c782c18..beacdde0a3e 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt
@@ -12,3 +12,5 @@ mitthesis-sample.bib
mydesign.tex
All of those files are in the directory mitthesis/MIT-thesis-template.
+
+You should also copy the fontsets directory (and mitthesis.cls) into this folder.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex
index ffc9657186d..6fe4965432f 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,10 +246,12 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex
index 29bb0e05cf4..3bbf3c83336 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,10 +246,12 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex
index fb2f11a35db..92a905fe998 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex
@@ -56,8 +56,8 @@
%%%%%%%%% Representative set-up for biblatex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
- \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces default "[Online]. Available" by "URL"
+%% Numerical citations of references
+\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
@@ -246,10 +246,12 @@
%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
-\printbibliography[title={References},heading=bibintoc]
-}
+\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
+% this sets the title of contents name for bibliography to \refname (= References)
+% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
+
+\printbibliography[title={\refname},heading=bibintoc]
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh
new file mode 100755
index 00000000000..fdb19c1f4fa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh
@@ -0,0 +1,72 @@
+#! /bin/bash
+
+# first run
+
+pdflatex Defaultfonts
+pdflatex Fira_Newtxsf
+pdflatex Libertine
+pdflatex Lucida
+pdflatex Newtx-sans-text
+pdflatex Newtx
+
+lualatex Heros-Stix2
+lualatex Stix2
+lualatex Termes-stix2
+lualatex Termes
+
+# biber
+
+biber Defaultfonts
+biber Fira_Newtxsf
+biber Libertine
+biber Lucida
+biber Newtx-sans-text
+biber Newtx
+biber Heros-Stix2
+biber Stix2
+biber Termes-stix2
+biber Termes
+
+# second run
+
+pdflatex Defaultfonts
+pdflatex Fira_Newtxsf
+pdflatex Libertine
+pdflatex Lucida
+pdflatex Newtx-sans-text
+pdflatex Newtx
+
+lualatex Heros-Stix2
+lualatex Stix2
+lualatex Termes-stix2
+lualatex Termes
+
+# third run
+
+pdflatex Defaultfonts
+pdflatex Fira_Newtxsf
+pdflatex Libertine
+pdflatex Lucida
+pdflatex Newtx-sans-text
+pdflatex Newtx
+
+lualatex Heros-Stix2
+lualatex Stix2
+lualatex Termes-stix2
+lualatex Termes
+
+# clean up
+
+mkdir pdffiles
+mv *.pdf pdffiles
+rm *.aux
+rm *.bbl
+rm *.bcf
+rm *.blg
+rm *.log
+rm *.lot
+rm *.lof
+rm *.toc
+rm *.xml
+
+
diff --git a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf
index 611f9c69ac4..94724d1eec4 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex
index 2b434f49a72..6f8954813b3 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex
@@ -1,12 +1,13 @@
% !TEX TS-program = lualatex
% !TEX encoding = UTF-8 Unicode
-% Version date: 02 November 2023
+% Version date: 1 July 2024
\DocumentMetadata
{
- pdfstandard = a-2b,%a-3u,%a-4,%
- pdfversion = 1.7, %2.0,
+ pdfstandard = a-4,
+ pdfversion = 2.0,
+% testphase = {phase-III, table, firstaid, math},
lang = en-US,
% debug = {xmp-export}, % note that subject entries are all fine in dc format of outputted xmpi file.
}
@@ -32,41 +33,6 @@
\usepackage{booktabs}
-%%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline).
-%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref
-%%% errors when macros are in section titles.
-\let\svsection\section
-\RenewDocumentCommand{\section}{s o m}{%
- \IfBooleanTF {#1}
- {\svsection*{#3}\phantomsection%
- {\IfNoValueTF {#2}
- {\addcontentsline{toc}{section}{#3}}
- {\addcontentsline{toc}{section}{#2}}% removed trailing space 2020/02/28
- }%
- }%
- {\IfNoValueTF {#2}
- {\svsection{#3}}
- {\svsection[#2]{#3}}%
- }%
-}
-
-%%% Create an optional argument for unnumbered SUBsections and set pdf bookmark (thru \addcontentsline).
-%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref
-%%% errors when macros are in section titles.
-\let\svsubsection\subsection
-\RenewDocumentCommand{\subsection}{s o m}{%
- \IfBooleanTF {#1}
- {\svsubsection*{#3}\phantomsection%
- {\IfNoValueTF {#2}
- {\addcontentsline{toc}{subsection}{#3}}
- {\addcontentsline{toc}{subsection}{#2}}
- }%
- }%
- {\IfNoValueTF {#2}
- {\svsubsection{#3}}
- {\svssubection[#2]{#3}}%
- }%
-}
%%%%%%%%% Set up text and math fonts %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -128,7 +94,7 @@
citecolor=blue,
urlcolor=violet,
filecolor=red,
-% anchorcolor=yellow,% not all pdf viewers recognize this field (Firefox does)
+ anchorcolor=yellow,% not all pdf viewers recognize this field (Firefox does)
% colorscheme=phelype,% overrides link, cite, url, file colors with a preset scheme, through \DocumentMetadata
pdfpagelayout=SinglePage,
pdfdisplaydoctitle=true,%
@@ -159,42 +125,40 @@
\ExplSyntaxOff
\urlstyle{same} % this changes font for \url to the current text font, but it is not recognized by \href.
-\RequirePackage{bookmark}% improves handling of pdf bookmarks
+%\RequirePackage{bookmark}% improves handling of pdf bookmarks
%\providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code
-%%%%%%% A nomenclature environment, if needed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%% A nomenclature environment, if needed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\providecommand{\nomname}{Nomenclature}
\newlength\nomenwidth
\newlength\savitemsep
\makeatletter
+% nomenclature entries
\NewDocumentCommand\entry{m m}{%
- \ifblank{#2}{%
- \ClassWarning{\ClassName}{The command \protect\entry requires two arguments. To obtain a subheading, use \protect\EntryHeading}
- \itemsep3\p@ plus 1\p@ minus 1\p@%
- \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000%
- }{%
- \item[#1\hfill]#2%
- \@itempenalty=-\@lowpenalty%
- }%
+ \item[#1\hfill]#2%
+ \@itempenalty=-\@lowpenalty
}
-% A separate command command for nomenclature subheadings
+% nomenclature subheadings
\NewDocumentCommand\EntryHeading{m}{%
- \itemsep3\p@ plus 1\p@ minus 1\p@%
- \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000%
+ \itemsep3\p@ plus 1\p@ minus 1\p@
+ \goodbreak\item[\itshape#1\hfill]\mbox{}% mbox added for tagged pdf 2023/10/11
+ \setlength{\itemsep}{\savitemsep}\@itempenalty=1000
}
\makeatother
%
% Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns.
% Second optional argument can be used to rename the environment, e.g., to List of Symbols.
+% Third optional argument selects section-level or chapter-level style for the nomenclature list.
+\newcounter{dummy}% for tagging code
\NewDocumentEnvironment{nomenclature}{O{2em} O{\nomname} O{section}}{%
\setlength\columnsep{2em}
\setlength{\nomenwidth}{#1}
- \csname #3\endcsname *{#2}% this level will probably vary amongst users! add to toc, as well.
-% \phantomsection\addcontentsline{toc}{#3}{#2}% removed for this example.
+ \csname #3\endcsname *{#2}% this level will vary amongst users!
+% \refstepcounter{dummy}\addcontentsline{toc}{#3}{#2}% omit contentsline for this document!
\raggedright
\begin{list}{}{%
\setlength{\itemsep}{0pt}%
@@ -203,7 +167,7 @@
\setlength{\labelwidth}{\nomenwidth}%
\setlength{\leftmargin}{\labelwidth}%
\addtolength{\leftmargin}{\labelsep}%
- \setlength\savitemsep\itemsep%
+ \setlength{\savitemsep}{\itemsep}%
}%
}{\end{list}\ignorespacesafterend}
@@ -211,110 +175,121 @@
%%%%%%%%%%%%% End preamble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\title{The MIT thesis template}
-\author{John H. Lienhard \\ Department of Mechanical Engineering \\ Massachusetts Institute of Technology}
-\date{\daymonthyeardate}
+\renewcommand\abstractname{SUMMARY}
\begin{document}
-\maketitle
+\begingroup
+ \centering
+ \LARGE The MIT thesis template\\[1em]
+ \large
+ John H. Lienhard \\ Department of Mechanical Engineering \\ Massachusetts Institute of Technology
+ \\[1em]
+ \daymonthyeardate\\[1em]
+\endgroup
+
-\section*{THE MIT THESIS TEMPLATE}
+\phantomsection\pdfbookmark[1]{\abstractname}{summary}
+\begin{abstract}
+This \LaTeX\ class formats theses according to the requirements of the MIT Libraries. The template is suitable for MIT theses of all types and at all levels. The title and abstract pages are automatically laid out from information provided by the user. The template includes options to use a variety of typefaces, and it is compatible with either pdfTeX or unicode engines such as luaLaTeX. When using LaTeX formats dated November 2022 or later, the resulting pdf file meets the PDF/A-2b archivability standard. A standard \href{https://www.tug.org/texlive/}{\TeX\ Live} installation includes all other packages required by the template. This document provides instructions for installation and use of the template.
+\end{abstract}
-This template is suitable for MIT theses of all types and at all levels. The title and abstract pages are automatically laid out from information provided by the user. The template includes options to use a variety of fonts, and it is compatible with either pdfTeX or unicode engines such as luaLaTeX. When using LaTeX formats dated November 2022 or later, the resulting pdf file meets the PDF/A-2b archivability standard. A standard \href{https://www.tug.org/texlive/}{\TeX\ Live} installation includes all other packages required by the template.
+\tableofcontents
-\subsection*{Background}
+\section{BACKGROUND}
The original MIT Thesis template was written \LaTeX\ 2.09 by Stephen Gildea in the late 1980s (in CTAN, \href{https://mirrors.ctan.org/obsolete/macros/latex209/contrib/mitthesis/mitthesis.sty}{here}). That template was edited by many later students.
-LaTeX has changed greatly since the original MIT thesis template was written. \LaTeX\ 2.09 was replaced by \LaTeXe\ in 1994. New engines were developed, particularly pdfTeX during the 1990s and Unicode-aware engines in the decades that followed. Many packages and fonts were developed to accompany the original platform, particularly after 2000; and major updates to the LaTeX kernel began in 2018. Over the years, the MIT Libraries have changed the required format several times, especially as electronic thesis submission has become the norm. The original template served MIT well; but by the early 2020s, it was substantially out of date. That situation motivated the creation of a new template.
+LaTeX has changed greatly since the original MIT thesis template was written. \LaTeX\ 2.09 was replaced by \LaTeXe\ in 1994. New engines were developed, particularly pdfTeX during the 1990s and Unicode-aware engines in the decades that followed. Many packages and fonts were developed to accompany the original platform, particularly after 2000; and major updates to the LaTeX kernel began in 2018. Over the years, the MIT Libraries changed the required format several times, especially as electronic thesis submission became the norm. The original template served MIT well; but by the early 2020s, it was substantially out of date. That situation motivated the creation of a new template.
This new MIT thesis template was developed in 2023 at the request of the MIT Libraries. The title and abstract pages strictly follow the current \href{https://libraries.mit.edu/distinctive-collections/thesis-specs/}{requirements of the Libraries}. The underlying code is entirely new, with extensive use of \texttt{expl3} syntax.
-\subsection*{System requirements}
+\section{SYSTEM REQUIREMENTS AND INSTALLATION}
The new \texttt{mitthesis} class uses the features of \LaTeX\ as of 2022, with limited backward compatibility. An up-to-date \LaTeX\ system is therefore necessary when using this template.
-\LaTeX\ is a free, open source system. The entire system is distributed through the \TeX\ Live platform (\url{https://www.tug.org/texlive/}), including the basic format, packages, and user interfaces. The system operates on Windows, MacOS, and Unix/Linux. \TeX\ Live is formally updated each year in the spring, and the associated utility package allows users download the most current codes more frequently if they desire. (At the time of this writing, the commercial platform Overleaf.com provides similar functionality.)
+\LaTeX\ is a free, open source system. The entire system is distributed through the \TeX\ Live platform (\url{https://www.tug.org/texlive/}), including the basic format, packages, and user interfaces. The system operates on Windows, MacOS, and Unix/Linux. \TeX\ Live is formally updated each year in the spring, and the associated utility package allows users to download the most current codes more frequently if they desire. (At the time of this writing, the commercial platform Overleaf.com provides a similar functionality.)
If you are missing a package or documentation, you may obtain it at no cost from CTAN (\href{http://ctan.org}{ctan.org}).
-\subsection*{\LaTeX\ engine}
-The template works with either \pdfTeX\ or unicode engines such as \LuaLaTeX. With the latter, fonts that you install in your operating system can be configured for use in your thesis. \LuaLaTeX\ also enables the direct use of lua code in your \texttt{.tex} file.
-
-\subsection*{Downloading the template}
+\subsection{Downloading the template}
The files needed for preparing your thesis are in the CTAN repository: \url{https://ctan.org/pkg/mitthesis}. Copy the subdirectory \texttt{MIT-thesis-template} onto your system. That directory contains files you can modify into your own thesis.
-If \texttt{mitthesis.cls} is installed in your system (e.g., if you use an up-to-date version of \TeX\ Live), you are all set. If not, copy the file \texttt{mitthesis.cls} into your working directory. If you plan to use fonts other than the default fonts, ensure that the subdirectory \texttt{fontsets} is present in your working directory.
+If the most current version of \texttt{mitthesis.cls} is installed in your system (e.g., if you use an up-to-date version of \TeX\ Live), you are all set. If not, copy the file \texttt{mitthesis.cls} into your working directory. If you plan to use fonts other than the default fonts, ensure that the subdirectory \texttt{fontsets} is present in your working directory.
-\subsection*{File structure}
+\subsection{File structure}
The new MIT thesis template consists of: \texttt{mitthesis.cls}; a root file \texttt{MIT-Thesis.tex}; a file to load the abstract, \texttt{abstract.tex}; a file for design options, \texttt{mydesign.tex}; and an optional file to change the fonts (see the subdirectory, \texttt{fontset}). You should change the name of the root file to something more descriptive of your own work (e.g., \texttt{JohnsThesis.tex}, \texttt{MagnumOpusScientiae.tex},\ldots). In addition, files must be loaded for acknowledgments, an optional biosketch, chapters, optional appendices, and bibliography.
-\subsection*{Bibliography}
-You may generate your bibliography using either \texttt{biblatex/biber} or \texttt{natbib/bibtex}. The template is set up for \texttt{biblatex} by default, rather than the older, less flexible \texttt{natbib}.
+\subsection{\LaTeX\ engine}
+The template works with either \pdfTeX\ or unicode engines such as \LuaLaTeX. With the latter, fonts that you install in your operating system can be configured for use in your thesis. \LuaLaTeX\ also enables the direct use of lua code in your \texttt{.tex} file. With lua code, you can automate plotting, table generation, and other numerical computations.
-\subsection*{PDF/A compatibility}
-PDF/A-2b compliance will be automatic if the \verb|\DocumentMetadata{..}| command is issued before the \verb|\documentclass{..}| command and \textit{provided that your graphics are also compliant}. This command was added to \LaTeX\ in June 2022. For older versions of \LaTeX, the \texttt{mitthesis} class will fall back to loading the \texttt{hyperxmp} package to support pdf metadata, but PDF/A compliance will require post-processing (for example, by using the PreFlight function of Adobe Acrobat). An up-to-date \LaTeX\ installation is preferred.
+\subsection{PDF/A compliance}
+PDF/A-2b compliance will be automatic if the \verb|\DocumentMetadata{pdfstandard = a-2b}| command is issued before the \verb|\documentclass{..}| command and \textit{provided that your graphics are also compliant}. This command was added to \LaTeX\ in June 2022. For older versions of \LaTeX,
+PDF/A compliance will require post-processing (for example, by using the PreFlight function of Adobe Acrobat). Current \LaTeX\ development (ca.~2024) is working toward fully \textit{accessible} PDF/A out of the box (e.g., PDF/A-2a). Unicode compliance (e.g., PDF/A-2u) depends greatly on your fonts and figures.
-Current \LaTeX\ development (ca.~2023) is working toward fully \textit{accessible} PDF/A out of the box (e.g., PDF/A-2a). Unicode compliance (e.g., PDF/A-2u) depends greatly on your fonts and figures.
-\section*{INFORMATION YOU NEED TO COMPLETE}
-Various fields and commands must be changed to your own information in the preamble of \texttt{MIT-Thesis.tex} and immediately after the \verb|\begin{document}| command. This information includes the title, author, degree and other essential information. With the comments in \texttt{MIT-Thesis.tex}, this step should be self-explanatory. Nevertheless some comments follow.
+\section{SETTING UP TITLE PAGE, ABSTRACT, AND BIBLIOGRAPHY}
+Various fields and commands must be changed to your own information in the preamble of \texttt{MIT-Thesis.tex} and immediately after the \verb|\begin{document}| command. This information includes the title, author, degree and other essential information. With the comments in \texttt{MIT-Thesis.tex}, this step should be self-explanatory. Nevertheless, some explanation follows.
-In the \verb|\hypersetup{..}| command, change the sample file to match your own information (e.g., keywords, subject, etc.). These commands generate metadata that are incorporated into the pdf file.
-The commands that define the title page are as follow.
-\begin{itemize}
+\begin{enumerate}
+\item In the \verb|\hypersetup{..}| command, change the sample file to match your own information (e.g., keywords, subject, etc.). These commands generate metadata that are incorporated into the pdf file.
+
\item \verb|\title{the title of your thesis}|
\item \verb|\Author{author full name}{author department}[1st PREVIOUS degree][2nd...| \linebreak
Note that third, fourth, fifth, and sixth arguments are optional [..] and may be omitted. Use once for each author.
-\item \verb|\Degree{name of degree}{department giving degree}|. Use once for each degree fulfilled by the thesis. If the thesis satisfies two degrees from one department, leave the department argument blank for the \textit{second} degree: \verb|\Degree{2nd degree name}{}|
+\item \verb|\Degree{name of degree}{department giving degree}|. Use once for each degree fulfilled by the thesis.
-\item \verb|\Supervisor{supervisor name}{supervisor title}|. Use once for each supervisor.
+If two departments jointly issue a single degree, leave the degree argument blank for the \textit{second} degree:
+\verb|\Degree{}{2nd department name}|.
+If the thesis satisfies two degrees from one department, leave the department argument blank for
+the \textit{second} degree: \verb|\Degree{2nd degree name}{}|.
+
+If you wish to cause a line break in a very long degree name, you can insert \verb|\\| at an appropriate point.
+Department names should not break across lines. For example:
+\begin{quote}
+\verb|\Degree{Doctor of Philosophy \\ in \\ Electrical Engineering and Computer|\linebreak
+\hbox{}\qquad\verb|Science}{Department of Electrical Engineering and Computer Science}|
+\end{quote}
+
+\item \verb|\Supervisor{supervisor name}{supervisor title}|. Use once for each supervisor. See \S\ref{sec:6.3} if your supervisor has more than one title.
\item \verb|\Acceptor{acceptor name}{acceptor title}{thesis related position}|. Professor who accepts theses for your department (e.g., the Graduate Officer). Use once for each department.
\item \verb|\DegreeDate{Month}{year}|. Date degree is awarded (February, May, June, or September).
\item \verb|\ThesisDate{date}|. Date that your final thesis is submitted to the department.
-\end{itemize}
+\end{enumerate}
-\subsection*{Copyright license}
+\subsection{Copyright license}
If you wish to make your thesis available under a Creative Commons License, issue the following command between
\verb|\begin{document}| and \verb|\maketitle|: \verb|\CClicense{license type}{license url}|. For example,
\vskip 5pt
\noindent\quad\verb|\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}|.
-\subsection*{Overflowing title page: managing space} If your title page overflows the vertical space (from too many authors, degrees, previous degrees, etc.), you can using some or all of the following techniques. The commands must be given before \verb|\maketitle|.
-\begin{enumerate}
- \item Reduce the 12pt and 18pt skips between the various blocks of text to 6pt with this command:
- \vskip 5pt
- \noindent\verb|\Tighten|
- \item Reduce the font size in the signature block with this command:
- \vskip 5pt
- \noindent\verb|\SignatureBlockSize{\small}|
- \item Put the acceptor name and title onto two lines, rather than three, by putting the acceptor's position into the 2\textsuperscript{nd} argument and leaving the 3\textsuperscript{rd} argument blank:
- \vskip 5pt
- {\small\noindent\verb|\Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}|}
- \item Reduce the font size of the the author name[s] from \verb|\large| to \verb|\normalsize| with this command:
- \vskip 5pt
- \noindent\verb|\AuthorNameSize{\normalsize}|
- \item Omit previous degrees from the title page, instead mentioning them in the biographical sketch.
-\end{enumerate}
+\subsection{Bibliography}
+You may generate your bibliography using either \texttt{biblatex/biber} or \texttt{natbib/bibtex}. The template is set up for \texttt{biblatex} by default, rather than the older, less flexible \texttt{natbib}. The \texttt{biblatex} package is very powerful, and you can customize most aspects the reference list and citations to suit your needs. See the documentation for details: \hrefurl{https://ctan.org/pkg/biblatex}{ctan.org/pkg/biblatex}.
-Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
-can use this command to squash the vertical glue (\TeX's stretchy space):
- \vskip 5pt
- \quad\verb|\Squash|
- \vskip 5pt
-\noindent This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically when the page is too full.
+The style of citations and references can be set in your \texttt{.tex} file. For numerical citations of references (e.g., [1]), you can do
+\vskip 5pt
+\verb|\usepackage[style=ext-numeric-comp,giveninits=true,sorting=none]{biblatex}|
+\vskip 5pt
+\noindent For IEEE style citations and references, you might do
+\vskip 5pt
+\verb| \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}|
+\vskip 5pt
+\noindent For author/year style (Smith, 2024), you might do
+\vskip 5pt
+\verb| \usepackage[style=authoryear, maxbibnames=10]{biblatex} |
+\vskip 5pt
+\noindent In the author/year style, \verb|\cite{..}| commands do not automatically produce parentheses. Instead, you can do
+\verb|\parencite{..}| to get ``(Author, year).''
-\section*{PACKAGE OPTIONS}
-Package options may be specified for \verb|\documentclass[..]{mitthesis}|. These options are described in Table~\ref{tab:1} and the subsections that follow.
+\section{CLASS OPTIONS}
+Class options may be specified for \verb|\documentclass[..]{mitthesis}|. These options are described in Table~\ref{tab:1} and the subsections that follow.
\begin{table}[b]
\caption{Options to the document class\label{tab:1}}
@@ -323,7 +298,7 @@ Package options may be specified for \verb|\documentclass[..]{mitthesis}|. These
\small
\begin{tabular}{>{\ttfamily}l<{} >{\raggedright\arraybackslash}p{42em} }
\toprule
-\textrm{Package option} & Effect \\
+\textrm{Class option} & Effect \\
\midrule
fontset & is a keyvalue, \texttt{fontset = <\textit{name}>}, which selects the set of fonts used for the thesis. See description below. \\
lineno & this option loads the \texttt{\hrefurl{https://ctan.org/pkg/lineno}{lineno}} package, which provides line numbers, as for editing. The \texttt{\hrefurl{https://ctan.org/pkg/lineno}{lineno}} package provides additional commands to control line numbering. \\
@@ -334,17 +309,16 @@ twoside & gives facing-page behavior for two-sided printing; omitting it will e
\end{tabular}}%
\end{table}
-\subsection*{Font loading}
-By default, \texttt{mitthesis.cls} will load the traditional \LaTeX\ fonts, Computer Modern (for \pdfTeX) or Latin Modern (for unicode engines). By using the key value \texttt{fontset=$\cdots$} in the \verb|\documentclass| command, you can select a different set of fonts.
+\subsection{Font loading}
+By default, \texttt{mitthesis.cls} will load the traditional \LaTeX\ typeface, Computer Modern (for \pdfTeX) or Latin Modern (for unicode engines). By using the key value \texttt{fontset=$\cdots$} in the \verb|\documentclass| command, you can select a different set of fonts.
-Ten fontsets are predefined, including the default set (see Table~\ref{tab:2}). Three work only with \pdfTeX, four work only with unicode engines, and three work with either. These options include a mixture of serif or sans serif text and math fonts, as shown in the table. To access the predefined font sets, you \textit{must} have the directory \texttt{fontsets} as a subdirectory of your working directory, including its files as named.
+Ten font sets are predefined, including the default set (see Table~\ref{tab:2}). Three work only with \pdfTeX, four work only with unicode engines, and three work with either. These options include a mixture of serif or sans serif text and math fonts, as shown in the table. To access the predefined font sets, you \textit{must} have the directory \texttt{fontsets} as a subdirectory of your working directory, including its files as named.
-Among the predefined fonts, Termes and NewTX are serifed fonts similar to the digital font Times New Roman. STIX Two is more similar to the original metal-type Times font. Linux Libertine is a serif font inspired by 19\textsuperscript{th} century book type. Lucida is a serifed font designed for high legibility at small size or on low resolution devices. This font is excellent for mathematics and includes a complete bold-face math font, but it is not free. Heros and NewTX-sans are sans-serif text fonts similar to Helvetica. NewTXsf is a sans-serif math font which draws upon glyphs from the STIX font. Fira is a humanist sans-serif text font designed in association with the Firefox browser. Finally, Computer Modern (and its extension Latin Modern)---the traditional \LaTeX\ font---is a Didone font, with high contrast between thick and thin elements.
+Among the predefined font sets, Termes and NewTX are serifed typefaces similar to the digital typeface Times New Roman. STIX Two is more similar to the original metal-type Times typeface. Linux Libertine is a serif typeface inspired by 19\textsuperscript{th} century book type. Lucida is a serifed typeface designed for high legibility at small size or on low resolution devices. Lucida is excellent for mathematics and includes a complete bold-face math font, but it is not free. Heros and NewTX-sans are sans-serif text typefaces similar to Helvetica. NewTXsf is a sans-serif math font which draws upon glyphs from the STIX fonts. Fira is a humanist sans-serif text typeface designed in association with the Firefox browser. Finally, Computer Modern (and its extension Latin Modern)---the traditional \LaTeX\ typeface---is a Didone typeface, with high contrast between thick and thin elements.
+% STIX Two, Termes, and LMR do not include a separate bold math font.
-You may also place your own fontset file, say \texttt{Myfontset.tex}, in your working directory, and load it with
-
-\vskip10pt
-\hfill\verb|\documentclass[fontset=Myfontset]{mitthesis}|\hfill\hbox{}
+You may also place your own font-set file, say \texttt{Myfontset.tex}, in your working directory, and load it with:
+\verb|\documentclass[fontset=Myfontset]{mitthesis}|.
\begin{table}[t]
\caption{Predefined font sets\label{tab:2}}
@@ -362,7 +336,7 @@ default & yes & yes & serif & serif & CM \& LM fonts are included in \TeX\
libertine & yes & yes & serif & serif & in \TeX\ Live for \pdfTeX. For unicode, OpenType text fonts freely available here
\linebreak \url{https://sourceforge.net/projects/linuxlibertine/}\linebreak and the math font here
\linebreak \url{https://github.com/alerque/libertinus} \\
-lucida & yes & yes & serif & serif & the lucida fonts are available from the \TeX\ User's Group,
+lucida & yes & yes & serif & serif & the Lucida fonts are available from the \TeX\ User's Group,
\url{https://tug.org/store/lucida} \\[2em]
heros-stix2 & no & yes & sans & serif & \url{http://www.gust.org.pl/projects/e-foundry/tex-gyre} \linebreak\url{https://github.com/stipub/stixfonts} \linebreak fonts are free \\
stix2 & no & yes & serif & serif & \url{https://github.com/stipub/stixfonts}, fonts are free\\
@@ -374,17 +348,64 @@ termes-stix2 & no & yes & serif & serif & \url{http://www.gust.org.pl/projects/
\end{tabular}}%
\end{table}
-\subsection*{Design options}
+\subsection{Design options}
The thesis will follow the default styles of the \LaTeX\ report class for sections headings, captions, and lists. If you prefer different styles you can use the class option [mydesign] which loads the file \texttt{mydesign.tex}.
With \texttt{mydesign.tex}, you can set options for packages that manage color, e.g.\ \texttt{\hrefurl{https://ctan.org/pkg/xcolor}{xcolor}}, that change the margins, or that change the design of titles, captions, and lists: \texttt{\hrefurl{https://ctan.org/pkg/titlesec}{titlesec}}, \texttt{\hrefurl{https://ctan.org/pkg/caption}{caption}}, or \texttt{\hrefurl{https://ctan.org/pkg/enumitem}{enumitem}}. You can also load other packages. The \texttt{mitthesis} class will insert these commands at the appropriate point (prior to loading \texttt{\hrefurl{https://ctan.org/pkg/babel}{babel}}, fonts, or \texttt{\hrefurl{https://ctan.org/pkg/hyperref}{hyperref}}). You should not need to edit the class file.
Hyperlink colors and pdf bookmark or viewing options from the \texttt{hyperref} package can be changed by using \verb|\hypersetup{ .. }| in the preamble or using \verb|\AtBeginDocument{ \hypersetup{ .. } }| in the \texttt{mydesign.tex} file.
-\subsection*{Single-sided vs.\ double-sided layout}
+\subsection{Single-sided vs.\ double-sided layout}
The sample template uses the option \texttt{[twosided]}, which starts major sections (abstract, table of contents, chapters, etc.) on odd-numbered pages. This arrangement is suitable for two-sided printing, but can lead to empty even-numbered pages. If you do not wish to have this behavior, omit that option. By default, even and odd page margins are the same; this can be changed in \texttt{mydesign.tex} if necessary.
-\begin{table}[t]
+\subsection{Additional commands}
+The class also provides \verb|\DegreeYear|, \verb|\DegreeMonth|, and \verb|\CopyrightAuthor|. The latter combines all author names into a single token list, e.g., ``Joseph O. Hirschfelder, Charles F. Curtiss and R. Byron Bird''; a period at the end of the final name (e.g., as in ``John F. Nash Jr.'') is removed.
+
+\subsection{Nomenclature}
+An optional nomenclature environment is provided by the class. This environment can support either chapter-by-chapter nomenclature (at the section level) or a single nomenclature for the entire thesis (at the chapter level). The environment has three optional arguments: [1] adjust space between symbol and definition; [2] name (heading) of the nomenclature list; and [3] level, which can be ``chapter'' or ``section'' depending on whether you
+have one nomenclature list for whole thesis or one for each chapter (the default is section).
+
+For example, the following code
+\begin{center}
+\begin{minipage}{0.8\textwidth}
+\begin{verbatim}
+\begin{nomenclature}[2em][Nomenclature for Chapter 1][section]
+\EntryHeading{Roman letters}
+\entry{$\mathcal{C}$}{material curve}
+\entry{$\mathbf{u}$}{velocity [m s$^{-1}$]}
+\EntryHeading{Greek letters}
+\entry{$\Gamma$}{circulation [m$^2$ s$^{-1}$]}
+\entry{$\rho$}{mass density [kg m$^{-3}$]}
+\end{nomenclature}
+\end{verbatim}
+\end{minipage}
+\end{center}
+produces the nomenclature list below
+\begin{center}
+\begin{minipage}{0.8\textwidth}
+\begin{nomenclature}[2em][Nomenclature for Chapter 1][section]
+\EntryHeading{Roman letters}
+\entry{$\mathcal{C}$}{material curve}
+\entry{$\mathbf{u}$}{velocity [m s$^{-1}$]}
+\EntryHeading{Greek letters}
+\entry{$\Gamma$}{circulation [m$^2$ s$^{-1}$]}
+\entry{$\rho$}{mass density [kg m$^{-3}$]}
+\end{nomenclature}
+\end{minipage}
+\end{center}
+
+\section{PACKAGES FOR MATH, CHEMISTRY, CODE, TABLES, AND MORE}
+The \texttt{mitthesis} class loads the \texttt{amsmath} package and its extension \texttt{mathttools}. These packages provide many useful macros for typesetting equations and symbols, such as: environments for aligning and splitting equations or groups of equations; tools for matrices; a wide variety of operators and symbols; tools to define new math operators and paired delimiters; and much, much more. If you are including equations, look at the documentation for these packages: \url{https://ctan.org/pkg/amsmath} and \url{https://ctan.org/pkg/mathtools}.\looseness=1
+
+Specialized packages for many disciplines can be found in \hrefurl{https://ctan.org}{CTAN}. These include subjects like \hrefurl{https://ctan.org/topic/chemistry}{chemistry}, \hrefurl{https://ctan.org/topic/linguistic}{linguistics}, and \hrefurl{https://ctan.org/topic/physics}{physics}. As examples of such packages, the sample thesis template uses the package \texttt{\hrefurl{https://ctan.org/pkg/mhchem}{mhchem}} to set chemical equations and the package \texttt{\hrefurl{https://ctan.org/pkg/listings}{listings}} to list computer code.
+
+Several packages focus on table and tabular environments. The \texttt{\hrefurl{https://ctan.org/pkg/booktabs}{booktabs}} package, use in the sample thesis template, produces better quality horizontal lines (called \textit{rules}) for separating material in tables. The \texttt{\hrefurl{https://ctan.org/pkg/array}{array}} package (also used) provides additional options for column formats in tabular environments, and the \texttt{\hrefurl{https://ctan.org/pkg/dcolumn}{dcolumn}} package aligns columns of numbers on the decimal separator.
+
+When selecting a package to use, check that it is currently maintained (with relatively recent updates), and compare it to other packages that perform similar functions. Some packages are better than others, and some obsolete packages remain online.
+
+The packages called by \texttt{mitthesis} are listed in Table~\ref{tab:3} on page~\pageref{tab:3}.
+
+\begin{table}
\caption{External packages used. For documentation, visit CTAN, \url{https://ctan.org}. Alternatively, if you have \hrefurl{https://www.tug.org/texlive/}{\TeX\ Live} installed, you can open a terminal window and type \texttt{\%\ texdoc package-name}.\label{tab:3}}
\vskip5pt
\centering{\small%
@@ -398,22 +419,25 @@ bm & defines commands to access bold math symbols (loaded for default fonts) &
bookmarks& is loaded automatically under the new pdf-management system & customize pdf bookmarks \\
doi & support for hyperlinking DOIs & hyperlink a doi number: \verb|\doi{..}| \\
etoolbox & extend or modify other macros & can use in preamble if needed \\
-iftex & check which \LaTeX\ engine is running& macros to check which engine, e.g., \verb|\ifpdftex| \\
geometry & set page size and margins & can use \verb|\newgeometry| in \texttt{mydesign.tex}\\
graphicsx& support for inserting images & use to include graphics\\
hyperref & support for hyperlinks and metadata & must complete setup in preamble\\
+iftex & check which \LaTeX\ engine is running& macros to check which engine, e.g., \verb|\ifpdftex| \\
mathtools& loads and extends \texttt{amsmath} & \textbf{many useful math macros available}. See documentation for \texttt{amsmath} and \texttt{mathtools} \\[0.7em]
\midrule
hyperxmp & fallback if no \verb|\DocumentMetadata{..}|& ---\\
kvoptions& key values for systems pre 2022/11/01 & ---\\
-xparse & for systems older than 2020/10/01 & macros to define new commands\\[0.7em]
+xparse & for systems older than 2020/10/01 & macros to define new commands\\
\midrule
-lineno & loaded if class option is given & keyvalue \texttt{lineno} will give line numbers; \texttt{lineno} package has additional commands that control line numbering\\[3em]
+lineno & loaded if class option is given & keyvalue \texttt{lineno} will give line numbers; \texttt{lineno} package adds commands to control numbering\\[0.7em]
\midrule
caption & also loaded by \texttt{mydesign.tex} & support for caption styling \\
subcaption & also loaded by \texttt{mydesign.tex} & support for subfigures within figures \\
titlesec & also loaded by \texttt{mydesign.tex} & support for styling section headings \\
xcolor & also loaded by \texttt{mydesign.tex} & support for colors, including colored fonts \\[0.7em]
+array & --- & additional options for formatting table columns \\
+booktabs & --- & better quality tables, with additional commands \\
+dcolumn & --- & align number columns on selectable separators \\
\midrule
babel & --- & if you use multiple languages, load \texttt{babel} in a fontset file before loading fonts \\
biblatex & --- & sample template uses this bibliography tool. Change to \texttt{natbib} if you prefer\\
@@ -428,75 +452,71 @@ unicode-math & --- & load in a fontset file if using a unicode engine\\
\end{tabular*}}%
\end{table}
-\subsection*{Additional commands}
-The class also provides \verb|\DegreeYear|, \verb|\DegreeMonth|, and \verb|\CopyrightAuthor|. The latter combines all author names into a single token list, e.g., ``Joseph O. Hirschfelder, Charles F. Curtiss and R. Byron Bird''; a period at the end of the final name (e.g., as in ``John F. Nash Jr.'') is removed.
-
-
-\subsection*{Nomenclature}
-An optional nomenclature environment is provided by the class. This environment can support either chapter-by-chapter nomenclature (at the section level) or a single nomenclature for the entire thesis (at the chapter level). The environment has three optional arguments: [1] adjust space between symbol and definition; [2] name (heading) of the nomenclature list; and [3] level, which can be ``chapter'' or ``section'' depending on whether you
-have one nomenclature list for whole thesis or one for each chapter (the default is section).
+\section{TROUBLESHOOTING AND MODIFICATIONS}
+\subsection{Listing thesis committee members or using a signature page}
+Listing committee members (with or without signatures) is not required under MIT's thesis specifications. Only the thesis supervisor should appear on the title page, not a list of committee members. However, some departments may require a separate committee or signature page. That page can be inserted by the author between the title and abstract pages. Check with your department about this page and any associated formatting requirements.
-For example, the following code
-\begin{center}
-\begin{minipage}{0.8\textwidth}
-\begin{verbatim}
-\begin{nomenclature}[2em][Nomenclature for Chapter 1][section]
-\EntryHeading{Roman letters}
-\entry{$\mathcal{C}$}{material curve}
-\EntryHeading{Greek letters}
-\entry{$\Gamma$}{circulation [m$^2$ s$^{-1}$]}
-\end{nomenclature}
-\end{verbatim}
-\end{minipage}
-\end{center}
-produces the nomenclature list below
-\begin{center}
-\begin{minipage}{0.8\textwidth}
-\begin{nomenclature}[2em][Nomenclature for Chapter 1][section]
-\EntryHeading{Roman letters}
-\entry{$\mathcal{C}$}{material curve}
-%\entry{$\mathbf{u}$}{velocity [m s$^{-1}$]}
-\EntryHeading{Greek letters}
-\entry{$\Gamma$}{circulation [m$^2$ s$^{-1}$]}
-%\entry{$\rho$}{mass density [kg m$^{-3}$]}
-\end{nomenclature}
-\end{minipage}
-\end{center}
+\subsection{Dealing with multiple titles in the signature block}\label{sec:6.3}
+When a thesis supervisor has multiple titles (and both will not fit on one line), you can obtain a line break with proper horizontal spacing by doing
+ \vskip 5pt
+ \quad\verb|\Supervisor{name}{first title and \\ \> second title}|
+ \vskip 5pt
+\noindent\textbf{\TeX hackers note:} The signature block is typeset as a \LaTeX\ \texttt{tabbing} environment.
-\section*{PACKAGES FOR MATH, CHEMISTRY, CODE LISTINGS, AND MORE}
-The \texttt{mitthesis} class loads the \texttt{amsmath} package and its extension \texttt{mathttools}. These packages provide many useful macros for typesetting equations and symbols, such as: environments for aligning and splitting equations or groups of equations; tools for matrices; a wide variety of operators and symbols; tools to define new math operators and paired delimiters; and much, much more. If you are including equations, look at the documentation for these packages: \url{https://ctan.org/pkg/amsmath} and \url{https://ctan.org/pkg/mathtools}.\looseness=1
+\subsection{Overflowing title page: managing space} If your title page overflows the vertical space (from too many authors, degrees, previous degrees, etc.), you can using some or all of the following techniques. The commands must be given before \verb|\maketitle|.
+\begin{enumerate}
+ \item Reduce the 12 pt and 18 pt skips between the various blocks of text to 6 pt with this command:
+ \vskip 5pt
+ \noindent\verb|\Tighten|
+ \item Reduce the font size in the signature block with this command:
+ \vskip 5pt
+ \noindent\verb|\SignatureBlockSize{\small}|
+ \item Put the acceptor name and title onto two lines, rather than three, by putting the acceptor's position into the 2\textsuperscript{nd} argument and leaving the 3\textsuperscript{rd} argument blank:
+ \vskip 5pt
+ {\small\noindent\verb|\Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}|}
+ \item Reduce the font size of the the author name[s] from \verb|\large| to \verb|\normalsize| with this command:
+ \vskip 5pt
+ \noindent\verb|\AuthorNameSize{\normalsize}|
+ \item Omit previous degrees from the title page, instead mentioning them in the biographical sketch.
+\end{enumerate}
-Specialized packages for many disciplines can be found in \hrefurl{https://ctan.org}{CTAN}. These include subjects like \hrefurl{https://ctan.org/topic/chemistry}{chemistry}, \hrefurl{https://ctan.org/topic/linguistic}{linguistics}, and \hrefurl{https://ctan.org/topic/physics}{physics}. As examples of such packages, the sample thesis template uses the package \texttt{\hrefurl{https://ctan.org/pkg/mhchem}{mhchem}} to set chemical equations and the package \texttt{\hrefurl{https://ctan.org/pkg/listings}{listings}} to list computer code.
-When selecting a package to use, check that it is currently maintained (with relatively recent updates), and compare it to other packages that perform similar functions. Some packages are better than others, and some obsolete packages remain online.
+\subsection{Push title page text toward top} If you prefer to keep the text toward the top of the page with most white space at the bottom, you
+can use this command to squash the vertical glue (\TeX's stretchy space):
+ \vskip 5pt
+ \quad\verb|\Squash|
+ \vskip 5pt
+\noindent This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically when the page is too full.
-The packages called by \texttt{mitthesis} are listed in Table~\ref{tab:3} on page~\pageref{tab:3}.
+\subsection{Changing paragraph separation}
+If you prefer to denote paragraph breaks by vertical space rather than indentation, you can try the \texttt{parskip} package: \hrefurl{https://ctan.org/pkg/parskip}{ctan.org/pkg/parskip}. See that package's documentation for details.
-\section*{USE OUTSIDE MIT}
-If you wish to adapt this template for use at a different institution, you can put the following commands in your preamble.
+\subsection{Use outside MIT}
+To adapt this template for use at a different institution, you can put the following commands in your preamble.
\begin{itemize}
-\item Use \verb|\Institution{Your Institution}| to change MIT to your own institution on the title page. %{\small\textit{New with v1.06.}}
+\item Use \verb|\Institution{Your Institution}| to change MIT to your own institution on the title page.
\item Use \verb|\maketitle*| (in place of \verb|\maketitle|) to drop the MIT copyright permission statement
\item If your institution issues degrees in months other than February, May, June, or September, you can still put those months into the
-\verb|\DegreeDate| command. To suppress the resulting error message, put \verb|\SuppressMonthError| before \verb|\maketitle*|. %\newline{\small\textit{New with v1.11.}}
+\verb|\DegreeDate| command. To suppress the resulting error message, put \verb|\SuppressMonthError| before \verb|\maketitle*|.
-\item Omitting \verb|\Acceptor| commands will drop the ``Accepted by:'' field. To suppress the resultant error message, put \verb|\SuppressAcceptorError| before \verb|\maketitle*|. %\newline{\small\textit{New with v1.06.}}
+\item Omitting \verb|\Acceptor| commands will drop the ``Accepted by:'' field. To suppress the resultant error message, put \verb|\SuppressAcceptorError| before \verb|\maketitle*|.
+
+\item To change ``Thesis Supervisor'' to something else use \verb|\SupervisorDesignation{..}|.
\end{itemize}
Please do not remove the license/copyright text from the sources files --- this code took me some time write!
-\section*{RESOURCES FOR \LaTeX}
+\section[RESOURCES FOR LATEX]{RESOURCES FOR \LaTeX}
\LaTeX\ documentation is easy to find online. A few useful resources, among many, are these:
\begin{description}
\item[\LaTeX\ Wikibook.] \url{https://en.wikibooks.org/wiki/LaTeX}. An online tutorial book.
\item[\LaTeX 2e: An unofficial reference manual.] \url{https://latexref.xyz/dev/latex2e.html}. A comprehensive explanation of each \LaTeX\ command, from the \TeX\ User's Group.
\item[\TeX\ Stack-Exchange.]\ \url{https://tex.stackexchange.com/}. More than 250,000 answered questions, and you can ask your own!
-\item[ChatGPT.] At the time of this writing, ChatGPT, a chatbot based on a large language model, could both answer some \LaTeX-related questions and write acceptable \LaTeX\ and expl3 code.
+\item[ChatGPT.] At the time of this writing, ChatGPT, a chatbot based on a large language model, could sometimes accurately answer \LaTeX-related questions or write acceptable \LaTeX\ and expl3 code.
\end{description}
-
\vskip 30pt
\centering{\color{Red3}\Large\textbf{\textit{Good luck with your thesis and your thesis defense!}}
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index 245eda72b79..bcfdad1373e 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,371 +1,396 @@
-version 2.3.1 (2022-02-21)
-- Fix duplicate GitLab icon (#105)
-- Revert using detokenize in social links (#97)
-- Fix broken compilation in classic style (#96)
-
-version 2.3.0 (2021-12-16)
-- Remove font loading from class (#87)
-- Add Matrix and Signal icon (#84)
-- Improved symbol loading (#84)
-
-version: 2.2.0 (2021-07-28)
-- Remove dot in cventry when using moderncvbodyi.
+version 2.4.1 (18 Jul 2024)
+- Fix commons/colors.tex not found in package (#194)
+
+version 2.4.0 (08 Jul 2024)
+- Rewrote user guide, thanks to David Seus (#58, #106, #169).
+- Fixed "Underfull \hbox (badness 10000)" warning in \makecvtitle (#162).
+- Fixed unnecessary academicons warning when academicons aren't used (#161).
+- Fixed page counts unnecessarily linking to the last page of the PDF (#159).
+- Added support for an optional signature in the cover letter (#157).
+- Added support for non-ASCII characters in links (#155).
+- Added option to force a homepage link to use HTTP rather than HTTPS (#154).
+- Passed unicode option directly to hyperref to avoid conflicts with the
+ inclusion of hyperref by other packages (#148).
+- Fixed the sender block on the cover letter in banking style (#146).
+- Added option to classic style to align header elements at the top (#144).
+- Added Twitch, YouTube, TikTok, Instagram, SoundCloud, Steam, Xbox, PlayStation
+ and Battle.net social icons (#131).
+- Removed extra dash in PDF metadata when CV title is empty (#116).
+- Added support for an optional subject line in the cover letter (#114).
+- Added Discord social icon (#112).
+- Replace instances of ~~~ in codebase with \hspace to be more compatible with
+ babel for Spanish (#109).
+- Added Codeberg and Mastodon social icons (#107).
+- New \social options: arXiv, INSPIRE (#185)
+- Systematize colors and make them user adjustable. See documentation for details.
+ This requires the \moderncvcolor to be issued BEFORE \moderncvstyle (#151).
+- all styles: make the head options 'details' and 'nodetails' available to the user. (previously they were hidden). Oldstyle does not respond too well to nodetails (#150).
+- casual style: make the head options 'alternate', 'details' and 'nodetails' available to the user. (previously they were hidden) (#150).
+- Setting \listitemsymbolspace allows custom spacing between list symbol and text item (for \cvlistitem and \cvlistdoubleitem) (#74).
+- Introducing \cvtripleitem command for items in three columns. Closing feature request #174.
+- Fixed wrong cvlistitem vspace caused by multiline section titles in fancy style (#69).
+
+version 2.3.1 (21 Feb 2022)
+- Fix duplicate GitLab icon (#105).
+- Revert using detokenize in social links (#97).
+- Fix broken compilation in classic style (#96).
+
+version 2.3.0 (16 Dec 2021)
+- Remove font loading from class (#87).
+- Add Matrix and Signal icon (#84).
+- Improved symbol loading (#84).
+
+version: 2.2.0 (28 Jul 2021)
+- Remove dot in \cventry when using moderncvbodyi.
+
- Remove http baseurl in hyperref.
-- Change font encoding to use fontspec with Latin Modern for luatex and xetex,
+- Change font encoding to use fontspec with Latin Modern for LuaTeX and XeTeX,
else inputenc / fontenc / lmodern (https://tex.stackexchange.com/a/496643).
- Add birthdate field command.
- Add Social entries for WhatsApp, Signal and Matrix.
- Fix Researcher ID not showing (#29).
-- Make options 'symbols' and 'nosymbols' available to all styles to toggle whether
- symbols should be used or not. Include symbols in oldstyle by default.
-- Migrate older newcommand syntax in moderncvcollection.sty to the xparse syntax.
+- Make options "symbols" and "nosymbols" available to all styles to toggle
+ whether symbols should be used or not. Include symbols in oldstyle by default.
+- Migrate older newcommand syntax in moderncvcollection.sty to xparse syntax.
- Fix resumé typo in template. Is now résumé.
- Various other minor fixes.
version 2.1.0 (21 Jan 2021)
-- maintainer change: now team maintained (https://github.com/moderncv), since
- original repository is basically dead since 2016.
-- new \social options: Xing, Skype, GitLab, Bitbucket, stack overflow, ORCID,
- ResearcherID, ResearchGate, Telegram and Google Scholar
-- hyperlinks in phone numbers
-- switch from l3regex to expl3
-- new skill matrix feature
-- move to fonawesome5 package
-- default to https
+- Maintainer change: now team maintained (https://github.com/moderncv), since
+ original repository has been basically dead since 2016.
+- New \social options: Xing, Skype, GitLab, Bitbucket, stack overflow, ORCID,
+ ResearcherID, ResearchGate, Telegram and Google Scholar.
+- Hyperlinks in phone numbers.
+- Switch from l3regex to expl3.
+- New skill matrix feature.
+- Move to fontawesome5 package.
+- Default to https.
version 2.0.0 (28 Jul 2015)
- - refactored the code into heads, body, foot and icon substyles. All styles
- (classic, casual, banking and oldstyle) are just a combination of these and
- some font selection. Mixing substyles (e.g., the banking header with the
- classic body) is now trivial by using the \moderncvhead, \moderncvbody,
- \moderncvfoot and \moderncvicons commands. Each of these take a substyle number
- as argument. \moderncvcolor takes a color name as argument.
- - added a new style, "fancy".
- - added an optional argument to \moderncvstyle to specify style options, i.e.
- \moderncvstyle[options]{style}. Below is a list of the available options per
- style:
- * classic
- > to specify of one's name should appear left or right at the top: "left"
- (default) or "right;
- * casual
- > to specify of one's name should appear left or right at the top: "left"
- (default) or "right;
- * banking
- > to specify how the section- and subsectionrules should be set:
- "fullrules", "shortrules", "mixedrules" (default; full rules for sections,
- short rules for subsections), "centered" (fullrules with centered title)
- and "norules" (norules, small caps font);
- > to specify how the body should be aligned: left" (default), "center" or
- "right";
- * oldstyle & fancy
- n/a
- - added a new color variant: "burgundy".
- - corrected the color of \addressstyle to match the one effectively used
- (color2).
- - adjusted the bibliography spacing to handle entries with or without labels.
- - added a check on the emptyness of \title when setting the hyperref document
- properties.
+- Refactored the code into heads, body, foot and icon substyles. All styles
+ (classic, casual, banking and oldstyle) are just a combination of these and
+ some font selection. Mixing substyles (e.g., the banking header with the
+ classic body) is now trivial by using the \moderncvhead, \moderncvbody,
+ \moderncvfoot and \moderncvicons commands. Each of these take a substyle
+ number as argument. \moderncvcolor takes a color name as argument.
+- Added a new style: fancy.
+- Added an optional argument to \moderncvstyle to specify style options, i.e.
+ \moderncvstyle[options]{style}. Below is a list of the available options per
+ style:
+ * classic
+ > to specify where at the top one's name should appear: "left" (default) or
+ "right;
+ * casual
+ > to specify where at the top one's name should appear: "left" (default) or
+ "right;
+ * banking
+ > to specify how the section and subsection rules should be set:
+ "fullrules", "shortrules", "mixedrules" (default; full rules for sections,
+ short rules for subsections), "centered" (fullrules with centered title)
+ and "norules" (norules, small caps font);
+ > to specify how the body should be aligned: left" (default), "center" or
+ "right";
+ * oldstyle & fancy
+ > n/a
+- Added a new color variant: "burgundy".
+- Corrected \addressstyle color to match the one effectively used (color2).
+- Adjusted the bibliography spacing to handle entries with or without labels.
+- Added a check on the emptiness of \title when setting the hyperref document
+ properties.
version 1.5.1 (29 Apr 2013)
- - made sure that XeLaTeX or LuaLaTeX is in use before loading the awesome icon
- set and if not, revert to the marvosym icon set.
+- Made sure that XeTeX or LuaTeX is in use before loading the awesome icon set
+ and if not, revert to the marvosym icon set.
version 1.5.0 (23 Apr 2013)
- - added a command to showcase social accounts in one's personal information:
- \social. The command currently handles automatically LinkedIn, Twitter and
- Github accounts, and other links can be provided explicitly.
- - added a new icon set: "awesome" (using the icons from the Font Awesome font).
- - set the "awesome" icon set as the default for the "casual" and "banking"
- style variants (can be changed back with \moderncvicons{marvosym}).
- - forced all the icons of the "letters" icon set to be of the same width, for
- alignment purpose.
- - added a letter icon ("W") for the homepage of the "letters" icon set.
- - forced some white space between the main text and the footer of the "casual"
- style variant.
- - removed the rule below the headings of the cvcolumns environment.
+- Added a command to showcase social accounts in one's personal information:
+ \social. The command currently handles LinkedIn, Twitter and Github accounts
+ automatically, and other links can be provided explicitly.
+- Added a new icon set: "awesome" (using the icons from the Font Awesome font).
+- Set the "awesome" icon set as the default for the casual and banking styles
+ (can be changed back with \moderncvicons{marvosym}).
+- Forced all the icons of the "letters" icon set to be of the same width, for
+ alignment purposes.
+- Added a letter icon ("W") for the homepage of the "letters" icon set.
+- Forced some whitespace between the main text and the footer of the casual
+ style.
+- Removed the rule below the headings of the cvcolumns environment.
version 1.4.0 (28 Mar 2013)
- - deprecated \phone, \mobile and \fax in favour of \phone[<type>], where <type>
- can be "fixed" (default), "mobile" or "fax". As part of the change, one can now
- use each of these multiple times, to e.g. display multiple mobile phone numbers.
- - deprecated \firstname and \familyname in favour of \name{<first>}{<last>}.
- - added a new mechanism to select amongs different possible icon sets:
- \moderncvicons{<iconsetname>}, where <iconsetname> can be "marvosym" (used by
- default in the "banking", "casual" and "classic" style variants) or "letters"
- (used by default in the "oldstyle" style variant). \moderncvicons should
- always be called after \moderncvstyle in order to override the style variants
- defaults.
- - added a command to control the font of the page numbering: \pagenumberfont,
- as requested by fr1a1nky (launchpad question #224496).
- - removed the use of the suffix package.
+- Deprecated \phone, \mobile and \fax in favour of \phone[<type>], where <type>
+ can be "fixed" (default), "mobile" or "fax". As part of the change, one can
+ now use each of these multiple times, e.g. to display multiple mobile phone
+ numbers.
+- Deprecated \firstname and \familyname in favour of \name{<first>}{<last>}.
+- Added a new mechanism to select amongs different possible icon sets:
+ \moderncvicons{<iconsetname>}, where <iconsetname> can be "marvosym" (used by
+ default in the banking, casual and classic styles) or "letters" (used by
+ default in the oldstyle style). \moderncvicons should always be called after
+ \moderncvstyle in order to override the styles' defaults.
+- Added a command to control the font of the page numbering: \pagenumberfont, as
+ requested by fr1a1nky (launchpad question #224496).
+- Removed the use of the suffix package.
version 1.3.0 (09 Feb 2013)
- - added a new environment to create multiple columns: cvcolumns. Each column
- is then created by \cvcolumn[width]{header}{content}, where the optional width
- is given as a fraction of the total width (between 0 and 1). The header and
- content are robust and can contain any paragraph command (e.g., a nest itemize
- environment).
- - added a macro (\pdfpagemode) to control what is visible upon opening compiled
- pdfs (assuming pdf reader support), as suggested by U. Stöhr.
- Possible values include: "UseNone" (only the document), "UseThumbs" (show
- thumbnails), "UseOutlines" (show bookmarks) and "FullScreen" (open in
- fullscreen mode).
- - added a 3rd, fully optional (can be omitted or left blank) argument to
- \address to specify a country, as requested on launchpad (launchpad bug
- #1063995).
- - compacted list environments further.
- - replaced the use of the xargs package by the xparse one.
+- Added a new environment to create multiple columns: cvcolumns. Each column is
+ then created by \cvcolumn[width]{header}{content}, where the optional width is
+ given as a fraction of the total width (between 0 and 1). The header and
+ content are robust and can contain any paragraph command (e.g., a nested
+ itemize environment).
+- Added a macro (\pdfpagemode) to control what is visible upon opening compiled
+ PDFs (assuming PDF reader support), as suggested by U. Stöhr.
+ Possible values include: "UseNone" (only the document), "UseThumbs" (show
+ thumbnails), "UseOutlines" (show bookmarks) and "FullScreen" (open in
+ fullscreen mode).
+- Added a 3rd, fully optional (can be omitted or left blank) argument to
+ \address to specify a country, as requested on launchpad (launchpad bug
+ #1063995).
+- Compacted list environments further.
+- Replaced the use of the xargs package by the xparse one.
version 1.2.1 (04 Dec 2012)
- - fixed a regression bug introduced in version 1.2.0 in the header of the
- "banking" style when no title is used, as reported on tex.stackexchange
- (question #85427).
+- Fixed a regression bug introduced in v1.2.0 in the header of the banking style
+ when no title is used, as reported on tex.stackexchange (question #85427).
version 1.2.0 (31 Oct 2012)
- - updated the "banking" style header to include the option to show a title.
- - set the values of \arrayrulewidth and \doublerulesep to their standard values
- (0.4pt and 2pt resp.) to enable the drawing of rules in tabulars and arrays by
- default.
- - modified the code of \makecvtitle and \makelettertitle of the "casual" style
- to avoid it to cause horizontal alignment issues after and before itself.
- - corrected a bug in \makelettertitle of most styles that displayed the current
- date (\today) instead of the date given through the \date command, as reported
- by B. Schlimmchen and S. Fnord.
- - removed the need to set pdfpagelabels=false when loading hyperref, by putting
- \pagenumbering{arabic} (to define \thepage) before loading hyperref, as figured
- out by J. Wolf.
- - corrected the line wrapping of \cvlistitem of the "banking" style.
- - corrected a bug in \makecvtitle and \makelettertitle of the "banking" style.
- - removed an unwanted space in the footer of the "casual" style.
- - moved the font style definitions to moderncv.cls for better readability
- (moderncv.cls is meant to be a sort of header file, implementing only some
- macros shared by all styles and defining the macros that the style files need
- to implement).
+- Updated the banking style header to include the option to show a title.
+- Set the values of \arrayrulewidth and \doublerulesep to their standard values
+ (0.4pt and 2pt, respectively) to enable the drawing of rules in tabulars and
+ arrays by default.
+- Modified the code of \makecvtitle and \makelettertitle of the casual style to
+ avoid it causing horizontal alignment issues before and after itself.
+- Corrected a bug in \makelettertitle of most styles that displayed the current
+ date (\today) instead of the date given through the \date command, as reported
+ by B. Schlimmchen and S. Fnord.
+- Removed the need to set pdfpagelabels=false when loading hyperref by putting
+ \pagenumbering{arabic} (to define \thepage) before loading hyperref, as
+ figured out by J. Wolf.
+- Corrected the line wrapping of \cvlistitem of the banking style.
+- Corrected a bug in \makecvtitle and \makelettertitle of the banking style.
+- Removed an unwanted space in the footer of the casual style.
+- Moved the font style definitions to moderncv.cls for better readability
+ (moderncv.cls is meant to be a sort of header file, implementing only some
+ macros shared by all styles and defining the macros that the style files need
+ to implement).
version 1.1.3 (10 Aug 2012)
- - corrected a longstanding issue causing hyperref to issue two warnings
- regarding its "pdfpagelabels" option, as pointed out and solved by P. Leifeld
- (launchpad bug #1035466).
+- Corrected a long-standing issue causing hyperref to issue two warnings about
+ its "pdfpagelabels" option, as pointed out and solved by P. Leifeld (launchpad
+ bug #1035466).
version 1.1.2 (09 Aug 2012)
- - fixed a regression bug introduced in version 1.0.0 in the footer of the
- "casual" style, as discovered on tex.stackexchange (question #66316).
+- Fixed a regression bug introduced in v1.0.0 in the footer of the casual style,
+ as discovered on tex.stackexchange (question #66316).
version 1.1.1 (30 Jul 2012)
- - fixed a compatibility issue introduced in version 1.0.0 when
- \maketitlenamewidth was renamed to \makecvtitlenamewidth, as reported by Peppe
- on launchpad (launchpad bug #1030802). The template now correctly uses
- \makecvtitlenamewidth, and \maketitlenamewidth was created as an alias for
- backward compatibility.
+- Fixed a compatibility issue introduced in v1.0.0 when \maketitlenamewidth was
+ renamed to \makecvtitlenamewidth, as reported by Peppe on launchpad (launchpad
+ bug #1030802). The template now correctly uses \makecvtitlenamewidth, and
+ \maketitlenamewidth was created as an alias forbackward compatibility.
version 1.1.0 (29 Jul 2012)
- - fixed the switching from letter to resume, correcting spacing errors when a
- letter is typeset before the resume, as noticed by U. Gabor.
- - fixed the vertical alignment of the footers, as reported by T. Homa.
- Footers are now aligned to the bottom and the letter and cv footers are
- perfectly aligned in the "casual" style.
- - prepared moderncv for fontspec font loading (still commented in code).
- - changed the handling of the "sans" and "roman" class options, to be reflected
- at the beginning of the document and override style font choices.
- - turned unicode support in hyperref on by default.
- - tweaked the use of \textbullet to avoid the fall-back to Computer Modern
- fonts and prepared the use of symbols from the MarVoSym font for fontspec
- (LauLaTeX or XeLaTeX).
- - tweaked the \subsectionfill of the "banking" style to distribute extra space
- evenly between leaders.
- - added two options to change the "Enclosure" string used for the letter
- enclosure: either specify another string as optional argument to \enclosure,
- or redefine \enclname, as suggested by D. Wille.
+- Fixed the switching from letter to resume, correcting spacing errors when a
+ letter is typeset before the resume, as noticed by U. Gabor.
+- Fixed the vertical alignment of the footers, as reported by T. Homa. Footers
+ are now aligned to the bottom and the letter and CV footers are perfectly
+ aligned in the casual style.
+- Prepared moderncv for fontspec font loading (still commented out in code).
+- Changed the handling of the "sans" and "roman" class options, to be reflected
+ at the beginning of the document and override style font choices.
+- Turned unicode support in hyperref on by default.
+- Tweaked the use of \textbullet to avoid a fallback to Computer Modern fonts
+ and prepared the use of symbols from the MarVoSym font for fontspec (LuaTeX or
+ XeTeX).
+- Tweaked the \subsectionfill of the banking style to distribute extra space
+ evenly between leaders.
+- Added two options to change the "Enclosure" string used for the letter
+ enclosure: either specify another string as an optional argument to \enclosure
+ or redefine \enclname, as suggested by D. Wille.
version 1.0.0 (26 Mar 2012)
- - added commands to generate letters for every resume style: \recipient, \date,
- \opening, \closing, \enclosure, \makelettertitle and \makeletterclosing. The
- old \maketitle and \makefooter commands are now deprecated and replaced by
- \makecvtitle and \makecvfooter.
- - changed the alignment algorithm for the personal data display in the oldstyle
- style, as to align on the baseline of the first line with the surrounding text.
+- Added commands to generate letters for every resume style: \recipient, \date,
+ \opening, \closing, \enclosure, \makelettertitle and \makeletterclosing. The
+ old \maketitle and \makefooter commands are now deprecated and replaced by
+ \makecvtitle and \makecvfooter.
+- Changed the alignment algorithm for the personal data display in the oldstyle
+ style, to align on the baseline of the first line with the surrounding text.
version 0.19.0 (06 Feb 2012)
- - reintroduced the ability to force the width reserved to display the name
- in the resume header for the classic style (\maketitlenamewidth).
- - improved the pdf metadata, as reported by S. Wunsch (launchpad bug #922476).
- - fixed a footersymbol bug in the casual style when no mobile number was given,
- as reported by S. Wunsch (launchpad bug #922470).
- - fixed a display bug when an address was given without postcode/city, as
- reported by O. Shaneh (launchpad bug #670263).
+- Reintroduced the ability to force the width reserved to display the name in
+ the resume header for the classic style (\maketitlenamewidth).
+- Improved the PDF metadata, as reported by S. Wunsch (launchpad bug #922476).
+- Fixed a \footersymbol bug in the casual style when no mobile number was given,
+ as reported by S. Wunsch (launchpad bug #922470).
+- Fixed a display bug when an address was given without postcode/city, as
+ reported by O. Shaneh (launchpad bug #670263).
version 0.18.0 (05 Feb 2012)
- - corrected the handling of pdf bookmarks, as suggested on stackexchange by
- U. Fischer.
- - improved the spacing between sections and subsections by using \addvspace
- instead of \vspace.
- - corrected the spacing between entries with nested itemize environments
- (temporary solution working only for single line items).
- - added a check in the oldstyle style for an empty 4th argument in the
- \cvdoubleitem definition, to avoid printing a colon without preceding label.
- - added a new style on top of classic, casual and oldstyle: banking.
+- Corrected the handling of PDF bookmarks, as suggested on stackexchange by
+ U. Fischer.
+- Improved the spacing between sections and subsections by using \addvspace
+ instead of \vspace.
+- Corrected the spacing between entries with nested itemize environments
+ (temporary solution working only for single line items).
+- Added a check in the oldstyle style for an empty 4th argument in the
+ \cvdoubleitem definition to avoid printing a colon without a preceding label.
+- Added a new style on top of classic, casual and oldstyle: banking.
version 0.17.0 (25 Jan 2012)
- - changed the footer algorithm of style casual to avoid starting lines with
- the footer symbol.
- - aligned the space before and after the title across styles.
- - added an optional title to the casual style.
- - changed the definition of the font styles to avoid undesired extra spacing.
- - added a Spanish template, kindly provided by I. Buitrón.
- - corrected the vertical misalignment between the page number and the center
- footer in the casual style.
+- Changed the footer algorithm of the casual style to avoid starting lines with
+ the footer symbol.
+- Aligned the space before and after the title across styles.
+- Added an optional title to the casual style.
+- Changed the definition of the font styles to avoid undesired extra spacing.
+- Added a Spanish template, kindly provided by I. Buitrón.
+- Corrected the vertical misalignment between the page number and the center
+ footer in the casual style.
version 0.16.0 (15 Jan 2012)
- - added starred versions of \section and \subsection (that are identical to
- their non-starred version, to e.g. enable biblatex support as requested by
- S. Verberkt (launchpad bug #913102).
- - corrected a misalignment of the colored rule in front of the section titles
- in the classic and casual styles, as reported by P. Neidhardt (launchpad bug
- #915910).
+- Added starred versions of \section and \subsection that are identical to their
+ non-starred versions (e.g. to enable BibLaTeX support) as requested by
+ S. Verberkt (launchpad bug #913102).
+- Corrected a misalignment of the colored rule in front of the section titles in
+ the classic and casual styles, as reported by P. Neidhardt (launchpad bug
+ #915910).
version 0.15.1 (23 December 2011)
- - corrected a bug in the classic style causing the address font and color not
- being carried over newlines, as reported by J. Smith.
+- Corrected a bug in the classic style causing the address font and color to not
+ be carried over newlines, as reported by J. Smith.
version 0.15.0 (19 December 2011)
- - corrected list spacing.
- - corrected inconsistent use of sans serif fonts in roman layout option.
- - the lmodern fonts are now automatically loaded only if installed on the
- system. The "nolmodern" option is now therefore obsolete.
- - complete code refactoring separating themes in separate styles and colors.
- - renamed \cvline to \cvitem, \cvlanguage to \cvitemwithcomment and \cvcomputer
- to \cvdoubleitem (the old command name still work and redirect to the new ones,
- but are deprecated).
- - removed the arbitrary minipage widths of skill proficiency vs comment in
- \cvitemwithcomments. The skill proficiency is now typeset exactly as given
- (i.e. one one line if no linebreaks are implicitly given) and the comment uses
- the remaining horizontal space.
- - changed the optional argument of \cvlistitem and \cvlistdoubleitem to specify
- the vertical skip after the item (as for \cvitem, cvitemwithcomments, etc).
- The way to change the list symbol is to redefine \listitemsymbol.
- - added a new style on top of classic and casual: oldstyle.
- - loaded the microtype package to improve typography.
+- Corrected list spacing.
+- Corrected inconsistent use of sans serif fonts in roman layout option.
+- The lmodern fonts are now automatically loaded only if they're installed on
+ the system. The "nolmodern" option is now therefore obsolete.
+- Completed code refactoring separating themes in separate styles and colors.
+- Renamed \cvline to \cvitem, \cvlanguage to \cvitemwithcomment and \cvcomputer
+ to \cvdoubleitem (the old command names still work and redirect to the new
+ ones, but are deprecated).
+- Removed the arbitrary minipage widths of skill proficiency vs comment in
+ \cvitemwithcomments. The skill proficiency is now typeset exactly as given
+ (i.e. one one line if no linebreaks are implicitly given) and the comment uses
+ the remaining horizontal space.
+- Changed the optional argument of \cvlistitem and \cvlistdoubleitem to specify
+ the vertical skip after the item (as for \cvitem, \cvitemwithcomments, etc).
+ The way to change the list symbol is to redefine \listitemsymbol.
+- Added a new style on top of classic and casual: oldstyle.
+- Loaded the microtype package to improve typography.
version 0.14.0 (04 December 2011)
- - added support for CJK, thanks to the help of P. D'Apice.
- - the use of \recomputelengths after modifying any length in the preamble is
- now unnecessary; \recomputelength is automatically called at the start of the
- document.
+- Added support for CJK, thanks to the help of P. D'Apice.
+- The use of \recomputelengths after modifying any length in the preamble is now
+ unnecessary; \recomputelength is automatically called at the start of the
+ document.
version 0.13.1 (11 November 2011)
- - corrected a bug introduced by v0.13 in the classic style when no \photo is
- used, as reported by S. Gislais (launchpad bug #888702).
+- Corrected a bug introduced by v0.13 in the classic style when no \photo is
+ used, as reported by S. Gislais (launchpad bug #888702).
version 0.13.0 (06 November 2011)
- - added a "black" color option to render the resume in black & white, as
- suggested by F. Bicarri.
- - removed the pdflatex option when loading hyperref to enable other engines
- (e.g., dvips, xetex), leftover from the v 0.11 cleanup, as reported by
- K. Amaterasu and P. Mavrogiorgos (launchpad bugs #754693 and #859834).
- - added a "purple" color option, as proposed by B. Ravel.
- - added a 3rd optional argument to the \photo command to control the thickness
- of the framebox. Setting it to 0pt will disable the frame around the photo, as
- requested by T. Krennwallner (launchpad bug #664568).
+- Added a "black" color option to render the resume in black & white, as
+ suggested by F. Bicarri.
+- Removed the pdflatex option when loading hyperref to enable other engines
+ (e.g., dvips, XeTeX), leftover from the v0.11 cleanup, as reported by
+ K. Amaterasu and P. Mavrogiorgos (launchpad bugs #754693 and #859834).
+- Added a "purple" color option, as proposed by B. Ravel.
+- Added a 3rd optional argument to the \photo command to control the thickness
+ of the framebox. Setting it to 0pt will disable the frame around the photo, as
+ requested by T. Krennwallner (launchpad bug #664568).
version 0.12.0 (03 August 2010)
- - prevented pagebreaks after sections and subsections (launchpad bug #409902),
- as originally reported by C. Gaspoz and fixed by launchpad user tentotwo).
+- Prevented pagebreaks after sections and subsections (launchpad bug #409902),
+ as originally reported by C. Gaspoz and fixed by launchpad user tentotwo.
version 0.11.0 (20 July 2010)
- - removed the \ifpdf check when loading the graphicx package, as graphicx does
- does check internally and this was preventing proper functionning with xelatex
- and luatex, as reported by A. Trautmann. The same check was also removed
- everywhere else in the document (i.e. when loading the color and hyperref
- packages).
+- Removed the \ifpdf check when loading the graphicx package, as graphicx
+ already does this check internally. This was preventing proper functioning
+ with XeTeX and LuaTeX, as reported by A. Trautmann. The same check was also
+ removed everywhere else in the document (i.e. when loading the color and
+ hyperref packages).
version 0.10.0 (13 June 2010)
- - fixed a compatibility issue with the natbib package (natbib uses \section*
- to format the bibliography title, while only \section was defined by
- moderncv), as reported on launchpad (launchpad bug #393920).
- - fixed a compatibility issues with (any package relying on) the etoolbox
- package, due to the double definition of \AtEndPreamble, as reported by
- D. Becker.
+- Fixed a compatibility issue with the natbib package (natbib uses \section* to
+ format the bibliography title, while only \section was defined by moderncv),
+ as reported on launchpad (launchpad bug #393920).
+- Fixed compatibility issues with (any package relying on) the etoolbox package,
+ due to the double definition of \AtEndPreamble, as reported by D. Becker.
version 0.9.0 (31 May 2010)
- - added support for the itemize, enumerate and description environments.
+- Added support for the itemize, enumerate and description environments.
version 0.8.0 (24 May 2010)
- - added support for multibib. Also modified the template to illustrate how to
+- Added support for multibib. Also modified the template to illustrate how to
show labels in the bibliography, as requested by Tom D. R. and Stefan K.
- - added a command to indicate your personal homepage (\homepage{url}), as
+- Added a command to indicate your personal homepage (\homepage{url}), as
requested by J. de Jong and A. Pairet.
- - corrected an alignment bug for text following a \quote with no immediate
+- Corrected an alignment bug for text following a \quote with no immediate
\section, as kindly reported by J. Vermeulen and L. Saliou.
- - corrected a spacing bug when no blank line (or \par) is left after
- \maketitle. Thanks to A. Menzel for reporting the strange behaviour.
- - corrected the alignment of the extrainfo title part when no picture was
- used, as reported by M. Bana.
- - corrected the missplacement of pdf bookmarks as noticed by L. Fortunato.
- - corrected several bugs linked to the code for checking for empty arguments
- in \cventry, as reported by B. Ekran (launchpad bug #268768), L. Păncescu and
+- Corrected a spacing bug when no blank line (or \par) is left after \maketitle.
+ Thanks to A. Menzel for reporting the strange behaviour.
+- Corrected the alignment of the \extrainfo title part when no picture was used,
+ as reported by M. Bana.
+- Corrected the misplacement of PDF bookmarks as noticed by L. Fortunato.
+- Corrected several bugs linked to the code for checking for empty arguments in
+ \cventry, as reported by B. Ekran (launchpad bug #268768), L. Păncescu and
E. Gregorio.
version 0.7.0 (17 June 2008)
- - corrected an outstanding spacing bug (space between cvlines longer
- than 1 line).
- - removed the need to use \closesection and \emptysection as internal
- tabulars are now always closed. This allows she use of bibliography packages
- such as bibunits. Thanks to S. Busch for pointing out the incompatibility and
- helping testing out the bug correction.
- - changed the definition of \photo: the first (optional) argument should
- give the desired width of the picture, instead of its height
- - corrected an alignment bug for \cvlistitems longer than 1 line, as
- reported by S. Nikolopoulos.
- - deprecated the commands \sethintscolumnlength and \sethintscolumntowidth.
+- Corrected an outstanding spacing bug where the space between cvlines was
+ longer than 1 line.
+- Removed the need to use \closesection and \emptysection as internal tabulars
+ are now always closed. This allows the use of bibliography packages such as
+ bibunits. Thanks to S. Busch for pointing out the incompatibility and helping
+ test out the bug correction.
+- Changed the definition of \photo: the first (optional) argument should give
+ the desired width of the picture, instead of its height
+- Corrected an alignment bug for \cvlistitems longer than 1 line, as reported by
+ S. Nikolopoulos.
+- Deprecated the commands \sethintscolumnlength and \sethintscolumntowidth.
Instead, just set \hintscolumnwidth to the desired length by using the regular
\setlength or \settowidth commands, and call \recomputelengths.
- - added the ability to control the width of the name placeholder in the
- classic theme, by setting the length \maketitlenamewidth. Again, don't forget
- to call \recomputelengths afterward.
+- Added the ability to control the width of the name placeholder in the classic
+ theme, by setting the length \maketitlenamewidth. Again, don't forget to call
+ \recomputelengths afterward.
version 0.6.0 (28 May 2007)
- - corrected some spacing bugs and cleaned up the code.
- - corrected a bug in the bibliography file of the examples spotted by
- U. Stöhr.
- - added color variants to the classic and casual style, as suggested by
+- Corrected some spacing bugs and cleaned up the code.
+- Corrected a bug in the bibliography file of the examples spotted by U. Stöhr.
+- Added color variants to the classic and casual styles, as suggested by
U. Stöhr.
- - added a page counter for resumes running longer than 1 page, as requested by
+- Added a page counter for resumes running longer than 1 page, as requested by
A. Martin. It can be disabled by the command \nopagenumbers{}.
- - added commands to include a mobile phone and fax number.
- - made the symbols used for the phone number, the email, ... customizable.
- To modify those symbols, just redefine \phonesymbol, emailsymbol, ...
- - corrected the pdf information given to hyperref as pointed out by
- C. Knuepfer.
- - rewrote the examples.
+- Added commands to include a mobile phone and fax number.
+- Made the symbols used for the phone number, the email etc. customizable. To
+ modify those symbols, just redefine \phonesymbol, \emailsymbol etc.
+- Corrected the PDF information given to hyperref as pointed out by C. Knuepfer.
+- Rewrote the examples.
version 0.5.0 (9 September 2006)
- - added a \photo command to display a picture. That command takes the name of
- the file with the picture as argument, and the desired height as optional
- argument.
- - implemented the needed commands to make moderncv compatible with BibTeX, as
+- Added a \photo command to display a picture. This command takes the name of
+ the file with the picture as a required argument and the desired height as an
+ optional argument.
+- Implemented the needed commands to make moderncv compatible with BibTeX, as
suggested by J. Lie. This makes it possible to display one's publications,
- stored in the BibTeX file 'publications.bib'
- by using:
+ stored in the BibTeX file "publications.bib" by using:
\nocite{*}
\bibliographystyle{plain}
\bibliography{publications}
- As usual, the name of the section title can be changed by redefining the
- command \refname.
- - added the \today command, useful for example if one need to add the date the
- resumé was produced with
+ As usual, the name of the section title can be changed by redefining \refname.
+- Added the \today command, useful for example if one needs to add the date the
+ resume was produced with:
\closesection{}
\vfill{\hfill{\scriptsize Produced \today.}}
at the end of your CV, as suggested by F. Hammann.
version 0.4.0 (2 May 2006)
- - removed the dependency on the geometry package, so that users can now invoke
- it themselve, and easily change the geometry of the page.
+- Removed the dependency on the geometry package so that users can now invoke it
+ themselves and easily change the geometry of the page.
version 0.3.0 (10 April 2006)
- - moderncv now uses the 'longtable' class, allowing cv sections to split
- across multiple pages.
- - the different lengths used by moderncv are now customizable! In particular,
- the first column (the one containing the date in the examples), can now be set
+- Moderncv now uses the longtable class, allowing CV sections to split across
+ multiple pages.
+- The different lengths used by moderncv are now customizable! In particular,
+ the first column (the one containing the date in the examples) can now be set
to any width, for people needing a smaller or larger one. To do that, either
use
\sethintscolumnlength{<length>},
@@ -374,33 +399,32 @@ version 0.3.0 (10 April 2006)
where <string> is a string of the desired length (usually, the longest string
that has to appear in the column). Thanks to A. Pöge for pointing out the need
of such a feature.
- - added the command \emptysection{}, which makes it possible to start a
- section without name. In combination with \closesection{}, this makes it
- possible to drop out of the layout of moderncv, and come back to it later.
- This should make the inclusion of arbitrary elements not covered by moderncv
- code possible.
- - corrected a spacing problem in the cventry command, as pointed out and
- solved by B. Eßmann.
+- Added the command \emptysection{}, which makes it possible to start an unnamed
+ section. In combination with \closesection{}, this makes it possible to drop
+ out of the layout of moderncv, and come back to it later. This should make the
+ inclusion of arbitrary elements not covered by moderncv code possible.
+- Corrected a spacing problem in the \cventry command, as pointed out and solved
+ by B. Eßmann.
version 0.2.0 (6 March 2006)
- - rewrite of the code to have the styles (fonts, colours, headers and footers)
+- Rewrite of the code to have the styles (fonts, colours, headers and footers)
be defined in different files than the class. The styles are now defined in a
separate file per style, named moderncvstyle<style_name>. It should now be
easy to write your own style, starting from moderncvstyleempty.sty. If you
feel you have created a nice style, just email it to me and I'll include it in
the next version.
- - due to the previous point, styles are now loaded by the command
+- Due to the previous point, styles are now loaded by the command
\moderncvstyle{style_name}. I couldn't figure out a way to preserve the old
"casual" and "classic" class options, so these are now broken! Use
\moderncvstyle{casual} or \moderncvstyle{classic} at the beginning of your
- document. This should be the only incompatibility with version 0.1.
- - added class option "nolmodern" for people without the latin modern fonts.
- - corrected some English mistakes in the examples. Thanks to M. H. Prager for
+ document. This should be the only incompatibility with v0.1.
+- Added class option "nolmodern" for people without the Latin Modern fonts.
+- Corrected some English mistakes in the examples. Thanks to M. H. Prager for
pointing them out.
- - added a \cvlistitem to produce items with a bullet (or whatever is defined
- in \listitemsymbol), and renamed \cvresume to \cvlistdoubleitem for
- consistency purpose. For compatibility reasons, the command \cvresume still
- works, but should be avoided.
+- Added a \cvlistitem to produce items with a bullet (or whatever is defined in
+ \listitemsymbol), and renamed \cvresume to \cvlistdoubleitem for consistency
+ purposes. For compatibility reasons, the command \cvresume still works, but
+ should be avoided.
version 0.1.0 (1 March 2006)
- - first release.
+- First release.
diff --git a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
index 15b86eccbcd..25ef872007c 100644
--- a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
+++ b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
@@ -1,15 +1,12 @@
-- When using the "fancy" style, undesired space is added between the bibliography
- head and the first entry, as well as after the last entry
-- Moderncv is incompatible with biblatex.
-- Footnotes generates errors (though the output seem correct when running with
- "-interaction=nonstopmode")
-- When using CJK, the last \clearpage required for fancyhdr to work properly kills
- the "lastpage" counter, hence also the page numbering.
-- Moderncv produces an error ("lonely \item--perhaps a missing list environment")
- when used with bibentry, through the output is actually correct. Amongst other,
- this causes compilation by LyX to stop.
-- The space after a cventry gets eaten up when the last argument contains a nested
- itemize environment. An ugly hack and incomplete solution was implemented by
- including a \strut in every item label, but this doesn't solve the problem for
- multi-line items. Ideally, the strut should end the item, but there seems to be
- no way to do this.
+- moderncv is incompatible with biber.
+- moderncv is incompatible with BibLaTeX.
+- moderncv is incompatible with babel in Spanish.
+
+- Skill matrices don't break automatically in fancy style.
+- Long names break the oldstyle style and possibly other styles (needs testing).
+- Long URLs in classic style can make the name break line. Fixed width for the address part must be implemented.
+- When using the fancy style, undesired space is added between the bibliography head and the first entry, as well as after the last entry.
+- Footnotes generate errors, but the output seems correct when running with "-interaction=nonstopmode"
+- When using CJK, the last \clearpage required for the fancyhdr package to work properly kills the "lastpage" counter, and therefore also the page numbering.
+- moderncv produces an error "lonely \item--perhaps a missing list environment" when used with the bibentry package, though the output is actually correct. Among other things, this causes compilation by LyX to stop.
+- The space after a \cventry gets eaten up when the last argument contains a nested itemize environment. An ugly hack and incomplete solution was implemented by including a \strut in every item label, but this doesn't solve the problem for multi-line items. Ideally, the \strut should end the item, but there seems to be no way to do this.
diff --git a/Master/texmf-dist/doc/latex/moderncv/README.md b/Master/texmf-dist/doc/latex/moderncv/README.md
index 1eb439d16be..19ff062daee 100644
--- a/Master/texmf-dist/doc/latex/moderncv/README.md
+++ b/Master/texmf-dist/doc/latex/moderncv/README.md
@@ -1,27 +1,44 @@
# moderncv
+[![Build template](https://github.com/moderncv/moderncv/actions/workflows/build-pdf.yml/badge.svg)](https://github.com/moderncv/moderncv/actions/workflows/build-pdf.yml)
+[![CTAN](https://img.shields.io/ctan/v/moderncv.svg)](https://www.ctan.org/pkg/moderncv)
+[![Matrix](https://img.shields.io/matrix/moderncv:matrix.org)](https://matrix.to/#/#moderncv:matrix.org)
+
## A modern curriculum vitae class for LaTeX
-**moderncv** provides a documentclass for typesetting curricula vitae in various styles. Moderncv aims to be both straightforward to use and customizable, providing five ready-made styles (classic, casual, banking, oldstyle and fancy) and allowing one to define his own by modifying colors, fonts, icons, etc.
+The `moderncv` package provides a document class for typesetting applications (curricula vitae and cover letters) in various styles. `moderncv` aims to be both straightforward to use and customizable, providing five ready-made styles (classic, casual, banking, oldstyle and fancy) and allowing you to define your own by modifying colors, fonts, icons, etc.
-Most commands are defined in such a way that arguments are optional.
+## Getting started
-Until a decent manual is written, one can always look in the `template.tex` file for an example. It can be compiled to pdf via `latexmk -pdf ./template.tex`.
+### Installation
+`moderncv` should already be included in your installed LaTeX distribution.
+If not, you can get the tarball of the package from [CTAN](https://www.ctan.org/pkg/moderncv).
+Alternatively, you can also build the package from source by cloning the its [GitHub repository](https://github.com/moderncv/moderncv) and compiling the included LaTeX files:
+```
+latexmk -pdf ./template.tex manual/moderncv_userguide.tex
+```
-If using [`academicons`](https://ctan.org/tex-archive/fonts/academicons) in the template, you need to use a Xe(La)TeX or Lua(La)TeX engine for them to render. Otherwise an alternative will be used automatically.
+### Usage
+To get started on your own CV, use and modify the template file `template.tex`.
+The user guide can be found in the folder `manual` and contains additional information on what the document class offers.
+Take a look at it to see if this package suits your needs.
-## Development
+If you are using the [`academicons`](https://ctan.org/tex-archive/fonts/academicons) package in the template, you will need to use a Xe(La)TeX or Lua(La)TeX engine to render the icons. Otherwise, an alternative icon package will be used automatically.
-[![Build template](https://github.com/moderncv/moderncv/actions/workflows/build-pdf.yml/badge.svg)](https://github.com/moderncv/moderncv/actions/workflows/build-pdf.yml)
-[![CTAN](https://img.shields.io/ctan/v/moderncv.svg)](https://www.ctan.org/pkg/moderncv)
-[![Matrix](https://img.shields.io/matrix/moderncv:matrix.org)](https://matrix.to/#/#moderncv:matrix.org)
+## Development
-As the main goal is to keep this package alive, it is maintained in a loosely structured team. You can contact us in our matrix room [moderncv:matrix.org](https://matrix.to/#/#moderncv:matrix.org), feel free to join if you have questions or want to contribute. Development takes places at [github.com/moderncv/moderncv](https://github.com/moderncv/moderncv).
+As the main goal is to keep this package alive, it is maintained in a loosely structured team.
+You can contact us in our matrix room [moderncv:matrix.org](https://matrix.to/#/#moderncv:matrix.org), feel free to join if you have questions or want to contribute.
+Development takes place at [github.com/moderncv/moderncv](https://github.com/moderncv/moderncv).
## Licence
-moderncv is licensed under the [LPPL-1.3c](https://spdx.org/licenses/LPPL-1.3c.html).
+
+`moderncv` is licensed under the [LPPL-1.3c](https://spdx.org/licenses/LPPL-1.3c.html).
## Origin
-Original author: Xavier Danaux <xdanaux@gmail.com><br/>
-Original repository: https://github.com/xdanaux/moderncv<br/>
-This repository is a fork aiming to maintain moderncv inside CTAN, since upstream is dead since 2016.
+
+Original author: Xavier Danaux <xdanaux@gmail.com>
+<br/>
+Original repository: https://github.com/xdanaux/moderncv
+
+This repository is a fork aiming to maintain `moderncv` inside CTAN, since upstream has been dead since 2016.
diff --git a/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.pdf b/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.pdf
index cadbefe3865..0468a22e0fd 100644
--- a/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.tex b/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.tex
index 26d2016178d..feb6f31f6fa 100644
--- a/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.tex
+++ b/Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.tex
@@ -1,462 +1,1071 @@
-%% moderncv_userguide.tex (compiled with pdfLaTeX)
-%% Copyright 2007 Cristina Sambo
+%% moderncv_userguide.tex as shipped with 2024-07-18 v2.4.1 modern curriculum vitae and letter document class (moderncv)
+%% 2021 David Seus, cryptointerest@posteo.de
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
% available at http://www.latex-project.org/lppl/.
-\documentclass[a4paper,11pt]{article}
+\documentclass[a4paper, 11pt]{article}
-\title{\bfseries Moderncv -- v. 0.6}
-\author{Package by Xavier Danaux \\ \begin{small}Documentation by Cristina Sambo \end{small}}
-\date{}
+\title{%
+ \texttt{moderncv} User Guide\\
+ {\small Package v2.4.1}%
+}
+% Cristina Sambo,
+\author{%
+ Package by Xavier Danaux\\
+ and\\
+ moderncv community\\
+ {\small Documentation by David Seus}%
+}
+\date{\today}
-%language and encoding options
+% Language and encoding options
\usepackage[english]{babel}
+\usepackage{ifxetex, ifluatex}
+\newif\ifxetexorluatex
+\ifxetex
+ \xetexorluatextrue
+\else
+ \ifluatex
+ \xetexorluatextrue
+ \else
+ \xetexorluatexfalse
+ \fi
+\fi
+
+% PDFLaTeX or LUALaTeX/XeLaTeX
+\ifxetexorluatex
+ % \usepackage{luatextra}
+ % \usepackage{lualatex-math}
+ \usepackage{shellesc} % Fix a bug for lualatex shellescape
+ % \usepackage{unicode-math}
+ % \setmathfont{xits-math.otf}
+\else
+ \usepackage[utf8]{inputenx} % Uncomment if using pdflatex, comment if using lualatex
+\fi
+\PassOptionsToPackage{T1}{fontenc} % T2A for Cyrillic
\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%font options
+% Font options
\usepackage{txfonts}
\usepackage{marvosym}
\usepackage{pifont}
-%margins, spacing and page layout
-\usepackage[pdftex,colorlinks=true]{hyperref} %(hyperref must be loaded before geometry)
-\usepackage[pdftex]{geometry}
+% Margins, spacing and page layout
+\usepackage[pdftex, colorlinks=true]{hyperref} % hyperref must be loaded before geometry
+\usepackage[pdftex, marginparwidth=50pt]{geometry}
\geometry{top=2.5cm, bottom=3cm}
-\setlength{\parindent}{0pt} %(to soppress indentation when starting a new paragraph)
-\frenchspacing %(to soppress additional space after a full stop)
-
-%packages
-\usepackage[pdftex]{graphicx}
-\usepackage[pdftex]{xcolor}
-\usepackage[labelfont=sl,font=small,width=0.9\textwidth]{caption}
+\usepackage{parskip} % Replace paragraph indentation with vertical spacing
+\frenchspacing % Suppress additional space after a full stop
+\renewcommand{\arraystretch}{1.1}
+
+% Packages
+\usepackage{graphicx}
+\usepackage{xcolor}
+\usepackage[labelfont=sl, font=small, width=0.9\textwidth]{caption}
\usepackage{marvosym}
\usepackage{latexsym}
-
-%pdfLaTeX options
-\pdfpagewidth=\paperwidth
-\pdfpageheight=\paperheight
-\pdfimageresolution=150
-\pdfinfo{
- /Title (Moderncv -- v. 0.6)
- /Author (Cristina Sambo)
- /Subject (Moderncv package user's guide)
- /Keywords (curriculum vitae, LaTeX)
+\usepackage{url}
+\usepackage{scrhack} % Fix warnings when using KOMA with listings package
+\usepackage{xspace} % Fix spacing after macros
+\usepackage{mparhack} % Fix marginpar
+\usepackage{microtype}
+\usepackage{multicol} % Multicolumn text for long lists
+
+% Code listings
+\usepackage{listings}
+% \lstset{emph={trueIndex, root}, emphstyle=\color{BlueViolet}}% \underbar} % Special keywords
+\lstset{%
+ language=[LaTeX]Tex, % C++,
+ morekeywords={PassOptionsToPackage, selectlanguage},
+ keywordstyle=\color{cvblue}, % \bfseries,
+ basicstyle=\small\ttfamily,
+ % identifierstyle=\color{NavyBlue},
+ commentstyle=\color{gray}\ttfamily,
+ stringstyle=\rmfamily,
+ numbers=none, % left,
+ numberstyle=\scriptsize, % \tiny
+ stepnumber=5,
+ numbersep=8pt,
+ showstringspaces=false,
+ breaklines=true,
+ % frameround=ftff,
+ % frame=single,
+ belowcaptionskip=0.75\baselineskip,
+ % frame=L,
+ emph={
+ cvitem, cventry, cvdoubleentry, cvdoubleitem, cvtripleitem, cvlistitem, cvlistdoubleitem, cvcolumns, moderncvstyle, moderncvcolor,
+ cvskill, cvskilllegend, cvskillplainlegend, cvskillhead, cvskillentry, nopagenumbers,
+ name, born, address, email, link, social, phone, homepage, extrainfo, photo, quote, section, subsection, setlength, NewDocumentCommand, definecolor, colorlet, cvitemwithcomment,
+ recipient, subject, opening, closing, signature, enclosure
+ },
+ emphstyle={\color{cvblue}},
+ emph={[2]
+ familydefault, sfdefault, rmdefault, inputenc, moderncv, document, bibliographyitemlabel,
+ addresssymbol, mobilephonesymbol, fixedphonesymbol, faxphonesymbol, emailsymbol, homepagesymbol, linkedinsocialsymbol,
+ xingsocialsymbol, twittersocialsymbol, githubsocialsymbol, gitlabsocialsymbol,
+ stackoverflowsocialsymbol, bitbucketsocialsymbol, skypesocialsymbol, orcidsocialsymbol, researchgatesocialsymbol, arxivsocialsymbol, inspiresocialsymbol,
+ researcheridsocialsymbol, telegramsocialsymbol, whatsappsocialsymbol, signalsocialsymbol, matrixsocialsymbol, googlescholarsocialsymbol, cvstretchability, bornsymbol
+ },
+ emphstyle={[2]\color{cvblue!60!cvgrey}\bfseries},
+ literate={{é}{{\'e}}1},
}
-%my commands
-\definecolor{bluecv}{rgb}{0.25,0.5,0.75}
-\definecolor{greencv}{rgb}{0.55,0.85,0.35}
-\definecolor{redcv}{rgb}{1.00,0.30,0.30}
-\definecolor{orangecv}{rgb}{1,0.65,0.20}
-\definecolor{greycv}{rgb}{0.75,0.75,0.75}
+% Hyperlinks
+\usepackage{hyperref}
+\hypersetup{
+ unicode=true,
+ % draft, % Draft mode for printing (see below)
+ colorlinks=true, linktocpage=true, pdfstartpage=3, pdfstartview=FitV,
+ % colorlinks=false, linktocpage=false, pdfstartpage=3, pdfstartview=FitV, pdfborder={0 0 0}, % Black links (e.g., for printing)
+ breaklinks=true, pageanchor=true,
+ pdfpagemode=UseNone,
+ % pdfpagemode=UseOutlines,
+ plainpages=false, bookmarksnumbered, bookmarksopen=true, bookmarksopenlevel=1,
+ hypertexnames=true, pdfhighlight=/O, % nesting=true, frenchlinks,
+ urlcolor=cvblue, linkcolor=cvblue, citecolor=cvblue, % pagecolor=RoyalBlue,
+ % urlcolor=Black, linkcolor=Black, citecolor=Black, % pagecolor=Black,
+ % pdfborder={0 0 1}, % Width of PDF link border 0 0 1, 0 0 0 = colorlinks
+ % linkbordercolor=gray!15,
+ % citebordercolor=green!15,
+}
-%==================
+% Colors
+\definecolor{cvblue}{rgb}{0.22, 0.45, 0.70}
+\definecolor{cvgreen}{rgb}{0.35, 0.70, 0.30}
+\definecolor{cvred}{rgb}{0.95, 0.20, 0.20}
+\definecolor{cvorange}{rgb}{0.95, 0.55, 0.15}
+\definecolor{cvgrey}{rgb}{0.75, 0.75, 0.75}
+\definecolor{cvburgundy}{rgb}{0.596078, 0, 0} % burgundy: 139/255 (0.545098) or 152/255 (0.596078)
+\definecolor{cvgrey}{rgb}{0.55, 0.55, 0.55}
+\definecolor{cvpurple}{rgb}{0.50, 0.33, 0.80}
+
+% Macros
+\newcommand{\todo}[1]{\marginpar{\raggedright \textcolor{red}{[\textbf{TODO:} #1]}}}
+\newcommand{\todox}[1]{\textcolor{red}{[\textbf{TODO:} #1]}}
+\newcommand{\note}{\paragraph{Note.}}
+\newcommand{\code}[1]{\lstinline!#1!}
+\newcommand{\moderncv}{\code{moderncv}}
+\newcommand{\Moderncv}{\moderncv~}
+\newcommand{\github}{GitHub}
+\newcommand{\Github}{\github~}
+\newcommand{\ctan}{CTAN}
+\newcommand{\Ctan}{\ctan~}
+\newcommand{\cvtemplate}{\code{template.tex}}
+\newcommand{\Cvtemplate}{\cvtemplate~}
+\newcommand{\Latex}{\LaTeX~}
+\newcommand{\biblatex}{BibLaTeX}
+\newcommand{\Biblatex}{\biblatex~}
+\newcommand{\cvdoccolorbox}[1]{{\color{#1}\rule{4ex}{2ex}}}
+\newcommand{\moderncvGithub}{\url{https://github.com/moderncv/moderncv}}
+\newcommand{\moderncvCtan}{\url{https://ctan.org/pkg/moderncv}}
+
+
+
+
+
+% ==================
% DOCUMENT BEGINNING
-%==================
+% ==================
\begin{document}
\maketitle
-
\begin{abstract}
-\noindent \texttt{Moderncv}, as its author says in the readme file, provides a documentclass for typesetting modern curriculum vitaes in various styles. It is fairly customizable, allowing you to define your own style by changing the colors, the fonts, \dots\ and provides two default styles: classic and casual.
+ \noindent
+ The \Moderncv package provides a document class for typesetting modern curriculum vit\ae{} and cover letters in various styles.
+ Five predefined styles are available, each of which can be adjusted through various options for headings, footers and colors.
+ It is fairly customizable, allowing the user to adjust the look and feel of each style to their liking.
+ Several macros allow the user to add content to the CV and format it in a consistent way.
+ A letter of motivation consistent with the style is part of the template as well.
\end{abstract}
+\tableofcontents
+
-\section{Introduction}
-When I saw for the first time this class I was amazing: ``Here it is what I need'', I thought. Using the very clear examples, was easy to make my first curriculum.
-Indeed the class is very simple to use, in this documentation I will only put together all the things to help users to have all on hand.
-
-\smallskip
-\texttt{Moderncv} requires the following packages: \texttt{ifthen}, \texttt{ifpdf}, \texttt{color}, \texttt{lmodern}, \texttt{marvosym}, \texttt{url}, \texttt{hyperref}, \texttt{longtable}, \texttt{graphicx}, \texttt{fancyhdr}, usually all just included in the \LaTeX\ distributions.
-
-\section{In the preamble}
-
-At the very beginning of your preamble (that is the part before \verb|\begin{document}|) insert:
-
-\begin{verbatim}
-\documentclass[<options>]{moderncv}
-\end{verbatim}
-
-where the options are:
-
-\begin{description}
- \item[paper size options:] \texttt{a4paper}, \texttt{a5paper}, \texttt{b5paper}, \texttt{letterpaper}, \texttt{legalpaper}, \texttt{ex\-ec\-u\-tive\-pa\-per}, \texttt{landscape}
- \item[font size options:] \texttt{10pt}, \texttt{11pt}, \texttt{12pt}
- \item[font option:] \texttt{nolmodern}, for people without the latin modern fonts
- \item[color option:] \texttt{nocolor}, to have all in black and white
- \item[draft/final options:] \texttt{draft}, \texttt{final}
-\end{description}
-
-The default options are: \texttt{a4paper}, \texttt{11pt}, \texttt{color}, \texttt{final}.
-
-After the documentclass specification, choose the theme for your curriculum vit\ae:
-
-\begin{verbatim}
-\moderncvtheme[<options>]{casual}
-\end{verbatim}
-
-which is the default theme, or
-
-\begin{verbatim}
-\moderncvtheme[<options>]{classic}
-\end{verbatim}
-
-where the theme options are:
-
-\begin{description}
- \item[color options:] you can choose between five color:
- \begin{itemize}
- \item[\texttt{blue}] {\color{bluecv}\rule{1cm}{2ex}} (default color)
- \item[\texttt{green}] {\color{greencv}\rule{1cm}{2ex}}
- \item[\texttt{red}] {\color{redcv}\rule{1cm}{2ex}}
- \item[\texttt{orange}] {\color{orangecv}\rule{1cm}{2ex}}
- \item[\texttt{grey}] {\color{greycv}\rule{1cm}{2ex}}
- \end{itemize}
- \item[roman option:] \texttt{roman}, for {\fontsize{11}{12} \usefont{T1}{lmr}{m}{n}\selectfont roman} fonts, instead of \fontsize{11}{12} \usefont{T1}{lmss}{m}{n}\selectfont sans serif fonts.
-\end{description}
-
-Then you have to specify the character encoding (utf8, latin1, and so on):
-
-\begin{verbatim}
-\usepackage[<your encoding>]{inputenc}
-\end{verbatim}
-
-and you can adjust the page geometry:
-
-\begin{verbatim}
-\usepackage[<options>]{geometry}
-\recomputelengths
-\end{verbatim}
-
-where \verb|\recomputelengths| is required when changes are made to page layout lengths.
-
-Now we can get into the part most related to our curriculum vit\ae: our personal data. They will be inserted in the header of the first page, in the classic theme, or in the footer of every page, in the case of casual theme.
-
+
+\section{Getting started}
+\subsection{How to read this manual}
+This manual is organized as follows.
+The current section explains on how to get started with the \Moderncv package, i.e. how to install required packages.
+% \emph{Note that it is assumed that you know how to install \Latex packages in case some are missing.}
+Section \ref{section:moderncvTemplate} explains how to work with the \Moderncv template file step by step.
+Section \ref{section:customization} details the customizations that the user can make: the different styles, their options, colors and tips and tricks.
+Section \ref{section:implementationDetails} details the packages that \Moderncv uses, known problems and possible solutions to those problems.
+
+\subsection{Installation instructions}
+If the \Moderncv package does not ship with your \Latex distribution or if the installed version is too old, grab the \Moderncv code from \Ctan or \github:
+
+\begin{tabular}{l}
+ \moderncvCtan \\% [.5ex]
+ \moderncvGithub
+\end{tabular}
+
+\note Depending on your \Latex distribution, you may have to install some additional packages.
+Section \ref{section:implementationDetails:requiredPackages} lists all the packages that \Moderncv requires to be installed on your system.
+
+
+
+\section{The \texttt{moderncv} template step by step}
+This section is a quick reference to the \Moderncv package and should contain enough information to typeset a first working CV.
+\label{section:moderncvTemplate}
+The easiest way to get started with \Moderncv is to use the template that comes with the package.
+If \Moderncv is part of your \Latex distribution, search for the folder \Moderncv on your system, which should contain all the files for the package.
+In this folder, there should be a file called \cvtemplate.
+If you downloaded the package from \Github or \ctan, look for \Cvtemplate in the folder of the newly downloaded (and possibly extracted) package.
+
+\note If you downloaded \Moderncv from \Github or \Ctan and moved \Cvtemplate to another folder, make sure to adjust the \code{TEXINPUTS} variable to find the newly downloaded package.
+Otherwise, either the package version provided by your \Latex distribution gets used or \Latex throws an error if there is no other version installed.
+
+Test your setup by compiling \Cvtemplate and looking at the result.
+
+\note The \Moderncv package should compile with \code{pdflatex}, \code{lualatex} and \code{xelatex}.
+However, not all icons are available when using \code{pdflatex}, so using either \code{lualatex} or \code{xelatex} \emph{is highly recommended.}
+
+\subsection{Basic setup}
+A document using the \Moderncv document class is set up like any other document class.
+We will go through the template step by step.
+
+\subsubsection*{Configuring document class options}
+The \Moderncv document class is loaded as per usual, by
+\begin{lstlisting}
+ \documentclass[<options>]{moderncv}
+\end{lstlisting}
+where at most one value for each option can be passed to the document class:
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.55\textwidth}}
+ \textbf{\code{paper}:} & \code{a4paper} (default), \code{a5paper}, \code{b5paper}, \code{letterpaper},
+ \code{legalpaper}, \code{executivepaper}, \code{landscape} \\
+ \textbf{\code{font family}:} & \code{sans}, \code{roman} \\
+ \textbf{\code{font size}:} & \code{10pt}, \code{11pt} (default), \code{12pt} \\
+ \textbf{\code{draft/final}:} & \code{draft}, \code{final} (default)
+\end{tabular}
+
+\subsubsection*{Choosing a \texttt{moderncv} style and color}
+Choose a \Moderncv style and color by adjusting the commands
+\begin{lstlisting}
+ \moderncvstyle{<style>}
+ \moderncvcolor{<color>}
+\end{lstlisting}
+As explained in \cvtemplate, the possible values are
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.65\textwidth}}
+ \textbf{\code{style}:} & \code{casual} (default), \code{classic}, \code{banking}, \code{oldstyle},
+ \code{fancy} \\
+ \textbf{\code{color}:} & \code{black} \cvdoccolorbox{black}, \code{blue} \cvdoccolorbox{cvblue} (default), \code{burgundy} \cvdoccolorbox{cvburgundy}, \code{green} \cvdoccolorbox{cvgreen}, \code{grey} \cvdoccolorbox{cvgrey}, \code{orange} \cvdoccolorbox{cvorange}, \code{purple} \cvdoccolorbox{cvpurple}, \code{red} \cvdoccolorbox{cvred}
+\end{tabular}
+
+\note Some of the styles take additional options to fine-tune their appearance.
+To keep this overview short, these options will be described in section \ref{section:customization:stylesAndOptions}.
+
+\subsubsection*{Font family and page numbering}
+The default font family is set by the line \code{\\renewcommand\{\\familydefault\}\{\\sfdefault\}} in \cvtemplate.
+Use \code{\\sfdefault} for the default sans-serif font, \code{\\rmdefault} for the default roman font, and likewise for any \TeX{} font name.
+The general syntax is
+\begin{lstlisting}
+ \renewcommand{\familydefault}{<fontfamily>}
+ % \nopagenumbers{}
+\end{lstlisting}
+Uncommenting \code{\%\\nopagenumbers\{\}} suppresses automatic page numbering for CVs longer than one page.
+
+\subsubsection*{Adjusting input encoding}
+If you are not using \code{xelatex} or \code{lualatex}, which both use \code{utf8} encoding by default, uncomment the \code{\\usepackage[utf8]\{inputenc\}} import and change the encoding as needed.
+
+\subsubsection{Language-specific setup}
+The \code{babel} package can be loaded in the preamble of your CV.
+
+\note \Moderncv doesn't work with \code{babel} in Spanish (see this \href{https://github.com/moderncv/moderncv/issues/103}{GitHub issue}).
+
+For CJK users, uncomment the \code{\\usepackage\{CJKutf8\}} import.
+
+\subsection{Personal data}
+Edit the personal data section to reflect your personal information.
+This data will appear in the header of the first page of the CV and/or in the footer of every page, as well as on the cover letter.
+Most of the commands are optional, so try out what you like and see what you need.
+
+\paragraph{\code{\\name}}
+A command for your name. Takes the given name and surname as arguments.
+\begin{lstlisting}
+ \name{<given name>}{<surname>}
+\end{lstlisting}
+
+\paragraph{\code{\\title}}
+A command for a document title. Could be used for a generic CV title, job title, etc.
+\begin{lstlisting}
+ \title{<title>}
+\end{lstlisting}
+
+\paragraph{\code{\\born}}
+A command for a birth date.
+\begin{lstlisting}
+ \born{<birth date>}
+\end{lstlisting}
+
+\paragraph{\code{\\address}}
+A command for a three-lined street address.
+\begin{lstlisting}
+ \address{<street address>}{<city and postcode>}{<country>}
+\end{lstlisting}
+
+\paragraph{\code{\\phone}}
+A command for a phone number. Takes the phone type as an optional argument.
+\begin{lstlisting}
+ \phone[<type>]{<phone number>}
+\end{lstlisting}
+The allowed values for \code{<type>} are \code{fax}, \code{fixed} and \code{mobile}.
+
+\paragraph{\code{\\email}}
+A command for an email address.
+\begin{lstlisting}
+ \email{<email address>}
+\end{lstlisting}
+
+\paragraph{\code{\\homepage}}
+A command for a personal website.
+\begin{lstlisting}
+ \homepage{<web address>}
+\end{lstlisting}
+
+\paragraph{\code{\\social}}
+A command for a social media account.
+Takes the platform as an optional argument.
+\begin{lstlisting}
+ \social[<platform>]{<username or handle>}
+\end{lstlisting}
+The following values are supported for \code{<platform>}:
\begin{itemize}
-\item \verb|\firstname{John}|
-\item \verb|\familyname{Doe}|
-\item \verb|\title{Resum\'e title}|: optional
-\item \verb|\address{street and number}{postcode city}|: optional
-\item \verb|\mobile{mobile}|: optional
-\item \verb|\phone{phone}|: optional
-\item \verb|\fax{fax}|: optional
-\item \verb|\email{email}|: optional
-\item \verb|\extrainfo{additional information}|: optional; here you can put, for example, the address of your website
-\item \verb|\photo[64pt]{picture}|: optional; \texttt{64pt} is the height the picture, you can set here the size you prefer; \texttt{picture} is the name of the picture file
-\item \verb|\quote{Some quote}|: optional
-\end{itemize}
-
-Finally you can suppress automatic page numbering for CVs longer than one page:
-
-\begin{verbatim}
-\nopagenumbers{}
-\end{verbatim}
-
-\subsection{Examples}
-
-In practice, you will type:
-
-\begin{verbatim}
-\documentclass[11pt,a4paper]{moderncv}
-
-% moderncv themes
-\moderncvtheme[green]{casual}
-
-% character encoding
-\usepackage[utf8]{inputenc}
-
-% adjust the page margins
-\usepackage[scale=0.8]{geometry}
-\recomputelengths
-
-% personal data
-\firstname{John}
-\familyname{Doe}
-\title{Design enthusiast}
-\address{12 somestreet}{3456 somecity}
-\mobile{+123 456 7890}
-\phone{+12 (3)456 78 90}
-\fax{+12 (3)456 78 90}
-\email{jdoe@design.org}
-\extrainfo{\weblink{www.ctan.org}}
-\photo[64pt]{jdoe_picture}
-\quote{Any intelligent fool can make things bigger, more complex,
-and more violent. It takes a touch of genius -- and a lot of courage -- to
-move in the opposite direction.}
-
-\begin{document}
-\maketitle
-
-... <what you'll see in the next section>
-
-\end{document}
-\end{verbatim}
-
-to obtain a casual moderncv in green, as shown in figure \ref{fig:casual}, and you will substitute the line describing the theme with:
-
-\begin{verbatim}
-% moderncv themes
-\moderncvtheme[blue]{classic}
-\end{verbatim}
-
-to obtain a classic moderncv in blue, as shown in figure \ref{fig:classic}.
-
-
-\begin{figure}[p]
- \centering
- \fbox{\includegraphics[angle=90,width=\textwidth]{cv_casual.pdf}}
- \caption{An example of casual moderncv in green.}
- \label{fig:casual}
-\end{figure}
-
-\begin{figure}[p]
- \centering
- \fbox{\includegraphics[angle=90,width=\textwidth]{cv_classic.pdf}}
- \caption{An example of classic moderncv in blue.}
- \label{fig:classic}
-\end{figure}
-
-\section{Customize sections}
-
-Now we are ready to edit the part between \verb|\begin{document}| and \verb|\end{document}|.
-
-As you can seen in figure \ref{fig:casual} e \ref{fig:classic}, you can divide your CV into sections, each of them describing what you are, what you know and what you have done in your life. Every section is divide into items chosen from different flavours. More in details:
-
-\subsection{Section}
-
-The command to open a new section is:
-
-\begin{verbatim}
-\section{<title>}
-\end{verbatim}
-
-and every section can be divided into subsections:
-
-\begin{verbatim}
-\subsection{<title>}
-\end{verbatim}
-
-If necessary, there is a command to close the section:
-
-\begin{verbatim}
-\closesection{}
-\end{verbatim}
-
-and even one to create an empty section:
-
-\begin{verbatim}
-\emptysection{}
-\end{verbatim}
-
-An example of their usage can be the next one:
-
-\begin{verbatim}
-\section{Section with your own content}\closesection
-Your content here, inside the normal \LaTeX{} environment.
-You can use any regular \LaTeX{} command, display mathematics
-\[e =m\,c^2,\]
-put some table or figure, \dots
-
-\emptysection{}
-\cvitem{Now}{Back to moderncv layout, without making a new section :-)}
-\end{verbatim}
-
-whose results is shown in figure \ref{fig:ex_sec}.
-
-\begin{figure}[!ht]
- \centering
- \fbox{\includegraphics[width=0.9\textwidth]{ex_sec}}
- \caption{Example of usage of section commands.}
- \label{fig:ex_sec}
-\end{figure}
-
-\subsection{Items}
-
-Inside sections, you can choose between different kind of items depending on the purpose:
+ \begin{multicols}{4}
+ \item \code{arxiv}
+ \item \code{battlenet}
+ \item \code{bitbucket}
+ \item \code{codeberg}
+ \item \code{discord}
+ \item \code{github}
+ \item \code{gitlab}
+ \item \code{googlescholar}
+ \item \code{inspire}
+ \item \code{instagram}
+ \item \code{linkedin}
+ \item \code{mastodon}
+ \item \code{matrix}
+ \item \code{orcid}
+ \item \code{playstation}
+ \item \code{researcherid}
+ \item \code{researchgate}
+ \item \code{signal}
+ \item \code{skype}
+ \item \code{soundcloud}
+ \item \code{stackoverflow}
+ \item \code{steam}
+ \item \code{telegram}
+ \item \code{tiktok}
+ \item \code{twitch}
+ \item \code{twitter}
+ \item \code{whatsapp}
+ \item \code{xbox}
+ \item \code{xing}
+ \item \code{youtube}
+ \end{multicols}
+\end{itemize}
+\paragraph{\code{\\extrainfo}}
+A command for any extra information.
+\begin{lstlisting}
+ \extrainfo{<extra information>}
+\end{lstlisting}
+
+\paragraph{\code{\\photo}}
+A command for a photo.
+Takes the image file name as a required argument.
+Takes the height of the photo and the thickness of the photo frame as optional arguments.
+\begin{lstlisting}
+ \photo[<photo height>][<frame thickness>]{<photo file name>}
+\end{lstlisting}
+
+\paragraph{\code{\\quote}}
+A command for a quote.
+\begin{lstlisting}
+ \quote{<quote>}
+\end{lstlisting}
+
+\note{Long names and URLs can break some CVs and cover letters depending on the used style. Manually inserting line breaks for names with \code{\\\\} can help for \texttt{oldstyle} or \texttt{fancy}. Adjusting lengths as described in section \ref{subsection:adjusting:lengths} could help to mitigate issues with long URLs.}
+
+\paragraph{Pictures.}
+For some occasions you may need to include pictures besides the portrait photo. For this task it is helpful to know basic lengths used in \moderncv. For a more detailed description of lengths see section \ref{subsection:adjusting:lengths}.
+For instance, pictures can be included with \code{\\includegraphics}:
+\begin{lstlisting}
+ \hspace{\hintscolumnwidth + \separatorcolumnwidth}\includegraphics[<scale>]{<file name picture>}
+\end{lstlisting}
+Adding \code{\\hspace} in units of basic \code{moderncv} lengths will fit them more naturally into the CV or resume.
+
+\paragraph{Bibliography.}
+In case BibTeX is used, the bibliography settings are adjusted in the lines
+\begin{lstlisting}
+ % to show numerical labels in the bibliography (default is to show no labels)
+ % \renewcommand*{\bibliographyitemlabel}{[\arabic{enumiv}]}
+ % \renewcommand{\refname}{Articles}
+
+ % bibliography with mutiple entries
+ % \usepackage{multibib}
+ % \newcites{book, misc}{{Books}, {Others}}
+\end{lstlisting}
+By default, no labels are shown for bibliography entries.
+Uncommenting the line \code{\%\\renewcommand*\{\\bibliographyitemlabel\}\{[\\arabic\{enumiv\}]\}}
+allows one to fine-tune the labels.
+Uncommenting the line \code{\%\\renewcommand\{\\refname\}\{Articles\}} allows one to redefine the bibliography heading string ``Publications'' that is shown by default.
+Finally, adjustments using the \code{multibib} package can be done in the last two lines shown here.
+
+\note \Biblatex is currently not supported.
+
+\subsection{Modifying CV content}
+\subsubsection{Structuring the CV}
+As with any other document style, the CV can be structured into sections and subsections using \code{\\section} and \code{\\subsection}.
+
+The \Moderncv package provides some macros to add content to your CV.
+The easiest way to understand their intended use is to look at how they're used in the template.
+Nonetheless, we list the macros here along with a short description of their intended use.
+
+\subsubsection{General macros}
+
+\paragraph{\code{\\cvitem}}
+A flexible command for a single CV entry.
+Takes the descriptor and body text as required arguments.
+Can be used to list job experiences and similar.
+\begin{lstlisting}
+ \cvitem{<descriptor>}{<body>}
+\end{lstlisting}
+
+\paragraph{\code{\\cvdoubleitem}}
+A two-column variation of \code{\\cvitem}.
+Takes four required arguments: the descriptor and body text of the first column and the descriptor and body text of the second column.
+Can be used to enter skills, such as computer skills or language skills, in a two-column fashion.
+\begin{lstlisting}
+ \cvdoubleitem{<descriptor 1>}{<body 1>}{<descriptor 2>}{<body 2>}
+\end{lstlisting}
+
+\paragraph{\code{\\cvtripleitem}}
+A three-column variation of \code{\\cvitem}.
+Takes six required arguments: the descriptor and body text of the first column, second and third column.
+Can be used to enter skills, such as computer skills or language skills, in a three-column fashion.
+\begin{lstlisting}
+ \cvtripleitem{<descriptor 1>}{<body 1>}{<descriptor 2>}{<body 2>}{<descriptor 3>}{<body 3>}
+\end{lstlisting}
+
+\paragraph{\code{\\cvitemwithcomment}}
+A variation of \code{\\cvitem} with an additional argument for a comment.
+Can be used to enter skills such as computer skills or language skills.
+\begin{lstlisting}
+ \cvitemwithcomment{<descriptor>}{<skill level>}{<comment>}
+\end{lstlisting}
+
+\paragraph{\code{\\cventry}}
+A command for entering an education or job experience.
+Takes six required arguments: date(s), degree/job title, educational institution/employer, city, academic grade and description.
+While arguments 3 to 6 aren't optional, they can be left empty.
+If line breaks in argument 6 aren't done properly, a minipage can be used.
+Alternatively, \code{\\newline\{\}} can be used to break lines in argument 6.
+\begin{lstlisting}
+ \cventry{<year--year>}{<degree/job title>}{<institution/employer>}
+ {<city>}{<grade>}{<description>}
+\end{lstlisting}
+
+\paragraph{\code{\\cvlistitem}}
+A command for a single bullet-list item.
+Very long lines get broken.
+\begin{lstlisting}
+ \cvlistitem{<item>}
+\end{lstlisting}
+
+\paragraph{\code{\\cvlistdoubleitem}}
+A two-column variation of \code{\\cvlistitem}.
+\begin{lstlisting}
+ \cvlistdoubleitem{<item 1>}{item 2>}
+\end{lstlisting}
+
+\paragraph{\code{\\cvcolumns}}
+An environment typesetting multicolumn \code{\\cvitem}s.
+This can be combined with the \code{itemize} environment.
+\begin{lstlisting}
+ \begin{cvcolumns}
+ \cvcolumn{<category 1>}{<content>}
+ \cvcolumn{<category 2>}{<content>}
+ \cvcolumn[<width>]{<content>}
+ \end{cvcolumns}
+\end{lstlisting}
+\code{<width>} is a number between 0 and 1 controling the width of the column.
+
+\subsubsection{Skill matrix macros}
+The skill matrix is a table for displaying skills such as computer skills or project management skills graphically.
+The skill matrix table consists of several elements:
\begin{itemize}
- \item in the sections describing your education or your job experiences, you can use:
- \begin{verbatim}
-\cventry{years}{degree/job title}{institution/employer}
-{localization}{optional: grade/...}
-{optional: comment/job description}
- \end{verbatim}
-\vspace{-20pt}
-where the last three arguments are optional
- \item inside `language' cvsection environment, you can type every entry with:
- \begin{verbatim}
-\cvlanguage{name}{level}{comment}
- \end{verbatim}
- \item inside `computer skills' cvsection environment, you can type every entry with:
- \begin{verbatim}
-\cvcomputer{category}{programs}{category}{programs}
- \end{verbatim}
- \item to typeset lines with a hint on the left:
- \begin{verbatim}
-\cvline{leftmark}{text}
- \end{verbatim}
- \item to typeset entry with a description on the left, but in two columns inside a cvsection:
- \begin{verbatim}
-\cvdoubleitem{subtitle}{text}{subtitle}{text}
- \end{verbatim}
- \item to typeset lists on one column inside a cvsection:
- \begin{verbatim}
-\cvlistitem{point1}
- \end{verbatim}
- \item to typeset lists on two columns inside a cvsection:
- \begin{verbatim}
-\cvlistdoubleitem{point1}{point2}
- \end{verbatim}
- \item to add a section listing all your publications stored in a BibTeX file:
- \begin{verbatim}
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{BibTeX_file}
- \end{verbatim}
-\vspace{-20pt}
- where the name of the section title can be changed by redefining the \texttt{refname} with \verb|\renewcommand{\refname}{<new_name>}|
+ \item the graphical representation of the skill on a scale from 0 to 5,
+ \item the legend to explain the meaning of the scale,
+ \item a header line to explain the meaning of the table columns and
+ \item the actual skill entries.
\end{itemize}
-\subsubsection*{Example}
-
-Let's put all together and see in figure \ref{fig:sections} what is the result:
-
-\begin{verbatim}
-... preamble ...
-\begin{document}
-\section{Education}
-\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description}
-\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description}
-%
-\section{Master thesis}
-\cvline{title}{\emph{Title}}
-\cvline{supervisors}{Supervisors}
-\cvline{description}{\small Short thesis abstract}
-%
-\section{Experience}
-\subsection{Vocational}
-\cventry{year--year}{Job title}{Employer}{City}{}{Description}
-\cventry{year--year}{Job title}{Employer}{City}{}{Description}
-\subsection{Miscellaneous}
-\cventry{year--year}{Job title}{Employer}{City}{}%
- {Description line 1\newline{}Description line 2}
-%
-\section{Languages}
-\cvlanguage{language 1}{Skill level}{Comment}
-\cvlanguage{language 2}{Skill level}{Comment}
-%
-\section{Computer skills}
-\cvcomputer{category 1}{XXX, YYY, ZZZ}{category 3}{XXX, YYY, ZZZ}
-\cvcomputer{category 2}{XXX, YYY, ZZZ}{category 4}{XXX, YYY, ZZZ}
-%
-\section{Interests}
-\cvline{hobby 1}{\small Description}
-\cvline{hobby 2}{\small Description}
-\cvline{hobby 3}{\small Description}
-%
-\closesection{}
-\pagebreak
-%
-\section{Extra}
-\cvlistitem{Item 1}
-\cvlistitem{Item 2}
-\cvlistitem{Item 3}
-%
-\section{Extra 2}
-\cvlistdoubleitem{Item 1}{Item 4}
-\cvlistdoubleitem{Item 2}{Item 5}
-\cvlistdoubleitem{Item 3}{}
-%
-% Publications from a BibTeX file
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{publications} % 'publications' is the name of a BibTeX file
-%
-\end{document}
-\end{verbatim}
-
-\begin{figure}[!ht]
- \centering
- \fbox{\includegraphics[angle=90,width=\textwidth]{test_cvsection2.pdf}}\\
- \fbox{\includegraphics[angle=90,width=\textwidth]{test_cvsection1.pdf}}
-\caption{Example of usage of items inside cvsections.}
- \label{fig:sections}
-\end{figure}
-
-\section{More customizations}
-
-You have some useful commands to personalize your CV further.
-
-\subsection*{Modifying the symbols}
-You can modify the symbols used for the personal data (phone number, the email, \ldots) redefining \texttt{phonesymbol}, \texttt{emailsymbol}, \texttt{addresssymbol}, \texttt{mobilesymbol}, \texttt{faxsymbol}.
-
-For example: if you want to use the dingbat fonts, load the \texttt{pifont} package in the preamble, then substitute the default symbol \Telefon\ with the dingbat symbol \ding{38}\ by:
-\begin{verbatim}
-\renewcommand{\phonesymbol}{\ding{38}}
-\end{verbatim}
-
-You can change the symbol for lists in two way:
+\paragraph{\code{\\cvskill}}
+A command for the graphical representation of a single skill.
+The required argument must be a number from 0 to 5.
+\begin{lstlisting}
+ \cvskill{<0-5>}
+\end{lstlisting}
+This command can be used outside of the skill matrix, too.
+
+\paragraph{\code{\\cvskilllegend}}
+A command for a legend for the skill matrix.
+Takes six optional arguments: post-padding width and the descriptions for the five skill levels.
+\begin{lstlisting}
+ \cvskilllegend
+ \cvskilllegend*[<post-padding>][<level 1>][<level 2>][<level 3>]
+ [<level 4>][<level 5>]{<descriptor>}
+\end{lstlisting}
+The command with no arguments inserts the legend in its standard form: without a descriptor or any lines.
+An optional asterisk toggles the inclusion of a dashed line.
+\code{<post-padding>} must be a valid length like \code{1em} or \code{1ex}.
+
+The most general form of this command can be used to translate the legend descriptions into other languages or to add a name descriptor:
+\begin{lstlisting}
+ % Example: German translation
+ \cvskilllegend[0.2em][Grundkenntnisse]
+ [Grundkenntnisse und eigene Erfahrung in Projekten]
+ [Umfangreiche Erfahrung in Projekten]
+ [Vertiefte Expertenkenntnisse][Experte/Guru]{Legende}
+\end{lstlisting}
+
+\paragraph{\code{\\cvskillplainlegend}}
+A variation of \code{\\cvskilllegend} with the first three skill levels in the first column.
+\begin{lstlisting}
+ \cvskillplainlegend
+ \cvskillplainlegend*[<post-padding>][<level 1>][<level 2>]
+ [<level 3>][<level 4>][<level 5>]{<descriptor>}
+\end{lstlisting}
+
+\paragraph{\code{\\cvskillhead}}
+A command for a header line for the skill matrix.
+Takes five optional arguments: post-padding width, level, skill label, years of experience and a comment.
+\begin{lstlisting}
+ \cvskillhead[<post-padding>][<level>][<skill>][<years of experience>][<comment>]
+\end{lstlisting}
+\code{<post-padding>} must be a valid length like \code{1em} or \code{1ex}.
+
+\paragraph{\code{\\cvskillentry}}
+A command for an entry in the skill matrix.
+Takes five required arguments: skill category, skill level (0 to 5), skill name, years of experience and a comment.
+Takes a single optional argument for the post-padding width.
+\begin{lstlisting}
+ \cvskillentry*[<post-padding>]{<skill category>}{<0-5>}
+ {<skill name>}{<years of experience>}{<comment>}
+\end{lstlisting}
+An optional asterisk toggles the inclusion of a dashed line.
+\code{<post-padding>} must be a valid length like \code{1em} or \code{1ex}.
+
+How to make length adjustments to the skill matrix will be explained in section \ref{section:length:skillmatrix}.
+
+\subsection{Letter of motivation}
+
+In order to provide additional information for a job application, {\moderncv} provides a motivation letter. Define the following recipient data fields to customize your letter:
+\paragraph{\code{\\recipient}}
+A command for the letter's recipient. This allows line breaks to properly format the recipient's address.
+\begin{lstlisting}
+ \recipient{<Team or contact person>}{<company>\\<street>\\<city>}
+\end{lstlisting}
+
+\paragraph{\code{\\date}}
+A command to set the letter's date.
+\begin{lstlisting}
+ \date{<your custom date>}
+\end{lstlisting}
+
+\paragraph{\code{\\subject}}
+A command to define the job application subject.
+\begin{lstlisting}
+ \subject{<subject>}
+\end{lstlisting}
+
+\paragraph{\code{\\opening}}
+A command to set your opening (e.g. ``Dear X,'' or ``To whom it may concern,'').
+\begin{lstlisting}
+ \opening{<greeting>}
+\end{lstlisting}
+
+\paragraph{\code{\\closing}}
+A command to set your closing (e.g. ``Sincerely,'' or ``Yours truly,'').
+\begin{lstlisting}
+ \closing{<closing>}
+\end{lstlisting}
+
+\paragraph{\code{\\signature}}
+An optional command to include your signature after the closing. This feature is defined using the \code{\\includegraphics}. The first argument is the scale and the second argument is the filename of your scanned signature.
+\begin{lstlisting}
+ \signature{<scale>}{<signature filename>}
+\end{lstlisting}
+
+\paragraph{\code{\\enclosure}}
+A command to list the attached documents. The first optional parameter allows a redefinition of the default ``Enclosure'' label.
+\begin{lstlisting}
+ \enclosure[<optional alternative label>]{<list of documents>}
+\end{lstlisting}
+
+\note If typesetting the resume in Chinese using CJK an additional \code{\\clearpage} is required after the \code{\\makeletterclosing} command. This helps \code{fancyhdr} to work correctly with CJK. Otherwise it will remove the page numbering by making \code{lastpage} undefined.
+
+\section{Customization}
+\label{section:customization}
+\subsection{Styles and their options}
+\label{section:customization:stylesAndOptions}
+Each style allows fine-tuning via options passed into the \code{\\moderncvstyle} command:
+\begin{lstlisting}
+ \moderncvstyle[<option 1>, <option 2>, ...]{<style>}
+\end{lstlisting}
+Each style defines its own options, and not all options are available for each style.
+Below is a list of all the options available for each style:
+
+\paragraph{\code{casual}}
+This style allows the following options which \emph{only} affect header and footer styles:
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.72\textwidth}}
+ \textbf{\code{head alignment}} & values: \code{left}, \code{right} (default).
+ Aligns the title and the picture if one is included. \\
+ \textbf{\code{name}} & values: \code{alternate}.
+ Displays the name in all lowercase.
+ Differentiation of the name is done by color (disabled by default).
+ This feature is discouraged for longer names. \\
+ \textbf{\code{data in head}} & values: \code{details}, \code{nodetails} (default).
+ Toggles between the header and footer as the location of personal data on the page. \\
+ \textbf{\code{symbols}} & values: \code{symbols} (default), \code{nosymbols}.
+ Toggles between inclusion of icons or text-based abbreviations for personal data.
+\end{tabular}
+
+\paragraph{\code{classic}}
+This style allows the following options which \emph{only} affect header and footer styles:
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.75\textwidth}}
+ \textbf{\code{alignment}} & values: \code{left} (default), \code{right}.
+ Aligns the address block and the picture. \\
+ \textbf{\code{data in head}} & values: \code{details}, \code{nodetails} (default).
+ Toggles between the header and footer as the location of personal data on the page. \\
+ \textbf{\code{symbols}} & values: \code{symbols} (default), \code{nosymbols}.
+ Toggles between inclusion of icons or text-based abbreviations for personal data.
+\end{tabular}
+
+\paragraph{\code{banking}}
+This style allows the following options:
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.68\textwidth}}
+ \textbf{\code{alignment (body)}} & values: \code{left} (default), \code{center}, \code{right}.
+ Aligns the entries in the style. \\
+ \textbf{\code{rule style}} & values: \code{fullrules}, \code{shortrules}, \code{mixedrules} (default), \code{norules}.
+ Adjusts the rules used in the style. \\
+ \textbf{\code{data in head}} & values: \code{details}, \code{nodetails} (default).
+ Toggles between the header and footer as the location of personal data on the page. \\
+ \textbf{\code{symbols}} & values: \code{symbols} (default), \code{nosymbols}.
+ Toggles between inclusion of icons or text-based abbreviations for personal data.
+\end{tabular}
+
+\paragraph{\code{oldstyle}}
+This style allows the following options:
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.73\textwidth}}
+ \textbf{\code{data in head}} & values: \code{details}, \code{nodetails} (default).
+ Toggles between the header and footer as the location of personal data on the page. \\
+ \textbf{\code{symbols}} & values: \code{symbols} (default), \code{nosymbols}.
+ Toggles between inclusion of icons or text-based abbreviations for personal data.
+\end{tabular}
+
+\paragraph{\code{fancy}}
+This style allows the following options:
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.73\textwidth}}
+ \textbf{\code{data in head}} & values: \code{details}, \code{nodetails} (default).
+ Toggles between the header and footer as the location of personal data on the page. \\
+ \textbf{\code{symbols}} & values: \code{symbols} (default), \code{nosymbols}.
+ Toggles between inclusion of icons or text-based abbreviations for personal data.
+\end{tabular}
+
+\note Only one option from each option category can be passed in at a time, e.g.
+\begin{lstlisting}
+ \moderncvstyle[left, nosymbols]{casual}
+\end{lstlisting}
+
+\paragraph{\code{contemporary}}
+This style allows the following options which \emph{only} affect header and footer styles:
+
+\begin{tabular}{r@{\hspace{2ex}}p{0.75\textwidth}}
+ \textbf{\code{alignment}} & values: \code{left} (default), \code{right}.
+ Aligns the address block and the picture. \\
+ \textbf{\code{data in head}} & values: \code{details} (default), \code{nodetails}.
+ Toggles between the header and footer as the location of personal data on the page. \\
+ \textbf{\code{qr}} & values: \code{qr} (default), \code{noqr}.
+ Enables or disables the inclusion of a QR code of your personal website.
+\end{tabular}
+\note For the \code{contemporary} style it is recommended to use the \code{\\moderncvcolor\{cerulean\}} color scheme. The \code{contemporary} style is even more appealing with reduced margins. Use this in your preamble:
+\begin{lstlisting}
+ \usepackage[hmargin=0.5in,vmargin=10pt]{geometry}
+\end{lstlisting}
+
+\subsection{Adjusting colors}
+The colors of each style can be adjusted.
+
+\note The color theme must be loaded \emph{before} \code{\\moderncvstyle}, i.e.
+\begin{lstlisting}
+ \moderncvcolor{blue}
+ \moderncvstyle{casual}
+\end{lstlisting}
+
+\paragraph{Base colors.}
+Each style defines three main colors: \code{color0}, \code{color1} and \code{color2}.
+\code{color0} is black and the main text color.
+\code{color1} is the main theme color, like blue, green, etc.
+\code{color2} is a some form of grey used for the user data, etc.
+These colors can be redefined by using either \code{\\definecolor} or \code{\\colorlet}:
+\begin{lstlisting}
+ \definecolor{color1}{rgb}{0.55, 0.55, 0.55} % dark grey
+ \colorlet{color1}{black}
+\end{lstlisting}
+Any mechanism for naming and defining colors used by the \code{xcolor} package can be used to redefine the colors of a \Moderncv style.
+
+\paragraph{Fine tuning.}
+If an even finer control over the color scheme of the style is desired, the following color settings are used internally for the \code{casual} style and can be redefined:
+\begin{lstlisting}
+ % Head and footer
+ \colorlet{lastnamecolor}{color1}
+ \colorlet{namecolor}{lastnamecolor}
+ \colorlet{headrulecolor}{color1}
+ \colorlet{firstnamecolor}{lastnamecolor!50}
+ \colorlet{titlecolor}{color2}
+ \colorlet{addresscolor}{color2}
+ \colorlet{quotecolor}{color1}
+ \colorlet{pictureframecolor}{color1}
+ % Body
+ \colorlet{bodyrulecolor}{color1}
+ \colorlet{sectioncolor}{color1}
+ \colorlet{subsectioncolor}{color1}
+ \colorlet{hintstylecolor}{color0}
+ % Letter
+ \colorlet{letterclosingcolor}{color2}
+ % Skill matrix
+ \colorlet{skillmatrixfullcolor}{color1}
+ \colorlet{skillmatrixemptycolor}{color2!30}
+\end{lstlisting}
+
+
+\subsection{Modifying symbols and icons}
+\subsubsection{Icons}
+As stated in section \ref{section:customization:stylesAndOptions}, the use of icons is toggled by the \code{symbols} option that can be passed to \code{\\moderncvstyle}.
+
+The icons used in the display of the personal data (phone numbers, email, fax, social media accounts, etc.) can be customized by redefining the internal commands for the symbols:
+\begin{lstlisting}
+ \renewcommand*{<\symbolcommand>}{{\small<\symbol>}~}
+\end{lstlisting}
+Using \code{\\small} is optional, but the default behavior is to render all icons using \code{\\small}.
+Use \code{\\small} if one merely wishes to replace an icon/symbol while keeping the size consistent with the default icons/symbols.
+The tilde ensures proper spacing after the symbols and is recommended as well.
+
+Currently \Moderncv supports the following commands as \code{<\\symbolcommand>}:
\begin{itemize}
- \item redefining the command \texttt{listitemsymbol}: \verb|\renewcommand{\listitemsymbol}{-}|
- \item adding a specification for the label in \texttt{cvlistitem} and \texttt{cvlistdoubleitem}
+ \begin{multicols}{2}
+ \item \code{\\addresssymbol}
+ \item \code{\\mobilephonesymbol}
+ \item \code{\\fixedphonesymbol}
+ \item \code{\\faxphonesymbol}
+ \item \code{\\emailsymbol}
+ \item \code{\\homepagesymbol}
+ \item \code{\\linkedinsocialsymbol}
+ \item \code{\\xingsocialsymbol}
+ \item \code{\\twittersocialsymbol}
+ \item \code{\\githubsocialsymbol}
+ \item \code{\\gitlabsocialsymbol}
+ \item \code{\\stackoverflowsocialsymbol}
+ \item \code{\\googlescholarsocialsymbol}
+ \item \code{\\telegramsocialsymbol}
+ \item \code{\\whatsappsocialsymbol}
+ \item \code{\\signalsocialsymbol}
+ \item \code{\\matrixsocialsymbol}
+ \item \code{\\orcidsocialsymbol}
+ \item \code{\\researchgatesocialsymbol}
+ \item \code{\\researcheridsocialsymbol}
+ \item \code{\\bitbucketsocialsymbol}
+ \item \code{\\skypesocialsymbol}
+ \item \code{\\bornsymbol}
+ \item \code{\\arxivsocialsymbol}
+ \item \code{\\inspiresocialsymbol}
+ \end{multicols}
\end{itemize}
+The possible options for \code{<\\symbol>} depend on the package that is used.
+By default, the \code{marvosym} package is loaded if \code{pdflatex} is used, and the \code{academicons} and \code{fontawesome5} packages are loaded if either \code{lualatex} or \code{xelatex} is used.
+Full lists of all available symbols and icons can be found in the documentation of each respective package:
+
+\begin{tabular}{l}
+ \url{https://ctan.org/pkg/marvosym} \\[1ex]
+ \url{https://ctan.org/pkg/fontawesome5} \\[1ex]
+ \url{https://ctan.org/pkg/academicons}
+\end{tabular}
+
+\paragraph{Example.}
+If one wanted to use the dingbat fonts to replace the default phone symbol, one should load the \code{pifont} package in the preamble and then substitute the default symbol with the dingbat symbol \ding{38}\ with
+\begin{lstlisting}
+ \renewcommand*{\fixedphonesymbol}{\ding{38}~}
+\end{lstlisting}
+
+\paragraph{Alternative to icons}
+In case you do not want \texttt{symbols} (default) for the icons, there is also the option to replace icons with \texttt{letters} instead. This is set by the macro \code{\\moderncvicons}, which must be called after setting the style in the preamble.
+\begin{lstlisting}
+ \moderncvicons{<symbols|letters>}
+\end{lstlisting}
+This mechanism is also used to determine the icon set. In principle the \code{\\moderncvicons} can be used to determine the icon set with the possible values \texttt{marvosym}, \texttt{awesome} or \texttt{academic}, but it is recommended to let {\moderncv} decide the correct icon set due to differing \Latex compiler support.
+
+\subsubsection{Listing labels}
+The labels used in \code{itemize} environments, \code{cvlistitem} and \code{cvlistdoubleitem} can be changed in two different ways:
-For example: the following code produces the result shown in figure \ref{fig:ex_items}.
-
-\begin{verbatim}
-\closesection{} % needed to renewcommands
-\renewcommand{\listitemsymbol}{-} % change the symbol for lists
-
-\section{Extra 1}
-\cvlistitem{Item 1}
-\cvlistitem{Item 2}
-\cvlistitem[+]{Item 3} % optional other symbol
-
-\section{Extra 2}
-\cvlistdoubleitem[\Neutral]{Item 1}{Item 4}
-\cvlistdoubleitem[\Neutral]{Item 2}{Item 5}
-\cvlistdoubleitem[\Neutral]{Item 3}{}
-\end{verbatim}
-
-\begin{figure}[!hbt]
- \centering
- \fbox{\includegraphics[width=.8\textwidth]{ex_items.png}}
- \caption{Example of customization of the list labels.}
- \label{fig:ex_items}
-\end{figure}
-
-\subsection*{Adjusting lenghts}
-The different lengths used by moderncv are customizable by
-\begin{verbatim}
-\setlength{<length>}{<new_dimensions>}
-\end{verbatim}
-where \texttt{<length>} are \texttt{quote\-width}, \texttt{sep\-a\-ra\-tor\-col\-umn\-width}, \texttt{main\-col\-umn\-width}, \texttt{doub\-le\-i\-tem\-main\-col\-umn\-width}, \texttt{list\-i\-tem\-sym\-bol\-width}, \texttt{list\-doub\-le\-i\-tem\-main\-col\-umn\-width},
-
-In particular, the first column, can be set to any width. You can do that in two way:
\begin{itemize}
- \item using \verb|\sethintscolumnlength{<length>}|, where \texttt{<length>} is the desired length in a unit LaTeX understands
- \item using \verb|\sethintscolumntowidth{<string>}|, where \texttt{<string>} is a string of the desired length (usually, the longest string that has to appear in the column)
+ \item Redefining \code{\\labelitemi}, \code{\\labelitemii}, \code{\\labelitemiii} and \code{\\labelitemiv} changes the labels for \code{itemize} environments as well as for \code{cvlistitem} and \code{cvlistdoubleitem}, e.g.
+ \begin{lstlisting}
+ \renewcommand{\labelitemi}{-}
+ \end{lstlisting}
+ \item Redefining \code{\\listitemsymbol} changes the labels for \code{cvlistitem} and \code{cvlistdoubleitem} but \emph{not} for \code{itemize} environments, e.g.
+ \begin{lstlisting}
+ \renewcommand{\listitemsymbol}{-}
+\end{lstlisting}
\end{itemize}
-\subsection*{Additional commands}
-There are commands to manage hypertextual links:
+\subsection{Adjusting lengths}\label{subsection:adjusting:lengths}
+Some lengths in \Moderncv can be adjusted.
+
+The hints column can be adjusted by setting \code{\\hintscolumnwidth}:
+\begin{lstlisting}
+ \setlength{\hintscolumnwidth}{3cm}
+\end{lstlisting}
+
+For the \code{classic} style, the amount of horizontal space for the name can be adjusted by setting \code{\\makecvheadnamewidth} to avoid breaks:
+\begin{lstlisting}
+ \setlength{\makecvheadnamewidth}{10cm}
+\end{lstlisting}
+One should be careful though, as the length is normally calculated to avoid any overlap with the personal information.
+This should be used at one's own typographical risk.
+
+The spacing between the hints column and the CV entries can be adjusted by setting\\
+\code{\\separatorcolumnwidth}. The default value is \code{0.025\\textwidth}.
+\begin{lstlisting}
+ \setlength{\separatorcolumnwidth}{0.05\textwidth}
+\end{lstlisting}
+
+The spacing between the list symbol and the text item of \code{\\cvlistitem} and \code{\\cvlistdoubleitem} can be adjusted by setting \code{\\listitemsymbolspace} in the preamble. The default value is set to \code{0pt}.
+\begin{lstlisting}
+ \setlength{\listitemsymbolspace}{5pt}
+\end{lstlisting}
+
+The width of the footer can be adjusted by setting \code{\\footwidth}. Due to internal calculations \code{\\renewcommand} is needed. The default value is \code{0.8\\textwidth}.
+\begin{lstlisting}
+ \renewcommand*{\recomputefootlengths}{%
+ \setlength{\footwidth}{0.9\textwidth}}
+\end{lstlisting}
+
+The width of the quote can be adjusted by setting \code{\\quotewidth}. Due to internal calculations \code{\\renewcommand} is needed. The default value is \code{0.65\\textwidth}.
+\begin{lstlisting}
+ \renewcommand*{\recomputecvheadlengths}{%
+ \setlength{\quotewidth}{0.5\textwidth}}
+\end{lstlisting}
+
+
+% The different lengths used by moderncv are customizable by
+% \begin{lstlisting}
+% \setlength{<length>}{<new_dimensions>}
+% \end{lstlisting}
+% where \code{<length>} are \code{maincolumnwidth}, \code{doubleitemmaincolumnwidth}, \code{listitemsymbolwidth}, \code{listdoubleitemmaincolumnwidth},
+
+
+\subsubsection{Lengths in the skill matrix}
+\label{section:length:skillmatrix}
+Both the width of the skill matrix legend and the width of the skill matrix columns can be adjusted.
+
+The width of the skill matrix legend can be adjusted as follows:
+\begin{lstlisting}
+ \setcvskilllegendcolumns[<width>][<factor>]
+ % Examples:
+ \setcvskilllegendcolumns[][0.45]
+ \setcvskilllegendcolumns[\widthof{``Legend''}][0.45]
+ \setcvskilllegendcolumns[0ex][0.46] % useful for the banking style
+\end{lstlisting}
+\code{<width>} should be a length smaller than \code{\\textwidth}, and \code{<factor>} must be between 0 and 1.
+
+The width of the skill matrix columns can be adjusted as follows:
+\begin{lstlisting}
+ \setcvskillcolumns[<width>][<factor>][<exp_width>]
+ % Examples:
+ \setcvskillcolumns[5em][][] % adjust first column, same as \setcvskillcolumns[5em]
+ \setcvskillcolumns[][0.45][] % adjust third (skill) column, same as \setcvskillcolumns[][0.45]
+ \setcvskillcolumns[][][\widthof{``Year''}] % adjust fourth (years of experience) column
+ \setcvskillcolumns[][0.45][\widthof{``Year''}]
+ \setcvskillcolumns[\widthof{``Language''}][0.48][]
+ \setcvskillcolumns[\widthof{``Language''}]
+\end{lstlisting}
+\code{<width>} and \code{<exp_width>} should be lengths smaller than \code{\\textwidth}, and \code{<factor>} must be between 0 and 1.
+
+\subsection{Additional link commands}%% adapted from Cristina Sambo's documentation
+To create links to a website or a email address, use the following commands:
+
+A general weblink with optional text.
+\begin{lstlisting}
+ \link[<text>]{<link>}
+ %% example
+ \link[name of the link]{ftp://ftp.somesite.org}
+\end{lstlisting}
+
+An HTTP link. The HTTP prefix is generated automatically and is not needed in the link argument.
+\begin{lstlisting}
+ \link[<text>]{<link>}
+ %% example
+ \link[goto HTTP site]{www.somehttpsite.org}
+\end{lstlisting}
+
+A HTTPS link. The HTTPS prefix is generated automatically and is not needed in the link argument.
+\begin{lstlisting}
+ \link[<text>]{<link>}
+ %% example
+ \httpslink[goto HTTPS site]{www.somesecuresite.org}
+\end{lstlisting}
+
+An email link. The mailto prefix is generated automatically and is not needed in the link argument.
+\begin{lstlisting}
+ \link[<text>]{<link>}
+ %% example
+ \emaillink[my email]{jdoe@website.org}
+\end{lstlisting}
+
+\subsection{Page breaks and orphaned section headers}
+If \Latex breaks pages just after \code{\\section} or \code{\\subsection} commands, try adjusting the stretchability of the page with \code{\\cvsectionstretchability} or \code{\\cvsubsectionstretchability}:
+\begin{lstlisting}
+ \setlength{\cvsectionstretchability}{\baselineskip}
+ \setlength{\cvsubsectionstretchability}{100pt}
+\end{lstlisting}
+These two lengths tell \Latex how much extra length it needs after \code{\\section} and \code{\\subsection} commands.
+By default, \Moderncv sets both lengths to \code{0.9\\baselineskip}.
+
+This should solve orphaned \code{\\section} and \code{\\subsection} commands that are used alone for most users.
+However, \Latex does not check for content.
+For example, writing
+\begin{lstlisting}
+ \section{blub}
+ \subsection{blubblub}
+\end{lstlisting}
+one after the other may cause \Latex to place the section and subsection headers on separate pages.
+Since \Latex considers the subsection header to not be orphaned, it may place the section header at the bottom of a page if there is enough space to do so while placing the subsection header on the next page.
+One solution is to increase \code{\\cvsectionstretchability} to force the break of the section header.
+However, this changes the behaviour for all \code{\\section} commands in your CV and might cause unnecessary page breaks.
+It is therefore recommended to force the page break manually with a \code{\\newpage} in this case.
+
+\paragraph{Experts only:}
+Internally, \Moderncv uses a custom \code{\\needspace} command:
+\begin{lstlisting}
+ \NewDocumentCommand\@cvneedspace{m}{%
+ \begingroup
+ \setlength{\dimen@}{#1}%
+ \vskip\z@\@plus\dimen@
+ \penalty \withinstretchpenalty\vskip\z@\@plus -\dimen@
+ \vskip\dimen@
+ \penalty \poststretchpenalty%
+ \vskip -\dimen@
+ \vskip\z@skip % hide the previous |\vskip| from |\addvspace|
+ \endgroup
+ }
+\end{lstlisting}
+Thus, instead of setting \code{\\cvsectionstretchability} and/or \code{\\cvsubsectionstretchability}, page break behavior can be adjusted by redefining the following internal penalties:
+\begin{lstlisting}
+ \renewcommand{\withinstretchpenalty}{<-100...9999>}
+ \renewcommand{\poststretchpenalty}{<-100...9999>}.
+\end{lstlisting}
+By default, \Moderncv sets \code{\\withinstretchpenalty} to 0 and \code{\\poststretchpenalty} to 9999.
+The higher the penalties are, the less likely a page break will occur.
+A good explanation of \code{\\needspace} can be found at \url{https://tex.stackexchange.com/questions/348994/understanding-needspace}.
+
+
+\subsection{Tips and Tricks}
+\subsubsection{Legal disclaimer at the end of the CV}
+Some countries (e.g. Italy) require you to add a legal disclaimer authorizing the use of the personal data in your CV.
+To add such a disclaimer, add the following to the bottom of your CV:%
+\footnote{Example provided by Cristina Sambo}%
+\begin{lstlisting}
+ \vfill
+ \begin{center}
+ \textit{\small Ai sensi del D. Lgs. 196/2003 ...}
+ \end{center}
+\end{lstlisting}
+
+
+
+\section{Implementation details}
+\label{section:implementationDetails}
+
+\subsection{Creating your own styles}
+Currently {\moderncv} ships with six different styles: \texttt{casual} (default), \texttt{classic}, \texttt{banking}, \texttt{oldstyle}, \texttt{fancy} and \texttt{contemporary}. Internally, these styles are numbered 1, 2, 3, 4, 5 and 6, respectively. All styles except \texttt{oldstyle} and \texttt{fancy} possess additional option parameters which were described in section \ref{section:customization:stylesAndOptions}.
+
+Different styles' head, body and foot can be combined to create custom styles. This is done by setting \code{\\moderncvhead}, \code{\\moderncvbody} and \code{\\moderncvfoot} in the preamble. Here is an example of a custom style with a \texttt{banking} head, an \texttt{oldstyle} body and a \texttt{casual} foot:
+\begin{lstlisting}
+ \moderncvhead{3}
+ \moderncvbody{4}
+ \moderncvfoot{1}
+\end{lstlisting}
+Furthermore, options for each part of {\moderncv} parts can be set as well in such combinations. To get a CV with a \texttt{classic} head and a \texttt{banking} body with full rules, define the following in the preamble:
+\begin{lstlisting}
+ \moderncvhead{2}
+ \moderncvbody[fullrules]{3}
+ \moderncvfoot{1}
+\end{lstlisting}
+
+
+\subsection{Required packages}
+\label{section:implementationDetails:requiredPackages}
+In addition to the packages that \Moderncv provides, the following packages are loaded internally:
\begin{itemize}
- \item[-] \verb|\weblink[optional text]{link}|
- \item[-] \verb|\httplink[optional text]{link}|
- \item[-] \verb|\emaillink[optional text]{link}|
+ \begin{multicols}{3}
+ \item \code{etoolbox}
+ \item \code{ifthen}
+ \item \code{xcolor}
+ \item \code{ifxetex} or \code{ifluatex}
+ \item \code{fontenc}
+ \item \code{url}
+ \item \code{hyperref}
+ \item \code{graphicx}
+ \item \code{fancyhdr}
+ \item \code{tweaklist}%
+ \footnote{The \code{tweaklist} package has been altered for the development of \Moderncv and ships with \moderncv.}
+ \item \code{calc}
+ \item \code{xparse}
+ \item \code{microtype}
+ \item \code{expl3}
+ \item \code{tikz}
+ \item \code{changepage}
+ \item \code{fontawesome5}
+ \item \code{academicons}
+ \item \code{tgpagella}
+ \item \code{ebgaramond}
+ \item \code{kurier}
+ \item \code{multirow}
+ \item \code{arydshln}
+ \end{multicols}
\end{itemize}
-There is a \verb|\today| command, useful for example if you need to add the date the CV was produced.
-
-\subsection*{Putting things at the end of CV}
-Sometimes there is the need to add some lines at the end of the CV. For example, in Italy is necessary to add the permission to treat the personal data contained in the r\'esum\'e. You can do that dropping out of the layout of \texttt{moderncv} and pushing the lines at the end by the command \verb|\vfill|:
-\begin{verbatim}
-\emptysection{}\closesection
-\vfill
-\begin{center}
-\textit{\small Ai sensi del D. Lgs. 196/2003 ...}
-\end{center}
-\end{verbatim}
+Most of these packages should be included in your \Latex distribution of choice.
+
+\subsection{Known conflicts with other packages}
+\begin{enumerate}
+ \item \Moderncv is incompatible with \code{biber}.
+ \item \Moderncv is incompatible with \biblatex.
+ \item \Moderncv is incompatible with \code{babel} in Spanish
+\end{enumerate}
+
+\subsection{Known bugs}
+\begin{enumerate}
+ \item Skill matrices don't break automatically in \texttt{fancy} style.
+ \item Long names break the \texttt{oldstyle} style and possibly other styles (needs testing).
+ \item Long URLs in \texttt{classic} style can make the name break line.
+ Fixed width for the address part must be implemented.
+ \item When using the \texttt{fancy} style, undesired space is added between the bibliography head and the first entry, as well as after the last entry.
+ \item Footnotes generate errors, but the output seems correct when running with \code{-interaction=nonstopmode}.
+ \item When using CJK, the last \code{\\clearpage} required for the \code{fancyhdr} package to work properly kills the ``lastpage'' counter, and therefore also the page numbering.
+ \item \Moderncv produces the error ``\code{lonely \\item--perhaps a missing list environment}'' when used with the \code{bibentry} package, though the output is actually correct.
+ Among other things, this causes compilation by LyX to stop.
+ \item The space after a \code{\\cventry} gets eaten up when the last argument contains a nested \code{itemize} environment.
+ An ugly hack and incomplete solution was implemented by including a \code{\\strut} in every item label, but this doesn't solve the problem for multi-line items.
+ Ideally, the \code{\\strut} should end the item, but there seems to be no way to do this.
+\end{enumerate}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/moderncv/signature.png b/Master/texmf-dist/doc/latex/moderncv/signature.png
new file mode 100644
index 00000000000..8daa868ed8c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/signature.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/template.tex b/Master/texmf-dist/doc/latex/moderncv/template.tex
index 38d313b3836..7128f09e083 100644
--- a/Master/texmf-dist/doc/latex/moderncv/template.tex
+++ b/Master/texmf-dist/doc/latex/moderncv/template.tex
@@ -1,5 +1,5 @@
%% start of file `template.tex'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -8,17 +8,23 @@
\documentclass[11pt,a4paper,sans]{moderncv} % possible options include font size ('10pt', '11pt' and '12pt'), paper size ('a4paper', 'letterpaper', 'a5paper', 'legalpaper', 'executivepaper' and 'landscape') and font family ('sans' and 'roman')
+\moderncvcolor{cerulean} % color options 'black', 'blue' (default), 'burgundy', 'green', 'grey', 'orange', 'purple' and 'red'; for contemporary style use 'cerulean'
% moderncv themes
-\moderncvstyle{casual} % style options are 'casual' (default), 'classic', 'banking', 'oldstyle' and 'fancy'
-\moderncvcolor{blue} % color options 'black', 'blue' (default), 'burgundy', 'green', 'grey', 'orange', 'purple' and 'red'
+\moderncvstyle[]{contemporary} % style options are 'casual' (default), 'classic', 'banking', 'oldstyle', 'fancy' and 'contemporary'
+ % the 'contemporary' style optionally takes the `qr` (default) or `noqr` options
%\renewcommand{\familydefault}{\sfdefault} % to set the default font; use '\sfdefault' for the default sans serif font, '\rmdefault' for the default roman one, or any tex font name
%\nopagenumbers{} % uncomment to suppress automatic page numbering for CVs longer than one page
% adjust the page margins
-\usepackage[scale=0.75]{geometry}
-\setlength{\footskip}{136.00005pt} % depending on the amount of information in the footer, you need to change this value. comment this line out and set it to the size given in the warning
+\usepackage[hmargin=0.5in,vmargin=10pt]{geometry} % the 'contemporary' style looks better with reduced margins; uncomment the line below for increased margin
+%\usepackage[scale=0.75]{geometry}
%\setlength{\hintscolumnwidth}{3cm} % if you want to change the width of the column with the dates
%\setlength{\makecvheadnamewidth}{10cm} % for the 'classic' style, if you want to force the width allocated to your name and avoid line breaks. be careful though, the length is normally calculated to avoid any overlap with your personal info; use this at your own typographical risks...
+%\setlength{\listitemsymbolspace}{10pt} % set custom spacing between list symbol and text item (influences \cvlistitem and \cvlistdoubleitem)
+
+% the 'contemporary' style allows to append additional elements to the head background; uncomment and customize if needed
+%\def\@moderncvheadBackground{
+%}
% font loading
% for luatex and xetex, do not use inputenc and fontenc
@@ -30,7 +36,13 @@
\setmainfont{Latin Modern Roman}
\setsansfont{Latin Modern Sans}
\setmonofont{Latin Modern Mono}
- \setmathfont{Latin Modern Math}
+ \setmathfont{Latin Modern Math}
+
+ % you may also consider Fira Sans Light for a extra modern look
+ %\setsansfont[ItalicFont={Fira Sans Light Italic},%
+ % BoldFont={Fira Sans},%
+ % BoldItalicFont={Fira Sans Italic}]%
+ % {Fira Sans Light}%
\else
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
@@ -54,24 +66,49 @@
% Social icons
\social[linkedin]{john.doe} % optional, remove / comment the line if not wanted
\social[xing]{john\_doe} % optional, remove / comment the line if not wanted
-\social[twitter]{ji\_doe} % optional, remove / comment the line if not wanted
+
\social[github]{jdoe} % optional, remove / comment the line if not wanted
\social[gitlab]{jdoe} % optional, remove / comment the line if not wanted
-\social[stackoverflow]{0000000/johndoe} % optional, remove / comment the line if not wanted
+\social[codeberg]{jdoe} % optional, remove / comment the line if not wanted
\social[bitbucket]{jdoe} % optional, remove / comment the line if not wanted
+\social[stackoverflow]{0000000/johndoe} % optional, remove / comment the line if not wanted
+
\social[skype]{jdoe} % optional, remove / comment the line if not wanted
\social[orcid]{0000-0000-000-000} % optional, remove / comment the line if not wanted
\social[researchgate]{jdoe} % optional, remove / comment the line if not wanted
\social[researcherid]{jdoe} % optional, remove / comment the line if not wanted
+\social[googlescholar]{googlescholarid} % optional, remove / comment the line if not wanted
+
+\social[twitter]{ji\_doe} % optional, remove / comment the line if not wanted
+\social[mastodon]{mastodon.social/web/@user} % optional, remove / comment the line if not wanted
\social[telegram]{jdoe} % optional, remove / comment the line if not wanted
\social[whatsapp]{12345678901} % optional, remove / comment the line if not wanted
\social[signal]{12345678901} % optional, remove / comment the line if not wanted
\social[matrix]{@johndoe:matrix.org} % optional, remove / comment the line if not wanted
-\social[googlescholar]{googlescholarid} % optional, remove / comment the line if not wanted
+\social[discord]{jdoe\#0000} % optional, remove / comment the line if not wanted
+
+% YouTube links can take several forms, depending on how your account and channel are set up.
+% See https://support.google.com/youtube/answer/6180214 for more information.
+\social[youtube]{c/jdoeschannel} % optional, remove / comment the line if not wanted; Custom URL - can be shorted by removing 'c/'
+\social[youtube]{channel/XXXXXX} % optional, remove / comment the line if not wanted; Channel URL (ID-based) - can not be shortened
+\social[youtube]{user/jdoe} % optional, remove / comment the line if not wanted; Legacy username URL - if jdoe is not already claimed by a Custom URL, can be shortened by removing 'user/'
+
+\social[twitch]{jdoe} % optional, remove / comment the line if not wanted
+\social[tiktok]{jdoe} % optional, remove / comment the line if not wanted
+\social[instagram]{jdoe} % optional, remove / comment the line if not wanted
+
+\social[soundcloud]{jdoe} % optional, remove / comment the line if not wanted
+
+\social[steam]{jdoe} % optional, remove / comment the line if not wanted
+\social[xbox]{jdoe} % optional, remove / comment the line if not wanted
+\social[playstation]{jdoe} % optional, remove / comment the line if not wanted
+\social[battlenet]{jdoe\#0000} % optional, remove / comment the line if not wanted
+\social[arxiv]{doe\_j\_1} % optional, remove / comment the line if not wanted
+\social[inspire]{0000000} % optional, remove / comment the line if not wanted
\extrainfo{additional information} % optional, remove / comment the line if not wanted
-\photo[64pt][0.4pt]{picture} % optional, remove / comment the line if not wanted; '64pt' is the height the picture must be resized to, 0.4pt is the thickness of the frame around it (put it to 0pt for no frame) and 'picture' is the name of the picture file
+\photo[64pt][2pt]{picture} % optional, remove / comment the line if not wanted; '64pt' is the height the picture must be resized to, 2pt is the thickness of the frame around it (put it to 0pt for no frame) and 'picture' is the name of the picture file
\quote{Some quote} % optional, remove / comment the line if not wanted
% bibliography adjustments (only useful if you make citations in your resume, or print a list of publications using BibTeX)
@@ -92,7 +129,7 @@
%----- resume ---------------------------------------------------------
\makecvtitle
-\section{Education}
+\section{Education} % for 'contemporary' style use optional argument for displaying an icon, e.g. \section[\faGraduationCap]{Education}
\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description} % arguments 3 to 6 can be left empty
\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description}
@@ -135,12 +172,13 @@ Detailed achievements:
\cvdoubleitem{category 1}{XXX, YYY, ZZZ}{category 4}{XXX, YYY, ZZZ}
\cvdoubleitem{category 2}{XXX, YYY, ZZZ}{category 5}{XXX, YYY, ZZZ}
\cvdoubleitem{category 3}{XXX, YYY, ZZZ}{category 6}{XXX, YYY, ZZZ}
+\cvtripleitem{category 4}{XYZ}{category 5}{XYZ}{category 6}{XYZ}
\section{Skill matrix}
\cvitem{Skill matrix}{Alternatively, provide a skill matrix to show off your skills}
-%% Skill matrix as an alternative to rate one's skills, computer or other.
+%% Skill matrix as an alternative to rate one's skills, computer or other.
-%% Adjusts width of skill matrix columns.
+%% Adjusts width of skill matrix columns.
%% Usage \setcvskillcolumns[<width>][<factor>][<exp_width>]
%% <width>, <exp_width> should be lengths smaller than \textwidth, <factor> needs to be between 0 and 1.
%% Examples:
@@ -179,12 +217,12 @@ Detailed achievements:
%% Adjust head of the skill matrix for other languages
% \cvskillhead[0.25em][Level][F\"ahigkeit][Jahre][Bemerkung]
-%% \cvskillentry[*][<post_padding>]{<skill_cathegory>}{<0-5>}{<skill_name>}{<years_of_experience>}{<comment>}%
+%% \cvskillentry[*][<post_padding>]{<skill_cathegory>}{<0-5>}{<skill_name>}{<years_of_experience>}{<comment>}%
%% Example usages:
\cvskillentry*{Language:}{3}{Python}{2}{I'm so experienced in Python and have realised a million projects. At least.}
\cvskillentry{}{2}{Lilypond}{14}{So much sheet music! Man, I'm the best!}
\cvskillentry{}{3}{\LaTeX}{14}{Clearly I rock at \LaTeX}
-\cvskillentry*{OS:}{3}{Linux}{2}{I only use Archlinux btw}% notice the use of the starred command and the optional
+\cvskillentry*{OS:}{3}{Linux}{2}{I only use Archlinux btw}% notice the use of the starred command and the optional
\cvskillentry*[1em]{Methods}{4}{SCRUM}{8}{SCRUM master for 5 years}
%% \cvskill{<0-5>} command
% \cvitem{\textbackslash{cvskill}:}{Skills can be visually expressed by the \textbackslash{cvskill} command, e.g. \cvskill{2}}
@@ -232,8 +270,10 @@ Detailed achievements:
% recipient data
\recipient{Company Recruitment team}{Company, Inc.\\123 somestreet\\some city}
\date{January 01, 1984}
+\subject{Job application}
\opening{Dear Sir or Madam,}
\closing{Yours faithfully,}
+\signature{0.9}{signature.png} % optional, remove / comment the line if not wanted: first argument goes to \includegraphics > scale
\enclosure[Attached]{curriculum vit\ae{}} % use an optional argument to use a string other than "Enclosure", or redefine \enclname
\makelettertitle
@@ -254,4 +294,3 @@ Albert Einstein discovered that $e=mc^2$ in 1905.
%% end of file `template.tex'.
-
diff --git a/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md b/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md
index 1d90d7617cc..d1e8bc4d603 100644
--- a/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/moloch/CHANGELOG.md
@@ -1,5 +1,20 @@
# Changelog
+## [0.4.0](https://github.com/jolars/moloch/compare/v0.3.0...v0.4.0) (2024-07-09)
+
+
+### Features
+
+* add a small amount of vertical space before subtitle ([b224a9b](https://github.com/jolars/moloch/commit/b224a9b5067187e64a7669b61aee029447535729))
+* support memoize package (closes [#16](https://github.com/jolars/moloch/issues/16)) ([1ca26e8](https://github.com/jolars/moloch/commit/1ca26e857a331fcb29296c4987b69aea0db90fae))
+* support title format modifications ([#18](https://github.com/jolars/moloch/issues/18)) ([46a4f49](https://github.com/jolars/moloch/commit/46a4f49e8bb95798c2d6f3b69a1b96128d95cb8b))
+
+
+### Bug Fixes
+
+* add % at the end of some commands ([33b9833](https://github.com/jolars/moloch/commit/33b9833f21d3e0654fe2452d0b8ac8e8eb3a47bb))
+* convert raw command in manual to text ([ac305e9](https://github.com/jolars/moloch/commit/ac305e9b547ce44e0573f333adc4e6684eb88b68))
+
## [0.3.0](https://github.com/jolars/moloch/compare/v0.2.0...v0.3.0) (2024-03-06)
diff --git a/Master/texmf-dist/doc/latex/moloch/README.md b/Master/texmf-dist/doc/latex/moloch/README.md
index f3b7971303c..c8d9b78f15a 100644
--- a/Master/texmf-dist/doc/latex/moloch/README.md
+++ b/Master/texmf-dist/doc/latex/moloch/README.md
@@ -12,19 +12,23 @@ The fork was created for the following reasons:
- To remove some of the more opinionated design choices, such as special handling of the Fira family of fonts.
- To strip away some features that added complexity to the code base without achieving valuable functionality for the majority of users, such as special code block designs and the pgfplots theme.
+[Here's a blog post](https://jolars.co/blog/2024-05-30-moloch/) in which I introduce the theme and write in more detail about the changes with respect to Metropolis.
+
Do not expect this theme to be backwards compatible with the Metropolis theme.
+![Screenshot](https://raw.githubusercontent.com/jolars/moloch/main/assets/screenshot.svg)
+
## Installation
Moloch is on [CTAN](https://ctan.org/pkg/moloch), so you can install it using your favorite LaTeX package manager. For example, with `tlmgr`:
-```sh
+```bash
tlmgr install moloch
```
You can also install the theme from source, in which case you need a working LaTeX installation with `l3build` installed. Then just follow these steps:
-```sh
+```bash
git clone https://github.com/jolars/moloch.git
cd moloch
l3build install
diff --git a/Master/texmf-dist/doc/latex/moloch/moloch.pdf b/Master/texmf-dist/doc/latex/moloch/moloch.pdf
index 3607149cef9..15f0652a6ac 100644
--- a/Master/texmf-dist/doc/latex/moloch/moloch.pdf
+++ b/Master/texmf-dist/doc/latex/moloch/moloch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moloch/moloch.tex b/Master/texmf-dist/doc/latex/moloch/moloch.tex
index a9eb3269333..c8300607bef 100644
--- a/Master/texmf-dist/doc/latex/moloch/moloch.tex
+++ b/Master/texmf-dist/doc/latex/moloch/moloch.tex
@@ -58,7 +58,7 @@
xrightmargin=0em,
aboveskip=1em,
belowskip=1em,
- morekeywords={usetheme,institute,maketitle,%
+ morekeywords={usetheme,institute,maketitle,@moloch@titleformat,%
plain,setbeamercolor,molochset,setsansfont,setmonofont},
}
\lstMakeShortInline|
@@ -82,7 +82,7 @@
\newcommand{\themename}{\textsf{moloch}\xspace}
-\def\molochversion{0.3.0} % x-release-please-version
+\def\molochversion{0.4.0} % x-release-please-version
\usepackage{readprov}
% \ReadPackageInfos{beamerthememoloch}
@@ -166,10 +166,10 @@ The following code shows a minimal example of a Beamer presentation using
\begin{lstlisting}
\documentclass{beamer}
\usetheme{moloch}
-\title{A minimal example}
+\title{A Minimal Example}
\date{\today}
\author{Johan Larsson}
-\institute{Centre for Modern Beamer Themes}
+\institute{Some University}
\begin{document}
\maketitle
\section{First Section}
@@ -187,6 +187,7 @@ The following code shows a minimal example of a Beamer presentation using
\begin{itemize}
\item |tikz|
\item |pgfopts|
+ \item |etoolbox|
\item |calc|
\end{itemize}
\end{multicols}
@@ -224,6 +225,27 @@ The list of options is structured as shown in the following example.
A short description of the option.
}
+
+\subsubsection{Main theme}
+
+\DescribeOption{titleformat}%
+{regular, smallcaps, allsmallcaps, allcaps}
+{regular}{
+ Changes the format of titles, subtitles, section titles, frame titles, and
+ the text on ``standout'' frames. The available options produce
+ Regular, \textsc{SmallCaps}, \textsc{\MakeLowercase{AllSmallCaps}}, or
+ \MakeUppercase{AllCaps} titles. Note that these commands do not
+ affect math and numbers, so may not work as you expect if your titles
+ contain these.
+}
+
+\DescribeOption{titleformat plain}%
+{regular, smallcaps, allsmallcaps, allcaps}%
+{regular}{
+ Changes the format of ``standout'' frames (see |titleformat|, above).
+}
+
+
\subsubsection{Inner theme}
\DescribeOption{sectionpage}{none, simple, progressbar}{progressbar}{
@@ -270,6 +292,20 @@ The list of options is structured as shown in the following example.
of the reverse.
}
+
+\subsubsection{Font theme}
+
+\DescribeMacro{titleformat title}
+\DescribeMacro{titleformat subtitle}
+\DescribeMacro{titleformat section}
+\DescribeOption{titleformat frame}%
+{regular, smallcaps, allsmallcaps, allcaps}%
+{regular}{
+ Individually controls the format of titles, subtitles, section titles, and
+ frame titles (see |titleformat|, above).
+}
+
+
\subsection{Color Customization}
The included \themename color theme is used by default, but its colors can be
@@ -321,6 +357,18 @@ single sentence or image. To use it, add the key |standout| to the frame:
\section{Known Issues}
+\subsection{Title Formats}
+
+Be aware that not every font supports small caps, so the |smallcaps| or
+|allsmallcaps| options may not work for all fonts.
+In particular, the Computer Modern sans-serif typeface, which is used
+by default when \themename is compiled with pdf\LaTeX, does not have a
+small-caps variant.
+
+Note that title format options |allsmallcaps| and |allcaps| do not
+affect the sizes of numerals, punctuation, and math symbol, and are
+probably best avoided if your titles contain these characters.
+
\subsection{Interactions with other color themes}
\themename can be used along with any other Beamer color theme, such as
@@ -412,7 +460,7 @@ solution for Org mode users, using |org-set-property|.
\subsection{Standout frames with Pandoc}
-With Pandoc versions prior 1.17.2 it was not possible to create standout frames
+With Pandoc versions prior to 1.17.2 it was not possible to create standout frames
because Pandoc only supported a specific list of frame attributes thus ignoring
additional attributes such as |{.standout}|.
diff --git a/Master/texmf-dist/doc/latex/moremath/MANIFEST.md b/Master/texmf-dist/doc/latex/moremath/MANIFEST.md
new file mode 100644
index 00000000000..ef52db4ec20
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moremath/MANIFEST.md
@@ -0,0 +1,26 @@
+# Manifest of the `moremath`-package
+
+This file lists all files that are considered to be part of `moremath`.
+
+
+## Source Files
+- `moremath.dtx`: Documentation and package source.
+- `moremath.ins`: Batch file for generating `moremath.sty`
+
+## Text Files
+These plain text files are included as documentation or metadata.
+
+- `README.md`: README file.
+- `MANIFEST.md`: This file.
+
+## Derived Files
+
+These files are derived from other files mentioned above.
+
+### Documentation
+
+- `moremath-doc.pdf`: Package documentation generated from `moremath.dtx`
+
+### Unpacked Package Code
+
+- `moremath.sty`: File generated from `moremath.dtx` by `moremath.ins`.
diff --git a/Master/texmf-dist/doc/latex/moremath/README.md b/Master/texmf-dist/doc/latex/moremath/README.md
new file mode 100644
index 00000000000..4727b4b11db
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moremath/README.md
@@ -0,0 +1,48 @@
+# `moremath`: Convenience Math Macros
+
+The `moremath` package provides convenience shorthand math macros such as
+(auto-)delimited operators, (auto-)delimited vector calculus operators
+and some commands for quickly producing diagonal matrices,
+column, and row vectors.
+
+It depends on [mathtools](https://ctan.org/pkg/mathtools),
+[amssymb](https://ctan.org/pkg/amsfonts),
+and optionally on [bm](https://ctan.org/pkg/bm).
+
+_____
+**Note: This package is still in its initial development phase.**
+
+Its interface may be subject to change until version 1.0.0 has been reached.
+
+_____
+
+## Unpacking the Source Code
+
+To unpack the source code use
+
+``` shell
+TEX moremath.ins
+```
+
+## Generating the Documentation
+
+To produce the documentation run `moremath.dtx` through `*latex`.
+
+
+## License
+
+Copyright (C) 2024 Marcel Ilg
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+https://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+
+The Current Maintainer of this work is Marcel Ilg.
+
+This work consists of the files listed in `MANIFEST.md`.
diff --git a/Master/texmf-dist/doc/latex/moremath/moremath-doc.pdf b/Master/texmf-dist/doc/latex/moremath/moremath-doc.pdf
new file mode 100644
index 00000000000..4a90adc8e7c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moremath/moremath-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/README.md b/Master/texmf-dist/doc/latex/msu-thesis/README.md
index e46f1c7d41f..d1942487f79 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/README.md
+++ b/Master/texmf-dist/doc/latex/msu-thesis/README.md
@@ -1,4 +1,4 @@
-# MSU Thesis Class Version 4.3 2024/06/07
+# MSU Thesis Class Version 4.3b 2024/07/08
Copyright 2011-2024 by Alan Munn <amunn@msu.edu>
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/docs/msu-thesis.tex b/Master/texmf-dist/doc/latex/msu-thesis/docs/msu-thesis.tex
index 4a653326212..ffd0904eb86 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/docs/msu-thesis.tex
+++ b/Master/texmf-dist/doc/latex/msu-thesis/docs/msu-thesis.tex
@@ -2,8 +2,8 @@
\documentclass[11pt]{article}
-\def\msuversion{4.3}
-\def\msudate{2024/06/07}
+\def\msuversion{4.3b}
+\def\msudate{2024/07/08}
\title{\textbf{Using the MSU Thesis Class}}
\author{\textbf{Alan Munn}\\Department of Linguistics, Languages, and Cultures\\Michigan State University\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}}
\date{Version \msuversion\\\msudate}
@@ -467,7 +467,7 @@ Florent Chervet for early \pkg{hyperref} code (up until v.3.6), and Ulrike Fisch
current \pkg{hyperref} code. Thanks to David Carlisle for helping me understand a ridiculous spacing problem.
Thanks also to the following people who have reported
problems over the years: Irina Agafonova, Ali Al-jiboory, Abubakr Ayesh, Julian Blank,
-Nathan Brugnone, Dmitriy Bryndin, Greg Christian, Kyle Crayne, Ciaron Hamilton, Matt Husband, Changkuk
+Nathan Brugnone, Dmitriy Bryndin, Harrison Cassady, Greg Christian, Kyle Crayne, Ciaron Hamilton, Matt Husband, Changkuk
Jung, Minkyu Kim, Claire Kopenhafer, Adam Liter, Vanessa Maldonado, Andriana Manousidaki, Ben Miller, William Muir, Eureka
Pai, Alicia Parrish, Victoria Parrish, Neil ver Planck, Taha Posos, Nick Rekuski, Giacomo Romanini, William Sands, Adam
Soliman, Mookyong Son, Erik Stitt, Fanurs C.E. Teh, Eremey Valetov, Matthew Vincent, Michael Wojcik, Stephen Yowono, Atacan Yücesoy, Ali
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf b/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf
index 89adadc3321..11fe39050a8 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf
+++ b/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-chapterbib-testfile.pdf b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-chapterbib-testfile.pdf
index 6e9c51144e1..2de16c49650 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-chapterbib-testfile.pdf
+++ b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-chapterbib-testfile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/overarrows/README.md b/Master/texmf-dist/doc/latex/overarrows/README.md
index f2139d64993..a70fd1601cb 100644
--- a/Master/texmf-dist/doc/latex/overarrows/README.md
+++ b/Master/texmf-dist/doc/latex/overarrows/README.md
@@ -13,11 +13,11 @@ Julien Labbé <Julien.Labbe@univ-grenoble-alpes.fr> Université Grenoble-Alpes
## Repository
-https://gricad-gitlab.univ-grenoble-alpes.fr/labbeju/latex-packages/-/tree/main/overarrows
+https://github.com/julienlabbe/latex-packages/tree/main/overarrows
## Licence
-Copyright (C) 2023 by Julien Labbé
+Copyright (C) 2023-2024 by Julien Labbé
This file may be distributed and/or modified under the conditions of the LaTeX
Project Public License (LPPL), either version 1.3c of this license or (at your
diff --git a/Master/texmf-dist/doc/latex/overarrows/overarrows-doc.sty b/Master/texmf-dist/doc/latex/overarrows/overarrows-doc.sty
index df8e30f7930..9fc29228d18 100644
--- a/Master/texmf-dist/doc/latex/overarrows/overarrows-doc.sty
+++ b/Master/texmf-dist/doc/latex/overarrows/overarrows-doc.sty
@@ -32,6 +32,7 @@
\lstdefinestyle{lstovardoc}{%
language = [LaTeX]TeX,
columns = flexible,
+ keepspaces = true,
keywordstyle = {\bfseries\color{ovar_darkblue}},
texcsstyle = *{\bfseries\color{ovar_darkblue}},
commentstyle = {\color{gray}},
@@ -126,7 +127,7 @@ actual '='
name=macrocode,
firstnumber=auto,
style = lstovarcode,
- showlines=false,
+ showlines = false,
texcs = [2]{% commands
DeclareOverArrowCommand, ProvideOverArrowCommand,%
NewOverArrowCommand, RenewOverArrowCommand,%
@@ -147,8 +148,9 @@ actual '='
indexstyle = [3]\indexlength,%
texcs = [4]{% internal macros
ovar@rightarrow, ovar@leftarrow, ifovar@option@oldarrows@,
- ifovar@option@esvect@, ifovar@option@tikz@, ifovar@option@pstarrows@,
- ifovar@detectsubscripts@, ifovar@option@debug@,
+ ifovar@option@esvect@, ifovar@option@tikz@, ifovar@option@pstricks@,
+ ifovar@option@pstarrows@, ifovar@detectsubscripts@,
+ ifovar@option@subother@, ifovar@option@subactive@, ifovar@option@debug@,
ifovar@option@overrightarrow@, ifovar@option@underrightarrow@,
ifovar@option@overleftarrow@, ifovar@option@underleftarrow@,
ifovar@option@overleftrightarrow@, ifovar@option@underleftrightarrow@,
@@ -156,26 +158,29 @@ actual '='
ifovar@option@overrightharpoondown@, ifovar@option@underrightharpoondown@,
ifovar@option@overleftharpoonup@, ifovar@option@underleftharpoonup@,
ifovar@option@overleftharpoondown@, ifovar@option@underleftharpoondown@,
- ifovar@option@overbar@, ifovar@option@underbar@, ovar@set, ovar@length@min,
+ ifovar@option@overbar@, ifovar@option@underbar@, ovar@auto@middle,
+ ovar@auto@trim@middle, ovar@subcmd, ovar@set, ovar@length@min,
ovar@before@arrow, ovar@after@arrow, ovar@macro@stack, ovar@macro@arrow,
- ovar@set@, ovar@shift@left, ovar@shift@right, ovar@stack@fill,
- ovar@stackunder@fill, ovar@stack@lens, ovar@stackunder@lens,
- ovar@macro@arrowfill, ovar@arrow@fill, ovar@arrow@start, ovar@trim@start,
- ovar@trim@middle, ovar@arrow@middle, ovar@trim@end, ovar@arrow@end,
- ovar@tikz@command, ovar@tikz@pathoptions, ovar@tikz@path,
- ovar@tikz@options, ovar@picture@geometry, ovar@picture@linethickness,
- ovar@picture@command, ovar@extralength, ovar@tempdim, ovar@set@arrowlength,
- ovar@set@arrowthickness, ovar@stackover@@, ovar@stackunder@@,
- ovar@stackover@, ovar@stackunder@, ovar@stackover@fill,
- ovar@stackover@lens, ovar@set@common, ovar@starversion,
- ovar@testmathstyles, ovar@row@teststyle,%
- ifovar@option@subother@,ifovar@option@subactive@,ovar@subcmd,ovar@testkerning,%
+ ovar@shift@left, ovar@shift@right, ovar@stack@fill, ovar@stackunder@fill,
+ ovar@stack@lens, ovar@stackunder@lens, ovar@macro@arrowfill,
+ ovar@arrow@fill, ovar@arrow@start, ovar@trim@start, ovar@trim@middle,
+ ovar@arrow@middle, ovar@trim@end, ovar@arrow@end, ovar@tikz@command,
+ ovar@tikz@pathoptions, ovar@tikz@path, ovar@tikz@options,
+ ovar@pstricks@geometry, ovar@pstricks@linethickness, ovar@pstricks@psset,
+ ovar@pstricks@command, ovar@picture@geometry, ovar@picture@linethickness,
+ ovar@picture@command, ovar@tempdim, ovar@set@arrowlength,
+ ovar@set@arrowthickness, ovar@set@arrowthickness@UM@lua,
+ ovar@rulethickness@fontdimen, ovar@rulethickness@family, ovar@stackover@@,
+ ovar@stackunder@@, ovar@stackover@, ovar@stackunder@, ovar@stackover@fill,
+ ovar@stackover@lens, ovar@cmdname@processor, ovar@set@common,
+ ovar@starversion, ovar@tempbox, ovar@testmathstyles, ovar@row@teststyle,
+ ovar@testkerning%
},
index = [4][texcs4],%
indexstyle = [4]\indexmacrointernal,%
moretexcs = [5]{% other macros
- Relbar, relbareda, relbaredd, rightarrow, Rightarrow, varleftarrow,
- varrightarrow, twoheadrightarrow,%
+ relbar, Relbar, relbareda, relbaredd, harrowextender, rightarrow,
+ Rightarrow, varleftarrow, varrightarrow, twoheadrightarrow,%
},
}
\csname\@lst @SetFirstNumber\endcsname
diff --git a/Master/texmf-dist/doc/latex/overarrows/overarrows.pdf b/Master/texmf-dist/doc/latex/overarrows/overarrows.pdf
index 7203b11bb3d..701f3ec02fa 100644
--- a/Master/texmf-dist/doc/latex/overarrows/overarrows.pdf
+++ b/Master/texmf-dist/doc/latex/overarrows/overarrows.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/passopt/README.md b/Master/texmf-dist/doc/latex/passopt/README.md
new file mode 100644
index 00000000000..f8eb8f4c437
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/passopt/README.md
@@ -0,0 +1,18 @@
+# The `passopt` package
+Passing options to packages or classes (v1.01a)
+
+## Abstract
+`passopt` allow reset the global options of a loaded macro package or document class, or to change the position of the pre-passed options in the list to the right.
+
+## License
+This work may be distributed and/or modified under the conditions of the CC-BY 4.0 License. The latest version of this license is in https://creativecommons.org/licenses/by/4.0/legalcode
+
+## Website
+| [Gitee](https://gitee.com/texno3/passopt) | [Github](https://github.com/texno3/passopt) | [CTAN](https://ctan.org/pkg/passopt) |
+
+## Maintainer
+Qu Yi<br/>
+Email: toquyi@163.com
+
+## Contributor
+Jonathan P. Spratte \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/passopt/passopt.pdf b/Master/texmf-dist/doc/latex/passopt/passopt.pdf
new file mode 100644
index 00000000000..ce6e437c651
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/passopt/passopt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/passopt/passopt.tex b/Master/texmf-dist/doc/latex/passopt/passopt.tex
new file mode 100644
index 00000000000..fb4473e3567
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/passopt/passopt.tex
@@ -0,0 +1,103 @@
+\documentclass[load-preamble+]{cnltx-doc}
+
+\usepackage{setspace,hologo,changelog,enumitem}
+\usepackage[margin = 1in,marginparwidth = 0.6in,footskip = 0.5in]{geometry}
+\setcnltx
+ {
+ package = passopt,
+ version = v1.01a,
+ date = 2024/07/17,
+ authors = Qu Yi,
+ info = Passing options to packages or classes,
+ email = toquyi@163.com,
+ url = https://github.com/texno3/passopt,
+ abstract =
+ {
+ \pkg*{passopt} allow reset the global options of a loaded macro package or document class, or to change the position of the pre-passed options in the list to the right.
+ },
+ color-scheme = blue,
+ listings-options = {numbers = none,gobble = 2,lineskip = 1pt},
+ pre-output = {\parindent = 0em\setstretch{1.3}},
+ before-skip = \smallskipamount,
+ after-skip = \smallskipamount
+ }
+\makeatletter
+\newcommand{\splitmeta}[2]{\meta{#1}\texttt{,}\meta{#2}}
+\newcommand{\newsplitarg}[4][\splitmeta]
+ {
+ \newcommand{#2}[2]
+ {\code{\textcolor{argument}{#3\textnormal{#1{##1}{##2}}#4}}}
+ }
+\newcommand{\kvsplit}[3]
+ {
+ \item\code{\option{#1}\cnltx@isvalue\splitmarg{#2}{#3}}
+ \cnltx@checkdefault{\hfill\newline}
+ }
+\newsplitarg{\splitoarg}{[}{]}
+\newsplitarg{\splitmarg}{\{}{\}}
+\newsplitarg{\splitdarg}{(}{)}
+\newnote{\newtag}[1]{\textcolor{red}{#1}}
+\renewcommand{\emph}[1]{\textcolor{red}{#1}}
+\renewcommand{\cnltx@write@lastname}{}
+\setlist{nosep,topsep = \smallskipamount}
+\setlist[description,1]{leftmargin = \parindent}
+\setlist[itemize,1]{leftmargin = *}
+\makeatother
+
+\begin{document}
+\section{Preface}
+For a developer, there are some cases where packages and classes may load other packages or classes with options. However, other developers or users may wish to disable the enabled options or enable new ones. To enable new options, \hologo{LaTeXe} provides the \cs{PassOptionsToPackage} and \cs{PassOptionsToClass} commands to pass the options before the package or class is loaded, but the passed options are located on the \textcolor{red}{left} side of the final options list.
+\begin{sourcecode}
+ \PassOptionsToPackage{opt1,opt2=A}{mypackage}
+
+ \documentclass{book}
+ \usepackage[opt3]{mypackage}
+
+ \begin{document}
+\end{sourcecode}
+
+In the example above, the list of options that the \pkg*{mypackage} macro package ends up executing is \fbox{\code{opt1,opt2=A,opt3}}. If you wish to \textcolor{red}{disable} the pre-enabled options or place the newly enabled options to the \textcolor{red}{right} of the list (last executed), then you need to modify the code of the load command in the package or class file, but this is not recommended for public sharing. Therefore, this macro package provides commands to reset the options and change the order of the new options.
+
+\section{User commands}
+Four commands are provided to set the options to be passed later, all of which are \textcolor{red}{locally} assigned. Subsequent loading of the macro package is not must required due to the hook mechanism used to modify the list of options.
+\begin{commands}
+ \command{SetOptionsToPackage}[\sarg\marg{options list}\marg{package}]
+ Passes options to the macro package, the location of the passed options is to the right of the options used when loading the macro package. If an asterisk parameter is used, only the passed options were ultimately retained.
+ \command{SetOptionsToClass}[\sarg\marg{options list}\marg{class}]
+ Similar to the previous command, but passing options for the document class.
+ \begin{sourcecode}
+ \RequirePackage{passopt}
+ \SetOptionsToPackage{opt1,opt2=A}{mypackage}
+
+ \documentclass{book}
+ \usepackage[opt3]{mypackage}
+
+ \begin{document}
+ \end{sourcecode}
+
+ In the example above, the list of options that the \pkg*{mypackage} macro package ends up executing is \fbox{\code{opt3,opt1,opt2=A}}. If the asterisk parameter is used, the list is \fbox{\code{opt1,opt2=A}}.
+
+ Note that since macro packages or document classes can only be loaded effectively once (using the \cs{usepackage} and \cs{RequirePackage} commands), only options passed before the first loading of a macro package or document class are effective, and it is recommended for users to use commands that pass options before \cs{documentclass}.
+ \command{ClearPackageOptions}[\marg{package}]
+ Clears the options that will be loaded into the macro package. The following commands has the same effect as \cs*{SetOptionsToPackage}\code{*}.
+ \begin{sourcecode}
+ \ClearPackageOptions{mypackage}
+ \SetOptionsToPackage{opt1,opt2=A}{mypackage}
+ \end{sourcecode}
+ \command{ClearClassOptions}[\marg{class}]
+ Similar to the previous command, but passing options for the document class.
+\end{commands}
+
+\section{Acknowledgment}
+Thanks Jonathan P. Spratte for the improvement suggestions.
+
+\appendix
+\begin{changelog}[simple]
+ \begin{version}[v = 1.01,date = 2024/07/15]
+ \item Synchronized modification for lists of \code{@raw@opt@} and \code{opt@}.
+ \item Options that are set are expanded once rather than fully expanded.
+ \end{version}
+\end{changelog}
+\nocite{*}
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
index 86e447b2830..140c496d529 100644
--- a/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
+++ b/Master/texmf-dist/doc/latex/pdfx/pdfx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfx/pdfx.xmpdata b/Master/texmf-dist/doc/latex/pdfx/pdfx.xmpdata
deleted file mode 100644
index 66eb6446350..00000000000
--- a/Master/texmf-dist/doc/latex/pdfx/pdfx.xmpdata
+++ /dev/null
@@ -1,33 +0,0 @@
-\Title{Generation of PDF/X- and PDF/A-compliant PDFs with pdfTeX \textemdash\ pdfx.sty}
-\Author{\CVR\sep \Thanh\sep Ross Moore\sep Peter Selinger}
-\Subject{This package supports generation of PDF/X-, PDF/A- and PDF/E-compliant documents, in most of their variants, using pdfLaTeX, LuaLaTeX and XeLaTeX.}
-\Keywords{PDF/X-, PDF/A- and PDF/E-compliance\sep Multilingual Metadata\sep installation\sep \TeX Live \thisyear}
-\PublicationType{manual}
-\Contributor{Norbert Preining: 'colorprofiles' package}
-\Copyright{Public domain.}
-\Copyrighted{False}
-\CopyrightURL{http://tug.org/texlive/}
-\CoverDisplayDate{March \thisyear}
-\CoverDate{\thisyear-03-10}
-\CreatorTool{LaTeX + pdfx.sty with option \pdfxopt, from TeX Live \thisyear}
-\Date{2017-05-18\sep 2017-06-23\sep 2018-11-29\sep 2018-12-22\sep 2019-02-08\sep 2019-03-10}
-\Advisory{An earlier version of this documentation was published as: TUGboat 36, No.2, pp.136\textendash 142 (2015)}
-\Advisory{v1.6: Added XMP support for PDF/UA-1. Added more Metadata fields and Language support.}
-\Advisory{v1.6: Default RGB and CMYK profiles now require the colorprofiles.sty package.}
-\Relation{Requires the colorprofiles package for RGB and CMYK default profiles.}
-\Advisory{v1.6: Access more profiles, incl. to pdfaPilot's color profile folders.}
-\Advisory{v1.6: Revised glyphtounicode.sty to use variation selectors.}
-\Advisory{v1.6: altered maps to PUA codepoints.}
-\Advisory{v1.6: added more glyphs via glyphtounicode-ntx.tex }
-\Advisory{v1.6: Support for 8-bit Hebrew encodings, some Arabic and Devanagari.}
-\Advisory{v1.6: Updated documentation, incl. for LaTeX changes.}
-\Advisory{v1.6.1: Fixed issue with ifthen package; improved Metadata with LuaTeX and XeTeX.}
-\Advisory{v.1.6.1: Flexibility with page boxes for PDF/X.}
-\Advisory{v.1.6.2: Fixed passing of options to xcolor, and some glyphtounicode values.}
-\Advisory{v.1.6.2: Fixed encoding issue. Extra warning when colorprofiles.tex is missing.}
-\Advisory{v.1.6.3: Properly fixed encoding issue; supports \string\pdfomitcharset\ primitive.}
-\Advisory{v.1.6.3: Reference to veraPDF validation software; additions to glyphtounicode-ntx.tex.}
-\Advisory{v.1.6.3: Patched \string\mathaccentV\ to output accents after the base character.}
-\pdfxEnableCommands{%
- \def\CVR{C.V. Radhakrishnan}\def\Thanh{H\`an Th\eee Thanh}%
- \def\eee{^^c3^^aa^^cc^^81 }}
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/README b/Master/texmf-dist/doc/latex/pgf-periodictable/README
index f33f53fa726..b1a6ef2279d 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/README
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/README
@@ -1,4 +1,4 @@
-This is pgf-PeriodicTable, version 2.1.0a (2024/04/03).
+This is pgf-PeriodicTable, version 2.1.1 (2024/07/07).
The purpose of this package is to provide the Periodic Table of Elements in
a simple way. It relies on pgf/TikZ to offer a full or partial periodic table with
@@ -22,6 +22,12 @@ ____________________________________________________________
Major changes:
+*** v2.1.1 (07/07/2024) ***
+New keys:
+- group numbers (to display group numbers in arabic numerals, Roman numerals or both)
+- Roman label color (sets the color of the Roman numerals)
+- O Roman (the oxidation numbers are presnted in Roman numerals)
+
*** v2.1.0a (03/04/2024) ***
Translation files have been renamed from 'lang.{undefined,nl}.tex' to 'pgfPT.lang.{undefined,nl}.tex' to match the runtime tree of TeX Live (names must be globally unique for reliable searching).
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_O.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_O.tex
new file mode 100644
index 00000000000..06f322d5eef
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_O.tex
@@ -0,0 +1,33 @@
+\vfill%
+\subsubsection{\texorpdfstring{\ding{224} The oxidation states}{The oxidation states}}%\vspace{6pt}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% O color
+\pgfPTMoption{4}{O color}{black}{%
+Sets the color of the oxidation states.
+}
+\\ [10pt]\pgfPTMbuildcell(5,3)[(1;1-2;Z),(1;3;radio),(2-3;1.5-3.5;CS),(4;1-3;name),(5;1-3;O)]%
+\pgfPTbuildcell(5,3)[(1;1-2;Z),(1;3;radio),(2-3;1.5-3.5;CS),(4;1-3;name),(5;1-3;O)]%
+\\ [5pt]\pgfPTMmacrobox{pgfPTstyle}[show title=false]%
+\pgfPTstyle[show title=false]%
+\\ [-1pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},O color=red]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},O color=red]}}%
+\\ [0pt]\pgfPTendoption%
+% O font \tiny\bfseries
+\pgfPTMoption{4}{O font}{\string\tiny\string\bfseries}{%
+Sets the font of the oxidation states.
+}
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},O font=\string\itshape\string\tiny]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},O font=\itshape\tiny]}}%
+\\ [0pt]\pgfPTendoption%
+% O Roman
+\newpage\vspace{-34pt}\ %
+\pgfPTMoption[\mbox{\pgfPTnewinversion{2.1.1}}]{4}{O Roman}{false}{%
+When set to \red{true} the oxidation states are displayed in Roman numerals, otherwise they are displayed in arabic numerals.
+}
+%\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},O Roman]%
+%\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},O Roman]}}%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list=spd,O Roman,group numbers=CAS]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list=spd,O Roman,group numbers=CAS]}}%
+\\ [5pt]\pgfPTendoption%
+\pgfPTresetcell%
+\endinput
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex
index e74b8bf418f..c90a4cae942 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex
@@ -12,7 +12,7 @@ For all the \textit{other contents} available for the cells of the periodic tabl
\item\red{\textbf{Ei}}:\hspace{.5ex}first ionization energy
\item\red{\textbf{eneg}}:\hspace{.5ex}electronegativity (Pauling)
\item\red{\textbf{eaff}}:\hspace{.5ex}electroaffnity
-\item\red{\textbf{O}}:\hspace{.5ex}oxidation states
+%\item\red{\textbf{O}}:\hspace{.5ex}oxidation states
\item\red{\textbf{Tmelt}}:\hspace{.5ex}melting point (Kelvin)
\item\red{\textbf{TmeltC}}:\hspace{.5ex}melting point (Celsius degrees)
\item\red{\textbf{Tboil}}:\hspace{.5ex}boiling point (Kelvin)
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_density.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_density.tex
index 2a33c0371e8..511bd765c69 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_density.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_density.tex
@@ -14,28 +14,28 @@ Sets the density value text color.}
\pgfPTMoption{4}{d font}{\string\tiny\string\bfseries}{%
Sets the density value text font.
}
-\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=myd,show title=false]%
-\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},Z list={1,...,36},cell style=myd,show title=false]}}%
-\\ [10pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=myd,show title=false,d font=\string\tiny\string\itshape]%
+%\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=myd,show title=false]%
+%\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},Z list={1,...,36},cell style=myd,show title=false]}}%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=myd,show title=false,d font=\string\tiny\string\itshape]%
\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},Z list={1,...,36},cell style=myd,show title=false,d font=\tiny\itshape]}}%
\\ [0pt]\pgfPTendoption%
-% d unit=<g/cm3|g/dm3|both> .default=g/dm3
\vfill%
+% d unit=<g/cm3|g/dm3|both> .default=g/dm3
\pgfPTMoption[\pgfPTnewinversion{1.0.1}]{4}{d unit}{both}{%
Sets the unit for the density of the elements. The two possible values to this key are \red{g/dm3} ($\mathsf{g/dm^3}$), \red{g/cm3} ($\mathsf{g/cm^3}$) and \red{both} ($\mathsf{g/dm^3}$ for elements in the gaseous state and $\mathsf{g/cm^3}$ for all other elements).
}%
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=myd,show title=false]%
-\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=myd,show title=false]}}%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=myd,show title=false]}}%
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=myd,show title=false,d unit=g/cm3]%
-\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=myd,show title=false,d unit=g/cm3]}}%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=myd,show title=false,d unit=g/cm3]}}%
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=myd,show title=false,d unit=g/dm3]%
-\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=myd,show title=false,d unit=g/dm3]}}%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=myd,show title=false,d unit=g/dm3]}}%
\\ [0pt]\pgfPTendoption%
-\vfill\newpage\ \\ [-32pt]%
+\newpage\ \\ [-32pt]%
% d precision
\pgfPTMoption{4}{d precision}{-1}{%
Sets the density precision, \ie, the decimal places displayed in their value, performing the respective rounding, without zero padding the value.
-\\ [10pt]\tikz{\node[text width=\linewidth-.6666em,fill=orange!5!white,draw=orange,rounded corners=2pt] {\textbf{\red{NOTE}}:\\ Rounding is performed over density values witch actually have a maximum 5 or 8 decimal places, when the values are in $\mathsf{g/dm^3}$ or in $\mathsf{g/cm^3}$, respectively.. So giving this key a value of -1 (the value of the melting or boiling point as-is) or 5 or 8 has the same effect.
+\\ [10pt]\tikz{\node[text width=\linewidth-.6666em,fill=orange!5!white,draw=orange,rounded corners=2pt] {\textbf{\red{NOTE}}:\\ Rounding is performed over density values witch actually have a maximum 5 or 8 decimal places, when the values are in $\mathsf{g/dm^3}$ or in $\mathsf{g/cm^3}$, respectively.. So giving this key a value of -1 (the value of the density as-is) or 5 or 8 has the same effect.
\\ \textit{Therefore the values provided to this key should be any integer between -1 and 4 ($\mathsf{g/dm^3}$) or 7 ($\mathsf{g/cm^3}$). Any other integer provided will be processed as -1.}};}
}
\vfill%\\ [10pt]
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_periodgroup.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_periodgroup.tex
index 59e27e553e5..ff09b0b2e16 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_periodgroup.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_periodgroup.tex
@@ -1,4 +1,3 @@
-%\vfill\vfill%
\subsubsection{\texorpdfstring{\ding{224} Periods and Groups}{Periods and Groups}}%\vspace{6pt}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% show period numbers
@@ -10,17 +9,38 @@
\\ [10pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},show period numbers=false]%
\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},show period numbers=false]}}%
\\ [5pt]\pgfPTendoption%
-%\vfill%
-%\newpage\ \\ [-32pt]%
% show group numbers
\label{option_show group numbers}%
\pgfPTMoption{4}{show group numbers}{true}%
{When set to \red{true} the group numbers are shown, otherwise they are not shown.}%
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36}]%
-\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36}]}}%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36}]}}%
\\ [10pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},show group numbers=false]%
-\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},show group numbers=false]}}%
-\\ [5pt]\pgfPTendoption%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},show group numbers=false]}}%
+\\ [0pt]\pgfPTendoption%
+\vfill%
+% group numbers
+\label{option_group numbers}%
+\pgfPTMoption[\pgfPTnewinversion{2.1.1}]{4}{group numbers}{arabic}%
+{This key controls how group numbering is displayed:
+\vspace{4pt}\begin{itemlist}
+\item\red{\textbf{arabic}}: group numbers are shown in arabic numerals as recommended by IUPAC since 1988.
+\item\red{\textbf{CAS}}: group numbers are shown in Roman numerals and `A' or `B' suffix. This is an older naming scheme, used by the Chemical Abstract Service (CAS), more popular in the United States.
+\item\red{\textbf{IUPAC}}: group numbers are shown in Roman numerals and `A' or `B' suffix. This is an older naming scheme, used by IUPAC before 1988, more popular in Europe.
+\item\red{\textbf{CAS*}}: combines the option \red{CAS} and \red{arabic}. Roman numerals and `A' or `B' suffix are above the group and the arabic numerals above them.
+\item\red{\textbf{IUPAC*}}: combines the option \red{IUPAC} and \red{arabic}. Roman numerals and `A' or `B' suffix are above the group and the arabic numerals above them.
+\end{itemlist}
+}%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group numbers=CAS]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},group numbers=CAS]}}%
+\newpage\vspace{-34pt}\ %\\ [10pt]
+\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group numbers=IUPAC]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},group numbers=IUPAC]}}%
+\\ [10pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group numbers=CAS*]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},group numbers=CAS*]}}%
+\\ [10pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group numbers=IUPAC*]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},group numbers=IUPAC*]}}%
+\\ [0pt]\pgfPTendoption%
\vfill%
% period label color
\label{option_period label color}%
@@ -28,19 +48,26 @@
{Sets the period label color.}%
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},period label color=black]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},period label color=black]}}%
-\\ [5pt]\pgfPTendoption%
-\vfill%
-%\newpage\ \\ [-32pt]%
+\\ [0pt]\pgfPTendoption%
+\newpage\vspace{-34pt}\ %\vfill%
% group label color
\label{option_group label color}%
\pgfPTMoption{4}{group label color}{blue!50!black}%
{Sets the group label color.}%
-\vfill%
-\newpage%\\ [5pt]
-\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group label color=black]%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group label color=black]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},group label color=black]}}%
\\ [0pt]\pgfPTendoption%
\vfill%
+% Roman label color
+\label{option_Roman label color}%
+\pgfPTMoption[\pgfPTnewinversion{2.1.1}]{4}{Roman label color}{blue!70!black}%
+{Sets the Roman group label color.}%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group numbers=CAS*,Roman label color=purple]%
+\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},group numbers=CAS*,Roman label color=purple]}}%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},group numbers=CAS*,Roman label color=purple, group label color=teal]%
+\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},group numbers=CAS*,Roman label color=purple,group label color=teal]}}%
+\\ [0pt]\pgfPTendoption%
+\vfill%
% label font
\label{option_label font}%
\pgfPTMoption{4}{label font}{\string\small\string\bfseries}%
@@ -62,7 +89,6 @@ The key \red{show period numbers} is set to \red{true}.
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},per={gr=false,c=green!50!black}]}}%
\\ [0pt]\pgfPTendstyle%
\vfill%
-%\newpage\ \\ [-32pt]%
% gr={per=??,c=??,f=??} -> auto sets 'show groups numbers=true'; 'show period numbers' can be set to 'false' by the user
% gr/.default={per=true,c=blue!50!black,f=\small\bfseries}
% gr (pseudo style)
@@ -72,11 +98,10 @@ The key \red{show period numbers} is set to \red{true}.
The key \red{show group numbers} is set to \red{true}.
\\ [3pt]\makebox[\linewidth][c]{\use{gr=\{per=<true|false>,c=<color>,f=<font commands>\}}}%
}%
-\vfill%
-\newpage%\\ [5pt]
-\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},gr={per=false,c=green!50!black}]%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},gr={per=false,c=green!50!black}]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},gr={per=false,c=green!50!black}]}}%
\\ [0pt]\pgfPTendstyle%
+\newpage\vspace{-34pt}\ %%
% per+gr={c=??,pc=??,gc=??,f=??} -> auto sets 'show period numbers=true' & 'show groups numbers=true'
% per+gr/.default={pc=red!50!black,gc=blue!50!black,f=\small\bfseries}
% per+gr (pseudo style)
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex
index 70d6e325ca6..ddaee71477b 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex
@@ -1,12 +1,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Definitions for pgf-PeriodicTable Manual
-% Hugo Gomes @ 04/03/2024 v2.1.0a
+% Hugo Gomes @ 07/07/2024 v2.1.1
+% Hugo Gomes @ 03/04/2024 v2.1.0a
% Hugo Gomes @ 14/02/2024 v2.1.0
% Hugo Gomes @ 29/05/2023 v2.0.1
% Hugo Gomes @ 20/02/2023 v2.0.0
% Hugo Gomes @ 08/11/2022 v1.0.1
% Hugo Gomes @ 10/10/2022 v1.0.0
-\def\pgfPTversion{2.1.0a}%
+\def\pgfPTversion{2.1.1}%
\def\pgfPTnewinversion#1{new in v#1}%
\def\pgfPTchangedinversion#1{changed in v#1}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf b/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf
index 7c0b250d7c0..c588490c487 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.tex
index 659f09fd727..c2b22dd9ad3 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.tex
@@ -10,7 +10,7 @@
\date{\today}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}%
-\usefont{T1}{verdana}{m}{n}%
+\usefont{T1}{vna}{m}{n}
\begin{titlepage}
\vspace{\stretch{1}}%
\maketitle\thispagestyle{empty}%
@@ -114,8 +114,8 @@ This option works with the \textrm{Xe\LaTeX} and \textrm{Lua\LaTeX} engines to t
\\ [3pt]\pgfPTMline
\subsection{Interaction with other packages}
\subsubsection{fontspec}
-To correctly set the font in each cell contents the command \bs{fontspec} must be used. For example if you want to use \textit{Arial} for the \red{name font}, it must be set using \red{font name=\bs{fontspec}\lb Arial\rb\bs{selectfont}}.\\ All other font selection commands, \eg, \bs{large}, \mbox{\bs{itshape}}, are used as usual. For example if you want to use \textit{Arial}\hfil\ in\hfil\ \textit{large}\hfil\ size\hfil\ and\hfil\ \textit{bold}\hfil\ weight\hfil\ for\hfil\ the \red{name font}, then you type
-\\ \makebox[\linewidth][s]{\red{font name=\bs{large}\bs{bfseries}\bs{fontspec}\lb Arial\rb\bs{selectfont}}\hfil\ or\hfil\ \red{font name=\bs{fontspec}\lb Arial\rb}}
+To correctly set the font in each cell contents the command \bs{fontspec} must be used. For example if you want to use \textit{Arial} for the \red{name font}, it must be set using \red{name font=\bs{fontspec}\lb Arial\rb\bs{selectfont}}.\\ All other font selection commands, \eg, \bs{large}, \mbox{\bs{itshape}}, are used as usual. For example if you want to use \textit{Arial}\hfil\ in\hfil\ \textit{large}\hfil\ size\hfil\ and\hfil\ \textit{bold}\hfil\ weight\hfil\ for\hfil\ the \red{name font}, then you type
+\\ \makebox[\linewidth][s]{\red{name font=\bs{large}\bs{bfseries}\bs{fontspec}\lb Arial\rb\bs{selectfont}}\hfil\ or\hfil\ \red{name font=\bs{fontspec}\lb Arial\rb}}
\\ \bs{large}\bs{bfseries}\bs{selectfont}.
\subsubsection{ragged2e}
Using \texttt{\large\textcolor{green!40!black}{\textbackslash usepackage}\textcolor{blue!70!black}{[}\textcolor{brown!60!black}{document}%
@@ -203,6 +203,8 @@ The following options and styles are used for customizing the contents available
\input{manualfiles/pgf-PeriodicTableManual_name.tex}%
\label{file:Ar}%
\input{manualfiles/pgf-PeriodicTableManual_Ar.tex}%
+\label{file:O}%
+\input{manualfiles/pgf-PeriodicTableManual_O.tex}%
\label{file:density}%
\input{manualfiles/pgf-PeriodicTableManual_density.tex}%
\label{file:ls}%
diff --git a/Master/texmf-dist/doc/latex/pgf-spectra/README b/Master/texmf-dist/doc/latex/pgf-spectra/README
index 3f4fef79e28..12c4c6b8ada 100644
--- a/Master/texmf-dist/doc/latex/pgf-spectra/README
+++ b/Master/texmf-dist/doc/latex/pgf-spectra/README
@@ -1,4 +1,4 @@
-This is pgf-spectra, version 3.0.1 (27/04/2023).
+This is pgf-spectra, version 3.0.1a (07/07/2024).
This package provides the \pgfspectra[<options>] command which draws continuous and emission or absorption spectra for 98 elements and their ions.
It was developed mainly for the writing of my own documentation and exams sheets supporting directly PDF output format.
@@ -7,7 +7,7 @@ It also allows the user to draw a spectrum with their own personal data.
The lines data extends from Extreme UV to Near IR (from 10 to 4000 nanometers).
It is possible to redshift the lines of a spectrum, by directly entering the redshift value or the velocity and the angle to compute the redshift value.
Spectral lines data can be presented in a table or exported to a file.
-This package also provides color conversion (correlated color temperature), shadings for use with TikZ and/or PGFPLOTS, color maps for use with PGFPLOTS,
+This package also provides color conversion (correlated color temperature), shadings for use with TikZ and/or PGFPLOTS, color maps for use with PGFPLOTS,
displaying the spectral lines in a table and exporting the lines data files.
____________________________________________________________
@@ -18,13 +18,24 @@ ____________________________________________________________
** Licence: released under the LaTeX Project Public License v1.3 or later, see http://www.latex-project.org/lppl.txt
____________________________________________________________
+*** v3.0.1a (07/07/2024) ***
+Removed lines data outside the range 10nm - 4000nm (H, He, Be, C, Si, Kr, Sn, I) in LSE data file, which generate a package warning, e.g.
+«Package pgf-spectra Warning: invalid wavelength (4051.1602nm). The wavelength must be lesser or equal to 4000nm (NIR)... on input line 27».
+Fixed chemical symbol label width producing incorrect alignment on consecutive lines for the spectrum of some elements, e.g.
+-------------------------------------------------------
+\pgfspectraStyle[axis,begin=400,end=700,axis step=20,axis ticks=9,axis color=lightgray, axis font color=black,label,width=.88\textwidth,height=0.7cm]
+\noindent\pgfspectra[element=Cl]
+
+\noindent\pgfspectra[element=Rn]
+-------------------------------------------------------
+
*** v3.0.1 (27/04/2023) ***
-Fixed a small bug dealing with the 'axis label'/'axis label text' background color, which occurred when setting a visible background with the 'back' key, e.g.,
+Fixed a small bug dealing with the 'axis label'/'axis label text' background color, which occurred when setting a visible background with the 'back' key, e.g.,
\pgfspectra[element=H,axis label text={wavenumber in nanometer},back=visible50]
*** v3.0.0 (25/04/2023) ***
-In the \pgfspectra command, syntax for the key 'lines' has been updated: it is now possible to specify a continuous range using 'start wavelength to end
+In the \pgfspectra command, syntax for the key 'lines' has been updated: it is now possible to specify a continuous range using 'start wavelength to end
wavelength', for instance, 'lines={380 to 500}' or 'lines={380 to 500,633}' or 'lines={633,555,380 to 500}'.
New keys for \pgfspectra:
- axis label
@@ -45,12 +56,12 @@ ____________________________________________________________
Previous versions
*** v2.2.0 (21/02/2023) ***
-LSE data renormalized to lower values within TeX capabilities. This prevents 'Dimension too large' errors and subsequent errors in spectrum drawing when
+LSE data renormalized to lower values within TeX capabilities. This prevents 'Dimension too large' errors and subsequent errors in spectrum drawing when
using the 'relative intensity' key.
-Added maximum intensities in IR, visible an UV ranges for both data sources (NIST and LSE). Now, when using the 'relative intensity' key, the interval of
-wavelengths is detected and the respective maximum intensity is used. For example, if the spectrum is within the visible range, say between 400 and 700
-nanometers, the maximum visible intensity will be used. The same is true for ranges only in IR or UV ranges. But, if the spectrum to be drawn is in more
-than one region - for example, from 300 to 1000 or from 400 to 1000 or from 300 to 700 nanometers - the maximum intensity that will be used is defined
+Added maximum intensities in IR, visible an UV ranges for both data sources (NIST and LSE). Now, when using the 'relative intensity' key, the interval of
+wavelengths is detected and the respective maximum intensity is used. For example, if the spectrum is within the visible range, say between 400 and 700
+nanometers, the maximum visible intensity will be used. The same is true for ranges only in IR or UV ranges. But, if the spectrum to be drawn is in more
+than one region - for example, from 300 to 1000 or from 400 to 1000 or from 300 to 700 nanometers - the maximum intensity that will be used is defined
as the maximum intensity of all data.
Fixed some typos in the manual.
diff --git a/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.pdf b/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.pdf
index e003e00f809..a627994bbf8 100644
--- a/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.pdf
+++ b/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.tex b/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.tex
index 16616704042..4ffb5d4c87c 100644
--- a/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.tex
+++ b/Master/texmf-dist/doc/latex/pgf-spectra/pgf-spectraManual.tex
@@ -20,12 +20,12 @@
\setlength{\parindent}{0pt}
\setlength{\oddsidemargin}{0pt}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\version{3.0.1}%
+\def\version{3.0.1a}%
\def\inversion#1{#1}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage[pdfstartview={ },colorlinks=true, linkcolor=black!50!green, citecolor=gray, urlcolor=teal, hyperindex, plainpages=false,bookmarksopenlevel=1,bookmarksopen=true]{hyperref}%
\hypersetup{%Start options on pdf
-pdftitle = {Manual for pgf-spectra (v\inversion{3.0.1})},%
+pdftitle = {Manual for pgf-spectra (v\inversion{3.0.1a})},%
pdfsubject = {Emission and absorption lines of the elements},%
pdfkeywords = {Draw the spectrum of elements in a simple way via pgf/TikZ environment. It's possible to draw a desired spectrum, continuous or discrete.},%
pdfauthor = {\textcopyright Hugo Gomes},%
@@ -80,7 +80,7 @@ pdfproducer = {pdfeTeX-1.\the\pdftexversion\pdftexrevision},
\end{titlepage}
\newpage%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\pagestyle{empty}%
+\pagestyle{empty}\enlargethispage{\baselineskip}%
\pdfbookmark[1]{Table of contents}{pdfContents}%
\tableofcontents%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -97,6 +97,18 @@ pdfproducer = {pdfeTeX-1.\the\pdftexversion\pdftexrevision},
\vfill\vfill\vfill\newpage
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{What's new}
+\vspace{-32pt}\ \subsection*{}{\normalfont\large\bfseries\raisebox{1.25pt}{$\mathbf{\blacktriangleright}$}\ In version 3.0.1a}%
+\addcontentsline{toc}{subsection}{In version 3.0.1a}%
+\begin{itemize}
+\item Removed lines data outside the range $10\,nm$ -- $4000\,nm$ (H, He, Be, C, Si, Kr, Sn, I) in LSE data file, which generate a package warning, e.g.
+\texttt{Package pgf-spectra Warning: invalid wavelength (4051.1602nm). The wavelength must be lesser or\\ equal to 4000nm (NIR)... on input line 27}.
+\item Fixed chemical symbol label width producing incorrect alignment on consecutive lines for the spectrum of some elements, e.g.
+\\ \makebox[\linewidth][s]{\hrulefill}
+\\ \txtspecstyle[axis,begin=400,end=700,axis step=20,axis ticks=9,\\ axis color=lightgray,axis font color=black,label,width=.88\string\textwidth,height=0.7cm]
+\\ \bs{noindent}\bs{pgfspectra}\lp\red{element=Cl}\rp
+\\ \bs{noindent}\bs{pgfspectra}\lp\red{element=Rn}\rp
+\\ \makebox[\linewidth][s]{\hrulefill}
+\end{itemize}
\vspace{-32pt}\ \subsection*{}{\normalfont\large\bfseries\raisebox{1.25pt}{$\mathbf{\blacktriangleright}$}\ In version 3.0.1}%
\addcontentsline{toc}{subsection}{In version 3.0.1}%
\begin{itemize}
@@ -242,7 +254,7 @@ with the following specific keys% \pgfspectraplotshade[options]{name}
\\ [10pt]According to the information on the page the listed lines are based on "Line Spectra of the Ele\-ments", Joseph Reader and Charles H. Corliss CRC Handbook of Chemistry and Physics. This book refers that The table contains the outstanding spectral lines of neutral ($I$) and singly ionized ($II$) atoms of the elements from hydrogen through plutonium ($Z=1-94$); selected strong lines from doubly ionized ($III$), triply ionized ($IV$), and quadruply ionized ($V$) atoms are also included.
\\ [6pt]\makebox[66pt][s]{}\begin{minipage}{\linewidth-66pt}\color{black!70}\small Note: pst-spectra documentation refers "\textit{Line Spectra of the Elements from the Astronomical Data Center of NASA}" as the source material, but I'm assuming the original source is "\textit{Line Spectra of the Ele\-ments}"\textit{, Joseph Reader and Charles H. Corliss CRC Handbook of Chemistry and Physics}, obtained from \href{http://cdsarc.u-strasbg.fr/viz-bin/Cat?VI/16}{http://cdsarc.u-strasbg.fr/viz-bin/Cat?VI/16}.\end{minipage}
\\ [12pt]\tikz{\node[text width=\linewidth-4mm,draw=purple,rounded corners=2pt,fill=black!10!purple!10,inner sep=2mm,text justified] {To use this data set load the package \pack{} with the option \verb|LSE| (acronym to Line Spectra of the Elements):%
- \\ [6pt]\large\color{purple}\verb|\usepackage[LSE]{pgf-spectra}|\\ [6pt]\small\color{orange}\hfill Number of lines provided: 46065 (see file pgf-spectraDataLSE.pdf)};}
+ \\ [6pt]\large\color{purple}\verb|\usepackage[LSE]{pgf-spectra}|\\ [6pt]\small\color{orange}\hfill Number of lines provided: 46031 (see file pgf-spectraDataLSE.pdf)};}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Data based on NIST}
\tikz{\node[text width=\linewidth-4mm,draw=teal,rounded corners=2pt,fill=black!10,inner sep=2mm,text centered] {This set was obtained from \href{https://physics.nist.gov/PhysRefData/Handbook/Tables/findinglist.htm}{https://physics.nist.gov/PhysRefData/Handbook/Tables/findinglist.htm}};}
@@ -2318,7 +2330,7 @@ colorbar horizontal,colormap access=map]
\\ \header
\\ [-1pt]\linhaimpar{\hyperlink{optionlib:backcolor}{back color}}{background color of the table header, of the \textit{element(s)} column, of the table border lines and of the lines between rows}{color}{black!10}{any named color or user defined color}%
\\ [-1pt]\linhapar{\hyperlink{optionlib:databackcolor}{data back color}}{the background color of each data row}{color}{white}{any named color or user defined color}%
-\\ [-1pt]\linhaimpar{\hyperlink{optionlib:elementscolumnwidth}{elements column width}}{the width of the \textit{element(s)} column}{length}{2.5em}{up to maximum \TeX\ dimension (16384pt)}%
+\\ [-1pt]\linhaimpar{\hyperlink{optionlib:elementscolumnwidth}{elements column\vskip0pt width}}{the width of the \textit{element(s)} column}{length}{2.5em}{up to maximum \TeX\ dimension (16384pt)}%
\\ [-1pt]\linhapar{\hyperlink{optionlib:textcolor}{text color}}{the color of all text in the table}{color}{black}{any named color or user defined color}%
\\ [-1pt]\linhaimpar{\hyperlink{optionlib:title}{title}}{the title in the table header}{text}{<REDSHIFTED>\\ SPECTRAL LINES OF ELEMENT(S) \ldots}{}%
\\ [-1pt]\linhapar{\hyperlink{optionlib:width}{width}}{the total width of the table}{length}{\textbackslash linewidth}{up to maximum \TeX\ dimension (16384pt)}%
diff --git a/Master/texmf-dist/doc/latex/photobook/Makefile b/Master/texmf-dist/doc/latex/photobook/Makefile
index 59b7ea002c8..19edca368e3 100644
--- a/Master/texmf-dist/doc/latex/photobook/Makefile
+++ b/Master/texmf-dist/doc/latex/photobook/Makefile
@@ -85,8 +85,7 @@ endif
# markdown dialect...
#
-# XXX still needs some tweaking...
-MD_FORMAT ?= markdown_github
+MD_FORMAT ?= gfm
# debug output...
@@ -173,26 +172,11 @@ LN := cp -l
# - |..| - verbatim does not work...
# - || - parts of doc omitted...
# - verbatim blocks get merged sometimes...
+# - does not resolve \jobname in include...
# - ...
# ...not sure if this can be tweaked...
-#%.md: %.tex
-# pandoc -t $(MD_FORMAT) -s $< -o $@
-
-# XXX EXPERIMENTAL...
-# XXX revise:
-# ...for this to work we need to replace:
-# \documentclass{ltxdoc}
-# to:
-# \documentclass[markdownextra]{internet}
-# XXX install the internet class...
-# https://github.com/loopspace/latex-to-internet
-# ...needs testing...
%.md: %.tex
- cat $< \
- | sed 's/documentclass{ltxdoc}/documentclass[markdownextra]{internet}/' \
- > $<.tmp
- mv $<{.tmp,}
- $(TEX) $< $(STDERR)
+ pandoc -t $(MD_FORMAT) -s $< -o $@
# meta-section...
diff --git a/Master/texmf-dist/doc/latex/photobook/README.md b/Master/texmf-dist/doc/latex/photobook/README.md
index 13daa3c373a..7055717be06 100644
--- a/Master/texmf-dist/doc/latex/photobook/README.md
+++ b/Master/texmf-dist/doc/latex/photobook/README.md
@@ -28,7 +28,7 @@ $ make install
The `photobook` document class requires a set of modules to be installed
for it to function, the full list is included in the docs and can be
-printed by calling:
+generated and printed by calling:
```shell
$ make depends
```
@@ -39,7 +39,8 @@ For more info on `make` targets see the: [./Makefile](./Makefile)
# Documentation
-Pre-built documentation can be found on
+Pre-built documentation can be found in the
+[Github releases](https://github.com/flynx/photobook/releases/latest) or on
[CTAN](http://mirrors.ctan.org/macros/latex/contrib/photobook/photobook.pdf).
@@ -69,7 +70,7 @@ Build requirements for docs:
## Notes
-- The main refetence is inline with the source [photobook.cls](./photobook.cls)
+- The main reference is maintained inline with the source [photobook.cls](./photobook.cls)
thus it is both human-readable next to the code it documents and is
used to build the `photobook.pdf`.
Extracting the documentation source (`photobook*.tex`) is done
diff --git a/Master/texmf-dist/doc/latex/photobook/photobook.pdf b/Master/texmf-dist/doc/latex/photobook/photobook.pdf
index 5e785e73cf6..3e31d7fedcf 100644
--- a/Master/texmf-dist/doc/latex/photobook/photobook.pdf
+++ b/Master/texmf-dist/doc/latex/photobook/photobook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/README.md b/Master/texmf-dist/doc/latex/polyglossia/README.md
index d0ba2a157a3..a3f65bbb9d6 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/README.md
+++ b/Master/texmf-dist/doc/latex/polyglossia/README.md
@@ -1,4 +1,4 @@
-# THE POLYGLOSSIA PACKAGE v2.1
+# THE POLYGLOSSIA PACKAGE v2.2
## Multilingual typesetting with XeLaTeX and LuaLaTeX
This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX.
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
index 20caa55173c..4808227a41a 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex
index 939f20665da..0e7a197b09d 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex
@@ -4,7 +4,12 @@
\usepackage{xltxtra,url,amsmath}
\setmainfont{Linux Libertine O}
\defaultfontfeatures{Scale=MatchLowercase}
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ Extension = .ttf,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic]
\newfontfamily\arabicfonttt[Script=Arabic,Scale=.75]{DejaVu Sans Mono}
\newfontfamily\farsifont[Script=Arabic,Scale=1.1,WordSpace=2]{IranNastaliq}
\let\XeTeX\undefined
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-chinese.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-chinese.pdf
deleted file mode 100644
index 394f0071ca0..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-chinese.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-japanese.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-japanese.pdf
deleted file mode 100644
index 61c74d82115..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-japanese.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
index 06feebd9740..dba7be728be 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-odia.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-odia.pdf
deleted file mode 100644
index a17158697c5..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-odia.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
index 12f2c1f0939..b291acb0b5e 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex b/Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex
new file mode 100644
index 00000000000..b226e61f186
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex
@@ -0,0 +1,128 @@
+% !TeX TS-program = xelatex
+\documentclass[a4paper]{book}
+\usepackage{polyglossia}
+\usepackage{graphicx}
+\usepackage{url,amsmath}
+
+\setmainlanguage{uyghur}
+\newfontfamily\arabicfont[Script=Arabic,Scale=1]{UKIJ Tuz}
+\let\arabicfonttt\ttfamily
+
+\setotherlanguage[variant=british]{english}
+
+\title{لاتېكىس قوللانمىسى}
+\author{neouyghur}
+\date{\today}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\listoffigures
+
+\listoftables
+
+\pagenumbering{arabic}
+
+\chapter{ئۇيغۇرلار}
+
+\section{ئۇيغۇرلار ۋە ئۇلارنىڭ تۇرمۇش مەدەنىيىتى}
+
+ئۇيغۇرلار شىنجاڭ ئۇيغۇر ئاپتونوم رايونىنىڭ ھەقىقىي ئىگىلىرى ۋە مىراسخورلىرى بولۇپ، بۇ رايوندا توپلىشىپ ياشايدىغان غوللۇق، يەرلىك مىللەت ۋە ئاپتونومىيە ھوقۇقى يۈرگۈزگۈچى مىللەت. ئۇيغۇرلار پارچە ھالەتتە، جۇڭگونىڭ بىر قاتار چوڭ شەھەرلىرىدە خىزمەت ۋە تىجارەت قىلىدۇ. ئۇيغۇرلار شىنجاڭ ئۇيغۇر ئاپتونوم رايونىدىن باشقا، يەنە جۇڭگو، قازاقىستان، قىرغىزىستان، ئۆزبېكىستان، تاجىكىستان، تۈركمەنىستان (ئاساسلىقى بايرام ئەلى رايونى)، پاكىستان، ئەرەبىستان، تۈركىيە، ئاۋسترالىيە، گېرمانىيە، نورۋىگىيە، گوللاندىيە، شىۋىتسىيە، فىنلاندىيە، بېلگىيە، روسيە، ئامېرىكا قاتارلىق دۆلەتلەردە كۆرۈنەرلىك نوپۇستا، مۇئەييەن جامائەت تۈركۈمى شەكلىدە ياشايدۇ.
+
+\begin{english}
+The \textbf{Uyghurs}\footnote{%
+ From \url{https://en.wikipedia.org/wiki/Uyghurs}} have traditionally inhabited a series of oases scattered across the Taklamakan Desert within the Tarim Basin. These oases have historically existed as independent states or were controlled by many civilizations including China, the Mongols, the Tibetans and various Turkic polities. The Uyghurs gradually started to become Islamized in the 10th century and most Uyghurs identified as Muslims by the 16th century. Islam has since played an important role in Uyghur culture and identity.
+\end{english}
+
+\section{نىكاھ}
+ئۇيغۇرلاردا نىكاھ مۇناسىۋىتى بىلەن چاي ئىچكۈزۈش، توي ئالدىدىكى مەسلىھەت چايلىرى، نىكاھ ئوقۇپ قىز-يىگىتنىڭ رازىلىقىنى ئېلىش، توي مۇراسىمى، يىگىت-قىزلار ئولتۇرۇشى، قۇدىلار چىللاقلىرى ئىزچىل ساقلىنىپ كەلدى. ئۇيغۇرلاردا دەپنە مۇراسىمى ھەرقايسى دىنىي مەدەنىيەتلەر تەسىرىدە ھەرخىل بولسىمۇ، ئەمما مېيىتنى پاكىزە يۇيۇپ كېپەنلەش، ھازىدارلار ئاق رومال سېلىپ، ئاق بەلۋاغ باغلاپ يىغا-زارە قىلىش، مېيىتنىڭ نامىزىنى چۈشۈرۈش، جىنازىنى ئالمىشىپ تالىشىپ كۈتۈرۈپ قەبرىستانلىققا ئېلىپ بېرىش، لەھەتتە مېيىتنىڭ يۈزىنى قىبلە (غەرب) تەرەپكە قىلىپ ياتقۇزۇش، ئىچ گۆرنىڭ ئاغزىنى كېسەك بىلەن ئېتىپ، تاش گۆرنى توپا بىلەن كۆمۈش، قەبرە بېشىدا مېيىتنىڭ ئىجابىي تەرىپىگە گۇۋاھلىق بېرىش، قەبرە تېشى-گۈمبەز ئورنىتىش، مېيىتنىڭ يەتتە، قىرىق، يىل نەزىرلىرىنى ئۆتكۈزۈش ئادەتلىرى بىردەك ئىزچىل بۇلۇپ كەلدى. ئۇيغۇرلار ۋە ئۇلارنىڭ ئەجدادلىرى مېيىت سۆڭىكىنى كاھىش (ساپال) ساندۇققا سېلىپ يەرلىككە قۇيۇش، مېيىتنى تاش گۆرگە كۆمۈش، مېيىتنى ئاستىغا ياغاچ شادا قويۇلغان گۆرگە ياتقۇزۇپ، ئۈستىگە قىزىل تۇپراق ۋە قۇم تۆكۈپ كۆمۈش، شام گۆرگە قويۇش قاتارلىق دەپنە قىلىش ئۇسۇللىرىنىمۇ قوللاندى.
+
+\section{ھېيت-ئايەم}
+
+
+\begin{figure}
+ \begin{center}
+\includegraphics[scale=1]{example-image-a}
+\caption{ئا رەسىم.}
+ \end{center}
+\end{figure}
+
+\begin{table}
+\begin{center}
+ \begin{tabular}{||c c c c||}
+ \hline
+ Col1 & Col2 & Col2 & Col3 \\ [0.5ex]
+ \hline\hline
+ 1 & 6 & 87837 & 787 \\
+ \hline
+ 2 & 7 & 78 & 5415 \\
+ \hline
+ 3 & 545 & 778 & 7507 \\
+ \hline
+ 4 & 545 & 18744 & 7560 \\
+ \hline
+ 5 & 88 & 788 & 6344 \\ [1ex]
+ \hline
+ \end{tabular}
+ \caption{بىر سىناق جەدۋەل}
+\end{center}
+\end{table}
+
+\begin{equation}
+ x^2 + y^2 = z^2
+ \label{test}
+\end{equation}
+
+
+\chapter{مەڭگۈ تاش يادىكارلىقلىرى}
+
+\section{تەس مەڭگۈ تېشى}
+بۇ مەڭگۈ تاش يادىكارلىقى 1976- يىلى موڭغۇلىيەدىكى تەس دەرياسىنىڭ سول قىرغىدىكى نوغۇن تولغوي ئىگىزلىكىنىڭ يېنىدىن تېپىلغانلىقى ئۈچۈن، «تەس مەڭگۈ تېشى» دەپ ئاتالغان. «تەس مەڭگۈ تېشى» ئورخۇن ئۇيغۇر خانلىقى دەۋرىگە مەنسۇپ يادىكارلىقلارنىڭ ئىچىدە بۇزغۇنچىلىققا ئۇچرىشى ئېغىرراق. ئەڭ مۇھىم بولغان يازما يادىكارلىق. ئۇنىڭدا بۆگۈ قاغان (759- 780- يىللار) ئەجدادى (دادىسى) بولغان ئەل ئەتمىش بىلگە قاغان (مويۇنچۇر، 747- 759- يىللار9 دەۋرىگىچە بولغان ئۇيغۇر قاغانلىرىنىڭ تارىخى، جۈملىدىن بىرىنچى ۋە ئىككىنچى ئۇيغۇر خانلىقىنىڭ تەقدىرى. كۆل بىلگە قاغان ۋە ئەل ئەتمىش بىلگە قاغان باشچىلىقىدىكى ئۈچىنچى ئۇيغۇر خانلىقىنىڭ بەرپا بولۇشى قاتارلىق مەسىلىلەر ھەققىدە مەلۇمات بېرىلگەن. بۇ ھەقتىكى بىر قىسىم مەزمۇنلار كونا- يېڭى تاڭنامىلەردە ئۇچرىمايدۇ. شۇڭا تەس مەڭگۈ تېشىدىكى مەلۇماتلار زور سېلىشتۇرما قىممەتكە ئىگە. تەتقىقاتلارغا قارىغاندا، «تەس مەڭگۈ تېشى» نىڭ ئاپتورى مويۇنچۇر قاغاننىڭ يېقىن تۇققىنى تۈپەك ئالىپ شۇل دېگەن كىشى بولۇپ، مەڭگۈ تاشنى قاغان يېڭىدىن تەختكە چىققان ۋاقىتتا توغرىسى 761- 762- يىللىرى ئورنىتىلغان، دېيىشكە بولىدۇ.
+
+
+\begin{table}
+ \begin{center}
+ \begin{tabular}{||c c c c||}
+ \hline
+ Col1 & Col2 & Col2 & Col3 \\ [0.5ex]
+ \hline\hline
+ 1 & 6 & 87837 & 787 \\
+ \hline
+ 2 & 7 & 78 & 5415 \\
+ \hline
+ 3 & 545 & 778 & 7507 \\
+ \hline
+ 4 & 545 & 18744 & 7560 \\
+ \hline
+ 5 & 88 & 788 & 6344 \\ [1ex]
+ \hline
+ \end{tabular}
+ \caption{يەنە بىر سىناق جەدۋەل}
+ \end{center}
+\end{table}
+
+\section{تېرخىن مەڭگۈ تېشى}
+
+\begin{figure}
+ \begin{center}
+ \includegraphics[scale=0.5]{example-image-b}
+ \caption{ب رەسىم.}
+ \end{center}
+\end{figure}
+
+\begin{thebibliography}{9}
+ \bibitem{latexcompanion}
+ Michel Goossens, Frank Mittelbach, and Alexander Samarin.
+ \textit{The \LaTeX\ Companion}.
+ Addison-Wesley, Reading, Massachusetts, 1993.
+
+ \bibitem{einstein}
+ ئو. تۇرسۇن.
+ \textit{لاتېكىست قوللانمىسى}. (ئۇيغۇرچە)
+ [\textit{بىر ژورنال}]. , 322(10):891–921, 1905.
+\end{thebibliography}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf b/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
index 05d7cac61ce..ad1d2d4f693 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/examples.tex b/Master/texmf-dist/doc/latex/polyglossia/examples.tex
index 7e331b70d45..09beb075e70 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/examples.tex
+++ b/Master/texmf-dist/doc/latex/polyglossia/examples.tex
@@ -16,7 +16,12 @@
\setmainfont{Linux Libertine O}
\defaultfontfeatures{Scale=MatchLowercase}
\setmonofont{Inconsolata}
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ Extension = .ttf,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic]
\newfontfamily\syriacfont[Script=Syriac]{Serto Jerusalem}
\newfontfamily\hebrewfont[Script=Hebrew]{Ezra SIL}
\newfontfamily\sanskritfont[Script=Devanagari]{Sanskrit 2003}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
index d218332d9b0..f7b12a7bd6b 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
index 1d4fc5e4aac..77fb0f02ac3 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
+++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
@@ -23,8 +23,10 @@
]{hyperref}
\usepackage{array}
\usepackage{metalogo}
-\let\XeTeX\undefined
-\let\XeLaTeX\undefined
+\ifxetex
+ \let\XeTeX\undefined
+ \let\XeLaTeX\undefined
+\fi
\usepackage[babelshorthands]{polyglossia}
\usepackage{farsical}
%
@@ -124,15 +126,23 @@
\usepackage[osf]{libertine}
% Monospace: Package dejavu-otf
\setmonofont[Scale=MatchLowercase]{DejaVuSansMono}
-% Libertine includes Hebrew, but we load it separately since
-% osf is not supported with this script and we want to avoid the
-% respective warnings
-\newfontfamily\hebrewfont[Script=Hebrew]{Linux Libertine O}
+% Package culmus
+\newfontfamily\hebrewfont[Script=Hebrew]{DavidCLM}[
+ UprightFont = *-Medium,
+ BoldFont = *-Bold,
+ Extension = .otf,
+ ItalicFont = *-MediumItalic,
+ BoldItalicFont = *-BoldItalic]
% Package dejavu-otf
\newfontfamily\armenianfont[Script=Armenian,Scale=MatchLowercase]{DejaVuSans}
\newfontfamily\georgianfont[Scale=MatchLowercase]{DejaVuSerif}
% Package amiri
-\newfontfamily\arabicfont[Script=Arabic]{Amiri-Regular}
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ Extension = .ttf,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic]
% No Syriac otf/ttf font seems available on CTAN
% This one, from the Syriac Institute, is included on Linux
% in the x11-fonts set and can be downloaded from
@@ -457,7 +467,7 @@ Table~\ref{tab:BCP47-polyglossia} lists the currently supported tags.
dv & divehi & \tabularnewline
el & greek & \tabularnewline
el-monoton & greek & variant=monotonic [\emph{default}] \tabularnewline
- el-polyton & greek & varant=polytonic \tabularnewline
+ el-polyton & greek & variant=polytonic \tabularnewline
en & english & \tabularnewline
en-AU & english & variant=australian \tabularnewline
en-CA & english & variant=canadian \tabularnewline
@@ -771,13 +781,25 @@ see sec.~\ref{sec:langtags}).
\section{Font setup}
-With polyglossia it is possible to associate a specific font with any script or language
+With \pkg{polyglossia} it is possible to associate a specific font with any script or language
that occurs in the document. That font should always be defined as
-\cmd{\⟨script⟩font}\ or \cmd{\⟨language⟩font}.
+\cmd{\⟨script⟩font}\ or \cmd{\⟨language⟩font}. Note that ¦⟨language⟩¦ points to the \pkg{polyglossia}
+language name, ¦⟨script⟩¦ might point either to an OpenType script name as defined by \pkg{fontspec}
+(\eg ¦Latin¦) \new{2.2}or a BCP-47 script tag (\eg ¦Latn¦), though the script is fully lower-cased
+in the \cmd{\⟨script⟩font}\ command.
+
For instance, if the default font defined by \cmd\setmainfont\
does not support Greek, then one can define the font used to display Greek with:\\
-\centerline{ \cmd\newfontfamily\cmd{\greekfont[Script=Greek,\meta{…}]\marg{font}}. }
-Note that polyglossia will use the font defined as is, so assure to do all necessary settings
+\centerline{\cmd\newfontfamily\cmd{\greekfont[Script=Greek,\meta{…}]\marg{font}}}
+%
+If you want to setup a blackletter font specifically for the German blackletter script variant,
+you might do so by:\\
+\centerline{\cmd\newfontfamily\cmd{\latffont[\meta{…}]\marg{font}}}
+%
+Setting up a font specifically for traditional Chinese is possible via:\\
+\centerline{\cmd\newfontfamily\cmd{\hantfont[Script=CJK,\meta{…}]\marg{font}}}
+%
+Note that \pkg{polyglossia} will use the font defined as is, so assure to do all necessary settings
(please refer to the \pkg{fontspec} documentation for details).
For instance, if \cmd\arabicfont\ is explicitly defined, then the option ¦Script=Arabic¦ should
be included in that definition.
@@ -787,10 +809,12 @@ it can be defined by means of \new{1.2.0}
\cmd{\⟨script⟩fontsf} or \cmd{\⟨language⟩fontsf} and \cmd{\⟨script⟩fonttt} or \cmd{\⟨language⟩fonttt}, respectively.
Whenever a new language is activated, \pkg{polyglossia} will first check whether
-a font has been defined for that language or – for languages in non-Latin scripts –
-for the script it uses. If it is not defined, it will use the currently active font
-and – in the case of OpenType fonts – will attempt to turn on the appropriate
-OpenType tags for the script and language used, in case these are available in
+a font has been defined for that language. If this is not the case, it will check whether a font associated
+with the BCP-47 script tag of the current language is defined. If this also isn't the case, \pkg{polyglossia}
+will finally check (but this only for languages in non-Latin scripts) whether there is a font associated
+with the OpenType script tag. If none of these fonts is defined, \pkg{polyglossia} will use the currently
+active font as defined by ¦\setmainfont¦, ¦\setsansfont¦ or ¦\setmonofont¦ and – in the case of OpenType fonts –
+will attempt to turn on the appropriate OpenType tags for the script and language used, in case these are available in
the font, by means of \pkg{fontspec}’s \cmd\addfontfeature. If the current font
does not appear to support the script of that language, an error message is
displayed.
@@ -1585,7 +1609,7 @@ and that passing \xpgvalue{babelshorthands} (without value) is equivalent to pas
\end{table}
\item \xpgchoicekey[1.46]{hyphenation}{\xpgvalue{classic}, \xpgvalue{modern}, or \xpgvalue{liturgical}}
There are three different sets of hyphenation patterns for Latin. Separate
- documention for them is available on the
+ documentation for them is available on the
Internet.\footnote{Refer to \url{https://github.com/gregorio-project/hyphen-la/blob/master/doc/README.md\#hyphenation-styles}}
Each of the four variants mentioned above has its default set of hyphenation
patterns as indicated by table \ref{tab:latin-hyphenation}. Use the
@@ -1657,7 +1681,7 @@ and that passing \xpgvalue{babelshorthands} (without value) is equivalent to pas
\item[¦'AE¦] for Ǽ (AE ligature with acute), also available for \'Œ
\end{shorthands}
\item \xpgboolkeyfalse[1.46]{prosodicshorthands}
- Enable shorthands for prosodic marks (macrons and breves) very similiar to
+ Enable shorthands for prosodic marks (macrons and breves) very similar to
those provided by \pkg{babel-latin} using the ¦withprosodicmarks¦
modifier.
Note that the active ¦=¦ character used for macrons will cause problems with
@@ -2563,7 +2587,7 @@ in Hebrew script or in roman transliteration).
\subsection{Islamic calendar (hijrical.sty)}\label{sec:hijrical}
This package computes dates in the lunar Islamic (Hijra) calendar.\footnote{ %
It makes use of the arithmetical algorithm in chapter 6 of
- Reingold \& Gershowitz, \textit{Calendrical calculation: the Millenium edition}
+ Reingold \& Gershowitz, \textit{Calendrical calculation: the Millennium edition}
(Cambridge University Press, 2001).\label{reingold}}
It provides two macros for the end-user.
The command
@@ -2698,6 +2722,31 @@ where \meta{type} is a supported language id type (such as ¦bcp-47¦) and \meta
\bgroup\footnotesize
+\subsection*{2.2 (2024/07/15)}
+
+\subsubsection*{Bug fixes}
+\begin{itemize}
+ \item Fix \texttt{lang} environment (\TXI{633}).
+ \item Fix first number of Maghrib abjad numbering for Algeria, Morocco and
+ Tunisia (\TXI{640}).
+ \item Fix some captions strings in Bulgarian, Chinese, Esperanto, Estonian, Hindi,
+ Latvian, and Slovak (\TXP{651})
+ \item Improve performance with multilingual documents that have a TOC (\TXI{641}).
+\end{itemize}
+
+\subsubsection*{New Features}
+\begin{itemize}
+ \item Add possibility to associate a font to a language/variant with reference to
+ a BCP-47 script tag (\TXI{636}).
+\end{itemize}
+
+\subsubsection*{Internal work}
+\begin{itemize}
+ \item The major rewrite of the package code has been finished. More code has been cleaned up,
+ and \pkg{polyglossia} employs modern concepts (\pkg{latex3} and modern \LaTeXe).
+ All key-val handling uses \pkg{l3keys} now rather than \pkg{xkeyval}.
+\end{itemize}
+
\subsection*{2.1 (2024/03/07)}
\subsubsection*{Bug fixes}
@@ -3756,7 +3805,7 @@ where \meta{type} is a supported language id type (such as ¦bcp-47¦) and \meta
\section{Acknowledgements (by François Charette)}
\pkg{Polyglossia} is notable for being a recycle box of previous contributions
by other people. I take this opportunity to thank the following individuals,
-whose splendid work has made my task almost trivial in comparision: \TA{Johannes
+whose splendid work has made my task almost trivial in comparison: \TA{Johannes
Braams} and the numerous contributors to the \pkg{babel} package (in particular
\TA{Boris Lavva} and others for its Hebrew support), \TA{Alexej Kryukov} (\pkg{antomega}),
\TA{Will Robertson} (\pkg{fontspec}), \TA{Apostolos Syropoulos} (\pkg{xgreek}), \TA{Youssef Jabri}
@@ -3783,7 +3832,7 @@ Many thanks to all the people who have contributed bugfixes and new features to
since we took over.
In alphabetical order: \TA{Ignas Anikevicius}, \TA{Sina Ahmadi}, \TA{Matthew Bertucci}, \TA{Wouter Bolsterlee}, \TA{Christian Buhtz},
\TA{Ashok Das}, \TA{Oleg Domanov}, user \TA{fakhriaunur}, \TA{Philipp Gesang}, \TA{Kevin Godby},
-\TA{Enrico Gregorio}, \TA{Khaled Hosny}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime},
+\TA{Enrico Gregorio}, \TA{Khaled Hosny}, \TA{Stephen Huan}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime},
\TA{Mike Kroutikov}, \TA{Ivan Kokan}, \TA{Caleb Maclennan}, \TA{Gyula Magyarkuti}, \TA{José Mancera}, \TA{Miquel Ortega},
\TA{Yevgen Pogribnyi}, \TA{Will Robertson}, \TA{Maïeul Rouquette}, \TA{Elie Roux}, \TA{Hugo Roy}, \TA{Guy Rutenberg},
\TA{Marcin Serwin}, \TA{Arvinder Singh}, \TA{Avisek Jena}, \TA{Philipp Stephani}, \TA{Niranjan Tambe}, \TA{Takuji Tanaka},
diff --git a/Master/texmf-dist/doc/latex/polyglossia/test-welsh.pdf b/Master/texmf-dist/doc/latex/polyglossia/test-welsh.pdf
deleted file mode 100644
index 8f18eb1e9df..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/test-welsh.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdf
index dcd5987717d..c684b9fff89 100644
--- a/Master/texmf-dist/doc/latex/profcollege/ProfCollege-doc.pdf
+++ b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip
index 097aea9c26c..995fa25ee88 100644
--- a/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip
+++ b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
index 40cb330c40a..b4802be53e6 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
index 0ef3a590262..2fef183bb19 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf
index 5e6698109fb..c3e58a2813b 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prtec/PRTEC19-template.pdf b/Master/texmf-dist/doc/latex/prtec/PRTEC19-template.pdf
deleted file mode 100644
index c0f369154a9..00000000000
--- a/Master/texmf-dist/doc/latex/prtec/PRTEC19-template.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prtec/PRTEC24-template.pdf b/Master/texmf-dist/doc/latex/prtec/PRTEC24-template.pdf
new file mode 100644
index 00000000000..a65827b7c47
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/prtec/PRTEC24-template.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/prtec/PRTEC19-template.tex b/Master/texmf-dist/doc/latex/prtec/PRTEC24-template.tex
index e0769005af8..59e978ef742 100644
--- a/Master/texmf-dist/doc/latex/prtec/PRTEC19-template.tex
+++ b/Master/texmf-dist/doc/latex/prtec/PRTEC24-template.tex
@@ -4,7 +4,7 @@
%%
%% PRTEC uses A4 paper.
%%
-%% This file is version 1.04 dated 2019/04/17
+%% This file is version 1.07 dated 2024/07/07
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -22,18 +22,17 @@
%%
%% * option to omit PRTEC footer and header [nofoot]
%%
-%% * option not to use newtxtext's superiors font for footnotes [nodefaultsups] and option
-%% * for slightly larger small capitals [largesc]
+%% * option for slightly larger small capitals [largesc]
%%
%% For details of newtxmath and newtxtext, see the documentation available on CTAN (http://ctan.org)
%%
-%% The booktabs, array, and dcolumn packages are loaded by default; those macros may be used for setting tables.
+%% The booktabs, array, and dcolumn packages are loaded by default; those macros are for tables.
%%
%=========================================================
%%
%% LICENSE:
%%
-%% Copyright (c) 2019 John Lienhard
+%% Copyright (c) 2024 John Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -53,17 +52,16 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Class options are described above.
-
-\documentclass[upint,varvw]{prtec}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Editing tools; can delete these if not using.
-
-\usepackage{lipsum} % makes paragraphs of "latin" for layout testing
-\usepackage{comment} % see package documentation. Can comment out sections as needed.
+%% Don't modify the \DocumentMetadata command unless you know what it does.
+%% If this command throws an "undefined" error, your latex system is out of date: comment this command out.
+\DocumentMetadata{
+ pdfstandard = a-2b,% a-4,
+ pdfversion = 1.7,% 2.0,
+ lang = en-US,
+}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Class options are described above.
+\documentclass[upint,varvw,subscriptcorrection]{prtec}
%%%%% pdf metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -86,15 +84,15 @@
%%%%% Conference, title, authors, affiliations %%%%%%%%
-\confname{Extended Abstracts of The Second Pacific Rim Thermal Engineering Conference}
-\confdate{December 13-17, 2019}
-\confcity{Maui, Hawaii, USA}
+\confname{Extended Abstracts of The Third Pacific Rim Thermal Engineering Conference}
+\confdate{December 15--19, 2024}
+\confcity{Honolulu, Hawaii, USA}
%%% Your paper number
\paperno{PRTEC-XXXXX}
%%% Your title
-\papertitle{Our research paper: the latest developments in cutting-edge engineering}
+\papertitle{Our research paper: cutting-edge cooling}
%% Put author names into the order you want. Use the same order for affiliations.
@@ -106,7 +104,7 @@
%%
%% \JointFirstAuthor, if applicable, follows the affiliation of the relevant authors, no spaces.
-\SetAuthors{Mamoru Tanahashi\affil{1}\JointFirstAuthor , Yongchan Kim\affil{2}\JointFirstAuthor , Sumanta Acharya\affil{3} , Koji Fukagata\affil{4}, John Lienhard\affil{5}\CorrespondingAuthor{lienhard@mit.edu}}
+\SetAuthors{Mamoru Tanahashi\affil{1}\JointFirstAuthor, Yongchan Kim\affil{2}\JointFirstAuthor, Sumanta Acharya\affil{3}, Koji Fukagata\affil{4}, John Lienhard\affil{5}\CorrespondingAuthor{lienhard@mit.edu}}
\SetAffiliation{1}{Department of Mechanical Engineering, Tokyo Institute of Technology, Japan}
\SetAffiliation{2}{School of Mechanical Engineering, Korea University, Republic of Korea}
@@ -124,18 +122,17 @@
\begin{abstract}
-This guide has been prepared for authors of extended abstract to be presented at The Second Pacific Rim Thermal Engineering Conference (PRTEC2019), December 13--17, 2019, Maui, Hawaii, USA. Authors are requested to follow these guidelines to achieve uniformity in the presentation of the proceedings. The main format of the extended abstract is as follows. Text: Times New Roman (or equivalent), 11 pt, left and right justified. Headings: Times New Roman, all capitals, 12 pt, centered. Page size A4 (210 $\times$ 297 mm); 20 mm borders all round; paper title starts at 40 mm from the top of the page except for the first page. Convert the manuscript to a single PDF file and submit it to the Online Submission System (\url{https://www.jsme.or.jp/ted/PRTEC2019/}) by the electrical format. The abstract should summarize the key findings in your study and should be in a single paragraph no more than 250 words. It should give an account of the most relevant contributions of the paper. It is also important to briefly indicate the goal, the methods, the results, and the conclusions. Avoid abbreviations, diagrams, and references. It must be self-contained and understandable without reference to the text.
+This guide has been prepared for authors of extended abstract to be presented at The Second Pacific Rim Thermal Engineering Conference (PRTEC2024), December 15--19, 2024, Honolulu, Hawaii, USA. Authors are requested to follow these guidelines to achieve uniformity in the presentation of the proceedings. The main format of the extended abstract is as follows. Text: Times New Roman (or equivalent), 11 pt, left and right justified. Headings: Times New Roman, all capitals, 12 pt, centered. Page size A4 (210 $\times$ 297 mm); 20 mm borders all round; paper title starts at 40 mm from the top of the page except for the first page. Convert the manuscript to a single PDF file and submit it to the Online Submission System (\url{https://www.jsme.or.jp/conference/PRTEC2024/}) by the electrical format. The abstract should summarize the key findings in your study and should be in a single paragraph no more than 250 words. It should give an account of the most relevant contributions of the paper. It is also important to briefly indicate the goal, the methods, the results, and the conclusions. Avoid abbreviations, diagrams, and references. It must be self-contained and understandable without reference to the text.
-\keywords{PRTEC, Extended Abstract, Template; 10 pt Times font} %% <=== Change to your keywords, keep this command before \end{abstract}.
+\keywords{Times New Roman, 10 pt, Convection, Computational methods, Heat exchanger, Cooling turbine blade, Film cooling, High temperature} %% <=== Change to your keywords, keep this command before \end{abstract}.
\end{abstract}
-
\section{Introduction \NoCaseChange{(Details for submitting extended abstract)}}
-The Extended Abstract must be formatted using this template and submitted by \textbf{June 30, 2019} for review. \textbf{The final version of the Extended Abstract must be submitted by August 31, 2019 for inclusion in the proceedings.} The final version of the extended abstract that does not conform to the correct format will not be included in the proceedings. There will be no opportunity to alter it after the submission of the final version.
+The Extended Abstract must be formatted using this template and submitted by \textbf{August 15, 2024} for review. \textbf{The final version of the Extended Abstract must be submitted by September 30, 2024 for inclusion in the proceedings.} The final version of the extended abstract that does not conform to the correct format will not be included in the proceedings. There will be no opportunity to alter it after the submission of the final version.
-It is assumed that the corresponding author will make a presentation at the conference. Each accepted extended abstract must have at least one paid regular or student registration by \textbf{August 31, 2019} to ensure that their presentation is included in the Conference Program.
+It is assumed that the corresponding author will make a presentation at the conference. Each accepted extended abstract must have at least one paid regular or student registration by \textbf{October 15, 2024} to ensure that their presentation is included in the Conference Program.
\section{Length and Layout}
@@ -150,7 +147,7 @@ The layout of the extended abstract should follow the style of this document, st
\textbf{KEYWORDS:} Keywords can be selected to describe the feature of the extended abstract. Leave two blank lines between keywords and the first major heading.
-\textbf{Header and footnotes:} The header includes the Paper number. \textbf{Please insert your presentation ID supplied by the Online Submission System, e.g., PRTEC-23456, if your presentation ID is PRTEC-23456.} The footnote of the first page contains E-mail address of the corresponding author. Note that this ``formal'' corresponding author can be different from the ``practical'' corresponding author registered on the submission system. Do not edit the copyright line. We do not transfer the copyright for the authors' convenience. The copyright line should always appear as ``Copyright \textcopyright\ 2019 by The Author(s). Distributed by JSME, KSME, and ASTFE with permission.'' Do not substitute the authors' names in the copyright line.
+\textbf{Header and footnotes:} The header includes the Paper number. \textbf{Please insert your presentation ID supplied by the Online Submission System, e.g., PRTEC-23456, if your presentation ID is PRTEC-23456.} The footnote of the first page contains E-mail address of the corresponding author. Note that this ``formal'' corresponding author can be different from the ``practical'' corresponding author registered on the submission system. Do not edit the copyright line. We do not transfer the copyright for the authors' convenience. The copyright line should always appear as ``Copyright \textcopyright\ 2024 by The Author(s). Distributed by JSME, KSME, and ASTFE with permission.'' Do not substitute the authors' names in the copyright line.
@@ -240,11 +237,11 @@ Authors from non-English speaking countries are requested to find persons who ar
\textbf{Figures and tables:} Figures and tables should be placed at the top or bottom of the page on which they are first mentioned if possible, on the next page if not. Do not gather them at the end of the extended abstract.
-\textbf{Submission:} The Extended Abstract should be converted to a single PDF file whose size is no more than 4 Mbytes, and submitted to the Online Submission System (\url{https://www.jsme.or.jp/ted/PRTEC2019/}).
+\textbf{Submission:} The Extended Abstract should be converted to a single PDF file whose size is no more than 4 Mbytes, and submitted to the Online Submission System (\url{https://www.jsme.or.jp/conference/PRTEC2024/}).
-\textbf{Submission Deadline for review:} Extended Abstract for review should be submitted by \textbf{June 30, 2019}. Notification of acceptance will be made by July 15, 2019.
+\textbf{Submission Deadline for review:} Extended Abstract for review should be submitted by \textbf{July 15, 2024}. Notification of acceptance will be made by August 15, 2024.
-\textbf{Submission Deadline for final version:} All contributors must upload the final version of Extended Abstract for inclusion in the proceedings by \textbf{August 31, 2019} even if there is no modification from the initial Extended Abstract. The Final Extended Abstract that does not conform to the correct format will not be included in the proceedings. There will be no opportunity to alter it after the submission of the final version.
+\textbf{Submission Deadline for final version:} All contributors must upload the final version of Extended Abstract for inclusion in the proceedings by \textbf{September 30, 2024} even if there is no modification from the initial Extended Abstract. The Final Extended Abstract that does not conform to the correct format will not be included in the proceedings. There will be no opportunity to alter it after the submission of the final version.
\section*{Acknowledgements}
@@ -286,7 +283,7 @@ Acknowledgments should be placed immediately following CONCLUSIONS, if necessary
\section{Additional notes for \LaTeX\ users}
The PRTEC class file is compatible with \hologo{pdfLaTeX}, \hologo{LuaLaTeX}, and \hologo{XeLaTeX}. The class relies on the \texttt{newtx} math and text fonts and is not configured for \texttt{fontspec}. The class will automatically set the needed margins, spacings, font sizes, and citation formats. The class is also designed to support hyperlinks, metadata, and pdf bookmarks.
-The class loads the \verb|\booktabs|, \verb|\array|, and \verb|\dcolumn| packages, for use in formatting tables.
+The class loads the \verb|mathtools| and \verb|amsmath| for setting mathematics. The class loads the \verb|booktabs|, \verb|array|, and \verb|dcolumn| packages for formatting tables.
PRTEC requires that section headings be set in uppercase, bold-face type. The class will do this automatically. You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and into headings directly, as you would in the main text. Do not enclose them braces, e.g.\ \verb|{\cite{..}}|, which will cause errors. You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if they seem necessary. For footnotes inside tables, use the \texttt{tablefootnote} package.}
@@ -298,12 +295,12 @@ The pdf bookmarks are automatically set as the text of the section heading. Simp
%% For math in a section heading: the optional argument creates a pdfbookmark
%% without an error message or loss of characters.
-\section[Proof that S-gen\neq 0]{Proof that $\dot{S}_{\textrm{gen}}\neq 0$}
+\section[Proof that S-gen\neq 0]{Proof that \(\dot{S}_{\textrm{gen}}\neq 0\)}
For math in a section heading, the optional argument of \verb|\section[..]{..}| creates a pdfbookmark without losing characters or producing error messages. For this example, we use:
-\verb|\section[Proof that S-gen\neq 0]{Proof that $\dot{S}_{\textrm{gen}}\neq 0$}|
+\verb|\section[Proof that S-gen\neq 0]{Proof that \(\dot{S}_{\textrm{gen}}\neq 0\)}|
-Observe that some simple math expressions are accepted by the \verb|hyperref| package that manages the bookmarks.
+Some simple math expressions are accepted by the \verb|hyperref| package that manages the bookmarks.
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/prtec/README.md b/Master/texmf-dist/doc/latex/prtec/README.md
index f3dacefae1c..f01e4e5dc1c 100644
--- a/Master/texmf-dist/doc/latex/prtec/README.md
+++ b/Master/texmf-dist/doc/latex/prtec/README.md
@@ -1,6 +1,6 @@
#prtec -- A template for PRTEC conference papers#
- Version 1.06 dated 2019/08/20.
+ Version 1.07 dated 2024/07/07.
####Overview####
This class provides a LaTeX template to format extended abstracts for the
@@ -50,6 +50,12 @@
####Version History####
+ v1.07
+ - update to PRTEC 24
+ - update various aspects of code to account for 5 years of change in LaTeX
+ - adjust top and bottom margins
+ - include \\DocumentMetadata
+
v1.06 -- correct nofoot option to fully clear header
v1.05 -- edits to .bst to better support urls; minor edit to \\entry
@@ -62,7 +68,7 @@
####License####
- Copyright (c) 2019 John H. Lienhard
+ Copyright (c) 2024 John H. Lienhard
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
diff --git a/Master/texmf-dist/doc/latex/prtec/sample-figure.pdf b/Master/texmf-dist/doc/latex/prtec/sample-figure.pdf
index 29b41786be1..89d44bf9cff 100644
--- a/Master/texmf-dist/doc/latex/prtec/sample-figure.pdf
+++ b/Master/texmf-dist/doc/latex/prtec/sample-figure.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randexam/randexam-a-answer.pdf b/Master/texmf-dist/doc/latex/randexam/randexam-a-answer.pdf
index d961cd9cb55..686d3f696c0 100644
--- a/Master/texmf-dist/doc/latex/randexam/randexam-a-answer.pdf
+++ b/Master/texmf-dist/doc/latex/randexam/randexam-a-answer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randexam/randexam-a-blank.pdf b/Master/texmf-dist/doc/latex/randexam/randexam-a-blank.pdf
index 9656be370dc..d6ea0b132c4 100644
--- a/Master/texmf-dist/doc/latex/randexam/randexam-a-blank.pdf
+++ b/Master/texmf-dist/doc/latex/randexam/randexam-a-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randexam/randexam-b-answer.pdf b/Master/texmf-dist/doc/latex/randexam/randexam-b-answer.pdf
index fe0867038c6..ec97459092a 100644
--- a/Master/texmf-dist/doc/latex/randexam/randexam-b-answer.pdf
+++ b/Master/texmf-dist/doc/latex/randexam/randexam-b-answer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randexam/randexam-b-blank.pdf b/Master/texmf-dist/doc/latex/randexam/randexam-b-blank.pdf
index c059b6e6152..459ad1f1166 100644
--- a/Master/texmf-dist/doc/latex/randexam/randexam-b-blank.pdf
+++ b/Master/texmf-dist/doc/latex/randexam/randexam-b-blank.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randexam/randexam.pdf b/Master/texmf-dist/doc/latex/randexam/randexam.pdf
index 68c0e5925db..1ef3fcc5ad8 100644
--- a/Master/texmf-dist/doc/latex/randexam/randexam.pdf
+++ b/Master/texmf-dist/doc/latex/randexam/randexam.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randexam/randexam.tex b/Master/texmf-dist/doc/latex/randexam/randexam.tex
index 74e57318df8..ff7d951a151 100644
--- a/Master/texmf-dist/doc/latex/randexam/randexam.tex
+++ b/Master/texmf-dist/doc/latex/randexam/randexam.tex
@@ -3,7 +3,7 @@
\documentclass[12pt,plain,math=most]{randexam}
\geometry{b5paper,margin=2cm}
-\newcommand*{\myversion}{2024E}
+\newcommand*{\myversion}{2024F}
\newcommand*{\mydate}{\the\year-\mylpad\month-\mylpad\day}
\newcommand*{\mylpad}[1]{\ifnum#1<10 0\the#1\else\the#1\fi}
diff --git a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.pdf b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.pdf
index 6e42e68df98..6f4fa467efb 100644
--- a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.pdf
+++ b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.tex b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.tex
index dde087fc1ce..167d62e4f40 100644
--- a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.tex
+++ b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-doc.tex
@@ -3,8 +3,8 @@
% arara: lualatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)')
\documentclass[french,a4paper,11pt]{article}
-\def\TPversion{0.1.7}
-\def\TPdate{22 juin 2024}
+\def\TPversion{0.1.8}
+\def\TPdate{4 juillet 2024}
\usepackage[executable=python.exe]{pyluatex}
\usepackage[table,svgnames]{xcolor}
\usepackage{amsmath,amssymb}
@@ -148,7 +148,7 @@
\vspace{0.25cm}
-{$\blacktriangleright$~~Une commande pour afficher une matrice carrée (2x2, 3x3 ou 4x4) avec la syntaxe du package.}
+{$\blacktriangleright$~~Une commande pour afficher une matrice carrée (2×2, 3×3 ou 4×4) avec la syntaxe du package.}
\smallskip
@@ -156,15 +156,15 @@
\smallskip
-{$\blacktriangleright$~~Des commandes pour calculer le déterminant et l'inverse de matrices carrées (2x2, 3x3 ou 4x4).}
+{$\blacktriangleright$~~Des commandes pour calculer le déterminant et l'inverse de matrices carrées (2×2, 3×3 ou 4×4).}
\smallskip
-{$\blacktriangleright$~~Des commandes pour résoudre des systèmes linéaires (2x2, 3x3 ou 4x4).}
+{$\blacktriangleright$~~Des commandes pour résoudre des systèmes linéaires (2×2, 3×3 ou 4×4).}
\smallskip
-{$\blacktriangleright$~~Des commandes pour travailler sur des graphes probabilistes (2x2, 3x3 ou 4x4).}
+{$\blacktriangleright$~~Des commandes pour travailler sur des graphes probabilistes (2×2, 3×3 ou 4×4).}
\vspace{1cm}
@@ -207,7 +207,9 @@
\hrule
-\medskip
+\bigskip
+
+{\footnotesize\sffamily\itshape À mon papa.}
\newpage
@@ -240,8 +242,8 @@ La package \textit{propose} des outils pour travailler sur des matrices ou des s
À noter que les calculs -- en interne -- peuvent être effectués de deux manières :
\begin{itemize}
- \item via les packages \textsf{xint*} pour des formats \textbf{2x2} ou \textbf{3x3} (et dans une certaine mesure pour des \textbf{4x4}) ;
- \item via \textsf{python} et le package \textsf{pyluatex} (à charger manuellement du fait des options spécifiques) pour des formats \textbf{2x2}, \textbf{3x3} ou \textbf{4x4}.
+ \item via les packages \textsf{xint*} pour des formats \textbf{2×2} ou \textbf{3×3} (et dans une certaine mesure pour des \textbf{4×4}) ;
+ \item via \textsf{Python} et le package \textsf{pyluatex} (à charger manuellement du fait des options spécifiques) pour des formats \textbf{2×2}, \textbf{3×3} ou \textbf{4×4}.
\end{itemize}
Il n'est pas prévu -- pour le moment -- de travailler sur des matrices/systèmes plus grands, car l'idée est de pouvoir formater le résultat, ce qui se fait coefficient par coefficient.
@@ -252,7 +254,7 @@ L'utilisation de \textsf{pyluatex} nécessite une compilation adaptée, à savoi
\smallskip
-La méthode par \textsf{python} utilise quoi qu'il en soit le module \texttt{sympy}, qui doit donc être installé !
+La méthode par \textsf{Python} utilise quoi qu'il en soit le module \texttt{sympy}, qui doit donc être installé !
\end{warningblock}
\subsection{Packages utilisés, choix de formatage}
@@ -283,7 +285,7 @@ En marge de la présente documentation, compilée en \textsf{lualatex} avec \tex
\begin{itemize}
\item \texttt{ResolSysteme-exemples} pour les commandes disponibles en version classique (\textsf{xint}) ;
- \item \texttt{ResolSysteme-exemples-pyluatex} pour les commandes disponibles en version python (\textsf{pyluatex}).
+ \item \texttt{ResolSysteme-exemples-pyluatex} pour les commandes disponibles en version \textsf{Python} (\textsf{pyluatex}).
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{noteblock}
@@ -293,7 +295,7 @@ En marge de la présente documentation, compilée en \textsf{lualatex} avec \tex
\subsection{Chargement du package, et option}
\begin{importantblock}
-Le package peut donc se charger de deux manières différentes, suivant si l'utilisateur utilise \textsf{python} ou non. Les commandes \textit{classiques} sont disponibles même si \textsf{python} est utilisé.
+Le package peut donc se charger de deux manières différentes, suivant si l'utilisateur utilise \textsf{Python} ou non. Les commandes \textit{classiques} sont disponibles même si \textsf{Python} est utilisé.
\end{importantblock}
\begin{PresentationCode}{listing only}
@@ -314,18 +316,22 @@ D'autres solutions existent pour faire du calcul matriciel, on peut pas exemple
\smallskip
-L'idée est ici de proposer une version, adaptée à des dimensions classiques, avec formatage des calculs, sous forme de fraction irréductible notamment. Les formatages étant effectués \textit{a posteriori}, j'ai choisi de limiter ce package à des formats de taille raisonnable (\textbf{1x2} à \textbf{4x4}).
+L'idée est ici de proposer une version, adaptée à des dimensions classiques, avec formatage des calculs, sous forme de fraction irréductible notamment. Les formatages étant effectués \textit{a posteriori}, j'ai choisi de limiter ce package à des formats de taille raisonnable (\textbf{1×2} à \textbf{4×4}).
\end{noteblock}
\part{Historique}
+\verb|v0.1.8|~:~~~~Correction de bugs, améliorations dans la documentation.
+
+\verb|v0.1.7|~:~~~~Correction de bugs dans certains calculs avec des fractions.
+
\verb|v0.1.6|~:~~~~Correction de bugs dans certains calculs avec des fractions.
\verb|v0.1.6|~:~~~~Correction de bugs dans certains calculs.
\verb|v0.1.5|~:~~~~Inverse d'une matrice 4x4 et système 4x4 (même en normal).
-\verb|v0.1.4|~:~~~~Ajout de commandes pour du calcul matriciel sans python (de taille raisonnable) ;
+\verb|v0.1.4|~:~~~~Ajout de commandes pour du calcul matriciel sans \textsf{Python} (de taille raisonnable) ;
\verb| |~~~~~~commandes pour des graphes probabilistes.
@@ -333,7 +339,7 @@ L'idée est ici de proposer une version, adaptée à des dimensions classiques,
\verb| |~~~~~~inversion du comportement des commandes étoilées.
-\verb|v0.1.2|~:~~~~Ajout d'une commande d'affichage (formaté) d'une matrice 2x2, 3x3 ou 4x4.
+\verb|v0.1.2|~:~~~~Ajout d'une commande d'affichage (formaté) d'une matrice 2×2, 3×3 ou 4×4.
\verb|v0.1.1|~:~~~~Correction d'un bug avec le caractère \og ; \fg.
@@ -414,7 +420,7 @@ Les \textit{transformations} en fraction devraient pouvoir fonctionner avec des
\subsection{La commande}
\begin{cautionblock}
-Une commande (matricielle) est dédiée à l'affichage d'une matrice \textbf{2x2} ou \textbf{3x3} ou \textbf{4x4} (\textsf{python} est ici non nécessaire !) :
+Une commande (matricielle) est dédiée à l'affichage d'une matrice \textbf{2×2} ou \textbf{3×3} ou \textbf{4×4} (\textsf{Python} est ici non nécessaire !) :
\begin{itemize}
\item en saisissant les coefficients via une syntaxe propre au package (l'affichage est géré en interne par \textsf{nicematrix}) ;
@@ -485,8 +491,8 @@ L'idée est de proposer des commandes pour effectuer des calculs matriciels \tex
\item $(4\times4)\times(4\times4)$ ;
\item $(4\times4)\times(4\times1)$ ;
\end{itemize}
- \item le carré d'une matrice 2x2 ou 3x3 ou 4x4 ;
- \item la puissance d'une matrice 2x2 ou 3x3 ou 4x4 (via \textsf{python}).
+ \item le carré d'une matrice 2×2 ou 3×3 ou 4×4 ;
+ \item la puissance d'une matrice 2×2 ou 3×3 ou 4×4 (via \textsf{Python}).
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{cautionblock}
@@ -576,7 +582,7 @@ $\MatricePuissancePY(1,1,1,1 § 5,-2,1,5 § 0,5,2,-1 § 0,1,1,1)(5)[Aff]$
Une commande est disponible pour calculer le déterminant d'une matrice :
\begin{itemize}
- \item \textbf{2x2} ou \textbf{3x3} ou \textbf{4x4}.
+ \item \textbf{2×2} ou \textbf{3×3} ou \textbf{4×4}.
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{cautionblock}
@@ -585,7 +591,7 @@ Une commande est disponible pour calculer le déterminant d'une matrice :
%version classique
\DetMatrice(*)[option de formatage](matrice)
-%version python
+%version Python
\DetMatricePY(*)[option de formatage](matrice)
\end{PresentationCode}
@@ -633,7 +639,7 @@ est $\det(A)=\DetMatrice(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
Le dé. de $A=\AffMatrice(1,2 § 3,4)$ est
$\det(A)=\DetMatricePY(1,2 § 3,4)$.
\end{PresentationCode}
@@ -644,13 +650,13 @@ $\det(A)=\DetMatricePY[d](-1,0.5 § 1/2,4)$.
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
Le dét. de $A=\AffMatrice(-1,1/3,4 § 1/3,4,-1 § -1,0,0)$ est
$\det(A) \approx \DetMatricePY[dec=3](-1,1/3,4 § 1/3,4,-1 § -1,0,0)$.
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
Le dét. de $A=\AffMatrice(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$
est $\det(A)=\DetMatricePY(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{PresentationCode}
@@ -665,8 +671,8 @@ est $\det(A)=\DetMatricePY(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
Une commande (matricielle) disponible est pour calculer l'éventuelle inverse d'une matrice :
\begin{itemize}
- \item \textbf{2x2} ou \textbf{3x3} ou \textbf{4x4} (\cmaj{0.1.5}) pour le package \textit{classique} ;
- \item \textbf{2x2} ou \textbf{3x3} ou \textbf{4x4} également pour la version \textsf{python}.
+ \item \textbf{2×2} ou \textbf{3×3} ou \textbf{4×4} (\cmaj{0.1.5}) pour le package \textit{classique} ;
+ \item \textbf{2×2} ou \textbf{3×3} ou \textbf{4×4} également pour la version \textsf{Python}.
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{cautionblock}
@@ -675,7 +681,7 @@ Une commande (matricielle) disponible est pour calculer l'éventuelle inverse d'
%version classique
\MatriceInverse(*)[option de formatage]<options nicematrix>(matrice)[Clé]
-%version python
+%version Python
\MatriceInversePY(*)[option de formatage]<options nicematrix>(matrice)[Clé]
\end{PresentationCode}
@@ -714,7 +720,7 @@ $A^{-1}=\MatriceInverse[n]<cell-space-limits=2pt>(1,2,3 § 4,5,6 § 7,8,8)[Aff]$
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
L'inverse de $A=\AffMatrice(1,2 § 3,4)$ est
$A^{-1}=\MatriceInversePY[d]<cell-space-limits=2pt>(1,2 § 3,4)[Aff]$.
\end{PresentationCode}
@@ -727,7 +733,7 @@ $A^{-1}=
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
L'inv. de $A=\AffMatrice(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § -2,-3,-5,-6)$ est
$A^{-1}=
\MatriceInversePY[n]<cell-space-limits=2pt>(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § -2,-3,-5,-6)$.
@@ -740,17 +746,17 @@ $A^{-1}=
\subsection{Introduction}
\begin{cautionblock}
-\cmaj{0.1.4} Il existe des commandes pour travailler sur un graphe probabiliste (avec le package en version \textsf{python}) :
+\cmaj{0.1.4} Il existe des commandes pour travailler sur un graphe probabiliste (avec le package en version \textsf{Python}) :
\begin{itemize}
- \item afficher un état probabiliste (\textbf{1x2} ou \textbf{1x3} ou \textbf{1x4}, version normale ou version \textsf{python}) ;
- \item déterminer un état probabiliste à une certaine étape, uniquement en version \textsf{python}.
+ \item afficher un état probabiliste (\textbf{1×2} ou \textbf{1×3} ou \textbf{1×4}, version normale ou version \textsf{Python}) ;
+ \item déterminer un état probabiliste à une certaine étape, uniquement en version \textsf{Python}.
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{cautionblock}
\begin{PresentationCode}{listing only}
-%version classique ou python
+%version classique ou Python
\AffEtatProb[opt de formatage]<opts nicematrix>(matrice ligne)
\EtatProbPY[opt de formatage]<opts nicematrix>(état init)(mat de trans)(étape)
\end{PresentationCode}
@@ -847,8 +853,8 @@ $P_4 \approx \EtatProbPY[dec=3]
Il existe une commande (matricielle) pour déterminer l'éventuelle solution d'un système linéaire qui s'écrit matriciellement $A\times X=B$:
\begin{itemize}
- \item \textbf{2x2} ou \textbf{3x3} ou \textbf{4x4} (\cmaj{0.1.5}) pour le package \textit{classique} ;
- \item \textbf{2x2} ou \textbf{3x3} ou \textbf{4x4} également pour le package en version \textsf{python}.
+ \item \textbf{2×2} ou \textbf{3×3} ou \textbf{4×4} (\cmaj{0.1.5}) pour le package \textit{classique} ;
+ \item \textbf{2×2} ou \textbf{3×3} ou \textbf{4×4} également pour le package en version \textsf{Python}.
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{cautionblock}
@@ -857,7 +863,7 @@ Il existe une commande (matricielle) pour déterminer l'éventuelle solution d'u
%version classique
\SolutionSysteme(*)[opt de formatage]<opts nicematrix>(matriceA)(matriceB)[Clé]
-%version python
+%version Python
\SolutionSystemePY(*)[opt de formatage]<opts nicematrix>(matriceA)(matriceB)[Clé]
\end{PresentationCode}
@@ -882,6 +888,10 @@ Concernant cette commande, qui est à insérer dans un environnement \textit{mat
\item le dernier argument, \textit{optionnel} et entre \textsf{[...]}, permet -- grâce à la \textit{clé} \Cle{Matrice} -- de présenter le vecteur solution.
\end{itemize}
À noter que si la matrice n'est pas inversible, le texte \texttt{Matrice non inversible} est affiché.
+
+\smallskip
+
+Pour afficher le système via la commande \texttt{\textbackslash systeme}, le package \textsf{systeme} doit être chargé.
\end{tipblock}
\begin{PresentationCode}{}
@@ -891,7 +901,7 @@ La solution de $\systeme{3x+y-2z=-1,2x-y+z=4,x-y-2z=5}$ est $\mathcal{S}=%
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
La solution de $\systeme{x+y+z=-1,3x+2y-z=6,-x-y+2z=-5}$ est $\mathcal{S}=%
\left\lbrace \SolutionSystemePY(1,1,1 § 3,2,-1 § -1,-1,2)(-1,6,-5) \right\rbrace$.
\end{PresentationCode}
@@ -914,7 +924,7 @@ est $\mathcal{S}=
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
La solution de $\systeme[xyzt]{x+2y+3z+4t=-10,5x+6y+7z=0,x+y+z+t=4,-2x-3y-5z-6t=7}$
est $\mathcal{S}=%
\left\lbrace
@@ -938,8 +948,8 @@ La solution de $\systeme{x+2y=-5,4x+8y=1}$ est $\mathcal{S}=%
\cmaj{0.1.4} Il existe une commande (matricielle) pour déterminer l'éventuel état stable d'un graphe probabiliste :
\begin{itemize}
- \item \textbf{2x2} pour le package \textit{classique} ;
- \item \textbf{2x2} ou \textbf{3x3} ou \textbf{4x4} pour le package en version \textsf{python}.
+ \item \textbf{2×2} pour le package \textit{classique} ;
+ \item \textbf{2×2} ou \textbf{3×3} ou \textbf{4×4} pour le package en version \textsf{Python}.
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{cautionblock}
@@ -948,7 +958,7 @@ La solution de $\systeme{x+2y=-5,4x+8y=1}$ est $\mathcal{S}=%
%version classique
\EtatStable[opt de formatage]<opts nicematrix>(matriceA)
-%version python
+%version Python
\EtatStablePY[opt de formatage]<opts nicematrix>(matriceA)
\end{PresentationCode}
@@ -982,7 +992,7 @@ ou $\Pi = \EtatStable[dec](0.72,0.28 § 0.12,0.88)$.
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
L'état stable du gr. prob. de matrice
$M=\AffMatrice[dec](0.72,0.28 § 0.12,0.88)$
@@ -991,7 +1001,7 @@ ou $\Pi = \EtatStablePY[dec](0.72,0.28 § 0.12,0.88)$.
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
L'état stable du gr. prob. de matrice
$M=\AffMatrice[dec](0.9,0.03,0.07 § 0.30,0.43,0.27 § 0.14,0.07,0.79)$
@@ -1000,7 +1010,7 @@ ou $\Pi = \EtatStablePY[dec](0.9,0.03,0.07 § 0.30,0.43,0.27 § 0.14,0.07,0.79)$
\end{PresentationCode}
\begin{PresentationCode}{}
-%version python
+%version Python
L'état stable du gr. prob. de matrice
$M=\AffMatrice[dec]%
(0.1,0.2,0.3,0.4 § 0.25,0.25,0.25,0.25 § 0.15,0.15,0.2,0.5 § 0.3,0.3,0.2,0.2)$
@@ -1013,7 +1023,7 @@ est $\Pi \approx
\pagebreak
-\part{Fonctions python utilisées}
+\part{Fonctions Python utilisées}
\begin{cautionblock}
Les fonctions utilisées par les packages \textsf{pyluatex} ou \textsf{pythontex} sont données ci-dessous.
@@ -1022,7 +1032,7 @@ Elles sont accessibles en \textit{natif} une fois l'option \textsf{pyluatex} act
\end{cautionblock}
\begin{PresentationCodePython}{listing only}
-#variables symboliques (pour du 4x4 maxi)
+#variables symboliques (pour du 4×4 maxi)
import sympy as sy
x = sy.Symbol('x')
y = sy.Symbol('y')
diff --git a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.pdf b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.pdf
index 8aa1f3642e3..dfd7461c748 100644
--- a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.pdf
+++ b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.tex b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.tex
index 3527a582238..600ce6d1d3d 100644
--- a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.tex
+++ b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples-pyluatex.tex
@@ -2,7 +2,7 @@
% !TeX TXS-program:compile = txs:///lualatex/[--shell-escape]
\documentclass[french,a4paper,10pt]{article}
-\def\RSver{0.1.7}
+\def\RSver{0.1.8}
\usepackage[margin=1.5cm]{geometry}
\usepackage[executable=python.exe]{pyluatex}
\usepackage[pyluatex]{ResolSysteme}
@@ -27,7 +27,7 @@
\sisetup{locale=FR,output-decimal-marker={,}}
\end{ShowCodeTeX}
-\section{Affichage d'une matrice, 2x2 ou 3x3 ou 4x4}
+\section{Affichage d'une matrice, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
On considère les matrices $A=\AffMatrice(1,2 § 3,4)$
@@ -35,7 +35,7 @@ et $B=\AffMatrice[n](-1,-1/3,4 § 1/3,4,-1 § -1,0,0)$
et $C=\AffMatrice(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{ShowCodeTeX}
-\section{Déterminant d'une matrice, 2x2 ou 3x3 ou 4x4}
+\section{Déterminant d'une matrice, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
Le déterminant de $A=\AffMatrice(1,2 § 3,4)$ est
@@ -57,7 +57,7 @@ Le dét. de $A=\begin{pNiceMatrix} 1&2&3&4\\5&6&7&0\\1&1&1&1\\2&-3&-5&-6 \end{pN
est $\det(A)=\DetMatricePY(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{ShowCodeTeX}
-\section{Calculs avec des matrices, 2x2 ou 3x3 ou 4x4}
+\section{Calculs avec des matrices, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
$\ProduitMatricesPY(1,2)(3 § 4)[Aff]$ et $\ProduitMatricesPY(1,2)(3,4 § 5,6)[Aff]$ \\
@@ -83,7 +83,7 @@ $\MatricePuissancePY(1,1,-1 § 5,-2,1 § 0,5,2)(3)[Aff]$ \\
$\MatricePuissancePY(1,1,1,1 § 5,-2,1,5 § 0,5,2,-1 § 0,1,1,1)(5)[Aff]$
\end{ShowCodeTeX}
-\section{Inverse d'une matrice, 2x2 ou 3x3 ou 4x4}
+\section{Inverse d'une matrice, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
L'inverse de $A=\begin{pNiceMatrix} 1&2 \\ 3&4 \end{pNiceMatrix}$ est
@@ -120,7 +120,7 @@ L'inverse de $A=\begin{pNiceMatrix} 1&2&3&4\\5&6&7&0\\1&1&1&1\\2&-3&-5&-6 \end{p
est $A^{-1}=\MatriceInversePY[n]<cell-space-limits=2pt>(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{ShowCodeTeX}
-\section{Résolution d'un système, 2x2 ou 3x3 ou 4x4}
+\section{Résolution d'un système, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
La solution de $\systeme{-9x-8y=-8,3x-6y=-7}$ est $\mathcal{S}=%
@@ -160,7 +160,7 @@ La solution de $\systeme[xyzt]{x+2y+3z+4t=-10,5x+6y+7z=0,x+y+z+t=4,-2x-3y-5z-6t=
[Matrice]$
\end{ShowCodeTeX}
-\section{État probabiliste d'un graphe probabiliste, 2x2 ou 3x3 ou 4x4}
+\section{État probabiliste d'un graphe probabiliste, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
État initial : $P_0 = \AffEtatProb[t](1/3,2/3)$.
@@ -202,7 +202,7 @@ $P_4 \approx \EtatProbPY[dec=3]
(4)$
\end{ShowCodeTeX}
-\section{État stable d'un graphe probabiliste, 2x2 ou 3x3 ou 4x4}
+\section{État stable d'un graphe probabiliste, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
L'état stable du gr. prob. de matrice
diff --git a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.pdf b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.pdf
index 59e5819a3a6..bbf961d1a7d 100644
--- a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.pdf
+++ b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.tex b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.tex
index ffec22fb9fe..b228332dec2 100644
--- a/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.tex
+++ b/Master/texmf-dist/doc/latex/resolsysteme/ResolSysteme-exemples.tex
@@ -2,7 +2,7 @@
% !TeX TXS-program:compile = txs:///pdflatex
\documentclass[french,a4paper,10pt]{article}
-\def\RSver{0.1.7}
+\def\RSver{0.1.8}
\usepackage[margin=1.5cm]{geometry}
\usepackage{ResolSysteme}
\usepackage{systeme}
@@ -15,7 +15,7 @@
\part*{ResolSysteme (\RSver), version \og classique \fg{}}
-\section{Préambule sans utiliser python}
+\section{Préambule sans utiliser Python}
\begin{ShowCodeTeX}[listing only]
\documentclass[french,a4paper,10pt]{article}
@@ -25,7 +25,7 @@
\sisetup{locale=FR,output-decimal-marker={,}}
\end{ShowCodeTeX}
-\section{Affichage d'une matrice, 2x2 ou 3x3 ou 4x4}
+\section{Affichage d'une matrice, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
On considère les matrices $A=\AffMatrice(1,2 § 3,4)$
@@ -33,7 +33,7 @@ et $B=\AffMatrice[n](-1,1/3,4 § 1/3,4,-1 § -1,0,0)$
et $C=\AffMatrice(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{ShowCodeTeX}
-\section{Calculs avec des matrices, 2x2 ou 3x3 ou 4x4}
+\section{Calculs avec des matrices, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
$\ProduitMatrices(1,2)(3 § 4)[Aff]$ et $\ProduitMatrices(1,2)(3,4 § 5,6)[Aff]$ \\
@@ -59,7 +59,7 @@ $\CarreMatrice(-5,6,8 § 1,4,-9 § 1,-1,1)[Aff]$\\
$\CarreMatrice(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)[Aff]$
\end{ShowCodeTeX}
-\section{Déterminant d'une matrice, 2x2 ou 3x3 ou 4x4}
+\section{Déterminant d'une matrice, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
Le déterminant de $A=\AffMatrice(1,2 § 3,4)$ est
@@ -81,7 +81,7 @@ Le dét. de $A=\begin{pNiceMatrix} 1&2&3&4\\5&6&7&0\\1&1&1&1\\2&-3&-5&-6 \end{pN
est $\det(A)=\DetMatrice(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{ShowCodeTeX}
-\section{Inverse d'une matrice, 2x2 ou 3x3 ou 4x4}
+\section{Inverse d'une matrice, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
L'inverse de $A=\begin{pNiceMatrix} 1&2 \\ 3&4 \end{pNiceMatrix}$ est
@@ -113,7 +113,7 @@ L'inverse de $A=\begin{pNiceMatrix} 1&2&3&4\\5&6&7&0\\1&1&1&1\\2&-3&-5&-6 \end{p
est $A^{-1}=\MatriceInverse[n]<cell-space-limits=2pt>(1,2,3,4 § 5,6,7,0 § 1,1,1,1 § 2,-3,-5,-6)$.
\end{ShowCodeTeX}
-\section*{Résolution d'un système, 2x2 ou 3x3 ou 4x4}
+\section*{Résolution d'un système, 2×2 ou 3×3 ou 4×4}
\begin{ShowCodeTeX}
La solution de $\systeme{-9x-8y=-8,3x-6y=-7}$ est $\mathcal{S}=%
@@ -158,7 +158,7 @@ La solution de $\systeme[xyzt]{x+2y+3z+4t=-10,5x+6y+7z=0,x+y+z+t=4,-2x-3y-5z-6t=
[Matrice]$
\end{ShowCodeTeX}
-\section{État stable d'une graphe probabiliste, 2x2}
+\section{État stable d'une graphe probabiliste, 2×2}
\begin{ShowCodeTeX}
L'état stable du gr. prob. de matrice
diff --git a/Master/texmf-dist/doc/latex/responsive/README b/Master/texmf-dist/doc/latex/responsive/README
index dc2953cb549..c6ed3ea7ea6 100644
--- a/Master/texmf-dist/doc/latex/responsive/README
+++ b/Master/texmf-dist/doc/latex/responsive/README
@@ -1,6 +1,6 @@
The Responsive Package
-Version 0.1
+Version v0.1a
Change font sizes and other typographic details in LaTeX documents depending on
the page dimensions.
@@ -21,7 +21,7 @@ elements for various output formats and devices. Key features include:
- Line Spacing Control: adjust line spacing determining the x-height percentage
for enhanced readability.
-Copyright: 2023-2023 Michal Hoftich
+Copyright: 2023-2024 Michal Hoftich
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/responsive/responsive-doc.pdf b/Master/texmf-dist/doc/latex/responsive/responsive-doc.pdf
index 1e7245c04f1..498fcac9bb9 100644
--- a/Master/texmf-dist/doc/latex/responsive/responsive-doc.pdf
+++ b/Master/texmf-dist/doc/latex/responsive/responsive-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/responsive/responsive-doc.tex b/Master/texmf-dist/doc/latex/responsive/responsive-doc.tex
index 4272397e3e8..e5e5b3f074d 100644
--- a/Master/texmf-dist/doc/latex/responsive/responsive-doc.tex
+++ b/Master/texmf-dist/doc/latex/responsive/responsive-doc.tex
@@ -22,7 +22,7 @@
\usepackage{booktabs}
\usepackage[style=iso-authoryear]{biblatex}
\addbibresource{responsive-doc.bib}
-\newenvironment{changelog}{\longtable{@{} l p{30em}}}{\endlongtable}
+\newenvironment{changelog}{\longtable{@{} l p{20em}}}{\endlongtable}
\newcommand\change[2]{#1 & #2\\}
\ifdefined\HCode
% I want to convert parts of the document to images,
@@ -525,6 +525,9 @@ under the terms of the \LaTeX\ Project Public License, version 1.3.
\section{Changes}
\begin{changelog}
+ \change{2024-07-14}{Version 0.1a released}
+ \change{2024-03-16}{Set the \texttt{topmargin} dimension}
+ \change{}{Call Geometry's \texttt{\textbackslash Gm@process} command to fix page dimensions, if Geometry is loaded}
\change{2023-12-13}{Version 0.1 released.}
\change{}{Finished documentation.}
\change{2023-12-07}{Added the \texttt{lineheight} property.}
diff --git a/Master/texmf-dist/doc/latex/sepfootnotes/README b/Master/texmf-dist/doc/latex/sepfootnotes/README
index e0f9ac9aacc..2a507a1da49 100644
--- a/Master/texmf-dist/doc/latex/sepfootnotes/README
+++ b/Master/texmf-dist/doc/latex/sepfootnotes/README
@@ -5,8 +5,11 @@ This package supports footnotes and endnotes from separate files. This is
achieved with commands \sepfootnotecontent and \sepfootnote; the former defines
the content of a note, while the latter typesets that note.
+2024/07/05 v0.3d
+ * Package options after: Allow \sepfootnotecontent after \sepfootnote
+
2016/07/18 v0.3c
- * Package options Note definitions may take global scope
+ * Package options global: Note definitions may take global scope
2014/07/22 v0.3b
* Documentation Minor formatting changes to page 4
@@ -41,7 +44,7 @@ Usage:
*See sepfootnotes.pdf
--------------------------------------------------------------------------------
-Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima
+Copyright (C) 2013-2024 Eduardo C. Lourenço de Lima
This material is subject to the LaTeX Project Public License. See
http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
diff --git a/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.pdf b/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.pdf
index 0cb449cb218..0246b086b50 100644
--- a/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.pdf
+++ b/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.tex b/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.tex
index 4000f00fad0..f73370349a3 100644
--- a/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.tex
+++ b/Master/texmf-dist/doc/latex/sepfootnotes/sepfootnotes.tex
@@ -1,4 +1,4 @@
-% Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima
+% Copyright (C) 2013-2024 Eduardo C. Lourenço de Lima
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -44,11 +44,11 @@
{\begin{center}\begin{minipage}[t]{0.5\linewidth}}
{\end{minipage}\end{center}}
\newcommand\TODO{\texttt{Todo:}}
-\newcommand\fileversion{0.3c}
-\newcommand\filedate{July 18, 2016}
+\newcommand\fileversion{0.3d}
+\newcommand\filedate{July 5, 2024}
\begin{document}
\title{The \textsf{\color{myblue} sepfootnotes} package,\thanks{This document corresponds to \textsf{sepfootnotes}~\fileversion, dated~\filedate.
-I am grateful to Michael Sellhoff, Sam Foster, Mats, and David Carlisle for their valuable feedback on \texttt{sepfootnotes} and to Dan Luecking for the basic idea implemented in this package.}\\{or a footnote to Plato}}
+I am grateful to Michael Sellhoff, Sam Foster, Mats, David Carlisle, and schtandard for their valuable feedback on \texttt{sepfootnotes} and to Dan Luecking for the basic idea implemented in this package.}\\{or a footnote to Plato}}
\author{Eduardo C. Louren\c{c}o de Lima \\ \texttt{elourenco@phi.pro.br}}
\maketitle
@@ -59,9 +59,9 @@ I am grateful to Michael Sellhoff, Sam Foster, Mats, and David Carlisle for thei
Standard |\footnote| and |\endnote| both take a note as a mandatory argument. Because notes have to be embedded in the paragraph to which they refer, sentences are often split up into two\footnote {This is precisely what this footnote does to the first paragraph of this document. There are more than thirty words between `two' and `or more' in the code of an otherwise short paragraph.} or more parts. Consequently, footnotes and endnotes may disrupt the flow of reading and editing {\LaTeX} prose.\footnote {In a posting to \texttt{texhax.tug.org} in April 2010, someone complained that using footnotes ``tends to disrupt the flow of the document on the screen and makes editing the text itself harder'', and asked about the possibility of ``putting all of the footnotes in a separate file''~\cite{Nicholas Cole}. Another user, back in 2004, remarked that the ``only thing I missed about word processors was the ability to keep footnote text at the bottom of the page, or in a separate window. I often have extensive footnotes, and don't want them cluttering up my main body text when I'm composing''~\cite{Luecking}.} This can be an issue for those who make extensive use of notes, such as philosophers and people from the humanities in general.
- The |sepfootnotes| package gets around this inconvenience by separating note input from usage. That is, it provides a command to define what a particular note says, and another command to insert that note later on in the document.
+ The |sepfootnotes| package gets around this inconvenience by separating note input from usage. That is, it provides a command to define what a particular note says, and another command to insert that note in the document.
- Note definitions may be grouped together---in no particular order---in the preamble, at the beginning of chapters or sections, right before a paragraph, or even in a \emph{separate file}. In that way, the main body is less cluttered.
+ Note definitions may be grouped together---in no particular order---in the preamble, at the beginning of chapters or sections, in a separate file, or even right after a paragraph. In that way, the main body is less cluttered.
You may use |sepfootnotes| and standard |\footnote| simultaneously; the same goes for |\footcite| from |biblatex|.
@@ -273,10 +273,10 @@ Default:\footnote{Adapted from the \texttt{endnotes} package.}
\section {Package options}
\begin{list}{}{}
-\item[|warn|] Print warning messages. (Default.)
+\item[|after|] (experimental) Allow |\sepfootnotecontent| after |\sepfootnote|. Must compile twice. Implies |global|. See below.
+\item[|global|] Notes defined within environments and groups take global scope and become available throughout, as if they were defined in the preamble.
\item[|error|] Print warning messages, halt, and wait for user input.
\item[|quiet|] Suppress warning and error messages.
-\item[|global|] Notes defined within environments and groups take global scope and become available throughout, as if they were defined in the preamble.
\end{list}
\section{Examples}
diff --git a/Master/texmf-dist/doc/latex/spbmark/README.md b/Master/texmf-dist/doc/latex/spbmark/README.md
index 0fd0ff23714..9fe0dc2c5c8 100644
--- a/Master/texmf-dist/doc/latex/spbmark/README.md
+++ b/Master/texmf-dist/doc/latex/spbmark/README.md
@@ -1,5 +1,5 @@
# The `spbmark` package
-Customize superscripts and subscripts (v1.46k)
+Customize superscripts and subscripts (v1.46n)
## Abstract
`spbmark` provides three commands `\super`, `\sub` and `\supersub` to improve the layout of superscripts and subscripts which can be adjusted the relative position and format, and can be used in text and math mode.
@@ -11,5 +11,5 @@ This work may be distributed and/or modified under the conditions of the CC-BY 4
| [Gitee](https://gitee.com/texno3/spbmark) | [Github](https://github.com/texno3/spbmark) | [CTAN](https://ctan.org/pkg/spbmark) |
## Maintainer
-QuYi<br/>
+Qu Yi<br/>
Email: toquyi@163.com \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf b/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
index f17405570b1..c0f3a420770 100644
--- a/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
+++ b/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spbmark/spbmark.tex b/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
index 9da47d21515..d452fd09044 100644
--- a/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
+++ b/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
@@ -1,21 +1,21 @@
\documentclass[load-preamble+]{cnltx-doc}
-\usepackage{siunitx,setspace,pifont,hologo,changelog,enumitem}
+\usepackage{siunitx,setspace,hologo,changelog,enumitem}
\usepackage[spbmark]{altsubsup}
\usepackage[margin = 1in,marginparwidth = 0.6in,footskip = 0.5in]{geometry}
\usepackage[noto]{newtxmath}
\setcnltx
{
package = spbmark,
- version = v1.46k,
- date = 2024/06/21,
+ version = v1.46n,
+ date = 2024/07/14,
authors = Qu Yi,
- info = Customize superscript and subscript,
+ info = Customize superscripts and subscripts,
email = toquyi@163.com,
url = https://github.com/texno3/spbmark,
abstract =
{
- \pkg*{spbmark} provides three commands \cs{super}, \cs{sub} and \cs{supersub} to improve the layout of superscript and subscript which can be adjusted the relative position and format, and can be used in text and math mode.
+ \pkg*{spbmark} provides three commands \cs{super}, \cs{sub} and \cs{supersub} to improve the layout of superscripts and subscripts which can be adjusted the relative position and format, and can be used in text and math mode.
},
color-scheme = blue,
listings-options = {numbers = none,gobble = 2,lineskip = 1pt},
@@ -51,13 +51,13 @@
The following macro package options will redefine the script commands of the \LaTeX{} kernel. If you do not specify the values of boolean options, they default to \code{true}. These options can also be changed in the preamble area and main body using the global control command \cs{spbset}.
\begin{options}
\keychoice{text}{true,\fbox{false}}
- \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands. The command \cs{defspbstyle} can be used to define the style \code{textsp} and \code{textsb} to change the format of the text superscript and subscript.
+ \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands. The command \cs{defspbstyle} can be used to define the style \code{textsp} and \code{textsb} to change the format of the text superscripts and subscripts.
\keychoice{math}{true,\fbox{false}}
- \cs{sp} and \cs{sb} are equivalent to the \cs{super} and \cs{sub} commands. The command \cs{defspbstyle} can be used to define the style \code{mathsp} and \code{mathsb} to change the format of the math superscript and subscript.
+ \cs{sp} and \cs{sb} are equivalent to the \cs{super} and \cs{sub} commands. The command \cs{defspbstyle} can be used to define the style \code{mathsp} and \code{mathsb} to change the format of the math superscripts and subscripts.
\keychoice{math*}{true,\fbox{false}}\newtag{Exp\\v1.46j}%
- The \code{\^{}} and \code{\_{}} tokens in the math mode are equivalent to the \cs{super} and \cs{sub} commands. The command \cs{defspbstyle} can be used to define the style \code{mathsp*} and \code{mathsb*} to change the format of the math superscript and subscript.
+ The \code{\^{}} and \code{\_{}} tokens in the math mode are equivalent to the \cs{super} and \cs{sub} commands. The command \cs{defspbstyle} can be used to define the style \code{mathsp*} and \code{mathsb*} to change the format of the math superscripts and subscripts.
\keychoice{foot}{true,\fbox{false}}
- The format of the footnote mark match the superscript global move and format settings. \cs{defspbstyle} can be used to define the superscript style \code{fnmark} to change the format of the footnote mark.
+ The format of the footnote mark match the superscripts global move and format settings. \cs{defspbstyle} can be used to define the superscripts style \code{fnmark} to change the format of the footnote mark.
\begin{example}[code-only]
\defspbstyle{textsp}{vmove=-1pt,cmd=\bfseries}
\defspbstyle{mathsb}{hmove=0.5em}
@@ -73,19 +73,19 @@ The following macro package options will redefine the script commands of the \La
\spbset{all=false,math}
\end{example}
\keychoice{spcore}{\fbox{trad},none}\newtag{New\\v1.46k}%
- Kernel command case for text and math modes superscript. If \code{none} is selected, support for the superscript kernel command is removed, and the \option{cmd} and \option{vmove} options need to be set to control the size and offset of the superscript.
+ Kernel command case for text and math modes superscripts. If \code{none} is selected, support for the superscripts kernel command is removed, and the \option{cmd} and \option{vmove} options need to be set to control the size and offset of the superscripts.
\begin{example}[code-only]
\usepackage[spcore=none]{spbmark}
\usepackage{graphicx}
\spbset{spcmd=\scalebox{0.6},spvmove=5pt}
\end{example}
\keychoice{sbcore}{\fbox{trad},none}\newtag{New\\v1.46k}%
- Option for subscript kernel command case, similar to the \option{spcore} option.
+ Option for subscripts kernel command case, similar to the \option{spcore} option.
\end{options}
\section{User commands}
\label{sec:user commands}
-There are currently three commands to set superscript and subscript. Their format can be set temporarily using the optional parameters of the command, or set globally using a key-value list, see Section \ref{sec:global control interface}.
+There are currently three commands to print superscripts and subscripts. Their format can be set locally using the optional parameter of the command, or set globally using a key-value list, see Section \ref{sec:global control interface}.
\begin{commands}
\command{super}[\sarg\oarg{kv list}\marg{content}\oarg{kv list}]
This is a superscript output command. The two \meta{kv list} are equivalent.
@@ -128,7 +128,7 @@ There are currently three commands to set superscript and subscript. Their forma
6A\supersub[hmove=-8pt]{examsuper}{sub}\hspace{\dimexpr(\maxwd-8pt)}B
\end{example}
\command{defspbstyle}[\marg{style name}\marg{kv list}]
- Defines the style of the superscript or subscript used for the \option{style} option.
+ Defines the style of the superscripts or subscripts used for the \option{style} option.
\command{spbifmath}[\marg{math code}\marg{text code}]
In some cases, \code{math} or \code{text} output modes require different code for format or move. This command can be used when using the \code{match} option or changing the output mode locally, whitch should be used in the move or format options. It can switch the corresponding code according to different output modes.
\command{spbshortkv}[\marg{short opt}\marg{key value}]
@@ -155,11 +155,11 @@ The options common to \meta{kv list} of the three commands are as follows. They
\keyval{cmd}{format cmds}
The format commands of superscript or subscript. The last command can take a parameter, which accepts superscript or subscript. Represents the format of superscript and subscript in the superscript and subscript commands.
\keyval{cmd+}{format cmds}
- Add code to the previous global superscript or subscript format commands.
+ Add code to the previous option \option{cmd}.
\keyval{height}{fixed length}
- The distance between the superscript or subscript baseline and the previous line. It is recommended that the superscript adjusts the height and the subscript adjusts the depth.
+ The height of the marker box above the baseline. It is recommended that the superscript adjusts the height and the subscript adjusts the depth.
\keyval{depth}{fixed length}
- The distance between the superscript or subscript baseline and the next line.
+ The depth of the marker box below the baseline.
\keyval{style}{style name}
Use the \meta{style name} defined by the \cs{defspbstyle} command to make it work global or local.
\keychoice{mode}{text,math,\fbox{match}}
@@ -185,71 +185,74 @@ The options common to \meta{kv list} of the three commands are as follows. They
\label{sec:global control interface}
\begin{commands}
\command{spbset}[\marg{key-value list}]
- \pkg*{spbmark} uses the \cs{spbset} command to control the global default format of superscript and subscript. These options also apply to \meta{kv list} of the above commands. The values ​set by it will be overwritten by the optional parameters of the superscript and other commands.
+ \pkg*{spbmark} uses the \cs{spbset} command to control the global default format of superscripts and subscripts. These options also apply to \meta{kv list} of the \textcolor{red}{above} print commands. The values set by it will be overwritten by the optional parameter of superscripts and subscripts commands.
+
+ Note that the relative length units in the options such as \code{ex} and \code{em} are for the \textcolor{red}{body} font size, not the marker itself.
+
+ The following list of keys control the format both of superscripts \emph{or} subscripts. They can also be used in the optional parameter of the \cs{super} or \cs{sub} command.
\end{commands}
-The following list of keys control the format both of superscript \emph{or} subscript.
\begin{options}
\keyval{spvmove}{fixed length}\Default{0pt}
- Extra vertical move of the superscript.
+ Extra vertical move of the superscripts.
\keyval{sphmove}{fixed length}\Default{0pt}
- Extra horizontal move of the superscript.
+ Extra horizontal move of the superscripts.
\keyval{sbvmove}{fixed length}\Default{0pt}
- Extra vertical move of the subscript.
+ Extra vertical move of the subscripts.
\keyval{sbhmove}{fixed length}\Default{0pt}
- Extra horizontal move of the subscript.
+ Extra horizontal move of the subscripts.
\opt{nohmove}
- Cancel the horizontal move of superscript and subscript at the same time.
+ Cancel the horizontal move of superscripts and subscripts at the same time.
\opt{novmove}
- Cancel the vertical move of superscript and subscript at the same time.
+ Cancel the vertical move of superscripts and subscripts at the same time.
\keyval{spcmd}{format cmds}
- The format commands of superscript. The last command in the code can take an argument, which is a superscript.
+ The format commands of superscripts. The last command in the code can take an argument, which is a superscripts.
\keyval{spcmd+}{format cmds}
- Add code to the previous global superscript format commands.
+ Add code to the previous option \option{spcmd}.
\keyval{sbcmd}{format cmds}
- The format commands of subscript. Similar to the \option{spcmd} option, but for subscript.
+ The format commands of subscripts. Similar to the \option{spcmd} option, but for subscripts.
\keyval{sbcmd+}{format cmds}
- Add code to the previous global subcript format commands.
+ Add code to the previous option \option{sbcmd}.
\keyval{spheight}{fixed length}
- The distance between the superscript baseline and the previous line.
+ The height of the superscript box above the baseline.
\keyval{spdepth}{fixed length}
- The distance between the superscript baseline and the next line.
+ The depth of the superscript box below the baseline.
\keyval{sbheight}{fixed length}
- The distance between the subscript baseline and the previous line.
+ The height of the subscript box above the baseline.
\keyval{sbdepth}{fixed length}
- The distance between the subscript baseline and the next line.
+ The depth of the subscript box below the baseline.
\keychoice{spthiswd}{auto,\fbox{keep}}
- Width processing mode after using this superscript. See Section \ref{sec:user commands} for the meaning of this option.
+ Width processing mode after using this superscripts. See Section \ref{sec:user commands} for the meaning of this option.
\keychoice{sbthiswd}{auto,\fbox{keep}}
- Width processing mode after using this subscript. See Section \ref{sec:user commands} for the meaning of this option.
+ Width processing mode after using this subscripts. See Section \ref{sec:user commands} for the meaning of this option.
\keyval{spregex}{regular expression}
- After the superscript command is used, the regular expression rules of the following tokens are matched. See Section \ref{sec:user commands} for the meaning of this option.
+ After the superscripts command is used, the regular expression rules of the following tokens are matched. See Section \ref{sec:user commands} for the meaning of this option.
\keyval{sbregex}{regular expression}
- Similar to the \option{spregex} option, but for subscript.
+ Similar to the \option{spregex} option, but for subscripts.
\end{options}
-If \option{sphmove} is positive, the superscript or subscript moves to the right, conversely it moves to the left. The positive direction of vertical offset of subscript and superscript is \textcolor{red}{opposite}. For superscript, if \option{spvmove} is positive, the superscript moves up, conversely it moves down. For subscript, if \option{spvmove} is positive, the subscript moves down, conversely it moves up.
+If \option{sphmove} is positive, the superscripts or subscripts moves to the right, conversely it moves to the left. The positive direction of vertical offset of subscripts and superscripts is \textcolor{red}{opposite}. For superscripts, if \option{spvmove} is positive, the superscripts moves up, conversely it moves down. For subscripts, if \option{spvmove} is positive, the subscripts moves down, conversely it moves up.
-The following list of keys control the format of superscript \emph{and} subscript.
+The following list of keys control the format of superscripts \emph{and} subscripts. They can also be used in the optional parameter of the \cs{supersub} command.
\begin{options}
\keyval{spbhmove}{fixed length}\Default{0pt}
- Extra vertical move of the superscript and the subscript.
+ Extra vertical move of the superscripts and the subscripts.
\kvsplit{spbcmd}{super cmds}{sub cmds}
- The format commands of superscript and subscript. The first part is in superscript format, and the latter part is in subscript format. They are separated by commas, or only the first part exists.
+ The format commands of superscripts and subscripts. The first part is in superscripts format, and the latter part is in subscripts format. They are separated by commas, or only the first part exists.
\kvsplit{spbcmd+}{super cmds}{sub cmds}
- Add code to the previous global superscript and subscript format commands.
+ Add code to the previous option \option{spbcmd}.
\keyval{spbheight}{fixed length}
- The distance between the superscript baseline and the previous line.
+ The height of the superscript box above the baseline.
\keyval{spbdepth}{fixed length}
- The distance between the subscript baseline and the next line.
+ The depth of the subscript box below the baseline.
\kvsplit{vsep}{super move}{sub move}\Default{0.6ex}
- The extra vertical distance between superscript and subscript. The front part is the movement amount of the superscript, and the latter part is the movement amount of the subscript. If only the front part means that both are vertically shifted by one-half of the current value.
+ The extra vertical distance between superscripts and subscripts. The front part is the movement amount of the superscripts, and the latter part is the movement amount of the subscripts. If only the front part means that both are vertically shifted by one-half of the current value.
\keychoice{halign}{\fbox{l},c,r}
- The alignment of superscript and subscript, which contains \code{l}, \code{c}, and \code{r} parameters respectively for left, center, and right alignment.
+ The alignment of superscripts and subscripts, which contains \code{l}, \code{c}, and \code{r} parameter respectively for left, center, and right alignment.
\end{options}
\section{Examples of use}
-Here is a list of the three commands, please pay attention to the usage of optional parameters. Note when the horizontal move is negative, the starting point is at the right end of the mark.
+Here is a list of the three commands, please pay attention to the usage of optional parameter. Note when the horizontal move is negative, the starting point is at the right end of the mark.
\begin{example}
\defspbstyle{fancy}{cmd=\color{purple}}
\spbset{spbcmd={\spbifmath{\mathtt}{\ttfamily},\color{blue}}}
@@ -261,7 +264,7 @@ Here is a list of the three commands, please pay attention to the usage of optio
\end{example}
\subsection{siunitx}
-It can also be used with the \pkg*{siunitx} package to output superscript and subscript in the unit:
+It can also be used with the \pkg*{siunitx} package to output superscripts and subscripts in the unit:
\begin{example}
\spbset{spcmd=\spbifmath{}{\color{purple}}}
\sisetup{text-superscript-command=\super}
@@ -272,13 +275,13 @@ It can also be used with the \pkg*{siunitx} package to output superscript and su
\end{example}
\subsection{realscripts}
-If the OpenType text font you are using does not have optical sizes, the superscript and subscript may not appear correctly. Loading the \pkg*{realscripts} package before the \pkg*{spbmark} package fixes this behavior.
+If the OpenType text font you are using does not have optical sizes, the superscripts and subscripts may not appear correctly. Loading the \pkg*{realscripts} package before the \pkg*{spbmark} package fixes this behavior.
\begin{example}[code-only]
\usepackage{realscripts,spbmark}
\end{example}
\subsection{altsubsup}
-The \pkg*{altsubsup} package allows to write alternate superscript and subscript in math mode with \code{\^{}}\oarg{mark} and \code{\_{}}\oarg{mark} dimensions. When the package is loaded using the \code{spbmark} option, the superscript and subscript mechanism of \pkg*{spbmark} is used, you can use \cs{defspbstyle} to define its superscript style \code{altsup} and subscript style \code{altsub}.
+The \pkg*{altsubsup} package allows to write alternate superscripts and subscripts in math mode with \code{\^{}}\oarg{mark} and \code{\_{}}\oarg{mark} dimensions. When the package is loaded using the \code{spbmark} option, the superscripts and subscripts mechanism of \pkg*{spbmark} is used, you can use \cs{defspbstyle} to define its superscripts style \code{altsup} and subscripts style \code{altsub}.
\begin{example}
\defspbstyle{altsup}{sphmove=-\llastwd,spthiswd=auto,spvmove=1pt}
$A_[bcd]^[e]B$
@@ -291,13 +294,13 @@ The \pkg*{altsubsup} package allows to write alternate superscript and subscript
If you need to use the original definitions of \cs{textsuperscript}, \cs{textsubscript}, \cs{sp} and \cs{sb} after using the \option{text} or \option{math} option, then you can use the following commands:
\begin{commands}
\command{spb@textsuperscript@save}[\marg{content}]
- Save the original definition of the \cs{textsuperscript} command, output superscript in the text mode.
+ Save the original definition of the \cs{textsuperscript} command, output superscripts in the text mode.
\command{spb@textsubscript@save}[\marg{content}]
- Save the original definition of the \cs{textsubscript} command, output subscript in the text mode.
+ Save the original definition of the \cs{textsubscript} command, output subscripts in the text mode.
\command{spb@math@super@save}[\marg{content}]
- Save the original definition of the \cs{sp} command, output superscript in the math mode.
+ Save the original definition of the \cs{sp} command, output superscripts in the math mode.
\command{spb@math@sub@save}[\marg{content}]
- Save the original definition of the \cs{sb} command, output subscript in the math mode.
+ Save the original definition of the \cs{sb} command, output subscripts in the math mode.
\end{commands}
\section{Known issues}
@@ -309,10 +312,9 @@ At present, the vertical and horizontal move are effective for the unit commands
\item Add option \option{math*}: The \code{\^{}} and \code{\_{}} tokens in the math mode are equivalent to the \cs{super} and \cs{sub} commands.
\end{version}
\begin{version}[v = 1.46k,date = 2024/06/21]
- \item Add options \option{spcore} and \option{sbcore}: Set kernel commands for superscript and subscript of text and math modes.
+ \item Add options \option{spcore} and \option{sbcore}: Set kernel commands for superscripts and subscripts of text and math modes.
\end{version}
\end{changelog}
\nocite{*}
-\AddToHook{cmd/printindex/before}{\clearpage}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/synthslant/LICENSE b/Master/texmf-dist/doc/latex/synthslant/LICENSE
index f8b699e6eb5..888d9e68e7a 100644
--- a/Master/texmf-dist/doc/latex/synthslant/LICENSE
+++ b/Master/texmf-dist/doc/latex/synthslant/LICENSE
@@ -355,11 +355,11 @@ Here is an example of such a notice and statement:
%% Copyright 2005 M. Y. Name
%
% This work may be distributed and/or modified under the
- % conditions of the LaTeX Project Public License, either version 1.3
+ % conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
- % http://www.latex-project.org/lppl.txt
- % and version 1.3 or later is part of all distributions of LaTeX
+ % https://www.latex-project.org/lppl.txt
+ % and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
diff --git a/Master/texmf-dist/doc/latex/synthslant/README.md b/Master/texmf-dist/doc/latex/synthslant/README.md
index 1b1c7191893..efc20fd37ee 100644
--- a/Master/texmf-dist/doc/latex/synthslant/README.md
+++ b/Master/texmf-dist/doc/latex/synthslant/README.md
@@ -1,3 +1,6 @@
+![distcheck status](https://github.com/cspiel/synthslant/actions/workflows/distcheck.yml/badge.svg)
+
+
# SynthSlant &ndash; Synthetic slanting of glyphs
LaTeX package `synthslant` slants short pieces of text to the right or to the left.
diff --git a/Master/texmf-dist/doc/latex/synthslant/RELEASE-HOWTO.md b/Master/texmf-dist/doc/latex/synthslant/RELEASE-HOWTO.md
deleted file mode 100644
index 13435ef66d5..00000000000
--- a/Master/texmf-dist/doc/latex/synthslant/RELEASE-HOWTO.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# How to prepare a new release
-
-... and not make too many mistakes.
-
-
-1. Check that the work-area is clean with respect to **git**-tracked
- files.
-
- ``` git status ```
-
-1. Update the date stamp of `\ProvidesPackage`.
-
-1. (Temporarily) Zero the `\overfullrule`s of the documentation and
- the example files.
-
-1. Thoroughly clean the work-area:
-
- ```make maintainer-clean```
-
-1. Rebuild:
-
- ```make```
-
-1. Check that all _*.sty_ and _*.pdf_ files are in good shape.
-
-1. Push the documentation files created in the previous step down into
- the *docs* directory:
-
- ```make update-docs```
-
-1. Undo the `\overfullrule` change.
-
-1. Commit the changes:
-
- ```
- git add .
- ```
-
- and finally
-
- ```
- git commit
- ```
-
-1. Tag the commit with the version string of `\ProvidesPackage`:
-
- ```git tag v1.23```
-
-1. Push the changes to the public repository:
-
- ```git push origin master --tags```
diff --git a/Master/texmf-dist/doc/latex/synthslant/index.md b/Master/texmf-dist/doc/latex/synthslant/index.md
deleted file mode 100644
index c8c312f3887..00000000000
--- a/Master/texmf-dist/doc/latex/synthslant/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Package Documentation
-
-- Comprehensive `synthslant` documentation: [synthslant.pdf](https://cspiel.github.io/synthslant/synthslant.pdf)
-- `synthslant` test and demonstration: [synthslant-gauge.pdf](https://cspiel.github.io/synthslant/synthslant-gauge.pdf)
diff --git a/Master/texmf-dist/doc/latex/synthslant/shear-transform.mp b/Master/texmf-dist/doc/latex/synthslant/shear-transform.mp
index aeacb9a5841..2ae5591d18a 100644
--- a/Master/texmf-dist/doc/latex/synthslant/shear-transform.mp
+++ b/Master/texmf-dist/doc/latex/synthslant/shear-transform.mp
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
diff --git a/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.pdf b/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.pdf
index 425e7944efe..762c1e00a00 100644
--- a/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.pdf
+++ b/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.tex b/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.tex
index dbea94e5cea..17de9acf55c 100644
--- a/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.tex
+++ b/Master/texmf-dist/doc/latex/synthslant/synthslant-gauge.tex
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -134,7 +134,7 @@
\setlength{\headheight}{0pt}
\setlength{\headsep}{0pt}
-\setlength{\overfullrule}{3pt}
+\setlength{\overfullrule}{0pt}
\pagestyle{plain}
diff --git a/Master/texmf-dist/doc/latex/synthslant/synthslant-minimal-test.tex b/Master/texmf-dist/doc/latex/synthslant/synthslant-minimal-test.tex
new file mode 100644
index 00000000000..9f79f6d3d40
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/synthslant/synthslant-minimal-test.tex
@@ -0,0 +1,39 @@
+%%
+%% This is file `synthslant-minimal-test.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% synthslant.dtx (with options: `minimal-test')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2024 by Ch. L. Spiel
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Ch. L. Spiel.
+%%
+%% This work consists of the files synthslant.dtx and synthslant.ins
+%% and the derived files synthslant.sty, synthslant-gauge.tex,
+%% shear-transform.mp, and title.mp.
+%%
+%%
+\documentclass{minimal}
+
+\usepackage{synthslant}
+
+\begin{document}
+\textsynthslant{abc}
+\end{document}
+\endinput
+%%
+%% End of file `synthslant-minimal-test.tex'.
diff --git a/Master/texmf-dist/doc/latex/synthslant/synthslant.gst b/Master/texmf-dist/doc/latex/synthslant/synthslant.gst
new file mode 100644
index 00000000000..9d7be0ed103
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/synthslant/synthslant.gst
@@ -0,0 +1,44 @@
+%%
+%% This is file `synthslant.gst',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% synthslant.dtx (with options: `changes-style')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2024 by Ch. L. Spiel
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Ch. L. Spiel.
+%%
+%% This work consists of the files synthslant.dtx and synthslant.ins
+%% and the derived files synthslant.sty, synthslant-gauge.tex,
+%% shear-transform.mp, and title.mp.
+%%
+%%
+actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
+heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
+heading_suffix "}\\nopagebreak\n"
+headings_flag 0
+item_x1 "\\efill\n\\subitem "
+item_x2 "\\ "
+keyword "\\glossaryentry"
+level '>'
+line_max 65536
+postamble "\n\\end{theglossary}\n"
+preamble "\\begin{theglossary}\n \\makeatletter\\scan@allowedfalse"
+quote '!'
diff --git a/Master/texmf-dist/doc/latex/synthslant/synthslant.ist b/Master/texmf-dist/doc/latex/synthslant/synthslant.ist
index c593624beff..05784657484 100644
--- a/Master/texmf-dist/doc/latex/synthslant/synthslant.ist
+++ b/Master/texmf-dist/doc/latex/synthslant/synthslant.ist
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -28,11 +28,12 @@
%%
%%
actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
heading_suffix "}\\nopagebreak\n"
headings_flag 1
level '>'
+line_max 65536
quote '!'
-\endinput
-%%
-%% End of file `synthslant.ist'.
diff --git a/Master/texmf-dist/doc/latex/synthslant/synthslant.pdf b/Master/texmf-dist/doc/latex/synthslant/synthslant.pdf
index 9b034b86c39..555101ee3c9 100644
--- a/Master/texmf-dist/doc/latex/synthslant/synthslant.pdf
+++ b/Master/texmf-dist/doc/latex/synthslant/synthslant.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/synthslant/title.mp b/Master/texmf-dist/doc/latex/synthslant/title.mp
index 25658ecb985..57efebbae1a 100644
--- a/Master/texmf-dist/doc/latex/synthslant/title.mp
+++ b/Master/texmf-dist/doc/latex/synthslant/title.mp
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md
index 5aaa4f6f216..a0287ad4b2c 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md
@@ -22,7 +22,45 @@ and this project adheres to
-## [6.2.0]
+## [6.3.0] - 2024-07-10
+
+### Added
+- Library `documentation`:
+ - Option `page ref formatter` (issue #273)
+- First experimental partial tagging support: suppress tagging of drawing (issue #283)
+ This works for lualatex only.
+
+### Changed
+- The base package loads `tikz` now instead of `pgf`.
+ All skins, including the `standard` family, use `tikzpicture` as internal environment now.
+- Boolean marker to detect if inside a `tcb@savebox` introduced (issue #262)
+- LaTeX usrguide cited for `\NewDocumentCommand` and friends (issue #263)
+- Stricter checks on box names in `\newtcbox` and friends (issue #264)
+- Checks on formatter like `index key formatter` enforced (issue #265)
+- Needed LaTeX version updated to 2023-11-01
+- More meaningful error message in case of `\DeclareTColorBox` with same auto counter (issue #276)
+- Library `theorems`:
+ - Options `ams align`, `ams align*`, `ams gather`, and `ams gather*` are now shortcuts
+ for the upper part only (issue #282)
+ - Documentation for `ams align`, `ams align*`, `ams gather`, and `ams gather*` adapted, i.e.
+ exclusion of lower parts documented (issue #282)
+- Technical information: The package documentation is now produced with lualatex instead of pdflatex
+
+### Deprecated
+- The option `graphical environment` is useless now, since all environments are based on `tikzpicture` now.
+
+### Removed
+- Documentation for the deprecated options `before example` and `after example`
+- Documentation for the deprecated option `graphical environment`
+
+### Fixed
+- `\@nobreakfalse` added to `\tcb@parbox@false@settings` to avoid
+ decreased space before list with `parbox=false` following a section heading (issue #270)
+- Documentation typos fixed (issue #279)
+
+
+
+## [6.2.0] - 2024-01-10
### Added
- New convenience options for box content additions (issue #250)
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README.md b/Master/texmf-dist/doc/latex/tcolorbox/README.md
index 27f6edf11de..e90e2bec18d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/README.md
+++ b/Master/texmf-dist/doc/latex/tcolorbox/README.md
@@ -1,4 +1,4 @@
-# The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+# The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
> Copyright (c) 2006-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf
index e39ddaa037c..1e380d5559a 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex
index ffa291103b5..cb8586e6ec1 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcolorbox-example-poster.tex: a poster example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
index 809b35a2caf..2d332523c2d 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
index 1adaa24d7ea..6f878d2f1dd 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf
index eb23961967b..f81aee07830 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
index ae550c5c6de..7c6c769d1d8 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib
index be1c60b666d..e38e91c3d4c 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.bib
@@ -209,3 +209,9 @@
}
+@manual{latexproject:usrguide,
+ author = {The \LaTeX{} Project Team},
+ title = {{\LaTeX} for authors --- current version},
+ url = {https://mirrors.ctan.org/macros/latex/base/usrguide.pdf},
+ date = {2023-05-23},
+}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
index a86994c7e20..00dc2198b22 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
@@ -252,7 +252,7 @@ The |break at| option can be used to insert better break points by hand.
The example code enlarged the second partial box by one line, the third
partial box by two lines, and all following parts are not enlarged.
\begin{marker}
- If an automated page break occures before the first partial box, the
+ If an automated page break occurs before the first partial box, the
page enlargement is applied to the page before the first partial box \emph{and}
again to the page of the first partial box. Insert a manual break to prevent this.\\
In general, |enlargepage| should be used at the final stage of a document
@@ -513,7 +513,7 @@ and \refKey{/tcb/enlarge bottom at break by}.
\item the segmentation line (or similar) is drawn as first element of the
partial box containing the \emph{lower part}, if \refKey{/tcb/segmentation at break}
is set to be |true|.
- \item the segmenation line (or similar) is not drawn at all, if
+ \item the segmentation line (or similar) is not drawn at all, if
\refKey{/tcb/segmentation at break} is set to be |false|.
This may be preferable for skins like \refSkin{bicolor}, \refSkin{tile},
or \refSkin{beamer}.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex
index 0847f09775d..c41134a6c84 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex
@@ -214,7 +214,8 @@ numbered title and options.
\begin{docCommand}{NewTColorBox}{\oarg{init options}\marg{name}\marg{specification}\marg{options}}
Creates a new environment \meta{name} based on \refEnv{tcolorbox}.\\
Basically, \refCom{NewTColorBox} operates like |\NewDocumentEnvironment|. This means,
- the new environment \meta{name} is constructed with the given argument \meta{specification}.
+ the new environment \meta{name} is constructed with the
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if an environment with \meta{name} has already been defined.
The \meta{options} are given to the underlying \refEnv{tcolorbox}.\\
Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name}
@@ -275,7 +276,8 @@ This is a tcolorbox.
Creates a new command \texttt{\textbackslash}\meta{name} based on \refEnv{tcolorbox}.
In contrast to \refCom{NewTColorBox}, also the \meta{content} of the |tcolorbox| is specified.\\
Basically, \refCom{NewTotalTColorBox} operates like |\NewDocumentCommand|. This means,
- the new command \texttt{\textbackslash}\meta{name} is constructed with the given argument \meta{specification}.
+ the new command \texttt{\textbackslash}\meta{name} is constructed with the given
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if \texttt{\textbackslash}\meta{name} has already been defined.
The \meta{options} are given to the underlying \refEnv{tcolorbox} which is filled with
the specified \meta{content}.\\
@@ -387,7 +389,8 @@ The \xmybox[green]{quick} brown \xmybox{fox} \xmybox[blue]{jumps} over the
\begin{docCommand}{NewTCBox}{\oarg{init options}\brackets{\texttt{\textbackslash}\meta{name}}\marg{specification}\marg{options}}
Creates a new command \texttt{\textbackslash}\meta{name} based on \refCom{tcbox}.
Basically, \refCom{NewTCBox} operates like |\NewDocumentCommand|. This means,
- the new command \texttt{\textbackslash}\meta{name} is constructed with the given argument \meta{specification}.
+ the new command \texttt{\textbackslash}\meta{name} is constructed with the given
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if \texttt{\textbackslash}\meta{name} has already been defined.
The \meta{options} are given to the underlying \refCom{tcbox}.\\
Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name}
@@ -437,7 +440,8 @@ The \xmybox[green]{quick} brown \xmybox{fox} \xmybox[blue]{jumps} over the
Creates a new command \texttt{\textbackslash}\meta{name} based on \refCom{tcbox}.
In contrast to \refCom{NewTCBox}, also the \meta{content} of the |tcbox| is specified.\\
Basically, \refCom{NewTotalTCBox} operates like |\NewDocumentCommand|. This means,
- the new command \texttt{\textbackslash}\meta{name} is constructed with the given argument \meta{specification}.
+ the new command \texttt{\textbackslash}\meta{name} is constructed with the
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if \texttt{\textbackslash}\meta{name} has already been defined.
The \meta{options} are given to the underlying \refCom{tcbox} which is filled with
the specified \meta{content}.\\
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
index e20936d76b2..62f3fa3c019 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -3104,11 +3104,11 @@ inside the document preamble.
\begin{docTcbKey}[][doc new={2020-09-25}]{before skip balanced}{=\meta{glue}}{no default, initially |0.5\textbackslash baselineskip plus 2pt|}
Inserts some vertical space before the colored box. This style sets \refKey{/tcb/before}.\par
If the depth of the
- preceeding \TeX\ box is between |0pt| and |0.3\baselineskip|,
- the distance between the \emph{baseline} of the preceeding \TeX\ box and the tcolorbox
- ist set to \meta{glue}$+$|0.3\baselineskip|.\par
- If the depth is larger, the distance of the preceeding \TeX\ box and the tcolorbox
- ist set to \meta{glue}.\par
+ preceding \TeX\ box is between |0pt| and |0.3\baselineskip|,
+ the distance between the \emph{baseline} of the preceding \TeX\ box and the tcolorbox
+ is set to \meta{glue}$+$|0.3\baselineskip|.\par
+ If the depth is larger, the distance of the preceding \TeX\ box and the tcolorbox
+ is set to \meta{glue}.\par
Alternatively, see \refKey{/tcb/before skip} which ignores the \emph{baseline}.
\begin{exdispExample*}{before_skip_balanced}{sbs,lefthand ratio=0.6}
@@ -3174,7 +3174,7 @@ line 4 g
Inserts some vertical space of the given \meta{glue} before the colored box.
This style sets \refKey{/tcb/before}.
In contrast to \refKey{/tcb/before skip balanced}, this \meta{glue} is
- relative to the lower edge of the preceeding box and not to the baseline.
+ relative to the lower edge of the preceding box and not to the baseline.
\begin{exdispExample*}{before_skip}{sbs,lefthand ratio=0.6}
Some text.
\begin{tcolorbox}[before skip=1cm,
@@ -4363,7 +4363,8 @@ from page \pageref{sec:numberedboxes}, e.\,g.\ \refKey{/tcb/new/auto counter}.
\begin{docTcbKey}[][doc new=2014-11-28]{phantomlabel}{=\meta{marker}}{no default, initially unset}
Equivalent to \refKey{/tcb/label} for an \emph{unnumbered} box.
A |\phantomsection| from the package |hyperref| \cite{rahtz:hyperref} is used to set a correct
-hyperlink target. This is not needed for a numbered box.
+hyperlink target.
+This is not needed and should typically not be used for a numbered box.
\end{docTcbKey}
\clearpage
@@ -4691,8 +4692,7 @@ It is precise only, if \refKey{/tcb/check odd page} was set.
See \Fullref{sec:external} for the \mylib{external} library of |tcolorbox|.
\end{marker}
-If the \emph{externalization} library of the \texttt{tikz} package is used
-and \refKey{/tcb/graphical environment} is set to |tikzpicture|,
+If the \emph{externalization} library of the \texttt{tikz} package is used,
a |tcolorbox| could trigger the externalization process which will arise
a compilation error.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
index 9934cd5c860..45282f3c468 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
@@ -953,7 +953,7 @@ hand side if too long. Linebreaks can be used inside the \meta{text}.
\begin{dispListing}
\begin{docCommands}[
doc name = l_tcobox_example_tl,
- doc sort index = example_tl, % sorted unter e like example
+ doc sort index = example_tl, % sorted under e like example
]{}
\end{docCommands}
\end{dispListing}
@@ -1354,29 +1354,6 @@ keys to insert code before (or after) the description texts.
\end{docTcbKey}
-\begin{marker}
-The following two keys are deprecated and without function (v3.50 and above).
-Use \refKey{/tcb/before} and \refKey{/tcb/after} with appropriate values
-instead. Also see \refKey{/tcb/docexample}.
-\end{marker}
-
-\begin{docTcbKey}[][doc updated=2015-03-16]{before example}{=\meta{macros}}{no default, initially empty}
-\smallskip\begin{deprecated}
- Sets the \meta{macros} which are executed before \refEnv{dispExample} and \refEnv{dispListing}
- additional to \refKey{/tcb/before}.
-\end{deprecated}
-\end{docTcbKey}
-
-\enlargethispage*{1cm}
-
-\begin{docTcbKey}{after example}{=\meta{macros}}{no default, initially empty}
-\smallskip\begin{deprecated}
- Sets the \meta{macros} which are executed after \refEnv{dispExample} and \refEnv{dispListing}
- additional to \refKey{/tcb/after}.
-\end{deprecated}
-\end{docTcbKey}
-
-\clearpage
\begin{docTcbKey}[][doc new=2017-04-25]{keywords bold}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
Keyword used in \refEnv{docEnvironment}, \refEnv{docCommand}, etc. are printed
boldface (or not). Since the typewriter font is used, the effect may be
@@ -1391,6 +1368,24 @@ instead. Also see \refKey{/tcb/docexample}.
\end{dispExample*}
\end{docTcbKey}
+\clearpage
+
+\begin{docTcbKeys}
+ {
+ {
+ doc name = page ref formatter,
+ doc new = {2024-03-13},
+ doc parameter = \colOpt{=\meta{macro}},
+ doc description = {no default, initially \texttt{\textbackslash textsuperscript}},
+ }
+ }
+Sets \meta{macro} as formatter for page references like the
+reference to \refEnv{tcolorbox}.
+The default setting puts the page reference in a |\textsuperscript|.
+It may be changed to |\fakesuperscript| to cope with superiors problems
+in combination with the |realscripts| package or just otherwise for user customization.
+\end{docTcbKeys}
+
\begin{docTcbKey}[][doc new=2015-01-09]{index command}{=\meta{macro}}{no default, initially \cs{index}}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
index b7a10c23314..62c982c2d3e 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
@@ -74,7 +74,7 @@ executed.
\documentclass[a4paper]{book}% for example
\usepackage{...}% anything
% ...
-% Tpyically, all or the very most settings for the document.
+% Typically, all or the very most settings for the document.
\tcbEXTERNALIZE% Typically, just before \begin{document}
@@ -500,7 +500,7 @@ in this case.
\clearpage
\begin{docCommand}[doc new=2015-03-11]{newtcbexternalizeenvironment}{\marg{newenv}\marg{env}\marg{options}\marg{begin}\marg{end}}
Creates a new environment \meta{newenv} which is based on
- \refEnv{tcbexternal}. This enviroment takes \emph{at least}
+ \refEnv{tcbexternal}. This environment takes \emph{at least}
one optional parameter and one mandatory parameter.
These two parameters are passed to \refEnv{tcbexternal}.
Further, the given \meta{options} are always added to the option list of \refEnv{tcbexternal}.\par
@@ -532,7 +532,7 @@ a & This table is externalized as snippet. Obviously,
\begin{docCommand}[doc new=2015-03-11]{newtcbexternalizetcolorbox}{\marg{newenv}\marg{env}\marg{options}\marg{begin end options}}
Creates a new environment \meta{newenv} which is based on
- \refEnv{tcbexternal}. This enviroment takes \emph{at least}
+ \refEnv{tcbexternal}. This environment takes \emph{at least}
one optional parameter and one mandatory parameter.
These two parameters are passed to \refEnv{tcbexternal}.
Further, the given \meta{options} are always added to the option list of \refEnv{tcbexternal}.\par
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex
index 9f1f4627caa..909f7f4ac0f 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex
@@ -63,7 +63,7 @@ To be more specific, they determine the east-to-west and the north-to-south dime
which may be not the maximal dimensions for a non-rectangular node.
Note that the following dimensions are measured exactly including the line width
of the border line. If a new rectangle or node with the same dimensions
-and a border is to be drawn, this border width has to be substracted.
+and a border is to be drawn, this border width has to be subtracted.
\begin{docCommand}[doc new=2014-09-19]{tcbsettowidthofnode}{\marg{register}\marg{node}}
Sets the east-to-west dimension of the given \meta{node}
@@ -88,7 +88,7 @@ and a border is to be drawn, this border width has to be substracted.
\node[align=center,draw=red,fill=yellow] (A) {This is my\\example node};
\tcbsetmacrotowidthofnode\mywidth{A}
\tcbsetmacrotoheightofnode\myheight{A}
- \path[fill=blue!25!white] % rectangle widthout border
+ \path[fill=blue!25!white] % rectangle without border
([xshift=2mm]A.south east)
rectangle node{Copy} +(\mywidth,\myheight);
\node[draw=blue,fill=blue!25!white, % standard border width 0.4pt
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex
index 14f9e7b5771..a541659c37c 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.fitting.tex
@@ -145,7 +145,8 @@ The library is loaded by a package option or inside the preamble by:
\begin{docCommand}{NewTCBoxFit}{\oarg{init options}\brackets{\texttt{\textbackslash}\meta{name}}\marg{specification}\marg{options}}
Creates a new command \texttt{\textbackslash}\meta{name} based on \refCom{tcboxfit}.
Basically, \refCom{NewTCBoxFit} operates like |\NewDocumentCommand|. This means,
- the new command \texttt{\textbackslash}\meta{name} is constructed with the given argument \meta{specification}.
+ the new command \texttt{\textbackslash}\meta{name} is constructed with the given
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if \texttt{\textbackslash}\meta{name} has already been defined.
The \meta{options} are given to the underlying \refCom{tcboxfit}.\\
Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name}
@@ -192,7 +193,8 @@ The library is loaded by a package option or inside the preamble by:
Creates a new command \texttt{\textbackslash}\meta{name} based on \refCom{tcboxfit}.
In contrast to \refCom{NewTCBoxFit}, also the \meta{content} of the |tcboxfit| is specified.\\
Basically, \refCom{NewTotalTCBoxFit} operates like |\NewDocumentCommand|. This means,
- the new command \texttt{\textbackslash}\meta{name} is constructed with the given argument \meta{specification}.
+ the new command \texttt{\textbackslash}\meta{name} is constructed with the given
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if \texttt{\textbackslash}\meta{name} has already been defined.
The \meta{options} are given to the underlying \refCom{tcboxfit} which is filled with
the specified \meta{content}.\\
@@ -620,7 +622,7 @@ if necessary.
\begin{docTcbKey}{fit maxstep}{=\meta{number}}{no default, initially |20|}
Sets the maximal step size for the font size adjustment algorithm.
- In normal situations, the algorithm stops before reaching the intial value of 20 steps.
+ In normal situations, the algorithm stops before reaching the initial value of 20 steps.
If the box content does not shrink, this value prevents an endless loop.
\end{docTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
index 548c70e0816..0d76c0afbb3 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
@@ -48,7 +48,7 @@ for some hints. The short story is: you have to install not only
\subsection{Loading the Package}
The base package |tcolorbox| loads the packages
-|pgf| \cite{tantau:tikz_and_pgf}, |verbatim| \cite{schoepf:verbatim},
+|tikz| \cite{tantau:tikz_and_pgf}, |verbatim| \cite{schoepf:verbatim},
|etoolbox| \cite{lehmann:etoolbox},
and |environ| \cite{robertson:2014a}.
|tcolorbox| itself is loaded in the usual manner in the preamble:
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
index c2e8b5fe277..c6e56dcdfab 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
@@ -282,7 +282,8 @@ This is my \LaTeX\ box.
\begin{docCommand}{NewTCBListing}{\oarg{init options}\marg{name}\marg{specification}\marg{options}}
Creates a new environment \meta{name} based on \refEnv{tcblisting}.\\
Basically, \refCom{NewTCBListing} operates like |\NewDocumentEnvironment|. This means,
- the new environment \meta{name} is constructed with the given argument \meta{specification}.
+ the new environment \meta{name} is constructed with the
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if \meta{name} has already been defined.
The \meta{options} are given to the underlying \refEnv{tcblisting}.\\
Note that \refKey{/tcb/savedelimiter} is set to the given \meta{name}
@@ -429,7 +430,8 @@ Note that the following code uses \verb+!O{}+ now.
\begin{docCommand}{NewTCBInputListing}{\oarg{init options}\brackets{\texttt{\textbackslash}\meta{name}}\marg{specification}\marg{options}}
Creates a new command \texttt{\textbackslash}\meta{name} based on \refCom{tcbinputlisting}.
Basically, \refCom{NewTCBInputListing} operates like |\NewDocumentCommand|. This means,
- the new command \texttt{\textbackslash}\meta{name} is constructed with the given argument \meta{specification}.
+ the new command \texttt{\textbackslash}\meta{name} is constructed with the
+ given \LaTeX3 argument \meta{specification} following \cite{latexproject:usrguide}.
An error is issued if \texttt{\textbackslash}\meta{name} has already been defined.
The \meta{options} are given to the underlying \refCom{tcbinputlisting}.\\
The \meta{init options} allow setting up automatic numbering,
@@ -1178,6 +1180,7 @@ This \meta{system command} is added to \refKey{/tcb/process code}.
\end{marker}
\end{docTcbKey}
+\enlargethispage*{5mm}
\begin{docTcbKey}[][doc new=2014-11-14]{run pdflatex}{\colOpt{=\meta{arguments}}}{style, no default, initially unset}
Issues a |pdflatex| compilation of the listing with the given \meta{arguments}.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
index 3eabd88b1e6..7bc44882c8e 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
@@ -276,9 +276,9 @@
before skip=\medskipamount,after skip=\medskipamount,frame style={}},
}
-\newtcbexternalizetcolorbox{exdispExample}{dispExample}{environment with percent=false,minipage}{beforeafter example}
+\newtcbexternalizetcolorbox{exdispExample}{dispExample}{environment with percent=false,minipage,compiler=lualatex}{beforeafter example}
-\newtcbexternalizetcolorbox{exdispExample*}{dispExample*}{environment with percent=false,minipage}{beforeafter example}
+\newtcbexternalizetcolorbox{exdispExample*}{dispExample*}{environment with percent=false,minipage,compiler=lualatex}{beforeafter example}
\newcommand{\inputpreamblelisting}[1]{%
\tcbinputlisting{title=Definition in the preamble:,
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skincatalog.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skincatalog.tex
index ece3b4bc351..9f79252f3e1 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skincatalog.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skincatalog.tex
@@ -117,7 +117,6 @@ defined just for this documentation.
\begin{tcolorbox}[skintable=standard]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |pgfpicture|\\
\refKey{/tcb/frame engine}: \> |standard|\\
\refKey{/tcb/interior titled engine}: \> |standard|\\
\refKey{/tcb/interior engine}: \> |standard|\\
@@ -143,7 +142,6 @@ defined just for this documentation.
\begin{tcolorbox}[skintable=standard jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |pgfpicture|\\
\refKey{/tcb/frame engine}: \> |standardjigsaw|\\
\refKey{/tcb/interior titled engine}: \> |standard|\\
\refKey{/tcb/interior engine}: \> |standard|\\
@@ -185,7 +183,6 @@ have some \enquote{enhanced} features, the |enhanced| skin is what you are looki
\begin{tcolorbox}[skintable=enhanced]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |path|\\
\refKey{/tcb/interior titled engine}: \> |path|\\
\refKey{/tcb/interior engine}: \> |path|\\
@@ -297,7 +294,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=enhancedfirst]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathfirst|\\
\refKey{/tcb/interior titled engine}: \> |pathfirst|\\
\refKey{/tcb/interior engine}: \> |pathfirst|\\
@@ -322,7 +318,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=enhancedmiddle]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathmiddle|\\
\refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
\refKey{/tcb/interior engine}: \> |pathmiddle|\\
@@ -346,7 +341,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=enhancedlast]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathlast|\\
\refKey{/tcb/interior titled engine}: \> |pathlast|\\
\refKey{/tcb/interior engine}: \> |pathlast|\\
@@ -368,7 +362,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=enhanced jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathjigsaw|\\
\refKey{/tcb/interior titled engine}: \> |path|\\
\refKey{/tcb/interior engine}: \> |path|\\
@@ -404,7 +397,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=enhancedfirst jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathfirstjigsaw|\\
\refKey{/tcb/interior titled engine}: \> |pathfirst|\\
\refKey{/tcb/interior engine}: \> |pathfirst|\\
@@ -429,7 +421,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=enhancedmiddle jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathmiddlejigsaw|\\
\refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
\refKey{/tcb/interior engine}: \> |pathmiddle|\\
@@ -509,7 +500,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=enhancedlast]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathlastjigsaw|\\
\refKey{/tcb/interior titled engine}: \> |pathlast|\\
\refKey{/tcb/interior engine}: \> |pathlast|\\
@@ -537,7 +527,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolor]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |path|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -694,7 +683,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolorfirst]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathfirst|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -720,7 +708,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolormiddle]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathmiddle|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -746,7 +733,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolorlast]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathlast|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -772,7 +758,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolor jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathjigsaw|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -805,7 +790,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolorfirst jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathfirstjigsaw|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -833,7 +817,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolormiddle jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathmiddlejigsaw|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -860,7 +843,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=bicolorlast jigsaw]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathlastjigsaw|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -891,7 +873,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=tile]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -923,7 +904,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=tilefirst]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -949,7 +929,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=tilemiddle]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -976,7 +955,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=tilelast]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -1006,7 +984,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=beamer]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |path|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -1069,7 +1046,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=beamerfirst]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathfirst|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -1094,7 +1070,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=beamermiddle]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathmiddle|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -1118,7 +1093,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=beamerlast]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathlast|\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -1145,7 +1119,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=widget]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |path|\\
\refKey{/tcb/interior titled engine}: \> |path|\\
\refKey{/tcb/interior engine}: \> |path|\\
@@ -1184,7 +1157,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=widgetfirst]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathfirst|\\
\refKey{/tcb/interior titled engine}: \> |pathfirst|\\
\refKey{/tcb/interior engine}: \> |pathfirst|\\
@@ -1208,7 +1180,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=widgetmiddle]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathmiddle|\\
\refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
\refKey{/tcb/interior engine}: \> |pathmiddle|\\
@@ -1231,7 +1202,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=widgetlast]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |pathlast|\\
\refKey{/tcb/interior titled engine}: \> |pathlast|\\
\refKey{/tcb/interior engine}: \> |pathlast|\\
@@ -1257,7 +1227,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=empty]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> |empty|\\
\refKey{/tcb/interior engine}: \> |empty|\\
@@ -1348,7 +1317,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=emptyfirst]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> |empty|\\
\refKey{/tcb/interior engine}: \> |empty|\\
@@ -1375,7 +1343,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=emptymiddle]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> |empty|\\
\refKey{/tcb/interior engine}: \> |empty|\\
@@ -1401,7 +1368,6 @@ Nevertheless, this skin can be applied independently.
\begin{tcolorbox}[skintable=emptylast]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |empty|\\
\refKey{/tcb/interior titled engine}: \> |empty|\\
\refKey{/tcb/interior engine}: \> |empty|\\
@@ -1520,7 +1486,6 @@ are drawn by the codes given by
\begin{tcolorbox}[skintable=spartan]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |spartan|\\
\refKey{/tcb/interior titled engine}: \> |spartan|\\
\refKey{/tcb/interior engine}: \> |spartan|\\
@@ -1551,7 +1516,6 @@ are drawn by the codes given by
\begin{tcolorbox}[skintable=draft]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> \emph{special}\\
\refKey{/tcb/interior titled engine}: \> \emph{special}\\
\refKey{/tcb/interior engine}: \> \emph{special}\\
@@ -1612,7 +1576,6 @@ you would have used \refKey{/tcb/freelance} before.
\begin{tcolorbox}[skintable=freelance]
\begin{tabbing}
\refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
\refKey{/tcb/frame engine}: \> |freelance|\\
\refKey{/tcb/interior titled engine}: \> |freelance|\\
\refKey{/tcb/interior engine}: \> |freelance|\\
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
index e92d81a6440..bbf946c9fca 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
@@ -7,8 +7,7 @@ The library is loaded by a package option or inside the preamble by:
\begin{dispListing}
\tcbuselibrary{skins}
\end{dispListing}
-This also loads the package |tikz| \cite{tantau:tikz_and_pgf}. Typically but not necessarily,
-the following skins use |tikz| instead of |pgf|.
+This also loads the package |tikzfill.image|.
In the following, general settings and options of the library are
documented.
@@ -1059,9 +1058,7 @@ By default, the resulting boxed title is somewhat smaller than the main box.
\clearpage
\subsection{Watermark Option Keys}\label{subsec:watermarks}
-The following watermark options are applicable for all skins which
-use |tikzpicture| as \refKey{/tcb/graphical environment}.
-Therefore, the skin \refSkin{standard} does not support these watermarks,
+The skin \refSkin{standard} does not support these watermarks,
but all other skins, e.\,g.\ \refSkin{enhanced}.
\begin{marker}
@@ -1479,9 +1476,7 @@ Donau\-dampf\-schiff\-fahrts\-ka\-pi\-t\"ans\-m\"ut\-zen\-fran\-sen
\clearpage
\subsection{Border Line Option Keys}\label{subsec:borderline}
-The following borderline options are applicable for most skins which
-use |tikzpicture| as \refKey{/tcb/graphical environment}.
-Therefore, the skin \refSkin{standard} does not support these border lines,
+The skin \refSkin{standard} does not support these border lines,
but most other skins, e.\,g.\ \refSkin{enhanced}.
The borderlines are independent from the normal |tcolorbox| rules.
@@ -1714,9 +1709,7 @@ but adapt to breakable boxes.
\clearpage
\subsection{Shadow Option Keys}\label{subsec:shadows}
-The following shadow options are applicable for most skins which
-use |tikzpicture| as \refKey{/tcb/graphical environment}.
-Therefore, the skin \refSkin{standard} does not support these shadows,
+The skin \refSkin{standard} does not support these shadows,
but most other skins, e.\,g.\ \refSkin{enhanced}.
The shadows are stackable, i.\,e.\ several different shadows can be
@@ -2087,7 +2080,7 @@ This is a tcolorbox.
from the frame outline. A positive \meta{offset} value shrinks the shadow
and a negative \meta{offset} value enlarges the shadow.
The shadow is filled along a \tikzname\ path with the given \tikzname\ \meta{options}.\\
- The shadows adapt to the rounded corners of the |tcolorbox|. A shrinked shadow
+ The shadows adapt to the rounded corners of the |tcolorbox|. A shrunken shadow
will switch to sharp corners if necessary, an enlarged shadow may become
more rounded depending on several factors. But \refKey{/tcb/sharp corners}
have sharp shadows.
@@ -2255,7 +2248,7 @@ This is a tcolorbox.
\clearpage
\subsubsection{\tikzname\ Shadows}
-Alternativ to the package shadow options described before, shadows from
+Alternative to the package shadow options described before, shadows from
the \flqq Shadows Library\frqq\ of \tikzname\ can be used.
Such shadows can be added directly to the frame path using \refKey{/tcb/frame style}.
@@ -2292,9 +2285,7 @@ Such shadows can be added directly to the frame path using \refKey{/tcb/frame st
\clearpage
\subsection{\tikzname\ Picture Option Keys}\label{subsec:tikzpicture}
-The following general options are applicable for skins which
-use |tikzpicture| as \refKey{/tcb/graphical environment}.
-Therefore, the skin \refSkin{standard} does not support these options,
+The skin \refSkin{standard} does not support these options,
but most other skins, e.\,g.\ \refSkin{enhanced}.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex
index 1e6960ffd2a..a9fbc31bb27 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.technical.tex
@@ -62,13 +62,6 @@ option from the core package has to be set.
\clearpage
-\begin{docTcbKey}{graphical environment}{=\meta{name}}{no default, initially \texttt{pgfpicture}}
- Sets the graphical environment for the |tcolorbox| to \meta{name}.
- Feasible values are |pgfpicture| and |tikzpicture| or environments which
- inherit from one of these two. This key is set by a \refKey{/tcb/skin} and
- may seldom be used directly.
-\end{docTcbKey}
-
The skin of a |tcolorbox| is drawn by up to four \emph{engines}.
Afterwards, the text content is drawn which is not part of a skin.
The four steps are:
@@ -85,18 +78,6 @@ The four steps are:
by \refKey{/tcb/title engine}.
\end{enumerate}
-%Every engine for the up to four steps can be set to one of the following types:
-%\begin{enumerate}
-%\item\docValue{standard}: the original code from the core package.
-%\item\docValue{path}: a |tikz| path which can be controlled by options.
-%\item\docValue{pathfirst}: a |tikz| path which can be controlled by options.
-%\item\docValue{pathmiddle}: a |tikz| path which can be controlled by options.
-%\item\docValue{pathlast}: a |tikz| path which can be controlled by options.
-%\item\docValue{freelance}: arbitrary user code.
-%\item\docValue{spartan}: a quite spartan code.
-%\end{enumerate}
-%\clearpage
-
\begin{docTcbKey}{frame engine}{=\meta{name}}{no default, initially \texttt{standard}}
Sets the \emph{frame} drawing engine for a box to \meta{name}.
Typically, this key is set by a \refKey{/tcb/skin}.
@@ -644,7 +625,7 @@ These color names are
\item\docColor{tcbcolframe} set by \refKey{/tcb/colframe} (frame color)
\item\docColor{tcbcolback} set by \refKey{/tcb/colback} (background color)
\item\docColor{tcbcolbacktitle} set by \refKey{/tcb/colbacktitle} (background color of the title)
-\item\docColor{tcbcolbacklower} set by \refKey{/tcb/colbacklower} (skin dependend background color
+\item\docColor{tcbcolbacklower} set by \refKey{/tcb/colbacklower} (skin dependent background color
of the lower part; needs \mylib{skins} to be loaded)
\item\docColor{tcbcolupper} set by \refKey{/tcb/colupper} (text color upper part)
\item\docColor{tcbcollower} set by \refKey{/tcb/collower} (text color lower part)
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex
index 4884e85f576..f1a7be1ff41 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex
@@ -243,7 +243,7 @@ E&=mc^2 + \int_a^b x\, dx
\begin{docTcbKey}{separator sign}{=\meta{sign}}{no default, initially |:|}
The given \meta{sign} is used inside the title text of a theorem
- as separater between display name combined with number and
+ as separator between display name combined with number and
the specific title text. It is omitted, if there is no specific title text.
\begin{dispExample}
@@ -706,91 +706,140 @@ created by hand or using \refCom{newtcbtheorem}.
\end{docTcbKey}
\clearpage
-\begin{docTcbKey}{ams align upper}{}{style, no value}
+\begin{docTcbKeys}[
+ doc parameter = ,
+ doc description = {style, no value},
+ ]
+ {
+ {
+ doc name = ams align upper,
+ },
+ {
+ doc name = ams align,
+ doc updated = 2024-06-27,
+ }
+ }
Adds an |amsmath| |align| environment to the start and end
of the upper part.
-\end{docTcbKey}
-
-\begin{docTcbKey}{ams align lower}{}{style, no value}
- Adds an |amsmath| |align| environment to the start and end
- of the lower part.
-\end{docTcbKey}
-
-\begin{docTcbKey}{ams align}{}{style, no value}
- Adds an |amsmath| |align| environment to the start and end
- of the upper \emph{and} lower part.
\begin{dispExample}
\begin{tcolorbox}[ams align,colback=yellow!10!white,colframe=red!50!black]
\sum\limits_{n=1}^{\infty} \frac{1}{n} &= \infty.\\
\int x^2 ~\text{d}x &= \frac13 x^3 + c.
\end{tcolorbox}
\end{dispExample}
-\end{docTcbKey}
-
-\begin{docTcbKey}{ams align* upper}{}{style, no value}
- Adds an |amsmath| |align*| environment to the start and end
- of the upper part.
-\end{docTcbKey}
+\begin{marker}
+ Boxes with \refKey{/tcb/ams align upper} or \refKey{/tcb/ams align}
+ cannot have a lower part!
+ For a lower part, use \refKey{/tcb/ams nodisplayskip upper} instead.
+\end{marker}
+\end{docTcbKeys}
-\begin{docTcbKey}{ams align* lower}{}{style, no value}
- Adds an |amsmath| |align*| environment to the start and end
+\begin{docTcbKey}{ams align lower}{}{style, no value}
+ Adds an |amsmath| |align| environment to the start and end
of the lower part.
\end{docTcbKey}
-\begin{docTcbKey}{ams align*}{}{style, no value}
+
+\begin{docTcbKeys}[
+ doc parameter = ,
+ doc description = {style, no value},
+ ]
+ {
+ {
+ doc name = ams align* upper,
+ },
+ {
+ doc name = ams align*,
+ doc updated = 2024-06-27,
+ }
+ }
Adds an |amsmath| |align*| environment to the start and end
- of the upper \emph{and} lower part.
+ of the upper part.
\begin{dispExample}
\begin{tcolorbox}[ams align*,colback=yellow!10!white,colframe=red!50!black]
\sum\limits_{n=1}^{\infty} \frac{1}{n} &= \infty.\\
\int x^2 ~\text{d}x &= \frac13 x^3 + c.
\end{tcolorbox}
\end{dispExample}
-\end{docTcbKey}
-
-\clearpage
-\begin{docTcbKey}{ams gather upper}{}{style, no value}
- Adds an |amsmath| |gather| environment to the start and end
- of the upper part.
-\end{docTcbKey}
+\begin{marker}
+ Boxes with \refKey{/tcb/ams align* upper} or \refKey{/tcb/ams align*}
+ cannot have a lower part!
+ For a lower part, use \refKey{/tcb/ams nodisplayskip upper} instead.
+\end{marker}
+\end{docTcbKeys}
-\begin{docTcbKey}{ams gather lower}{}{style, no value}
- Adds an |amsmath| |gather| environment to the start and end
+\begin{docTcbKey}{ams align* lower}{}{style, no value}
+ Adds an |amsmath| |align*| environment to the start and end
of the lower part.
\end{docTcbKey}
-\begin{docTcbKey}{ams gather}{}{style, no value}
+
+\clearpage
+\begin{docTcbKeys}[
+ doc parameter = ,
+ doc description = {style, no value},
+ ]
+ {
+ {
+ doc name = ams gather upper,
+ },
+ {
+ doc name = ams gather,
+ doc updated = 2024-06-27,
+ }
+ }
Adds an |amsmath| |gather| environment to the start and end
- of the upper \emph{and} lower part.
+ of the upper part.
\begin{dispExample}
\begin{tcolorbox}[ams gather,colback=yellow!10!white,colframe=red!50!black]
\sum\limits_{n=1}^{\infty} \frac{1}{n} = \infty.\\
\int x^2 ~\text{d}x = \frac13 x^3 + c.
\end{tcolorbox}
\end{dispExample}
-\end{docTcbKey}
-
-\begin{docTcbKey}{ams gather* upper}{}{style, no value}
- Adds an |amsmath| |gather*| environment to the start and end
- of the upper part.
-\end{docTcbKey}
+\begin{marker}
+ Boxes with \refKey{/tcb/ams gather upper} or \refKey{/tcb/ams gather}
+ cannot have a lower part!
+ For a lower part, use \refKey{/tcb/ams nodisplayskip upper} instead.
+\end{marker}
+\end{docTcbKeys}
-\begin{docTcbKey}{ams gather* lower}{}{style, no value}
- Adds an |amsmath| |gather*| environment to the start and end
+\begin{docTcbKey}{ams gather lower}{}{style, no value}
+ Adds an |amsmath| |gather| environment to the start and end
of the lower part.
\end{docTcbKey}
-\begin{docTcbKey}{ams gather*}{}{style, no value}
+\begin{docTcbKeys}[
+ doc parameter = ,
+ doc description = {style, no value},
+ ]
+ {
+ {
+ doc name = ams gather* upper,
+ },
+ {
+ doc name = ams gather*,
+ doc updated = 2024-06-27,
+ }
+ }
Adds an |amsmath| |gather*| environment to the start and end
- of the upper \emph{and} lower part.
+ of the upper part.
\begin{dispExample}
\begin{tcolorbox}[ams gather*,colback=yellow!10!white,colframe=red!50!black]
\sum\limits_{n=1}^{\infty} \frac{1}{n} = \infty.\\
\int x^2 ~\text{d}x = \frac13 x^3 + c.
\end{tcolorbox}
\end{dispExample}
-\end{docTcbKey}
+\begin{marker}
+ Boxes with \refKey{/tcb/ams gather* upper} or \refKey{/tcb/ams gather*}
+ cannot have a lower part!
+ For a lower part, use \refKey{/tcb/ams nodisplayskip upper} instead.
+\end{marker}
+\end{docTcbKeys}
+\begin{docTcbKey}{ams gather* lower}{}{style, no value}
+ Adds an |amsmath| |gather*| environment to the start and end
+ of the lower part.
+\end{docTcbKey}
\clearpage
\begin{docTcbKey}{ams nodisplayskip upper}{}{style, no value}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.vignette.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.vignette.tex
index 733c356d8e0..8ea72010fe0 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.vignette.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.vignette.tex
@@ -140,7 +140,7 @@ is used internally.
\enlargethispage*{1cm}
-\begin{vigTcbKey}[][doc new=2016-04-22]{inside node}{=\meta{name}}{style, initally unset}
+\begin{vigTcbKey}[][doc new=2016-04-22]{inside node}{=\meta{name}}{style, initially unset}
Places the \refCom{tcbvignette} inside the node with the given \meta{name}.
The outer limits of the \emph{vignette} are adapted to the node geometry.
\begin{dispExample*}{sbs,righthand width=3cm,center lower}
@@ -154,7 +154,7 @@ is used internally.
\clearpage
-\begin{vigTcbKey}[][doc new=2016-04-22]{outside node}{=\meta{name}}{style, initally unset}
+\begin{vigTcbKey}[][doc new=2016-04-22]{outside node}{=\meta{name}}{style, initially unset}
Places the \refCom{tcbvignette} outside the node with the given \meta{name}.
The inner limits of the \emph{vignette} are adapted to the node geometry.
\begin{dispExample*}{sbs,righthand width=3cm,center lower}
@@ -167,7 +167,7 @@ is used internally.
\end{vigTcbKey}
-\begin{vigTcbKey}[][doc new=2016-04-22]{over node}{=\meta{name}}{style, initally unset}
+\begin{vigTcbKey}[][doc new=2016-04-22]{over node}{=\meta{name}}{style, initially unset}
Places the \refCom{tcbvignette} over the node with the given \meta{name}.
The outer limits of the \emph{vignette} are adapted to the node geometry, but
are shifted to the outside by \refKey{/tcb/vig/over node offset}.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index a7499395e4a..3054aff5913 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
index b7c17423914..c60eb4acfa8 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -25,6 +25,18 @@
% arara: pdflatex: { shell: yes, synctex: yes }
% arara: pdflatex: { shell: yes, synctex: yes }
%
+%\DocumentMetadata{
+% lang = en,
+% pdfversion = 2.0,
+% pdfstandard = ua-2,
+% pdfstandard = a-4f,
+% testphase =
+% {
+% phase-III,
+% firstaid
+% },
+% %uncompress,
+%}
\PassOptionsToPackage{pdftex,bookmarks,raiselinks,pageanchor,hyperindex,colorlinks,pdfusetitle,pdfpagelabels}{hyperref}
\documentclass[a4paper,11pt]{ltxdoc}
@@ -51,8 +63,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{6.2.0}%
-\def\datum{2024/01/10}%
+\def\version{6.3.0}%
+\def\datum{2024/07/10}%
\makeindex
\hypersetup{
@@ -68,7 +80,7 @@
%\geometry{showframe}
%\tcbset{draftmode}
\tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.initoptions,tcolorbox.doc.index}
+%\includeonly{tcolorbox.doc.coreoptions}
%\hypersetup{colorlinks=false}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/texvc/texvc.pdf b/Master/texmf-dist/doc/latex/texvc/texvc.pdf
index 7269b865f21..f431f01829d 100644
--- a/Master/texmf-dist/doc/latex/texvc/texvc.pdf
+++ b/Master/texmf-dist/doc/latex/texvc/texvc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md
index fb293105fc3..b038a8a762d 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md
@@ -6,6 +6,17 @@
## [Unreleased]
+## [v7.5.2] - 2024-07-01
+
+### Added
+
+- 增加选项 `eqn-paren-style` 控制公式编号的括号样式([#959](https://github.com/tuna/thuthesis/pull/959))。
+
+### Fixed
+
+- 解决本科生的多篇“书面翻译对应的原文索引”([#956](https://github.com/tuna/thuthesis/issues/956))。
+- 修复 GitHub 发布的 Release 压缩包缺少部分文件的问题([#965](https://github.com/tuna/thuthesis/issues/965))。
+
## [v7.5.1] - 2024-05-20
### Changed
@@ -988,7 +999,8 @@
-[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.5.1...HEAD
+[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.5.2...HEAD
+[v7.5.2]: https://github.com/tuna/thuthesis/compare/v7.5.1...v7.5.2
[v7.5.1]: https://github.com/tuna/thuthesis/compare/v7.5.0...v7.5.1
[v7.5.0]: https://github.com/tuna/thuthesis/compare/v7.4.0...v7.5.0
[v7.4.0]: https://github.com/tuna/thuthesis/compare/v7.3.2...v7.4.0
diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf
index 2c48ce2ef57..36ed8efd751 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
index daa32de045d..4979b94dc41 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/README.md b/Master/texmf-dist/doc/latex/tkz-elements/README.md
index a4d8d90fadd..66c11bf62fe 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/README.md
+++ b/Master/texmf-dist/doc/latex/tkz-elements/README.md
@@ -1,10 +1,10 @@
# tkz-elements — for euclidean geometry
-Release 2.25c 2024/04/28
+Release 2.30c 2024/07/16
## Description
-`tkz-elements v.2.25c` is the new version of a library written in lua, allowing to make all the necessary calculations to define the objects of a Euclidean geometry figure. You need to compile with `LuaLaTeX`. With `tkz-elements`, the definitions and calculations are only done with `Lua`.
+`tkz-elements v.2.30c` is the new version of a library written in lua, allowing to make all the necessary calculations to define the objects of a Euclidean geometry figure. You need to compile with `LuaLaTeX`. With `tkz-elements`, the definitions and calculations are only done with `Lua`.
The main possibility of programmation proposed is oriented "object programming" with object classes like point, line, triangle, circle and ellipse. For the moment, once the calculations are done, it is `tkz-euclide` or `TikZ` which allows the drawings. You can use the option `mini` with `tkz-euclide` to load only the modules required for tracing.
@@ -62,6 +62,15 @@ An important example `Golden Arbelos` using the package is on the site. All the
are on the site.
## History
+
+ - version 2.30c
+ - new version of the macro `\tkzGetNodes` written by Sanskar Singh. This version now fixes a bug that prevented a figure from being centred with `centering` or the `center` environment.
+ - adding methods `bevan_circle`, `symmedial_circle`.
+ - correction of the methods `function triangle: bevan_point ()` and `function triangle: mittenpunkt_point ()`.
+ - adding `function triangle: similar ()`
+ - adding `function line : perpendicular_bisector ()` which is similar to `function line : mediator ()`
+ - correction of documentation.
+
- version 2.25c
- French documentation at my site: [http://altermundus.fr](http://altermundus.fr)
- Added `colinear_at` a new method for the classe `line`
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-circle.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-circle.tex
index 7ae96c7ada5..85e73595189 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-circle.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-circle.tex
@@ -25,8 +25,8 @@ This class is defined by two points: the center and a point through which the ci
\Iattr{circle}{south} & |C.AB.south| & |z.S = C.OA.south| \\
\Iattr{circle}{east} & |C.AB.east| & |z.E = C.OA.east| \\
\Iattr{circle}{west} & |C.AB.west| & |z.W = C.OA.west| \\
-\Iattr{circle}{opp} & |z.Ap = C.AB.opp| & Refer to (\ref{ssub:example_circle_attributes}) \\
-\Iattr{circle}{ct} & |L = C.AB.ct| & Refer to (\ref{ssub:example_circle_attributes}) \\
+\Iattr{circle}{opp} & |z.Ap = C.AB.opp| & [\ref{ssub:example_circle_attributes}] \\
+\Iattr{circle}{ct} & |L = C.AB.ct| [ \ref{ssub:example_circle_attributes} ] \\
\bottomrule %
\end{tabular}
\egroup
@@ -71,16 +71,16 @@ Three attributes are used (south, west, radius).
z.c = C.ab.opp
z.r,z.t = get_points (C.ab.ct : ortho_from (z.b))
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
+
+\emph{\begin{tikzpicture}
\tkzGetNodes
\tkzDrawPoints(a,b,c,s,w)
\tkzLabelPoints(a,b,c,s,w)
\tkzDrawCircle(a,b)
\tkzDrawSegments(a,b r,t b,c)
\tkzLabelSegment[sloped](a,b){ab = \tkzUseLua{r}}
-\end{tikzpicture}
-\hspace*{\fill}
+\end{tikzpicture}}
+
\end{minipage}
% subsubsection example_circle_attributes (end)
% subsection attributes_of_a_circle (end)
@@ -96,184 +96,314 @@ Three attributes are used (south, west, radius).
\toprule
\textbf{Methods} & \textbf{Comments} & \\
\midrule \\
-\Igfct{circle}{new(O,A)} & |C.OA = circle : new (z.O,z.A)| & circle center $O$ through $A$\\
-\Igfct{circle}{radius(O,r)} & |C.OA = circle : radius (z.O,2)| & circle center $O$ radius =2 cm\\
-\Igfct{circle}{diameter(A,B)} & |C.OA = circle :diameter(z.A,z.B)| & circle diameter $[AB]$ \\
+\Igfct{circle}{new(O,A)} & |C.OA = circle : new (z.O,z.A)| & center $O$ through $A$; [\ref{ssub:method_imeth_circle_new}]\\
+\Igfct{circle}{radius(O,r)} & |C.OA = circle : radius (z.O,2)| & center $O$ radius =2 cm; [\ref{ssub:method_imeth_circle_radius}]\\
+\Igfct{circle}{diameter(A,B)} & |C.OA = circle :diameter(z.A,z.B)| & diameter $[AB]$; [\ref{ssub:method_imeth_circle_diameter}] \\
\midrule
\textbf{Points} &&\\
\midrule
-\Imeth{circle}{antipode (pt)} & |z.C = C.OA: antipode (z.B)| & $[BC]$ is a diameter \\
-\Imeth{circle}{inversion (pt)} & |z.Bp = C.AC: inversion (z.B)|&\\
-\Imeth{circle}{midarc (pt,pt)} & |z.D = C.AB: midarc (z.B,z.C)|& $D$ is the midarc of $\widearc{BC}$\\
-\Imeth{circle}{point (r)} & |z.E = C.AB: point (0.25)|& |r| between 0 and 1\\
+\Imeth{circle}{antipode (pt)} & |z.C = C.OA: antipode (z.B)| & $[BC]$ = diameter; [\ref{ssub:method_imeth_circle_antipode}] \\
+\Imeth{circle}{midarc (pt,pt)} & |z.D = C.AB: midarc (z.B,z.C)|& $D$ is the midarc of $\widearc{BC}$; [\ref{ssub:method_imeth_circle_midarc}]\\
+\Imeth{circle}{point (r)} & |z.E = C.AB: point (0.25)|& |r| between 0 and 1; [\ref{ssub:method_imeth_circle_point}]\\
\Imeth{circle}{random\_pt(lower, upper)} & &\\
-\Imeth{circle}{internal\_similitude (C)} & |z.I = C.one : internal_similitude (C.two)| &\\
-\Imeth{circle}{external\_similitude (C)} & |z.J = C.one : external_similitude (C.two)| & \\
-\Imeth{circle}{radical\_center (C1<,C2>)} & or only (C1) & Refer to \ref{sub:radical_center} \\
+\Imeth{circle}{inversion (obj)} & |z.Bp = C.AC: inversion (z.B)|& [\ref{ssub:inversion}]\\
+\Imeth{circle}{internal\_similitude (C)} & |z.I= C.one: internal_similitude(C.two)| & [\ref{ssub:method_imeth_circle_internal__similitude}]\\
+\Imeth{circle}{external\_similitude (C)} & |z.J= C.one: external_similitude(C.two)| & [\ref{ssub:method_imeth_circle_external__similitude}] \\
+\Imeth{circle}{radical\_center (C1<,C2>)} & or only (C1) & [\ref{ssub:radical_center} ] \\
\midrule
\textbf{Lines} & & \\
\midrule
-\Imeth{circle}{radical\_axis (C)} & Refer to ( \ref{sub:d_alembert_2} ; \ref{sub:radical_axis_v1} ; \ref{sub:radical_axis_v2} ; \ref{sub:radical_axis_v3} ; \ref{sub:radical_axis_v4})& \\
-\Imeth{circle}{tangent\_at (pt)} & |z.P = C.OA: tangent_at (z.M)| & Refer to (\ref{ssub:lemoine} ; \ref{ssub:example_combination_of_methods})\\
-\Imeth{circle}{tangent\_from (pt)}& |z.M,z.N = C.OA: tangent_from (z.P)| & Refer to (\ref{tangent_from})\\
-\Imeth{circle}{inversion (line)} & |L or C = C.AC: inversion (L.EF)|& Refer to (\ref{ssub:inversion_line})\\
-\Imeth{circle}{common\_tangent (C)} & |z.a,z.b = C.AC: common_tangent (C.EF)|& Refer to (\ref{sub:common_tangent} ; \ref{sub:common_tangent_orthogonality})\\
+\Imeth{circle}{radical\_axis (C)} & [ \ref{ssub:method_imeth_circle_radical__axis_c} ; \ref{sub:d_alembert_2} ] & \\
+\Imeth{circle}{tangent\_at (pt)} & |z.P=C.OA:tangent_at(z.M)| & [\ref{ssub:method_imeth_circle_tangent}] \\
+\Imeth{circle}{tangent\_from (pt)}& |z.M,z.N=C.OA: tangent_from (z.P)| & [\ref{ssub:method_imeth_circle_tangent} ] \\
+\Imeth{circle}{common\_tangent (C)}& |z.a,z.b = C.AC: common_tangent (C.EF)|& [\ref{ssub:common_tangent} ; \ref{sub:common_tangent_orthogonality}] \\
\midrule
\textbf{Circles}& &\\
\midrule
-\Imeth{circle}{orthogonal\_from (pt)} &|C=C.OA:orthogonal_from (z.P)| & Refer to (\ref{ssub:altshiller} ; \ref{sub:common_tangent_orthogonality} ; \ref{sub:orthogonal_circles_v1} ; \ref{sub:pencil_v1}) \\
-\Imeth{circle}{orthogonal\_through (pta,ptb)}&|C=C.OA:orthogonal_through (z.z1,z.z2)| & Refer to (\ref{sub:orthogonal_circle_through})\\
-\Imeth{circle}{inversion (...)} &|C.AC:inversion (pt, pts, L or C)|& Refer to \ref{ssub:inversion}, \ref{ssub:inversion_point}, \ref{ssub:inversion_line}, \ref{ssub:inversion_circle}\\
-\Imeth{circle}{midcircle (C)} & |C.inv = C.OA: midcircle (C.EF)| & Refer to \ref{ssub:midcircle} \\
-\Imeth{circle}{radical\_circle (C1<,C2>)} & or only (C1) & Refer to \ref{sub:radical_circle}\\
+\Imeth{circle}{orthogonal\_from (pt)} &|C=C.OA:orthogonal_from (z.P)| & [\ref{ssub:method_imeth_circle_orthogonal_from_pt} ;\ref{sub:altshiller} ; \ref{sub:pencil_v1}] \\
+\Imeth{circle}{orthogonal\_through(pta,ptb)}&|C=C.OA:orthogonal_through (z.z1,z.z2)| & [\ref{ssub:method_imeth_circle_orthogonal_through}]\\
+\Imeth{circle}{midcircle (C)} & |C.inv = C.OA: midcircle (C.EF)| & [\ref{ssub:midcircle}] \\
+\Imeth{circle}{radical\_circle (C1<,C2>)} & or only (C1) & [\ref{ssub:radical_circle}] \\
\midrule
\textbf{Miscellaneous} &&\\
\midrule
-\Imeth{circle}{power (pt)} &|p = C.OA: power (z.M)| & Refer to (\ref{sub:power_v1} ; \ref{sub:power_v2} ; \ref{sub:apollonius_circle_v1_with_inversion}) \\
-\Imeth{circle}{in\_out (pt)} & |C.OA : in_out (z.M)| & Refer to (\ref{sub:in_out_for_circle_and_disk}) \\
-\Imeth{circle}{in\_out\_disk (pt)} & |C.OA : in_out_disk (z.M)| & Refer to (\ref{sub:in_out_for_circle_and_disk}) \\
+\Imeth{circle}{power (pt)} &| r = C.OA: power (z.M)| & [\ref{par:power_v1} ; \ref{par:power_v2} ; \ref{sub:apollonius_circle_v1_with_inversion} ] \\
+\Imeth{circle}{in\_out (pt)} & |C.OA : in_out (z.M)| & [\ref{ssub:in_out_for_circle_and_disk}] \\
+\Imeth{circle}{in\_out\_disk (pt)} & |C.OA : in_out_disk (z.M)| & [\ref{ssub:in_out_for_circle_and_disk}] \\
\Imeth{circle}{draw ()} & for further use &\\
-\Imeth{circle}{circles\_position (C1)} & result = string &Refer to (\ref{sub:circles_position}) \\
+\Imeth{circle}{circles\_position (C1)} & result = string & [\ref{ssub:circles_position}] \\
\bottomrule
\end{tabular}
\egroup
% subsection methods_circle (end)
-\subsubsection{Altshiller} % (fold)
-\label{ssub:altshiller}
+\subsubsection{Method \Imeth{circle}{new}} % (fold)
+\label{ssub:method_imeth_circle_new}
+
+A circle is defined by its centre and a point through which it passes.
+\vspace{6pt}
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
- z.P = point : new (0,0)
- z.Q = point : new (5,0)
- z.I = point : new (3,2)
- C.QI = circle : new (z.Q,z.I)
- C.PE = C.QI : orthogonal_from (z.P)
- z.E = C.PE.through
- C.QE = circle : new (z.Q,z.E)
- _,z.F = intersection (C.PE,C.QE)
- z.A = C.PE: point (1/9)
- L.AE = line : new (z.A,z.E)
- _,z.C = intersection (L.AE,C.QE)
- L.AF = line : new (z.A,z.F)
- L.CQ = line : new (z.C,z.Q)
- z.D = intersection (L.AF,L.CQ)
+z.O = point: new (0,0)
+z.A = point: new (2,1)
+C = circle: new (z.O , z.A)
\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(P,E Q,E)
- \tkzDrawLines[add=0 and 1](P,Q)
- \tkzDrawLines[add=0 and 2](A,E)
- \tkzDrawSegments(P,E E,F F,C A,F C,D)
- \tkzDrawPoints(P,Q,E,F,A,C,D)
- \tkzLabelPoints(P,Q,E,F,A,C,D)
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,A)
+\tkzDrawPoints(A,O)
+\tkzLabelPoints[right](A,O)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
-\hspace*{\fill}
\begin{minipage}{.5\textwidth}
- \begin{tkzelements}
- scale =.5
- z.P = point : new (0,0)
- z.Q = point : new (5,0)
- z.I = point : new (3,2)
- C.QI = circle : new (z.Q,z.I)
- C.PE = C.QI : orthogonal_from (z.P)
- z.E = C.PE.through
- C.QE = circle : new (z.Q,z.E)
- _,z.F = intersection (C.PE,C.QE)
- z.A = C.PE: point (1/9)
- L.AE = line : new (z.A,z.E)
- _,z.C = intersection (L.AE,C.QE)
- L.AF = line : new (z.A,z.F)
- L.CQ = line : new (z.C,z.Q)
- z.D = intersection (L.AF,L.CQ)
- \end{tkzelements}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(P,E Q,E)
- \tkzDrawLines[add=0 and 1](P,Q)
- \tkzDrawLines[add=0 and 2](A,E)
- \tkzDrawSegments(P,E E,F F,C A,F C,D)
- \tkzDrawPoints(P,Q,E,F,A,C,D)
- \tkzLabelPoints(P,Q,E,F,A,C,D)
- \end{tikzpicture}
+\begin{tkzelements}
+z.O = point: new (0,0)
+z.A = point: new (2,1)
+C = circle: new (z.O , z.A)
+\end{tkzelements}
+ \begin{center}
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,A)
+\tkzDrawPoints(A,O)
+\tkzLabelPoints[right](A,O)
+\end{tikzpicture}
+ \end{center}
+
\end{minipage}
-%subsubsection altshiller (end)
-\subsubsection{Lemoine} % (fold)
-\label{ssub:lemoine}
+% subsubsection method_imeth_circle_new (end)
+\subsubsection{Method \Imeth{circle}{radius}} % (fold)
+\label{ssub:method_imeth_circle_radius}
+
+
+We define a circle with its centre and radius.
+
+\vspace{6pt}
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
- scale = 1.25
- z.A = point: new (1,0)
- z.B = point: new (5,2)
- z.C = point: new (1.2,2)
- T = triangle: new(z.A,z.B,z.C)
- z.O = T.circumcenter
- C.OA = circle: new (z.O,z.A)
- L.tA = C.OA: tangent_at (z.A)
- L.tB = C.OA: tangent_at (z.B)
- L.tC = C.OA: tangent_at (z.C)
- z.P = intersection (L.tA,T.bc)
- z.Q = intersection (L.tB,T.ca)
- z.R = intersection (L.tC,T.ab)
+z.O = point: new (0,0)
+z.A = point: new (2,1)
+C = circle: radius (z.A , math.sqrt(5))
+z.T = C.through
\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygon[teal](A,B,C)
- \tkzDrawCircle(O,A)
- \tkzDrawPoints(A,B,C,P,Q,R)
- \tkzLabelPoints(A,B,C,P,Q,R)
- \tkzDrawLine[blue](Q,R)
- \tkzDrawLines[red](A,P B,Q R,C)
- \tkzDrawSegments(A,R C,P C,Q)
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(A,T)
+\tkzDrawPoints(A,O,T)
+\tkzLabelPoints[right](A,O,T)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ z.O = point: new (0,0)
+ z.A = point: new (2,1)
+ C = circle: radius (z.A , math.sqrt(5))
+ z.T = C.through
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawCircles(A,T)
+ \tkzDrawPoints(A,O,T)
+ \tkzLabelPoints[right](A,O,T)
+ \end{tikzpicture}
+ \end{center}
+\end{minipage}
+% subsubsection method_imeth_circle_radius (end)
+
+\subsubsection{Method \Imeth{circle}{diameter}} % (fold)
+\label{ssub:method_imeth_circle_diameter}
+
+A circle is defined by two points at the ends of one of its diameters.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+z.A = point: new (0,0)
+z.B = point: new (2,1)
+C = circle: diameter (z.A , z.B)
+z.O = C.center
+z.T = C.through
+\end{tkzelements}
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,T)
+\tkzDrawPoints(A,B,O,T)
+\tkzLabelPoints[right](A,B,O,T)
\end{tikzpicture}
\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+z.A = point: new (0,0)
+z.B = point: new (2,1)
+C = circle: diameter (z.A , z.B)
+z.O = C.center
+z.T = C.through
+\end{tkzelements}
+ \begin{center}
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,T)
+\tkzDrawPoints(A,B,O,T)
+\tkzLabelPoints[right](A,B,O,T)
+\end{tikzpicture}
+ \end{center}
+\end{minipage}
+% subsubsection method_imeth_circle_diameter (end)
+\subsubsection{Method \Imeth{circle}{antipode}} % (fold)
+\label{ssub:method_imeth_circle_antipode}
+This method is used to define a point that is diametrically opposed to a point on a given circle.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+z.A = point: new (0,0)
+z.O = point: new (2,1)
+C = circle: new (z.O , z.A)
+z.B = C : antipode (z.A)
+\end{tkzelements}
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,A)
+\tkzDrawPoints(A,B,O)
+\tkzLabelPoints[right](A,B,O)
+\end{tikzpicture}
+\end{Verbatim}
\end{minipage}
\begin{minipage}{.5\textwidth}
\begin{tkzelements}
-scale = .75
-z.A = point: new (1,0)
-z.B = point: new (5,2)
-z.C = point: new (1.2,2)
-T = triangle: new(z.A,z.B,z.C)
-z.O = T.circumcenter
-C.OA = circle: new (z.O,z.A)
-L.tA = C.OA: tangent_at (z.A)
-L.tB = C.OA: tangent_at (z.B)
-L.tC = C.OA: tangent_at (z.C)
-z.R = intersection (L.tC,T.ab)
-z.P = intersection (L.tA,T.bc)
-z.Q = intersection (L.tB,T.ca)
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}[rotate=90]
-\tkzGetNodes
-\tkzDrawPolygon[teal](A,B,C)
+z.A = point: new (0,0)
+z.O = point: new (2,1)
+C = circle: new (z.O , z.A)
+z.B = C : antipode (z.A)
+\end{tkzelements}
+ \begin{center}
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,A)
+\tkzDrawPoints(A,B,O)
+\tkzLabelPoints[right](A,B,O)
+\end{tikzpicture}
+ \end{center}
+\end{minipage}
+
+
+% subsubsection method_imeth_circle_antipode (end)
+
+\subsubsection{Method \Imeth{circle}{midarc}} % (fold)
+\label{ssub:method_imeth_circle_midarc}
+The definition given in [ \href{https://mathworld.wolfram.com/Mid-ArcPoints.html}{Weisstein, Eric W. "Mid-Arc Points." From MathWorld--A Wolfram Web Resource.}] is as follows:
+The mid-arc points of a triangle as defined by Johnson (1929) are the points on the circumcircle of the triangle which lie half-way along each of the three arcs determined by the vertices. These points arise in the definition of the Fuhrmann circle and Fuhrmann triangle, and lie on the extensions of the perpendicular bisectors of the triangle sides drawn from the circumcenter.
+
+The definition I use here is more general: the defined point is simply the point that divides an arc into two arcs of the same length.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+z.A = point: new (0,0)
+z.O = point: new (2,1)
+C = circle: new (z.O , z.A)
+z.B = C : point (0.25)
+z.M = C : midarc (z.A,z.B)
+\end{tkzelements}
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,A)
+\tkzDrawPoints(A,B,O,M)
+\tkzLabelPoints[right](A,B,O,M)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+z.A = point: new (0,0)
+z.O = point: new (2,1)
+C = circle: new (z.O , z.A)
+z.B = C : point (0.25)
+z.M = C : midarc (z.A,z.B)
+\end{tkzelements}
+ \begin{center}
+\begin{tikzpicture}[gridded]
+\tkzGetNodes
+\tkzDrawCircles(O,A)
+\tkzDrawPoints(A,B,O,M)
+\tkzLabelPoints[right](A,B,O,M)
+\end{tikzpicture}
+ \end{center}
+\end{minipage}
+
+% subsubsection method_imeth_circle_midarc (end)
+
+\subsubsection{Method \Imeth{circle}{point (r)}} % (fold)
+\label{ssub:method_imeth_circle_point}
+
+Let $C$ be a circle with centre $O$ and passing through $A$ such that |z.A = C.through|. This method defines a point $M$ on the circle from A such that the ratio of the length of $\widearc{AM}$ to the circumference of the circle is equal to $r$.
+
+In the next example, $r=\dfrac{1}{6}$ corresponds to $\dfrac{\pi/3}{2\pi}$, so the angle $\widehat{AOE}$ has the measure $\pi/3$.
+
+If $r=.5$ the defined point is diametrically opposed to $A$, the angle $\widehat{AOD}$ has the measure $\pi$.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+ \begin{tkzelements}
+ z.O = point: new (0,0)
+ z.A = point: new (1,2)
+ C.OA = circle: new (z.O,z.A)
+ z.B = C.OA: point (1/6)
+ z.C = C.OA: point (0.25)
+ z.D = C.OA: point (0.5)
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
\tkzDrawCircle(O,A)
-\tkzDrawPoints(A,B,C,P,Q,R)
-\tkzLabelPoints(A,B,C,P,Q,R)
-\tkzDrawLine[blue](Q,R)
-\tkzDrawLines[red](A,P B,Q R,C)
-\tkzDrawSegments(A,R C,P C,Q)
+\tkzDrawPoints(A,...,D,O)
+\tkzLabelPoints(A,...,D,O)
\end{tikzpicture}
+\end{Verbatim}
\end{minipage}
-%\caption{Lemoine line}
-% subsubsection lemoine (end)
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ z.O = point: new (0,0)
+ z.A = point: new (1,2)
+ C.OA = circle: new (z.O,z.A)
+ z.B = C.OA: point (1/6)
+ z.C = C.OA: point (0.25)
+ z.D = C.OA: point (0.5)
+\end{tkzelements}
+\begin{center}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawCircle(O,A)
+\tkzDrawPoints(A,...,D,O)
+\tkzLabelPoints(A,...,D,O)
+\end{tikzpicture}
+\end{center}
+\end{minipage}
-\subsubsection{Inversion: point, line and circle} % (fold)
+
+% subsubsection method_imeth_circle_point (end)
+
+\subsubsection{Method \Imeth{circle}{inversion (obj)}: point, line and circle} % (fold)
\label{ssub:inversion}
The \code{inversion} method can be used on a point, a line or a circle. Depending on the type of object, the function determines the correct algorithm to use.
-\subsubsection{Inversion: point} % (fold)
-\label{ssub:inversion_point}
+\paragraph{Inversion: point} % (fold)
+\label{par:inversion_point}
The \code{inversion} method can be used on a point, a group of points, a line or a circle. Depending on the type of object, the function determines the correct algorithm to use.
@@ -308,20 +438,23 @@ The \code{inversion} method can be used on a point, a group of points, a line or
z.d = C.oa: inversion (z.c)
p = C.oa: power (z.c)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircle(o,a)
- \tkzDrawSegments(o,a o,c)
- \tkzDrawPoints(a,o,c,d)
- \tkzLabelPoints(a,o,c,d)
- \tkzLabelSegment[sloped,above=1em](c,d){%
- La puissance de c est \tkzUseLua{p}}
- \end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(o,a)
+ \tkzDrawSegments(o,a o,c)
+ \tkzDrawPoints(a,o,c,d)
+ \tkzLabelPoints(a,o,c,d)
+ \tkzLabelSegment[sloped,above=1em](c,d){%
+ La puissance de c est \tkzUseLua{p}}
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
-\subsubsection{Inversion: line} % (fold)
-\label{ssub:inversion_line}
+\paragraph{Inversion: line} % (fold)
+\label{par:inversion_line}
The result is either a straight line or a circle.
@@ -333,7 +466,7 @@ The result is either a straight line or a circle.
C.oa = circle: new (z.o,z.a)
z.c = point: new (3,2)
z.d = point: new (0,4)
- L.cd = line: new (z.c,z.d)
+ L.cd = line: new (z.c,z.d)
C.OH = C.oa: inversion (L.cd)
z.O,z.H = get_points(C.OH)
\end{tkzelements}
@@ -357,19 +490,22 @@ The result is either a straight line or a circle.
C.OH = C.oa: inversion (L.cd)
z.O,z.H = get_points(C.OH)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(o,a)
- \tkzDrawCircles[new](O,H)
- \tkzDrawLines(c,d o,H)
- \tkzDrawPoints(a,o,c,d,H)
- \tkzLabelPoints(a,o,c,d,H)
- \end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(o,a)
+ \tkzDrawCircles[new](O,H)
+ \tkzDrawLines(c,d o,H)
+ \tkzDrawPoints(a,o,c,d,H)
+ \tkzLabelPoints(a,o,c,d,H)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
- \subsubsection{Inversion: circle} % (fold)
- \label{ssub:inversion_circle}
+\paragraph{Inversion: circle} % (fold)
+ \label{par:inversion_circle}
The result is either a straight line or a circle.
@@ -423,19 +559,697 @@ color = "orange"
else z.f,z.b = get_points(obj) end
color = "orange"
\end{tkzelements}
- \hspace{\fill}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles[black](o,a)
- \tkzDrawCircles[teal](c,o e,d)
- \tkzDrawCircles[\tkzUseLua{color}](f,b)
- \tkzDrawLines[\tkzUseLua{color}](p,q)
- \tkzDrawPoints(a,...,f,o,p,q)
- \tkzLabelPoints(a,...,f,o,p,q)
- \end{tikzpicture}
+
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles[black](o,a)
+ \tkzDrawCircles[teal](c,o e,d)
+ \tkzDrawCircles[\tkzUseLua{color}](f,b)
+ \tkzDrawLines[\tkzUseLua{color}](p,q)
+ \tkzDrawPoints(a,...,f,o,p,q)
+ \tkzLabelPoints(a,...,f,o,p,q)
+ \end{tikzpicture}
+ \end{center}
\end{minipage}
+
% subsubsection inversion (end)
+\subsubsection{Method \Imeth{circle}{internal\_similitude}} % (fold)
+\label{ssub:method_imeth_circle_internal__similitude}
+
+Circles are geometrically similar to one another and mirror symmetric. Hence, a pair of circles has both types of homothetic centers, internal and external, unless the centers are equal or the radii are equal; these exceptional cases are treated after general position. These two homothetic centers lie on the line joining the centers of the two given circles, which is called the line of centers. Circles with radius zero can also be included (see exceptional cases), and negative radius can also be used, switching external and internal. [Wikipedia]
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = 0.75
+z.A = point : new ( 0 , 0 )
+z.a = point : new ( 2 , 2 )
+z.B = point : new ( 5 , 2 )
+z.b = point : new ( 6 , 1 )
+C.Aa = circle : new (z.A,z.a)
+C.Bb = circle : new (z.B,z.b)
+z.I = C.Aa : internal_similitude (C.Bb)
+L.TA1,L.TA2 = C.Aa : tangent_from (z.I)
+z.A1 = L.TA1.pb
+z.A2 = L.TA2.pb
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawCircles(A,a B,b)
+\tkzDrawPoints(A,a,B,b,I,A1,A2)
+\tkzDrawLines[add = 1 and 2](A1,I A2,I)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = .75
+z.A = point : new ( 0 , 0 )
+z.a = point : new ( 2 , 2 )
+z.B = point : new ( 5 , 2 )
+z.b = point : new ( 6 , 1 )
+C.Aa = circle : new (z.A,z.a)
+C.Bb = circle : new (z.B,z.b)
+z.I = C.Aa : internal_similitude (C.Bb)
+L.TA1,L.TA2 = C.Aa : tangent_from (z.I)
+z.A1 = L.TA1.pb
+z.A2 = L.TA2.pb
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,a B,b)
+ \tkzDrawPoints(A,a,B,b,I,A1,A2)
+ \tkzDrawLines[add = 1 and 2](A1,I A2,I)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+
+% subsubsection method_imeth_circle_internal__similitude (end)
+
+\subsubsection{Method \Imeth{circle}{external\_similitude}} % (fold)
+\label{ssub:method_imeth_circle_external__similitude}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+z.A = point : new ( 0 , 0 )
+z.a = point : new ( 2 , 2 )
+z.B = point : new ( 3 , 2 )
+z.b = point : new ( 4 , 1 )
+C.Aa = circle : new (z.A,z.a)
+C.Bb = circle : new (z.B,z.b)
+z.I = C.Aa : external_similitude (C.Bb)
+L.TA1,L.TA2 = C.Aa : tangent_from (z.I)
+z.A1 = L.TA1.pb
+z.A2 = L.TA2.pb
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawCircles(A,a B,b)
+\tkzDrawPoints(A,a,B,b,I,A1,A2)
+\tkzDrawLines[add = .5 and .2](A1,I A2,I)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = .75
+z.A = point : new ( 0 , 0 )
+z.a = point : new ( 2 , 2 )
+z.B = point : new ( 3 , 2 )
+z.b = point : new ( 4 , 1 )
+C.Aa = circle : new (z.A,z.a)
+C.Bb = circle : new (z.B,z.b)
+z.I = C.Aa : external_similitude (C.Bb)
+L.TA1,L.TA2 = C.Aa : tangent_from (z.I)
+z.A1 = L.TA1.pb
+z.A2 = L.TA2.pb
+\end{tkzelements}
+\begin{center}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawCircles(A,a B,b)
+\tkzDrawPoints(A,a,B,b,I,A1,A2)
+\tkzDrawLines[add = .5 and .2](A1,I A2,I)
+\end{tikzpicture}
+\end{center}
+\end{minipage}
+% subsubsection method_imeth_circle_external__similitude (end)
+
+
+\subsubsection{Method \Imeth{circle}{radical\_center (C1,C2)}} % (fold)
+\label{ssub:radical_center}
+
+The radical lines of three circles are concurrent in a point known as the radical center (also called the power center). This theorem was originally demonstrated by Monge (Dörrie 1965, p. 153). [\href{https://mathworld.wolfram.com/RadicalCenter.html}{Weisstein, Eric W. "Radical Center." From MathWorld--A Wolfram Web Resource. }
+]
+
+Here I have also named \code{radical\_center} the point of intersection of the radical axis of two circles with the centre axis. See the following example for how to obtain point $H$.
+
+
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
+\begin{Verbatim}
+\begin{tkzelements}
+ z.O = point : new (0,0)
+ z.x = point : new (1,0)
+ z.y = point : new (4,0)
+ z.z = point : new (2,0)
+ z.Op = point : new (4,2)
+ z.P = point : new (2,2.5)
+ C.Ox = circle : new (z.O,z.x)
+ C.Pz = circle : new (z.P,z.z)
+ C.Opy = circle : new (z.Op,z.y)
+ z.ap,z.a = intersection (C.Ox,C.Pz)
+ z.bp,z.b = intersection (C.Opy,C.Pz)
+ L.aap = line : new (z.a,z.ap)
+ L.bbp = line : new (z.b,z.bp)
+ -- z.X = intersection (L.aap,L.bbp)
+ z.X = C.Ox : radical_center(C.Pz,C.Opy)
+ -- L.OOp = line : new (z.O,z.Op)
+ -- z.H = L.OOp : projection (z.X)
+ z.H = C.Ox : radical_center(C.Opy)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,a O',b P,z)
+ \tkzDrawLines[red](a,X b',X H,X O,O')
+ \tkzDrawPoints(O,O',P,a,a',b,b',X,H)
+ \tkzLabelPoints[below right](O,O',P,H)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
+\begin{tkzelements}
+z.O = point : new (0,0)
+z.x = point : new (1,0)
+z.y = point : new (4,0)
+z.z = point : new (2,0)
+z.Op = point : new (4,2)
+z.P = point : new (2,2.5)
+C.Ox = circle : new (z.O,z.x)
+C.Pz = circle : new (z.P,z.z)
+C.Opy = circle : new (z.Op,z.y)
+z.ap,z.a = intersection (C.Ox,C.Pz)
+z.bp,z.b = intersection (C.Opy,C.Pz)
+L.aap = line : new (z.a,z.ap)
+L.bbp = line : new (z.b,z.bp)
+z.X = intersection (L.aap,L.bbp)
+L.OOp = line : new (z.O,z.Op)
+z.H = L.OOp : projection (z.X)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,a O',b P,z)
+ \tkzDrawLines[red](a,X b',X H,X O,O')
+ \tkzDrawPoints(O,O',P,a,a',b,b',X,H)
+ \tkzLabelPoints[below right](O,O',P,H)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsubsection radical_center (end)
+
+\subsubsection{Method \Imeth{circle}{radical\_axis}(C)} % (fold)
+\label{ssub:method_imeth_circle_radical__axis_c}
+
+The radical line, also called the radical axis, is the locus of points of equal circle power with respect to two nonconcentric circles. By the chordal theorem, it is perpendicular to the line of centers (Dörrie 1965). [\href{https://mathworld.wolfram.com/RadicalLine.html}{Weisstein, Eric W. "Radical Line." From MathWorld--A Wolfram Web Resource.} ]
+
+\vspace{6pt}
+\paragraph{Radical axis v1} % (fold)
+\label{par:radical_axis_v1}
+
+\begin{Verbatim}
+\begin{tkzelements}
+scale = .75
+z.X = point : new (0,0)
+z.B = point : new (2,2)
+z.Y = point : new (7,1)
+z.Ap = point : new (8,-1)
+L.XY = line : new (z.X,z.Y)
+C.XB = circle : new (z.X,z.B)
+C.YAp = circle : new (z.Y,z.Ap)
+z.E,z.F = get_points (C.XB : radical_axis (C.YAp))
+z.A = C.XB : point (0.4)
+T.ABAp = triangle: new (z.A,z.B,z.Ap)
+z.O = T.ABAp.circumcenter
+C.OAp = circle : new (z.O,z.Ap)
+_,z.Bp = intersection (C.OAp,C.YAp)
+L.AB = line : new (z.A,z.B)
+L.ApBp = line : new (z.Ap,z.Bp)
+z.M = intersection (L.AB,L.ApBp)
+z.H = L.XY : projection (z.M)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(X,B Y,A')
+ \tkzDrawArc[dashed,delta=30](O,A')(A)
+ \tkzDrawPoints(A,B,A',B',M,H,X,Y,O,E,F)
+ \tkzDrawLines[red](A,M A',M X,Y E,F)
+ \tkzDrawLines[red,add=1 and 3](M,H)
+\end{tikzpicture}
+\end{Verbatim}
+
+\begin{tkzelements}
+scale = .75
+z.X = point : new (0,0)
+z.B = point : new (2,2)
+z.Y = point : new (7,1)
+z.Ap = point : new (8,-1)
+L.XY = line : new (z.X,z.Y)
+C.XB = circle : new (z.X,z.B)
+C.YAp = circle : new (z.Y,z.Ap)
+z.E,z.F = get_points (C.XB : radical_axis (C.YAp))
+z.A = C.XB : point (0.4)
+T.ABAp = triangle: new (z.A,z.B,z.Ap)
+z.O = T.ABAp.circumcenter
+C.OAp = circle : new (z.O,z.Ap)
+_,z.Bp = intersection (C.OAp,C.YAp)
+L.AB = line : new (z.A,z.B)
+L.ApBp = line : new (z.Ap,z.Bp)
+z.M = intersection (L.AB,L.ApBp)
+z.H = L.XY : projection (z.M)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(X,B Y,A')
+ \tkzDrawArc[dashed,delta=30](O,A')(A)
+ \tkzDrawPoints(A,B,A',B',M,H,X,Y,O,E,F)
+ \tkzDrawLines[red](A,M A',M X,Y E,F)
+ \tkzDrawLines[red,add=1 and 3](M,H)
+ \end{tikzpicture}
+\end{center}
+% paragraph radical_axis_v1 (end)
+
+\paragraph{Radical axis v2} % (fold)
+\label{par:radical_axis_v2}
+
+\begin{Verbatim}
+\begin{tkzelements}
+scale = 1.25
+z.O = point : new (-1,0)
+z.Op = point : new (4,-1)
+z.B = point : new (0,2)
+z.D = point : new (4,0)
+C.OB = circle : new (z.O,z.B)
+C.OpD = circle : new (z.Op,z.D)
+L.EF = C.OB : radical_axis (C.OpD)
+z.E,z.F = get_points (L.EF)
+z.M = L.EF : point (.75)
+L.MT,L.MTp = C.OB : tangent_from (z.M)
+_,z.T = get_points (L.MT)
+_,z.Tp = get_points (L.MTp)
+L.MK,L.MKp = C.OpD : tangent_from (z.M)
+_,z.K = get_points (L.MK)
+_,z.Kp = get_points (L.MKp)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,B O',D)
+ \tkzDrawLine(E,F)
+ \tkzDrawLine[add=.5 and .5](O,O')
+ \tkzDrawLines[add = 0 and .5](M,T M,T' M,K M,K')
+ \tkzDrawCircle(M,T)
+ \tkzDrawPoints(O,O',T,M,T',K,K')
+ \tkzLabelPoints(O,O',T,T',K,K',M)
+\end{tikzpicture}
+\end{Verbatim}
+
+\begin{tkzelements}
+scale =1.25
+z.O = point : new (-1,0)
+z.Op = point : new (4,-1)
+z.B = point : new (0,2)
+z.D = point : new (4,0)
+C.OB = circle : new (z.O,z.B)
+C.OpD = circle : new (z.Op,z.D)
+L.EF = C.OB : radical_axis (C.OpD)
+z.E,z.F = get_points (L.EF)
+z.M = L.EF : point (.75)
+L.MT,L.MTp = C.OB : tangent_from (z.M)
+_,z.T = get_points (L.MT)
+_,z.Tp = get_points (L.MTp)
+L.MK,L.MKp = C.OpD : tangent_from (z.M)
+_,z.K = get_points (L.MK)
+_,z.Kp = get_points (L.MKp)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,B O',D)
+ \tkzDrawLine(E,F)
+ \tkzDrawLine[add=.5 and .5](O,O')
+ \tkzDrawLines[add = 0 and .5](M,T M,T' M,K M,K')
+ \tkzDrawCircle(M,T)
+ \tkzDrawPoints(O,O',T,M,T',K,K')
+ \tkzLabelPoints(O,O',T,T',K,K',M)
+ \end{tikzpicture}
+\end{center}
+% paragraph radical_axis_v2 (end)
+
+\paragraph{Radical axis v3} % (fold)
+\label{par:radical_axis_v3}
+
+\begin{Verbatim}
+ \begin{tkzelements}
+ z.O = point : new (0,0)
+ z.B = point : new (4,0)
+ z.Op = point : new (6,0)
+ C.OB = circle : new (z.O,z.B)
+ C.OpB = circle : new (z.Op,z.B)
+ L.EF = C.OB : radical_axis (C.OpB)
+ z.E,z.F = get_points(L.EF)
+ z.M = L.EF : point (0.2)
+ L = C.OB : tangent_from (z.M)
+ _,z.T = get_points (L)
+ L = C.OpB : tangent_from (z.M)
+ _,z.Tp = get_points (L)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,B O',B)
+ \tkzDrawSegments(M,T M,T')
+ \tkzDrawSegments(E,F)
+ \tkzDrawLine[add=.5 and .5](O,O')
+ \tkzDrawPoints(O,B,O',E,F,M,T,T')
+ \tkzLabelPoints(O,O',B,E,F,T,T')
+ \tkzDrawArc(M,T')(T)
+\end{tikzpicture}
+\end{Verbatim}
+
+\begin{tkzelements}
+z.O = point : new (0,0)
+z.B = point : new (4,0)
+z.Op = point : new (6,0)
+C.OB = circle : new (z.O,z.B)
+C.OpB = circle : new (z.Op,z.B)
+L.EF = C.OB : radical_axis (C.OpB)
+z.E,z.F = get_points(L.EF)
+z.M = L.EF : point (0.2)
+L = C.OB : tangent_from (z.M)
+_,z.T = get_points (L)
+L = C.OpB : tangent_from (z.M)
+_,z.Tp = get_points (L)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,B O',B)
+ \tkzDrawSegments(M,T M,T')
+ \tkzDrawSegments(E,F)
+ \tkzDrawLine[add=.5 and .5](O,O')
+ \tkzDrawPoints(O,B,O',E,F,M,T,T')
+ \tkzLabelPoints(O,O',B,E,F,T,T')
+ \tkzDrawArc(M,T')(T)
+ \end{tikzpicture}
+\end{center}
+% paragraph radical_axis_v3 (end)
+
+\paragraph{Radical axis v4} % (fold)
+\label{par:radical_axis_v4}
+
+\begin{Verbatim}
+\begin{tkzelements}
+ z.O = point : new (0,0)
+ z.B = point : new (5,0)
+ z.Op = point : new (3,0)
+ C.OB = circle : new (z.O,z.B)
+ C.OpB = circle : new (z.Op,z.B)
+ L.EF = C.OB : radical_axis (C.OpB)
+ z.E,z.F = get_points(L.EF)
+ z.H = L.EF.mid
+ z.M = L.EF : point (.8)
+ _,L = C.OB : tangent_from (z.M)
+ _,z.T = get_points (L)
+ _,L = C.OpB : tangent_from (z.M)
+ _,z.Tp = get_points (L)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,B O',B)
+ \tkzDrawSegments(M,T M,T')
+ \tkzDrawSegments(E,F)
+ \tkzDrawLine[add=.3 and .3](O,H)
+ \tkzDrawPoints(O,O',B,E,H,M)
+ \tkzLabelPoints[below right](O,O',E,F,M,T,T')
+ \tkzDrawArc(M,B)(T)
+\end{tikzpicture}
+\end{Verbatim}
+
+\begin{tkzelements}
+ z.O = point : new (0,0)
+ z.B = point : new (5,0)
+ z.Op = point : new (3,0)
+ C.OB = circle : new (z.O,z.B)
+ C.OpB = circle : new (z.Op,z.B)
+ L.EF = C.OB : radical_axis (C.OpB)
+ z.E,z.F = get_points(L.EF)
+ z.H = L.EF.mid
+ z.M = L.EF : point (.8)
+ _,L = C.OB : tangent_from (z.M)
+ _,z.T = get_points (L)
+ _,L = C.OpB : tangent_from (z.M)
+ _,z.Tp = get_points (L)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,B O',B)
+ \tkzDrawSegments(M,T M,T')
+ \tkzDrawSegments(E,F)
+ \tkzDrawLine[add=.3 and .3](O,H)
+ \tkzDrawPoints(O,O',B,E,H,M)
+ \tkzLabelPoints[below right](O,O',E,F,M,T,T')
+ \tkzDrawArc(M,B)(T)
+ \end{tikzpicture}
+\end{center}
+% paragraph radical_axis_v4 (end)
+
+% subsubsection method_imeth_circle_radical__axis_c (end)
+
+
+\subsubsection{Methods \Imeth{circle}{tangent\_at (P)} and \Imeth{circle}{tangent\_from (P)}} % (fold)
+\label{ssub:method_imeth_circle_tangent}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+ \begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (1,2)
+ C.AB = circle: new (z.A,z.B)
+ z.C = point: new (3,-2)
+ L.T = C.AB : tangent_at (z.B)
+ z.D = L.T.pb
+ L.T1,L.T2 = C.AB : tangent_from (z.C)
+ z.T1 = L.T1.pb
+ z.T2 = L.T2.pb
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawCircle(A,B)
+\tkzDrawLines[add =.5 and .5](B,D C,T1 C,T2)
+\tkzDrawSegments[dashed](A,B A,T1 A,T2)
+\tkzDrawPoints(A,...,D,T1,T2)
+\tkzLabelPoints[below left](A,T2,C)
+\tkzLabelPoints[above right](B,T1,D)
+\tkzMarkRightAngles(A,B,D A,T1,C A,T2,C)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (1,2)
+ C.AB = circle: new (z.A,z.B)
+ z.C = point: new (3,-2)
+ L.T = C.AB : tangent_at (z.B)
+ z.D = L.T.pb
+ L.T1,L.T2 = C.AB : tangent_from (z.C)
+ z.T1 = L.T1.pb
+ z.T2 = L.T2.pb
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(A,B)
+ \tkzDrawLines[add =.5 and .5](B,D C,T1 C,T2)
+ \tkzDrawSegments[dashed](A,B A,T1 A,T2)
+ \tkzDrawPoints(A,...,D,T1,T2)
+ \tkzLabelPoints[below left](A,T2,C)
+ \tkzLabelPoints[above right](B,T1,D)
+ \tkzMarkRightAngles(A,B,D A,T1,C A,T2,C)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsubsection (end)
+
+\subsubsection{Common tangent: Angle of two intersecting circles} % (fold)
+\label{ssub:common_tangent}
+
+Let be a tangent common to both circles at $T$ and $T'$ (closest to $C$). Let a secant parallel to this tangent pass through $C$. Then the segment $[TT']$ is seen from the other common point $D$ at an angle equal to half the angle of the two circles.
+
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 5 , 2 )
+ L.AB = line : new ( z.A , z.B )
+ z.C = point : new ( 1 , 2 )
+ C.AC = circle : new (z.A,z.C)
+ C.BC = circle : new (z.B,z.C)
+ z.T,z.Tp = C.AC : common_tangent (C.BC)
+ L.TTp = line : new (z.T,z.Tp)
+ z.M = C.AC : point (0.45)
+ L.MC =line : new (z.M,z.C)
+ z.Mp = intersection (L.MC, C.BC)
+ L.mm = L.TTp : ll_from (z.C)
+ _,z.M = intersection (L.mm, C.AC)
+ z.Mp = intersection (L.mm, C.BC)
+ _,z.D = intersection (C.AC,C.BC)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,C B,C)
+ \tkzDrawSegments(M,M' A,D B,D A,B C,D T,C T',C)
+ \tkzDrawSegments[gray](D,M D,M' T,T' D,T D,T')
+ \tkzDrawPoints(A,B,C,D,M,M',T,T')
+ \tkzLabelPoints(A,B,D,M)
+ \tkzLabelPoints[above](C,M',T,T')
+ \tkzMarkAngles[mark=|,size=.75](T,C,M C,T,T' C,D,T T,D,M)
+ \tkzMarkAngles[mark=||,size=.75](M',C,T' T,T',C T',D,C M',D,T')
+\end{tikzpicture}
+\end{Verbatim}
+
+
+\begin{tkzelements}
+z.A = point : new ( 0 , 0 )
+z.B = point : new ( 5 , 2 )
+L.AB = line : new ( z.A , z.B )
+z.C = point : new ( 1 , 2 )
+C.AC = circle : new (z.A,z.C)
+C.BC = circle : new (z.B,z.C)
+z.T,z.Tp = C.AC : common_tangent (C.BC)
+L.TTp = line : new (z.T,z.Tp)
+z.M = C.AC : point (0.45)
+L.MC =line : new (z.M,z.C)
+z.Mp = intersection (L.MC, C.BC)
+L.mm = L.TTp : ll_from (z.C)
+_,z.M = intersection (L.mm, C.AC)
+z.Mp = intersection (L.mm, C.BC)
+_,z.D = intersection (C.AC,C.BC)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,C B,C)
+ \tkzDrawSegments(M,M' A,D B,D A,B C,D T,C T',C)
+ \tkzDrawSegments[gray](D,M D,M' T,T' D,T D,T')
+ \tkzDrawPoints(A,B,C,D,M,M',T,T')
+ \tkzLabelPoints(A,B,D,M)
+ \tkzLabelPoints[above](C,M',T,T')
+ \tkzMarkAngles[mark=|,size=.75](T,C,M C,T,T' C,D,T T,D,M)
+ \tkzMarkAngles[mark=||,size=.75](M',C,T' T,T',C T',D,C M',D,T')
+ \end{tikzpicture}
+\end{center}
+% subsubsection common_tangent (end)
+
+\subsubsection{Method \Imeth{circle}{orthogonal\_from (pt)}} % (fold)
+\label{ssub:method_imeth_circle_orthogonal_from_pt}
+
+In geometry, two circles are said to be orthogonal if their respective tangent lines at the points of intersection are perpendicular (meet at a right angle). [wikipedia]
+
+This method determines a circle with a given centre, orthogonal to a circle that is also given.
+
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = .6
+ z.C_1 = point: new (0,0)
+ z.C_2 = point: new (8,0)
+ z.A = point: new (5,0)
+ C = circle: new (z.C_1,z.A)
+ z.S,z.T = get_points (C: orthogonal_from (z.C_2))
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(C_1,T C_2,T)
+ \tkzDrawSegments(C_1,T C_2,T)
+ \tkzDrawLine(C_1,C_2)
+ \tkzMarkRightAngle[fill=teal,%
+ opacity=.2,size=1](C_1,T,C_2)
+ \tkzDrawPoints(C_1,C_2,T)
+ \tkzLabelPoints(C_1,C_2)
+ \tkzLabelPoints[above](T)
+ \tkzLabelSegment[left](C_1,T){r}
+ \tkzLabelSegments[right](C_2,T){$\gamma$}
+ \tkzLabelSegment[below](C_1,C_2){d}
+ \tkzLabelCircle[left=10pt](C_1,T)(180){Circle 1}
+ \tkzLabelCircle[right=10pt](C_2,T)(180){Circle 2}
+\end{tikzpicture}
+\end{Verbatim}
+
+\begin{tkzelements}
+scale = .6
+z.C_1 = point: new (0,0)
+z.C_2 = point: new (8,0)
+z.A = point: new (5,0)
+C = circle: new (z.C_1,z.A)
+z.S,z.T = get_points (C: orthogonal_from (z.C_2))
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(C_1,T C_2,T)
+ \tkzDrawSegments(C_1,T C_2,T)
+ \tkzDrawLine(C_1,C_2)
+ \tkzMarkRightAngle[fill=teal,opacity=.2,size=.5](C_1,T,C_2)
+ \tkzDrawPoints(C_1,C_2,T)
+ \tkzLabelPoints(C_1,C_2)
+ \tkzLabelPoints[above](T)
+ \tkzLabelSegment[left](C_1,T){r}
+ \tkzLabelSegments[right](C_2,T){$\gamma$}
+ \tkzLabelSegment[below](C_1,C_2){d}
+ \tkzLabelCircle[left=10pt](C_1,T)(180){Circle 1}
+ \tkzLabelCircle[right=10pt](C_2,T)(180){Circle 2}
+ \end{tikzpicture}
+\end{center}
+
+% subsubsection method_imeth_circle_orthogonal__from_pt (end)
+
+\subsubsection{Method \Imeth{circle}{orthogonal\_through}} % (fold)
+\label{ssub:method_imeth_circle_orthogonal_through}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.O = point: new (0,1)
+ z.A = point: new (1,0)
+ z.z1 = point: new (-1.5,-1.5)
+ z.z2 = point: new (2.5,-1.25)
+ C.OA = circle: new (z.O,z.A)
+ C = C.OA: orthogonal_through (z.z1,z.z2)
+ z.c = C.center
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(O,A)
+ \tkzDrawCircle[new](c,z1)
+ \tkzDrawPoints[new](O,A,z1,z2,c)
+ \tkzLabelPoints[right](O,A,z1,z2,c)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}\begin{tkzelements}
+ z.O = point: new (0,1)
+ z.A = point: new (1,0)
+ z.z1 = point: new (-1.5,-1.5)
+ z.z2 = point: new (2.5,-1.25)
+ C.OA = circle: new (z.O,z.A)
+ C = C.OA: orthogonal_through (z.z1,z.z2)
+ z.c = C.center
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(O,A)
+ \tkzDrawCircle[orange](c,z1)
+ \tkzDrawPoints[orange](O,A,z1,z2,c)
+ \tkzLabelPoints[right](O,A,z1,z2,c)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+% subsubsection method_imeth_circle_orthogonal__through (end)
+
\subsubsection{midcircle} % (fold)
\label{ssub:midcircle}
@@ -473,8 +1287,8 @@ z.H = C.AO.north
z.F = C.BP.north
z.G = C.BP.south
C.IT,C.JV = C.AO : midcircle (C.BP)
-z.I,z.T = get_points ( C.IT )
-z.J,z.V = get_points ( C.JV )
+z.I,z.T = get_points (C.IT)
+z.J,z.V = get_points (C.JV)
z.X,z.Y = intersection (C.AO,C.BP)
\end{tkzelements}
\end{Verbatim}
@@ -493,8 +1307,8 @@ z.X,z.Y = intersection (C.AO,C.BP)
z.F = C.BP.north
z.G = C.BP.south
C.IT,C.JV = C.AO : midcircle (C.BP)
- z.I,z.T = get_points ( C.IT )
- z.J,z.V = get_points ( C.JV )
+ z.I,z.T = get_points (C.IT)
+ z.J,z.V = get_points (C.JV)
z.X,z.Y = intersection (C.AO,C.BP)
\end{tkzelements}
\begin{tikzpicture}
@@ -520,7 +1334,7 @@ z.X,z.Y = intersection (C.AO,C.BP)
\vfill
\item One given circle is in the interior of the other given circle.
-
+\label{midcircle_diameter}
\begin{minipage}{.6\textwidth}
\begin{Verbatim}
\begin{tkzelements}
@@ -539,7 +1353,7 @@ z.X,z.Y = intersection (C.AO,C.BP)
z.x = C.SV.center
z.y = C.UR.center
C.IT = C.AO : midcircle (C.BP)
- z.I,z.T = get_points ( C.IT )
+ z.I,z.T = get_points (C.IT)
\end{tkzelements}
\end{Verbatim}
\end{minipage}
@@ -560,7 +1374,7 @@ z.X,z.Y = intersection (C.AO,C.BP)
z.x = C.SV.center
z.y = C.UR.center
C.IT = C.AO : midcircle (C.BP)
- z.I,z.T = get_points ( C.IT )
+ z.I,z.T = get_points (C.IT)
\end{tkzelements}
\begin{tikzpicture}
\tkzGetNodes
@@ -597,7 +1411,7 @@ z.E = C.Aa.north
z.F = C.Bb.north
L.EF = line : new (z.E,z.F)
C.IT = C.Aa : midcircle (C.Bb)
-z.I,z.T = get_points ( C.IT )
+z.I,z.T = get_points (C.IT)
L.TF = C.Bb : tangent_from (z.I)
z.H = intersection (L.TF,C.IT)
z.E = intersection (L.TF,C.Aa)
@@ -620,7 +1434,7 @@ z.E = C.Aa.north
z.F = C.Bb.north
L.EF = line : new (z.E,z.F)
C.IT = C.Aa : midcircle (C.Bb)
-z.I,z.T = get_points ( C.IT )
+z.I,z.T = get_points (C.IT)
L.TF = C.Bb : tangent_from (z.I)
z.H = intersection (L.TF,C.IT)
z.E = intersection (L.TF,C.Aa)
@@ -662,7 +1476,7 @@ z.E = C.Aa.north
z.F = C.Bb.north
L.EF = line : new (z.E,z.F)
C.IT = C.Aa : midcircle (C.Bb)
-z.I,z.T = get_points ( C.IT )
+z.I,z.T = get_points(C.IT)
L.TF = C.Bb : tangent_from (z.I)
z.H = intersection (L.TF,C.IT)
z.E = intersection (L.TF,C.Aa)
@@ -685,7 +1499,7 @@ z.E = C.Aa.north
z.F = C.Bb.north
L.EF = line : new (z.E,z.F)
C.IT = C.Aa : midcircle (C.Bb)
-z.I,z.T = get_points ( C.IT )
+z.I,z.T = get_points (C.IT)
L.TF = C.Bb : tangent_from (z.I)
z.H = intersection (L.TF,C.IT)
z.E = intersection (L.TF,C.Aa)
@@ -711,14 +1525,14 @@ z.F=L.TF.pb
\begin{minipage}{.4\textwidth}
\begin{Verbatim}
\begin{tkzelements}
-z.A = point : new ( 2 , 0 )
-z.B = point : new ( 4 , 0 )
-z.a = point : new ( 1 , 0)
-z.b = point : new ( 1 , 0)
-C.Aa = circle : new (z.A,z.a)
-C.Bb = circle : new (z.B,z.b)
-C.IT = C.Aa : midcircle (C.Bb)
-z.I,z.T = get_points ( C.IT )
+z.A = point : new ( 2 , 0 )
+z.B = point : new ( 4 , 0 )
+z.a = point : new ( 1 , 0)
+z.b = point : new ( 1 , 0)
+C.Aa = circle : new (z.A,z.a)
+C.Bb = circle : new (z.B,z.b)
+C.IT = C.Aa : midcircle (C.Bb)
+z.I,z.T = get_points(C.IT)
\end{tkzelements}
\end{Verbatim}
\end{minipage}
@@ -731,7 +1545,7 @@ z.b = point : new ( 1 , 0)
C.Aa = circle : new (z.A,z.a)
C.Bb = circle : new (z.B,z.b)
C.IT = C.Aa : midcircle (C.Bb)
-z.I,z.T = get_points ( C.IT )
+z.I,z.T = get_points (C.IT)
\end{tkzelements}
\begin{tikzpicture}
@@ -748,206 +1562,205 @@ z.I,z.T = get_points ( C.IT )
\end{enumerate}
% subsubsection midcircle (end)
-% subsection methods_of_the_class_circle (end)
-\subsection{Circles\_position} % (fold)
-\label{sub:circles_position}
-This function returns a string indicating the position of the circle in relation to another. Useful for creating a function. Cases are:
+\subsubsection{Radical circle} % (fold)
+\label{ssub:radical_circle}
-\begin{itemize}
- \item \code{outside}
- \item \code{outside tangent}
- \item \code{inside tangent}
- \item \code{inside}
- \item \code{intersect}
-\end{itemize}
-
-\begin{minipage}{.5\textwidth}
-\begin{Verbatim}
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
+\begin{Verbatim}
\begin{tkzelements}
- z.A = point : new ( 0 , 0 )
- z.a = point : new ( 3 , 0 )
- z.B = point : new ( 2 , 0 )
- z.b = point : new ( 3 , 0 )
- C.Aa = circle: new (z.A,z.a)
- C.Bb = circle: new (z.B,z.b)
- position = C.Aa : circles_position (C.Bb)
- if position == "inside tangent"
- then color = "orange"
- else color = "blue" end
+ scale = .5
+ z.A = point: new (0,0)
+ z.B = point: new (6,0)
+ z.C = point: new (0.8,4)
+ T.ABC = triangle : new ( z.A,z.B,z.C )
+ C.exa = T.ABC : ex_circle ()
+ z.I_a,z.Xa = get_points (C.exa)
+ C.exb = T.ABC : ex_circle (1)
+ z.I_b,z.Xb = get_points (C.exb)
+ C.exc = T.ABC : ex_circle (2)
+ z.I_c,z.Xc = get_points (C.exc)
+ C.ortho = C.exa : radical_circle (C.exb,C.exc)
+ z.w,z.a = get_points (C.ortho)
\end{tkzelements}
-
\begin{tikzpicture}
\tkzGetNodes
- \tkzDrawCircle(A,a)
- \tkzDrawCircle[color=\tkzUseLua{color}](B,b)
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawCircles(I_a,Xa I_b,Xb I_c,Xc)
+ \tkzDrawCircles[red,thick](w,a)
+ \tkzDrawPoints(A,B,C)
+ \tkzLabelPoints(A,B,C)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
-\begin{minipage}{.5\textwidth}
+
\begin{tkzelements}
-z.A = point : new ( 1 , 0 )
-z.a = point : new ( 3 , 0 )
-z.B = point : new ( 2 , 0 )
-z.b = point : new ( 3 , 0 )
-C.Aa = circle: new (z.A,z.a)
-C.Bb = circle: new (z.B,z.b)
-position = C.Aa : circles_position (C.Bb)
-if position == "inside tangent" then color = "orange" else color = "blue" end
+ scale = .5
+ z.A = point: new (0,0)
+ z.B = point: new (6,0)
+ z.C = point: new (0.8,4)
+ T.ABC = triangle : new ( z.A,z.B,z.C )
+ C.exa = T.ABC : ex_circle ()
+ z.I_a,z.Xa = get_points (C.exa)
+ C.exb = T.ABC : ex_circle (1)
+ z.I_b,z.Xb = get_points (C.exb)
+ C.exc = T.ABC : ex_circle (2)
+ z.I_c,z.Xc = get_points (C.exc)
+ C.ortho = C.exa : radical_circle (C.exb,C.exc)
+ z.w,z.a = get_points (C.ortho)
\end{tkzelements}
-\hspace{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle(A,a)
-\tkzDrawCircle[color=\tkzUseLua{color}](B,b)
-\end{tikzpicture}\hspace{\fill}
-\end{minipage}
-% subsection circles__position (end)
-\subsection{Common tangent: Angle of two intersecting circles} % (fold)
-\label{sub:common_tangent}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawCircles(I_a,Xa I_b,Xb I_c,Xc)
+ \tkzDrawCircles[red,thick](w,a)
+ \tkzDrawPoints(A,B,C)
+ \tkzLabelPoints(A,B,C)
+ \end{tikzpicture}
+\end{center}
+% subsubsection radical_circle (end)
-Let be a tangent common to both circles at $T$ and $T'$ (closest to $C$). Let a secant parallel to this tangent pass through $C$. Then the segment $[TT']$ is seen from the other common point $D$ at an angle equal to half the angle of the two circles.
+\subsubsection{Method \Imeth{circle}{power(C)}} % (fold)
+\label{ssub:method_imeth_circle_power_c}
+\paragraph{Power v1} % (fold)
+\label{par:power_v1}
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
\begin{Verbatim}
\begin{tkzelements}
- z.A = point : new ( 0 , 0 )
- z.B = point : new ( 5 , 2 )
- L.AB = line : new ( z.A , z.B )
- z.C = point : new ( 1 , 2 )
- C.AC = circle : new (z.A,z.C)
- C.BC = circle : new (z.B,z.C)
- z.T,z.Tp = C.AC : common_tangent (C.BC)
- L.TTp = line : new (z.T,z.Tp)
- z.M = C.AC : point (0.45)
- L.MC =line : new (z.M,z.C)
- z.Mp = intersection (L.MC, C.BC)
- L.mm = L.TTp : ll_from (z.C)
- _,z.M = intersection (L.mm, C.AC)
- z.Mp = intersection (L.mm, C.BC)
- _,z.D = intersection (C.AC,C.BC)
-\end{tkzelements}
+ z.O = point : new (0,0)
+ z.A = point : new (2,-2)
+ z.M = point : new (-6,0)
+ L.AM = line : new (z.A,z.M)
+ C.OA = circle : new (z.O,z.A)
+ z.Ap = C.OA : antipode (z.A)
+ z.B = intersection (L.AM, C.OA)
+\end{tkzelements}
\begin{tikzpicture}
\tkzGetNodes
- \tkzDrawCircles(A,C B,C)
- \tkzDrawSegments(M,M' A,D B,D A,B C,D T,C T',C)
- \tkzDrawSegments[gray](D,M D,M' T,T' D,T D,T')
- \tkzDrawPoints(A,B,C,D,M,M',T,T')
- \tkzLabelPoints(A,B,D,M)
- \tkzLabelPoints[above](C,M',T,T')
- \tkzMarkAngles[mark=|,size=.75](T,C,M C,T,T' C,D,T T,D,M)
- \tkzMarkAngles[mark=||,size=.75](M',C,T' T,T',C T',D,C M',D,T')
+ \tkzDrawCircle(O,A)
+ \tkzMarkRightAngle[fill=gray!10](A',B,M)
+ \tkzDrawSegments(M,O A,A' A',B)
+ \tkzDrawPoints(O,A,A',M,B)
+ \tkzLabelPoints(O,A,A',M,B)
+ \tkzDrawSegments[-Triangle](M,A M,A')
\end{tikzpicture}
\end{Verbatim}
-
-
+\end{minipage}
+\begin{minipage}[t]{.5\textwidth}
\begin{tkzelements}
-z.A = point : new ( 0 , 0 )
-z.B = point : new ( 5 , 2 )
-L.AB = line : new ( z.A , z.B )
-z.C = point : new ( 1 , 2 )
-C.AC = circle : new (z.A,z.C)
-C.BC = circle : new (z.B,z.C)
-z.T,z.Tp = C.AC : common_tangent (C.BC)
-L.TTp = line : new (z.T,z.Tp)
-z.M = C.AC : point (0.45)
-L.MC =line : new (z.M,z.C)
-z.Mp = intersection (L.MC, C.BC)
-L.mm = L.TTp : ll_from (z.C)
-_,z.M = intersection (L.mm, C.AC)
-z.Mp = intersection (L.mm, C.BC)
-_,z.D = intersection (C.AC,C.BC)
+scale = 1
+z.O = point : new (0,0)
+z.A = point : new (2,-2)
+z.M = point : new (-6,0)
+L.AM = line : new (z.A,z.M)
+C.OA = circle : new (z.O,z.A)
+z.Ap = C.OA : antipode (z.A)
+z.B = intersection (L.AM, C.OA)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(A,C B,C)
-\tkzDrawSegments(M,M' A,D B,D A,B C,D T,C T',C)
-\tkzDrawSegments[gray](D,M D,M' T,T' D,T D,T')
-\tkzDrawPoints(A,B,C,D,M,M',T,T')
-\tkzLabelPoints(A,B,D,M)
-\tkzLabelPoints[above](C,M',T,T')
-\tkzMarkAngles[mark=|,size=.75](T,C,M C,T,T' C,D,T T,D,M)
-\tkzMarkAngles[mark=||,size=.75](M',C,T' T,T',C T',D,C M',D,T')
-\end{tikzpicture}
-\hspace*{\fill}
-% subsection common_tangent (end)
-\subsection{Common tangent: orthogonality} % (fold)
-\label{sub:common_tangent_orthogonality}
-For two circles to be orthogonal, it is necessary and sufficient for a secant passing through one of their common points to be seen from the other common point at a right angle.
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(O,A)
+ \tkzMarkRightAngle[fill=gray!10](A',B,M)
+ \tkzDrawSegments(M,O A,A' A',B)
+ \tkzDrawPoints(O,A,A',M,B)
+ \tkzLabelPoints(O,A,A',M,B)
+ \tkzDrawSegments[-Triangle](M,A M,A')
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% paragraph power_v1 (end)
+\paragraph{Power v2} % (fold)
+\label{par:power_v2}
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
\begin{Verbatim}
\begin{tkzelements}
- z.A = point : new ( 0 , 0 )
- z.B = point : new ( 4 , 2 )
- L.AB = line : new ( z.A , z.B )
- z.a = point : new ( 1 , 2 )
- C.Aa = circle : new (z.A,z.a)
- C.BC = C.Aa : orthogonal_from (z.B)
- z.C,z.D = intersection (C.Aa,C.BC)
- C.AC = circle : new (z.A,z.C)
- z.T,z.Tp = C.AC : common_tangent (C.BC)
- L.TTp = line : new (z.T,z.Tp)
- z.M = C.AC : point (0.45)
- L.MC =line : new (z.M,z.C)
- z.Mp = intersection (L.MC, C.BC)
- L.mm = L.TTp : ll_from (z.C)
- _,z.M = intersection (L.mm, C.AC)
- z.Mp = intersection (L.mm, C.BC)
+ z.O = point : new (0,0)
+ z.A = point : new (2,2)
+ z.M = point : new (-1.5,0)
+ L.AM = line : new (z.A,z.M)
+ C.OA = circle : new (z.O,z.A)
+ z.Ap = C.OA : antipode (z.A)
+ _,z.B = intersection (L.AM, C.OA)
+ z.m = z.M : north(1)
+ L.mM = line : new (z.m,z.M)
+ z.U,z.V = intersection (L.mM,C.OA)
\end{tkzelements}
-
\begin{tikzpicture}
\tkzGetNodes
- \tkzDrawCircles(A,C B,C)
- \tkzDrawSegments(M,M' A,C B,C A,B)
- \tkzDrawSegments[gray](D,M D,M' T,T')
- \tkzDrawPoints(A,B,C,D,M,M',T,T')
- \tkzLabelPoints(A,B,D,M)
- \tkzLabelPoints[above](C,M',T,T')
- \tkzMarkRightAngles(M',D,M A,C,B)
+ \tkzDrawCircle(O,A)
+ \tkzMarkRightAngle[fill=gray!10](A',B,M)
+ \tkzDrawSegments(M,O A,A' A',B A,B U,V)
+ \tkzDrawPoints(O,A,A',M,B,U,V,m)
+ \tkzLabelPoints(O,A,M,U,V,m)
+ \tkzLabelPoints[below left](A',B)
+ \tkzDrawSegments(M,A M,A')
\end{tikzpicture}
\end{Verbatim}
-
+\end{minipage}
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
\begin{tkzelements}
-z.A = point : new ( 0 , 0 )
-z.B = point : new ( 4 , 2 )
-L.AB = line : new ( z.A , z.B )
-z.a = point : new ( 1 , 2 )
-C.Aa = circle : new (z.A,z.a)
-C.BC = C.Aa : orthogonal_from (z.B)
-z.C,z.D = intersection (C.Aa,C.BC)
-C.AC = circle : new (z.A,z.C)
-z.T,z.Tp = C.AC : common_tangent (C.BC)
-L.TTp = line : new (z.T,z.Tp)
-z.M = C.AC : point (0.45)
-L.MC =line : new (z.M,z.C)
-z.Mp = intersection (L.MC, C.BC)
-L.mm = L.TTp : ll_from (z.C)
-_,z.M = intersection (L.mm, C.AC)
-z.Mp = intersection (L.mm, C.BC)
+scale = 1
+z.O = point : new (0,0)
+z.A = point : new (2,2)
+z.M = point : new (-1.5,0)
+L.AM = line : new (z.A,z.M)
+C.OA = circle : new (z.O,z.A)
+z.Ap = C.OA : antipode (z.A)
+_,z.B = intersection (L.AM, C.OA)
+z.m = z.M : north(1)
+L.mM = line : new (z.m,z.M)
+z.U,z.V = intersection (L.mM,C.OA)
\end{tkzelements}
- \hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(A,C B,C)
- \tkzDrawSegments(M,M' A,C B,C A,B)
- \tkzDrawSegments[gray](D,M D,M' T,T')
- \tkzDrawPoints(A,B,C,D,M,M',T,T')
- \tkzLabelPoints(A,B,D,M)
- \tkzLabelPoints[above](C,M',T,T')
- \tkzMarkRightAngles(M',D,M A,C,B)
-\end{tikzpicture}
-\hspace*{\fill}
-% subsection common_tangent_orthogonality (end)
-\subsection{In\_out for circle and disk} % (fold)
-\label{sub:in_out_for_circle_and_disk}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(O,A)
+ \tkzMarkRightAngle[fill=gray!10](A',B,M)
+ \tkzDrawSegments(M,O A,A' A',B A,B U,V)
+ \tkzDrawPoints(O,A,A',M,B,U,V,m)
+ \tkzLabelPoints(O,A,M,U,V,m)
+ \tkzLabelPoints[below left](A',B)
+ \tkzDrawSegments(M,A M,A')
+ \end{tikzpicture}
+\end{center}
-\begin{Verbatim}
-\begin{tkzelements}
+\end{minipage}
+% paragraph power_v2 (end)
+
+% subsubsection method_imeth_circle_power_c (end)
+
+\subsubsection{Method \Imeth{circle}{in\_out} for circle and disk} % (fold)
+\label{ssub:in_out_for_circle_and_disk}
+
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+ \begin{tkzelements}
+ z.O = point : new (0,0)
+ z.A = point : new (1,2)
+ C.OA = circle : new (z.O,z.A)
+ z.N = point : new (-2,2)
+ z.M = point : new (1,0)
+ z.P = point : new (2,1)
+ BCm = C.OA : in_out (z.M)
+ BDm = C.OA : in_out_disk (z.M)
+ BCn = C.OA : in_out (z.N)
+ BDn = C.OA : in_out_disk (z.N)
+ BCp = C.OA : in_out (z.P)
+ BDp = C.OA : in_out_disk (z.P)
+ \end{tkzelements}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}\begin{tkzelements}
z.O = point : new (0,0)
z.A = point : new (1,2)
C.OA = circle : new (z.O,z.A)
@@ -965,53 +1778,104 @@ BDp = C.OA : in_out_disk (z.P)
\tkzLabelPoints(O,M,N,P)
\ifthenelse{\equal{\tkzUseLua{#1}}{true}}{
\tkzLabelPoint[below=#4pt,font=\scriptsize](#2){on the #3}}{%
- \tkzLabelPoint[below=#4pt,font=\scriptsize](#2){out the #3}}}
+ \tkzLabelPoint[below=#4pt,font=\scriptsize](#2){out the #3}}
+}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawSegments[dashed](O,M O,N O,P)
+ \tkzDrawCircle(O,A)
+ \tkzDrawPoints(O,M,N,P)
+ \tkzPosPoint{BCm}{M}{circle}{8}
+ \tkzPosPoint{BCn}{N}{circle}{8}
+ \tkzPosPoint{BCp}{P}{circle}{8}
+ \tkzPosPoint{BDm}{M}{disk}{14}
+ \tkzPosPoint{BDn}{N}{disk}{14}
+ \tkzPosPoint{BDp}{P}{disk}{14}
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+ \def\tkzPosPoint#1#2#3#4{%
+ \tkzLabelPoints(O,M,N,P)
+ \ifthenelse{\equal{\tkzUseLua{#1}}{true}}{
+ \tkzLabelPoint[below=#4pt,font=\scriptsize](#2){on the #3}}{%
+ \tkzLabelPoint[below=#4pt,font=\scriptsize](#2){out the #3}}}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawSegments[dashed](O,M O,N O,P)
+ \tkzDrawCircle(O,A)
+ \tkzDrawPoints(O,M,N,P)
+ \tkzPosPoint{BCm}{M}{circle}{8}
+ \tkzPosPoint{BCn}{N}{circle}{8}
+ \tkzPosPoint{BCp}{P}{circle}{8}
+ \tkzPosPoint{BDm}{M}{disk}{14}
+ \tkzPosPoint{BDn}{N}{disk}{14}
+ \tkzPosPoint{BDp}{P}{disk}{14}
+ \end{tikzpicture}
+ \end{Verbatim}
+\end{minipage}
+
+% subsubsection in_out_for_circle_and_disk (end)
+
+\subsubsection{Method \Imeth{circle}{circles\_position}} % (fold)
+\label{ssub:circles_position}
+
+This function returns a string indicating the position of the circle in relation to another. Useful for creating a function. Cases are:
+
+\begin{itemize}
+ \item \code{outside}
+ \item \code{outside tangent}
+ \item \code{inside tangent}
+ \item \code{inside}
+ \item \code{intersect}
+\end{itemize}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point : new ( 0 , 0 )
+ z.a = point : new ( 3 , 0 )
+ z.B = point : new ( 2 , 0 )
+ z.b = point : new ( 3 , 0 )
+ C.Aa = circle: new (z.A,z.a)
+ C.Bb = circle: new (z.B,z.b)
+ position = C.Aa : circles_position (C.Bb)
+ if position == "inside tangent"
+ then color = "orange"
+ else color = "blue" end
+\end{tkzelements}
+
\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawSegments[dashed](O,M O,N O,P)
-\tkzDrawCircle(O,A)
-\tkzDrawPoints(O,M,N,P)
-\tkzPosPoint{BCm}{M}{circle}{8}
-\tkzPosPoint{BCn}{N}{circle}{8}
-\tkzPosPoint{BCp}{P}{circle}{8}
-\tkzPosPoint{BDm}{M}{disk}{14}
-\tkzPosPoint{BDn}{N}{disk}{14}
-\tkzPosPoint{BDp}{P}{disk}{14}
+ \tkzGetNodes
+ \tkzDrawCircle(A,a)
+ \tkzDrawCircle[color=\tkzUseLua{color}](B,b)
\end{tikzpicture}
\end{Verbatim}
-
+\end{minipage}
+\begin{minipage}{.5\textwidth}
\begin{tkzelements}
-z.O = point : new (0,0)
-z.A = point : new (1,2)
-C.OA = circle : new (z.O,z.A)
-z.N = point : new (-2,2)
-z.M = point : new (1,0)
-z.P = point : new (2,1)
-BCm = C.OA : in_out (z.M)
-BDm = C.OA : in_out_disk (z.M)
-BCn = C.OA : in_out (z.N)
-BDn = C.OA : in_out_disk (z.N)
-BCp = C.OA : in_out (z.P)
-BDp = C.OA : in_out_disk (z.P)
+z.A = point : new ( 1 , 0 )
+z.a = point : new ( 3 , 0 )
+z.B = point : new ( 2 , 0 )
+z.b = point : new ( 3 , 0 )
+C.Aa = circle: new (z.A,z.a)
+C.Bb = circle: new (z.B,z.b)
+position = C.Aa : circles_position (C.Bb)
+if position == "inside tangent" then color = "orange" else color = "blue" end
\end{tkzelements}
-\def\tkzPosPoint#1#2#3#4{%
-\tkzLabelPoints(O,M,N,P)
- \ifthenelse{\equal{\tkzUseLua{#1}}{true}}{
- \tkzLabelPoint[below=#4pt,font=\scriptsize](#2){on the #3}}{%
- \tkzLabelPoint[below=#4pt,font=\scriptsize](#2){out the #3}}
-}
+\hspace{\fill}
\begin{tikzpicture}
\tkzGetNodes
-\tkzDrawSegments[dashed](O,M O,N O,P)
-\tkzDrawCircle(O,A)
-\tkzDrawPoints(O,M,N,P)
-\tkzPosPoint{BCm}{M}{circle}{8}
-\tkzPosPoint{BCn}{N}{circle}{8}
-\tkzPosPoint{BCp}{P}{circle}{8}
-\tkzPosPoint{BDm}{M}{disk}{14}
-\tkzPosPoint{BDn}{N}{disk}{14}
-\tkzPosPoint{BDp}{P}{disk}{14}
-\end{tikzpicture}
-% subsection in_out_for_circle_and_disk (end)
+\tkzDrawCircle(A,a)
+\tkzDrawCircle[color=\tkzUseLua{color}](B,b)
+\end{tikzpicture}\hspace{\fill}
+\end{minipage}
+% subsubsection circles__position (end)
+
+% subsection methods_of_the_class_circle (end)
% section class_circle (end)
+
\endinput
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-ellipse.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-ellipse.tex
index 3146f73461e..016dd8025ca 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-ellipse.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-ellipse.tex
@@ -141,10 +141,10 @@ To do this, you'll need to use a macro: \tkzcname{tkzUseLua} defined in \pkg{tk
\Imeth{ellipse}{foci (f1,f2,v)} & E = ellipse: foci ( focus 1, focus 2, vertex ) \\
\Imeth{ellipse}{radii (c,a,b,sl) } & E = ellipse: radii ( center, radius a, radius b, slope ) \\
\Imeth{ellipse}{in\_out (pt) } & pt in/out of the ellipse \\
-\Imeth{ellipse}{tangent\_at (pt) } & Refer to ex. \ref{ssub:method_point} \\
-\Imeth{ellipse}{tangent\_from (pt) } & Refer to ex. \ref{ssub:method_point} \\
-\Imeth{ellipse}{point (t) } & vertex = point (0) covertex = point (0.25) ex Refer to \ref{ssub:method_point} \\
-\Imeth{ellipse}{orthoptic\_circle () } & Refer to ex. \ref{ssub:steiner_inellipse_and_circumellipse} \\
+\Imeth{ellipse}{tangent\_at (pt) } & [ ex. \ref{ssub:method_point} ] \\
+\Imeth{ellipse}{tangent\_from (pt) } & [ex. \ref{ssub:method_point} ] \\
+\Imeth{ellipse}{point (t) } & vertex = point (0) covertex = point (0.25) [ex. \ref{ssub:method_point} ] \\
+\Imeth{ellipse}{orthoptic\_circle () } & [ex. \ref{ssub:steiner_inellipse_and_circumellipse}] \\
\bottomrule
\end{tabular}
@@ -153,7 +153,7 @@ To do this, you'll need to use a macro: \tkzcname{tkzUseLua} defined in \pkg{tk
\subsubsection{Method \Imeth{ellipse}{new}} % (fold)
\label{ssub:method_imeth_ellipse_new}
The main method for creating a new ellipse is \Imeth{ellipse}{new}. The arguments are three: \Iattr{ellipse}{center}, \Iattr{ellipse}{vertex} and \Iattr{ellipse}{covertex}
-For attributes Refer to \ref{sec:class_ellipse}.
+For attributes [\ref{sec:class_ellipse}].
\begin{minipage}{0.5\textwidth}
\begin{Verbatim}
@@ -258,22 +258,25 @@ The first two points are the foci of the ellipse, and the third one is the verte
a,b = E.Rx,E.Ry
ang = math.deg(E.slope)
\end{tkzelements}
- \hspace*{\fill}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygon(A,B,C)
- \tkzDrawCircles[cyan](O,A N,I)
- \tkzDrawSegments(X,R A,X)
- \tkzDrawEllipse[red](N,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
- \tkzDrawLines[add=.2 and .5](I,H)
- \tkzDrawPoints(A,B,C,N,O,X,H,R,S,I)
- \tkzLabelPoints[above](C,X)
- \tkzLabelPoints[above right](N,O)
- \tkzLabelPoints[above left](R)
- \tkzLabelPoints[left](A)
- \tkzLabelPoints[right](B,I,S,H)
- \end{tikzpicture}
- \hspace*{\fill}
+
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawCircles[cyan](O,A N,I)
+ \tkzDrawSegments(X,R A,X)
+ \tkzDrawEllipse[red](N,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
+ \tkzDrawLines[add=.2 and .5](I,H)
+ \tkzDrawPoints(A,B,C,N,O,X,H,R,S,I)
+ \tkzLabelPoints[above](C,X)
+ \tkzLabelPoints[above right](N,O)
+ \tkzLabelPoints[above left](R)
+ \tkzLabelPoints[left](A)
+ \tkzLabelPoints[right](B,I,S,H)
+ \end{tikzpicture}
+ \end{center}
+
+
\end{minipage}
\begin{Verbatim}
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-line.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-line.tex
index 435ad9bcc63..f4acdafc8c0 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-line.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-line.tex
@@ -26,22 +26,53 @@ The attributes are :
\Iattr{line}{pb} & Second point of the segment & \\
\Iattr{line}{type} & Type is 'line' & |L.AB.type = 'line'| \\
\Iattr{line}{mid} & Middle of the segment& |z.M = L.AB.mid|\\
-\Iattr{line}{slope} & Slope of the line & Refer to (\ref{ssub:example_class_line})\\
-\Iattr{line}{length} &|l = L.AB.length|&Refer to (\ref{sub:transfer_from_lua_to_tex} ; \ref{ssub:example_class_line})\\
-\Iattr{line}{north\_pa} & &Refer to (\ref{ssub:example_class_line}) \\
+\Iattr{line}{slope} & Slope of the line & [\ref{ssub:example_class_line}] \\
+\Iattr{line}{length} &|l = L.AB.length|& [\ref{sub:transfer_from_lua_to_tex} ; \ref{ssub:example_class_line}] \\
+\Iattr{line}{north\_pa} & & [\ref{ssub:example_class_line}] \\
\Iattr{line}{north\_pb} & &\\
\Iattr{line}{south\_pa} & &\\
-\Iattr{line}{south\_pb} & &Refer to (\ref{ssub:example_class_line}) \\
+\Iattr{line}{south\_pb} & & [\ref{ssub:example_class_line}] \\
\Iattr{line}{east} & &\\
\Iattr{line}{west} & &\\
-\Iattr{line}{vec} & |V.AB = L.AB.vec|& defines $\overrightarrow{AB}$ Refer to (\ref{sec:class_vector})\\
+\Iattr{line}{vec} & |V.AB = L.AB.vec|& defines $\overrightarrow{AB}$ [\ref{sec:class_vector}] \\
\bottomrule
\end{tabular}
\egroup
\subsubsection{Example: attributes of class line} % (fold)
\label{ssub:example_class_line}
-\begin{minipage}{.5\textwidth}
+
+\vspace{5pt}
+\begin{tkzelements}
+z.a = point: new (1, 1)
+z.b = point: new (5, 4)
+L.ab = line : new (z.a,z.b)
+z.m = L.ab.mid
+z.w = L.ab.west
+z.e = L.ab.east
+z.r = L.ab.north_pa
+z.s = L.ab.south_pb
+sl = L.ab.slope
+len = L.ab.length
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(a,b,m,e,r,s,w)
+ \tkzLabelPoints(a,b)
+ \tkzLabelPoint(r){north\_pa}
+ \tkzLabelPoint(s){south\_pb}
+ \tkzLabelPoint[below](m){mid}
+ \tkzLabelPoint[right](w){west}
+ \tkzLabelPoint[left](e){east}
+ \tkzDrawLine(a,b)
+ \tkzLabelSegment[above = 1em,sloped](a,b){ab = \pmpn{\tkzUseLua{len}}}
+ \tkzLabelSegment[above=2em,sloped](a,b){slope of (ab) = \pmpn{\tkzUseLua{sl}}}
+ \end{tikzpicture}
+\end{center}
+
+
\begin{Verbatim}
\begin{tkzelements}
scale = .5
@@ -67,35 +98,8 @@ The attributes are :
\tkzLabelSegment[above=12pt,sloped](a,b){slope of (ab) = \tkzUseLua{sl}}
\end{tikzpicture}
\end{Verbatim}
-\end{minipage}
-\begin{minipage}{.5\textwidth}\begin{tkzelements}
-scale = .5
-z.a = point: new (1, 1)
-z.b = point: new (5, 4)
-L.ab = line : new (z.a,z.b)
-z.m = L.ab.mid
-z.w = L.ab.west
-z.e = L.ab.east
-z.r = L.ab.north_pa
-z.s = L.ab.south_pb
-sl = L.ab.slope
-len = L.ab.length
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPoints(a,b,m,e,r,s,w)
- \tkzLabelPoints(a,b)
- \tkzLabelPoint(r){north\_pa}
- \tkzLabelPoint(s){south\_pb}
- \tkzLabelPoint[below](m){mid}
- \tkzLabelPoint[right](w){west}
- \tkzLabelPoint[left](e){east}
- \tkzDrawLine(a,b)
- \tkzLabelSegment[above = 1em,sloped](a,b){ab = \pmpn{\tkzUseLua{len}}}
- \tkzLabelSegment[above=2em,sloped](a,b){slope of (ab) = \pmpn{\tkzUseLua{sl}}}
-\end{tikzpicture}
-\end{minipage}
+
+
% subsubsection example_class_line (end)
\subsubsection{Method \Imeth{line}{new} and line attributes}
@@ -161,62 +165,54 @@ Here's the list of methods for the \tkzNameObj{line} object. The results can be
\toprule
\textbf{Methods} & \textbf{Comments} & \\
\midrule
-\Igfct{line}{new(pt, pt)} & |L.AB = line : new(z.A,z.B)| & Create line $(AB)$ ; Refer to (\ref{ssub:altshiller})\\
+\Igfct{line}{new(pt, pt)} & |L.AB = line : new(z.A,z.B)| & Create line $(AB)$ ; [\ref{sub:altshiller}] \\
\midrule
\textbf{Points} &&\\
\midrule
-\Imeth{line}{gold\_ratio ()} & |z.C=L.AB : gold_ratio()| & Refer to (\ref{sub:gold_ratio_with_segment} ; \ref{sub:the_figure_pappus_circle} ; \ref{sub:bankoff_circle}) \\
-\Imeth{line}{normalize ()} & |z.C=L.AB : normalize()| & AC =1 and $C\in (AB)$ Refer to (\ref{ssub:normalize}) \\
+\Imeth{line}{gold\_ratio ()} & |z.C=L.AB : gold_ratio()| & [\ref{sub:gold_ratio_with_segment} ; \ref{sub:the_figure_pappus_circle} ; \ref{sub:bankoff_circle} ] \\
+\Imeth{line}{normalize ()} & |z.C=L.AB : normalize()| & AC =1 and $C\in (AB)$ [ \ref{ssub:normalize}] \\
\Imeth{line}{normalize\_inv ()} & |z.C=L.AB : normalize_inv()| & CB=1 and $C\in (AB)$ \\
-\Imeth{line}{barycenter (r,r)} & |z.C=L.AB : barycenter (1,2)| & Refer to (\ref{ssub:barycenter_with_a_line})\\
-\Imeth{line}{point (r)} & |z.C=L.AB : point (2)| & $\overrightarrow{AC} = 2\overrightarrow{AB}$ Refer to (\ref{sub:ellipse} ; \ref{ssub:method_point})\\
+\Imeth{line}{barycenter (r,r)} & |z.C=L.AB : barycenter (1,2)| & [\ref{ssub:barycenter_with_a_line}] \\
+\Imeth{line}{point (r)} & |z.C=L.AB : point (2)| & $\overrightarrow{AC} = 2\overrightarrow{AB}$ [\ref{sub:ellipse} ; \ref{ssub:method_point}] \\
\Imeth{line}{midpoint ()} & |z.M=L.AB : midpoint ()| & better is |z.M = L.AB.mid| \\
-\Imeth{line}{harmonic\_int (pt)} & |z.D=L.AB : harmonic_int (z.C)| & Refer to (\ref{sub:bankoff_circle})\\
-\Imeth{line}{harmonic\_ext (pt)} & |z.D=L.AB : harmonic_ext (z.C)| & Refer to (\ref{sub:bankoff_circle})\\
-\Imeth{line}{harmonic\_both (r)} & |z.C,z.D=L.AB : harmonic_both|($\varphi$) & \ref{sub:harmonic_division_with_tkzphi}\\
+\Imeth{line}{harmonic\_int (pt)} & |z.D=L.AB : harmonic_int (z.C)| & [ \ref{sub:bankoff_circle}] \\
+\Imeth{line}{harmonic\_ext (pt)} & |z.D=L.AB : harmonic_ext (z.C)| & [ \ref{sub:bankoff_circle}] \\
+\Imeth{line}{harmonic\_both (r)} & |z.C,z.D=L.AB : harmonic_both|($\varphi$) & [\ref{sub:harmonic_division_with_tkzphi}] \\
\Imeth{line}{\_east(d)} & |z.M=L.AB : _east(2)| & |BM = 2| $A,B,M$ aligned \\
\Imeth{line}{\_west(d)} & |z.M=L.AB : _east(2)| & |BM = 2| $A,B,M$ aligned \\
-\Imeth{line}{\_north\_pa(d)} &|z.M=L.AB: _north_pa(2)| &|AM=2| $AM\perp AB$ ; $\overrightarrow{AB},\overrightarrow{AM}$ counterclockwise \\
-\Imeth{line}{\_south\_pa(d)} &|z.M=L.AB:_south_pa(2)| &|AM=2|; $AM\perp AB$ ; $\overrightarrow{AB},\overrightarrow{AM}$ clockwise \\
-\Imeth{line}{\_north\_pb(d)} &|z.M=L.AB:_north_pb(2)| &|BM=2|; $BM\perp BA$ ; $\overrightarrow{BA},\overrightarrow{BM}$ clockwise \\
-\Imeth{line}{\_south\_pb(d)} &|z.M=L.AB:_south_pb(2)| &|BM=2|; $BM\perp BA$ ; $\overrightarrow{AB},\overrightarrow{AM}$ counterclockwise \\
-\Imeth{line}{report(d,pt)} &|z.M=L.AB:report(2,z.N)| &|MN=2|; $AB\parallel MN$ ; Refer to ex. (\ref{ssub:method_report})\\
-\Imeth{line}{colinear\_at(pt,k)} &|z.D=L.AB:colinear_at(z.C,2)| &|CD=2AB|; $AB\parallel CD$ ; Refer to ex. (\ref{ssub:method_imeth_line_colinear__at})\\
+\Imeth{line}{\_north\_pa(d)} &|z.M=L.AB: _north_pa(2)| &|AM=2|; $AM\perp AB$ ; $\overrightarrow{AB},\overrightarrow{AM}$ counterclockwise. \\
+...&& [\ref{ssub:new_line_from_a_defined_line}; \ref{ssub:attributes_of_an_ellipse}]\\
+\Imeth{line}{\_south\_pa(d)} &|z.M=L.AB: _south_pa(2)| &|AM=2|; $AM\perp AB$ ; $\overrightarrow{AB},\overrightarrow{AM}$ clockwise \\
+\Imeth{line}{\_north\_pb(d)} &|z.M=L.AB: _north_pb(2)| &|BM=2|; $BM\perp BA$ ; $\overrightarrow{BA},\overrightarrow{BM}$ clockwise \\
+\Imeth{line}{\_south\_pb(d)} &|z.M=L.AB: _south_pb(2)| &|BM=2|; $BM\perp BA$ ; $\overrightarrow{AB},\overrightarrow{AM}$ counterclockwise \\
+\Imeth{line}{report(d,pt)} &|z.M=L.AB: report(2,z.N)| &|MN=2|; $AB\parallel MN$ ; [ex. \ref{ssub:method_report}]\\
+\Imeth{line}{colinear\_at(pt,k)} &|z.D=L.AB: colinear_at(z.C,2)| &|CD=2AB|; $AB\parallel CD$ ; [ex. \ref{ssub:method_imeth_line_colinear__at}]\\
\midrule
\textbf{Lines} &&\\
\midrule
-\Imeth{line}{ll\_from ( pt )} &|L.CD=L.AB: ll_from(z.C)| &$(CD) \parallel (AB)$ \\
-\Imeth{line}{ortho\_from ( pt )} &|L.CD=L.AB: ortho_from(z.C)|&$(CD) \perp (AB)$\\
-\Imeth{line}{mediator ()}&|L.uv=L.AB: mediator()| & $(u,v)$mediator of $(A,B)$\\
+\Imeth{line}{ll\_from ( pt )} &|L.CD=L.AB: ll_from(z.C)| &$(CD) \parallel (AB)$; [\ref{ssub:new_line_from_a_defined_line}] \\
+\Imeth{line}{ortho\_from ( pt )} &|L.CD=L.AB: ortho_from(z.C)|&$(CD) \perp (AB)$; [\ref{ssub:newline_ortho_from}] \\
+ \Imeth{line}{mediator ()} & |L.uv=L.AB: mediator()| & perpendicular bisector of $(A,B)$ \footnote{You can use |perpendicular_bisector| intead of \tkzname{mediator}.}; [\ref{ssub:method_imeth_line_mediator}]\\
\midrule
\textbf{Triangles}&&\\
\midrule
-\Imeth{line}{equilateral (<swap>)} & |T.ABC=L.AB:equilateral()| & $(\overrightarrow{AB},\overrightarrow{AC})>0$ or $<0$ with swap \footnote{Triangles are defined in the direct sense of rotation, unless the "swap" option is present.} \\
-\Imeth{line}{isosceles (an<,swap>)}&|T.ABC=L.AB:isosceles(math.pi/6)|&\\
-\Imeth{line}{two\_angles (an,an)} &|T.ABC=L.AB:two_angles(an,an)|&note \footnote{The given side is between the two angles} Refer to (\ref{ssub:triangle_with_two__angles}) \\
+\Imeth{line}{equilateral (<swap>)} & |T.ABC=L.AB:equilateral()| & $(\overrightarrow{AB},\overrightarrow{AC})>0$ or $<0$ with swap \footnote{Triangles are defined in the direct sense of rotation, unless the "swap" option is present.}; [\ref{ssub:object_rotation}] \\
+\Imeth{line}{isosceles (an<,swap>)}&|T.ABC=L.AB:isosceles(math.pi/6)|& [\ref{ssub:method_imeth_line_isosceles}]\\
+\Imeth{line}{two\_angles (an,an)} &|T.ABC=L.AB:two_angles(an,an)|&note \footnote{The given side is between the two angles} [\ref{ssub:triangle_with_two__angles}] \\
\Imeth{line}{school ()} & 30°,60°, 90° & \\
-\Imeth{line}{sss (r,r)} & $AC=r$ $BC=r$ & \\
-\Imeth{line}{as (r,an)} & $AC =r$ $\widehat{BAC} = an$& \\
-\Imeth{line}{sa (r,an)} & $AC =r$ $\widehat{ABC} = an$& \\
-\midrule
-\textbf{Sacred triangles}&&\\
-\midrule
-\Imeth{line}{gold (<swap>)} &|T.ABC=L.AB:gold()| & right in $B$ and $AC = \varphi \times AB $ \\
-\Imeth{line}{euclide (<swap>)} &|T.ABC=L.AB:euclide()| &$AB=AC$ ; $(\overrightarrow{AB},\overrightarrow{AC}) = \pi/5$ \\
-\Imeth{line}{golden (<swap>)} &|T.ABC=L.AB:golden()| &
- $(\overrightarrow{AB},\overrightarrow{AC}) = 2\times \pi/5$ \\
-\Imeth{line}{divine ()} & & \\
-\Imeth{line}{egyptian ()} & & \\
-\Imeth{line}{cheops ()} & & \\
+\Imeth{line}{sss (r,r)} & $AC=r$ $BC=r$ & [\ref{ssub:triangle_with_three_given_sides}] \\
+\Imeth{line}{sas (r,an)} & $AC =r$ $\widehat{BAC} = an$ & [\ref{ssub:triangle_with_three_given_sides}] \\
+\Imeth{line}{ssa (r,an)} & $AC =r$ $\widehat{ABC} = an$& [\ref{ssub:triangle_with_three_given_sides}]\\
\midrule
\textbf{Squares}&&\\
\midrule
-\Imeth{line}{square ()} &|S.AB=L.AB : square () | & create a square |S.AB|.\footnote{ |_,_,z.C,z.D = get_points(S.AB)|}\\
+\Imeth{line}{square ()} &|S.AB=L.AB : square () | & create a square |S.AB|.\footnote{ |_,_,z.C,z.D = get_points(S.AB)|}; [\ref{ssub:object_rotation}] \\
\bottomrule
\end{tabular}
\egroup
\end{minipage}
+
\begin{minipage}{\textwidth}
\bgroup
\catcode`_=12
@@ -226,23 +222,33 @@ Here's the list of methods for the \tkzNameObj{line} object. The results can be
\toprule
\textbf{Methods} & \textbf{Comments} & \\
\midrule
+\textbf{Sacred triangles}&&\\
+\midrule
+\Imeth{line}{gold (<swap>)} &|T.ABC=L.AB:gold()| & right in $B$ and $AC = \varphi \times AB $; [\ref{line:met}] \\
+\Imeth{line}{euclide (<swap>)} &|T.ABC=L.AB:euclide()| &$AB=AC$ ; $(\overrightarrow{AB},\overrightarrow{AC}) = \pi/5$; [\ref{line:met}] \\
+\Imeth{line}{golden (<swap>)} &|T.ABC=L.AB:golden()| &
+ $(\overrightarrow{AB},\overrightarrow{AC}) = 2\times \pi/5$ ; [\ref{line:met}] \\
+\Imeth{line}{divine ()} & & [\ref{line:met}] \\
+\Imeth{line}{egyptian ()} & & [\ref{line:met}] \\
+\Imeth{line}{cheops ()} & & [\ref{line:met}] \\
+\midrule
\textbf{Circles} &&\\
\midrule
\Imeth{line}{circle ()} & |C.AB = L.AB : circle ()| & center pa through pb \\
-\Imeth{line}{circle\_swap ()} & |C.BA = L.AB : circle_swap ()|& center pb through pa \\
-\Imeth{line}{apollonius (r)} & |C.apo = L.AB : apollonius (2)|& Set of points tq. |MA/MB = 2| \\
+\Imeth{line}{apollonius (r)} & |C.apo = L.AB : apollonius (2)|& Set of points tq. |MA/MB = 2|; [\ref{ssub:apollonius_circle_ma_mb_k}] \\
\midrule
\textbf{Transformations} &&\\
\midrule
-\Imeth{line}{reflection ( obj )} & |new obj = L.AB : reflection (obj|&\\
-\Imeth{line}{translation ( obj )} & |new obj = L.AB : translation (obj)|&\\
-\Imeth{line}{projection ( obj )} & |z.H = L.AB : projection (z.C)| & $CH \perp (AB)$ and $H\in (AB)$\\
+\Imeth{line}{reflection ( obj )} & |new obj = L.AB : reflection (obj|& [\ref{ssub:reflection_of_object}] \\
+\Imeth{line}{translation ( obj )} & |new obj = L.AB : translation (obj)|& [\ref{ssub:example_translation}] \\
+\Imeth{line}{projection ( obj )} & |z.H = L.AB : projection (z.C)| & $CH \perp (AB)$ and $H\in (AB)$; [\ref{ssub:example_projection_of_several_points}; \ref{ssub:example_combination_of_methods}]\\
+... & & [ \ref{ssub:example_projection_of_several_points}; \ref{ssub:example_combination_of_methods}]\\
\midrule
\textbf{Miscellaneous} &&\\
\midrule
-\Imeth{line}{distance (pt)} & |d = L.Ab : distance (z.C)| & Refer to \ref{ssub:example_distance_and_projection}\\
-\Imeth{line}{in\_out (pt)} & |b = L.AB: in_out(z.C)| & b=true if $C\in (AB)$ \\
-\Imeth{line}{slope ()} & |a = L.AB : slope()| & better is L.AB.slope \\
+\Imeth{line}{distance (pt)} & |d = L.Ab : distance (z.C)| & [\ref{ssub:example_distance_and_projection}] \\
+\Imeth{line}{in\_out (pt)} & |b = L.AB: in_out(z.C)| & b=true if $C\in (AB)$ ; [\ref{ssub:in_out_for_a_line}] \\
+\Imeth{line}{slope ()} & |a = L.AB : slope()| & better is L.AB.slope; [\ref{ssub:example_class_line}]\\
\Imeth{line}{in\_out\_segment (pt)} & |b = L.AB : in_out_segment(z.C)| & b=true if $C\in [AB$] \\
\bottomrule
\end{tabular}
@@ -309,7 +315,11 @@ The angles are on either side of the given segment
\tkzDrawPolygons(A,B,C)
\tkzDrawPoints(A,B,C)
\tkzLabelPoints(A,B)
- \tkzLabelPoints[above](C)
+ \tkzLabelPoints[above](C)
+ \tkzMarkAngle[red](C,B,A)
+ \tkzMarkAngle[red](B,A,C)
+ \tkzLabelAngle[red,pos=1.3](C,B,A){$\pi/2$}
+ \tkzLabelAngle[red,pos=1.3](B,A,C){$\pi/6$}
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
@@ -321,57 +331,130 @@ The angles are on either side of the given segment
T.ABC= L.AB : two_angles (math.pi/6,math.pi/2)
z.C = T.ABC.pc
\end{tkzelements}
- \hspace*{\fill}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygons(A,B,C)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(A,B)
- \tkzLabelPoints[above](C)
- \end{tikzpicture}
- \hspace*{\fill}
+
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C)
+ \tkzMarkAngle[red](C,B,A)
+ \tkzMarkAngle[red](B,A,C)
+ \tkzLabelAngle[red,pos=1.3](C,B,A){$\pi/2$}
+ \tkzLabelAngle[red,pos=1.3](B,A,C){$\pi/6$}
+ \end{tikzpicture}
+ \end{center}
+
\end{minipage}
% subsubsection triangle_with_two__angles (end)
-\subsubsection{Method \Imeth{line}{sss}} % (fold)
+\subsubsection{Method \Imeth{line}{isosceles}} % (fold)
+\label{ssub:method_imeth_line_isosceles}
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+\begin{tkzelements}
+ scale = 2
+ z.a = point : new (1,2)
+ z.b = point : new (5,1)
+ L.ab = line : new (z.a,z.b)
+ T.abc = L.ab : isosceles (math.pi/6,indirect)
+ z.c = T.abc.pc
+ z.L = T.abc : lemoine_point ()
+ T.SY = T.abc : symmedian ()
+ z.Ka,z.Kb,z.Kc = get_points (T.SY)
+ L.Kb = T.abc : symmedian_line (1)
+ _,z.Kb = get_points(L.Kb)
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawPolygons(a,b,c Ka,Kb,Kc)
+\tkzDrawPoints(a,b,c,L,Ka,Kb,Kc)
+\tkzLabelPoints(c,L,Ka,Kb)
+\tkzLabelPoints[above](a,b,Kc)
+\tkzDrawSegments[cyan](a,Ka b,Kb c,Kc)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = 2
+ z.a = point : new (1,2)
+ z.b = point : new (5,1)
+ L.ab = line : new (z.a,z.b)
+ T.abc = L.ab : isosceles (math.pi/6,indirect)
+ z.c = T.abc.pc
+ z.L = T.abc : lemoine_point ()
+ T.SY = T.abc : symmedian ()
+ z.Ka,z.Kb,
+ z.Kc = get_points (T.SY)
+ L.Kb = T.abc : symmedian_line (1)
+ _,z.Kb = get_points(L.Kb)
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawPolygons(a,b,c Ka,Kb,Kc)
+\tkzDrawPoints(a,b,c,L,Ka,Kb,Kc)
+\tkzLabelPoints(c,L,Ka,Kb)
+\tkzLabelPoints[above](a,b,Kc)
+\tkzDrawSegments[cyan](a,Ka b,Kb c,Kc)
+\end{tikzpicture}
+\end{minipage}
+
+% subsubsection method_imeth_line_isosceles (end)
+
+\subsubsection{Methods \Imeth{line}{sss}, \Imeth{line}{sas}, \Imeth{line}{ssa}} % (fold)
\label{ssub:triangle_with_three_given_sides}
In the following example, a small difficulty arises. The given lengths are not affected by scaling, so it's necessary to use the \Igfct{math}{value (r) } function, which will modify the lengths according to the scale.
+\vspace{6pt}
\begin{minipage}{.4\textwidth}
\begin{Verbatim}
\begin{tkzelements}
- z.A = point : new ( 0 , 0 )
- z.B = point : new ( 5 , 0 )
- L.AB = line : new ( z.A , z.B )
- T.ABC = L.AB : sss (value(3),value(4))
- z.C = T.ABC.pc
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 5 , 0 )
+ L.AB = line : new ( z.A , z.B )
+ T.ABC = L.AB : sss (value(3),value(4))
+ T.ABD = L.AB : sas (value(3),math.pi/2)
+ T.ABE = L.AB : ssa (value(7),math.pi/2)
+ z.C = T.ABC.pc
+ z.D = T.ABD.pc
+ z.E = T.ABE.pc
\end{tkzelements}
+\hspace{\fill}
\begin{tikzpicture}[gridded]
- \tkzGetNodes
- \tkzDrawPolygons(A,B,C)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(A,B)
- \tkzLabelPoints[above](C)
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C A,B,D A,B,E)
+ \tkzDrawPoints(A,B,C,D,E)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C,D,E)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
\begin{minipage}{.6\textwidth}
- \begin{tkzelements}
- z.A = point : new ( 0 , 0 )
- z.B = point : new ( 5 , 0 )
- L.AB = line : new ( z.A , z.B )
- T.ABC = L.AB : sss (value(3),value(4))
- z.C = T.ABC.pc
- \end{tkzelements}
-\hspace{\fill}
- \begin{tikzpicture}[gridded]
- \tkzGetNodes
- \tkzDrawPolygons(A,B,C)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(A,B)
- \tkzLabelPoints[above](C)
- \end{tikzpicture}
+\begin{tkzelements}
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 5 , 0 )
+ L.AB = line : new ( z.A , z.B )
+ T.ABC = L.AB : sss (value(3),value(4))
+ T.ABD = L.AB : sas (value(3),math.pi/2)
+ T.ABE = L.AB : ssa (value(7),math.pi/2)
+ z.C = T.ABC.pc
+ z.D = T.ABD.pc
+ z.E = T.ABE.pc
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C A,B,D A,B,E)
+ \tkzDrawPoints(A,B,C,D,E)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C,D,E)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection triangle_with_three_given_sides (end)
@@ -413,16 +496,20 @@ In some cases, two solutions are possible.
z.C = T.ABC.pc
z.D = T.ABD.pc
\end{tkzelements}
- \hspace{\fill} \begin{tikzpicture}[gridded]
- \tkzGetNodes
- \tkzDrawPolygons(A,B,C A,B,D)
- \tkzDrawPoints(A,B,C,D)
- \tkzLabelPoints(A,B)
- \tkzLabelPoints[above](C,D)
- \tkzLabelAngle[teal](C,B,A){$\pi/6$}
- \tkzLabelSegment[below left](A,C){$7$}
- \tkzLabelSegment[below left](A,D){$7$}
- \end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C A,B,D)
+ \tkzDrawPoints(A,B,C,D)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C,D)
+ \tkzLabelAngle[teal](C,B,A){$\pi/6$}
+ \tkzLabelSegment[below left](A,C){$7$}
+ \tkzLabelSegment[below left](A,D){$7$}
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection triangle_with_side_between_side_and_angle (end)
@@ -536,12 +623,15 @@ This method exists for all objects except quadrilaterals.
z.J = L.AB : point (-0.5)
z.K = L.AB : point (2)
\end{tkzelements}
-\begin{tikzpicture}[gridded]
-\tkzGetNodes
- \tkzDrawLine(J,K)
- \tkzDrawPoints(A,B,I,J,K)
- \tkzLabelPoints(A,B,I,J,K)
- \end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawLine(J,K)
+ \tkzDrawPoints(A,B,I,J,K)
+ \tkzLabelPoints(A,B,I,J,K)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection method_point (end)
@@ -576,12 +666,15 @@ If the coefficient is missing then it defaults to $1$ and in the following examp
z.D = L.AB : colinear_at (z.C,.5)
z.E = L.AB : colinear_at (z.C)
\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawSegments(A,B C,E)
- \tkzDrawPoints(A,B,C,D,E)
- \tkzLabelPoints(A,B,C,D,E)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawSegments(A,B C,E)
+ \tkzDrawPoints(A,B,C,D,E)
+ \tkzLabelPoints(A,B,C,D,E)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection method_imeth_line_colinear__at (end)
@@ -615,15 +708,17 @@ If the coefficient is missing then it defaults to $1$ and in the following examp
L.ab = line : new (z.a,z.b)
z.c = L.ab : normalize ()
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}[gridded]
-\tkzGetNodes
-\tkzDrawSegments(a,b)
-\tkzDrawCircle(a,c)
-\tkzDrawPoints(a,b,c)
-\tkzLabelPoints(a,b,c)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawSegments(a,b)
+ \tkzDrawCircle(a,c)
+ \tkzDrawPoints(a,b,c)
+ \tkzLabelPoints(a,b,c)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection normalize (end)
@@ -654,16 +749,19 @@ If the coefficient is missing then it defaults to $1$ and in the following examp
L.AB = line : new ( z.A , z.B )
z.G = L.AB : barycenter (1,2)
\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawLine(A,B)
- \tkzDrawPoints(A,B,G)
- \tkzLabelPoints(A,B,G)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLine(A,B)
+ \tkzDrawPoints(A,B,G)
+ \tkzLabelPoints(A,B,G)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection barycenter_with_a_line (end)
-\subsubsection{method \Imeth{line}{ll\_from}} % (fold)
+\subsubsection{Method \Imeth{line}{ll\_from}} % (fold)
\label{ssub:new_line_from_a_defined_line}
\begin{minipage}{0.5\textwidth}
\begin{Verbatim}
@@ -700,20 +798,162 @@ L.CD = line : new (z.C,z.D)
_,z.E = get_points ( L.CD: ll_from (z.B))
-- or z.E = L2.pb with |L2 = L.CD: ll_from (z.B)|
\end{tkzelements}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(A,B C,D B,E)
+ \tkzDrawPoints(A,...,E)
+ \tkzLabelPoints(A,...,E)
+ \tkzMarkRightAngle(B,A,C)
+ \tkzMarkSegments(A,C A,B A,D)
+ \end{tikzpicture}
+\end{center}
+
+
+\end{minipage}
+ % \caption{New line from defined line}
+% subsubsection new_line_from_a_defined_line (end)
+
+\subsubsection{Method \Imeth{line}{ortho\_from}} % (fold)
+\label{ssub:newline_ortho_from}
+\begin{minipage}{0.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point : new (1,1)
+ z.B = point : new (3,2)
+ L.AB = line : new (z.A,z.B)
+ z.C = point : new (1,3)
+ L.CD = L.AB : ortho_from(z.C)
+ z.D = L.CD.pb
+\end{tkzelements}
\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawLines(A,B C,D B,E)
-\tkzDrawPoints(A,...,E)
-\tkzLabelPoints(A,...,E)
-\tkzMarkRightAngle(B,A,C)
-\tkzMarkSegments(A,C A,B A,D)
+ \tkzGetNodes
+ \tkzDrawLines(A,B C,D)
+ \tkzDrawPoints(A,...,D)
+ \tkzLabelPoints(A,...,D)
\end{tikzpicture}
-\hspace*{\fill}
+\end{Verbatim}
\end{minipage}
- % \caption{New line from defined line}
+\begin{minipage}{0.5\textwidth}
+\begin{tkzelements}
+ z.A = point : new (1,1)
+ z.B = point : new (3,2)
+ L.AB = line : new (z.A,z.B)
+ z.C = point : new (1,3)
+ L.CD = L.AB : ortho_from(z.C)
+ z.D = L.CD.pb
+\end{tkzelements}
+
+\begin{center}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(A,B C,D)
+ \tkzDrawPoints(A,...,D)
+ \tkzLabelPoints(A,...,D)
+\end{tikzpicture}
+\end{center}
+
+
+\end{minipage}
+
% subsubsection new_line_from_a_defined_line (end)
+\subsubsection{Method \Imeth{line}{mediator}} % (fold)
+\label{ssub:method_imeth_line_mediator}
+
+In Mathworld, the mediator is the plane through the midpoint of a line segment and perpendicular to that segment, also called a mediating plane. The term "mediator" was introduced by J. Neuberg (Altshiller-Court 1979, p. 298). Here, I have adopted the French term and the mediator or
+the perpendicular bisector of a line segment, is a line segment perpendicular to the segment and passing through the midpoint of this segment.
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point: new(0,0)
+ z.B = point: new(5,0)
+ L.AB = line: new (z.A,z.B)
+ L.med = L.AB : mediator ()
+ z.M = L.AB.mid
+ z.x,z.y= get_points(L.med)
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawLine(A,B)
+\tkzDrawSegments(x,y)
+\tkzDrawPoints(A,B,M)
+\tkzLabelPoints(A,B)
+\tkzLabelPoints[below left](x,y,M)
+\tkzMarkSegments(A,M M,B)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ z.A = point: new(0,0)
+ z.B = point: new(5,0)
+ L.AB = line: new (z.A,z.B)
+ L.med = L.AB : mediator ()
+ z.M = L.AB.mid
+ z.x,z.y= get_points(L.med)
+\end{tkzelements}
+\begin{center}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawLine(A,B)
+\tkzDrawSegments(x,y)
+\tkzDrawPoints(A,B,M)
+\tkzLabelPoints(A,B)
+\tkzLabelPoints[below left](x,y,M)
+\tkzMarkSegments(A,M M,B)
+\end{tikzpicture}
+\end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_line_mediator (end)
+
+\subsubsection{Method \Imeth{line}{equilateral}} % (fold)
+\label{ssub:method_imeth_line_equilateral}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point: new(0,0)
+ z.B = point: new(5,0)
+ L.AB = line: new (z.A,z.B)
+ T.ABC = L.AB : equilateral ()
+ z.C = T.ABC.pc
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawLine(A,B)
+\tkzDrawPolygon(A,B,C)
+\tkzMarkSegments(A,B B,C C,A)
+\tkzDrawPoints(A,B,C)
+\tkzMarkAngles(B,A,C C,B,A A,C,B)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ z.A = point: new(0,0)
+ z.B = point: new(5,0)
+ L.AB = line: new (z.A,z.B)
+ T.ABC = L.AB : equilateral ()
+ z.C = T.ABC.pc
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLine(A,B)
+ \tkzDrawPolygon(A,B,C)
+ \tkzMarkSegments(A,B B,C C,A)
+ \tkzDrawPoints(A,B,C)
+ \tkzMarkAngles(B,A,C C,B,A A,C,B)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_line_equilateral (end)
\subsubsection{Method \Imeth{line}{projection}} % (fold)
\label{ssub:example_projection_of_several_points}
@@ -746,14 +986,16 @@ z.d = point: new (5, 2)
L.ab = line: new (z.a,z.b)
z.cp,z.dp = L.ab : projection(z.c,z.d)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawLines(a,b c,c' d,d')
-\tkzDrawPoints(a,...,d,c',d')
-\tkzLabelPoints(a,...,d,c',d')
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(a,b c,c' d,d')
+ \tkzDrawPoints(a,...,d,c',d')
+ \tkzLabelPoints(a,...,d,c',d')
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% \caption{Projection of several points}
@@ -809,23 +1051,26 @@ L.ab = C.OA : tangent_at (z.A)
z.a,z.b = L.ab.pa,L.ab.pb
-- or z.a,z.b = get_points (L.ab)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon(A,B,C)
-\tkzDrawCircle(O,A)
-\tkzDrawSegments[purple](O,A O,B O,H)
-\tkzDrawArc[red](O,A)(B)
-\tkzDrawArc[blue](O,B)(A)
-\tkzDrawLine[add = 2 and 1](A,a)
-\tkzFillAngles[teal!30,opacity=.4,,size=.5](A,C,B b,A,B A,O,H)
-\tkzMarkAngles[mark=|,size=.5](A,C,B b,A,B A,O,H H,O,B)
-\tkzDrawPoints(A,B,C,H,O)
-\tkzLabelPoints(B,H)
-\tkzLabelPoints[above](O,C)
-\tkzLabelPoints[left](A)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawCircle(O,A)
+ \tkzDrawSegments[purple](O,A O,B O,H)
+ \tkzDrawArc[red](O,A)(B)
+ \tkzDrawArc[blue](O,B)(A)
+ \tkzDrawLine[add = 2 and 1](A,a)
+ \tkzFillAngles[teal!30,opacity=.4,,size=.5](A,C,B b,A,B A,O,H)
+ \tkzMarkAngles[mark=|,size=.5](A,C,B b,A,B A,O,H H,O,B)
+ \tkzDrawPoints(A,B,C,H,O)
+ \tkzLabelPoints(B,H)
+ \tkzLabelPoints[above](O,C)
+ \tkzLabelPoints[left](A)
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
% subsubsection example_combination_of_methods (end)
@@ -860,63 +1105,21 @@ z.a,z.b = L.ab.pa,L.ab.pb
L.AB = line : new (z.A,z.B)
z.E,z.F = L.AB : translation (z.C,z.D)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPoints(A,...,F)
-\tkzLabelPoints(A,...,F)
-\tkzDrawSegments[->,red,> =latex](C,E D,F A,B) )
-\end{tikzpicture}
-\hspace*{\fill}
-\end{minipage}
-% subsubsection example_translation (end)
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(A,...,F)
+ \tkzLabelPoints(A,...,F)
+ \tkzDrawSegments[->,red,> =latex](C,E D,F A,B) )
+ \end{tikzpicture}
+\end{center}
-\subsubsection{Method \Imeth{line}{distance}} % (fold)
-\label{ssub:example_distance_and_projection}
-\begin{minipage}{0.5\textwidth}
-\begin{Verbatim}
-\begin{tkzelements}
- z.A = point : new (0 , 0)
- z.B = point : new (5 , -2)
- z.C = point : new (3 , 3)
- L.AB = line : new (z.A,z.B)
- d = L.AB : distance (z.C)
- z.H = L.AB : projection (z.C)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawLines(A,B C,H)
- \tkzDrawPoints(A,B,C,H)
- \tkzLabelPoints(A,B,C,H)
- \tkzLabelSegment[above left,
- draw](C,H){$CH = \tkzUseLua{d}$}
-\end{tikzpicture}
-\end{Verbatim}
-\end{minipage}
-\begin{minipage}{0.5\textwidth}
-\begin{tkzelements}
- z.A = point : new (0 , 0)
- z.B = point : new (5 , -2)
- z.C = point : new (3 , 3)
- L.AB = line : new (z.A,z.B)
- d = L.AB : distance (z.C)
- z.H = L.AB : projection (z.C)
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawLines(A,B C,H)
-\tkzDrawPoints(A,B,C,H)
-\tkzLabelPoints(A,B,C,H)
-\tkzLabelSegment[above left,draw](C,H){$CH = \tkzUseLua{d}$}
-\end{tikzpicture}
-\hspace*{\fill}
\end{minipage}
-% \caption{Method distance with line object}
-% subsubsection example_distance_and_projection (end)
+% subsubsection example_translation (end)
+
\subsubsection{Method \Imeth{line}{reflection} of an object} % (fold)
\label{ssub:reflection_of_object}
@@ -955,19 +1158,72 @@ z.a,z.b = L.ab.pa,L.ab.pb
T.new = L.AB : reflection (T.EFG)
z.Ep,z.Fp,z.Gp = get_points(T.new)
\end{tkzelements}
-\hspace{\fill}\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawLine(A,B)
- \tkzDrawPolygon(E,F,G)
- \tkzDrawPolygon[new](E',F',G')
- \tkzDrawSegment[red,dashed](E,E')
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLine(A,B)
+ \tkzDrawPolygon(E,F,G)
+ \tkzDrawPolygon[new](E',F',G')
+ \tkzDrawSegment[red,dashed](E,E')
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection reflection_of_object (end)
+\subsubsection{Method \Imeth{line}{distance}} % (fold)
+\label{ssub:example_distance_and_projection}
+
+\begin{minipage}{0.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point : new (0 , 0)
+ z.B = point : new (5 , -2)
+ z.C = point : new (3 , 3)
+ L.AB = line : new (z.A,z.B)
+ d = L.AB : distance (z.C)
+ z.H = L.AB : projection (z.C)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(A,B C,H)
+ \tkzDrawPoints(A,B,C,H)
+ \tkzLabelPoints(A,B,C,H)
+ \tkzLabelSegment[above left,
+ draw](C,H){$CH = \tkzUseLua{d}$}
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{0.5\textwidth}
+\begin{tkzelements}
+ z.A = point : new (0 , 0)
+ z.B = point : new (5 , -2)
+ z.C = point : new (3 , 3)
+ L.AB = line : new (z.A,z.B)
+ d = L.AB : distance (z.C)
+ z.H = L.AB : projection (z.C)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(A,B C,H)
+ \tkzDrawPoints(A,B,C,H)
+ \tkzLabelPoints(A,B,C,H)
+ \tkzLabelSegment[above left,draw](C,H){$CH = \tkzUseLua{d}$}
+ \end{tikzpicture}
+\end{center}
-\subsection{Method \Imeth{line}{apollonius} Apollonius circle MA/MB = k} % (fold)
-\label{sub:apollonius_circle_ma_mb_k}
+
+\end{minipage}
+
+% \caption{Method distance with line object}
+% subsubsection example_distance_and_projection (end)
+
+
+\subsubsection{Method \Imeth{line}{apollonius} (Apollonius circle MA/MB = k)} % (fold)
+\label{ssub:apollonius_circle_ma_mb_k}
\begin{Verbatim}
\begin{tkzelements}
@@ -984,14 +1240,15 @@ z.a,z.b = L.ab.pa,L.ab.pb
\tkzFillCircle[blue!20,opacity=.2](O,C)
\tkzDrawCircle[blue!50!black](O,C)
\tkzDrawPoints(A,B,O,C,D,P)
- \tkzLabelPoints[below right](A,B,O,C,D,P)
\tkzDrawSegments[orange](P,A P,B P,D B,D P,C)
\tkzDrawSegments[red](A,C)
\tkzDrawPoints(A,B)
\tkzLabelCircle[draw,fill=green!10,%
text width=3cm,text centered,left=24pt](O,D)(60)%
{$CA/CB=2$\\$PA/PB=2$\\$DA/DB=2$}
- \tkzMarkRightAngle[opacity=.3,fill=lightgray](O,P,C)
+ \tkzLabelPoints[below right](A,B,O,C,D)
+ \tkzLabelPoints[above](P)
+ \tkzMarkRightAngle[opacity=.3,fill=lightgray](D,P,C)
\tkzMarkAngles[mark=||](A,P,D D,P,B)
\end{tikzpicture}
\end{Verbatim}
@@ -1006,24 +1263,28 @@ z.D = C.apo : antipode (z.C)
z.P = C.apo : point (0.30)
\end{tkzelements}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzFillCircle[blue!20,opacity=.2](O,C)
-\tkzDrawCircle[blue!50!black](O,C)
-\tkzDrawPoints(A,B,O,C,D,P)
-\tkzLabelPoints[below right](A,B,O,C,D,P)
-\tkzDrawSegments[orange](P,A P,B P,D B,D P,C)
-\tkzDrawSegments[red](A,C)
-\tkzDrawPoints(A,B)
-\tkzLabelCircle[draw,fill=green!10,%
- text width=3cm,text centered,left=24pt](O,D)(60)%
- {$CA/CB=2$\\$PA/PB=2$\\$DA/DB=2$}
-\tkzMarkRightAngle[opacity=.3,fill=lightgray](O,P,C)
-\tkzMarkAngles[mark=||](A,P,D D,P,B)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzFillCircle[blue!20,opacity=.2](O,C)
+ \tkzDrawCircle[blue!50!black](O,C)
+ \tkzDrawPoints(A,B,O,C,D,P)
+ \tkzDrawSegments[orange](P,A P,B P,D B,D P,C)
+ \tkzDrawSegments[red](A,C)
+ \tkzDrawPoints(A,B)
+ \tkzLabelCircle[draw,fill=green!10,%
+ text width=3cm,text centered,left=24pt](O,D)(60)%
+ {$CA/CB=2$\\$PA/PB=2$\\$DA/DB=2$}
+ \tkzLabelPoints[below right](A,B,O,C,D)
+ \tkzLabelPoints[above](P)
+ \tkzMarkRightAngle[opacity=.3,fill=lightgray](D,P,C)
+ \tkzMarkAngles[mark=||](A,P,D D,P,B)
+ \end{tikzpicture}
+\end{center}
+
Remark: |\tkzUseLua{length(z.P,z.A)/length(z.P,z.B)}| = \tkzUseLua{length(z.P,z.A)/length(z.P,z.B)}
-% subsection apollonius_circle_ma_mb_k (end)
+% subsubsection apollonius_circle_ma_mb_k (end)
% subsection methods_from_class_line (end)
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-matrices.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-matrices.tex
index 04b874532d8..d533511fbe2 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-matrices.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-matrices.tex
@@ -15,7 +15,7 @@ This \code{matrix} class has been created to avoid the need for an external libr
\begin{itemize}
-\item The first method is: (Refer to \ref{ssub:method_new})
+\item The first method is: [\ref{ssub:method_new}]
\begin{minipage}{.5\textwidth}
\begin{mybox}
@@ -33,13 +33,13 @@ This \code{matrix} class has been created to avoid the need for an external libr
\end{minipage}
-\item It is also possible to obtain a square matrix with: (Refer to \ref{ssub:method_square})
+\item It is also possible to obtain a square matrix with: [\ref{ssub:method_square}]
\begin{mybox}
|M = matrix : square (2,a,b,c,d)|
\end{mybox}
-\item In the case of a column vector: (Refer to \ref{ssub:method_vector})
+\item In the case of a column vector: [\ref{ssub:method_vector}]
\begin{minipage}{.5\textwidth}
\begin{mybox}
@@ -52,7 +52,7 @@ This \code{matrix} class has been created to avoid the need for an external libr
\end{tkzelements}
\end{minipage}
-\item Homogeneous transformation matrix (Refer to \ref{ssub:method_htm})
+\item Homogeneous transformation matrix [\ref{ssub:method_htm}]
The objective is to generate a matrix with homogeneous coordinates capable of transforming a coordinate system through rotation, translation, and scaling. To achieve this, it is necessary to define both the rotation angle, the coordinates of the new origin ans the scaling factors.
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-misc.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-misc.tex
index c8c5cccd8f3..e80a292858c 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-misc.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-misc.tex
@@ -17,11 +17,11 @@
%tkzround( num, idp ) & \\
% Cramer33(a1,a2,a3,b1,b2,b3,c1,c2,c3) & \\
% Cramer22(a1,a2,b1,b2) & \\
-\Igfct{math}{length (a,b) } & point.abs(a-b) Refer to (\ref{ssub:report_de_distance}) \\
+\Igfct{math}{length (a,b) } & point.abs(a-b) [\ref{sub:report_de_distance}] \\
\Igfct{math}{islinear (z1,z2,z3) } & Are the points aligned? (z2-z1) $\parallel$ (z3-z1) ? \\
\Igfct{math}{isortho (z1,z2,z3)} & (z2-z1) $\perp$ (z3-z1) ? boolean\\
-\Igfct{math}{get\_angle (z1,z2,z3)} & the vertex is z1 Refer to (\ref{sub:get_angle}) \\
-\Igfct{math}{bisector (z1,z2,z3)} & L.Aa = bisector (z.A,z.B,z.C) from A (\ref{sub:get_angle})\\
+\Igfct{math}{get\_angle (z1,z2,z3)} & the vertex is z1 [\ref{sub:get_angle}] \\
+\Igfct{math}{bisector (z1,z2,z3)} & L.Aa = bisector (z.A,z.B,z.C) from A [\ref{sub:get_angle}] \\
\Igfct{math}{bisector\_ext (z1,z2,z3)} & L.Aa = bisector_ext (z.A,z.B,z.C) from A \\
\Igfct{math}{altitude (z1,z2,z3)} & altitude from z1 \\
\Igfct{package}{set\_lua\_to\_tex (list)} & set\_lua\_to\_tex('a','n') defines |\a| and |\n| \\
@@ -31,7 +31,7 @@
\Igfct{math}{real (v) } & apply | value /scale | \\
\Igfct{math}{angle\_normalize (an) } & to get a value between 0 and $2\pi$ \\
\Igfct{misc}{barycenter (\{z1,n1\},\{z2,n2\}, ...)} & barycenter of list of points \\
-\Igfct{math}{solve\_quadratic (a,b,c) } & gives the solution of $ax^2+bx+c =0$ a,b,c real or complex (Refer to \ref{ssub:function_solve__quadratic})\\
+\Igfct{math}{solve\_quadratic (a,b,c) } & gives the solution of $ax^2+bx+c =0$ a,b,c real or complex [\ref{ssub:function_solve__quadratic}] \\
\bottomrule
\end{tabular}
\egroup
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-point.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-point.tex
index e404dc763bb..0da8f16b78b 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-point.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-point.tex
@@ -92,7 +92,6 @@ The creation of a point is done using the following method, but there are other
This is the creation of a fixed point with coordinates 1 and 2 and which is named $A$. The notation |z.A| indicates that the coordinates will be stored in a table denoted as |z| (reference to the notation of the affixes of the complex numbers) that $A$ is the name of the point and the key allowing access to the values.
-
\begin{center}
\bgroup
\small
@@ -101,21 +100,18 @@ This is the creation of a fixed point with coordinates 1 and 2 and which is name
\begin{tabular}{lll}
\toprule
\textbf{Attributes} & \textbf{Application}& \textbf{Example}\\
- \Iattr{point}{re} & |z.A.re = 1| & Refer to (\ref{ssub:methods}) \\
- \Iattr{point}{im} & |z.A.im = 2| & Refer to (\ref{ssub:methods}) \\
+ \Iattr{point}{re} & |z.A.re = 1| & [\ref{ssub:methods}] \\
+ \Iattr{point}{im} & |z.A.im = 2| & [\ref{ssub:methods}] \\
\Iattr{point}{type} & |z.A.type = 'point'| & \\
- \Iattr{point}{argument} & |z.A.argument $\approx$ 0.78539816339745| & Refer to (\ref{ssub:example_point_attributes})\\
- \Iattr{point}{modulus} & |z.A.modulus| $\approx$ |2.2360...| =$\sqrt{5}$ & Refer to (\ref{ssub:example_point_attributes})\\
+ \Iattr{point}{argument} & |z.A.argument $\approx$ 0.78539816339745| & [\ref{ssub:example_point_attributes}] \\
+ \Iattr{point}{modulus} & |z.A.modulus| $\approx$ |2.2360...| =$\sqrt{5}$ & [\ref{ssub:example_point_attributes}] \\
\bottomrule
\end{tabular}
\egroup
\end{center}
-
-
-
\newpage
-\subsubsection{Example:point attributes} % (fold)
+\subsubsection{Example: point attributes} % (fold)
\label{ssub:example_point_attributes}
\begin{tkzelements}
@@ -189,7 +185,7 @@ Attributes of \texttt{z.M}
\end{center}
\MakeShortVerb{\|}
- \hspace*{\fill}
+
% \caption{Class Point}
% subsubsection example_point_attributes (end)
% subsection attributes_of_a_point (end)
@@ -225,19 +221,20 @@ Attributes of \texttt{z.M}
z.O = point : new ( 0 , 0 )
z.I = point : new ( 1 , 0 )
\end{tkzelements}
- \hspace{\fill}\begin{tikzpicture}
- \tkzGetNodes
- \tkzInit[xmin=-4,ymin=-4,xmax=4,ymax=4]
- \tkzDrawCircle[dashed,red](O,A)
- \tkzPointShowCoord(A)
- \tkzDrawPoint(A)
- \tkzLabelPoint[above right](A){\normalsize $a+ib$}
- \tkzDrawX\tkzDrawY
- \tkzDrawSegment(O,A)
- \tkzLabelSegment[above,anchor=south,sloped](O,A){ OA = modulus of $z_A$}
- \tkzLabelAngle[anchor=west,pos=.5](I,O,A){$\theta$ = argument of $z_A$}
- \end{tikzpicture}
- \hspace{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzInit[xmin=-4,ymin=-4,xmax=4,ymax=4]
+ \tkzDrawCircle[dashed,red](O,A)
+ \tkzPointShowCoord(A)
+ \tkzDrawPoint(A)
+ \tkzLabelPoint[above right](A){\normalsize $a+ib$}
+ \tkzDrawX\tkzDrawY
+ \tkzDrawSegment(O,A)
+ \tkzLabelSegment[above,anchor=south,sloped](O,A){ OA = modulus of $z_A$}
+ \tkzLabelAngle[anchor=west,pos=.5](I,O,A){$\theta$ = argument of $z_A$}
+ \end{tikzpicture}
+\end{center}
\end{minipage}
@@ -257,37 +254,37 @@ The methods described in the following table are standard and can be found in mo
\toprule
\textbf{Functions} & \textbf{Application}& \\
\midrule
-\Igfct{point}{new(r,r)} & |z.A = point : new(1,2)| & Refer to (\ref{ssub:method_normalize}) \\
-\Igfct{point}{polar (d,an)} & |z.A = point : polar(1,math.pi/3)| & Refer to (\ref{sub:archimedes} )\\
+\Igfct{point}{new(r,r)} & |z.A = point : new(1,2)| & [\ref{ssub:method_normalize}] \\
+\Igfct{point}{polar (d,an)} & |z.A = point : polar(1,math.pi/3)| & [\ref{sub:archimedes}] \\
\Igfct{point}{polar\_deg (d,an)} & an in deg & polar coordinates an deg \\
\midrule
\textbf{Methods} & \textbf{Application}& \\
\midrule
\textbf{Points} &&\\
\midrule
-\Imeth{point}{north(r)} & |r| distance to the point (1 if empty) & Refer to (\ref{sub:power_v2}) ; \ref{ssub:methods}) \\
+\Imeth{point}{north(r)} & |r| distance to the point (1 if empty) & [\ref{par:power_v2} ; \ref{ssub:methods}] \\
\Imeth{point}{south(r)} & & \\
\Imeth{point}{east(r)} & & \\
\Imeth{point}{west(r)} & & \\
-\Imeth{point}{normalize()} & |z.b = z.a: normalize ()| & Refer to (\ref{ssub:method_normalize}) \\
-\Imeth{point}{get\_points (obj)} & retrieves points from the object & \\
-\Imeth{point}{orthogonal (d)} & |z.B=z.A:orthogonal(d)| & $\overrightarrow{OB}\perp \overrightarrow{OA}$ and $OB=d$\\
-\Imeth{point}{at ()} & |z.X = z.B : at (z.A)| & $\overrightarrow{OB}= \overrightarrow{AX}$ and $OB=d$\\
+\Imeth{point}{normalize()} & |z.b = z.a: normalize ()| & [\ref{ssub:method_normalize}] \\
+\Imeth{point}{get\_points (obj)} & retrieves points from the object & [\ref{ssub:object_rotation}; \ref{ssub:apollonius_circle_ma_mb_k} ] \\
+\Imeth{point}{orthogonal (d)} & |z.B=z.A:orthogonal(d)| & $\overrightarrow{OB}\perp \overrightarrow{OA}$ and $OB=d$. [\ref{ssub:orthogonal_method}]\\
+\Imeth{point}{at ()} & |z.X = z.B : at (z.A)| & $\overrightarrow{OB}= \overrightarrow{AX}$ and $OB=d$. [\ref{ssub:_imeth_point_at_method}] \\
\midrule
\textbf{Transformations} &&\\
\midrule
- \Imeth{point}{symmetry(obj)} & obj : point, line, etc. & Refer to (\ref{ssub:object_symmetry}) \\
- \Imeth{point}{rotation(an , obj)} & point, line, etc. & Refer to (\ref{ssub:object_rotation})\\
- \Imeth{point}{homothety(r,obj)} & |z.c = z.a : homothety (2,z.b)| & Refer to (\ref{sub:homothety}) \\
+ \Imeth{point}{symmetry(obj)} & obj : point, line, etc. & [\ref{ssub:object_symmetry}] \\
+ \Imeth{point}{rotation(an , obj)} & point, line, etc. & [\ref{ssub:object_rotation}] \\
+ \Imeth{point}{homothety(r,obj)} & |z.c = z.a : homothety (2,z.b)| & [\ref{sub:homothety}] \\
\midrule
\textbf{Misc.} &&\\
\midrule
- \Imeth{point}{print()} & displays the affix of the point & Refer to (\ref{ssub:object_symmetry}) \\
+ \Imeth{point}{print()} & displays the affix of the point & [\ref{ssub:object_symmetry} ]\\
\bottomrule %
\end{tabular}
\egroup
-\subsubsection{Example: method \Imeth{point}{north (d)} } % (fold)
+\subsubsection{Method \Imeth{point}{north (d)} } % (fold)
\label{ssub:example_method_imeth_point_north_d}
This function defines a point located on a vertical line passing through the given point. This function is useful if you want to report a certain distance (Refer to the following example).
@@ -320,71 +317,21 @@ If |d| is absent then it is considered equal to 1.
z.C = z.O : west ()
z.D = z.O : south ()
\end{tkzelements}
-\hspace{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygon(A,B,C,D)
- \tkzDrawPoints(A,B,C,D,O,A')
- \tkzLabelPoints(A,B,C,D,O,A')
-\end{tikzpicture}
-\end{minipage}
-% subsubsection example_method_imeth_point_north_d (end)
-
-\subsubsection{Length transfer} % (fold)
-\label{ssub:report_de_distance}
-
-Use of |north and east| functions linked to points, to transfer lengths, Refer to (\ref{sub:length_of_a_segment})
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C,D)
+ \tkzDrawPoints(A,B,C,D,O,A')
+ \tkzLabelPoints(A,B,C,D,O,A')
+ \end{tikzpicture}
+\end{center}
-\begin{minipage}{.4\textwidth}
-\begin{Verbatim}
-\begin{tkzelements}
- z.A = point : new ( 0 , 0 )
- z.B = point : new ( 3 , 0 )
- L.AB = line : new ( z.A , z.B )
- T.ABC = L.AB : sublime ()
- z.C = T.ABC.pc
- z.D = z.B: north (length(z.B,z.C))
- z.E = z.B: east (L.AB.length)
- z.M = L.AB.mid
- z.F = z.E : north (length(z.C,z.M))
-\end{tkzelements}
-\begin{tikzpicture}[gridded]
- \tkzGetNodes
- \tkzDrawPolygons(A,B,C)
- \tkzDrawSegments[gray,dashed](B,D B,E E,F C,M)
- \tkzDrawPoints(A,...,F)
- \tkzLabelPoints(A,B,E,M)
- \tkzLabelPoints[above right](C,D,F)
-\end{tikzpicture}
-\end{Verbatim}
\end{minipage}
-\begin{minipage}{.6\textwidth}
-\begin{tkzelements}
- z.A = point : new ( 0 , 0 )
- z.B = point : new ( 3 , 0 )
- L.AB = line : new ( z.A , z.B )
- T.ABC = L.AB : sublime ()
- z.C = T.ABC.pc
- z.D = z.B: north (length(z.B,z.C))
- z.E = z.B: east (L.AB.length)
- z.M = L.AB.mid
- z.F = z.E : north (length(z.C,z.M))
-\end{tkzelements}
-\hspace{\fill}
-\begin{tikzpicture}[gridded]
- \tkzGetNodes
- \tkzDrawPolygons(A,B,C)
- \tkzDrawSegments[gray,dashed](B,D B,E E,F C,M)
- \tkzDrawPoints(A,...,F)
- \tkzLabelPoints(A,B,E,M)
- \tkzLabelPoints[above right](C,D,F)
-\end{tikzpicture}
-\end{minipage}
-% subsubsection report_de_distance (end)
+% subsubsection example_method_imeth_point_north_d (end)
-\subsubsection{Example: method \Imeth{point}{polar} } % (fold)
+\subsubsection{Method \Imeth{point}{polar} } % (fold)
\label{ssub:example_polar_method}
This involves defining a point using its modulus and argument.
@@ -402,7 +349,8 @@ This involves defining a point using its modulus and argument.
\tkzDrawSegments[new](O,A)
\tkzDrawSegments[purple](O,F)
\tkzDrawPoints(A,O,F)
- \tkzLabelPoints[below right=6pt](A,O,F)
+ \tkzLabelPoints[below right=6pt](A,O)
+ \tkzLabelPoints[above](F)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
@@ -413,16 +361,20 @@ This involves defining a point using its modulus and argument.
z.A = point: new (3, 0)
z.F = point: polar (3, math.pi/3)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle(O,A)
-\tkzDrawSegments[new](O,A)
-\tkzDrawSegments[purple](O,F)
-\tkzDrawPoints(A,O,F)
-\tkzLabelPoints(A,O,F)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(O,A)
+ \tkzDrawSegments[new](O,A)
+ \tkzDrawSegments[purple](O,F)
+ \tkzDrawPoints(A,O,F)
+ \tkzLabelPoints[below right=6pt](A,O)
+ \tkzLabelPoints[above](F)
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
% subsubsection example_polar_method (end)
@@ -431,7 +383,26 @@ This involves defining a point using its modulus and argument.
The result is a point located between the origin and the initial point at a distance of $1$ from the origin.
-\begin{minipage}{.4\textwidth}
+\begin{tkzelements}
+scale = 1.5
+z.O = point : new (0,0)
+z.A = point : new (2,1)
+z.B = z.A : normalize ()
+z.I = point : new (1,0)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawSegment(O,A)
+ \tkzDrawCircle(O,B)
+ \tkzDrawPoints(O,A,B,I)
+ \tkzLabelPoints(O,A)
+ \tkzLabelPoints[above](B)
+ \tkzLabelPoint[below right](I){$1$}
+ \end{tikzpicture}
+\end{center}
+
\begin{Verbatim}
\begin{tkzelements}
scale = 1.5
@@ -449,29 +420,11 @@ The result is a point located between the origin and the initial point at a dist
\tkzLabelPoint[below right](I){$1$}
\end{tikzpicture}
\end{Verbatim}
-\end{minipage}
-\begin{minipage}{.6\textwidth}
-\begin{tkzelements}
-scale = 1.5
-z.O = point : new (0,0)
-z.A = point : new (1,2)
-z.B = z.A : normalize ()
-z.I = point : new (1,0)
-\end{tkzelements}
- \hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawSegment(O,A)
-\tkzDrawCircle(O,B)
-\tkzDrawPoints(O,A,B,I)
-\tkzLabelPoints(O,A,B)
-\tkzLabelPoint[below right](I){$1$}
-\end{tikzpicture}
- \hspace*{\fill}
-\end{minipage}
+
+
% subsubsection method_normalize (end)
-\subsubsection{\Imeth{point}{Orthogonal (d)} method} % (fold)
+\subsubsection{Method \Imeth{point}{orthogonal (d)}} % (fold)
\label{ssub:orthogonal_method}
Let $O$ be the origin of the plane. The "orthogonal (d)" method is used to obtain a point $B$ from a point $A$ such that $\overrightarrow{OB}\perp \overrightarrow{OA}$ with $OB=OA$ if $d$ is empty, otherwise $OB = d$.
@@ -499,16 +452,19 @@ Let $O$ be the origin of the plane. The "orthogonal (d)" method is used to obtai
z.O = point : new ( 0,0 )
z.C = z.A : orthogonal ()
\end{tkzelements}
-\begin{tikzpicture}[gridded]
- \tkzGetNodes
- \tkzDrawSegments(O,A O,C)
- \tkzDrawPoints(O,A,B,C)
- \tkzLabelPoints[below right](O,A,B,C)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawSegments(O,A O,C)
+ \tkzDrawPoints(O,A,B,C)
+ \tkzLabelPoints[below right](O,A,B,C)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection orthogonal_method (end)
-\subsubsection{\Imeth{point}{at} method} % (fold)
+\subsubsection{Method \Imeth{point}{at}} % (fold)
\label{ssub:_imeth_point_at_method}
This method is complementary to the previous one, so you may not wish to have $\overrightarrow{OB}\perp \overrightarrow{OA}$ but $\overrightarrow{AB}\perp \overrightarrow{OA}$.
@@ -521,14 +477,16 @@ This method is complementary to the previous one, so you may not wish to have $\
z.O = point : new ( 0,0 )
-- z.B = z.B : at (z.A) -- or
z.B = z.A : orthogonal (1) : at (z.A)
+ z.E = z.A : orthogonal (1)
z.C = z.A+z.B
z.D =(z.C-z.A):orthogonal(2) : at (z.C)
\end{tkzelements}
\begin{tikzpicture}[gridded]
\tkzGetNodes
- \tkzLabelPoints[below right](O,A,B,C,D)
- \tkzDrawSegments(O,A A,B A,C C,D)
- \tkzDrawPoints(O,A,B,C,D)
+ \tkzLabelPoints[below right](O,A,C)
+ \tkzLabelPoints[above](B,D,E)
+ \tkzDrawSegments(O,A A,B A,C C,D O,E)
+ \tkzDrawPoints(O,A,B,C,D,E)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
@@ -539,20 +497,24 @@ z.B = z.A : orthogonal (1)
z.O = point : new ( 0,0 )
-- z.B = z.B : at (z.A) -- or
z.B = z.A : orthogonal (1) : at (z.A)
+z.E = z.A : orthogonal (1)
z.C = z.A+z.B
z.D =(z.C-z.A):orthogonal(2) : at (z.C)
\end{tkzelements}
-\begin{tikzpicture}[gridded]
-\tkzGetNodes
-\tkzLabelPoints[below right](O,A,B,C,D)
-\tkzDrawSegments(O,A A,B A,C C,D)
-\tkzDrawPoints(O,A,B,C,D)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzLabelPoints[below right](O,A,C)
+ \tkzLabelPoints[above](B,D,E)
+ \tkzDrawSegments(O,A A,B A,C C,D O,E)
+ \tkzDrawPoints(O,A,B,C,D,E)
+ \end{tikzpicture}
+\end{center}
\end{minipage}
% subsubsection _imeth_point_at_method (end)
-\subsubsection{Example: \Imeth{point}{rotation of points}} % (fold)
+\subsubsection{Method \Imeth{point}{rotation} first example} % (fold)
\label{ssub:example_rotation_of_points}
The arguments are the angle of rotation in radians, and here a list of points.
@@ -565,26 +527,27 @@ The arguments are the angle of rotation in radians, and here a list of points.
z.o = point: new(6, -2)
z.ap,z.bp = z.o : rotation (math.pi/2,z.a,z.b)
\end{tkzelements}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawLines(o,a o,a' o,b o,b')
- \tkzDrawPoints(a,a',b,b',o)
- \tkzLabelPoints(b,b',o)
- \tkzLabelPoints[below left](a,a')
- \tkzDrawArc(o,a)(a')
- \tkzDrawArc(o,b)(b')
- \end{tikzpicture}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(o,a o,a' o,b o,b')
+ \tkzDrawPoints(a,a',b,b',o)
+ \tkzLabelPoints(b,b',o)
+ \tkzLabelPoints[below left](a,a')
+ \tkzDrawArc(o,a)(a')
+ \tkzDrawArc(o,b)(b')
+ \end{tikzpicture}
\end{Verbatim}
\end{minipage}
\begin{minipage}{.4\textwidth}
\begin{tkzelements}
- scale = .5
+ scale = .5
z.a = point: new(0, -1)
z.b = point: new(4, 0)
z.o = point: new(6, -2)
z.ap,z.bp = z.o : rotation (math.pi/2,z.a,z.b)
\end{tkzelements}
-\hspace*{\fill}
+
+\begin{center}
\begin{tikzpicture}
\tkzGetNodes
\tkzDrawLines(o,a o,a' o,b o,b')
@@ -594,16 +557,16 @@ The arguments are the angle of rotation in radians, and here a list of points.
\tkzDrawArc(o,a)(a')
\tkzDrawArc(o,b)(b')
\end{tikzpicture}
-\hspace*{\fill}
+\end{center}
\end{minipage}
% subsubsection example_rotation_of_points (end)
-\subsubsection{Object \Imeth{point}{rotation}} % (fold)
+\subsubsection{Method \Imeth{point}{rotation} second example} % (fold)
\label{ssub:object_rotation}
Rotate a triangle by an angle of $\pi/6$ around $O$.
\begin{minipage}{.5\textwidth}
- \begin{Verbatim}
+\begin{Verbatim}
\begin{tkzelements}
scale = .75
z.O = point : new ( -1 , -1 )
@@ -619,13 +582,12 @@ Rotate a triangle by an angle of $\pi/6$ around $O$.
T.ApBpCp = z.O : rotation (math.pi/3,T.ABC)
z.Ap,z.Bp,z.Cp = get_points ( T.ApBpCp)
\end{tkzelements}
-
\begin{tikzpicture}
\tkzGetNodes
\tkzDrawPolygons(A,B,C A',B',C' A,B,E,F A',B',E',F')
\tkzDrawPoints (A,B,C,A',B',C',O)
- \tkzLabelPoints (A,B,C,A',B',C',O)
- \tkzDrawArc[delta=0,->](O,A)(A')
+ \tkzLabelPoints (A,B,C,A',B',C',O)
+ \tkzDrawArc[delta=0,->](O,A)(A')
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
@@ -645,61 +607,68 @@ T.ApBpCp = z.O : rotation (math.pi/3,T.ABC)
z.Ap,z.Bp,z.Cp = get_points ( T.ApBpCp)
\end{tkzelements}
-\hspace{\fill}\begin{tikzpicture}
+\begin{center}
+\begin{tikzpicture}
\tkzGetNodes
\tkzDrawPolygons(A,B,C A',B',C' A,B,E,F A',B',E',F')
\tkzDrawPoints (A,B,C,A',B',C',O)
- \tkzLabelPoints (A,B,C,A',B',C',O)
+ \tkzLabelPoints (A,B,C,A',B',C',O)
\begin{scope}
\tkzDrawArc[delta=0,->,dashed,red](O,A)(A')
\tkzDrawSegments[dashed,red](O,A O,A')
\end{scope}
-
\end{tikzpicture}
+\end{center}
\end{minipage}
% subsubsection object_rotation (end)
-\subsubsection{Object \Imeth{point}{symmetry}} % (fold)
+\subsubsection{Method \Imeth{point}{symmetry}} % (fold)
\label{ssub:object_symmetry}
+
+Example of the symmetry of an object
+
+
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
- z.a = point: new(0,-1)
- z.b = point: new(2, 0)
- L.ab = line : new (z.a,z.b)
- C.ab = circle : new (z.a,z.b)
- z.o = point: new(1,1)
- z.ap,z.bp = get_points (z.o: symmetry (C.ab))
+ z.a = point: new(0,-1)
+ z.b = point: new(2, 0)
+ L.ab = line : new (z.a,z.b)
+ C.ab = circle : new (z.a,z.b)
+ z.o = point: new(1,1)
+ z.ap,z.bp = get_points (z.o: symmetry (C.ab))
\end{tkzelements}
-
\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(a,b a',b')
-\tkzDrawLines(a,a' b,b')
-\tkzDrawLines[red](a,b a',b')
-\tkzDrawPoints(a,a',b,b',o)
-\tkzLabelPoints(a,a',b,b',o)
+ \tkzGetNodes
+ \tkzDrawCircles(a,b a',b')
+ \tkzDrawLines(a,a' b,b')
+ \tkzDrawLines[red](a,b a',b')
+ \tkzDrawPoints(a,a',b,b',o)
+ \tkzLabelPoints(a,a',b,b',o)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
\begin{minipage}{.5\textwidth}
\begin{tkzelements}
- z.a = point: new(0, -1)
- z.b = point: new(2, 0)
- L.ab = line : new (z.a,z.b)
- C.ab = circle : new (z.a,z.b)
- z.o = point: new(1, 1)
- z.ap,z.bp = get_points (z.o: symmetry (C.ab))
+ z.a = point: new(0, -1)
+ z.b = point: new(2, 0)
+ L.ab = line : new (z.a,z.b)
+ C.ab = circle : new (z.a,z.b)
+ z.o = point: new(1, 1)
+ z.ap,z.bp = get_points (z.o: symmetry (C.ab))
\end{tkzelements}
-\hspace{\fill}\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(a,b a',b')
-\tkzDrawLines(a,a' b,b')
-\tkzDrawLines[red](a,b a',b')
-\tkzDrawPoints(a,a',b,b',o)
-\tkzLabelPoints(a,a',b,b',o)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(a,b a',b')
+ \tkzDrawLines(a,a' b,b')
+ \tkzDrawLines[red](a,b a',b')
+ \tkzDrawPoints(a,a',b,b',o)
+ \tkzLabelPoints(a,a',b,b',o)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection object_symmetry (end)
% subsection methods_of_the_class_point (end)
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-regular.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-regular.tex
index 3ec9e777a64..98b6ac3610f 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-regular.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-regular.tex
@@ -94,7 +94,7 @@ z.H = RP.five.proj
\midrule
\textbf{Points} &\\
\midrule
-\Imeth{regular\_polygon}{name (string)} & Refer to\ref{ssub:pentagon} \\
+\Imeth{regular\_polygon}{name (string)} & [\ref{ssub:pentagon}] \\
\bottomrule %
\end{tabular}
\egroup
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-triangle.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-triangle.tex
index 80b711e46f6..b144ed3e012 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-triangle.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-triangle.tex
@@ -21,12 +21,13 @@ The triangle object is created using the \Imeth{triangle}{new} method, for examp
\Iattr{triangle}{pb} &T.ABC.pb \\
\Iattr{triangle}{pc} &T.ABC.pc \\
\Iattr{triangle}{type} & 'triangle' \\
-\Iattr{triangle}{circumcenter} & T.ABC.circumcenter\\
+\Iattr{triangle}{circumcenter} & T.ABC.circumcenter; [\ref{ssub:example_triangle_attributes}
+]\\
\Iattr{triangle}{centroid} &T.ABC.centroid\\
\Iattr{triangle}{incenter} &T.ABC.incenter\\
\Iattr{triangle}{orthocenter} &T.ABC.orthocenter\\
\Iattr{triangle}{eulercenter} &T.ABC.eulercenter \\
-\Iattr{triangle}{spiekercenter} &T.ABC.spiekercenter \\
+\Iattr{triangle}{spiekercenter} &T.ABC.spiekercenter; [\ref{ssub:example_apollonius_circle}] \\
\Iattr{triangle}{a}& It's the length of the side opposite the first vertex \\
\Iattr{triangle}{b}& It's the length of the side opposite the second verte\\
\Iattr{triangle}{c}& It's the length of the side opposite the third vertex \\
@@ -116,7 +117,7 @@ The triangle object is created using the \Imeth{triangle}{new} method, for examp
\begin{tkzelements}
z.A = point: new (0 , 0)
z.B = point: new (4 , 0)
- z.C = point: new (0 , 3)
+ z.C = point: new (1 , 3)
T.ABC = triangle : new (z.A,z.B,z.C)
z.O = T.ABC.circumcenter
z.I = T.ABC.incenter
@@ -129,18 +130,22 @@ The triangle object is created using the \Imeth{triangle}{new} method, for examp
beta = T.ABC.beta
gamma = T.ABC.gamma
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPoints(A,B,C,O,G,I,H)
- \tkzLabelPoints[below](A,B,O,G,I)
- \tkzLabelPoints[above right](H,C)
- \tkzDrawCircles(O,A)
- \tkzLabelSegment[sloped](A,B){\tkzUseLua{c}}
- \tkzLabelSegment[sloped,above](B,C){\tkzUseLua{a}}
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPoints(A,B,C,O,G,I,H)
+ \tkzDrawCircles(O,A)
+ \tkzLabelPoints[below](A,B,O,G,I)
+ \tkzLabelPoints[above right](H)
+ \tkzLabelPoints[above](C)
+ \tkzLabelSegment[sloped](A,B){\tkzUseLua{c}}
+ \tkzLabelSegment[sloped,above](B,C){\tkzUseLua{a}}
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
% subsubsection example_triangle_attributes (end)
@@ -155,64 +160,95 @@ The triangle object is created using the \Imeth{triangle}{new} method, for examp
\small
\begin{minipage}{\textwidth}
\captionof{table}{triangle methods.}\label{triangle:met}
-\begin{tabular}{ll}
+\begin{tabular}{lll}
\toprule
-\textbf{Methods} & \textbf{Comments} \\
+\textbf{Methods} & \textbf{Comments} & \\
\midrule
-\Imeth{triangle}{new} (a, b ,c) & |T.ABC = triangle : new (z.A,z.B,z.C)| \\
- ... & |T| or |T.name| with what you want for name, is possible.\\
+\Imeth{triangle}{new} (a, b ,c) & |T.ABC = triangle : new (z.A,z.B,z.C)|& [\ref{sub:triangle_attributes_angles}] \footnote{|T| or |T.name| with what you want for name, is possible.} \\
\midrule
- \textbf{Points} &\\
+ \textbf{Points} &&\\
\midrule
-\Imeth{triangle}{lemoine\_point ()} & |T.ABC : lemoine_point ()| intersection os the symmedians\\
-\Imeth{triangle}{symmedian\_point ()} & Lemoine point or the Grebe point \\
-\Imeth{triangle}{bevan\_point ()} & Circumcenter of the excentral triangle\\
-\Imeth{triangle}{mittenpunkt\_point ()} & Symmedian point of the excentral triangle\\
-\Imeth{triangle}{gergonne\_point ()} & Intersection of the three cevians that lead to the contact points \\
-\Imeth{triangle}{nagel\_point () } & Intersection of the three cevians that lead to the extouch points\\
-\Imeth{triangle}{feuerbach\_point () } & The point at which the incircle and euler circle are tangent. \\
-\Imeth{triangle}{spieker\_center ()} & Incenter of the medial triangle \\
-\Imeth{triangle}{barycenter (ka,kb,kc)} & |T.ABC: barycenter (2,1,1)| barycenter of |({A,2},{B,1},{C,1}) |\\
-\Imeth{triangle}{base (u,v) } & |z.D = T.ABC: base(1,1)| \tkzar ABDC is a parallelogram \\
-\Imeth{triangle}{projection (p) } & Projection of a point on the sides \\
-\Imeth{triangle}{euler\_points () } & Euler points of euler circle \\
-\Imeth{triangle}{nine\_points () } & 9 Points of the euler circle \\
-\Imeth{triangle}{parallelogram ()} & |z.D = T.ABC : parallelogram ()| \tkzar ABCD is a parallelogram\\
+\Imeth{triangle}{lemoine\_point ()} & |T.ABC : lemoine_point ()| intersection of the symmedians & [\ref{ssub:method_imeth_line_isosceles}]\\
+
+\Imeth{triangle}{symmedian\_point ()} & Lemoine point or the Grebe point& [\ref{ssub:method_imeth_triangle_symmedial}] \\
+
+\Imeth{triangle}{lemoine\_point ()} & symmedian point or the Grebe point& [\ref{ssub:method_imeth_triangle_symmedial}] \\
+
+\Imeth{triangle}{bevan\_point ()} & Circumcenter of the excentral triangle& [\ref{ssub:methods_imeth_triangle_bevan_circle_and_imeth_triangle_bevan_point}
+]\\
+
+\Imeth{triangle}{mittenpunkt\_point ()} & Symmedian point of the excentral triangle& [\ref{ssub:method_imeth_triangle_mittenpunkt}]\\
+
+\Imeth{triangle}{gergonne\_point ()} & Intersection of the three cevians that lead to the contact points& [\ref{ssub:gergonne_point}]\\
+
+\Imeth{triangle}{nagel\_point () } & Intersection of the three cevians that lead to the extouch points& [\ref{ssub:method_imeth_triangle_nagel__point}]\\
+
+\Imeth{triangle}{feuerbach\_point () } & The point at which the incircle and euler circle are tangent.& [\ref{ssub:method_imeth_triangle_feuerbach}]\\
+
+\Imeth{triangle}{spieker\_center ()} & Incenter of the medial triangle& [\ref{sub:apollonius_circle_v1_with_inversion}]\\
+
+\Imeth{triangle}{barycentric (ka,kb,kc)} & |T.ABC: barycentric (2,1,1)| barycenter of |({A,2},{B,1},{C,1}) |&Remark \footnote{The function \code{barycenter} is used to obtain the barycentre for any number of points }\\
+
+\Imeth{triangle}{base (u,v) } & |z.D = T.ABC: base(1,1)| \tkzar ABDC is a parallelogram & [\ref{ssub:method_imeth_triangle_base}] \\
+\Imeth{triangle}{trilinear (u,v,w) } & |z.D = T.ABC: trilinear(1,1,1)| \tkzar ABDC parallelogram & [\ref{ssub:method_imeth_triangle_trilinear}] \\
+
+\Imeth{triangle}{projection (p) } & Projection of a point on the sides &[\ref{sub:euler_relation}; \ref{ssub:method_imeth_triangle_projection}]\\
+
+\Imeth{triangle}{euler\_points () } & Euler points of euler circle & [\ref{ssub:method_imeth_triangle_euler__points}] \\
+
+\Imeth{triangle}{nine\_points () } & 9 Points of the euler circle & [\ref{ssub:method_imeth_triangle_nine__points}] \\
+
+\Imeth{triangle}{parallelogram ()} & |z.D = T.ABC : parallelogram ()| \tkzar ABCD parallelogram& [\ref{sub:director_circle}]\\
\midrule
- \textbf{Lines} &\\
+ \textbf{Lines} &&\\
\midrule
\Imeth{triangle}{altitude (n) } & |L.AHa = T.ABC : altitude () | n empty or 0 line from $A$
-\footnote{|z.Ha = L.AHa.pb| recovers the common point of the opposite side and altitude. The method |orthic| is usefull.}\\
-\Imeth{triangle}{bisector (n) } & |L.Bb = T.ABC : bisector (1) | n = 1 line from $B$ \footnote{|_,z.b = get_points(L.Bb)| recovers the common point of the opposite side and bisector. }\\
-\Imeth{triangle}{bisector\_ext(n) } & n=2 line from the third vertex.\\
-\Imeth{triangle}{symmedian\_line (n)} & Cevian with respect to Lemoine point. \\
+\footnote{|z.Ha = L.AHa.pb| recovers the common point of the opposite side and altitude. The method |orthic| is usefull. If you don't need to use the triangle object several times, you can obtain a bisector or a altitude with the function |altitude (z.A,z.B,z.C)| ; [ \ref{misc}]}& [\ref{ssub:method_imeth_triangle_altitude} ]\\
+
+\Imeth{triangle}{bisector (n) } & |L.Bb = T.ABC : bisector (1) | n = 1 line from $B$ \footnote{|_,z.b = get_points(L.Bb)| recovers the common point of the opposite side and bisector. If you don't need to use the triangle object several times, you can obtain a bisector with the function |bisector (z.A,z.B,z.C)| [\ref{misc}]}& [\ref{ssub:method_imeth_triangle_bisector}]\\
+
+\Imeth{triangle}{bisector\_ext(n) } & n=2 line from the third vertex.& [\ref{sub:harmonic_division_and_bisector}]\\
+
+\Imeth{triangle}{symmedian\_line (n)} & Cevian with respect to Lemoine point.& [\ref{ssub:method_imeth_triangle_symmedial} ; \ref{ssub:method_imeth_line_isosceles}]\\
+
\Imeth{triangle}{euler\_line () } & the line through $N$ ,$G$, $H$ and $O$ if the triangle is not equilateral
-\footnote{N center of nine points circle, G centroid, H orthocenter , O circum center } \\
-\Imeth{triangle}{antiparallel(pt,n)} & n=0 antiparallel through pt to $(BC)$, n=1 to $(AC)$ etc.\\
+\footnote{N center of nine points circle, G centroid, H orthocenter , O circum center } & [\ref{sub:hexagram}]\\
+
+\Imeth{triangle}{antiparallel(pt,n)} & n=0 antiparallel through pt to $(BC)$, n=1 to $(AC)$ etc.& [\ref{sub:antiparallel_through_lemoine_point}]\\
\midrule
- \textbf{Circles} &\\
+ \textbf{Circles} &&\\
\midrule
\Imeth{triangle}{euler\_circle ()} & C.|NP = T.ABC : euler_circle ()| \tkzar $N$ euler point
- \footnote{ The midpoint of each side of the triangle, the foot of each altitude, the midpoint of the line segment from each vertex of the triangle to the orthocenter.} \\
-\Imeth{triangle}{circum\_circle ()} & |C.OA = T.ABC : circum ()| Triangle's circumscribed circle \\
-\Imeth{triangle}{in\_circle ()} & Inscribed circle of the triangle\\
-\Imeth{triangle}{ex\_circle (n)} & Circle tangent to the three sides of the triangle ; n =1 swap ; n=2 2 swap \\
-\Imeth{triangle}{first\_lemoine\_circle ()} & The center is the midpoint between Lemoine point and the circumcenter.\footnote{
-Through the Lemoine point draw lines parallel to the triangle's sides. The points where the parallel lines intersect the sides of ABC
- then lie on a circle known as the first Lemoine circle. } \\
-\Imeth{triangle}{second\_lemoine\_circle ()} & Refer to example \ref{sub:antiparallel_through_lemoine_point}\\
-\Imeth{triangle}{spieker\_circle ()} & The incircle of the medial triangle\\
-\Imeth{triangle}{cevian\_circle ()} & Circumscribed circle of a Cevian triangle Refer to (\ref{ssub:method_imeth_triangle_cevian})\\
-\Imeth{triangle}{pedal\_circle ()} & Circumscribed circle of the podar triangle Refer to (\ref{ssub:method_imeth_triangle_pedal})\\
-\Imeth{triangle}{conway\_circle ()} & Circumscribed circle of Conway points Refer to (\ref{ssub:method_imeth_triangle_conway})\\
+ \footnote{ The midpoint of each side of the triangle, the foot of each altitude, the midpoint of the line segment from each vertex of the triangle to the orthocenter.} & [\ref{ssub:method_imeth_triangle_euler_circle}]\\
+
+\Imeth{triangle}{circum\_circle ()} & |C.OA = T.ABC : circum ()| Triangle's circumscribed circle & [\ref{ssub:method_imeth_triangle_circum_circle}] \\
+
+\Imeth{triangle}{in\_circle ()} & Inscribed circle of the triangle&
+[\ref{ssub:method_imeth_triangle_in_circle}]\\
+
+\Imeth{triangle}{ex\_circle (n)} & Circle tangent to the three sides of the triangle ; n =1 swap ; n=2 2 swap & [\ref{ssub:method_imeth_triangle_ex__circle}]\\
+
+\Imeth{triangle}{first\_lemoine\_circle ()} & The center is the midpoint between Lemoine point and the circumcenter.\footnote{Through the Lemoine point draw lines parallel to the triangle's sides. The points where the parallel lines intersect the sides of ABC then lie on a circle known as the first Lemoine circle. }& [\ref{sub:first_and_second_lemoine_circles}
+] \\
+
+\Imeth{triangle}{second\_lemoine\_circle ()} & & \ref{sub:antiparallel_through_lemoine_point}] \\
+
+\Imeth{triangle}{spieker\_circle ()} & The incircle of the medial triangle& [\ref{ssub:method_imeth_triangle_spieker__circle}]\\
+
+\Imeth{triangle}{bevan\_circle ()} & Circumscribed circle of a excentral triangle & [\ref{ssub:methods_imeth_triangle_bevan_circle_and_imeth_triangle_bevan_point}]\\
+
+\Imeth{triangle}{cevian\_circle ()} & Circumscribed circle of a Cevian triangle & [\ref{ssub:method_imeth_triangle_cevian}]\\
+
+\Imeth{triangle}{symmedial\_circle ()} & Circumscribed circle of a symmedial triangle & [\ref{ssub:method_imeth_triangle_symmedial}]\\
+
+\Imeth{triangle}{pedal\_circle ()} & Circumscribed circle of the podar triangle & [\ref{ssub:method_imeth_triangle_pedal}]\\
+
+\Imeth{triangle}{conway\_circle ()} & Circumscribed circle of Conway points & [\ref{ssub:method_imeth_triangle_conway}]\\
\bottomrule
\end{tabular}
\end{minipage}
\egroup
-Remark: If you don't need to use the triangle object several times, you can obtain a bisector or a altitude with the next functions
-
-|bisector (z.A,z.B,z.C)| and |altitude (z.A,z.B,z.C)| Refer to (\ref{misc})
\clearpage\newpage
\bgroup
@@ -227,29 +263,48 @@ Remark: If you don't need to use the triangle object several times, you can obta
\midrule
\textbf{Triangles} &\\
\midrule
-\Imeth{triangle}{orthic ()} & |T = T.ABC : orthic ()| triangle joining the feet of the altitudes \\
-\Imeth{triangle}{medial ()} & |T = T.ABC : medial ()| triangle with vertices at the midpoints\\
-\Imeth{triangle}{incentral ()} & Cevian triangle of the triangle with respect to its incenter \\
-\Imeth{triangle}{excentral () } & Triangle with vertices corresponding to the excenters \\
-\Imeth{triangle}{extouch ()} & Triangle formed by the points of tangency with the excircles \\
-\Imeth{triangle}{intouch () } & Contact triangle formed by the points of tangency of the incircle \\
-\Imeth{triangle}{tangential ()} & Triangle formed by the lines tangent to the circumcircle at the vertices\\
-\Imeth{triangle}{feuerbach ()} & Triangle formed by the points of tangency of the euler circle with the excircles\\
-\Imeth{triangle}{anti () }& Anticomplementary Triangle The given triangle is its medial triangle. \\
-\Imeth{triangle}{cevian (pt)} & Triangle formed with the endpoints of the three cevians with respect to |pt|. refer to (\ref{ssub:method_imeth_triangle_cevian})\\
-\Imeth{triangle}{pedal (pt)} & Triangle formed by projections onto the sides of |pt| Refer to \ref{ssub:method_imeth_triangle_pedal}\\
-\Imeth{triangle}{symmedian ()} & Triangle formed with the intersection points of the symmedians. \\
-\Imeth{triangle}{euler ()} & Triangle formed with the euler points \\
+\Imeth{triangle}{orthic ()} & |T = T.ABC : orthic ()| triangle joining the feet of the altitudes ; [\ref{ssub:method_imeth_triangle_altitude}] \\
+
+\Imeth{triangle}{medial ()} & |T = T.ABC : medial ()| triangle with vertices at the midpoints; [\ref{ssub:method_imeth_triangle_medial} ; \ref{sub:nine_points} ; \ref{ssub:method_imeth_triangle_symmedial}]\\
+
+\Imeth{triangle}{incentral ()}& Cevian triangle of the triangle with respect to its incenter. [\ref{ssub:method_incentral}] \\
+
+\Imeth{triangle}{excentral ()} & Triangle with vertices corresponding to the excenters. [\ref{ssub:method_imeth_triangle_feuerbach} ] \\
+
+\Imeth{triangle}{extouch ()} & Triangle formed by the points of tangency with the excircles. [\ref{sub:excircles} ] \\
+
+\Imeth{triangle}{intouch () } & Contact triangle formed by the points of tangency of the incircle [\ref{ssub:gergonne_point}]\\
+
+\Imeth{triangle}{contact () } & contact = intouch ; [
+\ref{ssub:gergonne_point}] \\
+
+\Imeth{triangle}{tangential ()} & Triangle formed by the lines tangent to the circumcircle at the vertices; [\ref{ssub:method_imeth_triangle_tangential}]\\
+
+\Imeth{triangle}{feuerbach ()} & Triangle formed by the points of tangency of the euler circle with the excircles; [\ref{ssub:method_imeth_triangle_feuerbach}]\\
+
+\Imeth{triangle}{anti () }& Anticomplementary Triangle The given triangle is its medial triangle.\footnote{You can use \tkzname{similar} instead of \tkzname{anti}.} ; [\ref{ssub:method_imeth_triangle_anti}] \\
+
+\Imeth{triangle}{cevian (pt)} & Triangle formed with the endpoints of the three cevians with respect to |pt|; [\ref{ssub:method_imeth_triangle_cevian}] \\
+
+\Imeth{triangle}{pedal (pt)} & Triangle formed by projections onto the sides of |pt| [\ref{ssub:method_imeth_triangle_pedal}]\\
+
+\Imeth{triangle}{symmedial ()} & Triangle formed with the intersection points of the symmedians ; [\ref{ssub:method_imeth_triangle_symmedial}] \\
+
+\Imeth{triangle}{euler ()} & Triangle formed with the euler points ; [\ref{ssub:method_imeth_triangle_euler__points}] \\
+
+\Imeth{triangle}{similar ()} & Triangle formed with straight lines parallel to the sides [\ref{ssub:method_imeth_triangle_similar}] \\
\midrule
\textbf{Ellipses} &\\
-\Imeth{triangle}{steiner\_inellipse ()} & Refer to ex. (\ref{ssub:steiner_inellipse_and_circumellipse})\\
-\Imeth{triangle}{steiner\_circumellipse ()} & Refer to ex. (\ref{ssub:steiner_inellipse_and_circumellipse})\\
-\Imeth{triangle}{euler\_ellipse ()} & Refer to ex. (\ref{sub:euler_ellipse})\\
+\Imeth{triangle}{steiner\_inellipse ()} & [ex. \ref{ssub:steiner_inellipse_and_circumellipse}] \\
+
+\Imeth{triangle}{steiner\_circumellipse ()} & [ex. \ref{ssub:steiner_inellipse_and_circumellipse}] \\
+
+\Imeth{triangle}{euler\_ellipse ()} & [ex. (\ref{sub:euler_ellipse}]\\
\midrule
\textbf{Miscellaneous} &\\
\midrule
\Imeth{triangle}{area ()} & $ \mathcal{A}$| = T.ABC: area ()|\\
-\Imeth{triangle}{barycentric\_coordinates (pt)} & Triples of numbers corresponding to masses placed at the vertices\\
+\Imeth{triangle}{barycentric\_coordinates(pt)}& Triples of numbers corresponding to masses placed at the vertices\\
\Imeth{triangle}{in\_out (pt)} & Boolean. Test if |pt| is inside the triangle\\
\Imeth{triangle}{check\_equilateral ()} & Boolean. Test if the triangle is equilateral\\
\bottomrule
@@ -259,68 +314,1146 @@ Remark: If you don't need to use the triangle object several times, you can obta
\egroup
% subsubsection methods_of_the_class_triangle (end)
+\subsubsection{Gergonne point} % (fold)
+\label{ssub:gergonne_point}
+
+In this example, some usefull methods are applied like \Imeth{triangle}{intouch} or \Imeth{triangle}{contact}.
+The points of contact of the inscribed circle (incircle) with the triangle in question are obtained.
+
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
+\begin{Verbatim}
+\begin{tkzelements}
+z.a = point: new(1,0)
+z.b = point: new(6,2)
+z.c = point: new(2,5)
+T = triangle : new (z.a,z.b,z.c)
+z.g = T : gergonne_point ()
+z.i = T.incenter
+z.ta,z.tb,z.tc = get_points (T : intouch ())
+\end{tkzelements}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(a,b,c)
+ \tkzDrawSegments (a,ta b,tb c,tc)
+ \tkzDrawCircle(i,ta)
+ \tkzDrawPoints(a,b,c,g,ta,tb,tc)
+ \tkzLabelPoints(a,b,tc)
+ \tkzLabelPoints[above](c,ta)
+ \tkzLabelPoints[above left](tb)
+ \end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
+\begin{tkzelements}
+z.a = point: new(1,0)
+z.b = point: new(6,2)
+z.c = point: new(2,5)
+T = triangle : new (z.a,z.b,z.c)
+z.g = T : gergonne_point ()
+z.i = T.incenter
+z.ta,z.tb,z.tc = get_points (T : intouch ())
+\end{tkzelements}
+
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(a,b,c)
+ \tkzDrawSegments (a,ta b,tb c,tc)
+ \tkzDrawCircle(i,ta)
+ \tkzDrawPoints(a,b,c,g,ta,tb,tc)
+ \tkzLabelPoints(a,b,tc)
+ \tkzLabelPoints[above](c,ta)
+ \tkzLabelPoints[above left](tb)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsubsection gergonne_point (end)
+
+\subsubsection{Method \Imeth{triangle}{Nagel\_point}} % (fold)
+\label{ssub:method_imeth_triangle_nagel__point}
+
+Let $E_a$ be the point at which the $J_a$-excircle meets the side $(BC)$ of a triangle $ABC$, and define $E_b$ and $E_c$ similarly. Then the lines $A,E_a$, $B,E_b$ and $C,E_c$ concur in the Nagel point $Na$.
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = .7
+ z.A = point : new (0,0)
+ z.B = point : new (3.6,0)
+ z.C = point : new (2.8,4)
+ T.ABC = triangle: new (z.A,z.B,z.C)
+ z.Na = T.ABC : nagel_point ()
+ z.J_a,z.J_b,
+ z.J_c = get_points (T.ABC : excentral ())
+ z.E_a,z.E_b,
+ z.E_c = get_points (T.ABC : extouch ())
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(A,B,C)
+ \tkzDrawPoints[red,size=2](J_a,J_b,J_c)
+ \tkzClipBB
+ \tkzDrawLines[add=1.75 and 1.75,teal](A,B A,C B,C)
+ \tkzDrawCircles(J_a,E_a J_b,E_b J_c,E_c)
+ \tkzDrawSegments[dashed,gray](J_a,E_a J_b,E_b J_c,E_c)
+ \tkzDrawSegments[orange](A,E_a B,E_b C,E_c)
+ \tkzDrawPoints[red,size=2](Na,E_a,E_b,E_c)
+ \tkzLabelPoints(A,B,Na)
+ \tkzLabelPoints(E_c,J_a,J_b,J_c)
+ \tkzLabelPoints[above](E_a,E_b,C)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = .7
+ z.A = point : new (0,0)
+ z.B = point : new (3.6,0)
+ z.C = point : new (2.8,4)
+ T.ABC = triangle: new (z.A,z.B,z.C)
+ z.Na = T.ABC : nagel_point ()
+ z.J_a,z.J_b,
+ z.J_c = get_points (T.ABC : excentral ())
+ z.E_a,z.E_b,
+ z.E_c = get_points (T.ABC : extouch ())
+\end{tkzelements}
+
+\begin{center}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(A,B,C)
+ \tkzDrawPoints[red,size=2](J_a,J_b,J_c)
+ \tkzClipBB
+ \tkzDrawLines[add=1.75 and 1.75,teal](A,B A,C B,C)
+ \tkzDrawCircles(J_a,E_a J_b,E_b J_c,E_c)
+ \tkzDrawSegments[dashed,gray](J_a,E_a J_b,E_b J_c,E_c)
+ \tkzDrawSegments[orange](A,E_a B,E_b C,E_c)
+ \tkzDrawPoints[red,size=2](Na,E_a,E_b,E_c)
+ \tkzLabelPoints(A,B,Na)
+ \tkzLabelPoints(E_c,J_a,J_b,J_c)
+ \tkzLabelPoints[above](E_a,E_b,C)
+\end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsubsection method_imeth_triangle_nagel__point (end)
+
+
+\subsubsection{Method \Imeth{triangle}{mittenpunkt}} % (fold)
+\label{ssub:method_imeth_triangle_mittenpunkt}
+
+The Mittenpunkt is the symmedian point of the excentral triangle. The mittenpunkt (also called the middlespoint) of a triangle is the symmedian point of the excentral triangle, i.e., the point of concurrence of the lines from the excenters through the corresponding triangle side midpoints.
+[ \href{https://mathworld.wolfram.com/Mittenpunkt.html}{Weisstein, Eric W. "Mittenpunkt." From MathWorld--A Wolfram Web Resource.}]
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = 1
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 6 , 0 )
+ z.C = point : new ( 4 , 6 )
+ T = triangle : new (z.A,z.B,z.C)
+ z.Ma,
+ z.Mb,
+ z.Mc = get_points (T : medial ())
+ z.Ia,z.Ib,z.Ic = get_points(T : excentral ())
+ z.Mi = T : mittenpunkt_point ()
+ T.int = T : extouch ()
+ z.Ta,z.Tb,z.Tc = get_points(T.int)
+\end{tkzelements}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = 1
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 6 , 0 )
+ z.C = point : new ( 4 , 6 )
+ T = triangle : new (z.A,z.B,z.C)
+ z.Ma,
+ z.Mb,
+ z.Mc = get_points (T : medial ())
+ z.Ia,z.Ib,z.Ic = get_points(T : excentral ())
+ z.Mi = T : mittenpunkt_point ()
+ T.int = T : extouch ()
+ z.Ta,z.Tb,z.Tc = get_points(T.int)
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}[scale=.5]
+ \tkzGetNodes
+ \tkzDrawPolygons[](A,B,C Ma,Mb,Mc)
+ \tkzDrawPoints(Ma,Mb,Mc,Ia,Ib,Ic)
+ \tkzDrawPoints[red](Ta,Tb,Tc)
+ \tkzLabelPoints[below](Ib)
+ \tkzLabelPoints[above left](Ia,Ic)
+ \tkzClipBB
+ \tkzDrawLines[add=0 and 1](Ia,Ma Ib,Mb Ic,Mc)
+ \tkzDrawLines[add=1 and 1](A,B A,C B,C)
+ \tkzDrawCircles[red](Ia,Ta Ib,Tb Ic,Tc)
+ \tkzDrawPoints(B,C,A,Mi) %
+ \tkzLabelPoints(B,A)
+ \tkzLabelPoints[above](C,Mi)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tikzpicture}[scale=.5]
+ \tkzGetNodes
+ \tkzDrawPolygons[](A,B,C Ma,Mb,Mc)
+ \tkzDrawPoints(Ma,Mb,Mc,Ia,Ib,Ic)
+ \tkzDrawPoints[red](Ta,Tb,Tc)
+ \tkzLabelPoints[below](Ib)
+ \tkzLabelPoints[above left](Ia,Ic)
+ \tkzClipBB
+ \tkzDrawLines[add=0 and 1](Ia,Ma Ib,Mb Ic,Mc)
+ \tkzDrawLines[add=1 and 1](A,B A,C B,C)
+ \tkzDrawCircles[red](Ia,Ta Ib,Tb Ic,Tc)
+ \tkzDrawPoints(B,C,A,Mi)
+ \tkzLabelPoints(B,A)
+ \tkzLabelPoints[above](C,Mi)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+
+
+% subsubsection method_imeth_triangle_mittenpunkt (end)
+
+\subsubsection{Method \Imeth{triangle}{projection}} % (fold)
+\label{ssub:method_imeth_triangle_projection}
+
+This involves obtaining the projections of a point onto the sides of a triangle. In the following example, we are going to find the projections of a centre of an exinscribed circle.
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+z.A = point: new (0 , 0)
+z.B = point: new (5 , 0)
+z.C = point: new (-.4 , 4)
+T.ABC = triangle: new (z.A,z.B,z.C)
+z.J,_ = get_points(T.ABC: ex_circle (2))
+z.X ,
+z.Y,
+z.Z = T.ABC : projection (z.J)
+\end{tkzelements}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+z.A = point: new (0 , 0)
+z.B = point: new (5 , 0)
+z.C = point: new (-.4 , 4)
+T.ABC = triangle: new (z.A,z.B,z.C)
+z.J,_ = get_points(T.ABC: ex_circle (2))
+z.X ,
+z.Y,
+z.Z = T.ABC : projection (z.J)
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawArc(J,X)(Y)
+ \tkzDrawSegments[blue](J,X J,Y J,Z C,Y C,X)
+ \tkzDrawPoints(A,B,C,J,X,Y,Z)
+ \tkzLabelPoints(J,X,Y)
+ \tkzLabelPoints[above](C,B,Z)
+ \tkzLabelPoints[left](A)
+ \tkzMarkRightAngles[fill=gray!20,opacity=.4](A,Z,J A,Y,J J,X,B)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawArc(J,X)(Y)
+ \tkzDrawSegments[blue](J,X J,Y J,Z C,Y C,X)
+ \tkzDrawPoints(A,B,C,J,X,Y,Z)
+ \tkzLabelPoints(J,X,Y)
+ \tkzLabelPoints[above](C,B,Z)
+ \tkzLabelPoints[left](A)
+ \tkzMarkRightAngles[fill=gray!20,opacity=.4](A,Z,J A,Y,J J,X,B)
+ \end{tikzpicture}
+\end{center}
+\end{Verbatim}
+\end{minipage}
+
+% subsubsection method_imeth_triangle_projection (end)
+
+\subsubsection{Method \Imeth{triangle}{trilinear}} % (fold)
+\label{ssub:method_imeth_triangle_trilinear}
+
+Given a reference triangle $ABC$, the trilinear coordinates of a point $P$ with respect to $ABC$ are an ordered triple of numbers, each of which is proportional to the directed distance from $P$ to one of the side lines. Trilinear coordinates are denoted alpha:beta:gamma or (alpha,beta,gamma) and also are known as homogeneous coordinates or "trilinears." Trilinear coordinates were introduced by Plücker in 1835.
+[\href{https://mathworld.wolfram.com/TrilinearCoordinates.html}{Weisstein, Eric W. "Trilinear Coordinates." From MathWorld--A Wolfram Web Resource.}]
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+z.A = point : new ( 0 , 0 )
+z.B = point : new ( 4 , 0 )
+z.C = point : new ( 4 , 3 )
+T.ABC = triangle : new ( z.A , z.B , z.C )
+a = T.ABC.a
+b = T.ABC.b
+c = T.ABC.c
+z.Gp = T.ABC : trilinear (b*c,a*c,a*b)
+z.G = T.ABC : barycentric (1,1,1)
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawPolygon(A,B,C)
+\tkzDrawPoints(A,B,C,G',G)
+\tkzLabelPoints(A,B,G')
+\tkzLabelPoints[above](C,G)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+z.A = point : new ( 0 , 0 )
+z.B = point : new ( 4 , 0 )
+z.C = point : new ( 4 , 3 )
+T.ABC = triangle : new ( z.A , z.B , z.C )
+a = T.ABC.a
+b = T.ABC.b
+c = T.ABC.c
+z.Gp = T.ABC : trilinear (b*c,a*c,a*b)
+z.G = T.ABC : barycentric (1,1,1)
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPoints(A,B,C,G',G)
+ \tkzLabelPoints(A,B,G')
+ \tkzLabelPoints[above](C,G)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsubsection method_imeth_triangle_trilinear (end)
+
+\subsubsection{Method \Imeth{triangle}{barycentric\_coordinates}} % (fold)
+\label{ssub:method_imeth_triangle_barycentric__coordinates}
+
+This method produces a triplet of coordinates which are the barycentric coordinates of a point as a function of the three points of a given triangle.
+
+\vspace{6pt}
+
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+\begin{tkzelements}
+ z.A = point: new (1,1)
+ z.B = point: new (8,0)
+ z.C = point: new (2,5)
+ T = triangle: new(z.A,z.B,z.C)
+ z.G = T.centroid
+ ca,cb,cc = T : barycentric_coordinates (z.G)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C,G)
+ \tkzLabelPoints(A,B,C,G)
+ \tkzLabelPoint(G){\pmpn{\tkzUseLua{ca}}:\pmpn{\tkzUseLua{cb}}:\pmpn{\tkzUseLua{cc}}}
+\end{tikzpicture}
+ \end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale = .75
+ z.A = point: new (1,1)
+ z.B = point: new (8,0)
+ z.C = point: new (2,5)
+ T = triangle: new(z.A,z.B,z.C)
+ z.G = T.centroid
+ ca,cb,cc = T : barycentric_coordinates (z.G)
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C,G)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C) \tkzLabelPoint(G){\pmpn{\tkzUseLua{ca}}:\pmpn{\tkzUseLua{cb}}:\pmpn{\tkzUseLua{cc}}}
+ \end{tikzpicture}
+ \end{center}
+\end{minipage}
+
+% subsubsection method_imeth_triangle_barycentric__coordinates (end)
+
+\subsubsection{Method \Imeth{triangle}{base}} % (fold)
+\label{ssub:method_imeth_triangle_base}
+
+In the next example, the point $D$ is defined by $\overrightarrow{AD} = 1\cdot \overrightarrow{AB}+1\cdot \overrightarrow{AC}$.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = .75
+ z.A = point: new (1,1)
+ z.B = point: new (8,0)
+ z.C = point: new (0,5)
+ z.X = point: new (2,2)
+ T = triangle: new(z.A,z.B,z.C)
+ z.D = T : base (1,1)
+ z.E = T : base (.5,1)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,D,C A,B,E,C)
+ \tkzDrawPoints(A,B,C,D,E)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C,D,E)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale = .75
+ z.A = point: new (1,1)
+ z.B = point: new (8,0)
+ z.C = point: new (0,5)
+ z.X = point: new (2,2)
+ T = triangle: new(z.A,z.B,z.C)
+ z.D = T : base (1,1)
+ z.E = T : base (.5,1)
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,D,C A,B,E,C)
+ \tkzDrawPoints(A,B,C,D,E)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C,D,E)
+ \end{tikzpicture}
+ \end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_triangle_base (end)
+
+
+\subsubsection{Method \Imeth{triangle}{euler\_points}} % (fold)
+\label{ssub:method_imeth_triangle_euler__points}
+
+The points $a$, $b$ and $c$ are the Euler points. They are the midpoints of the segments $AH$, $BH$ and $CH$.
+
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+ \begin{tkzelements}
+ scale = 1.25
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ z.N = T.eulercenter
+ z.a,
+ z.b,
+ z.c = get_points (T : euler ())
+ z.H = T.orthocenter
+ T.orthic = T: orthic()
+ z.Ha,
+ z.Hb,
+ z.Hc = get_points (T.orthic)
+ \end{tkzelements}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawPolygons[cyan](a,b,c)
+ \tkzDrawCircle[purple](N,a)
+ \tkzDrawPoints(a,b,B,C,A,c,H)
+ \tkzDrawSegments[red](C,Hc B,Hb A,Ha)
+ \tkzLabelPoints(A,B,a,b,H)
+ \tkzLabelPoints[above](c,C)
+ \end{tikzpicture}
+ \end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale = 1.25
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ z.N = T.eulercenter
+ z.a,
+ z.b,
+ z.c = get_points (T : euler ())
+ z.H = T.orthocenter
+ T.orthic = T: orthic()
+ z.Ha,
+ z.Hb,
+ z.Hc = get_points (T.orthic)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawPolygons[cyan](a,b,c)
+ \tkzDrawCircle[purple](N,a)
+ \tkzDrawPoints(a,b,B,C,A,c,H)
+ \tkzDrawSegments[red](C,Hc B,Hb A,Ha)
+ \tkzLabelPoints(A,B,a,b,H)
+ \tkzLabelPoints[above](c,C)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+% subsubsection method_imeth_triangle_euler__points (end)
+
+\subsubsection{Method \Imeth{triangle}{nine\_points}} % (fold)
+\label{ssub:method_imeth_triangle_nine__points}
+
+This method gives the nine main points belonging to the Euler circle: in order, first the midpoints of the sides of the triangle, then the feet of the altitudes and finally the three Euler points. Refer to the last example.
+In the next example, we look for the centre of gravity in two different ways: the first uses the \code{trilinear} method, the second the \code{barycentric} method.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = 1.5
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ z.N = T.eulercenter
+ z.e1,
+ z.e2,
+ z.e3,
+ z.e4,
+ z.e5,
+ z.e6,
+ z.e7,
+ z.e8,
+ z.e9 = T : nine_points ()
+\end{tkzelements}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = 1.5
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ z.N = T.eulercenter
+ z.e1,
+ z.e2,
+ z.e3,
+ z.e4,
+ z.e5,
+ z.e6,
+ z.e7,
+ z.e8,
+ z.e9 = T : nine_points ()
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawCircle[purple](N,e1)
+ \tkzDrawPoints(e1,e2,e3,e4,e5,e6,e7,e8,e9)
+ \tkzLabelPoints(e1,e2,e3,e4,e5,e6,e7,e8,e9)
+\end{tikzpicture}
+\end{minipage}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawCircle[purple](N,e1)
+ \tkzDrawPoints(e1,e2,e3,e4,e5,e6,e7,e8,e9)
+ \tkzLabelPoints(e1,e2,e3,e4,e5,e6,e7,e8,e9)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+
+% subsubsection method_imeth_triangle_nine__points (end)
+
+\subsubsection{Method \Imeth{triangle}{altitude}} % (fold)
+\label{ssub:method_imeth_triangle_altitude}
+
+There are several methods to obtain one or more altitudes of a triangle. One possible method is the \Imeth{triangle}{orthic} method. This method allows for defining the \code{orthic} triangle whose vertices are the feet of the altitudes from each vertex. If only one altitude is needed, one can use the \code{altitude(n)} method. The numeric value $n$ can be $0$, $1$, or $2$. By default, if it is absent, it is considered to be $0$. Considering the triangle $ABC$, $n=0$ means no cyclic permutation of the vertices, and the altitude will be from the first point, here $A$. If $n=1$, the point trio $BCA$ is considered, and the altitude will be from $B$. For $n=2$, the altitude will be from $C$.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ z.H = T.orthocenter
+ L.HA = T : altitude ()
+ L.HC = T :altitude (2)
+ z.Hc = L.HC.pb
+ z.Ha = L.HA.pb
+ z.a,z.b,z.c = get_points (T : orthic ())
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[red](a,b,c)
+ \tkzDrawPoints(A,B,C,H)
+ \tkzDrawSegments[red](C,Hc A,Ha)
+ \tkzLabelPoints(A,B,H)
+ \tkzLabelPoints[font=\small](Hc)
+ \tkzLabelPoints[font=\small,above](Ha,C)
+ \tkzMarkRightAngles[fill = gray!30,opacity=.4](B,Hc,C A,Ha,C)
+ \end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ z.H = T.orthocenter
+ L.HA = T : altitude ()
+ L.HC = T : altitude (2)
+ z.Hc = L.HC.pb
+ z.Ha = L.HA.pb
+ z.a,z.b,z.c = get_points (T : orthic ())
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[red](a,b,c)
+ \tkzDrawPoints(A,B,C,H)
+ \tkzDrawSegments[red](C,Hc A,Ha)
+ \tkzLabelPoints(A,B,H)
+ \tkzLabelPoints[font=\small](Hc)
+ \tkzLabelPoints[font=\small,above](Ha,C)
+ \tkzMarkRightAngles[fill = gray!30,opacity=.4](B,Hc,C A,Ha,C)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsubsection method_imeth_triangle_altitude (end)
+
+\subsubsection{Method \Imeth{triangle}{bisector}} % (fold)
+\label{ssub:method_imeth_triangle_bisector}
+
+There are several methods to obtain one or more bisectors of a triangle. One possible method is the \Imeth{triangle}{incentral} method. This method allows for defining the \code{incentral} triangle whose vertices are the feet of the bisectors from each vertex. If only one bisector is needed, one can use the \code{bisector(n)} method. The numeric value $n$ can be $0$, $1$, or $2$. By default, if it is absent, it is considered to be $0$. Considering the triangle $ABC$, $n=0$ means no cyclic permutation of the vertices, and the bisector will be from the first point, here $A$. If $n=1$, the point trio $BCA$ is considered, and the bisector will be from $B$. For $n=2$, the bisector will be from $C$.
+
+\vspace{6pt}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point : new (0 , 0)
+ z.B = point : new (3 , 2)
+ z.C = point : new (2 , 5)
+ T.ABC = triangle : new ( z.A , z.B , z.C )
+ L.AE = T.ABC : bisector ()
+ z.E = L.AE.pb
+ z.F = T.ABC : bisector (1).pb
+ z.a,z.b,z.c = get_points (T.ABC : incentral ())
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[red](a,b,c)
+ \tkzDrawLines(A,B A,C A,E B,F)
+ \tkzDrawPoints(A,B,C,a,b,c)
+ \tkzLabelPoints(A,B,c)
+ \tkzLabelPoints[above](C,b,a)
+ \tkzMarkAngles[mark=|](B,A,a a,A,C)
+ \tkzMarkAngles[mark=||](C,B,b b,B,A)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ z.A = point : new (0 , 0)
+ z.B = point : new (3 , 2)
+ z.C = point : new (2 , 5)
+ T.ABC = triangle : new ( z.A , z.B , z.C )
+ L.AE = T.ABC : bisector ()
+ z.E = L.AE.pb
+ z.F = T.ABC : bisector (1).pb
+ z.a,z.b,z.c = get_points (T.ABC : incentral ())
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[red](a,b,c)
+ \tkzDrawLines(A,B A,C A,E B,F)
+ \tkzDrawPoints(A,B,C,a,b,c)
+ \tkzLabelPoints(A,B,c)
+ \tkzLabelPoints[above](C,b,a)
+ \tkzMarkAngles[cyan,mark=|,size=.75](B,A,a a,A,C)
+ \tkzMarkAngles[mark=||,size=.5](C,B,b b,B,A)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_triangle_bisector (end)
+
+%%%%%% Circles %%%%%%
+
+\subsubsection{Method \Imeth{triangle}{euler\_circle}} % (fold)
+\label{ssub:method_imeth_triangle_euler_circle}
+
+The nine-point circle, also called Euler's circle or the Feuerbach circle, is the circle that passes through the perpendicular feet $H_A, H_B, and H_C$ dropped from the vertices of any reference triangle DeltaABC on the sides opposite them. Euler showed in 1765 that it also passes through the midpoints$ M_A, M_B, M_C$ of the sides of DeltaABC. By Feuerbach's theorem, the nine-point circle also passes through the midpoints $E_A, E_B, and E_C$ of the segments that join the vertices and the orthocenter $H$. These points are commonly referred to as the Euler points.
+\href{https://mathworld.wolfram.com/Nine-PointCircle.html}{Weisstein, Eric W. "Nine-Point Circle." From MathWorld--A Wolfram Web Resource.}
+
+\vspace{6pt}
+There are several ways of obtaining the Euler circle. The first would be to use an attribute of the triangle to determine the centre. This centre is defined by |z.N = T.eulercenter|. Next, the circle passes through the midpoint of one of the sides. IF this circle is useful later on, it is best to define it using the \code{euler\_circle} method.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ C.euler = T : euler_circle ()
+ z.N,z.K = get_points (C.euler)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawCircle(N,K)
+ \tkzDrawPoints(A,B,C,N,K)
+ \tkzLabelPoints(A,B,N)
+ \tkzLabelPoints[above](C,K)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ C.euler = T : euler_circle ()
+ z.N,z.K = get_points (C.euler)
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawCircle(N,K)
+ \tkzDrawPoints(A,B,C,N,K)
+ \tkzLabelPoints(A,B,N)
+ \tkzLabelPoints[above](C,K)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_triangle_euler_circle (end)
+
+\subsubsection{Method \Imeth{triangle}{circum\_circle}} % (fold)
+\label{ssub:method_imeth_triangle_circum_circle}
+
+To obtain the circumscribed circle, simply use the \code{T.circumcenter} attribute, but if it is necessary to determine the circle then the method is \code{circum\_circle}.
-\subsubsection{Méthodes \Imeth{triangle}{cevian} et \Imeth{triangle}{cevian\_circle}} % (fold)
-\label{ssub:method_imeth_triangle_cevian}
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
- scale = 2
- z.a = point: new (1,2)
- z.b = point: new (5,1)
- z.c = point: new (3,5)
- T = triangle: new (z.a,z.b,z.c)
- z.i = T.orthocenter
- T.cevian = T : cevian (z.i)
- z.ta,z.tb,z.tc = get_points (T.cevian)
- C.cev = T : cevian_circle (z.i)
- z.w = C.cev.center
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ C.circum = T : circum_circle ()
+ z.O,z.K = get_points (C.circum)
\end{tkzelements}
\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawCircle(O,K)
+ \tkzDrawPoints(A,B,C,O,K)
+ \tkzLabelPoints(A,B,O)
+ \tkzLabelPoints[above](C,K)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,4)
+ T = triangle: new(z.A,z.B,z.C)
+ C.circum = T : circum_circle ()
+ z.O,z.K = get_points (C.circum)
+\end{tkzelements}
+
+\begin{center}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawCircle(O,K)
+ \tkzDrawPoints(A,B,C,O,K)
+ \tkzLabelPoints(A,B,O)
+ \tkzLabelPoints[above](C,K)
+\end{tikzpicture}
+\end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_triangle_circum_circle (end)
+
+\subsubsection{Method \Imeth{triangle}{in\_circle}} % (fold)
+\label{ssub:method_imeth_triangle_in_circle}
+
+An incircle is an inscribed circle of a polygon, i.e., a circle that is tangent to each of the polygon's sides. The center $I$ of the incircle is called the incenter, and the radius $r$ of the circle is called the inradius.
+
+The incenter is the point of concurrence of the triangle's angle bisectors. In addition, the points $M_A, M_B, and M_C$ of intersection of the incircle with the sides of $ABC$ are the polygon vertices of the pedal triangle [\ref{ssub:method_imeth_triangle_pedal}] taking the incenter as the pedal point (c.f. tangential triangle [\ref{ssub:method_imeth_triangle_medial}]). This triangle is called the contact triangle.
+
+[\href{https://mathworld.wolfram.com/Incircle.html}{Weisstein, Eric W. "Incircle." From MathWorld--A Wolfram Web Resource.}]
+
+\vspace{6pt}
+
+\begin{tkzelements}
+ scale = 2
+ z.A = point : new (0 , 0)
+ z.B = point : new (5 , 0)
+ z.C = point : new (1 , 3)
+ T.ABC = triangle : new ( z.A , z.B , z.C )
+ z.E = T.ABC : bisector ().pb
+ z.F = T.ABC : bisector (1).pb
+ z.G = T.ABC : bisector (2).pb
+ C.IH = T.ABC : in_circle ()
+ z.I,z.H = get_points (C.IH)
+\end{tkzelements}
+\begin{tikzpicture}%
+ [ new/.style ={ color = orange },
+ one/.style = { new,/tkzmkangle/size=.5 },
+ two/.style = { new,/tkzmkangle/size=.6 },
+ l/.style = { /tkzmkangle/arc=l },
+ ll/.style = { /tkzmkangle/arc=ll },
+ lll/.style = { /tkzmkangle/arc=lll }]
+\tkzGetNodes
+\tkzDrawPolygon(A,B,C)
+\tkzDrawSegments[new](A,E B,F C,G)
+ \tkzDrawSegments[dashed,add=0 and .5](I,H)
+ \tkzDrawPoints(A,B,C,E,F,G,I)
+ \tkzDrawCircle(I,H)
+ \tkzDrawPoints(I,A,B,C,H)
+\begin{scope}[one]
+ \tkzMarkAngles[l](B,A,E)
+ \tkzMarkAngles[ll](C,B,F)
+ \tkzMarkAngles[lll](A,C,G)
+\end{scope}
+\begin{scope}[two]
+ \tkzMarkAngles[l](E,A,C)
+ \tkzMarkAngles[ll](F,B,A)
+ \tkzMarkAngles[lll](G,C,B)
+\end{scope}
+\tkzLabelPoints(A,B,I)
+\tkzLabelPoints[above](C,H)
+\end{tikzpicture}
+
+
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point : new (0 , 0)
+ z.B = point : new (5 , 0)
+ z.C = point : new (1 , 3)
+ T.ABC = triangle : new(z.A,z.B,z.C)
+ z.E = T.ABC : bisector ().pb
+ z.F = T.ABC : bisector (1).pb
+ z.G = T.ABC : bisector (2).pb
+ C.IH = T.ABC : in_circle ()
+ z.I,z.H = get_points (C.IH)
+\end{tkzelements}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tikzpicture}%
+ [ new/.style ={color = orange },
+ one/.style = { new,/tkzmkangle/size=.5 },
+ two/.style = { new,/tkzmkangle/size=.6 },
+ l/.style = { /tkzmkangle/arc=l },
+ ll/.style = { /tkzmkangle/arc=ll },
+ lll/.style = { /tkzmkangle/arc=lll }]
\tkzGetNodes
-\tkzDrawPolygons(a,b,c ta,tb,tc)
-\tkzDrawSegments(a,ta b,tb c,tc)
-\tkzDrawPoints(a,b,c,i,ta,tb,tc)
-\tkzLabelPoints(a,b,c,i)
-\tkzDrawCircles(w,ta)
+\tkzDrawPolygon(A,B,C)
+\tkzDrawSegments[new](A,E B,F C,G)
+\tkzDrawSegments[dashed,add=0 and .5](I,H)
+\tkzDrawPoints(A,B,C,E,F,G,I)
+\tkzDrawCircle(I,H)
+\tkzDrawPoints(I,A,B,C,H)
+\begin{scope}[one]
+ \tkzMarkAngles[l](B,A,E)
+ \tkzMarkAngles[ll](C,B,F)
+ \tkzMarkAngles[lll](A,C,G)
+\end{scope}
+\begin{scope}[two]
+ \tkzMarkAngles[l](E,A,C)
+ \tkzMarkAngles[ll](F,B,A)
+ \tkzMarkAngles[lll](G,C,B)
+\end{scope}
+\tkzLabelPoints(A,B,I)
+\tkzLabelPoints[above](C,H)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
+
+
+% subsubsection method_imeth_triangle_in_circle (end)
+
+\subsubsection{Method \Imeth{triangle}{ex\_circle}} % (fold)
+\label{ssub:method_imeth_triangle_ex__circle}
+
+Given a triangle, extend two sides in the direction opposite their common vertex. The circle tangent to these two lines and to the other side of the triangle is called an excircle, or sometimes an escribed circle. The center of the excircle is called the excenter and lies on the external angle bisector of the opposite angle.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+z.A = point: new (0 , 0)
+z.B = point: new (5 , 0)
+z.C = point: new (-.4 , 4)
+T.ABC = triangle: new (z.A,z.B,z.C)
+z.I,_ = get_points(T.ABC: ex_circle ())
+z.J,_ = get_points(T.ABC: ex_circle (1))
+z.K,_ = get_points(T.ABC: ex_circle (2))
+z.Xk ,
+z.Yk,
+z.Zk = T.ABC : projection (z.K)
+z.Xi ,
+z.Yi,
+z.Zi = T.ABC : projection (z.I)
+z.Xj ,
+z.Yj,
+z.Zj = T.ABC : projection (z.J)
+\end{tkzelements}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = .5
+z.A = point: new (0 , 0)
+z.B = point: new (5 , 0)
+z.C = point: new (-.4 , 4)
+T.ABC = triangle: new (z.A,z.B,z.C)
+z.I,_ = get_points(T.ABC: ex_circle ())
+z.J,_ = get_points(T.ABC: ex_circle (1))
+z.K,_ = get_points(T.ABC: ex_circle (2))
+z.Xk ,
+z.Yk,
+z.Zk = T.ABC : projection (z.K)
+z.Xi ,
+z.Yi,
+z.Zi = T.ABC : projection (z.I)
+z.Xj ,
+z.Yj,
+z.Zj = T.ABC : projection (z.J)
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawArc(K,Xk)(Yk)
+ \tkzDrawArc(I,Yi)(Zi)
+ \tkzDrawArc(J,Zj)(Yj)
+ \tkzDrawSegments[blue](K,Xk K,Yk K,Zk C,Yk C,Xk I,Xi J,Yj)
+ \tkzDrawPoints(A,B,C,I,J,K,Xk,Yk,Zk,Xi,Yj)
+ \tkzLabelPoints(K,Xk,Yk)
+ \tkzLabelPoints[above](C,B,Zk,I,J)
+ \tkzLabelPoints[left](A)
+ \tkzMarkRightAngles[fill=gray!20,opacity=.4](A,Zk,K A,Yk,K K,Xk,B)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawArc(K,Xk)(Yk)
+ \tkzDrawArc(I,Yi)(Zi)
+ \tkzDrawArc(J,Zj)(Yj)
+ \tkzDrawSegments[blue](K,Xk K,Yk K,Zk C,Yk C,Xk I,Xi J,Yj)
+ \tkzDrawPoints(A,B,C,I,J,K,Xk,Yk,Zk,Xi,Yj)
+ \tkzLabelPoints(K,Xk,Yk)
+ \tkzLabelPoints[above](C,B,Zk,I,J)
+ \tkzLabelPoints[left](A)
+ \tkzMarkRightAngles[fill=gray!20,opacity=.4](A,Zk,K A,Yk,K K,Xk,B)
+ \end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+
+% subsubsection method_imeth_triangle_ex__circle (end)
+
+\subsubsection{Method \Imeth{triangle}{spieker\_circle}} % (fold)
+\label{ssub:method_imeth_triangle_spieker__circle}
+
+In geometry, the incircle of the medial triangle of a triangle is the Spieker circle. Its center is the Spieker center.
+
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = 1.5
+ z.A = point: new (1,1)
+ z.B = point: new (5,1)
+ z.C = point: new (2.2,4)
+ T = triangle: new (z.A,z.B,z.C)
+ C.first_lemoine = T:spieker_circle()
+ z.S,z.w = get_points( C.first_lemoine )
+ z.Ma,z.Mb,z.Mc = get_points(T : medial ())
+ z.N = T : nagel_point ()
+ z.Qa = midpoint(z.A,z.N)
+ z.Qb = midpoint(z.B,z.N)
+ z.Qc = midpoint(z.C,z.N)
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C Qa,Qb,Qc)
+ \tkzDrawPolygons[red](Ma,Mb,Mc)
+ \tkzDrawCircles[red](S,w)
+ \tkzDrawSegments[dashed](N,A N,B N,C)
+ \tkzDrawPoints(A,B,C,S,w,Ma,Mb,Mc,Qa,Qb,Qc,N)
+ \tkzLabelPoints(A,B,S,w,Mc,N)
+ \tkzLabelPoints[above](C,Ma,Mb,Qa,Qb,Qc)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+
\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
\begin{tkzelements}
-scale = 2
-z.a = point: new (1,2)
-z.b = point: new (5,1)
-z.c = point: new (3,5)
-T = triangle: new (z.a,z.b,z.c)
-z.i = T.orthocenter
-T.cevian = T : cevian (z.i)
-z.ta,z.tb,z.tc = get_points (T.cevian)
-C.cev = T : cevian_circle (z.i)
-z.w = C.cev.center
+ z.A = point: new (1,1)
+ z.B = point: new (5,1)
+ z.C = point: new (2.2,4)
+ T = triangle: new (z.A,z.B,z.C)
+ C.first_lemoine = T:spieker_circle()
+ z.S,z.w = get_points( C.first_lemoine )
+ z.Ma,z.Mb,z.Mc = get_points(T : medial ())
+ z.N = T : nagel_point ()
+ z.Qa = midpoint(z.A,z.N)
+ z.Qb = midpoint(z.B,z.N)
+ z.Qc = midpoint(z.C,z.N)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C Qa,Qb,Qc)
+ \tkzDrawPolygons[red](Ma,Mb,Mc)
+ \tkzDrawCircles[red](S,w)
+ \tkzDrawSegments[dashed](N,A N,B N,C)
+ \tkzDrawPoints(A,B,C,S,w,Ma,Mb,Mc,Qa,Qb,Qc,N)
+ \tkzLabelPoints(A,B,S,w,Mc,N)
+ \tkzLabelPoints[above](C,Ma,Mb,Qa,Qb,Qc)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+
+
+% subsubsection method_imeth_triangle_spieker__circle (end)
+
+\subsubsection{Methods \Imeth{triangle}{cevian} and \Imeth{triangle}{cevian\_circle}} % (fold)
+\label{ssub:method_imeth_triangle_cevian}
+
+A Cevian is a line segment which joins a vertex of a triangle with a point on the opposite side (or its extension). The condition for three general Cevians from the three vertices of a triangle to concur is known as Ceva's theorem.
+
+Picking a Cevian point $P$ in the interior of a triangle $ABC$ and drawing Cevians from each vertex through $P$ to the opposite side produces a set of three intersecting Cevians $APa$, $BPb$, and $CPc$ with respect to that point. The triangle $PaPbPc$ is known as the Cevian triangle of $ABC$ with respect to $P$, and the circumcircle of $PaPbPc$ is similarly known as the Cevian circle. [\href{https://mathworld.wolfram.com/CevianTriangle.html}{Weisstein, Eric W. "Cevian Triangle." From MathWorld--A Wolfram Web Resource.}]
+
+
+\vspace{6pt}
+
+\begin{tkzelements}
+ scale = 1.25
+ z.A = point: new (0,0)
+ z.B = point: new (4,0)
+ z.C = point: new (1.8,3)
+ T.ABC = triangle: new(z.A,z.B,z.C)
+ z.Q = point : new (1,-0.4)
+ z.P = point : new (2,1)
+ T.cevian = T.ABC : cevian (z.Q)
+ z.Qa,z.Qb,z.Qc = get_points (T.cevian)
+ T.cevian = T.ABC : cevian (z.P)
+ z.Pa,z.Pb,z.Pc = get_points (T.cevian)
+ C.cev = T.ABC : cevian_circle (z.P)
+ z.w = C.cev.center
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[cyan](A,B,C)
+ \tkzDrawSegments[cyan](A,Qb B,Qa)
+ \tkzDrawSegments[red](A,Qa B,Qb C,Q)
+ \tkzDrawSegments[blue](A,Pa B,Pb C,Pc)
+ \tkzDrawCircles(w,Pa)
+ \tkzDrawPoints(A,B,C,Qa,Qb,Qc,P,Q,Pa,Pb,Pc)
+ \tkzLabelPoints(A,B,P,Q,Pc)
+ \tkzLabelPoints[above](C,Qc)
+ \tkzLabelPoints[left](Qb,Pb)
+ \tkzLabelPoints[right](Qa,Pa)
+ \end{tikzpicture}
+\end{center}
+
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point: new (0,0)
+ z.B = point: new (4,0)
+ z.C = point: new (1.8,3)
+ T.ABC = triangle: new(z.A,z.B,z.C)
+ z.Q = point : new (1,-0.4)
+ z.P = point : new (2,1)
+ T.cevian = T.ABC : cevian (z.Q)
+ z.Qa,z.Qb,z.Qc = get_points (T.cevian)
+ T.cevian = T.ABC : cevian (z.P)
+ z.Pa,z.Pb,z.Pc = get_points (T.cevian)
+ C.cev = T.ABC : cevian_circle (z.P)
+ z.w = C.cev.center
\end{tkzelements}
\begin{tikzpicture}
\tkzGetNodes
-\tkzDrawPolygons(a,b,c ta,tb,tc)
-\tkzDrawSegments(a,ta b,tb c,tc)
-\tkzDrawPoints(a,b,c,i,ta,tb,tc)
-\tkzLabelPoints(a,b,c,i)
-\tkzDrawCircles(w,ta)
+\tkzDrawPolygons[cyan](A,B,C)
+\tkzDrawSegments[cyan](A,Qb B,Qa)
+\tkzDrawSegments[red](A,Qa B,Qb C,Q)
+\tkzDrawSegments[blue](A,Pa B,Pb C,Pc)
+\tkzDrawCircles(w,Pa)
+\tkzDrawPoints(A,B,C,Qa,Qb,Qc,P,Q,Pa,Pb,Pc)
+\tkzLabelPoints(A,B,P,Q,Pc)
+\tkzLabelPoints[above](C,Qc)
+\tkzLabelPoints[left](Qb,Pb)
+\tkzLabelPoints[right](Qa,Pa)
\end{tikzpicture}
+\end{Verbatim}
\end{minipage}
+
% subsubsection method_imeth_triangle_cevian (end)
-\subsubsection{Méthodes \Imeth{triangle}{pedal} et \Imeth{triangle}{pedal\_circle}} % (fold)
+\subsubsection{Methods \Imeth{triangle}{pedal} and \Imeth{triangle}{pedal\_circle}} % (fold)
\label{ssub:method_imeth_triangle_pedal}
+Given a point $P$, the pedal triangle of $P$ is the triangle whose polygon vertices are the feet of the perpendiculars from $P$ to the side lines.
+
+\vspace{6pt}
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
z.A = point: new(0,0)
z.B = point: new(5,0)
z.C = point: new(1.5,3)
- z.O = point: new (2,1)
+ z.O = point: new (2,1)
T.ABC = triangle: new (z.A,z.B,z.C)
T.pedal = T.ABC : pedal (z.O)
z.E,z.F,z.G = get_points(T.pedal)
@@ -334,7 +1467,8 @@ z.w = C.cev.center
\tkzDrawPolygon[red](E,F,G)
\tkzDrawCircle(w,T)
\tkzDrawPoints(A,B,C,E,F,G,O)
- \tkzLabelPoints(A,B,C,E,F,G)
+ \tkzLabelPoints(A,B,G)
+ \tkzLabelPoints[above](C,E,F)
\tkzDrawSegments(O,E O,F O,G)
\end{tikzpicture}
\end{Verbatim}
@@ -344,7 +1478,7 @@ z.w = C.cev.center
z.A = point: new(0,0)
z.B = point: new(5,0)
z.C = point: new(1.5,3)
- z.O = point: new (2,1)
+ z.O = point: new (2,1)
T.ABC = triangle: new (z.A,z.B,z.C)
T.pedal = T.ABC : pedal (z.O)
z.E,z.F,z.G = get_points(T.pedal)
@@ -352,23 +1486,28 @@ z.w = C.cev.center
z.w = C.pedal.center
z.T = C.pedal.through
\end{tkzelements}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygon(A,B,C)
- \tkzDrawPolygon[red](E,F,G)
- \tkzDrawCircle(w,T)
- \tkzDrawPoints(A,B,C,E,F,G,O)
- \tkzLabelPoints(A,B,C,E,F,G)
- \tkzDrawSegments(O,E O,F O,G)
- \end{tikzpicture}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[red](E,F,G)
+ \tkzDrawCircle(w,T)
+ \tkzDrawPoints(A,B,C,E,F,G,O)
+ \tkzLabelPoints(A,B,G)
+ \tkzLabelPoints[above](C,E,F)
+ \tkzDrawSegments(O,E O,F O,G)
+ \end{tikzpicture}
+ \end{center}
+
\end{minipage}
% subsubsection method_imeth_triangle_pedal (end)
-\subsubsection{Méthodes \Imeth{triangle}{conway\_points} et \Imeth{triangle}{conway\_circle}} % (fold)
+\subsubsection{Methods \Imeth{triangle}{conway\_points} and \Imeth{triangle}{conway\_circle}} % (fold)
\label{ssub:method_imeth_triangle_conway}
-En géométrie plane, le théorème du cercle de Conway stipule que lorsque les côtés se rencontrant à chaque sommet d'un triangle sont prolongés par la longueur du côté opposé, les six points d'extrémité des trois segments de droite résultants se trouvent sur un cercle dont le centre est le centre d'incidence du triangle.
+In plane geometry, Conway's circle theorem states that when the sides meeting at each vertex of a triangle are extended by the length of the opposite side, the six endpoints of the three resulting line segments lie on a circle whose centre is the centre of incidence of the triangle.
+\vspace{6pt}
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
@@ -424,9 +1563,557 @@ En géométrie plane, le théorème du cercle de Conway stipule que lorsque les
% subsubsection methode_imeth_triangle_conway (end)
+\subsubsection{Methods \Imeth{triangle}{bevan\_circle} and \Imeth{triangle}{bevan\_point} } % (fold)
+\label{ssub:methods_imeth_triangle_bevan_circle_and_imeth_triangle_bevan_point}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = .5
+ z.A = point: new (1,1)
+ z.B = point: new (6,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ C.bevan = T : bevan_circle ()
+ z.c,z.t = get_points (C.bevan)
+ -- or z.c = T : bevan_point ()
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawCircle(c,t)
+ \tkzDrawPoints(A,B,C,c,t)
+ \tkzLabelPoints(A,B,c,t)
+ \tkzLabelPoints[above](C)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale =.5
+ z.A = point: new (1,1)
+ z.B = point: new (6,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ C.bevan = T : bevan_circle ()
+ z.c,z.t = get_points (C.bevan)
+ -- or z.c = T : bevan_point ()
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawCircle(c,t)
+ \tkzDrawPoints(A,B,C,c,t)
+ \tkzLabelPoints(A,B,c,t)
+ \tkzLabelPoints[above](C)
+ \end{tikzpicture}
+ \end{center}
+
+\end{minipage}
+
+% subsubsection methods_imeth_triangle_bevan_circle_and_imeth_triangle_bevan_point (end)
+
+
+
+%%%%%% Triangles %%%%%
+
+
+
+\subsubsection{Method \Imeth{triangle}{feuerbach} and method \Imeth{triangle}{feuerbach\_point}} % (fold)
+\label{ssub:method_imeth_triangle_feuerbach}
+
+The Feuerbach triangle is the triangle formed by the three points of tangency of the nine-point circle with the excircles. (The fact that the excircles touch the nine-point circle is known as Feuerbach's theorem.)
+Refer to \href{https://mathworld.wolfram.com/FeuerbachTriangle.html}{Weisstein, Eric W. "Feuerbach Triangle." From MathWorld--A Wolfram Web Resource.}.
+
+The exinscribed circles of a triangle are tangent to the circle of the nine points of a triangle at points which form the \code{Feuerbach} triangle ($FaFbFc$). The inscribed circle and the circle of nine points are tangent at a point called the Feurerbach point $F$.
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+\begin{tkzelements}
+ scale = .8
+ z.A = point: new (0,0)
+ z.B = point: new (6,0)
+ z.C = point: new (0.8,4)
+ T.ABC = triangle : new ( z.A,z.B,z.C )
+ z.N = T.ABC.eulercenter
+ z.Fa,z.Fb,z.Fc = get_points ( T.ABC : feuerbach () )
+ z.F = T.ABC : feuerbach_point ()
+ z.Ja,z.Jb,z.Jc = get_points ( T.ABC : excentral () )
+ z.I = T.ABC.incenter
+ z.Ia,z.Ib,z.Ic = get_points (T.ABC : intouch ())
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawPoints(Ja,Jb,Jc)
+\tkzClipBB
+\tkzFillCircles[green!30,,opacity=.5](N,Fa)
+\tkzFillCircles[lightgray,,opacity=.5](I,F)
+\tkzDrawLines[add=3 and 3](A,B A,C B,C)
+\tkzDrawCircles(Ja,Fa Jb,Fb Jc,Fc N,Fa N,F I,F)
+\tkzDrawPoints(A,B,C,F,Fa,Fb,Fc,N,I,Ia,Ib,Ic)
+\tkzLabelPoints(N,A,B,Ia,Ib,Ic)
+\tkzLabelPoints[above](Fa,Fb,Fc,F,I,C)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+
+
+\begin{tkzelements}
+ scale = .7
+ z.A = point: new (0,0)
+ z.B = point: new (6,0)
+ z.C = point: new (0.8,4)
+ T.ABC = triangle : new ( z.A,z.B,z.C )
+ z.N = T.ABC.eulercenter
+ z.Fa,z.Fb,z.Fc = get_points ( T.ABC : feuerbach () )
+ z.F = T.ABC : feuerbach_point ()
+ z.Ja,z.Jb,z.Jc = get_points ( T.ABC : excentral () )
+ z.I = T.ABC.incenter
+ z.Ia,z.Ib,z.Ic = get_points (T.ABC : intouch ())
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(Ja,Jb,Jc)
+ \tkzClipBB
+ \tkzFillCircles[green!30,,opacity=.5](N,Fa)
+ \tkzFillCircles[lightgray,,opacity=.5](I,F)
+ \tkzDrawLines[add=3 and 3](A,B A,C B,C)
+ \tkzDrawCircles(Ja,Fa Jb,Fb Jc,Fc N,Fa N,F I,F)
+ \tkzDrawPoints(A,B,C,F,Fa,Fb,Fc,N,I,Ia,Ib,Ic)
+ \tkzLabelPoints(N,A,B,Ia,Ib,Ic)
+ \tkzLabelPoints[above](Fa,Fb,Fc,F,I,C)
+ \end{tikzpicture}
+\end{center}
+
+%subsubsection method_imeth_triangle_feuerbach (end)
+
+
+\subsubsection{Method \Imeth{triangle}{similar}} % (fold)
+\label{ssub:method_imeth_triangle_similar}
+
+The \code{similar} method creates a new triangle whose sides are parallel to the sides of the original triangle and pass through its vertices.
+
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+ \begin{tkzelements}
+ scale =.5
+ z.A = point: new (0 , 0)
+ z.B = point: new (6 , 0)
+ z.C = point: new (1.5 , 3.5)
+ T.ABC = triangle: new (z.A,z.B,z.C)
+ z.X,z.Y,z.Z = get_points ( T.ABC : similar ())
+ z.H_a,z.H_b,
+ z.H_c = get_points (T.ABC : orthic ())
+ \end{tkzelements}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C X,Y,Z)
+ \tkzDrawLines(A,H_a B,H_b C,H_c)
+ \tkzDrawPoints(A,B,C,X,Y,Z)
+ \tkzLabelPoints(A,B,Z)
+ \tkzLabelPoints[above](X,Y,C)
+ \end{tikzpicture}
+ \end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale =.5
+ z.A = point: new (0 , 0)
+ z.B = point: new (6 , 0)
+ z.C = point: new (1.5 , 3.5)
+ T.ABC = triangle: new (z.A,z.B,z.C)
+ z.X,z.Y,z.Z = get_points ( T.ABC : similar ())
+ z.H_a,z.H_b,
+ z.H_c = get_points (T.ABC : orthic ())
+ \end{tkzelements}
+\hspace*{\fill}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C X,Y,Z)
+ \tkzDrawLines(A,H_a B,H_b C,H_c)
+ \tkzDrawPoints(A,B,C,X,Y,Z)
+ \tkzLabelPoints(A,B,Z)
+ \tkzLabelPoints[above](X,Y,C)
+ \end{tikzpicture}
+\end{minipage}
+
+
+% subsubsection method_imeth_triangle_similar (end)
+
+\subsubsection{Method \Imeth{triangle}{medial}} % (fold)
+\label{ssub:method_imeth_triangle_medial}
+
+The triangle $MaMbMc$ formed by joining the midpoints of the sides of a triangle $ABC$. The medial triangle is sometimes also called the auxiliary triangle (Dixon 1991).
+[\href{https://mathworld.wolfram.com/MedialTriangle.html}{Weisstein, Eric W. "Medial Triangle." From MathWorld--A Wolfram Web Resource.}]
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+ \begin{tkzelements}
+ scale = 1.25
+ z.A = point: new (0,1)
+ z.B = point: new (6,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ T.med = T : medial ()
+ z.Ma,z.Mb,z.Mc= get_points (T.med)
+ z.G = T.centroid
+ z.O = T.circumcenter
+ \end{tkzelements}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPolygons[red](Ma,Mb,Mc)
+ \tkzDrawSegments(A,Ma B,Mb C,Mc)
+ \tkzDrawSegments[dashed,cyan](O,Ma O,Mb O,Mc)
+ \tkzDrawPoints(A,B,C,Ma,Mb,Mc,O,G)
+ \tkzLabelPoints(A,B,Mc,O)
+ \tkzLabelPoints[above](C)
+ \tkzLabelPoints[left](Mb)
+ \tkzLabelPoints[right](Ma,G)
+ \tkzMarkRightAngles[fill=cyan!20,
+ opacity=.4](O,Ma,B O,Mb,A O,Mc,A)
+ \end{tikzpicture}
+ \end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale = 1.25
+ z.A = point: new (0,1)
+ z.B = point: new (6,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ T.med = T : medial ()
+ z.Ma,z.Mb,z.Mc= get_points (T.med)
+ z.G = T.centroid
+ z.O = T.circumcenter
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPolygons[red](Ma,Mb,Mc)
+ \tkzDrawSegments(A,Ma B,Mb C,Mc)
+ \tkzDrawSegments[dashed,cyan](O,Ma O,Mb O,Mc)
+ \tkzDrawPoints(A,B,C,Ma,Mb,Mc,O,G)
+ \tkzLabelPoints(A,B,Mc,O)
+ \tkzLabelPoints[above](C)
+ \tkzLabelPoints[left](Mb)
+ \tkzLabelPoints[right](Ma,G)
+ \tkzMarkRightAngles[fill=cyan!20,
+ opacity=.4](O,Ma,B O,Mb,A O,Mc,A)
+ \end{tikzpicture}
+ \end{center}
+\end{minipage}
+
+
+% subsubsection method_imeth_triangle_medial (end)
+
+\subsubsection{Method \Imeth{triangle}{incentral} } % (fold)
+\label{ssub:method_incentral}
+
+The incentral triangle $IaIbIc$ is the Cevian triangle of a triangle $ABC$ with respect to its incenter $I$. It is therefore also the triangle whose vertices are determined by the intersections of the reference triangle's angle bisectors with the respective opposite sides.
+[ \href{https://mathworld.wolfram.com/IncentralTriangle.html}{Weisstein, Eric W. "Incentral Triangle." From MathWorld--A Wolfram Web Resource.}
+]
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point: new (0 , 0)
+ z.B = point: new (6 , 0)
+ z.C = point: new (1 , 4)
+ T.ABC = triangle: new (z.A,z.B,z.C)
+ z.I = T.ABC.incenter
+ z.Ia,z.Ib,
+ z.Ic = get_points (T.ABC : incentral ())
+ z.Ta,z.Tb,
+ z.Tc = get_points (T.ABC : intouch ())
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[dashed,red](Ia,Ib,Ic)
+ \tkzDrawSegments[dashed,red](A,Ia B,Ib C,Ic)
+ \tkzDrawCircle(I,Ta)
+ \tkzDrawPoints(A,B,C,Ia,Ib,Ic,I,Ta,Tb,Tc)
+ \tkzLabelPoints(A,B,Ic,I,Tc)
+ \tkzLabelPoints[above](Ia,Ta,C)
+ \tkzLabelPoints[above left](Ib,Tb)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ z.A = point: new (0 , 0)
+ z.B = point: new (6 , 0)
+ z.C = point: new (1 , 4)
+ T.ABC = triangle: new (z.A,z.B,z.C)
+ z.I = T.ABC.incenter
+ z.Ia,z.Ib,
+ z.Ic = get_points (T.ABC : incentral ())
+ z.Ta,z.Tb,
+ z.Tc = get_points (T.ABC : intouch ())
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[dashed,red](Ia,Ib,Ic)
+ \tkzDrawSegments[dashed,red](A,Ia B,Ib C,Ic)
+ \tkzDrawCircle(I,Ta)
+ \tkzDrawPoints(A,B,C,Ia,Ib,Ic,I,Ta,Tb,Tc)
+ \tkzLabelPoints(A,B,Ic,I,Tc)
+ \tkzLabelPoints[above](Ia,Ta,C)
+ \tkzLabelPoints[above left](Ib,Tb)
+ \end{tikzpicture}
+ \end{center}
+
+\end{minipage}
+
+% subsubsection method_incentral (end)
+
+
+\subsubsection{Method \Imeth{triangle}{tangential}} % (fold)
+\label{ssub:method_imeth_triangle_tangential}
+
+The tangential triangle is the triangle $TaTbTc$ formed by the lines tangent to the circumcircle of a given triangle DeltaABC at its vertices. It is therefore antipedal triangle of $ABC$ with respect to the circumcenter $O$. It is also anticevian triangle of $ABC$ with the symmedian point $K$ as the anticevian point (Kimberling 1998, p. 156). Furthermore, the symmedian point $K$ of $ABC$ is the Gergonne point of $TaTbTc$.
+
+The sides of an orthic triangle are parallel to the tangents to the circumcircle at the vertices (Johnson 1929, p. 172). This is equivalent to the statement that each line from a triangle's circumcenter to a vertex is always perpendicular to the corresponding side of the orthic triangle (Honsberger 1995, p. 22), and to the fact that the orthic and tangential triangles are homothetic.
+[ \href{https://mathworld.wolfram.com/TangentialTriangle.html}{Weisstein, Eric W. "Tangential Triangle." From MathWorld--A Wolfram Web Resource.}]
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = .75
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,3)
+ T = triangle: new(z.A,z.B,z.C)
+ z.H = T.orthocenter
+ z.O = T.circumcenter
+ z.L = T : symmedian_point ()
+ T.orthic = T: orthic()
+ z.Ha,
+ z.Hb,
+ z.Hc = get_points (T.orthic)
+ z.Ta,
+ z.Tb,
+ z.Tc = get_points (T : tangential ())
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C Ta,Tb,Tc)
+ \tkzDrawCircle(O,A)
+ \tkzDrawPoints(A,B,C,O,H,Ta,Tb,Tc,L)
+ \tkzDrawSegments[red](C,Hc B,Hb A,Ha)
+ \tkzDrawSegments[green](C,Tc B,Tb A,Ta)
+ \tkzDrawPolygon[blue](Ha,Hb,Hc)
+ \tkzLabelPoints(A,B,O,Tc)
+ \tkzLabelPoints[above](C,Tb,Ta)
+ \tkzLabelPoints[font=\small](Hc)
+ \tkzLabelPoints[font=\small,above](Ha,Hb)
+ \tkzMarkRightAngles(A,Ha,C B,Hb,A C,Hc,B)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = .75
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (1,3)
+ T = triangle: new(z.A,z.B,z.C)
+ z.H = T.orthocenter
+ z.O = T.circumcenter
+ z.L = T : symmedian_point ()
+ T.orthic = T: orthic()
+ z.Ha,
+ z.Hb,
+ z.Hc = get_points (T.orthic)
+ z.Ta,
+ z.Tb,
+ z.Tc = get_points (T : tangential ())
+\end{tkzelements}
+
+ \begin{center}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C Ta,Tb,Tc)
+ \tkzDrawCircle(O,A)
+ \tkzDrawPoints(A,B,C,O,H,Ta,Tb,Tc,L)
+ \tkzDrawSegments[red](C,Hc B,Hb A,Ha)
+ \tkzDrawSegments[green](C,Tc B,Tb A,Ta)
+ \tkzDrawPolygon[blue](Ha,Hb,Hc)
+ \tkzLabelPoints(A,B,O,Tc)
+ \tkzLabelPoints[above](C,Tb,Ta)
+ \tkzLabelPoints[font=\small](Hc)
+ \tkzLabelPoints[font=\small,above](Ha,Hb)
+ \tkzMarkRightAngles(A,Ha,C B,Hb,A C,Hc,B)
+\end{tikzpicture}
+ \end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_triangle_tangential (end)
+
+
+\subsubsection{Method \Imeth{triangle}{symmedial}} % (fold)
+\label{ssub:method_imeth_triangle_symmedial}
+
+The symmedial triangle $LaLbLc$ is the triangle whose vertices are the intersection points of the symmedians with the reference triangle $ABC$.
+
+The symmedial circle is the circumcircle of the symmedial triangle.
+
+The following example groups several concepts around the symmedian. As a reminder, a symmedian of a triangle is the reflection of the median with respect to the angle bisector.
+
+The points of contact of the symmedians with the sides of the triangle are obtained using the \code{symmedian} method.
+The intersection of the symmedians is the point known as the \code{Lemoine} or \code{Symmedian} point.
+You can use the triangle methods \code{lemoine\_point} or \code{symmedian\_point}. If you only need one of the lines, you can use the method \code{symmedian\_line(n)}. \(n=0\) corresponds to the line coming from the first vertex of the triangle, \(n=1\) to the second, and so on.
+
+In the next example, $L$ is the \code{Lemoine point} or the \code{Symmedian point}. $LaLbLc$ is the symmedian triangle.[\href{https://mathworld.wolfram.com/SymmedianPoint.html}{Weisstein, Eric W. "Symmedian Point." From MathWorld--A Wolfram Web Resource.}]
+
+\vspace{6pt}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = 2
+ z.A = point : new (0,0)
+ z.B = point : new (7,0)
+ z.C = point : new (2,3)
+ T.ABC = triangle : new (z.A,z.B,z.C)
+ z.L = T.ABC : lemoine_point ()
+ T.SY = T.ABC : symmedian ()
+ T.med = T.ABC : medial ()
+ z.Ka,z.Kb,z.Kc = get_points (T.SY)
+ z.Ma,z.Mb,z.Mc = get_points (T.med)
+ L.Kb = T.ABC : symmedian_line (1)
+ _,z.Kb = get_points(L.Kb)
+ z.G = T.ABC.centroid
+ z.Ia,z.Ib,z.Ic = get_points ( T.ABC : incentral ())
+ -- z.T = T.ABC : trilinear (0,1,1)
+ z.I = T.ABC.incenter
+\end{tkzelements}
+\begin{tikzpicture}
+\tkzGetNodes
+\tkzDrawPolygons(A,B,C)
+\tkzDrawPoints(A,B,C,L,Ka,Kb,Kc,G,Ma,Mb,Mc,Ia,Ib,Ic,I)
+\tkzDrawSegments[cyan](A,Ka B,Kb C,Kc)
+\tkzDrawSegments[green](A,Ma B,Mb C,Mc)
+\tkzDrawSegments[dashed,red](A,Ia B,Ib C,Ic)
+\tkzLabelPoints[above](C,Ka,Ia,Ma)
+\tkzLabelPoints[above left](Kb,Ib,Mb)
+\tkzLabelPoints(A,B,L,Kc,I,Ic,Mc,G)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = 2
+ z.A = point : new (0,0)
+ z.B = point : new (7,0)
+ z.C = point : new (2,3)
+ T.ABC = triangle : new (z.A,z.B,z.C)
+ z.L = T.ABC : lemoine_point ()
+ T.SY = T.ABC : symmedian ()
+ T.med = T.ABC : medial ()
+ z.Ka,z.Kb,z.Kc = get_points (T.SY)
+ z.Ma,z.Mb,z.Mc = get_points (T.med)
+ L.Kb = T.ABC : symmedian_line (1)
+ _,z.Kb = get_points(L.Kb)
+ z.G = T.ABC.centroid
+ z.Ia,z.Ib,z.Ic = get_points ( T.ABC : incentral ())
+ -- z.T = T.ABC : trilinear (0,1,1)
+ z.I = T.ABC.incenter
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C,L,Ka,Kb,Kc,G,Ma,Mb,Mc,Ia,Ib,Ic,I)
+ \tkzDrawSegments[cyan](A,Ka B,Kb C,Kc)
+ \tkzDrawSegments[green](A,Ma B,Mb C,Mc)
+ \tkzDrawSegments[dashed,red](A,Ia B,Ib C,Ic)
+ \tkzLabelPoints[above](C,Ka,Ia,Ma)
+ \tkzLabelPoints[above left](Kb,Ib,Mb)
+ \tkzLabelPoints(A,B,L,Kc,I,Ic,Mc,G)
+ \end{tikzpicture}
+\end{center}
+
+
+\end{minipage}
+
+% subsubsection method_imeth_triangle_symmedial (end)
+
+\subsubsection{Method \Imeth{triangle}{anti}} % (fold)
+\label{ssub:method_imeth_triangle_anti}
+
+The anticomplementary triangle is the triangle $TaTbTc$ which has a given triangle $ABC$ as its medial triangle. It is therefore the anticevian triangle with respect to the triangle centroid G (Kimberling 1998, p. 156). [\href{https://mathworld.wolfram.com/AnticomplementaryTriangle.html}{Weisstein, Eric W. "Anticomplementary Triangle." From MathWorld--A Wolfram Web Resource.}]
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = .6
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ T.similar = T: anti()
+ z.Ta,
+ z.Tb,
+ z.Tc = get_points (T.similar)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawPolygon[blue](Ta,Tb,Tc)
+ \tkzDrawPoints(A,B,C,Ta,Tb,Tc)
+ \tkzLabelPoints(A,B,Tc)
+ \tkzLabelPoints[above](Ta,Tb,C)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = .6
+ z.A = point: new (0,0)
+ z.B = point: new (5,0)
+ z.C = point: new (2,4)
+ T = triangle: new(z.A,z.B,z.C)
+ T.similar = T: anti()
+ z.Ta,
+ z.Tb,
+ z.Tc = get_points (T.similar)
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons[red](A,B,C)
+ \tkzDrawPolygon[blue](Ta,Tb,Tc)
+ \tkzDrawPoints(A,B,C,Ta,Tb,Tc)
+ \tkzLabelPoints(A,B,Tc)
+ \tkzLabelPoints[above](Ta,Tb,C)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+
+% subsubsection method_imeth_triangle_anti (end)
+
+
\subsubsection{Euler line} % (fold)
\label{ssub:euler_line}
+The line on which the orthocenter $H$, triangle centroid $G$, circumcenter $O$, nine-point center $N$, and a number of other important triangle centers lie.
+[ \href{https://mathworld.wolfram.com/EulerLine.html}{Weisstein, Eric W. "Euler Line." From MathWorld--A Wolfram Web Resource.}]
+
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
@@ -468,33 +2155,38 @@ En géométrie plane, le théorème du cercle de Conway stipule que lorsque les
z.P,z.Q,z.R = get_points (T.ABC: orthic())
z.K,z.I,z.J = get_points (T.ABC: medial ())
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawLines[blue](O,H)
-\tkzDrawCircle[red](N,I)
-\tkzDrawCircles[teal](O,A)
-\tkzDrawSegments(A,P B,Q C,R)
-\tkzDrawSegments[red](A,I B,J C,K)
-\tkzDrawPolygons(A,B,C)
-\tkzDrawPoints(A,B,C,N,I,J,K,O,P,Q,R,H,G)
-\tkzLabelPoints(A,B,C,I,J,K,P,Q,R)
-\tkzLabelPoints[below](N,O,G,H)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines[blue](O,H)
+ \tkzDrawCircle[red](N,I)
+ \tkzDrawCircles[teal](O,A)
+ \tkzDrawSegments(A,P B,Q C,R)
+ \tkzDrawSegments[red](A,I B,J C,K)
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C,N,I,J,K,O,P,Q,R,H,G)
+ \tkzLabelPoints(A,B,J,P,R)
+ \tkzLabelPoints[above](C,I,Q,K)
+ \tkzLabelPoints[below](N,O,G,H)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsubsection euler_line (end)
\subsection{Euler ellipse} % (fold)
\label{sub:euler_ellipse}
+The Euler ellipse is a conic, tangent to the three sides of a triangle, with the orthocentre and the centre of the circumscribed circle as foci.
Example of obtaining the Euler circle as well as the Euler ellipse.
+\vspace{6pt}
\begin{tkzelements}
z.A = point: new (2,3.8)
z.B = point: new (0 ,0)
z.C = point: new (6.2 ,0)
L.AB = line : new ( z.A , z.B )
T.ABC = triangle: new (z.A,z.B,z.C)
-z.K = midpoint (z.B,z.C)
+z.K = midpoint (z.B,z.C)
E.euler = T.ABC : euler_ellipse ()
z.N = T.ABC.eulercenter
C.euler = circle : new (z.N,z.K)
@@ -512,7 +2204,7 @@ z.B = point: new (0 ,0)
z.C = point: new (6.2 ,0)
L.AB = line : new ( z.A , z.B )
T.ABC = triangle: new (z.A,z.B,z.C)
-z.K = midpoint (z.B,z.C)
+z.K = midpoint (z.B,z.C)
E.euler = T.ABC : euler_ellipse ()
z.N = T.ABC.eulercenter
C.euler = circle : new (z.N,z.K)
@@ -554,21 +2246,22 @@ z.H = T.ABC.orthocenter
\subsubsection{Steiner inellipse and circumellipse} % (fold)
\label{ssub:steiner_inellipse_and_circumellipse}
-In this example, the inner and outer Steiner ellipses, referred to as the "inellipse" and "circumellipse" (Mathworld.com), respectively, along with the orthoptic circle, are depicted.. The triangle must be acutangle.
+In this example, the inner and outer Steiner ellipses, referred to as the "inellipse" and "circumellipse" [\href{https://mathworld.wolfram.com/SteinerInellipse.html}{Weisstein, Eric W. "Steiner Inellipse." From MathWorld--A Wolfram Web Resource.} and \href{https://mathworld.wolfram.com/SteinerCircumellipse.html}{Weisstein, Eric W. "Steiner Circumellipse." From MathWorld--A Wolfram Web Resource.}], respectively, along with the orthoptic circle, are depicted.. The triangle must be acutangle.
+\vspace{6pt}
\begin{minipage}{.5\textwidth}
\begin{Verbatim}
\begin{tkzelements}
scale = .5
z.A = point: new (1 , 4)
z.B = point: new (11 , 1)
- z.C = point: new (5 , 12)
+ z.C = point: new (5 , 12)
T.ABC = triangle: new(z.A,z.B,z.C)
E = T.ABC: steiner_inellipse ()
z.G = E.center
ang = math.deg(E.slope)
z.F = E.Fa
- z.E = E.Fb
+ z.E = E.Fb
C = E: orthoptic_circle ()
z.w = C.center
z.o = C.through
@@ -584,13 +2277,13 @@ In this example, the inner and outer Steiner ellipses, referred to as the "inell
scale = .5
z.A = point: new (1 , 4)
z.B = point: new (11 , 1)
-z.C = point: new (5 , 12)
+z.C = point: new (5 , 12)
T.ABC = triangle: new(z.A,z.B,z.C)
E = T.ABC: steiner_inellipse ()
z.G = E.center
ang = math.deg(E.slope)
z.F = E.Fa
-z.E = E.Fb
+z.E = E.Fb
C = E: orthoptic_circle ()
z.w = C.center
z.o = C.through
@@ -611,7 +2304,7 @@ z.T2 = L.T2.pb
\tkzUseLua{EE.Ry},\tkzUseLua{ang})
\tkzDrawLines(F,E M,T1 M,T2) %
\tkzDrawPoints(A,B,C,F,E,G,M,T1,T2)
-\tkzLabelPoints[above](C,M,T1)
+\tkzLabelPoints[above](C,M,T1)
\tkzLabelPoints[right](T2,B)
\tkzLabelPoints[below left](A,F,E,G)
\end{tikzpicture}
@@ -628,7 +2321,7 @@ z.T2 = L.T2.pb
\tkzUseLua{EE.Ry},\tkzUseLua{ang})
\tkzDrawLines(F,E M,T1 M,T2) %
\tkzDrawPoints(A,B,C,F,E,G,M,T1,T2)
-\tkzLabelPoints[above](C,M,T1)
+\tkzLabelPoints[above](C,M,T1)
\tkzLabelPoints[right](T2,B)
\tkzLabelPoints[below left](A,F,E,G)
\end{tikzpicture}
@@ -639,9 +2332,17 @@ z.T2 = L.T2.pb
\subsection{Harmonic division and bisector} % (fold)
\label{sub:harmonic_division_and_bisector}
+Let four points $A$, $C$, $B$ and $D$, in this order, lying on the straight line $(d)$ and $M$ un point pris hors de $(d)$. Then, if two of the following three propositions are true, then the third is also true:
+ \begin{enumerate}
+ \item The division (A,B;C,D) is harmonic. ($CA/CB = DA/DB$)
+ \item $(MC)$ is the internal angle bisector of $\widehat{AMB}$.
+ \item $(MD) \perp (MC)$.
+ \end{enumerate}
+
+ \vspace{6pt}
\begin{minipage}{.4\textwidth}
\begin{Verbatim}
-\begin{tkzelements}
+\begin{tkzelements}
scale = .4
z.A = point: new (0 , 0)
z.B = point: new (6 , 0)
@@ -664,7 +2365,7 @@ z.T2 = L.T2.pb
\end{Verbatim}
\end{minipage}
\begin{minipage}{.6\textwidth}
-\begin{tkzelements}
+\begin{tkzelements}
scale =.4
z.A = point: new (0 , 0)
z.B = point: new (6 , 0)
@@ -684,7 +2385,7 @@ z.T2 = L.T2.pb
z.E = intersection (L.LL,L.MC)
z.F = intersection (L.LL,L.MD)
\end{tkzelements}
-\hspace{\fill}
+\hspace{\fill}
\begin{tikzpicture}
\tkzGetNodes
\tkzDrawPolygon(A,B,M)
@@ -719,59 +2420,8 @@ z.T2 = L.T2.pb
\end{Verbatim}
% subsection harmonic_division_and_bisector (end)
-\subsubsection{Method \Imeth{triangle}{cevan}} % (fold)
-\label{ssub:method_imeth_triangle_cevan}
-
-\begin{minipage}{.5\textwidth}
- \begin{Verbatim}
- \begin{tkzelements}
- scale = 2
- z.a = point: new (1,2)
- z.b = point: new (5,1)
- z.c = point: new (3,5)
- T = triangle: new (z.a,z.b,z.c)
- z.i = T.orthocenter
- T.cevian = T : cevian (z.i)
- z.ta,z.tb,z.tc = get_points (T.cevian)
- C.cev = T : cevian_circle (z.i)
- z.w = C.cev.center
- \end{tkzelements}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygons(a,b,c ta,tb,tc)
- \tkzDrawSegments(a,ta b,tb c,tc)
- \tkzDrawPoints(a,b,c,i,ta,tb,tc)
- \tkzLabelPoints(a,b,c,i)
- \tkzDrawCircles(w,ta)
- \end{tikzpicture}
- \end{Verbatim}
-\end{minipage}
-\begin{minipage}{.5\textwidth}
- \begin{tkzelements}
- scale = 2
- z.a = point: new (1,2)
- z.b = point: new (5,1)
- z.c = point: new (3,5)
- T = triangle: new (z.a,z.b,z.c)
- z.i = T.orthocenter
- T.cevian = T : cevian (z.i)
- z.ta,z.tb,z.tc = get_points (T.cevian)
- C.cev = T : cevian_circle (z.i)
- z.w = C.cev.center
- \end{tkzelements}
- \begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygons(a,b,c ta,tb,tc)
- \tkzDrawSegments(a,ta b,tb c,tc)
- \tkzDrawPoints(a,b,c,i,ta,tb,tc)
- \tkzLabelPoints(a,b,c,i)
- \tkzDrawCircles(w,ta)
- \end{tikzpicture}
-\end{minipage}
-
-
-% subsubsection method_imeth_triangle_cevan (end)
-% subsection methods_of_the_class_triangle (end)
-% section class_triangle (end)
+%
+% % subsection methods_of_the_class_triangle (end)
+% % section class_triangle (end)
\endinput
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-vectors.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-vectors.tex
index b981ef555ab..ed1ea771833 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-vectors.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-classes-vectors.tex
@@ -41,11 +41,11 @@ z.E = V.AE.head -- we recover the final point (head)
\begin{tabular}{lll}
\toprule
\textbf{Attributes} & \textbf{Application}& \textbf{Example}\\
-\Iattr{vector}{tail} & |V.AB.t = z.A| & Refer to (\ref{ssub:methods}) \\
-\Iattr{vector}{head} & |V.AB.head = z.B| & Refer to (\ref{ssub:methods}) \\
+\Iattr{vector}{tail} & |V.AB.t = z.A| & [\ref{ssub:methods}]\\
+\Iattr{vector}{head} & |V.AB.head = z.B| & [\ref{ssub:methods}] \\
\Iattr{vector}{type} & |V.AB.type = 'vector'| & \\
-\Iattr{vector}{slope} & |V.AB.slope| & Refer to (\ref{ssub:example_vector_attributes})\\
-\Iattr{vector}{length} & |V.AB.norm|& Refer to (\ref{ssub:example_vector_attributes})\\
+\Iattr{vector}{slope} & |V.AB.slope| & [\ref{ssub:example_vector_attributes}] \\
+\Iattr{vector}{length} & |V.AB.norm|& [\ref{ssub:example_vector_attributes} ]\\
\Iattr{vector}{mtx} & |V.AB.mtx| & The result is a column matrix |{{V.AB.t},{V.AB.h}}|\\
\bottomrule
\end{tabular}
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-examples.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-examples.tex
index 4f46d4a1278..284ecca8eba 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-examples.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-examples.tex
@@ -2,7 +2,65 @@
\section{Examples} % (fold)
\label{sec:examples}
-
+
+\subsection{Length transfer} % (fold)
+\label{sub:report_de_distance}
+
+Use of |north and east| functions linked to points, to transfer lengths, Refer to (\ref{sub:length_of_a_segment})
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = .75
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 3 , 0 )
+ L.AB = line : new ( z.A , z.B )
+ T.ABC = L.AB : sublime ()
+ z.C = T.ABC.pc
+ z.D = z.B: north (length(z.B,z.C))
+ z.E = z.B: east (L.AB.length)
+ z.M = L.AB.mid
+ z.F = z.E : north (length(z.C,z.M))
+\end{tkzelements}
+\begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawSegments[gray,dashed](B,D B,E E,F C,M)
+ \tkzDrawPoints(A,...,F)
+ \tkzLabelPoints(A,B,E,M)
+ \tkzLabelPoints[above right](C,D,F)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+ scale = .75
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 3 , 0 )
+ L.AB = line : new ( z.A , z.B )
+ T.ABC = L.AB : sublime ()
+ z.C = T.ABC.pc
+ z.D = z.B: north (length(z.B,z.C))
+ z.E = z.B: east (L.AB.length)
+ z.M = L.AB.mid
+ z.F = z.E : north (length(z.C,z.M))
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawSegments[gray,dashed](B,D B,E E,F C,M)
+ \tkzDrawPoints(A,...,F)
+ \tkzLabelPoints(A,B,E,M)
+ \tkzLabelPoints[above right](C,D,F)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsection report_de_distance (end)
+
+
\subsection{D'Alembert 1} % (fold)
\label{sub:d_alembert_1}
@@ -54,15 +112,18 @@ z.Ip = C.Aa : internal_similitude (C.Bb)
z.Jp = C.Aa : internal_similitude (C.Cc)
z.Kp = C.Cc : internal_similitude (C.Bb)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}[rotate=30]
- \tkzGetNodes
- \tkzDrawCircles(A,a B,b C,c)
- \tkzDrawPoints(A,B,C,I,J,K,I',J',K')
- \tkzDrawSegments[new](I,K A,I A,J B,I B,K C,J C,K)
- \tkzDrawSegments[purple](I,J' I',J I',K)
- \tkzLabelPoints(I,J,K,I',J',K')
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}[rotate=30]
+ \tkzGetNodes
+ \tkzDrawCircles(A,a B,b C,c)
+ \tkzDrawPoints(A,B,C,I,J,K,I',J',K')
+ \tkzDrawSegments[new](I,K A,I A,J B,I B,K C,J C,K)
+ \tkzDrawSegments[purple](I,J' I',J I',K)
+ \tkzLabelPoints(I,J,K,I',J',K')
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection d_alembert_1 (end)
@@ -110,14 +171,148 @@ z.Kp = C.Cc : internal_similitude (C.Bb)
z.m,z.n = get_points (C.Bb : radical_axis (C.Cc))
\end{tkzelements}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,a B,b C,c)
+ \tkzDrawLines[new](i,j k,l m,n)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+% subsection d_alembert_2 (end)
+
+\subsection{Altshiller} % (fold)
+\label{sub:altshiller}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ z.P = point : new (0,0)
+ z.Q = point : new (5,0)
+ z.I = point : new (3,2)
+ C.QI = circle : new (z.Q,z.I)
+ C.PE = C.QI : orthogonal_from (z.P)
+ z.E = C.PE.through
+ C.QE = circle : new (z.Q,z.E)
+ _,z.F = intersection (C.PE,C.QE)
+ z.A = C.PE: point (1/9)
+ L.AE = line : new (z.A,z.E)
+ _,z.C = intersection (L.AE,C.QE)
+ L.AF = line : new (z.A,z.F)
+ L.CQ = line : new (z.C,z.Q)
+ z.D = intersection (L.AF,L.CQ)
+\end{tkzelements}
\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(A,a B,b C,c)
-\tkzDrawLines[new](i,j k,l m,n)
+ \tkzGetNodes
+ \tkzDrawCircles(P,E Q,E)
+ \tkzDrawLines[add=0 and 1](P,Q)
+ \tkzDrawLines[add=0 and 2](A,E)
+ \tkzDrawSegments(P,E E,F F,C A,F C,D)
+ \tkzDrawPoints(P,Q,E,F,A,C,D)
+ \tkzLabelPoints(P,Q,E,F,A,C,D)
+\end{tikzpicture}
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale =.5
+ z.P = point : new (0,0)
+ z.Q = point : new (5,0)
+ z.I = point : new (3,2)
+ C.QI = circle : new (z.Q,z.I)
+ C.PE = C.QI : orthogonal_from (z.P)
+ z.E = C.PE.through
+ C.QE = circle : new (z.Q,z.E)
+ _,z.F = intersection (C.PE,C.QE)
+ z.A = C.PE: point (1/9)
+ L.AE = line : new (z.A,z.E)
+ _,z.C = intersection (L.AE,C.QE)
+ L.AF = line : new (z.A,z.F)
+ L.CQ = line : new (z.C,z.Q)
+ z.D = intersection (L.AF,L.CQ)
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(P,E Q,E)
+ \tkzDrawLines[add=0 and 1](P,Q)
+ \tkzDrawLines[add=0 and 2](A,E)
+ \tkzDrawSegments(P,E E,F F,C A,F C,D)
+ \tkzDrawPoints(P,Q,E,F,A,C,D)
+ \tkzLabelPoints(P,Q,E,F,A,C,D)
+ \end{tikzpicture}
+ \end{center}
+\end{minipage}
+%subsection altshiller (end)
+
+\subsection{Lemoine} % (fold)
+\label{sub:lemoine}
+
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = 1.25
+ z.A = point: new (1,0)
+ z.B = point: new (5,2)
+ z.C = point: new (1.2,2)
+ T = triangle: new(z.A,z.B,z.C)
+ z.O = T.circumcenter
+ C.OA = circle: new (z.O,z.A)
+ L.tA = C.OA: tangent_at (z.A)
+ L.tB = C.OA: tangent_at (z.B)
+ L.tC = C.OA: tangent_at (z.C)
+ z.P = intersection (L.tA,T.bc)
+ z.Q = intersection (L.tB,T.ca)
+ z.R = intersection (L.tC,T.ab)
+\end{tkzelements}
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon[teal](A,B,C)
+ \tkzDrawCircle(O,A)
+ \tkzDrawPoints(A,B,C,P,Q,R)
+ \tkzLabelPoints(A,B,C,P,Q,R)
+ \tkzDrawLine[blue](Q,R)
+ \tkzDrawLines[red](A,P B,Q R,C)
+ \tkzDrawSegments(A,R C,P C,Q)
\end{tikzpicture}
+\end{Verbatim}
+
\end{minipage}
-% subsection d_alembert_2 (end)
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+scale = .75
+z.A = point: new (1,0)
+z.B = point: new (5,2)
+z.C = point: new (1.2,2)
+T = triangle: new(z.A,z.B,z.C)
+z.O = T.circumcenter
+C.OA = circle: new (z.O,z.A)
+L.tA = C.OA: tangent_at (z.A)
+L.tB = C.OA: tangent_at (z.B)
+L.tC = C.OA: tangent_at (z.C)
+z.R = intersection (L.tC,T.ab)
+z.P = intersection (L.tA,T.bc)
+z.Q = intersection (L.tB,T.ca)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}[rotate=90]
+ \tkzGetNodes
+ \tkzDrawPolygon[teal](A,B,C)
+ \tkzDrawCircle(O,A)
+ \tkzDrawPoints(A,B,C,P,Q,R)
+ \tkzLabelPoints(A,B,C,P,Q,R)
+ \tkzDrawLine[blue](Q,R)
+ \tkzDrawLines[red](A,P B,Q R,C)
+ \tkzDrawSegments(A,R C,P C,Q)
+ \end{tikzpicture}
+\end{center}
+
+\end{minipage}
+%\caption{Lemoine line}
+% subsection lemoine (end)
+
\subsection{Alternate} % (fold)
\label{sub:alternate}
@@ -148,7 +343,7 @@ z.Kp = C.Cc : internal_similitude (C.Bb)
\end{tikzpicture}
\end{Verbatim}
\end{minipage}
-\hspace*{\fill}
+
\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
\begin{tkzelements}
z.A = point: new (0 , 0)
@@ -161,21 +356,94 @@ z.D = intersection (L.AI,T.bc)
L.LLC = T.ab: ll_from (z.C)
z.E = intersection (L.AI,L.LLC)
\end{tkzelements}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon(A,B,C)
-\tkzDrawLine[purple](C,E)
-\tkzDrawSegment[purple](A,E)
-\tkzFillAngles[purple!30,opacity=.4](B,A,C C,E,D)
-\tkzMarkAngles[mark=|](B,A,D D,A,C C,E,D)
-\tkzDrawPoints(A,...,E)
-\tkzLabelPoints(A,B)
-\tkzLabelPoints[above](C,D,E)
-\tkzMarkSegments(A,C C,E)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawLine[purple](C,E)
+ \tkzDrawSegment[purple](A,E)
+ \tkzFillAngles[purple!30,opacity=.4](B,A,C C,E,D)
+ \tkzMarkAngles[mark=|](B,A,D D,A,C C,E,D)
+ \tkzDrawPoints(A,...,E)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C,D,E)
+ \tkzMarkSegments(A,C C,E)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection alternate (end)
+\subsection{Method \Imeth{circle}{common tangent}: orthogonality} % (fold)
+\label{sub:common_tangent_orthogonality}
+For two circles to be orthogonal, it is necessary and sufficient for a secant passing through one of their common points to be seen from the other common point at a right angle.
+
+\begin{Verbatim}
+\begin{tkzelements}
+ z.A = point : new ( 0 , 0 )
+ z.B = point : new ( 4 , 2 )
+ L.AB = line : new ( z.A , z.B )
+ z.a = point : new ( 1 , 2 )
+ C.Aa = circle : new (z.A,z.a)
+ C.BC = C.Aa : orthogonal_from (z.B)
+ z.C,z.D = intersection (C.Aa,C.BC)
+ C.AC = circle : new (z.A,z.C)
+ z.T,z.Tp = C.AC : common_tangent (C.BC)
+ L.TTp = line : new (z.T,z.Tp)
+ z.M = C.AC : point (0.45)
+ L.MC =line : new (z.M,z.C)
+ z.Mp = intersection (L.MC, C.BC)
+ L.mm = L.TTp : ll_from (z.C)
+ _,z.M = intersection (L.mm, C.AC)
+ z.Mp = intersection (L.mm, C.BC)
+\end{tkzelements}
+
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,C B,C)
+ \tkzDrawSegments(M,M' A,C B,C A,B)
+ \tkzDrawSegments[gray](D,M D,M' T,T')
+ \tkzDrawPoints(A,B,C,D,M,M',T,T')
+ \tkzLabelPoints(A,B,D,M)
+ \tkzLabelPoints[above](C,M',T,T')
+ \tkzMarkRightAngles(M',D,M A,C,B)
+\end{tikzpicture}
+\end{Verbatim}
+
+\begin{tkzelements}
+z.A = point : new ( 0 , 0 )
+z.B = point : new ( 4 , 2 )
+L.AB = line : new ( z.A , z.B )
+z.a = point : new ( 1 , 2 )
+C.Aa = circle : new (z.A,z.a)
+C.BC = C.Aa : orthogonal_from (z.B)
+z.C,z.D = intersection (C.Aa,C.BC)
+C.AC = circle : new (z.A,z.C)
+z.T,z.Tp = C.AC : common_tangent (C.BC)
+L.TTp = line : new (z.T,z.Tp)
+z.M = C.AC : point (0.45)
+L.MC =line : new (z.M,z.C)
+z.Mp = intersection (L.MC, C.BC)
+L.mm = L.TTp : ll_from (z.C)
+_,z.M = intersection (L.mm, C.AC)
+z.Mp = intersection (L.mm, C.BC)
+\end{tkzelements}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,C B,C)
+ \tkzDrawSegments(M,M' A,C B,C A,B)
+ \tkzDrawSegments[gray](D,M D,M' T,T')
+ \tkzDrawPoints(A,B,C,D,M,M',T,T')
+ \tkzLabelPoints(A,B,D,M)
+ \tkzLabelPoints[above](C,M',T,T')
+ \tkzMarkRightAngles(M',D,M A,C,B)
+ \end{tikzpicture}
+\end{center}
+% subsection common_tangent_orthogonality (end)
+
+
\subsection{Apollonius circle} % (fold)
\label{sub:apollonius_circle}
@@ -215,23 +483,26 @@ scale=.75
\end{Verbatim}
\end{minipage}
\begin{minipage}{.5\textwidth}
- \hspace*{\fill}
- \begin{tikzpicture}[scale=.8]
- \tkzGetNodes
- \tkzDrawSegment[add=0 and 1](A,M)
- \tkzDrawSegments[purple](M,C M,D)
- \tkzDrawCircle[purple](O,C)
- \tkzDrawSegments(A,B B,M D,B)
- \tkzDrawPoints(A,B,M,C,D)
- \tkzLabelPoints[below right](A,B,C,D)
- \tkzLabelPoints[above](M)
- \tkzFillAngles[opacity=.4,cyan!20](A,M,B)
- \tkzFillAngles[opacity=.4,purple!20](B,M,E)
- \tkzMarkRightAngle[opacity=.4,fill=gray!20](C,M,D)
- \tkzMarkAngles[mark=|](A,M,C C,M,B)
- \tkzMarkAngles[mark=||](B,M,D D,M,E)
- \end{tikzpicture}
- \hspace*{\fill}
+
+ \begin{center}
+ \begin{tikzpicture}[scale=.8]
+ \tkzGetNodes
+ \tkzDrawSegment[add=0 and 1](A,M)
+ \tkzDrawSegments[purple](M,C M,D)
+ \tkzDrawCircle[purple](O,C)
+ \tkzDrawSegments(A,B B,M D,B)
+ \tkzDrawPoints(A,B,M,C,D)
+ \tkzLabelPoints[below right](A,B,C,D)
+ \tkzLabelPoints[above](M)
+ \tkzFillAngles[opacity=.4,cyan!20](A,M,B)
+ \tkzFillAngles[opacity=.4,purple!20](B,M,E)
+ \tkzMarkRightAngle[opacity=.4,fill=gray!20](C,M,D)
+ \tkzMarkAngles[mark=|](A,M,C C,M,B)
+ \tkzMarkAngles[mark=||](B,M,D D,M,E)
+ \end{tikzpicture}
+ \end{center}
+
+
\end{minipage}
@@ -319,20 +590,23 @@ Remark : The circle can be obtained with:
_,z.N = intersection (C.GA , C.OC)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon(A,B,M)
-\tkzDrawCircles[purple](O,C G,A)
-\tkzDrawSegments[purple](M,D)
-\tkzDrawSegments(D,B O,G M,C)
-\tkzDrawSegments[red,dashed](M,N M,O M,G)
-\tkzDrawPoints(A,B,M,C,D,N,O,G)
-\tkzLabelPoints[below right](A,B,C,D,N,O,G)
-\tkzLabelPoints[above](M)
-\tkzMarkRightAngle[opacity=.4,fill=gray!20](C,M,D)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,M)
+ \tkzDrawCircles[purple](O,C G,A)
+ \tkzDrawSegments[purple](M,D)
+ \tkzDrawSegments(D,B O,G M,C)
+ \tkzDrawSegments[red,dashed](M,N M,O M,G)
+ \tkzDrawPoints(A,B,M,C,D,N,O,G)
+ \tkzLabelPoints[below right](A,B,C,D,N,O,G)
+ \tkzLabelPoints[above](M)
+ \tkzMarkRightAngle[opacity=.4,fill=gray!20](C,M,D)
+ \end{tikzpicture}
+\end{center}
+
+
% subsection apollonius_and_circle_circumscribed (end)
\subsection{Apollonius circles in a triangle} % (fold)
@@ -414,19 +688,22 @@ L.Bpt = line: new (z.Bp,z.T)
z.O3 = L.Bpt.mid
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles[blue!50!black](O1,C' O2,A' O3,B')
-\tkzDrawSegments[new](B,S C,T A,R)
-\tkzDrawPolygon(A,B,C)
-\tkzDrawPoints(A,B,C,A',B',C',O,I,R,S,T,O1,O2,O3)
-\tkzLabelPoints(A,B,C,A',B',C',O,I)
-\tkzLabelPoints(O1,O2,O3)
-\tkzDrawCircle[purple](O,A)
-\tkzDrawLine(O1,O2)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles[blue!50!black](O1,C' O2,A' O3,B')
+ \tkzDrawSegments[new](B,S C,T A,R)
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPoints(A,B,C,A',B',C',O,I,R,S,T,O1,O2,O3)
+ \tkzLabelPoints(A,B,C,A',B',C',O,I)
+ \tkzLabelPoints(O1,O2,O3)
+ \tkzDrawCircle[purple](O,A)
+ \tkzDrawLine(O1,O2)
+ \end{tikzpicture}
+\end{center}
+
+
Same result using the function |T.ABC.ab : apollonius (k) |
@@ -493,15 +770,18 @@ Same result using the function |T.ABC.ab : apollonius (k) |
C = circle: new (z.O_2,z.A)
z.C,z.D = intersection (L ,C)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(O_1,A O_2,A)
-\tkzDrawSegments[new](O_1,A E,F C,D)
-\tkzDrawSegments[purple](A,E A,F)
-\tkzDrawPoints(A,O_1,O_2,E,F,C,D)
-\tkzLabelPoints(A,O_1,O_2,E,F,C,D)
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O_1,A O_2,A)
+ \tkzDrawSegments[new](O_1,A E,F C,D)
+ \tkzDrawSegments[purple](A,E A,F)
+ \tkzDrawPoints(A,O_1,O_2,E,F,C,D)
+ \tkzLabelPoints(A,O_1,O_2,E,F,C,D)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection archimedes (end)
@@ -615,30 +895,156 @@ Same result using the function |T.ABC.ab : apollonius (k) |
z.O_5 = T.CP1P2.circumcenter
\end{tkzelements}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawSemiCircles[teal](O_0,B)
+ \tkzDrawSemiCircles[teal,fill=teal!20,opacity=.5](O_1,C O_2,B)
+ \tkzDrawCircle[fill=green!10](O_4,P_0)
+ \tkzDrawCircle[purple,fill=purple!10,opacity=.5](O_5,C)
+ \tkzDrawSegments(A,B O_0,P' B,P A,Q)
+ \tkzDrawSegments(P,B Q,O_2 P,O_1)
+ \tkzDrawSegments[purple](O_5,P_2 O_5,P_1 O_5,C)
+ \tkzDrawPoints(A,B,C,P_0,P_2,P_1,O_0,O_1,O_2,O_4,O_5,Q,P,P',S)
+ \tkzLabelPoints[below](A,B,C,O_0,O_1,O_2,P')
+ \tkzLabelPoints[above](Q,P)
+ \tkzLabelPoints[above right](P_0,P_2,P_1,O_5,O_4,S)
+ \begin{scope}[font=\scriptsize]
+ \tkzLabelCircle[above](O_1,C)(120){$(\beta)$}
+ \tkzLabelCircle[above](O_2,B)(70){$(\gamma)$}
+ \tkzLabelCircle[above](O_0,B)(110){$(\alpha)$}
+ \tkzLabelCircle[left](O_4,P_2)(60){$(\delta)$}
+ \tkzLabelCircle[left](O_5,C)(140){$(\epsilon)$}
+ \end{scope}
+ \end{tikzpicture}
+\end{center}
+
+% subsection bankoff_circle (end)
+
+\subsection{Symmedian property} % (fold)
+\label{sub:example_symmedian_property}
+
+$L$ is the symmedian point or lemoine point. $\dfrac{CL}{CLc} = \dfrac{a^2+b^2}{a^2+b^2+c^2}$
+
+\vspace{6pt}
+\begin{minipage}{.5\textwidth}
+ \begin{Verbatim}
+ \begin{tkzelements}
+ scale = 1.5
+ z.A = point : new (1,2)
+ z.B = point : new (5,1)
+ z.C = point : new (3,5)
+ T.ABC = triangle : new (z.A,z.B,z.C)
+ T.SY = T.ABC : symmedian ()
+ z.La,z.Lb,z.Lc = get_points (T.SY)
+ k = (T.ABC.a*T.ABC.a +
+ T.ABC.b*T.ABC.b)/(T.ABC.a*T.ABC.a +
+ T.ABC.b*T.ABC.b+T.ABC.c*T.ABC.c)
+ L.SY = line : new (z.C,z.Lc)
+ z.L = L.SY : point (k)
+ \end{tkzelements}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C,L,Lc)
+ \tkzDrawPoints[red](L)
+ \tkzDrawSegments[cyan](C,Lc)
+ \tkzLabelPoints(A,B,Lc)
+ \tkzLabelPoints[above](C)
+ \tkzLabelPoints[left](L)
+ \tkzLabelSegment(B,C){$a$}
+ \tkzLabelSegment(A,C){$b$}
+ \tkzLabelSegment(A,B){$ca$}
+ \end{tikzpicture}
+ \end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+ \begin{tkzelements}
+ scale = 1.5
+ z.A = point : new (1,2)
+ z.B = point : new (5,1)
+ z.C = point : new (3,5)
+ T.ABC = triangle : new (z.A,z.B,z.C)
+ T.SY = T.ABC : symmedian ()
+ z.La,z.Lb,z.Lc = get_points (T.SY)
+ k = (T.ABC.a*T.ABC.a +
+ T.ABC.b*T.ABC.b)/(T.ABC.a*T.ABC.a +
+ T.ABC.b*T.ABC.b+T.ABC.c*T.ABC.c)
+ L.SY = line : new (z.C,z.Lc)
+ z.L = L.SY : point (k)
+ \end{tkzelements}
+ \begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C,L,Lc)
+ \tkzDrawPoints[red](L)
+ \tkzDrawSegments[cyan](C,Lc)
+ \tkzLabelPoints(A,B,Lc)
+ \tkzLabelPoints[above](C)
+ \tkzLabelPoints[left](L)
+ \tkzLabelSegment(B,C){$a$}
+ \tkzLabelSegment(A,C){$b$}
+ \tkzLabelSegment(A,B){$ca$}
+ \end{tikzpicture}
+ \end{center}
+\end{minipage}
+
+
+% subsection example_symmedian_property (end)
+
+\subsection{Example: Cevian with orthocenter} % (fold)
+\label{sub:example_cevian_with_orthocenter}
+\begin{minipage}{.5\textwidth}
+\begin{Verbatim}
+\begin{tkzelements}
+ scale = 1.5
+ z.a = point: new (1,2)
+ z.b = point: new (5,1)
+ z.c = point: new (3,5)
+ T = triangle: new (z.a,z.b,z.c)
+ z.i = T.orthocenter
+ T.cevian = T : cevian (z.i)
+ z.ta,z.tb,z.tc = get_points (T.cevian)
+ C.cev = T : cevian_circle (z.i)
+ z.w = C.cev.center
+\end{tkzelements}
\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawSemiCircles[teal](O_0,B)
-\tkzDrawSemiCircles[teal,fill=teal!20,opacity=.5](O_1,C O_2,B)
-\tkzDrawCircle[fill=green!10](O_4,P_0)
-\tkzDrawCircle[purple,fill=purple!10,opacity=.5](O_5,C)
-\tkzDrawSegments(A,B O_0,P' B,P A,Q)
-\tkzDrawSegments(P,B Q,O_2 P,O_1)
-\tkzDrawSegments[purple](O_5,P_2 O_5,P_1 O_5,C)
-\tkzDrawPoints(A,B,C,P_0,P_2,P_1,O_0,O_1,O_2,O_4,O_5,Q,P,P',S)
-\tkzLabelPoints[below](A,B,C,O_0,O_1,O_2,P')
-\tkzLabelPoints[above](Q,P)
-\tkzLabelPoints[above right](P_0,P_2,P_1,O_5,O_4,S)
-\begin{scope}[font=\scriptsize]
- \tkzLabelCircle[above](O_1,C)(120){$(\beta)$}
- \tkzLabelCircle[above](O_2,B)(70){$(\gamma)$}
- \tkzLabelCircle[above](O_0,B)(110){$(\alpha)$}
- \tkzLabelCircle[left](O_4,P_2)(60){$(\delta)$}
- \tkzLabelCircle[left](O_5,C)(140){$(\epsilon)$}
-\end{scope}
+ \tkzGetNodes
+ \tkzDrawPolygons(a,b,c ta,tb,tc)
+ \tkzDrawSegments(a,ta b,tb c,tc)
+ \tkzDrawPoints(a,b,c,i,ta,tb,tc)
+ \tkzLabelPoints(a,b,c,i)
+ \tkzDrawCircles(w,ta)
\end{tikzpicture}
-\hspace*{\fill}
-% subsection bankoff_circle (end)
+\end{Verbatim}
+\end{minipage}
+\begin{minipage}{.5\textwidth}
+\begin{tkzelements}
+scale = 1.5
+z.a = point: new (1,2)
+z.b = point: new (5,1)
+z.c = point: new (3,5)
+T = triangle: new (z.a,z.b,z.c)
+z.i = T.orthocenter
+T.cevian = T : cevian (z.i)
+z.ta,z.tb,z.tc = get_points (T.cevian)
+C.cev = T : cevian_circle (z.i)
+z.w = C.cev.center
+\end{tkzelements}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(a,b,c ta,tb,tc)
+ \tkzDrawSegments(a,ta b,tb c,tc)
+ \tkzDrawPoints(a,b,c,i,ta,tb,tc)
+ \tkzLabelPoints(a,b,c,i)
+ \tkzDrawCircles(w,ta)
+ \end{tikzpicture}
+\end{center}
+\end{minipage}
+
+% subsection example_cevian_with_orthocenter (end)
\subsection{Excircles} % (fold)
\label{sub:excircles}
@@ -693,73 +1099,33 @@ Same result using the function |T.ABC.ab : apollonius (k) |
z.G = intersection (la,lb)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPoints[new](J_a,J_b,J_c)
-\tkzClipBB
-\tkzDrawCircles[gray](J_a,T_a J_b,T_b J_c,T_c)
-\tkzDrawLines[add=1 and 1](A,B B,C C,A)
-\tkzDrawSegments[new](A,T_a B,T_b C,T_c)
-\tkzDrawSegments[new](J_a,T_a J_b,T_b J_c,T_c)
-\tkzDrawPolygon(A,B,C)
-\tkzDrawPolygon[new](T_a,T_b,T_c)
-\tkzDrawPoints(A,B,C,K)
-\tkzDrawPoints[new](T_a,T_b,T_c)
-\tkzLabelPoints[below left](A)
-\tkzLabelPoints[below](B)
-\tkzLabelPoints[above](C)
-\tkzLabelPoints[new,below left](T_b)
-\tkzLabelPoints[new,below right](T_c)
-\tkzLabelPoints[new,right=6pt](T_a)
-\tkzMarkRightAngles[fill=gray!15](J_a,T_a,B J_b,T_b,C J_c,T_c,A)
-\end{tikzpicture}
-\hspace*{\fill}
-% subsection excircles (end)
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints[new](J_a,J_b,J_c)
+ \tkzClipBB
+ \tkzDrawCircles[gray](J_a,T_a J_b,T_b J_c,T_c)
+ \tkzDrawLines[add=1 and 1](A,B B,C C,A)
+ \tkzDrawSegments[new](A,T_a B,T_b C,T_c)
+ \tkzDrawSegments[new](J_a,T_a J_b,T_b J_c,T_c)
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawPolygon[new](T_a,T_b,T_c)
+ \tkzDrawPoints(A,B,C,K)
+ \tkzDrawPoints[new](T_a,T_b,T_c)
+ \tkzLabelPoints[below left](A)
+ \tkzLabelPoints[below](B)
+ \tkzLabelPoints[above](C)
+ \tkzLabelPoints[new,below left](T_b)
+ \tkzLabelPoints[new,below right](T_c)
+ \tkzLabelPoints[new,right=6pt](T_a)
+ \tkzMarkRightAngles[fill=gray!15](J_a,T_a,B J_b,T_b,C J_c,T_c,A)
+ \end{tikzpicture}
+\end{center}
+
+
+% subsection excircles (end)
-\subsection{Orthogonal circle through} % (fold)
-\label{sub:orthogonal_circle_through}
-\begin{minipage}{.5\textwidth}
-\begin{Verbatim}
-\begin{tkzelements}
- z.O = point: new (0,1)
- z.A = point: new (1,0)
- z.z1 = point: new (-1.5,-1.5)
- z.z2 = point: new (2.5,-1.25)
- C.OA = circle: new (z.O,z.A)
- C = C.OA: orthogonal_through (z.z1,z.z2)
- z.c = C.center
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircle(O,A)
- \tkzDrawCircle[new](c,z1)
- \tkzDrawPoints[new](O,A,z1,z2,c)
- \tkzLabelPoints[right](O,A,z1,z2,c)
-\end{tikzpicture}
-\end{Verbatim}
-\end{minipage}
-\begin{minipage}{.5\textwidth}\begin{tkzelements}
- z.O = point: new (0,1)
- z.A = point: new (1,0)
- z.z1 = point: new (-1.5,-1.5)
- z.z2 = point: new (2.5,-1.25)
- C.OA = circle: new (z.O,z.A)
- C = C.OA: orthogonal_through (z.z1,z.z2)
- z.c = C.center
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle(O,A)
-\tkzDrawCircle[orange](c,z1)
-\tkzDrawPoints[orange](O,A,z1,z2,c)
-\tkzLabelPoints[right](O,A,z1,z2,c)
-\end{tikzpicture}
-\hspace*{\fill}
-\end{minipage}
-% subsection orthogonal_circle_through (end)
\subsection{Divine ratio} % (fold)
\label{sub:divine_ratio}
@@ -826,16 +1192,19 @@ L.BG = line: new (z.B,z.G)
z.L = intersection (L.AR,L.BG)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygons(A,C,E,F A,B,G,H)
-\tkzDrawCircles(O_1,C O_2,B O_0,B)
-\tkzDrawSegments(H,C B,K A,L)
-\tkzDrawPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L)
-\tkzLabelPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,C,E,F A,B,G,H)
+ \tkzDrawCircles(O_1,C O_2,B O_0,B)
+ \tkzDrawSegments(H,C B,K A,L)
+ \tkzDrawPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L)
+ \tkzLabelPoints(A,B,C,K,E,F,G,H,O_0,O_1,O_2,R,S,T,L)
+ \end{tikzpicture}
+\end{center}
+
+
% subsection divine_ratio (end)
\subsection{Director circle} % (fold)
@@ -893,19 +1262,22 @@ z.J = L.J.pb
z.K = L.K.pb
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPoints(F1,F2,O)
-\tkzDrawCircles[teal](O,P)
-\tkzDrawPolygon(H,O,A,P)
-\tkzDrawEllipse[red](O,\tkzUseLua{a},\tkzUseLua{b},0)
-\tkzDrawSegments[orange](O,P O,L L,J L,K)
-\tkzDrawPoints(F1,F2,O,H,A,P,L,J,K)
-\tkzLabelPoints(F1,F2,O,H,A,P,L,J,K)
-\tkzLabelPoints[above](L)
-\tkzMarkRightAngles(A,P,H J,L,K)
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(F1,F2,O)
+ \tkzDrawCircles[teal](O,P)
+ \tkzDrawPolygon(H,O,A,P)
+ \tkzDrawEllipse[red](O,\tkzUseLua{a},\tkzUseLua{b},0)
+ \tkzDrawSegments[orange](O,P O,L L,J L,K)
+ \tkzDrawPoints(F1,F2,O,H,A,P,L,J,K)
+ \tkzLabelPoints(F1,F2,O,H,A,P,L,J,K)
+ \tkzLabelPoints[above](L)
+ \tkzMarkRightAngles(A,P,H J,L,K)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection director_circle (end)
@@ -961,18 +1333,21 @@ z.C = intersection (L.EG,L.AB)
z.O = C.AB: antipode (z.B)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawArc[delta=5](O,B)(G)
- \tkzDrawCircles(A,B B,A)
- \tkzDrawSegments(A,E B,E O,I)
- \tkzDrawSegments[purple](J,E A,G G,I K,G E,G)
- \tkzMarkSegments[mark=s||](A,E B,E O,A)
- \tkzDrawPoints(A,B,C,E,I,J,G,O,K)
- \tkzLabelPoints(A,B,C,E,I,J,G,O,K)
-\end{tikzpicture}
- \hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawArc[delta=5](O,B)(G)
+ \tkzDrawCircles(A,B B,A)
+ \tkzDrawSegments(A,E B,E O,I)
+ \tkzDrawSegments[purple](J,E A,G G,I K,G E,G)
+ \tkzMarkSegments[mark=s||](A,E B,E O,A)
+ \tkzDrawPoints(A,B,C,E,I,J,G,O,K)
+ \tkzLabelPoints(A,B,C,E,I,J,G,O,K)
+ \end{tikzpicture}
+\end{center}
+
+
% subsection gold_division (end)
\subsection{Ellipse} % (fold)
@@ -1014,15 +1389,17 @@ b = E.Ry
slope = math.deg(E.slope)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles[teal](C,A)
-\tkzDrawEllipse[red](C,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{slope})
-\tkzDrawPoints(C,A,B,b)
-\tkzLabelPoints(C,A,B)
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles[teal](C,A)
+ \tkzDrawEllipse[red](C,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{slope})
+ \tkzDrawPoints(C,A,B,b)
+ \tkzLabelPoints(C,A,B)
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
% subsection ellipse (end)
@@ -1060,12 +1437,15 @@ z.V = E : point (0)
z.CoV = E : point (math.pi/2)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}[gridded]
-\tkzGetNodes
-\tkzDrawEllipse[blue](C,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
-\tkzDrawPoints(C,V,CoV)
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}[gridded]
+ \tkzGetNodes
+ \tkzDrawEllipse[blue](C,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
+ \tkzDrawPoints(C,V,CoV)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection ellipse_with_radii (end)
@@ -1122,15 +1502,18 @@ z.F = L.ta.pb
z.G = L.tb.pb
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPoints(A,B,C,K,F,G,V,cV)
- \tkzLabelPoints(A,B,C,K,F,G,V,cV)
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(A,B,C,K,F,G,V,cV)
+ \tkzLabelPoints(A,B,C,K,F,G,V,cV)
\tkzDrawEllipse[teal](C,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
- \tkzDrawLines(K,F K,G)
-\end{tikzpicture}
- \hspace*{\fill}
+ \tkzDrawLines(K,F K,G)
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
% subsection ellipse_with_foci (end)
@@ -1184,19 +1567,21 @@ L.Ow = line : new (z.O,z.w)
_,z.E = intersection (L.Ow, C.OA)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawArc(J,X)(Y)
-\tkzDrawCircles(I,H O,A)
-\tkzDrawCircle[red](w,I)
-\tkzDrawLines(Y,C A,B X,C E,w E,B)
-\tkzDrawSegments[blue](J,C J,K I,H I,O w,B)
-\tkzDrawPoints(A,B,C,I,J,E,w,H,K,O)
-\tkzLabelPoints(A,B,C,J,I,w,H,K,E,O)
-\tkzMarkRightAngles[fill=gray!20,opacity=.4](C,H,I A,K,J)
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawArc(J,X)(Y)
+ \tkzDrawCircles(I,H O,A)
+ \tkzDrawCircle[red](w,I)
+ \tkzDrawLines(Y,C A,B X,C E,w E,B)
+ \tkzDrawSegments[blue](J,C J,K I,H I,O w,B)
+ \tkzDrawPoints(A,B,C,I,J,E,w,H,K,O)
+ \tkzLabelPoints(A,B,C,J,I,w,H,K,E,O)
+ \tkzMarkRightAngles[fill=gray!20,opacity=.4](C,H,I A,K,J)
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
% subsection euler_relation (end)
@@ -1242,20 +1627,23 @@ z.D = intersection (T.ext.ab,T.ABC.ab)
z.E = z.C: symmetry (z.B)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon(A,B,C)
-\tkzDrawLine[purple,add=0 and .5](B,C)
-\tkzDrawSegment[purple](A,D)
-\tkzDrawSegment[orange](C,D)
-\tkzFillAngles[purple!30,opacity=.2](D,C,A E,C,D)
-\tkzMarkAngles[mark=|](D,C,A E,C,D)
-\tkzDrawPoints(A,...,D)
-\tkzLabelPoints[above](C)
-\tkzLabelPoints(A,B,D)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawLine[purple,add=0 and .5](B,C)
+ \tkzDrawSegment[purple](A,D)
+ \tkzDrawSegment[orange](C,D)
+ \tkzFillAngles[purple!30,opacity=.2](D,C,A E,C,D)
+ \tkzMarkAngles[mark=|](D,C,A E,C,D)
+ \tkzDrawPoints(A,...,D)
+ \tkzLabelPoints[above](C)
+ \tkzLabelPoints(A,B,D)
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
% subsection external_angle (end)
@@ -1304,19 +1692,22 @@ L.LL = T.ab: ll_from (z.C)
L.AD = line: new (z.A,z.D)
z.E = intersection (L.LL,L.AD)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon(A,B,C)
-\tkzDrawLine[purple](C,E)
-\tkzDrawSegment[purple](A,E)
-\tkzFillAngles[purple!30,opacity=.4](B,A,C C,E,D)
-\tkzMarkAngles[mark=|](B,A,D D,A,C C,E,D)
-\tkzDrawPoints(A,...,E)
-\tkzLabelPoints(A,B)
-\tkzLabelPoints[above](C,D,E)
-\tkzMarkSegments(A,C C,E)
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawLine[purple](C,E)
+ \tkzDrawSegment[purple](A,E)
+ \tkzFillAngles[purple!30,opacity=.4](B,A,C C,E,D)
+ \tkzMarkAngles[mark=|](B,A,D D,A,C C,E,D)
+ \tkzDrawPoints(A,...,E)
+ \tkzLabelPoints(A,B)
+ \tkzLabelPoints[above](C,D,E)
+ \tkzMarkSegments(A,C C,E)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
%subsection internal_angle (end)
@@ -1392,18 +1783,20 @@ L.LH = line: new (z.L,z.H)
z.F = intersection (L.LH,C.IH) -- feuerbach
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}[rotate=90]
-\tkzGetNodes
-\tkzDrawLine(L,F)
-\tkzDrawCircle[red](N,A')
-\tkzDrawCircle[blue](I,H)
-\tkzDrawCircles[teal](O,A L,C')
-\tkzDrawSegments(M,L B,U Q,C C,X A,P B,Q)
-\tkzDrawPolygons(A,B,C A',B',C')
-\tkzDrawPoints(A,B,C,N,H,A',B',C',U,L,M,P,Q,F,I)
-\tkzLabelPoints(A,B,C,N,H,A',B',C',U,L,M,P,Q,F,I)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}[rotate=90]
+ \tkzGetNodes
+ \tkzDrawLine(L,F)
+ \tkzDrawCircle[red](N,A')
+ \tkzDrawCircle[blue](I,H)
+ \tkzDrawCircles[teal](O,A L,C')
+ \tkzDrawSegments(M,L B,U Q,C C,X A,P B,Q)
+ \tkzDrawPolygons(A,B,C A',B',C')
+ \tkzDrawPoints(A,B,C,N,H,A',B',C',U,L,M,P,Q,F,I)
+ \tkzLabelPoints(A,B,C,N,H,A',B',C',U,L,M,P,Q,F,I)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection nine_points (end)
@@ -1448,15 +1841,17 @@ L.AK = line: new (z.Y,z.K)
z.C = intersection (L.AK,L.AB)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawLines(A,B X,K)
-\tkzDrawLine[teal](Y,K)
-\tkzDrawPoints(A,B,C,X,Y,M,K)
-\tkzDrawArc[delta=20](M,A)(K)
-\tkzLabelPoints(A,B,C)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(A,B X,K)
+ \tkzDrawLine[teal](Y,K)
+ \tkzDrawPoints(A,B,C,X,Y,M,K)
+ \tkzDrawArc[delta=20](M,A)(K)
+ \tkzLabelPoints(A,B,C)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
%subsection gold_ratio_with_segment (end)
@@ -1502,13 +1897,15 @@ L.AB = line: new (z.A,z.B)
z.O_0 = L.AB.mid
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(O_1,C O_2,B O_0,B O_1,x)
-\tkzDrawPoints(A,C,B,O_1,O_2,O_0,x)
-\tkzLabelPoints[below right](A,C,B)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O_1,C O_2,B O_0,B O_1,x)
+ \tkzDrawPoints(A,C,B,O_1,O_2,O_0,x)
+ \tkzLabelPoints[below right](A,C,B)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection gold_arbelos (end)
@@ -1554,15 +1951,16 @@ z.O_0 = L.AB.mid
L.GF = line :new (z.G,z.F)
z.C = intersection (L.GF,L.AB)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawLines(A,B A,G A,D A,G F,E G,F G,D)
- \tkzDrawPoints(A,B,G,E,F,C,D)
- \tkzLabelPoints(A,B,G,E,F,C,D)
- \tkzMarkSegments(F,B B,E)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(A,B A,G A,D A,G F,E G,F G,D)
+ \tkzDrawPoints(A,B,G,E,F,C,D)
+ \tkzLabelPoints(A,B,G,E,F,C,D)
+ \tkzMarkSegments(F,B B,E)
+ \end{tikzpicture}
+\end{center}
\end{minipage}
% subsection harmonic_division_v1 (end)
@@ -1616,13 +2014,15 @@ L.GX = line: new (z.G,z.X)
z.C = intersection (L.GX,L.AB)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawLines(A,D A,E B,F D,F X,A X,B X,C)
-\tkzDrawPoints(A,...,G,X)
-\tkzLabelPoints(A,...,G,X)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines(A,D A,E B,F D,F X,A X,B X,C)
+ \tkzDrawPoints(A,...,G,X)
+ \tkzLabelPoints(A,...,G,X)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection harmonic_division_v2 (end)
@@ -1666,390 +2066,21 @@ z.Q = intersection (L.AC,L.PX)
z.R = intersection (L.BC,L.PX)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon(A,B,C)
-\tkzDrawLine[new](P,R)
-\tkzDrawLines(P,B A,C B,C)
-\tkzDrawPoints(P,Q,R,A,B,C)
-\tkzLabelPoints(A,B,C,P,Q,R)
-\end{tikzpicture}
-\hspace*{\fill}
-\end{minipage}
-% subsection menelaus (end)
-
-\subsection{Radical axis v1} % (fold)
-\label{sub:radical_axis_v1}
-
-\begin{Verbatim}
-\begin{tkzelements}
-scale = .75
-z.X = point : new (0,0)
-z.B = point : new (2,2)
-z.Y = point : new (7,1)
-z.Ap = point : new (8,-1)
-L.XY = line : new (z.X,z.Y)
-C.XB = circle : new (z.X,z.B)
-C.YAp = circle : new (z.Y,z.Ap)
-z.E,z.F = get_points (C.XB : radical_axis (C.YAp))
-z.A = C.XB : point (0.4)
-T.ABAp = triangle: new (z.A,z.B,z.Ap)
-z.O = T.ABAp.circumcenter
-C.OAp = circle : new (z.O,z.Ap)
-_,z.Bp = intersection (C.OAp,C.YAp)
-L.AB = line : new (z.A,z.B)
-L.ApBp = line : new (z.Ap,z.Bp)
-z.M = intersection (L.AB,L.ApBp)
-z.H = L.XY : projection (z.M)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(X,B Y,A')
- \tkzDrawArc[dashed,delta=30](O,A')(A)
- \tkzDrawPoints(A,B,A',B',M,H,X,Y,O,E,F)
- \tkzDrawLines[red](A,M A',M X,Y E,F)
- \tkzDrawLines[red,add=1 and 3](M,H)
-\end{tikzpicture}
-\end{Verbatim}
-
-\begin{tkzelements}
-scale = .75
-z.X = point : new (0,0)
-z.B = point : new (2,2)
-z.Y = point : new (7,1)
-z.Ap = point : new (8,-1)
-L.XY = line : new (z.X,z.Y)
-C.XB = circle : new (z.X,z.B)
-C.YAp = circle : new (z.Y,z.Ap)
-z.E,z.F = get_points (C.XB : radical_axis (C.YAp))
-z.A = C.XB : point (0.4)
-T.ABAp = triangle: new (z.A,z.B,z.Ap)
-z.O = T.ABAp.circumcenter
-C.OAp = circle : new (z.O,z.Ap)
-_,z.Bp = intersection (C.OAp,C.YAp)
-L.AB = line : new (z.A,z.B)
-L.ApBp = line : new (z.Ap,z.Bp)
-z.M = intersection (L.AB,L.ApBp)
-z.H = L.XY : projection (z.M)
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(X,B Y,A')
-\tkzDrawArc[dashed,delta=30](O,A')(A)
-\tkzDrawPoints(A,B,A',B',M,H,X,Y,O,E,F)
-\tkzDrawLines[red](A,M A',M X,Y E,F)
-\tkzDrawLines[red,add=1 and 3](M,H)
-\end{tikzpicture}
-% subsection radical_axis_v1 (end)
-
-\subsection{Radical axis v2} % (fold)
-\label{sub:radical_axis_v2}
-
-\begin{Verbatim}
-\begin{tkzelements}
-scale = 1.25
-z.O = point : new (-1,0)
-z.Op = point : new (4,-1)
-z.B = point : new (0,2)
-z.D = point : new (4,0)
-C.OB = circle : new (z.O,z.B)
-C.OpD = circle : new (z.Op,z.D)
-L.EF = C.OB : radical_axis (C.OpD)
-z.E,z.F = get_points (L.EF)
-z.M = L.EF : point (.75)
-L.MT,L.MTp = C.OB : tangent_from (z.M)
-_,z.T = get_points (L.MT)
-_,z.Tp = get_points (L.MTp)
-L.MK,L.MKp = C.OpD : tangent_from (z.M)
-_,z.K = get_points (L.MK)
-_,z.Kp = get_points (L.MKp)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(O,B O',D)
- \tkzDrawLine(E,F)
- \tkzDrawLine[add=.5 and .5](O,O')
- \tkzDrawLines[add = 0 and .5](M,T M,T' M,K M,K')
- \tkzDrawCircle(M,T)
- \tkzDrawPoints(O,O',T,M,T',K,K')
- \tkzLabelPoints(O,O',T,T',K,K',M)
-\end{tikzpicture}
-\end{Verbatim}
-
-\begin{tkzelements}
-scale =1.25
-z.O = point : new (-1,0)
-z.Op = point : new (4,-1)
-z.B = point : new (0,2)
-z.D = point : new (4,0)
-C.OB = circle : new (z.O,z.B)
-C.OpD = circle : new (z.Op,z.D)
-L.EF = C.OB : radical_axis (C.OpD)
-z.E,z.F = get_points (L.EF)
-z.M = L.EF : point (.75)
-L.MT,L.MTp = C.OB : tangent_from (z.M)
-_,z.T = get_points (L.MT)
-_,z.Tp = get_points (L.MTp)
-L.MK,L.MKp = C.OpD : tangent_from (z.M)
-_,z.K = get_points (L.MK)
-_,z.Kp = get_points (L.MKp)
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(O,B O',D)
-\tkzDrawLine(E,F)
-\tkzDrawLine[add=.5 and .5](O,O')
-\tkzDrawLines[add = 0 and .5](M,T M,T' M,K M,K')
-\tkzDrawCircle(M,T)
-\tkzDrawPoints(O,O',T,M,T',K,K')
-\tkzLabelPoints(O,O',T,T',K,K',M)
-\end{tikzpicture}
-\hspace*{\fill}
-% subsection radical_axis_v2 (end)
-
-\subsection{Radical axis v3} % (fold)
-\label{sub:radical_axis_v3}
-
-\begin{Verbatim}
- \begin{tkzelements}
- z.O = point : new (0,0)
- z.B = point : new (4,0)
- z.Op = point : new (6,0)
- C.OB = circle : new (z.O,z.B)
- C.OpB = circle : new (z.Op,z.B)
- L.EF = C.OB : radical_axis (C.OpB)
- z.E,z.F = get_points(L.EF)
- z.M = L.EF : point (0.2)
- L = C.OB : tangent_from (z.M)
- _,z.T = get_points (L)
- L = C.OpB : tangent_from (z.M)
- _,z.Tp = get_points (L)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(O,B O',B)
- \tkzDrawSegments(M,T M,T')
- \tkzDrawSegments(E,F)
- \tkzDrawLine[add=.5 and .5](O,O')
- \tkzDrawPoints(O,B,O',E,F,M,T,T')
- \tkzLabelPoints(O,O',B,E,F,T,T')
- \tkzDrawArc(M,T')(T)
-\end{tikzpicture}
-\end{Verbatim}
-
-\begin{tkzelements}
-z.O = point : new (0,0)
-z.B = point : new (4,0)
-z.Op = point : new (6,0)
-C.OB = circle : new (z.O,z.B)
-C.OpB = circle : new (z.Op,z.B)
-L.EF = C.OB : radical_axis (C.OpB)
-z.E,z.F = get_points(L.EF)
-z.M = L.EF : point (0.2)
-L = C.OB : tangent_from (z.M)
-_,z.T = get_points (L)
-L = C.OpB : tangent_from (z.M)
-_,z.Tp = get_points (L)
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(O,B O',B)
-\tkzDrawSegments(M,T M,T')
-\tkzDrawSegments(E,F)
-\tkzDrawLine[add=.5 and .5](O,O')
-\tkzDrawPoints(O,B,O',E,F,M,T,T')
-\tkzLabelPoints(O,O',B,E,F,T,T')
-\tkzDrawArc(M,T')(T)
-\end{tikzpicture}
-\hspace*{\fill}
-% subsection radical_axis_v3 (end)
-
-\subsection{Radical axis v4} % (fold)
-\label{sub:radical_axis_v4}
-\begin{Verbatim}
-\begin{tkzelements}
- z.O = point : new (0,0)
- z.B = point : new (5,0)
- z.Op = point : new (3,0)
- C.OB = circle : new (z.O,z.B)
- C.OpB = circle : new (z.Op,z.B)
- L.EF = C.OB : radical_axis (C.OpB)
- z.E,z.F = get_points(L.EF)
- z.H = L.EF.mid
- z.M = L.EF : point (.8)
- _,L = C.OB : tangent_from (z.M)
- _,z.T = get_points (L)
- _,L = C.OpB : tangent_from (z.M)
- _,z.Tp = get_points (L)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(O,B O',B)
- \tkzDrawSegments(M,T M,T')
- \tkzDrawSegments(E,F)
- \tkzDrawLine[add=.3 and .3](O,H)
- \tkzDrawPoints(O,O',B,E,H,M)
- \tkzLabelPoints[below right](O,O',E,F,M,T,T')
- \tkzDrawArc(M,B)(T)
-\end{tikzpicture}
-\end{Verbatim}
-
-
-\begin{tkzelements}
- z.O = point : new (0,0)
- z.B = point : new (5,0)
- z.Op = point : new (3,0)
- C.OB = circle : new (z.O,z.B)
- C.OpB = circle : new (z.Op,z.B)
- L.EF = C.OB : radical_axis (C.OpB)
- z.E,z.F = get_points(L.EF)
- z.H = L.EF.mid
- z.M = L.EF : point (.8)
- _,L = C.OB : tangent_from (z.M)
- _,z.T = get_points (L)
- _,L = C.OpB : tangent_from (z.M)
- _,z.Tp = get_points (L)
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(O,B O',B)
- \tkzDrawSegments(M,T M,T')
- \tkzDrawSegments(E,F)
- \tkzDrawLine[add=.3 and .3](O,H)
- \tkzDrawPoints(O,O',B,E,H,M)
- \tkzLabelPoints[below right](O,O',E,F,M,T,T')
- \tkzDrawArc(M,B)(T)
-\end{tikzpicture}
-\hspace*{\fill}
-% subsection radical_axis_v4 (end)
-
-\subsection{Radical center} % (fold)
-\label{sub:radical_center}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{Verbatim}
-\begin{tkzelements}
- z.O = point : new (0,0)
- z.x = point : new (1,0)
- z.y = point : new (4,0)
- z.z = point : new (2,0)
- z.Op = point : new (4,2)
- z.P = point : new (2,2.5)
- C.Ox = circle : new (z.O,z.x)
- C.Pz = circle : new (z.P,z.z)
- C.Opy = circle : new (z.Op,z.y)
- z.ap,z.a = intersection (C.Ox,C.Pz)
- z.bp,z.b = intersection (C.Opy,C.Pz)
- L.aap = line : new (z.a,z.ap)
- L.bbp = line : new (z.b,z.bp)
- z.X = intersection (L.aap,L.bbp)
--- or z.X = radical_center(C.Ox,C.Pz,C.Opy)
- L.OOp = line : new (z.O,z.Op)
- z.H = L.OOp : projection (z.X)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(O,a O',b P,z)
- \tkzDrawLines[red](a,X b',X H,X O,O')
- \tkzDrawPoints(O,O',P,a,a',b,b',X,H)
- \tkzLabelPoints[below right](O,O',P,H)
-\end{tikzpicture}
-\end{Verbatim}
-\end{minipage}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{tkzelements}
-z.O = point : new (0,0)
-z.x = point : new (1,0)
-z.y = point : new (4,0)
-z.z = point : new (2,0)
-z.Op = point : new (4,2)
-z.P = point : new (2,2.5)
-C.Ox = circle : new (z.O,z.x)
-C.Pz = circle : new (z.P,z.z)
-C.Opy = circle : new (z.Op,z.y)
-z.ap,z.a = intersection (C.Ox,C.Pz)
-z.bp,z.b = intersection (C.Opy,C.Pz)
-L.aap = line : new (z.a,z.ap)
-L.bbp = line : new (z.b,z.bp)
-z.X = intersection (L.aap,L.bbp)
-L.OOp = line : new (z.O,z.Op)
-z.H = L.OOp : projection (z.X)
-\end{tkzelements}
-
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(O,a O',b P,z)
-\tkzDrawLines[red](a,X b',X H,X O,O')
-\tkzDrawPoints(O,O',P,a,a',b,b',X,H)
-\tkzLabelPoints[below right](O,O',P,H)
-\end{tikzpicture}
-\end{minipage}
-% subsection radical_center (end)
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawLine[new](P,R)
+ \tkzDrawLines(P,B A,C B,C)
+ \tkzDrawPoints(P,Q,R,A,B,C)
+ \tkzLabelPoints(A,B,C,P,Q,R)
+ \end{tikzpicture}
+\end{center}
-\subsection{Radical circle} % (fold)
-\label{sub:radical_circle}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{Verbatim}
-\begin{tkzelements}
- scale = .5
- z.A = point: new (0,0)
- z.B = point: new (6,0)
- z.C = point: new (0.8,4)
- T.ABC = triangle : new ( z.A,z.B,z.C )
- C.exa = T.ABC : ex_circle ()
- z.I_a,z.Xa = get_points (C.exa)
- C.exb = T.ABC : ex_circle (1)
- z.I_b,z.Xb = get_points (C.exb)
- C.exc = T.ABC : ex_circle (2)
- z.I_c,z.Xc = get_points (C.exc)
- C.ortho = C.exa : radical_circle (C.exb,C.exc)
- z.w,z.a = get_points (C.ortho)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygon(A,B,C)
- \tkzDrawCircles(I_a,Xa I_b,Xb I_c,Xc)
- \tkzDrawCircles[red,thick](w,a)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(A,B,C)
-\end{tikzpicture}
-\end{Verbatim}
\end{minipage}
+% subsection menelaus (end)
-\begin{tkzelements}
- scale = .5
- z.A = point: new (0,0)
- z.B = point: new (6,0)
- z.C = point: new (0.8,4)
- T.ABC = triangle : new ( z.A,z.B,z.C )
- C.exa = T.ABC : ex_circle ()
- z.I_a,z.Xa = get_points (C.exa)
- C.exb = T.ABC : ex_circle (1)
- z.I_b,z.Xb = get_points (C.exb)
- C.exc = T.ABC : ex_circle (2)
- z.I_c,z.Xc = get_points (C.exc)
- C.ortho = C.exa : radical_circle (C.exb,C.exc)
- z.w,z.a = get_points (C.ortho)
-\end{tkzelements}
-
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawPolygon(A,B,C)
- \tkzDrawCircles(I_a,Xa I_b,Xb I_c,Xc)
- \tkzDrawCircles[red,thick](w,a)
- \tkzDrawPoints(A,B,C)
- \tkzLabelPoints(A,B,C)
-\end{tikzpicture}
-\hspace*{\fill}
-
-% subsection radical_circle (end)
\subsection{Euler ellipse} % (fold)
\label{sub:hexagram}
@@ -2136,21 +2167,22 @@ _,z.W = intersection (L.ZO,E)
\end{Verbatim}
\end{minipage}
\begin{minipage}{.6\textwidth}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon(A,B,C)
-\tkzDrawCircles[red](N,Ma O,A)
-\tkzDrawSegments(A,X B,Y C,Z B,Hb C,Hc X,O Y,O Z,O)
-\tkzDrawPolygon[red](U,V,W)
-\tkzLabelPoints[red](U,V,W)
-\tkzLabelPoints(A,B,C,X,Y,Z)
-\tkzDrawLine[blue](I,J)
-\tkzLabelPoints[blue,right](O,N,G,H,I,J)
-\tkzDrawPoints(I,J,U,V,W)
-\tkzDrawPoints(A,B,C,N,G,H,O,X,Y,Z,Ma,Mb,Mc,Ha,Hb,Hc)
-\tkzDrawEllipse[blue](N,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawCircles[red](N,Ma O,A)
+ \tkzDrawSegments(A,X B,Y C,Z B,Hb C,Hc X,O Y,O Z,O)
+ \tkzDrawPolygon[red](U,V,W)
+ \tkzLabelPoints[red](U,V,W)
+ \tkzLabelPoints(A,B,C,X,Y,Z)
+ \tkzDrawLine[blue](I,J)
+ \tkzLabelPoints[blue,right](O,N,G,H,I,J)
+ \tkzDrawPoints(I,J,U,V,W)
+ \tkzDrawPoints(A,B,C,N,G,H,O,X,Y,Z,Ma,Mb,Mc,Ha,Hb,Hc)
+ \tkzDrawEllipse[blue](N,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
+ \end{tikzpicture}
+\end{center}
\end{minipage}
\begin{Verbatim}
@@ -2165,8 +2197,8 @@ _,z.W = intersection (L.ZO,E)
\tkzDrawLine[blue](I,J)
\tkzLabelPoints[blue,right](O,N,G,H,I,J)
\tkzDrawPoints(I,J,U,V,W)
- \tkzDrawPoints(A,B,C,N,G,H,O,X,Y,Z,Ma,Mb,Mc,Ha,Hb,Hc)
- \tkzDrawEllipse[blue](N,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
+ \tkzDrawPoints(A,B,C,N,G,H,O,X,Y,Z,Ma,Mb,Mc,Ha,Hb,Hc)
+ \tkzDrawEllipse[blue](N,\tkzUseLua{a},\tkzUseLua{b},\tkzUseLua{ang})
\end{tikzpicture}
\end{Verbatim}
@@ -2256,36 +2288,39 @@ z.O = C.DC : inversion (z.W)
\end{Verbatim}
\end{minipage}
\begin{minipage}{.6\textwidth}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles[teal](O_1,B)
-\tkzDrawSemiCircles[thin,teal](O_2,C O_3,B)
-\tkzDrawArc[purple,delta=0](D,V)(U)
-\tkzDrawCircle[new](O_7,C)
-\tkzDrawSegments[thin,purple](A,D D,B C,R C,S C,D U,V)
-\tkzDrawSegments[thin,red](O,D A,O O,B)
-\tkzDrawPoints(A,B,C,D,O_7) %,
-\tkzDrawPoints(O_1,O_2,O_3,U,V,R,S,W,O)
-\tkzDrawSegments[cyan](O_3,S O_2,R)
-\tkzDrawSegments[very thin](A,B)
-\tkzDrawSegments[cyan,thin](C,U U,D)
-\tkzMarkRightAngles[size=.2,fill=gray!40,opacity=.4](D,C,A A,D,B
- D,S,C D,W,V O_3,S,U O_2,R,U)
-\tkzFillAngles[cyan!40,opacity=.4](B,A,D A,D,O_1
- C,D,B D,C,R B,C,S A,R,O_2)
-\tkzFillAngles[green!40,opacity=.4](S,C,D W,R,D
- D,B,C R,C,A O_3,S,B)
-\tkzLabelPoints[below](C,O_2,O_3,O_1)
-\tkzLabelPoints[above](D)
-\tkzLabelPoints[below](O)
-\tkzLabelPoints[below left](A)
-\tkzLabelPoints[above left](R)
-\tkzLabelPoints[above right](S)
-\tkzLabelPoints[left](V)
-\tkzLabelPoints[below right](B,U,W,O_7)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles[teal](O_1,B)
+ \tkzDrawSemiCircles[thin,teal](O_2,C O_3,B)
+ \tkzDrawArc[purple,delta=0](D,V)(U)
+ \tkzDrawCircle[new](O_7,C)
+ \tkzDrawSegments[thin,purple](A,D D,B C,R C,S C,D U,V)
+ \tkzDrawSegments[thin,red](O,D A,O O,B)
+ \tkzDrawPoints(A,B,C,D,O_7) %,
+ \tkzDrawPoints(O_1,O_2,O_3,U,V,R,S,W,O)
+ \tkzDrawSegments[cyan](O_3,S O_2,R)
+ \tkzDrawSegments[very thin](A,B)
+ \tkzDrawSegments[cyan,thin](C,U U,D)
+ \tkzMarkRightAngles[size=.2,fill=gray!40,opacity=.4](D,C,A A,D,B
+ D,S,C D,W,V O_3,S,U O_2,R,U)
+ \tkzFillAngles[cyan!40,opacity=.4](B,A,D A,D,O_1
+ C,D,B D,C,R B,C,S A,R,O_2)
+ \tkzFillAngles[green!40,opacity=.4](S,C,D W,R,D
+ D,B,C R,C,A O_3,S,B)
+ \tkzLabelPoints[below](C,O_2,O_3,O_1)
+ \tkzLabelPoints[above](D)
+ \tkzLabelPoints[below](O)
+ \tkzLabelPoints[below left](A)
+ \tkzLabelPoints[above left](R)
+ \tkzLabelPoints[above right](S)
+ \tkzLabelPoints[left](V)
+ \tkzLabelPoints[below right](B,U,W,O_7)
+ \end{tikzpicture}
+\end{center}
+
+
\end{minipage}
\begin{Verbatim}
@@ -2379,25 +2414,27 @@ z.O = C.DC : inversion (z.W)
z.xa,z.xb,z.xc = C.ortho : inversion (z.Ea,z.Eb,z.Ec)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
- \tkzGetNodes
-\tkzDrawCircles[red](O,xa N,Ea)
-\tkzFillCircles[green!30!black,opacity=.3](O,xa)
-\tkzFillCircles[yellow!30,opacity=.7](Ja,Ea Jb,Eb Jc,Ec)
-\tkzFillCircles[teal!30!black,opacity=.3](S,a)
-\tkzFillCircles[green!30,opacity=.3](N,Ea)
-\tkzDrawPoints[red](Ea,Eb,Ec,xa,xb,xc,N)
-\tkzClipCircle(O,xa)
-\tkzDrawLines[add=3 and 3](A,B A,C B,C)
-\tkzDrawCircles(Ja,Ea Jb,Eb Jc,Ec)
-\tkzFillCircles[lightgray!30,opacity=.7](Ja,Ea Jb,Eb Jc,Ec)
-\tkzDrawCircles[teal](S,a)
-\tkzDrawPoints(A,B,C,O)
-\tkzDrawPoints[teal](S)
-\tkzLabelPoints(A,B,C,O,S,N)
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles[red](O,xa N,Ea)
+ \tkzFillCircles[green!30!black,opacity=.3](O,xa)
+ \tkzFillCircles[yellow!30,opacity=.7](Ja,Ea Jb,Eb Jc,Ec)
+ \tkzFillCircles[teal!30!black,opacity=.3](S,a)
+ \tkzFillCircles[green!30,opacity=.3](N,Ea)
+ \tkzDrawPoints[red](Ea,Eb,Ec,xa,xb,xc,N)
+ \tkzClipCircle(O,xa)
+ \tkzDrawLines[add=3 and 3](A,B A,C B,C)
+ \tkzDrawCircles(Ja,Ea Jb,Eb Jc,Ec)
+ \tkzFillCircles[lightgray!30,opacity=.7](Ja,Ea Jb,Eb Jc,Ec)
+ \tkzDrawCircles[teal](S,a)
+ \tkzDrawPoints(A,B,C,O)
+ \tkzDrawPoints[teal](S)
+ \tkzLabelPoints(A,B,C,O,S,N)
+ \end{tikzpicture}
+\end{center}
+
+
% subsection apollonius_circle_v1_with_inversion (end)
\subsection{Apollonius circle v2} % (fold)
@@ -2472,82 +2509,24 @@ L.MaS = line: new (z.Ma,z.S)
z.t = intersection (L.ox,L.MaS) -- through
\end{tkzelements}
-
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawLines[add=1 and 1](A,B A,C B,C)
-\tkzDrawCircles(Ja,Xa Jb,Xb Jc,Xc o,t N,Ma) %
-\tkzClipCircle(o,t)
-\tkzDrawLines[red](o,L N,o Ma,t)
-\tkzDrawLines[cyan,add=4 and 4](Ma,N o,t)
-\tkzDrawPoints(A,B,C,Ma,Ja,Jb,Jc)
-\tkzDrawPoints[red](N,O,L,S,o,t)
-\tkzLabelPoints[right,font=\tiny](A,B,C,Ja,Jb,Jc,O,N,L,S,Ma,o)
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawLines[add=1 and 1](A,B A,C B,C)
+ \tkzDrawCircles(Ja,Xa Jb,Xb Jc,Xc o,t N,Ma) %
+ \tkzClipCircle(o,t)
+ \tkzDrawLines[red](o,L N,o Ma,t)
+ \tkzDrawLines[cyan,add=4 and 4](Ma,N o,t)
+ \tkzDrawPoints(A,B,C,Ma,Ja,Jb,Jc)
+ \tkzDrawPoints[red](N,O,L,S,o,t)
+ \tkzLabelPoints[right,font=\tiny](A,B,C,Ja,Jb,Jc,O,N,L,S,Ma,o)
+ \end{tikzpicture}
+\end{center}
% subsection apollonius_circle_v2 (end)
-\subsection{Orthogonal circles v1} % (fold)
-\label{sub:orthogonal_circles_v1}
-
-\begin{Verbatim}
-\begin{tkzelements}
- scale = .6
- z.C_1 = point: new (0,0)
- z.C_2 = point: new (8,0)
- z.A = point: new (5,0)
- C = circle: new (z.C_1,z.A)
- z.S,z.T = get_points (C: orthogonal_from (z.C_2))
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircles(C_1,T C_2,T)
- \tkzDrawSegments(C_1,T C_2,T)
- \tkzDrawLine(C_1,C_2)
- \tkzMarkRightAngle[fill=teal,%
- opacity=.2,size=1](C_1,T,C_2)
- \tkzDrawPoints(C_1,C_2,T)
- \tkzLabelPoints(C_1,C_2)
- \tkzLabelPoints[above](T)
- \tkzLabelSegment[left](C_1,T){r}
- \tkzLabelSegments[right](C_2,T){$\gamma$}
- \tkzLabelSegment[below](C_1,C_2){d}
- \tkzLabelCircle[left=10pt](C_1,T)(180){Circle 1}
- \tkzLabelCircle[right=10pt](C_2,T)(180){Circle 2}
-\end{tikzpicture}
-\end{Verbatim}
-
-\begin{tkzelements}
-scale = .6
-z.C_1 = point: new (0,0)
-z.C_2 = point: new (8,0)
-z.A = point: new (5,0)
-C = circle: new (z.C_1,z.A)
-z.S,z.T = get_points (C: orthogonal_from (z.C_2))
-\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(C_1,T C_2,T)
-\tkzDrawSegments(C_1,T C_2,T)
-\tkzDrawLine(C_1,C_2)
-\tkzMarkRightAngle[fill=teal,opacity=.2,size=.5](C_1,T,C_2)
-\tkzDrawPoints(C_1,C_2,T)
-\tkzLabelPoints(C_1,C_2)
-\tkzLabelPoints[above](T)
-\tkzLabelSegment[left](C_1,T){r}
-\tkzLabelSegments[right](C_2,T){$\gamma$}
-\tkzLabelSegment[below](C_1,C_2){d}
-\tkzLabelCircle[left=10pt](C_1,T)(180){Circle 1}
-\tkzLabelCircle[right=10pt](C_2,T)(180){Circle 2}
-\end{tikzpicture}
-\hspace*{\fill}
-% subsection orthogonal_circles_v1 (end)
-
-\subsection{Orthogonal circles v2} % (fold)
+\subsection{Orthogonal circles} % (fold)
\label{sub:orthogonal_circles_v2}
\begin{Verbatim}
@@ -2602,24 +2581,26 @@ L.OOp = line : new (z.O,z.Op)
z.M = L.OOp.mid
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle[red](O,P)
-\tkzDrawCircle[purple](O',z1)
-\tkzDrawCircle[cyan](M,T)
-\tkzDrawSegments(O',T O,T' O',T')
-\tkzDrawSegment[purple](O',T)
-\tkzDrawSegments[red](O,T O,O')
-\tkzDrawPoints(O,O',T,T',M)
-\tkzMarkRightAngle[fill=gray!10](O',T,O)
-\tkzLabelPoint[below](O){$O$}
-\tkzLabelPoint[above](T){$T$}
-\tkzLabelPoint[above](M){$M$}
-\tkzLabelPoint[below](T'){$T'$}
-\tkzLabelPoint[above left](O'){$O'$}
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle[red](O,P)
+ \tkzDrawCircle[purple](O',z1)
+ \tkzDrawCircle[cyan](M,T)
+ \tkzDrawSegments(O',T O,T' O',T')
+ \tkzDrawSegment[purple](O',T)
+ \tkzDrawSegments[red](O,T O,O')
+ \tkzDrawPoints(O,O',T,T',M)
+ \tkzMarkRightAngle[fill=gray!10](O',T,O)
+ \tkzLabelPoint[below](O){$O$}
+ \tkzLabelPoint[above](T){$T$}
+ \tkzLabelPoint[above](M){$M$}
+ \tkzLabelPoint[below](T'){$T'$}
+ \tkzLabelPoint[above left](O'){$O'$}
+ \end{tikzpicture}
+\end{center}
+
+
% subsection orthogonal_circles_v2 (end)
%
\subsection{Orthogonal circle to two circles} % (fold)
@@ -2674,19 +2655,22 @@ z.Tp = L.Tp.pb
z.Kp = L.Kp.pb
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(O,B O',D)
-\tkzDrawLine[cyan](E,F)
-\tkzDrawLines[add=.5 and .5,orange](O,O' O,T O,T')
-\tkzDrawSegments[cyan](M,T M,T' M,K M,K')
-\tkzDrawCircle(M,T)
-\tkzDrawPoints(O,O',T,M,T',K,K')
-\tkzLabelPoints(O,O',T,T',M,K,K')
-\end{tikzpicture}
-\hspace*{\fill}
-% \subsection{Orthogonal to two circles} % (fold)
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(O,B O',D)
+ \tkzDrawLine[cyan](E,F)
+ \tkzDrawLines[add=.5 and .5,orange](O,O' O,T O,T')
+ \tkzDrawSegments[cyan](M,T M,T' M,K M,K')
+ \tkzDrawCircle(M,T)
+ \tkzDrawPoints(O,O',T,M,T',K,K')
+ \tkzLabelPoints(O,O',T,T',M,K,K')
+ \end{tikzpicture}
+\end{center}
+
+
+% subsection Orthogonal to two circles (fold)
\subsection{Midcircles} % (fold)
\label{sub:midcircles}
@@ -2738,36 +2722,39 @@ z.Ap = z.M_1: symmetry (z.A)
z.H_4,z.F,z.E,z.H_0 = L.AB : projection (z.O_4,z.G,z.H,z.P_0)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle[thin,fill=green!10](O_4,P_0)
-\tkzDrawCircle[purple,fill=purple!10,opacity=.5](O_5,C)
-\tkzDrawSemiCircles[teal](O_0,B)
-\tkzDrawSemiCircles[thin,teal,fill=teal!20,opacity=.5](O_1,C O_2,B)
-\tkzDrawSemiCircles[color = orange](M_2,B)
-\tkzDrawSemiCircles[color = orange](M_1,A')
-\tkzDrawArc[purple,delta=0](M_0,P_0)(C)
-\tkzDrawSegments[very thin](A,B A,P B,Q)
-\tkzDrawSegments[color=cyan](O_0,P_0 B,J G,J G,O_0 H,O_2)
-\tkzDrawSegments[ultra thin,purple](M_1,P_0 M_2,P_0 M_1,M_0 M_0,P_1 M_0,P_0 M_1,J)
-\tkzDrawPoints(A,B,C,P_0,P_2,P_1,M_0,M_1,M_2,J,P,Q,S)
-\tkzDrawPoints(O_0,O_1,O_2,O_4,O_5,G,H)
-\tkzMarkRightAngle[size=.2,fill=gray!20,opacity=.4](O_0,P_0,M_0)
-\tkzLabelPoints[below](A,B,C,M_0,M_1,M_2,O_1,O_2,O_0)
-\tkzLabelPoints[above](P_0,O_5,O_4)
-\tkzLabelPoints[above](P_1,J)
-\tkzLabelPoints[above](P_2,P,Q,S)
-\tkzLabelPoints[above right](H,E)
-\tkzLabelPoints[above left](F,G)
-\tkzLabelPoints[below right](H_0)
-\tkzLabelCircle[below=4pt,font=\scriptsize](O_1,C)(80){$(\beta)$}
-\tkzLabelCircle[below=4pt,font=\scriptsize](O_2,B)(80){$(\gamma)$}
-\tkzLabelCircle[below=4pt,font=\scriptsize](O_0,B)(110){$(\alpha)$}
-\tkzLabelCircle[left,font=\scriptsize](O_4,P_2)(60){$(\delta)$}
-\tkzLabelCircle[above left,font=\scriptsize](O_5,C)(40){$(\epsilon)$}
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle[thin,fill=green!10](O_4,P_0)
+ \tkzDrawCircle[purple,fill=purple!10,opacity=.5](O_5,C)
+ \tkzDrawSemiCircles[teal](O_0,B)
+ \tkzDrawSemiCircles[thin,teal,fill=teal!20,opacity=.5](O_1,C O_2,B)
+ \tkzDrawSemiCircles[color = orange](M_2,B)
+ \tkzDrawSemiCircles[color = orange](M_1,A')
+ \tkzDrawArc[purple,delta=0](M_0,P_0)(C)
+ \tkzDrawSegments[very thin](A,B A,P B,Q)
+ \tkzDrawSegments[color=cyan](O_0,P_0 B,J G,J G,O_0 H,O_2)
+ \tkzDrawSegments[ultra thin,purple](M_1,P_0 M_2,P_0 M_1,M_0 M_0,P_1 M_0,P_0 M_1,J)
+ \tkzDrawPoints(A,B,C,P_0,P_2,P_1,M_0,M_1,M_2,J,P,Q,S)
+ \tkzDrawPoints(O_0,O_1,O_2,O_4,O_5,G,H)
+ \tkzMarkRightAngle[size=.2,fill=gray!20,opacity=.4](O_0,P_0,M_0)
+ \tkzLabelPoints[below](A,B,C,M_0,M_1,M_2,O_1,O_2,O_0)
+ \tkzLabelPoints[above](P_0,O_5,O_4)
+ \tkzLabelPoints[above](P_1,J)
+ \tkzLabelPoints[above](P_2,P,Q,S)
+ \tkzLabelPoints[above right](H,E)
+ \tkzLabelPoints[above left](F,G)
+ \tkzLabelPoints[below right](H_0)
+ \tkzLabelCircle[below=4pt,font=\scriptsize](O_1,C)(80){$(\beta)$}
+ \tkzLabelCircle[below=4pt,font=\scriptsize](O_2,B)(80){$(\gamma)$}
+ \tkzLabelCircle[below=4pt,font=\scriptsize](O_0,B)(110){$(\alpha)$}
+ \tkzLabelCircle[left,font=\scriptsize](O_4,P_2)(60){$(\delta)$}
+ \tkzLabelCircle[above left,font=\scriptsize](O_5,C)(40){$(\epsilon)$}
+ \end{tikzpicture}
+\end{center}
+
+
\begin{Verbatim}
\begin{tkzelements}
@@ -2900,18 +2887,20 @@ z.xp,z.yp = get_points (C.C0A : orthogonal_from (z.M_1))
z.O = L.BA.mid
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(C_0,A C_1,A C_3,A C_5,A)
-\tkzDrawCircles[thick,color=red](M_0,x M_1,x')
-\tkzDrawCircles[thick,color=blue](O,A)
-\tkzDrawLines(C_0,C_1 B,M_1)
-\tkzDrawPoints(A,B,C_0,C_1,M_0,M_1,x,y)
-\tkzLabelPoints[below right](A,B,C_0,C_1,M_0,M_1,x,y)
-\tkzLabelLine[pos=1.25,right]( M_0,M_1){$(\Delta)$}
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(C_0,A C_1,A C_3,A C_5,A)
+ \tkzDrawCircles[thick,color=red](M_0,x M_1,x')
+ \tkzDrawCircles[thick,color=blue](O,A)
+ \tkzDrawLines(C_0,C_1 B,M_1)
+ \tkzDrawPoints(A,B,C_0,C_1,M_0,M_1,x,y)
+ \tkzLabelPoints[below right](A,B,C_0,C_1,M_0,M_1,x,y)
+ \tkzLabelLine[pos=1.25,right]( M_0,M_1){$(\Delta)$}
+ \end{tikzpicture}
+\end{center}
+
+
% subsection pencil_v1 (end)
\subsection{Pencil v2} % (fold)
@@ -2967,123 +2956,20 @@ z.O = L.BA.mid
z.t = C.orth2.through
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(C_0,A C_1,B)
-\tkzDrawCircles[thick,color=red](M_0,u M_1,v M_2,t)
-\tkzDrawLines[add= .75 and .75](C_0,C_1 M_0,M_1)
-\tkzDrawPoints(A,B,C_0,C_1,M_0,M_1,M_2)
-\tkzLabelPoints[below right](A,B,C_0,C_1,M_0,M_1,M_2)
-\tkzLabelLine[pos=2,right]( M_0,M_1){$(\Delta)$}
-\end{tikzpicture}
-\hspace*{\fill}
-%subsection pencil_v2 (end)
-
-\subsection{Power v1} % (fold)
-\label{sub:power_v1}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{Verbatim}
-\begin{tkzelements}
- z.O = point : new (0,0)
- z.A = point : new (2,-2)
- z.M = point : new (-6,0)
- L.AM = line : new (z.A,z.M)
- C.OA = circle : new (z.O,z.A)
- z.Ap = C.OA : antipode (z.A)
- z.B = intersection (L.AM, C.OA)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircle(O,A)
- \tkzMarkRightAngle[fill=gray!10](A',B,M)
- \tkzDrawSegments(M,O A,A' A',B)
- \tkzDrawPoints(O,A,A',M,B)
- \tkzLabelPoints(O,A,A',M,B)
- \tkzDrawSegments[-Triangle](M,A M,A')
-\end{tikzpicture}
-\end{Verbatim}
-\end{minipage}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{tkzelements}
-scale = 1
-z.O = point : new (0,0)
-z.A = point : new (2,-2)
-z.M = point : new (-6,0)
-L.AM = line : new (z.A,z.M)
-C.OA = circle : new (z.O,z.A)
-z.Ap = C.OA : antipode (z.A)
-z.B = intersection (L.AM, C.OA)
-\end{tkzelements}
-
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle(O,A)
-\tkzMarkRightAngle[fill=gray!10](A',B,M)
-\tkzDrawSegments(M,O A,A' A',B)
-\tkzDrawPoints(O,A,A',M,B)
-\tkzLabelPoints(O,A,A',M,B)
-\tkzDrawSegments[-Triangle](M,A M,A')
-\end{tikzpicture}
-\end{minipage}
-% subsection power_v1 (end)
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(C_0,A C_1,B)
+ \tkzDrawCircles[thick,color=red](M_0,u M_1,v M_2,t)
+ \tkzDrawLines[add= .75 and .75](C_0,C_1 M_0,M_1)
+ \tkzDrawPoints(A,B,C_0,C_1,M_0,M_1,M_2)
+ \tkzLabelPoints[below right](A,B,C_0,C_1,M_0,M_1,M_2)
+ \tkzLabelLine[pos=2,right]( M_0,M_1){$(\Delta)$}
+ \end{tikzpicture}
+\end{center}
-\subsection{Power v2} % (fold)
-\label{sub:power_v2}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{Verbatim}
-\begin{tkzelements}
- z.O = point : new (0,0)
- z.A = point : new (2,2)
- z.M = point : new (-1.5,0)
- L.AM = line : new (z.A,z.M)
- C.OA = circle : new (z.O,z.A)
- z.Ap = C.OA : antipode (z.A)
- _,z.B = intersection (L.AM, C.OA)
- z.m = z.M : north(1)
- L.mM = line : new (z.m,z.M)
- z.U,z.V = intersection (L.mM,C.OA)
-\end{tkzelements}
-\begin{tikzpicture}
- \tkzGetNodes
- \tkzDrawCircle(O,A)
- \tkzMarkRightAngle[fill=gray!10](A',B,M)
- \tkzDrawSegments(M,O A,A' A',B A,B U,V)
- \tkzDrawPoints(O,A,A',M,B,U,V,m)
- \tkzLabelPoints(O,A,M,U,V,m)
- \tkzLabelPoints[below left](A',B)
- \tkzDrawSegments(M,A M,A')
-\end{tikzpicture}
-\end{Verbatim}
-\end{minipage}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{tkzelements}
-scale = 1
-z.O = point : new (0,0)
-z.A = point : new (2,2)
-z.M = point : new (-1.5,0)
-L.AM = line : new (z.A,z.M)
-C.OA = circle : new (z.O,z.A)
-z.Ap = C.OA : antipode (z.A)
-_,z.B = intersection (L.AM, C.OA)
-z.m = z.M : north(1)
-L.mM = line : new (z.m,z.M)
-z.U,z.V = intersection (L.mM,C.OA)
-\end{tkzelements}
+%subsection pencil_v2 (end)
-\hspace*{\fill}\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle(O,A)
-\tkzMarkRightAngle[fill=gray!10](A',B,M)
-\tkzDrawSegments(M,O A,A' A',B A,B U,V)
-\tkzDrawPoints(O,A,A',M,B,U,V,m)
-\tkzLabelPoints(O,A,M,U,V,m)
-\tkzLabelPoints[below left](A',B)
-\tkzDrawSegments(M,A M,A')
-\end{tikzpicture}
-\end{minipage}
-% subsection power_v2 (end)
\subsection{Reim v1} % (fold)
\label{sub:reim_v1}
@@ -3137,22 +3023,25 @@ z.U,z.V = intersection (L.mM,C.OA)
z.O = intersection (L.EC,L.FD)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(A,E B,H)
-\tkzDrawSegments(E,D C,F)
-\tkzDrawLines(E,O F,O)
-\tkzDrawLines[red](E,F H,G)
-\tkzDrawPoints(A,...,H,O)
-\tkzLabelPoints(A,B,D,F,G,O)
-\tkzLabelPoints[above](E,C,H)
-\tkzMarkAngles[size=.5](E,C,F E,D,F)
-\tkzFillAngles[green!40,opacity=.4,size=.5](E,C,F E,D,F)
-\tkzMarkAngles[size=.5](F,C,H G,D,E)
-\tkzFillAngles[red!40,opacity=.4,size=.5](F,C,H G,D,E)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,E B,H)
+ \tkzDrawSegments(E,D C,F)
+ \tkzDrawLines(E,O F,O)
+ \tkzDrawLines[red](E,F H,G)
+ \tkzDrawPoints(A,...,H,O)
+ \tkzLabelPoints(A,B,D,F,G,O)
+ \tkzLabelPoints[above](E,C,H)
+ \tkzMarkAngles[size=.5](E,C,F E,D,F)
+ \tkzFillAngles[green!40,opacity=.4,size=.5](E,C,F E,D,F)
+ \tkzMarkAngles[size=.5](F,C,H G,D,E)
+ \tkzFillAngles[red!40,opacity=.4,size=.5](F,C,H G,D,E)
+ \end{tikzpicture}
+\end{center}
+
+
% subsection reim_v1 (end)
\subsection{Reim v2} % (fold)
@@ -3200,19 +3089,22 @@ z.m,z.mp = get_points (C.AC: tangent_at (z.M))
z.n,z.np = get_points (C.BC: tangent_at (z.N))
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(A,C B,C)
-\tkzDrawLines[new,add=1 and 1](M,m N,n C,c)
-\tkzDrawSegment(M,N)
-\tkzDrawPoints(A,B,C,M,N)
-\tkzLabelPoints[below right](A,B,C,M,N)
-\tkzFillAngles[blue!30,opacity=.3](m',M,C N,C,c' M,C,c n',N,C)
-\tkzLabelCircle[below=4pt,font=\scriptsize](A,C)(90){$(\alpha)$}
-\tkzLabelCircle[left=4pt,font=\scriptsize](B,C)(-90){$(\beta)$}
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,C B,C)
+ \tkzDrawLines[new,add=1 and 1](M,m N,n C,c)
+ \tkzDrawSegment(M,N)
+ \tkzDrawPoints(A,B,C,M,N)
+ \tkzLabelPoints[below right](A,B,C,M,N)
+ \tkzFillAngles[blue!30,opacity=.3](m',M,C N,C,c' M,C,c n',N,C)
+ \tkzLabelCircle[below=4pt,font=\scriptsize](A,C)(90){$(\alpha)$}
+ \tkzLabelCircle[left=4pt,font=\scriptsize](B,C)(-90){$(\beta)$}
+ \end{tikzpicture}
+\end{center}
+
+
% subsection reim_v2 (end)
\subsection{Reim v3} % (fold)
@@ -3282,21 +3174,23 @@ z.n,z.np = get_points (C.BC: tangent_at (z.N))
z.D = intersection (L.KO,C.zO)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawSegments(K,D D,C)
-\tkzDrawPolygon[teal](A,B,C)
-\tkzDrawCircles[orange](x,A y,B z,C)
-\tkzDrawPoints[fill=white](A,B,C,I,J,K,D)
-\tkzLabelPoints[below](A,B,J,K,O)
-\tkzLabelPoints[above](C,D,I)
-\tkzDrawPoints[fill=black](O)
-\tkzLabelCircle[below=4pt,font=\scriptsize](x,A)(20){$(\alpha)$}
-\tkzLabelCircle[left=4pt,font=\scriptsize](y,B)(60){$(\beta)$}
-\tkzLabelCircle[below=4pt,font=\scriptsize](z,C)(60){$(\gamma)$}
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawSegments(K,D D,C)
+ \tkzDrawPolygon[teal](A,B,C)
+ \tkzDrawCircles[orange](x,A y,B z,C)
+ \tkzDrawPoints[fill=white](A,B,C,I,J,K,D)
+ \tkzLabelPoints[below](A,B,J,K,O)
+ \tkzLabelPoints[above](C,D,I)
+ \tkzDrawPoints[fill=black](O)
+ \tkzLabelCircle[below=4pt,font=\scriptsize](x,A)(20){$(\alpha)$}
+ \tkzLabelCircle[left=4pt,font=\scriptsize](y,B)(60){$(\beta)$}
+ \tkzLabelCircle[below=4pt,font=\scriptsize](z,C)(60){$(\gamma)$}
+ \end{tikzpicture}
+\end{center}
+
+
% subsection reim_v3 (end)
\subsection{Tangent and circle} % (fold)
@@ -3339,14 +3233,17 @@ z.i = L.Ti.pb
z.j = L.Tj.pb
z.k,z.l = get_points (C.AB: tangent_at (z.B))
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(A,B M,A)
-\tkzDrawPoints(A,B,E,i,j,M,S)
-\tkzDrawLines(E,i E,j k,l)
-\tkzLabelPoints[right,font=\small](A,B,E,S,M)
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(A,B M,A)
+ \tkzDrawPoints(A,B,E,i,j,M,S)
+ \tkzDrawLines(E,i E,j k,l)
+ \tkzLabelPoints[right,font=\small](A,B,E,S,M)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection tangent_and_circle (end)
@@ -3377,13 +3274,16 @@ z.B = point: new (1,2)
z.E = point: new (-3,2)
z.C,z.D = z.E : homothety(2,z.A,z.B)
\end{tkzelements}
-\hspace*{\fill}\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPoints(A,B,C,E,D)
-\tkzLabelPoints(A,B,C,E)
-\tkzDrawCircles(A,B C,D)
-\tkzDrawLines(E,C E,D)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(A,B,C,E,D)
+ \tkzLabelPoints(A,B,C,E)
+ \tkzDrawCircles(A,B C,D)
+ \tkzDrawLines(E,C E,D)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection homothety (end)
@@ -3436,18 +3336,21 @@ z.b1,z.b2 = get_points (C.OA: tangent_at (z.B))
z.H = L.AB: projection (z.O)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircle(O,A)
-\tkzDrawPolygon(A,B,C)
-\tkzDrawSegments[new](A,O B,O O,H A,D D,B)
-\tkzDrawLine(b1,b2)
-\tkzDrawPoints(A,B,C,D,H,O)
-\tkzFillAngles[green!20,opacity=.3](H,O,B A,C,B A,B,b1)
-\tkzFillAngles[teal!20,opacity=.3](A,D,B b2,B,A)
-\tkzLabelPoints(A,B,C,D,H,O)
-\end{tikzpicture}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircle(O,A)
+ \tkzDrawPolygon(A,B,C)
+ \tkzDrawSegments[new](A,O B,O O,H A,D D,B)
+ \tkzDrawLine(b1,b2)
+ \tkzDrawPoints(A,B,C,D,H,O)
+ \tkzFillAngles[green!20,opacity=.3](H,O,B A,C,B A,B,b1)
+ \tkzFillAngles[teal!20,opacity=.3](A,D,B b2,B,A)
+ \tkzLabelPoints(A,B,C,D,H,O)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection tangent_and_chord (end)
@@ -3541,26 +3444,26 @@ z.Cp,_ = intersection (L.GD,C.xD)
\end{Verbatim}
\end{minipage}
\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\hspace*{\fill}
-\begin{tikzpicture}[scale=.75]
-\tkzGetNodes
-\tkzDrawCircles(O,B)
-\tkzDrawCircles[cyan](P,B)
-\tkzDrawCircles[red](w,E)
-\tkzDrawCircles[new](x,F)
-\tkzDrawSegments(A,G E,G C,G)
-\tkzDrawPolygons[new](A,E,C A',E',C')
-\tkzDrawPoints(A,...,G,A',E',C',O,P)
-\begin{scope}[font=\scriptsize]
- \tkzLabelPoints(A,...,F)
- \tkzLabelPoints[above left](G,A',E',C')
- \tkzLabelCircle[left](O,B)(30){$(\beta)$}
- \tkzLabelCircle[below](P,A)(40){$(\gamma)$}
- \tkzLabelCircle[right](w,C)(90){$(\alpha)$}
- \tkzLabelCircle[left](x,B)(-230){$((\delta))$}
-\end{scope}
-\end{tikzpicture}
-\hspace*{\fill}
+\begin{center}
+ \begin{tikzpicture}[scale=.75]
+ \tkzGetNodes
+ \tkzDrawCircles(O,B)
+ \tkzDrawCircles[cyan](P,B)
+ \tkzDrawCircles[red](w,E)
+ \tkzDrawCircles[new](x,F)
+ \tkzDrawSegments(A,G E,G C,G)
+ \tkzDrawPolygons[new](A,E,C A',E',C')
+ \tkzDrawPoints(A,...,G,A',E',C',O,P)
+ \begin{scope}[font=\scriptsize]
+ \tkzLabelPoints(A,...,F)
+ \tkzLabelPoints[above left](G,A',E',C')
+ \tkzLabelCircle[left](O,B)(30){$(\beta)$}
+ \tkzLabelCircle[below](P,A)(40){$(\gamma)$}
+ \tkzLabelCircle[right](w,C)(90){$(\alpha)$}
+ \tkzLabelCircle[left](x,B)(-230){$((\delta))$}
+ \end{scope}
+ \end{tikzpicture}
+\end{center}
\end{minipage}
% subsection three_chords (end)
@@ -3620,19 +3523,20 @@ L.TA = C.wE : tangent_at (z.A)
L.TC = C.xE : tangent_at (z.C)
z.I = intersection (L.TA,L.TC)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawCircles(w,E)
-\tkzDrawCircles[cyan](x,E)
-\tkzDrawCircles[red](G,A)
-\tkzDrawLines(A,I C,I F,I)
-\tkzDrawPoints(A,C,E,F)
-\tkzLabelPoints[right](A)
-\tkzLabelPoints[above right](E,F)
-\tkzLabelPoints[below](C)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawCircles(w,E)
+ \tkzDrawCircles[cyan](x,E)
+ \tkzDrawCircles[red](G,A)
+ \tkzDrawLines(A,I C,I F,I)
+ \tkzDrawPoints(A,C,E,F)
+ \tkzLabelPoints[right](A)
+ \tkzLabelPoints[above right](E,F)
+ \tkzLabelPoints[below](C)
+ \end{tikzpicture}
+\end{center}
\end{minipage}
% subsection three_tangents (end)
@@ -3665,15 +3569,16 @@ C.AB = circle: new (z.A,z.B)
z.C = z.A: rotation (math.pi/3,z.B)
z.D = C.AB: midarc (z.B,z.C)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPoints(A,B,C)
-\tkzDrawCircles(A,B)
-\tkzDrawPoints(A,...,D)
-\tkzLabelPoints(A,...,D)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPoints(A,B,C)
+ \tkzDrawCircles(A,B)
+ \tkzDrawPoints(A,...,D)
+ \tkzLabelPoints(A,...,D)
+ \end{tikzpicture}
+\end{center}
\end{minipage}
% subsection midarc (end)
@@ -3738,68 +3643,92 @@ z.Q = intersection (L.tB,L.AC)
z.R = intersection (L.tC,L.AB)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygon[teal](A,B,C)
-\tkzDrawCircle(O,A)
-\tkzDrawPoints(A,B,C,P,Q,R)
-\tkzLabelPoints(A,B,C,P,Q,R)
-\tkzDrawLine[blue](Q,R)
-\tkzDrawLines[red](Ar,Al Br,Q Cr,Cl)
-\tkzDrawSegments(A,R C,P C,Q)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygon[teal](A,B,C)
+ \tkzDrawCircle(O,A)
+ \tkzDrawPoints(A,B,C,P,Q,R)
+ \tkzLabelPoints(A,B,C,P,Q,R)
+ \tkzDrawLine[blue](Q,R)
+ \tkzDrawLines[red](Ar,Al Br,Q Cr,Cl)
+ \tkzDrawSegments(A,R C,P C,Q)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection lemoine_line_without_macro (end)
\subsection{First Lemoine circle} % (fold)
\label{sub:first_lemoine_circle}
+Draw lines through the symmedian point $L$ and parallel to the sides of the triangle. The points where the parallel lines intersect the sides of the triangle then lie on a circle known as the first Lemoine circle. It has center at the Brocard midpoint, i.e., the midpoint of $[OL]$, where $O$ is the circumcenter and $K$ is the symmedian point
+
+[\href{https://mathworld.wolfram.com/FirstLemoineCircle.html}{Weisstein, Eric W. "First Lemoine Circle." From MathWorld--A Wolfram Web Resource.}]
+
\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{Verbatim}
\begin{tkzelements}
z.A = point: new (1,1)
z.B = point: new (5,1)
- z.C = point: new (2,3)
- T = triangle: new (z.A,z.B,z.C)
- z.O = T.circumcenter
- z.o,z.w = get_points (T : first_lemoine_circle ())
+ z.C = point: new (2.2,4)
+ T = triangle: new (z.A,z.B,z.C)
+ z.O = T.circumcenter
+ C.first_lemoine = T:first_lemoine_circle()
+ z.o,z.w = get_points( C.first_lemoine )
+ z.y1,z.y2 = intersection (T.ab,C.first_lemoine)
+ z.y5,z.y6 = intersection (T.bc,C.first_lemoine)
+ z.y3,z.y4 = intersection (T.ca,C.first_lemoine)
z.L = T : lemoine_point ()
\end{tkzelements}
+\begin{center}
\begin{tikzpicture}
\tkzGetNodes
\tkzDrawPolygons(A,B,C)
- \tkzDrawPoints(A,B,C,o,w,O,L)
- \tkzLabelPoints(A,B,C,o,w,O,L)
- \tkzDrawCircles(o,w O,A)
+ \tkzDrawPoints(A,B,C,o,O,L,y1,y2,y3,y4,y5,y6)
+ \tkzLabelPoints(A,B,C,o,O,L,y1,y2,y3,y4,y5,y6)
+ \tkzDrawCircles(o,w)
+ \tkzDrawLines(y1,y6 y5,y4 y2,y3 O,L)
\end{tikzpicture}
-\end{Verbatim}
+\end{center}
\end{minipage}
+
\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
+\begin{Verbatim}
\begin{tkzelements}
-z.A = point: new (1,1)
-z.B = point: new (5,1)
-z.C = point: new (2,3)
-T = triangle: new (z.A,z.B,z.C)
-z.O = T.circumcenter
-z.o,z.w = get_points(T:first_lemoine_circle())
-z.L = T : lemoine_point ()
+ z.A = point: new (1,1)
+ z.B = point: new (5,1)
+ z.C = point: new (2.2,4)
+ T = triangle: new (z.A,z.B,z.C)
+ z.O = T.circumcenter
+ C.first_lemoine = T:first_lemoine_circle()
+ z.o,z.w = get_points( C.first_lemoine )
+ z.y1,z.y2 = intersection (T.ab,C.first_lemoine)
+ z.y5,z.y6 = intersection (T.bc,C.first_lemoine)
+ z.y3,z.y4 = intersection (T.ca,C.first_lemoine)
+ z.L = T : lemoine_point ()
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}[scale = 1.25]
-\tkzGetNodes
-\tkzDrawPolygons(A,B,C)
-\tkzDrawPoints(A,B,C,o,w,O,L)
-\tkzLabelPoints(A,B,C,o,w,O,L)
-\tkzDrawCircles(o,w O,A)
+\begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(A,B,C)
+ \tkzDrawPoints(A,B,C,o,O,L,y1,y2,y3,y4,y5,y6)
+ \tkzLabelPoints(A,B,C,o,O,L,y1,y2,y3,y4,y5,y6)
+ \tkzDrawCircles(o,w)
+ \tkzDrawLines(y1,y6 y5,y4 y2,y3 O,L)
\end{tikzpicture}
+\end{Verbatim}
\end{minipage}
+
% subsection first_lemoine_circle (end)
\subsection{First and second Lemoine circles} % (fold)
\label{sub:first_and_second_lemoine_circles}
+Draw antiparallels through the symmedian point $L$. The points where these lines intersect the sides then lie on a circle, known as the cosine circle (or sometimes the second Lemoine circle). Refer to [\ref{sub:antiparallel_through_lemoine_point}]
+
+[\href{https://mathworld.wolfram.com/CosineCircle.html}{Weisstein, Eric W. "Cosine Circle." From MathWorld--A Wolfram Web Resource.}]
+
+
\begin{Verbatim}
\begin{tkzelements}
scale = 2
@@ -3863,19 +3792,22 @@ L.y4y5 = line : new (z.y4,z.y5)
L.y2y3 = line : new (z.y2,z.y3)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}[scale = .75]
-\tkzGetNodes
-\tkzDrawPolygons(a,b,c y1,y2,y3,y4,y5,y6)
-\tkzDrawPoints(x1,x2,x3,x4,x5,x6,L)
-\tkzDrawPoints(a,b,c,o,O,y1,y2,y3,y4,y5,y6)
-\tkzLabelPoints[below right](a,b,c,o,O,y1,y2,y3,y4,y5,y6)
-\tkzLabelPoints[below left](x1,x2,x3,x4,x5,x6)
-\tkzLabelPoints[above](L)
-\tkzDrawCircles(L,x o,p O,a)
-\tkzDrawSegments(L,O x1,x4 x2,x5 x3,x6)
-\end{tikzpicture}
-\hspace*{\fill}
+
+\begin{center}
+ \begin{tikzpicture}[scale = .75]
+ \tkzGetNodes
+ \tkzDrawPolygons(a,b,c y1,y2,y3,y4,y5,y6)
+ \tkzDrawPoints(x1,x2,x3,x4,x5,x6,L)
+ \tkzDrawPoints(a,b,c,o,O,y1,y2,y3,y4,y5,y6)
+ \tkzLabelPoints[below right](a,b,c,o,O,y1,y2,y3,y4,y5,y6)
+ \tkzLabelPoints[below left](x1,x2,x3,x4,x5,x6)
+ \tkzLabelPoints[above](L)
+ \tkzDrawCircles(L,x o,p O,a)
+ \tkzDrawSegments(L,O x1,x4 x2,x5 x3,x6)
+ \end{tikzpicture}
+\end{center}
+
+
% subsection first_and_second_lemoine_circles (end)
\subsection{Inversion} % (fold)
@@ -3942,52 +3874,6 @@ z.Cp = C.AC: inversion ( z.B, z.E, z.C )
\end{minipage}
% subsection inversion (end)
-\subsection{Gergonne point} % (fold)
-\label{sub:gergonne_point}
-
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{Verbatim}
-\begin{tkzelements}
-z.a = point: new(1,0)
-z.b = point: new(6,2)
-z.c = point: new(2,5)
-T = triangle : new (z.a,z.b,z.c)
-z.g = T : gergonne_point ()
-z.i = T.incenter
-z.ta,z.tb,z.tc = get_points (T : intouch ())
-\end{tkzelements}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygons(a,b,c)
-\tkzDrawPoints(a,b,c,g)
-\tkzLabelPoints(a,b,c)
-\tkzDrawSegments (a,ta b,tb c,tc)
-\tkzDrawCircle(i,ta)
-\end{tikzpicture}
-\end{Verbatim}
-\end{minipage}
-\begin{minipage}[t]{.5\textwidth}\vspace{0pt}%
-\begin{tkzelements}
-z.a = point: new(1,0)
-z.b = point: new(6,2)
-z.c = point: new(2,5)
-T = triangle : new (z.a,z.b,z.c)
-z.g = T : gergonne_point ()
-z.i = T.incenter
-z.ta,z.tb,z.tc = get_points (T : intouch ())
-\end{tkzelements}
-
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygons(a,b,c)
-\tkzDrawPoints(a,b,c,g)
-\tkzLabelPoints(a,b,c)
-\tkzDrawSegments (a,ta b,tb c,tc)
-\tkzDrawCircle(i,ta)
-\end{tikzpicture}
-\end{minipage}
-% subsection gergonne_point (end)
\subsection{Antiparallel through Lemoine point} % (fold)
\label{sub:antiparallel_through_lemoine_point}
@@ -4035,16 +3921,18 @@ L.anti = T : antiparallel (z.L,2)
z.z_0,z.z_1 = get_points (L.anti)
\end{tkzelements}
-\hspace*{\fill}
-\begin{tikzpicture}
-\tkzGetNodes
-\tkzDrawPolygons(a,b,c)
-\tkzDrawPoints(a,b,c,L,x_0,x_1,y_0,y_1,z_0,z_1)
-\tkzLabelPoints(a,b)
-\tkzLabelPoints[above](L,c)
-\tkzDrawSegments(x_0,x_1 y_0,y_1 z_0,z_1)
-\tkzDrawCircle(L,x_0)
-\end{tikzpicture}
+\begin{center}
+ \begin{tikzpicture}
+ \tkzGetNodes
+ \tkzDrawPolygons(a,b,c)
+ \tkzDrawPoints(a,b,c,L,x_0,x_1,y_0,y_1,z_0,z_1)
+ \tkzLabelPoints(a,b)
+ \tkzLabelPoints[above](L,c)
+ \tkzDrawSegments(x_0,x_1 y_0,y_1 z_0,z_1)
+ \tkzDrawCircle(L,x_0)
+ \end{tikzpicture}
+\end{center}
+
\end{minipage}
% subsection antiparallel_through_lemoine_point (end)
@@ -4362,7 +4250,8 @@ end
\end{minipage}
% subsection three_circles (end)
-\subsection{pentagons in a golden arbelos} % (fold)
+\subsection{p
+Pentagons in a golden arbelos} % (fold)
\label{sub:golden_arbelos}
\begin{tkzelements}
@@ -4499,6 +4388,5 @@ z.D_2,z.E_2,z.F_2,z.G_2 = z.M_0 : homothety (kk,z.D_1,z.E_1,z.F_1,z.G_1)
\end{tikzpicture}
\end{Verbatim}
-
-
-% subsection golden_arbelos (end) \ No newline at end of file
+% subsection golden_arbelos (end)
+% section examples (end) \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-indepthstudy.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-indepthstudy.tex
index 6f58cbec5c7..140063f9289 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-indepthstudy.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-indepthstudy.tex
@@ -282,7 +282,7 @@ Then |z.B = z.A * za| describes a rotation of point A by an angle |a|.
\end{minipage}
% subsubsection example_of_complex_use (end)
-\subsubsection{Point operations(complex)} % (fold)
+\subsubsection{Point operations (complex)} % (fold)
\label{ssub:point_operations_complex}
\begin{minipage}{.5\textwidth}
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-intersection.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-intersection.tex
index cc842aba53d..1ba8fd0981c 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-intersection.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-intersection.tex
@@ -61,7 +61,7 @@ end
\end{tikzpicture}
\end{minipage}
-Other examples: \ref{ssub:altshiller}, \ref{ssub:lemoine}, \ref{sub:alternate}
+Other examples: \ref{sub:altshiller}, \ref{sub:lemoine}, \ref{sub:alternate}
% subsection line_line (end)
\newpage
@@ -117,7 +117,7 @@ _,z.K = intersection (C.OD,L.AE)
\end{tikzpicture}
\end{minipage}
-Other examples: \ref{ssub:altshiller}
+Other examples: \ref{sub:altshiller}
% subsection line_circle (end)
\newpage
@@ -168,7 +168,7 @@ C.DC = circle : new (z.D,z.C)
\end{tikzpicture}
\end{minipage}
-Other examples: \ref{ssub:altshiller}, \ref{sub:the_figure_pappus_circle}
+Other examples: \ref{sub:altshiller}, \ref{sub:the_figure_pappus_circle}
% subsection circle_circle (end)
\newpage
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-main.tex b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-main.tex
index 55608bb26b0..10998bb7f58 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-main.tex
+++ b/Master/texmf-dist/doc/latex/tkz-elements/TKZdoc-elements-main.tex
@@ -1,6 +1,6 @@
% !TEX TS-program = lualatex
% encoding : utf8
-% Documentation of tkz-elements v2.25c
+% Documentation of tkz-elements v2.30c
% Copyright 2024 Alain Matthes
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,10 +21,10 @@
headings = small
]{tkz-doc}
\gdef\tkznameofpack{tkz-elements}
-\gdef\tkzversionofpack{2.25c}
+\gdef\tkzversionofpack{2.30c}
\gdef\tkzdateofpack{\today}
\gdef\tkznameofdoc{tkz-elements.pdf}
-\gdef\tkzversionofdoc{2.25c}
+\gdef\tkzversionofdoc{2.30c}
\gdef\tkzdateofdoc{\today}
\gdef\tkzauthorofpack{Alain Matthes}
\gdef\tkzadressofauthor{}
@@ -170,10 +170,8 @@ sharp corners
\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb
-
-
\begin{document}
-\LuaCodeDebugOn
+%\LuaCodeDebugOn
\parindent=0pt
\tkzTitleFrame{tkz-elements \tkzversionofpack\\Euclidean Geometry}
diff --git a/Master/texmf-dist/doc/latex/tkz-elements/tkz-elements.pdf b/Master/texmf-dist/doc/latex/tkz-elements/tkz-elements.pdf
index d42a3a109b8..edb5864f4fb 100644
--- a/Master/texmf-dist/doc/latex/tkz-elements/tkz-elements.pdf
+++ b/Master/texmf-dist/doc/latex/tkz-elements/tkz-elements.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf
index 6ef7f594765..029671719e9 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex
index 88e9abb16a7..d89c17bff4b 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex
@@ -29,8 +29,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.5}
-\def\TPdate{22/06/2024}
+\def\TPversion{0.1.6}
+\def\TPdate{13/07/2024}
\usepackage{soul}
\usepackage{codehigh}
\usepackage{tabularray}
@@ -532,7 +532,7 @@ The mandatory arguments correspond to the x-coordinates (in \TikZ\ language) and
\subsection{Draw a line}\label{tracstraight}
-The idea is to propose a command to draw a line, from:
+The idea is to propose a command to draw a line (or an asymptote), from:
\begin{itemize}
\item of two points (or nodes);
@@ -542,6 +542,7 @@ The idea is to propose a command to draw a line, from:
\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
%in the GraphiqueTikz environment
\DrawLine[keys]{point or node}{point or node or slope}
+\DrawAsymptote[keys]{x value}
\end{tcblisting}
The optional \MontreCode{[keys]} available are:
@@ -564,6 +565,7 @@ The optional \MontreCode{[keys]} available are:
\DrawLine[Color=red]{(-2,-1)}{(2,4)}
\DrawLine[Color=blue,Start=-5,End=3]{(A)}{(B)}
\DrawLine[Color=olive,Slope]{(C)}{0.25}
+ \DrawAsymptote[Color=brown]{-6}
\end{GraphTikz}
\end{tcblisting}
@@ -1396,7 +1398,7 @@ The last mandatory argument is the work point (abscissa version or node followin
\section{Commands specific to two-variable statistics}
-\subsection{The point cloud}\label{scatter}
+\subsection{The point scatter}\label{scatter}
In addition to commands linked to functions, it is also possible to represent double statistical series.
@@ -1490,7 +1492,7 @@ In partnership with the \MontreCode{xint-regression} package, loaded by the pack
The command, similar to that of defining a curve, is:
\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
-\DrawRegression[keys]<no fct>{type}<rounded>{listex}{listey}
+\DrawRegression[keys]<name fct>{type}<rounded>{listex}{listey}
\end{tcblisting}
The \MontreCode{[keys]} available are, classically:
@@ -1651,53 +1653,30 @@ $\begin{cases}
\gamma \approx \RoundNb[0]{\Cgamma}
\end{cases}$.
\end{tcblisting}
-%
-%\newpage
-%
-%\section{Liste des commandes}
-%
-%Les commandes disponibles sont :
-%
-%\NewDocumentCommand\lstcmd{ m m m }{%
-% \item[\texttt{#1}] : \mintinline{latex}|#2|\hfill{}page \pageref{#3}
-%}
-%
-%\begin{description}
-% \lstcmd{environnement~~}{\begin{GraphiqueTikz}...\end{GraphiqueTikz}}{creaenvt}
-% \lstcmd{axes et grilles}{\TracerAxesGrille}{creaaxesgr}
-% \lstcmd{aj val axes X~~}{\RajouterValeursAxeX}{ajoutvals}
-% \lstcmd{aj val axes Y~~}{\RajouterValeursAxeY}{ajoutvals}
-% \lstcmd{def fonction~~~}{\DefineCurve}{deftracfct}
-% \lstcmd{tracé courbe~~~}{\DrawCurve}{deftracfct}
-% \lstcmd{def interpo~~~~}{\DefineCurveInterpo}{deftracinterpo}
-% \lstcmd{tracé interpo~~}{\DrawCurveInterpo}{deftracinterpo}
-% \lstcmd{def spline~~~~~}{\DefineSplineCurve}{deftracfctspline}
-% \lstcmd{tracé spline~~~}{\DrawSplineCurve}{deftracfctspline}
-% \lstcmd{tracé droite~~~}{\TracerDroite}{tracdroite}
-% \lstcmd{def points~~~~~}{\DefinirPts}{defpts}
-% \lstcmd{def image~~~~~~}{\DefinirImage}{defpts}
-% \lstcmd{marq pts~~~~~~~}{\MarquerPts}{markpts}
-% \lstcmd{placer txt~~~~~}{\PlacerTexte}{placetxt}
-% \lstcmd{récup absc~~~~~}{\RecupererAbscisse}{recupcoordo}
-% \lstcmd{récup ordo~~~~~}{\RecupererOrdonnee}{recupcoordo}
-% \lstcmd{récup coordos~~}{\RecupererCoordonnees}{recupcoordo}
-% \lstcmd{images~~~~~~~~~}{\PlacerImages}{images}
-% \lstcmd{antécédents~~~~}{\TrouverAntecedents}{defanteced}
-% \lstcmd{antécédents~~~~}{\PlacerAntecedents}{tracanteced}
-% \lstcmd{intersection~~~}{\TrouverIntersections}{intersect}
-% \lstcmd{maximum~~~~~~~~}{\TrouverMaximum}{maximum}
-% \lstcmd{minimum~~~~~~~~}{\TrouverMinimum}{minimum}
-% \lstcmd{intégrale~~~~~~}{\DrawIntegral}{integr}
-% \lstcmd{tangente~~~~~~~}{\DrawTangente}{tgte}
-% \lstcmd{loi normale~~~~}{\DefinirLoiNormale}{loinormale}
-% \lstcmd{loi normale~~~~}{\TracerLoiNormale}{loinormale}
-% \lstcmd{loi khideux~~~~}{\DefinirLoiKhiDeux}{loikhideux}
-% \lstcmd{loi khideux~~~~}{\TracerLoiKhiDeux}{loikhideux}
-% \lstcmd{stats 2 var~~~~}{\TracerNuage}{nuage}
-% \lstcmd{regressions~~~~}{\TracerAjustement}{regressions}
-% \lstcmd{arrondi~~~~~~~~}{\RoundNb}{numarrond}
-% \lstcmd{nb aléat~~~~~~~}{\ChoisirNbAlea}{nbalea}
-%\end{description}
+
+\subsection{Monte-Carle method}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%in the GraphiqueTikz environment
+\SimulateMonteCarlo[keys]<function>}{number of points}[\nbptsmcok][\nbptsmcko]
+\end{tcblisting}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphTikz}%
+ [x=10cm,y=10cm,Xmin=0,Xmax=1,Xgrid=0.1,Xgrids=0.05,
+ Ymin=0,Ymax=1,Ygrid=0.1,Ygrids=0.05]
+ \DrawAxisGrids[Enlarge=2.5mm,Last]{auto}{auto}
+ \DefineCurve[Trace,Color=teal,Step=0.001]<f>{sqrt(1-x^2)}
+ \SimulateMonteCarlo<f>{5000}
+\end{GraphTikz}
+
+There is \textcolor{blue}{\num{\nbptsmcok}} blue points,
+there is \textcolor{red}{\num{\nbptsmcko}} red points.
+
+And $\frac{\num{\nbptsmcok}}{\num{\nbptsmc}}
+\approx \RoundNb[4]{\nbptsmcok/\nbptsmc}$
+et $\frac{\pi}{4} \approx \RoundNb[4]{pi/4}$.
+\end{tcblisting}
\pagebreak
@@ -1705,6 +1684,7 @@ $\begin{cases}
\begin{quote}
\begin{verbatim}
+0.1.6 : Vertical asymptote + [in french doc] commands for integrals
0.1.5 : Initial version [en]
\end{verbatim}
\end{quote}
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf
index c53d69179c3..ba330fa444a 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex
index 9ea6b13200e..99d8414cd0f 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex
@@ -29,8 +29,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.5}
-\def\TPdate{22/06/2024}
+\def\TPversion{0.1.6}
+\def\TPdate{13/07/2024}
\usepackage{soul}
\usepackage{codehigh}
\usepackage{tabularray}
@@ -39,7 +39,7 @@
\hl{\vphantom{\texttt{pf}}\texttt{#1}}%
}
\usepackage[french]{babel}
-
+\sisetup{group-minimum-digits=4}
\renewcommand{\footnoterule}{\vfill\kern -3pt \hrule width 0.4\columnwidth \kern 2.6pt}
\begin{document}
@@ -209,7 +209,8 @@ Il sera ensuite possible :
\item de tracer des courbes ;
\item de déterminer graphiquement des images ou des antécédents ;
\item de rajouter des éléments de dérivation (tangentes) ou d'intégration (domaine) ;
- \item de tracer une droite d'ajustement linéaire ou la courbe d'un autre ajustement.
+ \item de tracer une droite d'ajustement linéaire ou la courbe d'un autre ajustement ;
+ \item \dots
\end{itemize}
\subsection{Packages utilisés, et options du package}
@@ -332,10 +333,11 @@ Concernant les styles des \textit{objets}, ils sont donnés ci-dessous.
\tikzset{pflgrilles/.style={very thin,lightgray}}
\tikzset{pflaxes/.style={line width=0.8pt,->,>=latex}}
-%style des points (courbe / nuage /labels)
+%style des points (courbe / nuage /labels /montecarlo)
\tikzset{pflpoint/.style={line width=0.95pt}}
\tikzset{pflpointc/.style={radius=1.75pt}}
\tikzset{pflpointnuage/.style={radius=1.75pt}}
+\tikzset{pflpointmc/.style={radius=0.875pt}}
\tikzset{pflnoeud/.style={}} %pour les inner sep par exemple :-)
%style des courbes
@@ -544,9 +546,12 @@ L'idée est de proposer une commande pour tracer une droite, à partir :
\item d'un point (ou nœud) et de la pente.
\end{itemize}
+Il existe également une commande pour une asymptote verticale.
+
\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
%dans l'environnement GraphiqueTikz
\TracerDroite[clés]{point ou nœud}{point ou noeud ou pente}
+\TracerAsymptote[clés]{abscisse}
\end{tcblisting}
Les \MontreCode{[clés]}, optionnelles, disponibles sont :
@@ -569,6 +574,7 @@ Les \MontreCode{[clés]}, optionnelles, disponibles sont :
\TracerDroite[Couleur=red]{(-2,-1)}{(2,4)}
\TracerDroite[Couleur=blue,Debut=-5,Fin=3]{(A)}{(B)}
\TracerDroite[Couleur=olive,Pente]{(C)}{0.25}
+ \TracerAsymptote[Couleur=brown]{-6}
\end{GraphiqueTikz}
\end{tcblisting}
@@ -1415,6 +1421,132 @@ Les \MontreCode{[clés]}, optionnelles, disponibles sont :
\pagebreak
+\section{Commandes spécifiques des méthodes intégrales}
+
+\subsection{Méthodes géométriques}\label{methodesintergrales}
+
+L'idée est de proposer plusieurs méthodes graphiques pour illustrer graphiquement une intégrale, via :
+
+\begin{itemize}
+ \item une méthode des rectangles (Gauche, Droite ou Milieu) ;
+ \item la méthode des trapèzes.
+\end{itemize}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%dans l'environnement GraphiqueTikz
+\RepresenterMethodeIntegrale[clés]<fonction>{a}{b}
+\end{tcblisting}
+
+Les \MontreCode{Clés} disponibles sont :
+
+\begin{itemize}
+ \item \MontreCode{Couleur} : couleur des tracés, \MontreCode{red} par défaut ;
+ \item \MontreCode{NbSubDiv} : nombre de subdivisions, \MontreCode{10} par défaut ;
+ \item \MontreCode{Methode} : méthode géométrique utilisée, parmi parmi \MontreCode{RectanglesGauche / RectanglesDroite / RectanglesMilieu / Trapezes} pour spécifier la méthode utilisée, \MontreCode{RectanglesGauche} par défaut ;
+ \item \MontreCode{Remplir} : booléen, \MontreCode{true} par défaut, pour remplir les éléments graphiques ;
+ \item \MontreCode{CouleurRemplissage} : couleur de remplissage, définie par rapport à la couleur principale par défaut ;
+ \item \MontreCode{Opacite} : opacité, \MontreCode{0.25} par défaut, du remplissage.
+\end{itemize}
+
+\smallskip
+
+Le deuxième argument, optionnel et entre \MontreCode{<...>}, correspond à la fonction \textbf{précédemment définie} !
+
+\smallskip
+
+Les deux derniers arguments, obligatoires, correspondent aux bornes de l'intégrale.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}
+ [x=0.66cm,y=0.033cm,Xmin=0,Xmax=21,Xgrille=2,Xgrilles=1,
+ Ymin=0,Ymax=160,Ygrille=20,Ygrilles=10]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \DefinirCourbe[Couleur=red,Nom=cf,Debut=1,Fin=20,Trace]<f>{80*x*exp(-0.2*x)}
+ \RepresenterMethodeIntegrale[Couleur=teal]<f>{5}{15}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}
+ [x=0.66cm,y=0.033cm,Xmin=0,Xmax=21,Xgrille=2,Xgrilles=1,
+ Ymin=0,Ymax=160,Ygrille=20,Ygrilles=10]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \DefinirCourbe[Couleur=red,Nom=cf,Debut=1,Fin=20,Trace]<f>{80*x*exp(-0.2*x)}
+ \RepresenterMethodeIntegrale
+ [Methode=RectanglesDroite,Couleur=orange,NbSubDiv=7]<f>{1}{10}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}
+ [x=0.66cm,y=0.033cm,Xmin=0,Xmax=21,Xgrille=2,Xgrilles=1,
+ Ymin=0,Ymax=160,Ygrille=20,Ygrilles=10]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \DefinirCourbe[Couleur=red,Nom=cf,Debut=1,Fin=20,Trace]<f>{80*x*exp(-0.2*x)}
+ \RepresenterMethodeIntegrale
+ [Methode=RectanglesMilieu,Couleur=yellow,NbSubDiv=25]<f>{1}{20}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}
+ [x=0.66cm,y=0.033cm,Xmin=0,Xmax=21,Xgrille=2,Xgrilles=1,
+ Ymin=0,Ymax=160,Ygrille=20,Ygrilles=10]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \DefinirCourbe[Couleur=red,Nom=cf,Debut=1,Fin=20,Trace]<f>{80*x*exp(-0.2*x)}
+ \RepresenterMethodeIntegrale
+ [Methode=Trapezes,Couleur=pink,Remplir=false]<f>{1}{20}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
+\subsection{Méthode de Monte-Carlo}\label{montecarlo}
+
+L'idée est de proposer une commande pour simuler un calcul intégral via la méthode de Monte-Carlo.
+
+Le code se charge de simuler les \textit{tirages}, et les résultats peuvent être stockés dans des macros.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%dans l'environnement GraphiqueTikz
+\SimulerMonteCarlo[clés]<fonction>{nb essais}[\nbptsmcok][\nbptsmcko]
+\end{tcblisting}
+
+Les \MontreCode{Clés} disponibles sont :
+
+\begin{itemize}
+ \item \MontreCode{Couleurs} : couleurs des points, \MontreCode{blue/red} par défaut ;
+ \item \MontreCode{BornesX} : bornes \textit{horizontales} pour la simulation, valant \MontreCode{\textbackslash pflxmin,\textbackslash pflxmax} par défaut ;
+ \item \MontreCode{BornesY} : bornes \textit{verticales} pour la simulation, valant \MontreCode{\textbackslash pflymin,\textbackslash pflymax} par défaut.
+\end{itemize}
+
+Le deuxième argument, optionnel et entre \MontreCode{<...>}, est la fonction \textbf{précédemment définie} à utiliser.
+
+\smallskip
+
+Les deux derniers arguments, optionnels et entre \MontreCode{[...]}, sont les macros dans lesquelles sont stockées les résultats de la simulation. Ces macros sont \MontreCode{\textbackslash nbptsmcok} et \MontreCode{\textbackslash nbptsmcko} par défaut.
+
+À noter que la macro \MontreCode{\textbackslash nbptsmc} permet de récupérer le nombre de points utilisés.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+%avec \sisetup{group-minimum-digits=4} pour le formatage des "milliers"
+
+\begin{GraphiqueTikz}%
+ [x=10cm,y=10cm,Xmin=0,Xmax=1,Xgrille=0.1,Xgrilles=0.05,
+ Ymin=0,Ymax=1,Ygrille=0.1,Ygrilles=0.05]
+ \TracerAxesGrilles[Elargir=2.5mm,Dernier]{auto}{auto}
+ \DefinirCourbe[Trace,Couleur=teal,Pas=0.001]<f>{sqrt(1-x^2)}
+ \SimulerMonteCarlo<f>{5000}
+\end{GraphiqueTikz}
+
+Le nombre de points bleus est de \textcolor{blue}{\num{\nbptsmcok}},
+le nombre de points rouges est de \textcolor{red}{\num{\nbptsmcko}}.
+
+La proportion de points bleus est de $\frac{\num{\nbptsmcok}}{\num{\nbptsmc}}
+\approx \ArrondirNum[4]{\nbptsmcok/\nbptsmc}$
+et $\frac{\pi}{4} \approx \ArrondirNum[4]{pi/4}$.
+\end{tcblisting}
+
+\pagebreak
+
\section{Commandes spécifiques des statistiques à deux variables}
\subsection{Le nuage de points}\label{nuage}
@@ -1767,6 +1899,7 @@ Les commandes disponibles sont :
\lstcmd{def spline~~~~~}{\DefinirCourbeSpline}{deftracfctspline}
\lstcmd{tracé spline~~~}{\TracerCourbeSpline}{deftracfctspline}
\lstcmd{tracé droite~~~}{\TracerDroite}{tracdroite}
+ \lstcmd{asymptote vert~}{\TracerAsymptote}{tracdroite}
\lstcmd{def points~~~~~}{\DefinirPts}{defpts}
\lstcmd{def image~~~~~~}{\DefinirImage}{defpts}
\lstcmd{marq pts~~~~~~~}{\MarquerPts}{markpts}
@@ -1781,6 +1914,8 @@ Les commandes disponibles sont :
\lstcmd{maximum~~~~~~~~}{\TrouverMaximum}{maximum}
\lstcmd{minimum~~~~~~~~}{\TrouverMinimum}{minimum}
\lstcmd{intégrale~~~~~~}{\TracerIntegrale}{integr}
+ \lstcmd{méthodes int~~~}{\RepresenterMethodeIntegrale}{methodesintergrales}
+ \lstcmd{Monte-Carlo~~~~}{\SimulerMonteCarlo}{montecarlo}
\lstcmd{tangente~~~~~~~}{\TracerTangente}{tgte}
\lstcmd{loi normale~~~~}{\DefinirLoiNormale}{loinormale}
\lstcmd{loi normale~~~~}{\TracerLoiNormale}{loinormale}
@@ -1798,6 +1933,7 @@ Les commandes disponibles sont :
\begin{quote}
\begin{verbatim}
+0.1.6 : Asymptote verticale + Méthodes intégrales (géom + Monte Carlo)
0.1.5 : Correction d'un bug sur les rajouts de valeurs + Nœud pour une image + [en] version !
0.1.4 : Placement de texte
0.1.3 : Ajout de régressions avec le package xint-regression
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf
index 28ceb95d743..94fb8c1ba06 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex
index 8e39f520414..3b108d83e30 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaAnnouncement-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaAnnouncement-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -34,14 +34,14 @@
\documentclass[
paper=a4,
- ngerman,
+ german,
color=black!20,
footer=true,
type=announcement,
% logofile=example-image, %Falls die Logo Dateien nicht vorliegen
]{tudaposter}
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\usepackage[autostyle]{csquotes}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf
index b7d11f2aa44..46572dc5484 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex
index 92f63543ce5..be652d469a3 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBeamer-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaBeamer-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -32,15 +32,15 @@
% !TeX program = lualatex
%%
\documentclass[
- ngerman,%g'Globale Übergabe der Hauptsprache
- aspectratio=169,%Beamer Option zum Umschalten des Formates
+ german,% Globale Übergabe der Hauptsprache
+ aspectratio=169,% Beamer Option zum Umschalten des Formates
accentcolor=2d,% Akzentfarbe
logo=false,% Kein Logo auf Folgeseiten
- colorframetitle=true,%Akzentfarbe auch im Frametitle
-% logofile=example-image, %Falls die Logo Dateien nicht vorliegen
- design=2008, %to activate the old design
+ colorframetitle=true,% Akzentfarbe auch im Frametitle
+% logofile=example-image, % Falls die Logo Dateien nicht vorliegen
+ design=2008, %Um das alte Design zu aktivieren
]{tudabeamer}
-\usepackage[main=ngerman]{babel}
+\usepackage[main=german]{babel}
% Der folgende Block ist nur bei pdfTeX auf Versionen vor April 2018 notwendig:
\usepackage{iftex}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.pdf
index d2e2f117942..dba6a9b3925 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.tex
index fb02f96b8ed..3e6e4357546 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer2023.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBeamer2023.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaBeamer2023.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib
index 154a6a80fa0..8b1022904ae 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBibliography.bib' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaBibliography.bib' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf
index 50716c5dad5..73187728927 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex
index d4a84ee8079..7b39c7fc3f7 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaExercise-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaExercise-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -33,11 +33,11 @@
%%
\documentclass[
- ngerman,
+ german,
points=true,% für die Aktivierung der Punktereferenzen funktioniert nicht für TeX Versionen vor 2020
]{tudaexercise}
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\usepackage[autostyle]{csquotes}
\usepackage{biblatex}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco
index 43d28f5cf72..3711a5c75a0 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaFromaddress.lco' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaFromaddress.lco' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf
index 5bf13522ef3..1eff1dfc4c5 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex
index 453d4250a8f..2303aa23aec 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLeaflet-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaLeaflet-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -37,7 +37,7 @@
% logofile=example-image, %Falls die Logo Dateien nicht vorliegen
]{tudaleaflet}
-\usepackage[ngerman]{babel}
+\usepackage[german]{babel}
\usepackage{blindtext}
\usepackage[autostyle]{csquotes}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf
index 452462b83f6..f0393a9152d 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex
index 0e3381865df..20a6dc4e9a2 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLetter-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaLetter-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -33,11 +33,13 @@
%%
\DocumentMetadata{
pdfstandard=a-2b,
- pdfversion=1.7,% 2.0 is possible as well, but some validators don't support that yet
+ lang=de,
+ pdfversion=1.7,% 2.0 geht auch, aber die meisten Validierungsprogramme unterstützen das noch nicht.
}
+
\documentclass[
- ngerman,
+ german,
% logo=false,%Schaltet das Logo für Folgeseiten ab
accentcolor=9c,%Akzentfarbe nach Tabelle aus den Corporate Design Richtlinien
premium=true,%Aktiviert die Färbung der Identitätsleiste
@@ -88,7 +90,7 @@ Zusätzliche Optionen sind im Folgenden aufgelistet:\\
}
Für Wiederverwendung der Absenderadresse wurde die Datei \enquote{DEMO"=TUDaFromaddress.lco} angelegt. Sie wird, wie bei \KOMAScript{} üblich, über
-\verb+\LoadLetterOption+ geladen. Sämtliche dort gesetzten Werte können innerhalb der Briefdatei überschrieben werden.
+\verb+\LoadLett+\babelhyphen{empty}\verb+erOption+ geladen. Sämtliche dort gesetzten Werte können innerhalb der Briefdatei überschrieben werden.
Die Adressdatei wird üblicherweise lokal im System installiert, um sie nicht immer mit allen anderen Dateien kopieren zu müssen. Falls Sie dies durchführen möchten, findet sich eine entsprechende Erklärung am Ende der DEMO"=TUDaFromaddress.lco"=Datei.
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf
index 581d0c42723..e58bb389eb8 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex
index 028ecf6f95b..6b14bfda0d1 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPhD-de.tex' version 3.39 (2024-06-27)
+%% This is file `DEMO-TUDaPhD-de.tex' version 3.41 (2024-07-02)
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -34,11 +34,12 @@
% PDF/A über pdfmanagement und nicht über pdfx
\DocumentMetadata{
pdfstandard=a-2b,
+ lang=de,
pdfversion=1.7,% 2.0 geht auch, aber die meisten Validierungsprogramme unterstützen das noch nicht.
}
\documentclass[
- german,% Hauptsprache als globale Option, früher war ngerman notwendig
+ german,% Hauptsprache als globale Option, früher war german notwendig
ruledheaders=chapter,% Ebene bis zu der die Überschriften mit Linien abgetrennt werden, vgl. DEMO-TUDaPub
class=book,% Basisdokumentenklasse. Wählt die korrespondierende KOMA-Script Klasse
thesis={% Dokumententyp PhD Thesis, für kleinere Abschlussarbeiten, siehe DEMO-TUDaThesis-de.tex
@@ -57,7 +58,7 @@
%%%%%%%%%%%%%%%%%%%
% Spracheinstellungen
%%%%%%%%%%%%%%%%%%%
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\usepackage[autostyle]{csquotes}% Sprachabhängig Anführungszeichen mit \enquote
% Falls mit pdflatex kompiliert wird, wird microtype automatisch geladen, in diesem Fall muss diese Zeile entfernt werden, und falls weiter Optionen hinzugefügt werden sollen, muss dies über
@@ -173,16 +174,16 @@ TUDa-CI verwendet hierfür das babel-Paket.
Dies wird jedoch nicht automatisch geladen, da hierfür die Konfiguration der Sprachen bekannt sein müsste. Die Demo-Dateien für Abschlussarbeiten (\file{DEMO-TUDaThesis.tex}/""\file{DEMO-TUDaPhD.tex}) laden hierfür die Konfiguration:
\begin{verbatim}
- \usepackage[english, main=ngerman]{babel}
+ \usepackage[english, main=german]{babel}
\end{verbatim}
Diese ist für ein Dokument mit Deutsch als Hauptsprache und Englischen Elementen.
Die Hauptsprache wird als Wert der Option \verb+main=+ übergeben.
-Das Laden von \verb+ngerman+ wird in den Fällen, in denen es von TUDa-CI benötigt wird, automatisch ausgelöst.
+Das Laden von \verb+german+ wird in den Fällen, in denen es von TUDa-CI benötigt wird, automatisch ausgelöst.
Für eine bessere Übersichtlichkeit ist es dennoch hilfreich es dort aufzuführen.
Falls die Hauptsprache nicht Deutsch ist, wäre daher die folgende Konfiguration sinnvoll:
\begin{verbatim}
- \usepackage[ngerman, main=<Hauptsprache>]{babel}
+ \usepackage[german, main=<Hauptsprache>]{babel}
\end{verbatim}
\section{Übergabe der Titeldaten}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf
index fa06d29e4a3..46617bca7d2 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex
index 35e8d5d812b..33a78fd1f3a 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPoster-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaPoster-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -34,14 +34,14 @@
\documentclass[
paper=a0,
- ngerman,
+ german,
accentcolor=9c,
logo=body,% Logo unterhalb der Identitätsleise
footer=true,
% logofile=example-image, %Falls die Logo Dateien nicht vorliegen
]{tudaposter}
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\usepackage[autostyle]{csquotes}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf
index 6546e45efaf..6cecc143278 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex
index 1e6cdc8ce7f..7b03b612d87 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPub-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaPub-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -34,16 +34,17 @@
% PDF/A über pdfmanagement und nicht über pdfx
\DocumentMetadata{
pdfstandard=a-2b,
+ lang=de,
pdfversion=1.7,% 2.0 geht auch, aber die meisten Validierungsprogramme unterstützen das noch nicht.
}
\documentclass[
- ngerman,
+ german,
accentcolor=9c,% Farbe für Hervorhebungen auf Basis der Deklarationen in den Corporate Design Richtlinien
% logofile=example-image, %Falls die Logo Dateien nicht vorliegen
]{tudapub}
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\usepackage[autostyle]{csquotes}
\usepackage{biblatex}
@@ -239,7 +240,7 @@ Die \code{abstract}-Umgebung wird für \cls{tudapub} um eine Option für die Spr
\end{abstract}
\end{verbatim}
-Für die Verwendung ist wichtig, dass alle im Dokument genutzten Sprachen geladen werden. Im Falle des Beispiels muss also sowohl \code{ngerman} als auch \code{english} an das \pck{babel}-Paket übergeben werden.
+Für die Verwendung ist wichtig, dass alle im Dokument genutzten Sprachen geladen werden. Im Falle des Beispiels muss also sowohl \code{german} als auch \code{english} an das \pck{babel}-Paket übergeben werden.
\subsection{PDF/A Konformität}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf
index b5078b678ab..dcdda46cb20 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex
index 56272741ba0..c5974e6ece3 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaReport-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaReport-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -33,13 +33,13 @@
%%
\documentclass[
- ngerman,
+ german,
accentcolor=9c,% Farbe für Hervorhebungen auf Basis der Deklarationen in den
type=intern,
marginpar=false
]{tudapub}
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\usepackage[autostyle]{csquotes}
%Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf
index d42332ad995..ee5b7471f53 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex
index 81978daa3df..aba84ecdab7 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaSciPoster-de.tex' version 3.39 (2024-06-27),
+%% This is file `DEMO-TUDaSciPoster-de.tex' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -41,7 +41,7 @@
]{tudasciposter}
%Sprache
-\usepackage[ngerman]{babel}
+\usepackage[german]{babel}
\usepackage[autostyle]{csquotes}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf
index 555b1afdffb..0f6944a3c97 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex
index 300274f41c0..12080524fb7 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex
+++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaThesis-de.tex' version 3.39 (2024-06-27)
+%% This is file `DEMO-TUDaThesis-de.tex' version 3.41 (2024-07-02)
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -34,11 +34,12 @@
% PDF/A über pdfmanagement und nicht über pdfx
\DocumentMetadata{
pdfstandard=a-2b,
+ lang=de,
pdfversion=1.7,% 2.0 geht auch, aber die meisten Validierungsprogramme unterstützen das noch nicht.
}
\documentclass[
- german,% Hauptsprache als globale Option, früher war ngerman notwendig
+ german,% Hauptsprache als globale Option, früher war german notwendig
ruledheaders=section,% Ebene bis zu der die Überschriften mit Linien abgetrennt werden,
class=report,% Basisdokumentenklasse. Wählt die Korrespondierende KOMA-Script Klasse
thesis={type=bachelor},% Dokumententyp Thesis, für Dissertationen siehe die Demo-Datei DEMO-TUDaPhd
@@ -54,7 +55,7 @@
%%%%%%%%%%%%%%%%%%%
% Spracheinstellungen
%%%%%%%%%%%%%%%%%%%
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\usepackage[autostyle]{csquotes}% Sprachabhängig Anführungszeichen mit \enquote
% Falls mit pdflatex kompiliert wird, wird microtype automatisch geladen, in diesem Fall muss diese Zeile entfernt werden, und falls weiter Optionen hinzugefügt werden sollen, muss dies über
@@ -190,16 +191,16 @@ TUDa-CI verwendet hierfür das babel-Paket.
Dies wird jedoch nicht automatisch geladen, da hierfür die Konfiguration der Sprachen bekannt sein müsste. Die Demo-Dateien für Abschlussarbeiten (\file{DEMO-TUDaThesis.tex}/""\file{DEMO-TUDaPhD.tex}) laden hierfür die Konfiguration:
\begin{verbatim}
-\usepackage[english, main=ngerman]{babel}
+\usepackage[english, main=german]{babel}
\end{verbatim}
Diese ist für ein Dokument mit Deutsch als Hauptsprache und Englischen Elementen.
Die Hauptsprache wird als Wert der Option \verb+main=+ übergeben.
-Das Laden von \verb+ngerman+ wird in den Fällen, in denen es von TUDa-CI benötigt wird, automatisch ausgelöst.
+Das Laden von \verb+german+ wird in den Fällen, in denen es von TUDa-CI benötigt wird, automatisch ausgelöst.
Für eine bessere Übersichtlichkeit ist es dennoch hilfreich es dort aufzuführen.
Falls die Hauptsprache nicht Deutsch ist, wäre daher die folgende Konfiguration sinnvoll:
\begin{verbatim}
-\usepackage[ngerman, main=<Hauptsprache>]{babel}
+\usepackage[german, main=<Hauptsprache>]{babel}
\end{verbatim}
\section{Übergabe der Titeldaten}
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/README.md b/Master/texmf-dist/doc/latex/tuda-ci/README.md
index 7200d27b9fa..1adcd629dcd 100644
--- a/Master/texmf-dist/doc/latex/tuda-ci/README.md
+++ b/Master/texmf-dist/doc/latex/tuda-ci/README.md
@@ -2,7 +2,7 @@
Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2024
- tuda-ci v3.39 (2024-06-27)
+ tuda-ci v3.41 (2024-07-02)
***************************************************************************
@@ -362,4 +362,9 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls
- update PhD affidavit
* 3.39 (2024-06-27)
- update all templates to no longer use pdfx by default due to the pdfx bug
- - fix letter last page reference \ No newline at end of file
+ - fix letter last page reference
+ * 3.40 (2024-07-01)
+ - implement workaround for the pdfx package bug. Thanks to Ulrike Fischer for the hint!
+ - fix `ìn_department` strings for theses
+ * 3.41 (2024-07-01)
+ - change package loading order to support updated version of pdfx
diff --git a/Master/texmf-dist/doc/latex/typog/LICENSE b/Master/texmf-dist/doc/latex/typog/LICENSE
new file mode 100644
index 00000000000..888d9e68e7a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/typog/LICENSE
@@ -0,0 +1,415 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3c
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % https://www.latex-project.org/lppl.txt
+ % and version 1.3c or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
diff --git a/Master/texmf-dist/doc/latex/typog/README.md b/Master/texmf-dist/doc/latex/typog/README.md
index fb55ccb1e12..c67519bffc6 100644
--- a/Master/texmf-dist/doc/latex/typog/README.md
+++ b/Master/texmf-dist/doc/latex/typog/README.md
@@ -1,3 +1,6 @@
+![distcheck status](https://github.com/cspiel/typog/actions/workflows/distcheck.yml/badge.svg)
+
+
# TypoG &ndash; Typographic Fine-Tuning for LaTeX
LaTeX package `typog` provides macros for (micro-)typographic enhancements;
@@ -8,6 +11,7 @@ it covers a variety of topics:
* Manual italic correction
* Extra kerning for slash and hyphen
* Raising selected characters (e.g. hyphen, en-dash, and em-dash)
+* Adjusting the vertical position of `itemize`'s labels
* Aligning of the last line of a paragraph
* Filling of the last line last line of a paragraph
* Word spacing control
diff --git a/Master/texmf-dist/doc/latex/typog/RELEASE-HOWTO.md b/Master/texmf-dist/doc/latex/typog/RELEASE-HOWTO.md
deleted file mode 100644
index 13435ef66d5..00000000000
--- a/Master/texmf-dist/doc/latex/typog/RELEASE-HOWTO.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# How to prepare a new release
-
-... and not make too many mistakes.
-
-
-1. Check that the work-area is clean with respect to **git**-tracked
- files.
-
- ``` git status ```
-
-1. Update the date stamp of `\ProvidesPackage`.
-
-1. (Temporarily) Zero the `\overfullrule`s of the documentation and
- the example files.
-
-1. Thoroughly clean the work-area:
-
- ```make maintainer-clean```
-
-1. Rebuild:
-
- ```make```
-
-1. Check that all _*.sty_ and _*.pdf_ files are in good shape.
-
-1. Push the documentation files created in the previous step down into
- the *docs* directory:
-
- ```make update-docs```
-
-1. Undo the `\overfullrule` change.
-
-1. Commit the changes:
-
- ```
- git add .
- ```
-
- and finally
-
- ```
- git commit
- ```
-
-1. Tag the commit with the version string of `\ProvidesPackage`:
-
- ```git tag v1.23```
-
-1. Push the changes to the public repository:
-
- ```git push origin master --tags```
diff --git a/Master/texmf-dist/doc/latex/typog/crooked-paragraphs.mp b/Master/texmf-dist/doc/latex/typog/crooked-paragraphs.mp
index 778a3bc3846..7667b66b1d6 100644
--- a/Master/texmf-dist/doc/latex/typog/crooked-paragraphs.mp
+++ b/Master/texmf-dist/doc/latex/typog/crooked-paragraphs.mp
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,7 +25,9 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
diff --git a/Master/texmf-dist/doc/latex/typog/index.md b/Master/texmf-dist/doc/latex/typog/index.md
deleted file mode 100644
index f4dc2e8bd9a..00000000000
--- a/Master/texmf-dist/doc/latex/typog/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Package Documentation
-
-- Comprehensive `typog` documentation: [typog.pdf](https://cspiel.github.io/typog/typog.pdf)
-- `typog` examples and tests: [typog-example.pdf](https://cspiel.github.io/typog/typog-example.pdf)
-- **typog-grep** manual page: [typog-grep.1](https://cspiel.github.io/typog/typog-grep.1) and as PDF: [typog-grep.1.pdf](https://cspiel.github.io/typog/typog-grep.1.pdf)
diff --git a/Master/texmf-dist/doc/latex/typog/slant-angle.mp b/Master/texmf-dist/doc/latex/typog/slant-angle.mp
index f25f790ea6f..61f2d248e22 100644
--- a/Master/texmf-dist/doc/latex/typog/slant-angle.mp
+++ b/Master/texmf-dist/doc/latex/typog/slant-angle.mp
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,7 +25,9 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
diff --git a/Master/texmf-dist/doc/latex/typog/smooth-parshapes.mp b/Master/texmf-dist/doc/latex/typog/smooth-parshapes.mp
index ce47135a56e..dcf66fd0527 100644
--- a/Master/texmf-dist/doc/latex/typog/smooth-parshapes.mp
+++ b/Master/texmf-dist/doc/latex/typog/smooth-parshapes.mp
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,7 +25,9 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
diff --git a/Master/texmf-dist/doc/latex/typog/teximan2latex.sed b/Master/texmf-dist/doc/latex/typog/teximan2latex.sed
index b329ac3845f..ff0a7e65328 100644
--- a/Master/texmf-dist/doc/latex/typog/teximan2latex.sed
+++ b/Master/texmf-dist/doc/latex/typog/teximan2latex.sed
@@ -10,35 +10,49 @@
/@menu/,/@end menu/d
## Convert sectioning macros to our own hierarchy.
-s/^@chapter \(.*\)$/\\subsection*{\\textls[40]{\1}}/
-s/^@section \(.*\)$/\\subsubsection*{\1}/
+s/^@chapter \(.*\)$/\\subsection{\\titlecase{\1}\\label{\1}}/
+s/^@section \(.*\)$/\\subsubsection{\\titlecase{\1}}\\label{\1}/
## Make `@asis' list resemble the Texinfo format.
s/@table @asis/\\begin{list}{}{\\itemindent=-20pt\\leftmargin=20pt}/
s/@end table/\\end{list}/
+## We substitute our maxipage environment for @display.
+s/@display/\\begin{maxipage}/
+s/@end display/\\end{maxipage}/
+
+## Translate `@example' environments.
+s/@example/\\begin{quote}\\tt\\obeylines/
+s/@end example/\\end{quote}\n\n/
+
## Indenting by four spaces generates a `verbatim' environment.
s/@verbatim/\\begin{verbatim}/
s/@end verbatim/\\end{verbatim}/
-## We substitute @display for our maxipage environment.
-s/@display/\\begin{maxipage}/
-s/@end display/\\end{maxipage}/
-
## The argument format of the URL macro is different.
s/@url{\([^,]*\), \([^}]*\)}/\\href{\1}{\2}/g
## Use our own markup.
s/\.\.\./\\dots{}/g
s/LaTeX/\\LaTeX{}/g
-s/@file/\\textit/g
+s/@file/\\emph/g
s/@strong/\\textbf/g
+s/@var/\\emph/g
s/[w]{/mbox{/g
+## Translate some Texinfo macros.
+s/@backslashchar/\\char`\\\\/g
+s/@lbracechar/\\{/g
+s/@noindent/\\noindent/g
+s/@rbracechar/\\}/g
+
## Quote some special characters.
s/%/\\%/g
s/_/\\_/g
+## Add space around alternative-indicators.
+s/[|]/\\,|\\,/g
+
## Adapt to how a man-page is typeset.
## En-dashes in front of long options really suck!
s/--/-\\nolig*-/g
@@ -52,4 +66,4 @@ s/@@/@/g
s/\\jobname/\\textbackslash jobname/g
## Make qualified Perl names breakable.
-s/::/::\\discretionary{}{}{}/g
+s/::/::\\breakpoint*/g
diff --git a/Master/texmf-dist/doc/latex/typog/title.mp b/Master/texmf-dist/doc/latex/typog/title.mp
index 2fd74e91f9d..21e47883ee5 100644
--- a/Master/texmf-dist/doc/latex/typog/title.mp
+++ b/Master/texmf-dist/doc/latex/typog/title.mp
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,7 +25,9 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
diff --git a/Master/texmf-dist/doc/latex/typog/typog-example.pdf b/Master/texmf-dist/doc/latex/typog/typog-example.pdf
index 621ac319d20..48a8a506e14 100644
--- a/Master/texmf-dist/doc/latex/typog/typog-example.pdf
+++ b/Master/texmf-dist/doc/latex/typog/typog-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/typog/typog-example.tex b/Master/texmf-dist/doc/latex/typog/typog-example.tex
index af04d490094..470bd830723 100644
--- a/Master/texmf-dist/doc/latex/typog/typog-example.tex
+++ b/Master/texmf-dist/doc/latex/typog/typog-example.tex
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,7 +25,9 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
@@ -42,10 +44,14 @@
\usepackage{fullwidth}
\usepackage{hyphenat}
\usepackage{mathtools}
-\usepackage[activate=true, verbose=true]{microtype}
+\usepackage[activate=true, verbose=false]{microtype}
\usepackage{ragged2e}
\usepackage[nobottomtitles*]{titlesec}\renewcommand*{\bottomtitlespace}{.2\textheight}
-\usepackage[debug, trackingttspacing]{typog}
+\usepackage{trace}
+\usepackage[debug,
+ trackingttspacing,
+ uppercaselabelitemadjustments={0pt, .1em, .15em, .1em},
+ lowercaselabelitemadjustments={-.0667em, 0pt, .1em, 0pt}]{typog}
\usepackage{xcolor}
\usepackage[loosest, proportional, scaled=1.064]{erewhon}
@@ -55,49 +61,42 @@
\usepackage{setspace}\setstretch{1.08333}
\def\xsfdefault{\relax}
-{
- \def\examplefont{6}
-
- \ifcase\examplefont % 0 -- document's default sans-serif font (e.g., ecrm1000)
- \gdef\examplefontname{default}
- \global\let\xsf=\sf
- \global\let\xsfdefault=\sfdefault
- \or % 1 -- Nunito
- \gdef\examplefontname{Nunito}
- \usepackage{nunito}
- \xdef\xsfdefault{\rmdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 2 -- OpenSans
- \gdef\examplefontname{OpenSans}
- \usepackage[defaultsans]{opensans}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 3 -- Noto Sans
- \gdef\examplefontname{OpenSans}
- \usepackage[sfdefault]{noto}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 4 -- Roboto
- \gdef\examplefontname{Roboto}
- \usepackage[sfdefault]{roboto}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 5 -- Montserrat
- \gdef\examplefontname{Montserrat Alternate}
- \usepackage[alternates]{montserrat}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 6 -- Inter
- \gdef\examplefontname{Inter}
- \usepackage[sfdefault]{inter}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \else
- \SelectedUnknownExampleFont
- \fi
- \typeout{typog-example: font for examples: `\xsfdefault'}%
-}
+\def\examplefont{6}
+
+\ifcase\examplefont % 0 -- document's default sans-serif font (e.g., ecrm1000)
+ \def\examplefontname{default}
+ \let\xsf=\sf
+ \let\xsfdefault=\sfdefault
+\or % 1 -- Nunito
+ \def\examplefontname{Nunito}
+ \def\xsfdefault{Nunito-TOsF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 2 -- OpenSans
+ \def\examplefontname{OpenSans}
+ \def\xsfdefault{opensans-TLF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 3 -- Noto Sans
+ \def\examplefontname{Noto Sans}
+ \def\xsfdefault{NotoSans-TLF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 4 -- Roboto
+ \def\examplefontname{Roboto}
+ \def\xsfdefault{Roboto-LF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 5 -- Montserrat
+ \def\examplefontname{Montserrat Alternates}
+ \def\xsfdefault{MontserratAlternates-LF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 6 -- Inter
+ \def\examplefontname{Inter}
+ \def\xsfdefault{Inter-LF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\else
+ \SelectedUnknownExampleFont
+\fi
+
+\typeout{typog-example: font for examples: `\xsfdefault'}%
\usepackage{hyperref}
\usepackage{cleveref}
@@ -204,7 +203,6 @@
concentrate all the badness in one place, making one truly unsightly line instead of
two moderately bad ones, because a single ``write-off'' produces fewest total
demerits according to the rules.}
- %There is a much better way to get the desired effect:~[\dots]
\newcommand*{\texbooktolerancesamplecredits}
{\medskip\noindent
\textsl{The sample text was taken from The~\TeX{}book~\cite[p.~107]{knuth:1986}.}}
@@ -212,7 +210,7 @@
\newcommand*{\texbookparfillskipsample}
{We still haven't discussed the special trick that allows the final line of a paragraph
to be shorter than the others. Just before \TeX{} begins to choose breakpoints,
- it does two important things: [\dots]}
+ it does two important things: [\dots\itcorr{-4}]}
\newcommand*{\texbooklongparfillskipsample}
{We still haven't discussed the special trick that allows the final line of a paragraph
to be shorter than the others. Just before \TeX{} begins to choose breakpoints,
@@ -220,7 +218,7 @@
that glue is discarded. (The reason is that a blank space often gets into a token list just
before \code{\char92par} or just before \code{\char36\char36}, and this blank space should not be
part of the paragraph.) (2)~Three or more items are put at the end of the
- current horizontal list~[\dots]}
+ current horizontal list~[\dots\itcorr{-4}]}
\newcommand*{\texbookparfillskipsamplecredits}
{\medskip\noindent
\textsl{The sample text was taken from The~\TeX{}book~\cite[p.~99n]{knuth:1986}.}}
@@ -271,7 +269,7 @@
The font used in this example is \exfontnameinfo, \exfontsizeinfo*.}
\setcounter{tocdepth}{1}
-\setlength{\overfullrule}{3pt}
+\setlength{\overfullrule}{0pt}
\hbadness=-1
\input{ushyphex}
@@ -383,7 +381,74 @@ in the official documentation of package~\packagename{typog}.
\noindent
Unless otherwise noted the font used in the examples is \singlequotes{\examplefontname}.
-\bigskip
+\section{Setup and Reconfiguration}
+
+\noindent
+\code{\char`\\ typogget}
+
+\begin{list}{}{}
+ \newcommand*{\expandsto}{$\mathbin{\mapsto}$}
+\item \code{breakpenalty} \expandsto{} \the\typogget{breakpenalty}
+\item \code{ligaturekern} \expandsto{} \milliem{\typogget{ligaturekern}}
+\item \code{lowercaselabelitemadjustments} \expandsto{} \typogget{lowercaselabelitemadjustments}
+\item \code{mathitalicscorrection} \expandsto{} \the\typogget{mathitalicscorrection}
+\item \code{raisecapitaldash} \expandsto{} \the\typogget{raisecapitaldash}
+\item \code{raisecapitalguillemets} \expandsto{} \the\typogget{raisecapitalguillemets}
+\item \code{raisecapitalhyphen} \expandsto{} \the\typogget{raisecapitalhyphen}
+\item \code{raisecapitaltimes} \expandsto{} \the\typogget{raisecapitaltimes}
+\item \code{raisefiguredash} \expandsto{} \the\typogget{raisefiguredash}
+\item \code{raiseguillemets} \expandsto{} \the\typogget{raiseguillemets}
+\item \code{shrinklimits} \expandsto{} \typogget{shrinklimits}
+\item \code{slashkern} \expandsto{} \the\typogget{slashkern}
+\item \code{stretchlimits} \expandsto{} \typogget{stretchlimits}
+\item \code{textitalicscorrection} \expandsto{} \the\typogget{textitalicscorrection}
+\item \code{trackingttspacing} \expandsto{} \typogget{trackingttspacing}
+\item \code{uppercaselabelitemadjustments} \expandsto{} \typogget{uppercaselabelitemadjustments}
+\end{list}
+
+\begingroup
+ \dimen0=\typogget{raisecapitaldash}%
+ \setbox0=\hbox to \typogget{ligaturekern} {}%
+\endgroup
+
+\noindent
+\code{\char`\\ typoggetnth}
+
+\begin{list}{}{}
+\item
+ Elements of \code{lowercaselabelitemadjustments}:
+ (1)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{1}\the\dimen0,
+ (2)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{2}\the\dimen0,
+ (3)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{3}\the\dimen0, and
+ (4)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{4}\the\dimen0.
+
+ Same elements now accessed from the right-hand-side, i.\,e.~with negative indices:
+ (\textminus4)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-4}\nth,
+ (\textminus3)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-3}\nth,
+ (\textminus2)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-2}\nth, and
+ (\textminus1)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-1}\nth.
+
+\item Elements of \code{shrinklimits}:
+ (1)~\typoggetnth{nth}{shrinklimits}{1}\nth,
+ (2)~\typoggetnth{nth}{shrinklimits}{2}\nth, and
+ (3)~\typoggetnth{nth}{shrinklimits}{3}\nth.
+
+\item Elements of \code{stretchlimits}:
+ (1)~\typoggetnth{nth}{stretchlimits}{1}\nth,
+ (2)~\typoggetnth{nth}{stretchlimits}{2}\nth, and
+ (3)~\typoggetnth{nth}{stretchlimits}{3}\nth.
+
+\item Elements of \code{trackingttspacing}:
+ (1)~\typoggetnth{nth}{trackingttspacing}{1}\nth,
+ (2)~\typoggetnth{nth}{trackingttspacing}{2}\nth, and
+ (3)~\typoggetnth{nth}{trackingttspacing}{3}\nth.
+
+\item Elements of \code{uppercaselabelitemadjustments}:
+ (1)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{1}\the\dimen0,
+ (2)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{2}\the\dimen0,
+ (3)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{3}\the\dimen0, and
+ (4)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{4}\the\dimen0.
+\end{list}
\section{Information}
@@ -864,6 +929,81 @@ We again compare the default implementation with the adjusted one.
\parbox[t]{0pt}{\FrenchdoublequotesFR{\samplestring}}
\end{quote}
+\section{Label Items}
+
+The current configurations for the uppercase and lowercase adjustments are
+\{\typogget{uppercaselabelitemadjustments}\} and \{\typogget{lowercaselabelitemadjustments}\},
+respectively.
+
+\begin{center}
+ \makeatletter
+ \noindent
+ A\raisebox{\typog@adjust@uppercase@labelitemi}{\labelitemi}%
+ B\raisebox{\typog@adjust@uppercase@labelitemii}{\labelitemii}%
+ E\raisebox{\typog@adjust@uppercase@labelitemiii}{\labelitemiii}%
+ G\raisebox{\typog@adjust@uppercase@labelitemiv}{\labelitemiv}H \\
+ a\raisebox{\typog@adjust@lowercase@labelitemi}{\labelitemi}%
+ b\raisebox{\typog@adjust@lowercase@labelitemii}{\labelitemii}%
+ c\raisebox{\typog@adjust@lowercase@labelitemiii}{\labelitemiii}%
+ e\raisebox{\typog@adjust@lowercase@labelitemiv}{\labelitemiv}g
+ \makeatother
+\end{center}
+
+For the following nested lists we adjust levels one and three for uppercase and levels two and
+four for lowercase.
+
+\begingroup
+ \uppercaseadjustlabelitems{1,3}
+ \lowercaseadjustlabelitems{2,4}
+ \setlength{\itemsep}{0pt}
+ \setlength{\parsep}{0pt}
+ \setlength{\topsep}{0pt}
+ \begin{itemize}
+ \item A
+ \item B
+ \item C
+ \begin{itemize}
+ \item d
+ \item e
+ \item f
+ \begin{itemize}
+ \item G
+ \item H
+ \item I
+ \begin{itemize}
+ \item j
+ \item k
+ \item l
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+\endgroup
+\noadjustlabelitems{*}% not necessary, but we want to exercise the macro
+
+The left example shows the result of \code{\string\typogadjuststairs\{.25pt\}\{11\}\{ABC\}} and
+the one on the right hand side just uses the same parameters except for the sample~\sample{ace},
+this is, only lowercase letters.
+
+\begin{center}
+ \begin{minipage}[t]{12em}
+ \centering
+ \typogadjuststairs{.25pt}{11}{ABC}
+ \end{minipage}
+ \begin{minipage}[t]{12em}
+ \centering
+ \typogadjuststairs{.25pt}{11}{ace}
+ \end{minipage}
+\end{center}
+
+For this document the calls
+\code{\string\typoguppercaseadjustcheck\{ABC\-DEF\-GHI\-JKL\-MNO\-PQR\-STU\-VWX\-YZ\}} and
+\code{\string\typoglowercaseadjustcheck\{ace\-gmn\-opq\-rsu\-vwx\-yz\}} yield
+\sample{\typoguppercaseadjustcheck{ABCDEFGHIJKLMNOPQRSTUVWXYZ}} and
+\sample{\typoglowercaseadjustcheck{acegmnopqrsuvwxyz}}, where the adjustments in effect are
+\code{\{\typogget{uppercaselabelitemadjustments}\}} and
+\code{\{\typogget{lowercaselabelitemadjustments}\}}, respectively.
+
\clearpage
\section{Align Last Line}
@@ -1085,7 +1225,7 @@ consult \propername{David Carlisle's} excellent post on \propername{StackExchang
\begin{center}
\setlength{\overfullrule}{0pt}
- \newcommand*{\spacesampletext}[1]{some#1text#1with#1spaces\rule{0.1pt}{1em}}
+ \newcommand*{\spacesampletext}[1]{some#1text#1with#1spaces\rule{.1pt}{1em}}
\newsavebox{\narrowspacesample}
\sbox{\narrowspacesample}{\spacesampletext{\narrowspace}}
\newsavebox{\widespacesample}
@@ -1488,7 +1628,7 @@ New settings: \baselinesetsize.
\newcommand*{\relbls}{130}
\paragraph{\code{\string\setbaselineskippercentage\{\relbls\}}}
-\setbaselineskippercentage{1 + 2 + .3333 * 100 + 100 * 0.6667}% float expression
+\setbaselineskippercentage{1 + 2 + .3333 * 100 + 100 * .6667}% float expression
\setbaselineskippercentage{\relbls}
\fontsizeinfo{baselinesetsize}
New settings: \baselinesetsize.
diff --git a/Master/texmf-dist/doc/latex/typog/typog-grep.1.pdf b/Master/texmf-dist/doc/latex/typog/typog-grep.1.pdf
index 09647860d5d..9a430085081 100644
--- a/Master/texmf-dist/doc/latex/typog/typog-grep.1.pdf
+++ b/Master/texmf-dist/doc/latex/typog/typog-grep.1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/typog/typog-grep.pl.in b/Master/texmf-dist/doc/latex/typog/typog-grep.pl.in
new file mode 100644
index 00000000000..39d64aec1ae
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/typog/typog-grep.pl.in
@@ -0,0 +1,682 @@
+#! /usr/bin/env perl
+
+use autodie qw(:all);
+use strict;
+use warnings;
+
+use Data::Dumper ();
+use Encode ();
+use English;
+use File::Basename ();
+use Getopt::Long;
+use IO::File;
+use IO::Handle;
+use Term::ANSIColor ();
+
+use constant COMMAND_NAME => File::Basename::basename($PROGRAM_NAME);
+
+my $DEBUG = 0;
+my $MATCH_COUNT = 0;
+my $OUTPUT_IS_REDIRECTED;
+
+sub fail_with_error {
+ print STDERR join('', COMMAND_NAME, ': ', @_, "\n");
+ exit 2;
+}
+
+sub issue_warning {
+ print STDERR join('', COMMAND_NAME, ': warning: ', @_, "\n");
+}
+
+sub debug_print {
+ return unless $DEBUG;
+ print STDERR "+ @_\n";
+}
+
+sub quote_filesystem {qq("$_[0]")}
+sub quote_literal {qq(`$_[0]')}
+
+sub limit_string_length {
+ my ($a_string, $a_maximum_length) = @_;
+
+ if (length $a_string <= $a_maximum_length) {
+ $a_string;
+ } else {
+ substr($a_string, 0, $a_maximum_length - 3) . '...';
+ }
+}
+
+## We set all colors to `undef' and fill them later with the values
+## of the actual configuration.
+my $highlight_patterns = {
+ PARTIAL_LINE => {
+ FONT_SPEC => [qr#
+ \\
+ (?: OMS | OMX | OT1 | T1 | TS1 | U )
+ (?: /[^/]+ ){5} / \S+ \s
+ (?: \([+-]\d+\) )?
+ #x, undef],
+ MATH => [qr#
+ \$
+ \\
+ (?: LMS | OML )
+ (?: /[^/]+ ){5} / \S+ \s
+ (?: \([+-]\d+\) )?
+ .*?
+ \$
+ #x, undef]
+ },
+ WHOLE_LINE => {
+ FILL_STATE => [qr#^(?:Under|Over)full \\hbox .*$#, undef],
+ FIRST_VBOX => [qr#^%%#, undef],
+ HORIZONTAL_BREAKPOINT => [qr#^@@\d+:.*$#, undef],
+ HORIZONTAL_BREAK_CANDIDATE => [qr#^@[\\ ].*$#, undef],
+ LINE_BREAK_PASS => [qr#^@[a-z]+?pass#, undef],
+ TIGHTNESS => [qr#^(?:Loose|Tight) \\hbox .*$#, undef],
+ VERTICAL_BREAKPOINT => [qr#^% t=\d+.*$#, undef]
+ }
+};
+
+sub colorize_line {
+ my ($configuration, $line) = @_;
+
+ foreach my $pattern_color_pair (values %{$highlight_patterns->{WHOLE_LINE}}) {
+ next unless $pattern_color_pair->[1];
+ return Term::ANSIColor::colored($line, $pattern_color_pair->[1])
+ if $line =~ $pattern_color_pair->[0];
+ }
+ return $line if $line =~ m#^\.#; # we do not paint box contents yet
+
+ $line =~ s#$highlight_patterns->{PARTIAL_LINE}->{MATH}->[0]
+ #Term::ANSIColor::colored($MATCH, $highlight_patterns->{PARTIAL_LINE}->{MATH}->[1])
+ #egx;
+
+ $line =~ s#$highlight_patterns->{PARTIAL_LINE}->{FONT_SPEC}->[0]
+ #Term::ANSIColor::colored($MATCH, $highlight_patterns->{PARTIAL_LINE}->{FONT_SPEC}->[1])
+ #egx;
+
+ return $line;
+}
+
+my $open_or_close_tag_regexp = qr#^</?typog-inspect[ >]#; # somewhat sloppy definition
+my $close_tag_regexp = qr#^</typog-inspect>#;
+my $open_tag_regexp =
+ qr#^
+ <typog-inspect \s+
+ id="(?<id_match> .*?)" \s+
+ job="(?<job_match> .*?)" \s+
+ line="(?<line_match> .*?)" \s+
+ page="(?<page_match> .*?)"
+ >#x;
+
+sub find_encoder {
+ my $encoding = shift;
+
+ my $encoder;
+
+ if ($encoding) {
+ $encoder = Encode::find_encoding($encoding);
+ if (!$encoder) {
+ issue_warning("encoding @{[quote_literal($encoding)]} unknown; proceeding without decoder");
+ }
+ }
+
+ return $encoder;
+}
+
+sub grep_log_file {
+ my ($options, $configuration, $file, $filename, $id_regexp) = @_;
+
+ my $encoder = find_encoder($options->{ENCODING});
+ my $job_name;
+ my $line_number = 0; # line number in the log file we are inspecting, i.e., $filename
+ my $match_count = 0;
+ my $source_line_number; # line number in TeX file the log refers to, i.e., "$job_name.tex"
+ my $page_number;
+ my $regexp_modifier = $options->{IGNORE_CASE} ? 'i' : '';
+ my $id_value;
+ my @nesting_levels;
+
+ if ($options->{WORD_REGEXP}) {
+ $id_regexp = "\\b$id_regexp\\b";
+ }
+
+ while (my $line = readline $file) {
+ chomp $line;
+ $line_number++;
+
+ $line = Encode::encode_utf8($encoder->decode($line, Encode::FB_CROAK)) if $encoder;
+
+ if ($line =~ $close_tag_regexp) {
+ fail_with_error("$filename: $line_number: mismatched open/close tags") unless @nesting_levels;
+ pop @nesting_levels;
+ }
+
+ if (@nesting_levels and $nesting_levels[-1] and $line !~ $open_or_close_tag_regexp) {
+ if ($options->{LOG_LINE_NUMBER}) {
+ my $formatted_log_line_number =
+ sprintf $configuration->{LOG_LINE_NUMBER_FORMAT}, $line_number;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_log_line_number =
+ Term::ANSIColor::colored($formatted_log_line_number,
+ $configuration->{COLORS}->{LOG_LINE_NUMBER});
+ }
+ print $formatted_log_line_number, ' ';
+ }
+
+ print "$job_name: " if $options->{JOB_NAME};
+
+ if ($options->{LINE_NUMBER}) {
+ my $formatted_line_number = sprintf $configuration->{LINE_NUMBER_FORMAT}, $source_line_number;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_line_number =
+ Term::ANSIColor::colored($formatted_line_number,
+ $configuration->{COLORS}->{LINE_NUMBER});
+ }
+ print $formatted_line_number, ' ';
+ }
+
+ if ($options->{PAGE_NUMBER}) {
+ my $formatted_page_number = sprintf $configuration->{PAGE_NUMBER_FORMAT}, $page_number;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_page_number =
+ Term::ANSIColor::colored($formatted_page_number,
+ $configuration->{COLORS}->{PAGE_NUMBER});
+ }
+ print $formatted_page_number, ' ';
+ }
+
+ if ($options->{ID} and not $configuration->{PRINT_ID_AS_HEADING}) {
+ my $formatted_id = sprintf $configuration->{ID_INLINE_FORMAT}, $id_value;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_id = Term::ANSIColor::colored($formatted_id ,
+ $configuration->{COLORS}->{ID_COLOR});
+ }
+ print $formatted_id, ' ';
+ }
+
+ if ($options->{COLORIZE_OUTPUT}) {
+ print colorize_line($configuration, $line);
+ } else {
+ print $line;
+ }
+ print "\n";
+ }
+
+ if ($line =~ $open_tag_regexp) {
+ $id_value = limit_string_length($+{id_match}, $configuration->{ID_MAX_LENGTH});
+ $job_name = $+{job_match};
+ $source_line_number = $+{line_match};
+ $page_number = $+{page_match};
+
+ my $found_matching_id = ($id_value =~ m/(?$regexp_modifier)$id_regexp/) ? 1 : 0;
+ push @nesting_levels, $found_matching_id;
+ if ($found_matching_id) {
+ ++$MATCH_COUNT; # global count -- needed for return code of program
+ ++$match_count; # per file count -- needed to be able to separate the hunks
+
+ print "\n" if $match_count >= 2;
+ if ($options->{ID} and $configuration->{PRINT_ID_AS_HEADING}) {
+ my $formatted_id = sprintf $configuration->{ID_HEADING_FORMAT}, $id_value;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_id =
+ Term::ANSIColor::colored($formatted_id,
+ $configuration->{COLORS}->{ID_HEADING_COLOR});
+ }
+ print $formatted_id, "\n";
+ }
+ }
+ }
+ }
+
+ return $match_count;
+}
+
+sub show_ids_in_file {
+ my ($options, $configuration, $file, $filename, $id_regexp) = @_;
+
+ my $encoder = find_encoder($options->{ENCODING});
+ my $line_number = 0;
+ my $match_count = 0;
+ my @nesting_levels;
+
+ while (my $line = readline $file) {
+ chomp $line;
+ $line_number++;
+
+ $line = Encode::encode_utf8($encoder->decode($line, Encode::FB_CROAK)) if $encoder;
+
+ if ($line =~ $close_tag_regexp) {
+ fail_with_error("$filename: $line_number: mismatched open/close tags") unless @nesting_levels;
+ pop @nesting_levels;
+ }
+
+ if ($line =~ $open_tag_regexp) {
+ my $id_value = limit_string_length($+{id_match}, $configuration->{ID_MAX_LENGTH});
+ my $job_name = $+{job_match};
+ my $source_line_number = $+{line_match};
+ my $page_number = $+{page_match};
+
+ ++$MATCH_COUNT;
+ ++$match_count;
+ push @nesting_levels, 1;
+
+ if ($options->{LOG_LINE_NUMBER}) {
+ my $formatted_log_line_number =
+ sprintf $configuration->{LOG_LINE_NUMBER_FORMAT}, $line_number;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_log_line_number =
+ Term::ANSIColor::colored($formatted_log_line_number,
+ $configuration->{COLORS}->{LOG_LINE_NUMBER});
+ }
+ print $formatted_log_line_number, ' ';
+ }
+
+ print "$job_name: " if $options->{JOB_NAME};
+
+ if ($options->{LINE_NUMBER}) {
+ my $formatted_line_number = sprintf $configuration->{LINE_NUMBER_FORMAT}, $source_line_number;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_line_number =
+ Term::ANSIColor::colored($formatted_line_number,
+ $configuration->{COLORS}->{LINE_NUMBER});
+ }
+ print $formatted_line_number, ' ';
+ }
+
+ if ($options->{PAGE_NUMBER}) {
+ my $formatted_page_number = sprintf $configuration->{PAGE_NUMBER_FORMAT}, $page_number;
+ if ($options->{COLORIZE_OUTPUT}) {
+ $formatted_page_number =
+ Term::ANSIColor::colored($formatted_page_number,
+ $configuration->{COLORS}->{PAGE_NUMBER});
+ }
+ print $formatted_page_number, ' ';
+ }
+
+ my $indent = $configuration->{ID_INDENT} * (@nesting_levels - 1);
+ print ' ' x $indent, $id_value, "\n";
+ }
+ }
+
+ return $match_count;
+}
+
+sub open_file_for_reading {
+ my $filename = shift;
+
+ my $file;
+
+ if ($filename eq 'stdin') {
+ $file = IO::Handle->new();
+ $file->fdopen(fileno(STDIN), 'r') or
+ fail_with_error("cannot open stdin: $OS_ERROR");
+ } else {
+ $file = IO::File->new($filename, 'r') or
+ fail_with_error("cannot open @{[quote_filesystem($filename)]}: $OS_ERROR");
+ }
+
+ return $file;
+}
+
+sub close_file {
+ my ($file, $filename) = shift;
+
+ $file->close or
+ issue_warning("problems while closing @{[quote_filesystem($filename)]}: $OS_ERROR");
+}
+
+sub grep_or_show {
+ my ($options, $configuration, $file, $filename, $id_regexp) = @_;
+
+ if ($options->{SHOW_ALL_IDS}) {
+ return show_ids_in_file($options, $configuration, $file, $filename, $id_regexp);
+ } else {
+ return grep_log_file($options, $configuration, $file, $filename, $id_regexp);
+ }
+}
+
+sub scan_files {
+ my ($options, $configuration, $id_regexp, $log_filenames) = @_;
+
+ my $match_count = 0;
+
+ if (@$log_filenames) {
+ foreach my $log_filename (@$log_filenames) {
+ $log_filename = 'stdin' if $log_filename eq '-';
+ if (@$log_filenames >= 2) {
+ print "\n" unless $log_filename eq $log_filenames->[0];
+ my $filename_header = "==> $log_filename <==\n";
+ $filename_header = Term::ANSIColor::colored($filename_header,
+ $configuration->{COLORS}->{FILE_HEADER})
+ if $options->{COLORIZE_OUTPUT};
+ print $filename_header;
+ }
+ my $file = open_file_for_reading($log_filename);
+ $match_count += grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
+ close_file($file, $log_filename);
+ }
+ } else {
+ my $log_filename = 'stdin';
+ my $file = open_file_for_reading($log_filename);
+ $match_count = grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
+ close_file($file, $log_filename);
+ }
+
+ return $match_count;
+}
+
+sub redirect_and_scan_files {
+ my ($options, $configuration, $id_regexp, $log_filenames) = @_;
+
+ my $pager;
+
+ my $pid = open($pager, '|-', $configuration->{PAGER}, $configuration->{PAGER_FLAGS});
+ fail_with_error('failed to redirect to pager ', quote_literal($configuration->{PAGER}),
+ ' with flags ', quote_literal($configuration->{PAGER_FLAGS}),
+ ": $OS_ERROR")
+ unless defined $pid;
+ my $stdout = select $pager;
+
+ $pager->autoflush;
+ my $match_count = scan_files($options, $configuration, $id_regexp, $log_filenames);
+
+ close $pager or issue_warning "error occurred while closing the pager (pid: $pid) pipe: $OS_ERROR";
+ select $stdout;
+
+ return $match_count;
+}
+
+########################################################################
+
+my $configuration_key_map = {
+ 'id-format' => 'ID_INLINE_FORMAT',
+ 'id-indent' => 'ID_INDENT',
+ 'id-heading' => 'PRINT_ID_AS_HEADING',
+ 'id-heading-format' => 'ID_HEADING_FORMAT',
+ 'id-max-length' => 'ID_MAX_LENGTH',
+ 'line-number-format' => 'LINE_NUMBER_FORMAT',
+ 'log-line-number-format' => 'LOG_LINE_NUMBER_FORMAT',
+ 'page-number-format' => 'PAGE_NUMBER_FORMAT',
+
+ 'file-header-color' => 'FILE_HEADER',
+ 'fill-state-color' => 'FILL_STATE',
+ 'first-vbox-color' => 'FIRST_VBOX',
+ 'font-spec-color' => 'FONT_SPEC',
+ 'horizontal-break-candidate-color' => 'HORIZONTAL_BREAK_CANDIDATE',
+ 'horizontal-breakpoint-color' => 'HORIZONTAL_BREAKPOINT',
+ 'id-color' => 'ID_COLOR',
+ 'id-heading-color' => 'ID_HEADING_COLOR',
+ 'line-break-pass-color' => 'LINE_BREAK_PASS',
+ 'line-number-color' => 'LINE_NUMBER',
+ 'log-line-number-color' => 'LOG_LINE_NUMBER',
+ 'math-color' => 'MATH',
+ 'page-number-color' => 'PAGE_NUMBER',
+ 'pager' => 'PAGER',
+ 'pager-flags' => 'PAGER_FLAGS',
+ 'tightness-color' => 'TIGHTNESS',
+ 'vertical-breakpoint-color' => 'VERTICAL_BREAKPOINT'
+};
+
+my $default_configuration = {
+ COLORS => {
+ FILE_HEADER => 'bold black',
+ FILL_STATE => 'bold magenta',
+ FIRST_VBOX => 'bold red',
+ FONT_SPEC => 'grey12',
+ HORIZONTAL_BREAKPOINT => 'bold green',
+ HORIZONTAL_BREAK_CANDIDATE => 'blue',
+ ID_COLOR => 'white on_black',
+ ID_HEADING_COLOR => 'white on_black',
+ LINE_BREAK_PASS => 'bold green',
+ LINE_NUMBER => 'bold black',
+ LOG_LINE_NUMBER => 'italic black',
+ MATH => 'yellow',
+ PAGE_NUMBER => 'bold white on_red',
+ TIGHTNESS => 'bold cyan',
+ VERTICAL_BREAKPOINT => 'red'
+ },
+ ID_INLINE_FORMAT => '%s:',
+ ID_HEADING_FORMAT => '--> %s <--',
+ ID_INDENT => 8,
+ ID_MAX_LENGTH => 40,
+ LINE_NUMBER_FORMAT => '%5d',
+ LOG_LINE_NUMBER_FORMAT => '%6d',
+ PAGE_NUMBER_FORMAT => '[%3d]',
+ PAGER => 'less',
+ PAGER_FLAGS => '--quit-if-one-screen',
+ PRINT_ID_AS_HEADING => 0
+};
+
+sub initialize_highlighting_from_configuration {
+ my $configuration = shift;
+
+ while (my (undef, $assoc) = each %$highlight_patterns) {
+ while (my ($name, $pattern_color_pair) = each %$assoc) {
+ $pattern_color_pair->[1] = $configuration->{COLORS}->{$name};
+ }
+ }
+}
+
+sub modify_configuration {
+ my ($configuration, $key, $value) = @_;
+
+ fail_with_error('malformed KEY=VALUE pair -- missing key') unless $key;
+
+ if (defined $configuration_key_map->{$key}) {
+ if ($key =~ m/-color$/) {
+ $configuration->{COLORS}->{$configuration_key_map->{$key}} = $value;
+ } else {
+ $configuration->{$configuration_key_map->{$key}} = $value;
+ }
+ } else {
+ fail_with_error("@{[quote_literal($key)]} is not a valid configuration KEY");
+ }
+}
+
+sub setup_configuation {
+ my ($config_spec, $configuration) = @_;
+
+ foreach my $spec (split ':', $config_spec) {
+ my ($key, $value) = split '=', $spec;
+ modify_configuration($configuration, $key, $value);
+ }
+}
+
+my $default_options = {
+ COLORIZE_MODE => 'auto',
+ DEBUG => 0,
+ ENCODING => undef,
+ ID => 0,
+ IGNORE_CASE => 0,
+ JOB_NAME => 0,
+ LINE_NUMBER => 0,
+ LOG_LINE_NUMBER => 0,
+ PAGE_NUMBER => 0,
+ REQUEST_PAGER => 1,
+ WORD_REGEXP => 0
+};
+
+sub show_help {
+ print <<HELP_TEXT;
+Usage: @{[COMMAND_NAME]} [OPTION] ID-REGEXP LOG-FILE...
+Structured grep for typog-inspect elements that match ID-REGEXP in LOG-FILE.
+
+Options
+ --color [WHEN],
+ --colour [WHEN] use color to highlight specific log contents
+ WHEN is 'always', 'never', or 'auto'
+ -C, --config KEY=VALUE set configuration KEY to VALUE
+ -E, --encoding ENCODING set character ENCODING of LOG-FILE
+ -i, --[no-]id print matching id with output lines
+ -y, --[no-]ignore-case ignore case distinctions in patterns and data
+ -j, --[no-]job-name print \\jobname with output lines
+ -n, --[no-]line-number print TeX-source line number with output lines
+ -N, --[no-]log-line-number print log-file line number with output lines
+ -p, --[no-]page-number print page number with output lines
+ -P, --[no-]pager redirect output to pager
+ -w, --[no-]word-regexp match only whole words
+
+ -a, --all, --any discover all IDs in LOG-FILE
+
+ --debug turn on debug output
+ -h, --help display this help and exit
+ --show-config show default configuration and exit
+ --show-encodings show all known encodings and exit
+ -V, --version show version information and exit
+
+HELP_TEXT
+
+ exit 0;
+}
+
+sub show_encodings {
+ my @all_encodings = Encode->encodings(':all');
+
+ foreach my $encoding (@all_encodings) {
+ print "$encoding\n";
+ }
+
+ exit 0;
+}
+
+sub show_configuration {
+ my $format_string_value = sub {quote_literal($default_configuration->{$_[0]})};
+
+ print <<FIXED_CONFIGURATION_TEXT;
+Configuration
+Key Default Value
+------------------------------------ -------------
+id-format @{[$format_string_value->('ID_INLINE_FORMAT')]}
+id-heading $default_configuration->{PRINT_ID_AS_HEADING}
+id-heading-format @{[$format_string_value->('ID_HEADING_FORMAT')]}
+id-indent $default_configuration->{ID_INDENT}
+id-max-length $default_configuration->{ID_MAX_LENGTH}
+line-number-format @{[$format_string_value->('LINE_NUMBER_FORMAT')]}
+log-line-number-format @{[$format_string_value->('LOG_LINE_NUMBER_FORMAT')]}
+page-number-format @{[$format_string_value->('PAGE_NUMBER_FORMAT')]}
+pager @{[$format_string_value->('PAGER')]}
+pager-flags @{[$format_string_value->('PAGER_FLAGS')]}
+
+FIXED_CONFIGURATION_TEXT
+
+ foreach my $configuration_key (sort keys %$configuration_key_map) {
+ next unless $configuration_key =~ m/-color$/;
+ printf("%-36s %s\n",
+ $configuration_key,
+ quote_literal($default_configuration->
+ {COLORS}->
+ {$configuration_key_map->{$configuration_key}}));
+ }
+
+ exit 0;
+}
+
+sub show_version {
+ print <<VERSION_TEXT;
+typog-grep @RELEASE@
+
+Copyright (C) 2024 by Ch. L. Spiel
+License LPPL: LaTeX Project Public License version 1.3c or later
+VERSION_TEXT
+
+ exit 0;
+}
+
+sub get_options {
+ my ($options, $configuration) = @_;
+
+ Getopt::Long::Configure('gnu_getopt', 'no_ignore_case');
+
+ Getopt::Long::GetOptions('a|all|any' => \$options->{SHOW_ALL_IDS},
+ 'color|colour=s' => \$options->{COLORIZE_MODE},
+ 'C|configuration=s' => sub{setup_configuation($_[1], $configuration)},
+ 'debug+' => \$DEBUG,
+ 'E|encoding=s' => \$options->{ENCODING},
+ 'h|help' => \&show_help,
+ 'i|id!' => \$options->{ID},
+ 'y|ignore-case!' => \$options->{IGNORE_CASE},
+ 'j|job-name!' => \$options->{JOB_NAME},
+ 'n|line-number!' => \$options->{LINE_NUMBER},
+ 'N|log-line-number!' => \$options->{LOG_LINE_NUMBER},
+ 'p|page-number!' => \$options->{PAGE_NUMBER},
+ 'P|pager!' => \$options->{REQUEST_PAGER},
+ 'show-encodings' => \&show_encodings,
+ 'show-config' => \&show_configuration,
+ 'V|version' => \&show_version,
+ 'w|word-regexp!' => \$options->{WORD_REGEXP}) or
+ fail_with_error('problems while parsing options');
+
+ if ($options->{COLORIZE_MODE}) {
+ fail_with_error("unknown colorize mode @{[quote_literal($options->{COLORIZE_MODE})]}")
+ unless $options->{COLORIZE_MODE} =~ m/^(?:always|auto|never)$/i;
+ } else {
+ $options->{COLORIZE_MODE} = 'auto';
+ }
+}
+
+sub do_colorize {
+ my $colorize_mode = shift;
+
+ if ($colorize_mode =~ m/never/i) {
+ 0;
+ } elsif ($colorize_mode =~ m/always/i) {
+ 1;
+ } elsif ($colorize_mode =~ m/auto/i) {
+ not $OUTPUT_IS_REDIRECTED;
+ }
+}
+
+## For the comparison with the POSIX spec of grep(1) consult
+## https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html
+
+sub main {
+ $OUTPUT_IS_REDIRECTED = -t STDOUT ? 0 : 1;
+
+ my $configuration = {%$default_configuration};
+ my $options = {%$default_options};
+ debug_print(Data::Dumper::Dumper(['Default Configuration', $configuration]));
+ debug_print(Data::Dumper::Dumper(['Default Options', $options]));
+
+ my $user_options = {};
+ my $user_configuration = {};
+ get_options($user_options, $user_configuration);
+ debug_print(Data::Dumper::Dumper(['User Configuration', $user_configuration]));
+ debug_print(Data::Dumper::Dumper(['User Options', $user_options]));
+ while (my ($key, $value) = each %$user_options) {
+ $options->{$key} = $value if $value;
+ }
+ while (my ($key, $value) = each %$user_configuration) {
+ $configuration->{$key} = $value if $value;
+ }
+ debug_print(Data::Dumper::Dumper(['Final Configuration', $configuration]));
+ debug_print(Data::Dumper::Dumper(['Final Options', $options]));
+
+ $options->{COLORIZE_OUTPUT} = do_colorize($options->{COLORIZE_MODE});
+ initialize_highlighting_from_configuration($configuration);
+
+ my $id_regexp;
+ if ($options->{SHOW_ALL_IDS}) {
+ $id_regexp = '^';
+ issue_warning("option @{[quote_literal('--id')]} ignored in @{[quote_literal('--all')]} mode")
+ if $options->{ID};
+ } else {
+ fail_with_error('missing ID-REGEXP') unless @ARGV >= 1;
+ $id_regexp = shift @ARGV;
+ }
+
+ if ($user_options->{REQUEST_PAGER} && $OUTPUT_IS_REDIRECTED) {
+ issue_warning("option @{[quote_literal('--pager')]} ignored because output is redirected");
+ }
+ my $use_pager = $options->{REQUEST_PAGER} && !$OUTPUT_IS_REDIRECTED;
+ my $match_count;
+ if ($use_pager) {
+ $match_count = redirect_and_scan_files($options, $configuration, $id_regexp, \@ARGV);
+ } else {
+ $match_count = scan_files($options, $configuration, $id_regexp, \@ARGV);
+ }
+
+ exit ($match_count == 0);
+}
+
+main();
diff --git a/Master/texmf-dist/doc/latex/typog/typog-grep.pod b/Master/texmf-dist/doc/latex/typog/typog-grep.pod
index 83f4f11f474..eba8297f807 100644
--- a/Master/texmf-dist/doc/latex/typog/typog-grep.pod
+++ b/Master/texmf-dist/doc/latex/typog/typog-grep.pod
@@ -7,7 +7,7 @@
=head1 NAME
-typog-grep - grep for typog-inspect elements in LaTeX log files
+typog-grep - specialized grep for typog-inspect elements in LaTeX log files
=head1 SYNOPSIS
@@ -19,9 +19,70 @@ typog-grep - grep for typog-inspect elements in LaTeX log files
=back
-The first form shows all C<E<lt>typog-inspect id="I<ID>" ...E<gt>> elements in F<LOG-FILE>.
+The first form, ``discovery mode'', shows all I<ID>s of
-The second form shows the contents of C<E<lt>typog-inspect id="I<ID>" ...E<gt>> elements
+=begin text
+
+<typog-inspect id="ID" ...>
+
+=end text
+
+=begin man
+
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" ...>
+.EE
+.RE
+
+=end man
+
+=begin texinfo
+
+@example
+<typog-inspect id="@var{ID}" ...>
+@end example
+@noindent
+
+=end texinfo
+
+Z<>
+elements in F<LOG-FILE>.
+
+The second form shows the contents, I<LOG-DATA>, of the elements
+
+=begin text
+
+<typog-inspect id="ID" ...>
+LOG-DATA
+</typog-inspect>
+
+=end text
+
+=begin man
+
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" ...>
+\fILOG-DATA\fP
+</typog-inspect>
+.EE
+.RE
+
+=end man
+
+=begin texinfo
+
+@example
+<typog-inspect id="@var{ID}" ...>
+@var{LOG-DATA}
+</typog-inspect>
+@end example
+@noindent
+
+=end texinfo
+
+Z<>
whose I<ID>s match I<REGEXP> in F<LOG-FILE>.
If no F<LOG-FILE> is given read from F<stdin>.
@@ -29,57 +90,101 @@ The S<filename C<->> is synonymous to F<stdin>.
=head1 DESCRIPTION
-B<typog-grep> is a tailored post-processor for LaTeX log files
-and the C<typoginspect> environment as provided by S<package typog>.
+B<typog-grep> is a tailored post-processor for LaTeX S<F<log> files>
+and the C<typoginspect> environment as provided by the S<LaTeX package typog>.
It shares more with the venerable
L<B<sgrep>|https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html>
than with S<POSIX L<B<grep>|https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html>>.
-The LaTeX user brackets her text in
+In the LaTeX source file the user brackets her text or code
+in a C<typoginspect> environment:
+
+=begin text
- \begin{typoginspect}{ID}
- Text and code to investigate
- \end{typoginspect}
+\begin{typoginspect}{ID}
+ TEXT-OR-CODE-TO-INVESTIGATE
+\end{typoginspect}
+
+=end text
+
+=begin man
+
+.RS
+.EX
+\ebegin{typoginspect}{\fI\,ID\/\fP}
+\fITEXT-OR-CODE-TO-INVESTIGATE\fP
+\eend{typoginspect}
+.EE
+.RE
+
+=end man
+=begin texinfo
+
+@example
+@backslashchar{}begin@lbracechar{}typoginspect@rbracechar{}@lbracechar{}@var{ID}@rbracechar{}
+@var{TEXT-OR-CODE-TO-INVESTIGATE}
+@backslashchar{}end@lbracechar{}typoginspect@rbracechar{}
+@end example
+@noindent
+
+=end texinfo
+
+Z<>
where I<ID> is used to identify one or more bracketed snippets.
I<ID> does not have to be unique.
The I<REGEXP> mechanism makes it easy to select groups of related I<ID>s
if they are named accordingly.
-In F<LOG-FILE> the environment shows up, packed with tracing information, as
+In F<LOG-FILE> the result of the environment shows up,
+packed with tracing information, as
-=begin texinfo
+=begin text
-@display
-@relax
+<typog-inspect id="ID" job="JOB-NAME" line="LINE-NUMBER" page="PAGE-NUMBER">
+ LOG-DATA
+</typog-inspect>
-=end texinfo
+=end text
+
+=begin man
- <typog-inspect id="ID" job="JOB-NAME" line="LINE-NUMBER" page="PAGE-NUMBER">
- Trace Data
- </typog-inspect>
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" job="\fI\,JOB-NAME\/\fP" line="\fI\,LINE-NUMBER\/\fP" page="\fI\,PAGE-NUMBER\/\fP">
+\fILOG-DATA\fP
+</typog-inspect>
+.EE
+.RE
+
+=end man
=begin texinfo
-@end display
-@relax
+@example
+<typog-inspect id="@var{ID}" job="@var{JOB-NAME}" line="@var{LINE-NUMBER}" page="@var{PAGE-NUMBER}">
+@var{LOG-DATA}
+</typog-inspect>
+@end example
+@noindent
=end texinfo
+Z<>
where all the capital-letter sequences are meta-variables
and in particular
I<JOB-NAME> is the expansion of C<\jobname>,
I<LINE-NUMBER> is the LaTeX source file line number
of the beginning of the C<typoginspect> environment,
and I<PAGE-NUMBER> is the page where
-the output of S<C<Text and code to investigate>> occurs.
+the output of S<C<TEXT-OR-CODE-TO-INVESTIGATE>> occurs.
B<typog-grep> reveals the contents of F<LOG-FILE>
between C<E<lt>typog-inspect id="I<ID>" ...E<gt>>
-and C<E<lt>/typog-inspectE<gt>> excluding the XML-tags.
+and C<E<lt>/typog-inspectE<gt>> excluding the XML-tags themselves.
Access the I<JOB-NAME>, I<LINE-NUMBER>, and I<PAGE-NUMBER>
with the commandline options
-B<--job-name>, B<--line-number>, and B<--page-number>, respectively.
+B<--job-name>, B<--line-number>, and B<--page-number>, respectively.
Use B<--id> to show the name of the IDs that matched I<REGEXP>.
C<typoginspect> environments can be nested.
@@ -96,11 +201,18 @@ The list of options is sorted by the names of the long options.
=item B<-a>, B<--all>, B<--any>
ID-discovery mode:
-Show all C<typog-inspect> elements independent of any matching patterns.
+Discover all C<typog-inspect> elements independent of any matching patterns
+and print their I<ID>s.
+The results are printed in their order of occurrence in the respective F<LOG-FILE>s.
+Pipe the output into B<sort> to get alphabetically ordered I<ID>s.
+
+Augment with options
+B<--job-name>, B<--line-number>, B<--log-line-number>, or S<B<--page-number>>
+for more information.
=item B<--color>, B<colour> I<WHEN>
-Colorize specific log contents for the matching ids.
+Colorize specific log contents for the matching I<ID>s.
The S<argument I<WHEN>> determines when to apply color:
C<always>, C<never>, S<or C<auto>>.
The setting C<auto> checks whether standard output has been redirected.
@@ -109,29 +221,45 @@ This is the default.
=item B<-C>, B<--config> I<KEY>=I<VALUE>[:I<KEY>=I<VALUE>[:...]]
Set one or more configuration I<KEY> to I<VALUE> pairs.
-See S<Sec. CONFIGURATION> below for a description of all available configuration items.
-Use option B<--show-config> to display the default configuration.
+See section L</CONFIGURATION> for a description
+of all available configuration items.
+Use S<option B<--show-config>> to display the default configuration.
=item B<--debug>
Turn on debug output on F<stderr>.
+=item B<-E>, B<--encoding> I<ENCODING>
+
+Set the I<ENCODING> of F<LOG-FILE> for the translation to UTF-8.
+The default is unset.
+
+Use this option to get rid of pesky
+S<"E<lt>I<HEX-DIGITS>E<gt>" escapes> on UTF-8 terminals.
+See S<option B<--show-encodings>> for the known encodings and
+Encode::Supported for a summary of all encodings.
+See also S<section L</Some Common Encodings>>.
+
+Apply L<B<iconv>|https://pubs.opengroup.org/onlinepubs/9699919799/utilities/iconv.html>
+(POSIX) or L<B<recode>|https://github.com/rrthomas/recode/> (GNU) on F<LOG-FILE>
+before this tool to avoid having to use S<option B<--encoding>>.
+
=item B<-h>, B<--help>
Display brief help then exit.
=item B<-i>, B<--[no-]id>
-Print the actual id name that matched I<REGEXP>.
-Control the appearance of the matching id with configuration S<item C<id-heading>>.
+Print the actual ID-name that matched I<REGEXP>.
+Control the appearance of the matching I<ID> with configuration S<item C<id-heading>>.
=item B<-y>, B<--[no-]ignore-case>
-Match ids while ignoring case distinctions in patterns and data.
+Match I<ID>s while ignoring case distinctions in patterns and data.
=item B<-j>, B<--[no-]job-name>
-Print the C<\jobname> that B<tex> associated with the input file.
+Print the C<\jobname> that B<latex> associated with the input file.
=item B<-n>, B<--[no-]line-number>
@@ -155,6 +283,10 @@ Redirect output from F<stdout> to the configured pager.
Show the default configuration and exit.
+=item B<--show-encodings>
+
+Show all known encodings and exit.
+
=item B<-V>, B<--version>
Show version information and exit.
@@ -177,26 +309,26 @@ S<Default: C<%s:>.>
=item C<id-heading>=C<0>E<verbar>C<1>
-Choose between printing the matching ids with S<option B<--id>>:
+Choose between printing the matching I<ID>s with S<option B<--id>>:
S<Inline (C<0>)> or heading before the matching data (C<1>).
S<Default: C<0>.>
=item C<id-heading-format>=I<FORMAT>
-Control the I<FORMAT> for printing matching ids in heading-mode,
+Control the I<FORMAT> for printing matching I<ID>s in heading-mode,
where I<FORMAT> is passed to Perl's C<printf>.
S<Default: C<--E<gt> %s E<lt>-->.>
=item C<id-indent>=I<INDENT>
Indentation of nested typog-inspect tags.
-Only used in ``discovery'' mode (first form), i.e., if B<--all> is active.
+Only used in ``discovery mode'' (first form), i.e., if S<B<--all>> is active.
S<Default: 8.>
=item C<id-max-length>=I<MAXIMUM-LENGTH>
-Set the maximum length of a matching id for printing.
-It a matching id exceeds this length it will be truncated
+Set the maximum length of a matching I<ID> for printing.
+It a matching I<ID> exceeds this length it will be truncated
and the last three characters (short of I<MAXIMUM-LENGTH>) will be replaced by dots.
S<Default: 40.>
@@ -262,11 +394,11 @@ Color of lines with horizontal S<breakpoints C<@@>>.
=item C<id-color>
-Color of matching ids when printed inline.
+Color of matching I<ID>s when printed inline.
=item C<id-heading-color>
-Color of matching ids when printed in heading form.
+Color of matching I<ID>s when printed in heading form.
=item C<line-break-pass-color>
@@ -333,13 +465,89 @@ C<bold>, C<dark>, C<italic>, C<underline>, C<reverse>
=back
+=head2 Some Common Encodings
+
+The following list shows some encodings
+that are suitable for S<option B<--encoding>>.
+
+=over 4
+
+=item Latin-1, Western European
+
+C<iso-8859-1>, C<cp850>, C<cp860>, C<cp1252>
+
+=item Latin-2, Central European
+
+C<iso-8859-2>, C<cp852>, C<cp1250>
+
+=item Latin-3, South European (Esperanto, Maltese)
+
+C<iso-8859-3>
+
+=item Latin-4, North European (Baltics)
+
+C<iso-8859-4>
+
+=item Cyrillics
+
+C<iso-8859-5>, C<cp855>, C<cp866> (Ukrainian), C<cp1251>
+
+=item Arabic
+
+C<iso-8859-6>, C<cp864>, C<cp1006> (Farsi), C<cp1256>
+
+=item Greek
+
+C<iso-8859-7>, C<cp737>, C<cp1253>
+
+=item Hebrew
+
+C<iso-8859-8>, C<cp862>, C<cp1255>
+
+=item Turkish
+
+C<iso-8859-9>, C<cp857>, C<cp1254>
+
+=item Nordic
+
+C<iso-8859-10>, C<cp865>, C<cp861> (Icelandic)
+
+=item Thai
+
+C<iso-8859-11>, C<cp874>
+
+=item Baltic
+
+C<iso-8859-13>, C<cp775>, C<cp1257>
+
+=item Celtic
+
+C<iso-8859-14>
+
+=item Latin-9 (sometimes called Latin0)
+
+C<iso-8859-15>
+
+=item Latin-10
+
+C<iso-8859-16>
+
+=back
+
=head1 EXIT STATUS
The exit status is 0 if at least one I<ID> matched I<REGEXP>,
1 if no I<ID> matched I<REGEXP>, and 2 if an error occurred.
+=head1 CAVEATS
+
+The end tag C<< </typog-inspect> >> sometimes gets placed too early in the output and the trace
+I<seems> truncated. However, LaTeX reliably logs the requested the trace information, but the
+write operations for trace data and the code which is used to print the S<end tag> are not
+synchronized.
+
=head1 SEE ALSO
-B<grep>(1), B<printf>(3), B<Term::ANSIColor>(pm)
+B<grep>(1), B<printf>(3), B<Encode::Supported>(pm), B<Term::ANSIColor>(pm)
=cut
diff --git a/Master/texmf-dist/doc/latex/typog/typog-grep.version.sed b/Master/texmf-dist/doc/latex/typog/typog-grep.version.sed
new file mode 100644
index 00000000000..2596bda8663
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/typog/typog-grep.version.sed
@@ -0,0 +1,3 @@
+s#@DATE@#2024/07/08#g
+s#@RELEASE@#0.4#g
+s#@TITLE@#TypoGraphic extensions#g
diff --git a/Master/texmf-dist/doc/latex/typog/typog-minimal-test.tex b/Master/texmf-dist/doc/latex/typog/typog-minimal-test.tex
new file mode 100644
index 00000000000..495dd55146a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/typog/typog-minimal-test.tex
@@ -0,0 +1,50 @@
+%%
+%% This is file `typog-minimal-test.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% typog.dtx (with options: `minimal-test')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2024 by Ch. L. Spiel
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Ch. L. Spiel.
+%%
+%% This work consists of the files typog.dtx and typog.ins
+%% and the derived files typog.sty, slant-angle.mp,
+%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
+%% typog-grep.pod, and teximan2latex.sed.
+%%
+%%
+\documentclass{minimal}
+
+\usepackage{typog}
+
+\newcommand*{\raiseamount}{0.5pt}
+
+\begin{document}
+\begin{typogsetup}{raise*=\raiseamount}
+ Em-dash raised by \the\typogget{raisecapitaldash} (expected: \raiseamount).
+\end{typogsetup}
+
+\fontsizeinfo{typoinfo}
+Document class ``minimal'' sets up font size and line spacing as~\typoinfo.
+\end{document}
+\endinput
+%%
+%% End of file `typog-minimal-test.tex'.
diff --git a/Master/texmf-dist/doc/latex/typog/typog-nomt.tex b/Master/texmf-dist/doc/latex/typog/typog-without-microtype-test.tex
index ebac4efd1f7..aa7fc79cdaa 100644
--- a/Master/texmf-dist/doc/latex/typog/typog-nomt.tex
+++ b/Master/texmf-dist/doc/latex/typog/typog-without-microtype-test.tex
@@ -1,21 +1,21 @@
%%
-%% This is file `typog-nomt.tex',
+%% This is file `typog-without-microtype-test.tex',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% typog.dtx (with options: `nomicrotype')
+%% typog.dtx (with options: `without-microtype')
%%
%% This is a generated file.
%%
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,7 +25,9 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
@@ -40,7 +42,9 @@
{\singleguillemetright}
{\singleguillemetleft}
-\usepackage[]{typog}
+\usepackage[uppercaselabelitemadjustments={.1em, .075em, .1em, .1em},
+ lowercaselabelitemadjustments={-.025em, -.05em, -.025em, -.025em}]
+ {typog}
\newcommand*{\packagename}[1]{\mbox{\textsf{#1}}}
@@ -53,7 +57,8 @@
\bigskip
-\noindent
+\section*{No Microtype}
+
This example \LaTeX-document uses package~\packagename{typog}
\emph{without} package~\packagename{microtype}.
@@ -61,6 +66,36 @@ We want \packagename{typog} to be as usable as possible even without
the nice features that \packagename{microtype} offers.
After all \packagename{typog} is just a front-end for it.
+\section*{No EnumItem}
+
+We intentionally do not load package~\packagename{enumitem}, either.
+So, we can test whether \packagename{typog} correctly patches the
+plain \LaTeX{} definition if environment~\texttt{itemize}.
+
+The vertical alignment of the label items was setup for
+uppercase (ABC\typoguppercaseadjustcheck{ABCXYZ}XYZ) and for
+lowercase (ace\typoglowercaseadjustcheck{acexyz}xyz), though
+this is not necessary for the test.
+
+\uppercaseadjustlabelitems{*}
+\begin{itemize}
+\item Level i
+\item Sublist \dots
+ \begin{itemize}
+ \item Level ii
+ \item Sublist \dots
+ \begin{itemize}
+ \item Level iii
+ \item Sublist \dots
+ \begin{itemize}
+ \item Level iv
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+\end{itemize}
+
+\section*{CSQuotes}
+
As we are testing a special configuration here anyhow,
we hook up our quotes with package~csquotes
to check whether they interact ok.
@@ -70,4 +105,4 @@ to check whether they interact ok.
\end{document}
\endinput
%%
-%% End of file `typog-nomt.tex'.
+%% End of file `typog-without-microtype-test.tex'.
diff --git a/Master/texmf-dist/doc/latex/typog/typog.gst b/Master/texmf-dist/doc/latex/typog/typog.gst
new file mode 100644
index 00000000000..f108fdc19eb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/typog/typog.gst
@@ -0,0 +1,48 @@
+%%
+%% This is file `typog.gst',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% typog.dtx (with options: `changes-style')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2024 by Ch. L. Spiel
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Ch. L. Spiel.
+%%
+%% This work consists of the files typog.dtx and typog.ins
+%% and the derived files typog.sty, slant-angle.mp,
+%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
+%% typog-grep.pod, and teximan2latex.sed.
+%%
+%%
+actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
+heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
+heading_suffix "}\\nopagebreak\n"
+headings_flag 0
+item_x1 "\\efill\n\\subitem "
+item_x2 "\\ "
+keyword "\\glossaryentry"
+level '>'
+line_max 65536
+postamble "\n\\end{theglossary}\n"
+preamble "\\begin{theglossary}\n \\makeatletter\\scan@allowedfalse"
+quote '!'
diff --git a/Master/texmf-dist/doc/latex/typog/typog.ist b/Master/texmf-dist/doc/latex/typog/typog.ist
index 9b8104b16c0..8ff11c7ac70 100644
--- a/Master/texmf-dist/doc/latex/typog/typog.ist
+++ b/Master/texmf-dist/doc/latex/typog/typog.ist
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,17 +25,20 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
delim_r "\\figuredash*"
heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
heading_suffix "}\\nopagebreak\n"
headings_flag 1
level '>'
+line_max 65536
quote '!'
-\endinput
-%%
-%% End of file `typog.ist'.
diff --git a/Master/texmf-dist/doc/latex/typog/typog.pdf b/Master/texmf-dist/doc/latex/typog/typog.pdf
index 9d00685045a..fa0fe74e4c3 100644
--- a/Master/texmf-dist/doc/latex/typog/typog.pdf
+++ b/Master/texmf-dist/doc/latex/typog/typog.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ulthese/README.md b/Master/texmf-dist/doc/latex/ulthese/README.md
index 436842396aa..30ca0199671 100644
--- a/Master/texmf-dist/doc/latex/ulthese/README.md
+++ b/Master/texmf-dist/doc/latex/ulthese/README.md
@@ -1,15 +1,14 @@
-# Package ulthese
+# Thesis class for Université Laval
-The package provides a class based on memoir and compatible with LaTeX
-and XeLaTeX to prepare theses and memoirs compliant with the
+The package provides a class based on memoir and compatible with
+pdfLaTeX and XeLaTeX to prepare theses and memoirs compliant with the
presentation rules set forth by the Faculty of Graduate Studies of
Université Laval, Québec, Canada. The class also comes with an
extensive set of templates for the various types of theses and memoirs
offered at Laval.
-Please note that the documentation for the class and the comments in
-the templates are written in French, the language of the target
-audience.
+The documentation for the class and the comments in the templates are
+written in French, the language of the target audience.
## Licence
@@ -18,11 +17,11 @@ later version.
## Version
-5.3a (2021-08-09)
+6.0 (2024-07-02)
## Author
-Université Laval <ulthese-dev@bibl.ulaval.ca>
+Vincent Goulet for Université Laval <ulthese-dev@bibl.ulaval.ca>
## Source code repository
@@ -30,20 +29,20 @@ https://gitlab.com/vigou3/ulthese/
> The rest of this file is in French for the target audience.
-# Paquetage ulthese
+# Classe pour les thèses et mémoires de l'Université Laval
Le paquetage **ulthese** fournit la classe du même nom permettant de
composer des thèses et des mémoires immédiatement conformes aux règles
-générales de présentation matérielle de la Faculté des études
-supérieures et postdoctorales (FESP) de l'[Université
-Laval](https://www.ulaval.ca).
+générales et complémentaires de présentation matérielle de la Faculté
+des études supérieures et postdoctorales (FESP) de l'[Université
+Laval](https://www.ulaval.ca).
La classe permet également de produire les types de documents suivants
selon les mêmes règles de présentation que les thèses et mémoires:
examen de doctorat, essai de maîtrise, projet de recherche, rapport de
stage.
-La classe est compatible avec LaTeX et XeLaTeX.
+La classe est compatible avec pdfLaTeX et XeLaTeX.
## Contenu du paquetage
@@ -56,16 +55,18 @@ La classe est compatible avec LaTeX et XeLaTeX.
## Installation
-Pour installer la classe ulthese, compiler avec LaTeX le fichier
-`ulthese.ins`, en exécutant
+Le paquetage **ulthese** est distribué via le réseau de sites
+Comprehensive TeX Archive Network (CTAN) et il fait partie des
+distributions TeX standards. Par conséquent, nous recommandons
+fortement d'installer ou de mettre à jour le paquetage à l'aide du
+gestionnaire de paquetages de votre distribution.
- latex ulthese.ins
+Les experts TeX peuvent générer la classe en compilant le fichier
+`ulthese.ins` avec LaTeX:
-depuis une ligne de commande. On peut aussi ouvrir le fichier
-`ulthese.ins` dans son éditeur LaTeX et lancer la compilation avec
-LaTeX, pdfTeX, pdfLaTeX ou XeLaTeX depuis celui-ci.
+ latex ulthese.ins
-La compilation du fichier ulthese.ins générera plusieurs fichiers:
+La compilation générera plusieurs fichiers:
1. la classe elle-même:
- `ulthese.cls`
@@ -97,16 +98,18 @@ Les gabarits inutiles peuvent être supprimés.
## Documentation
Le fichier `ulthese.pdf` contient la documentation complète de la
-classe et des gabarits. Le document peut être recréé à partir du code
-source avec les commandes
+classe. Le document peut être recréé à partir du code source avec les
+commandes
- pdflatex ulthese.dtx
+ xelatex ulthese.dtx
makeindex -s gglo.ist -o ulthese.gls ulthese.glo
- pdflatex ulthese.dtx
+ xelatex ulthese.dtx
+ xelatex ulthese.dtx
## Historique des versions
-L'historique des versions de la classe se trouve en annexe de la documentation.
+L'historique des versions de la classe se trouve en annexe de la
+documentation.
## Commentaires et suggestions
@@ -116,11 +119,5 @@ des améliorations à la classe.
## Aide additionnelle
-Faire appel aux ressources suivantes, dans l'ordre:
-
-1. consulter le [WikiThèse de l'Université Laval](http://www.theses.ulaval.ca/wiki/);
-
-2. consulter les archives de la liste de distribution
- [ulthese-aide](http://listes.ulaval.ca/listserv/archives/ulthese-aide.html);
-
-3. écrire à la liste de distribution [ulthese-aide](mailto:ulthese-aide@listes.ulaval.ca).
+Vous pouvez obtenir de l'aide additionnelle sur l'utilisation de la
+classe en écrivant à l'adresse: ulthese-aide@listes.ulaval.ca.
diff --git a/Master/texmf-dist/doc/latex/ulthese/avantpropos.tex b/Master/texmf-dist/doc/latex/ulthese/avantpropos.tex
index 7fdd8a60515..721e1af1ff7 100644
--- a/Master/texmf-dist/doc/latex/ulthese/avantpropos.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/avantpropos.tex
@@ -2,5 +2,5 @@
\label{chap-avantpropos} % étiquette pour renvois
\phantomsection\addcontentsline{toc}{chapter}{\nameref{chap-avantpropos}} % inclure dans TdM
-<Texte de l'avant-propos. Obligatoire dans une thèse ou un mémoire par
-articles.>
+<Texte de l'avant-propos. Obligatoire seulement pour une thèse ou un
+mémoire par intégration d'articles.>
diff --git a/Master/texmf-dist/doc/latex/ulthese/chapitre1-articles.tex b/Master/texmf-dist/doc/latex/ulthese/chapitre1-articles.tex
index 96730a285df..da0ee9bc144 100644
--- a/Master/texmf-dist/doc/latex/ulthese/chapitre1-articles.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/chapitre1-articles.tex
@@ -15,5 +15,3 @@
<Texte du chapitre ou de l'article.>
-\bibliographystyle{} % style de la bibliographie
-\bibliography{} % production de la bibliographie
diff --git a/Master/texmf-dist/doc/latex/ulthese/chapitre2-articles.tex b/Master/texmf-dist/doc/latex/ulthese/chapitre2-articles.tex
index 96730a285df..da0ee9bc144 100644
--- a/Master/texmf-dist/doc/latex/ulthese/chapitre2-articles.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/chapitre2-articles.tex
@@ -15,5 +15,3 @@
<Texte du chapitre ou de l'article.>
-\bibliographystyle{} % style de la bibliographie
-\bibliography{} % production de la bibliographie
diff --git a/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-articles.tex b/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-articles.tex
index dad95d80475..d0d68b475f0 100644
--- a/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-articles.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-articles.tex
@@ -4,50 +4,52 @@
%% description détaillée de la classe, de ce gabarit et des options
%% disponibles.
%%
+%% Vous devez obligatoirement enregistrer tout fichier contenant des
+%% caractères non-ASCII (comme des lettres accentuées) dans le codage
+%% de caractères UTF-8.
+%%
%% [Ne pas hésiter à supprimer les commentaires après les avoir lus.]
%%
%% Déclaration de la classe avec le type de grade
%% [l'un de LLD, DMus, DPsy, DThP, PhD]
%% et les langues les plus courantes. Le français sera la langue par
-%% défaut du document. L'option 'bibsection' permet de créer des
-%% bibliographies par chapitre présentées sous forme de section
-%% numérotée.
-\documentclass[PhD,bibsection,english,french]{ulthese}
- %% Encodage utilisé pour les caractères accentués dans les fichiers
- %% source du document. Les gabarits sont encodés en UTF-8. Inutile
- %% avec XeLaTeX, qui gère Unicode nativement.
- \ifxetex\else \usepackage[utf8]{inputenc} \fi
-
+%% défaut du document.
+\documentclass[PhD,english,french]{ulthese}
%% Charger ici les autres paquetages nécessaires pour le document.
%% Quelques exemples; décommenter au besoin.
%\usepackage{amsmath} % recommandé pour les mathématiques
%\usepackage{icomma} % gestion de la virgule dans les nombres
- %% Utilisation d'une autre police de caractères pour le document.
- %% - Sous LaTeX
- %\usepackage{mathpazo} % texte et mathématiques en Palatino
- %\usepackage{mathptmx} % texte et mathématiques en Times
- %% - Sous XeLaTeX
- %\setmainfont{TeX Gyre Pagella} % texte en Pagella (Palatino)
- %\setmathfont{TeX Gyre Pagella Math} % mathématiques en Pagella (Palatino)
- %\setmainfont{TeX Gyre Termes} % texte en Termes (Times)
- %\setmathfont{TeX Gyre Termes Math} % mathématiques en Termes (Times)
+ %% Utilisation d'une autre police de caractères pour le document
+ %% (exemple pour les polices STIX Two incluses dans TeX Live).
+ %% - Avec pdfLaTeX
+ %\usepackage{stix2}
+ %% - Avec XeLaTeX
+ %\setmainfont{STIXTwoText}
+ %[
+ % Extension = .otf,
+ % UprightFont = *-Regular,
+ % BoldFont = *-SemiBold,
+ % ItalicFont = *-Italic,
+ % BoldItalicFont = *-SemiBoldItalic,
+ %]
+ %\setmathfont{STIXTwoMath-Regular}
+ %[
+ % Extension = .otf,
+ %]
%% Options de mise en forme du mode français de babel. Consulter la
- %% documentation du paquetage babel pour les options disponibles.
- %% Désactiver (effacer ou mettre en commentaire) si l'option
- %% 'nobabel' est spécifiée au chargement de la classe.
- \frenchbsetup{%
+ %% documentation du paquetage babel-french pour les options
+ %% disponibles. Désactiver (effacer ou mettre en commentaire) si
+ %% l'option 'nobabel' est spécifiée au chargement de la classe.
+ \frenchsetup{%
StandardItemizeEnv=true, % format standard des listes
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % caractères « et » sont les guillemets
}
- %% Suppression du numéro de section de la bibliographie. Utilisation
- %% de \extrasfrench parce que c'est la dernière langue déclarée dans
- %% \documentclass, ci-dessus.
- %\addto\extrasfrench{%
- % \renewcommand{\bibsection}{\section*{\bibname}\prebibhook}}
+ %% Style de la bibliographie.
+ \bibliographystyle{}
%% Composition de la page frontispice. Remplacer les éléments entre < >.
%% Supprimer les caractères < >. Couper un long titre ou un long
@@ -72,19 +74,19 @@
\frontmatter % pages liminaires
-\frontispice % production de la page frontispice
+\frontispice % page frontispice (obligatoire)
-\include{resume} % résumé français
-\include{abstract} % résumé anglais
+\include{resume} % résumé français (obligatoire)
+\include{abstract} % résumé anglais (optionnel)
\cleardoublepage
-\tableofcontents % production de la TdM
+\tableofcontents % table des matières (obligatoire)
\cleardoublepage
-\listoftables % production de la liste des tableaux
+\listoftables % liste des tableaux
\cleardoublepage
-\listoffigures % production de la liste des figures
+\listoffigures % liste des figures
\cleardoublepage
\dedicace{<Dédicace si désiré>}
@@ -94,7 +96,7 @@
\cleardoublepage
\include{remerciements} % remerciements
-\include{avantpropos} % avant-propos
+\include{avantpropos} % avant-propos (obligatoire)
\mainmatter % corps du document
@@ -107,4 +109,5 @@
\include{annexe} % annexe A
+\bibliography{} % production de la bibliographie
\end{document}
diff --git a/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-cotutelle.tex b/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-cotutelle.tex
index a59a69303a4..64eb20d1a17 100644
--- a/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-cotutelle.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat-cotutelle.tex
@@ -4,6 +4,10 @@
%% description détaillée de la classe, de ce gabarit et des options
%% disponibles.
%%
+%% Vous devez obligatoirement enregistrer tout fichier contenant des
+%% caractères non-ASCII (comme des lettres accentuées) dans le codage
+%% de caractères UTF-8.
+%%
%% [Ne pas hésiter à supprimer les commentaires après les avoir lus.]
%%
%% Déclaration de la classe avec le type de grade
@@ -11,38 +15,41 @@
%% et les langues les plus courantes. Le français sera la langue par
%% défaut du document.
\documentclass[PhD,cotutelle,english,french]{ulthese}
- %% Encodage utilisé pour les caractères accentués dans les fichiers
- %% source du document. Les gabarits sont encodés en UTF-8. Inutile
- %% avec XeLaTeX, qui gère Unicode nativement.
- \ifxetex\else \usepackage[utf8]{inputenc} \fi
-
%% Charger ici les autres paquetages nécessaires pour le document.
%% Quelques exemples; décommenter au besoin.
%\usepackage{amsmath} % recommandé pour les mathématiques
%\usepackage{icomma} % gestion de la virgule dans les nombres
- %% Utilisation d'une autre police de caractères pour le document.
- %% - Sous LaTeX
- %\usepackage{mathpazo} % texte et mathématiques en Palatino
- %\usepackage{mathptmx} % texte et mathématiques en Times
- %% - Sous XeLaTeX
- %\setmainfont{TeX Gyre Pagella} % texte en Pagella (Palatino)
- %\setmathfont{TeX Gyre Pagella Math} % mathématiques en Pagella (Palatino)
- %\setmainfont{TeX Gyre Termes} % texte en Termes (Times)
- %\setmathfont{TeX Gyre Termes Math} % mathématiques en Termes (Times)
+ %% Utilisation d'une autre police de caractères pour le document
+ %% (exemple pour les polices STIX Two incluses dans TeX Live).
+ %% - Avec pdfLaTeX
+ %\usepackage{stix2}
+ %% - Avec XeLaTeX
+ %\setmainfont{STIXTwoText}
+ %[
+ % Extension = .otf,
+ % UprightFont = *-Regular,
+ % BoldFont = *-SemiBold,
+ % ItalicFont = *-Italic,
+ % BoldItalicFont = *-SemiBoldItalic,
+ %]
+ %\setmathfont{STIXTwoMath-Regular}
+ %[
+ % Extension = .otf,
+ %]
%% Options de mise en forme du mode français de babel. Consulter la
- %% documentation du paquetage babel pour les options disponibles.
- %% Désactiver (effacer ou mettre en commentaire) si l'option
- %% 'nobabel' est spécifiée au chargement de la classe.
- \frenchbsetup{%
+ %% documentation du paquetage babel-french pour les options
+ %% disponibles. Désactiver (effacer ou mettre en commentaire) si
+ %% l'option 'nobabel' est spécifiée au chargement de la classe.
+ \frenchsetup{%
StandardItemizeEnv=true, % format standard des listes
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % caractères « et » sont les guillemets
}
%% Style de la bibliographie.
- \bibliographystyle{}
+ \bibliographystyle{}
%% Composition de la page frontispice. Remplacer les éléments entre < >.
%% Supprimer les caractères < >. Couper un long titre ou un long
@@ -71,19 +78,19 @@
\frontmatter % pages liminaires
-\frontispice % production de la page frontispice
+\frontispice % page frontispice (obligatoire)
-\include{resume} % résumé français
-\include{abstract} % résumé anglais
+\include{resume} % résumé français (obligatoire)
+\include{abstract} % résumé anglais (optionnel)
\cleardoublepage
-\tableofcontents % production de la TdM
+\tableofcontents % table des matières (obligatoire)
\cleardoublepage
-\listoftables % production de la liste des tableaux
+\listoftables % liste des tableaux
\cleardoublepage
-\listoffigures % production de la liste des figures
+\listoffigures % liste des figures
\cleardoublepage
\dedicace{<Dédicace si désiré>}
@@ -93,7 +100,7 @@
\cleardoublepage
\include{remerciements} % remerciements
-\include{avantpropos} % avant-propos
+\include{avantpropos} % avant-propos (optionnel)
\mainmatter % corps du document
@@ -107,5 +114,4 @@
\include{annexe} % annexe A
\bibliography{} % production de la bibliographie
-
\end{document}
diff --git a/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat.tex b/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat.tex
index de8fa42fbe2..4773eb96106 100644
--- a/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/gabarit-doctorat.tex
@@ -4,6 +4,10 @@
%% description détaillée de la classe, de ce gabarit et des options
%% disponibles.
%%
+%% Vous devez obligatoirement enregistrer tout fichier contenant des
+%% caractères non-ASCII (comme des lettres accentuées) dans le codage
+%% de caractères UTF-8.
+%%
%% [Ne pas hésiter à supprimer les commentaires après les avoir lus.]
%%
%% Déclaration de la classe avec le type de grade
@@ -11,38 +15,41 @@
%% et les langues les plus courantes. Le français sera la langue par
%% défaut du document.
\documentclass[PhD,english,french]{ulthese}
- %% Encodage utilisé pour les caractères accentués dans les fichiers
- %% source du document. Les gabarits sont encodés en UTF-8. Inutile
- %% avec XeLaTeX, qui gère Unicode nativement.
- \ifxetex\else \usepackage[utf8]{inputenc} \fi
-
%% Charger ici les autres paquetages nécessaires pour le document.
%% Quelques exemples; décommenter au besoin.
%\usepackage{amsmath} % recommandé pour les mathématiques
%\usepackage{icomma} % gestion de la virgule dans les nombres
- %% Utilisation d'une autre police de caractères pour le document.
- %% - Sous LaTeX
- %\usepackage{mathpazo} % texte et mathématiques en Palatino
- %\usepackage{mathptmx} % texte et mathématiques en Times
- %% - Sous XeLaTeX
- %\setmainfont{TeX Gyre Pagella} % texte en Pagella (Palatino)
- %\setmathfont{TeX Gyre Pagella Math} % mathématiques en Pagella (Palatino)
- %\setmainfont{TeX Gyre Termes} % texte en Termes (Times)
- %\setmathfont{TeX Gyre Termes Math} % mathématiques en Termes (Times)
+ %% Utilisation d'une autre police de caractères pour le document
+ %% (exemple pour les polices STIX Two incluses dans TeX Live).
+ %% - Avec pdfLaTeX
+ %\usepackage{stix2}
+ %% - Avec XeLaTeX
+ %\setmainfont{STIXTwoText}
+ %[
+ % Extension = .otf,
+ % UprightFont = *-Regular,
+ % BoldFont = *-SemiBold,
+ % ItalicFont = *-Italic,
+ % BoldItalicFont = *-SemiBoldItalic,
+ %]
+ %\setmathfont{STIXTwoMath-Regular}
+ %[
+ % Extension = .otf,
+ %]
%% Options de mise en forme du mode français de babel. Consulter la
- %% documentation du paquetage babel pour les options disponibles.
- %% Désactiver (effacer ou mettre en commentaire) si l'option
- %% 'nobabel' est spécifiée au chargement de la classe.
- \frenchbsetup{%
+ %% documentation du paquetage babel-french pour les options
+ %% disponibles. Désactiver (effacer ou mettre en commentaire) si
+ %% l'option 'nobabel' est spécifiée au chargement de la classe.
+ \frenchsetup{%
StandardItemizeEnv=true, % format standard des listes
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % caractères « et » sont les guillemets
}
%% Style de la bibliographie.
- \bibliographystyle{}
+ \bibliographystyle{}
%% Composition de la page frontispice. Remplacer les éléments entre < >.
%% Supprimer les caractères < >. Couper un long titre ou un long
@@ -68,19 +75,19 @@
\frontmatter % pages liminaires
-\frontispice % production de la page frontispice
+\frontispice % page frontispice (obligatoire)
-\include{resume} % résumé français
-\include{abstract} % résumé anglais
+\include{resume} % résumé français (obligatoire)
+\include{abstract} % résumé anglais (optionnel)
\cleardoublepage
-\tableofcontents % production de la TdM
+\tableofcontents % table des matières (obligatoire)
\cleardoublepage
-\listoftables % production de la liste des tableaux
+\listoftables % liste des tableaux
\cleardoublepage
-\listoffigures % production de la liste des figures
+\listoffigures % liste des figures
\cleardoublepage
\dedicace{<Dédicace si désiré>}
@@ -90,7 +97,7 @@
\cleardoublepage
\include{remerciements} % remerciements
-\include{avantpropos} % avant-propos
+\include{avantpropos} % avant-propos (optionnel)
\mainmatter % corps du document
@@ -104,5 +111,4 @@
\include{annexe} % annexe A
\bibliography{} % production de la bibliographie
-
\end{document}
diff --git a/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-articles.tex b/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-articles.tex
index 9ccf99ae874..e317f64d048 100644
--- a/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-articles.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-articles.tex
@@ -3,51 +3,53 @@
%% description détaillée de la classe, de ce gabarit et des options
%% disponibles.
%%
+%% Vous devez obligatoirement enregistrer tout fichier contenant des
+%% caractères non-ASCII (comme des lettres accentuées) dans le codage
+%% de caractères UTF-8.
+%%
%% [Ne pas hésiter à supprimer les commentaires après les avoir lus.]
%%
%% Déclaration de la classe avec le type de grade
-%% [l'un de MATDR, MArch, MA, LLM, MErg, MMus, MPht, MSc, MScGeogr,
-%% MServSoc, MPsEd]
+%% [l'un de MATDR, MArch, LLM, MErg, MMus, MPsEd, MScGeogr,
+%% MServSoc, MTravSoc, MA, MSc]
%% et les langues les plus courantes. Le français sera la langue par
-%% défaut du document. L'option 'bibsection' permet de créer des
-%% bibliographies par chapitre présentées sous forme de section
-%% numérotée.
-\documentclass[MSc,bibsection,english,french]{ulthese}
- %% Encodage utilisé pour les caractères accentués dans les fichiers
- %% source du document. Les gabarits sont encodés en UTF-8. Inutile
- %% avec XeLaTeX, qui gère Unicode nativement.
- \ifxetex\else \usepackage[utf8]{inputenc} \fi
-
+%% défaut du document.
+\documentclass[MSc,english,french]{ulthese}
%% Charger ici les autres paquetages nécessaires pour le document.
%% Quelques exemples; décommenter au besoin.
%\usepackage{amsmath} % recommandé pour les mathématiques
%\usepackage{icomma} % gestion de la virgule dans les nombres
- %% Utilisation d'une autre police de caractères pour le document.
- %% - Sous LaTeX
- %\usepackage{mathpazo} % texte et mathématiques en Palatino
- %\usepackage{mathptmx} % texte et mathématiques en Times
- %% - Sous XeLaTeX
- %\setmainfont{TeX Gyre Pagella} % texte en Pagella (Palatino)
- %\setmathfont{TeX Gyre Pagella Math} % mathématiques en Pagella (Palatino)
- %\setmainfont{TeX Gyre Termes} % texte en Termes (Times)
- %\setmathfont{TeX Gyre Termes Math} % mathématiques en Termes (Times)
+ %% Utilisation d'une autre police de caractères pour le document
+ %% (exemple pour les polices STIX Two incluses dans TeX Live).
+ %% - Avec pdfLaTeX
+ %\usepackage{stix2}
+ %% - Avec XeLaTeX
+ %\setmainfont{STIXTwoText}
+ %[
+ % Extension = .otf,
+ % UprightFont = *-Regular,
+ % BoldFont = *-SemiBold,
+ % ItalicFont = *-Italic,
+ % BoldItalicFont = *-SemiBoldItalic,
+ %]
+ %\setmathfont{STIXTwoMath-Regular}
+ %[
+ % Extension = .otf,
+ %]
%% Options de mise en forme du mode français de babel. Consulter la
- %% documentation du paquetage babel pour les options disponibles.
- %% Désactiver (effacer ou mettre en commentaire) si l'option
- %% 'nobabel' est spécifiée au chargement de la classe.
- \frenchbsetup{%
+ %% documentation du paquetage babel-french pour les options
+ %% disponibles. Désactiver (effacer ou mettre en commentaire) si
+ %% l'option 'nobabel' est spécifiée au chargement de la classe.
+ \frenchsetup{%
StandardItemizeEnv=true, % format standard des listes
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % caractères « et » sont les guillemets
}
- %% Suppression du numéro de section de la bibliographie. Utilisation
- %% de \extrasfrench parce que c'est la dernière langue déclarée dans
- %% \documentclass, ci-dessus.
- %\addto\extrasfrench{%
- % \renewcommand{\bibsection}{\section*{\bibname}\prebibhook}}
+ %% Style de la bibliographie.
+ \bibliographystyle{}
%% Composition de la page frontispice. Remplacer les éléments entre < >.
%% Supprimer les caractères < >. Couper un long titre ou un long
@@ -72,19 +74,19 @@
\frontmatter % pages liminaires
-\frontispice % production de la page frontispice
+\frontispice % page frontispice (obligatoire)
-\include{resume} % résumé français
-\include{abstract} % résumé anglais
+\include{resume} % résumé français (obligatoire)
+\include{abstract} % résumé anglais (optionnel)
\cleardoublepage
-\tableofcontents % production de la TdM
+\tableofcontents % table des matières (obligatoire)
\cleardoublepage
-\listoftables % production de la liste des tableaux
+\listoftables % liste des tableaux
\cleardoublepage
-\listoffigures % production de la liste des figures
+\listoffigures % liste des figures
\cleardoublepage
\dedicace{<Dédicace si désiré>}
@@ -94,7 +96,7 @@
\cleardoublepage
\include{remerciements} % remerciements
-\include{avantpropos} % avant-propos
+\include{avantpropos} % avant-propos (obligatoire)
\mainmatter % corps du document
@@ -107,4 +109,5 @@
\include{annexe} % annexe A
+\bibliography{} % production de la bibliographie
\end{document}
diff --git a/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-bidiplomation.tex b/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-bidiplomation.tex
index e737a324ea2..963d15e491a 100644
--- a/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-bidiplomation.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise-bidiplomation.tex
@@ -4,46 +4,53 @@
%% description détaillée de la classe, de ce gabarit et des options
%% disponibles.
%%
+%% Vous devez obligatoirement enregistrer tout fichier contenant des
+%% caractères non-ASCII (comme des lettres accentuées) dans le codage
+%% de caractères UTF-8.
+%%
%% [Ne pas hésiter à supprimer les commentaires après les avoir lus.]
%%
%% Déclaration de la classe avec le type de grade
-%% [l'un de MATDR, MArch, MA, LLM, MErg, MMus, MPht, MSc, MScGeogr,
-%% MServSoc, MPsEd]
+%% [l'un de MATDR, MArch, LLM, MErg, MMus, MPsEd, MScGeogr,
+%% MServSoc, MTravSoc, MA, MSc]
%% et les langues les plus courantes. Le français sera la langue par
%% défaut du document.
\documentclass[MA,bidiplomation,english,french]{ulthese}
- %% Encodage utilisé pour les caractères accentués dans les fichiers
- %% source du document. Les gabarits sont encodés en UTF-8. Inutile
- %% avec XeLaTeX, qui gère Unicode nativement.
- \ifxetex\else \usepackage[utf8]{inputenc} \fi
-
%% Charger ici les autres paquetages nécessaires pour le document.
%% Quelques exemples; décommenter au besoin.
%\usepackage{amsmath} % recommandé pour les mathématiques
%\usepackage{icomma} % gestion de la virgule dans les nombres
- %% Utilisation d'une autre police de caractères pour le document.
- %% - Sous LaTeX
- %\usepackage{mathpazo} % texte et mathématiques en Palatino
- %\usepackage{mathptmx} % texte et mathématiques en Times
- %% - Sous XeLaTeX
- %\setmainfont{TeX Gyre Pagella} % texte en Pagella (Palatino)
- %\setmathfont{TeX Gyre Pagella Math} % mathématiques en Pagella (Palatino)
- %\setmainfont{TeX Gyre Termes} % texte en Termes (Times)
- %\setmathfont{TeX Gyre Termes Math} % mathématiques en Termes (Times)
+ %% Utilisation d'une autre police de caractères pour le document
+ %% (exemple pour les polices STIX Two incluses dans TeX Live).
+ %% - Avec pdfLaTeX
+ %\usepackage{stix2}
+ %% - Avec XeLaTeX
+ %\setmainfont{STIXTwoText}
+ %[
+ % Extension = .otf,
+ % UprightFont = *-Regular,
+ % BoldFont = *-SemiBold,
+ % ItalicFont = *-Italic,
+ % BoldItalicFont = *-SemiBoldItalic,
+ %]
+ %\setmathfont{STIXTwoMath-Regular}
+ %[
+ % Extension = .otf,
+ %]
%% Options de mise en forme du mode français de babel. Consulter la
- %% documentation du paquetage babel pour les options disponibles.
- %% Désactiver (effacer ou mettre en commentaire) si l'option
- %% 'nobabel' est spécifiée au chargement de la classe.
- \frenchbsetup{%
+ %% documentation du paquetage babel-french pour les options
+ %% disponibles. Désactiver (effacer ou mettre en commentaire) si
+ %% l'option 'nobabel' est spécifiée au chargement de la classe.
+ \frenchsetup{%
StandardItemizeEnv=true, % format standard des listes
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % caractères « et » sont les guillemets
}
%% Style de la bibliographie.
- \bibliographystyle{}
+ \bibliographystyle{}
%% Composition de la page frontispice. Remplacer les éléments entre < >.
%% Supprimer les caractères < >. Couper un long titre ou un long
@@ -72,19 +79,19 @@
\frontmatter % pages liminaires
-\frontispice % production de la page frontispice
+\frontispice % page frontispice (obligatoire)
-\include{resume} % résumé français
-\include{abstract} % résumé anglais
+\include{resume} % résumé français (obligatoire)
+\include{abstract} % résumé anglais (optionnel)
\cleardoublepage
-\tableofcontents % production de la TdM
+\tableofcontents % table des matières (obligatoire)
\cleardoublepage
-\listoftables % production de la liste des tableaux
+\listoftables % liste des tableaux
\cleardoublepage
-\listoffigures % production de la liste des figures
+\listoffigures % liste des figures
\cleardoublepage
\dedicace{<Dédicace si désiré>}
@@ -94,7 +101,7 @@
\cleardoublepage
\include{remerciements} % remerciements
-\include{avantpropos} % avant-propos
+\include{avantpropos} % avant-propos (optionnel)
\mainmatter % corps du document
@@ -108,5 +115,4 @@
\include{annexe} % annexe A
\bibliography{} % production de la bibliographie
-
\end{document}
diff --git a/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise.tex b/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise.tex
index 6d442ca82ea..64af596870b 100644
--- a/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise.tex
+++ b/Master/texmf-dist/doc/latex/ulthese/gabarit-maitrise.tex
@@ -4,46 +4,53 @@
%% description détaillée de la classe, de ce gabarit et des options
%% disponibles.
%%
+%% Vous devez obligatoirement enregistrer tout fichier contenant des
+%% caractères non-ASCII (comme des lettres accentuées) dans le codage
+%% de caractères UTF-8.
+%%
%% [Ne pas hésiter à supprimer les commentaires après les avoir lus.]
%%
%% Déclaration de la classe avec le type de grade
-%% [l'un de MATDR, MArch, MA, LLM, MErg, MMus, MPht, MSc, MScGeogr,
-%% MServSoc, MPsEd]
+%% [l'un de MATDR, MArch, LLM, MErg, MMus, MPsEd, MScGeogr,
+%% MServSoc, MTravSoc, MA, MSc]
%% et les langues les plus courantes. Le français sera la langue par
%% défaut du document.
\documentclass[MSc,english,french]{ulthese}
- %% Encodage utilisé pour les caractères accentués dans les fichiers
- %% source du document. Les gabarits sont encodés en UTF-8. Inutile
- %% avec XeLaTeX, qui gère Unicode nativement.
- \ifxetex\else \usepackage[utf8]{inputenc} \fi
-
%% Charger ici les autres paquetages nécessaires pour le document.
%% Quelques exemples; décommenter au besoin.
%\usepackage{amsmath} % recommandé pour les mathématiques
%\usepackage{icomma} % gestion de la virgule dans les nombres
- %% Utilisation d'une autre police de caractères pour le document.
- %% - Sous LaTeX
- %\usepackage{mathpazo} % texte et mathématiques en Palatino
- %\usepackage{mathptmx} % texte et mathématiques en Times
- %% - Sous XeLaTeX
- %\setmainfont{TeX Gyre Pagella} % texte en Pagella (Palatino)
- %\setmathfont{TeX Gyre Pagella Math} % mathématiques en Pagella (Palatino)
- %\setmainfont{TeX Gyre Termes} % texte en Termes (Times)
- %\setmathfont{TeX Gyre Termes Math} % mathématiques en Termes (Times)
+ %% Utilisation d'une autre police de caractères pour le document
+ %% (exemple pour les polices STIX Two incluses dans TeX Live).
+ %% - Avec pdfLaTeX
+ %\usepackage{stix2}
+ %% - Avec XeLaTeX
+ %\setmainfont{STIXTwoText}
+ %[
+ % Extension = .otf,
+ % UprightFont = *-Regular,
+ % BoldFont = *-SemiBold,
+ % ItalicFont = *-Italic,
+ % BoldItalicFont = *-SemiBoldItalic,
+ %]
+ %\setmathfont{STIXTwoMath-Regular}
+ %[
+ % Extension = .otf,
+ %]
%% Options de mise en forme du mode français de babel. Consulter la
- %% documentation du paquetage babel pour les options disponibles.
- %% Désactiver (effacer ou mettre en commentaire) si l'option
- %% 'nobabel' est spécifiée au chargement de la classe.
- \frenchbsetup{%
+ %% documentation du paquetage babel-french pour les options
+ %% disponibles. Désactiver (effacer ou mettre en commentaire) si
+ %% l'option 'nobabel' est spécifiée au chargement de la classe.
+ \frenchsetup{%
StandardItemizeEnv=true, % format standard des listes
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % caractères « et » sont les guillemets
}
%% Style de la bibliographie.
- \bibliographystyle{}
+ \bibliographystyle{}
%% Composition de la page frontispice. Remplacer les éléments entre < >.
%% Supprimer les caractères < >. Couper un long titre ou un long
@@ -69,19 +76,19 @@
\frontmatter % pages liminaires
-\frontispice % production de la page frontispice
+\frontispice % page frontispice (obligatoire)
-\include{resume} % résumé français
-\include{abstract} % résumé anglais
+\include{resume} % résumé français (obligatoire)
+\include{abstract} % résumé anglais (optionnel)
\cleardoublepage
-\tableofcontents % production de la TdM
+\tableofcontents % table des matières (obligatoire)
\cleardoublepage
-\listoftables % production de la liste des tableaux
+\listoftables % liste des tableaux
\cleardoublepage
-\listoffigures % production de la liste des figures
+\listoffigures % liste des figures
\cleardoublepage
\dedicace{<Dédicace si désiré>}
@@ -91,7 +98,7 @@
\cleardoublepage
\include{remerciements} % remerciements
-\include{avantpropos} % avant-propos
+\include{avantpropos} % avant-propos (optionnel)
\mainmatter % corps du document
@@ -105,5 +112,4 @@
\include{annexe} % annexe A
\bibliography{} % production de la bibliographie
-
\end{document}
diff --git a/Master/texmf-dist/doc/latex/ulthese/ulthese.pdf b/Master/texmf-dist/doc/latex/ulthese/ulthese.pdf
index 6cc5a949570..ae1094d5ca8 100644
--- a/Master/texmf-dist/doc/latex/ulthese/ulthese.pdf
+++ b/Master/texmf-dist/doc/latex/ulthese/ulthese.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/unbtex/README.md b/Master/texmf-dist/doc/latex/unbtex/README.md
index 2293f91fe49..0d0f2325fac 100644
--- a/Master/texmf-dist/doc/latex/unbtex/README.md
+++ b/Master/texmf-dist/doc/latex/unbtex/README.md
@@ -1,6 +1,6 @@
# UnBTeX: A class for bachelor, master, and doctoral thesis at the
# University of Brasilia (UnB), Brazil.
-# Version 1.5.1 2024/03/02
+# Version 1.5.2 2024/07/04
Copyright (C) 2021-2024 by Henrique C. Ferreira <hcferreira@unb.br>
@@ -109,6 +109,12 @@ Here is a history of changes:
1.5.1 (2024-03-02):
. The approval sheet (folha de aprovação) has been changed
. The bottom margin size has been corrected to be consistently adhered to
+ 1.5.2 (2024-07-04):
+ . The length of the footnote separator line has been corrected according
+ to ABNT standards
+ . The left margin indentation of the citacao environment has been corrected
+ according to ABNT standards
+ . The left margin indentation of the references can be adjusted by the user
## Overleaf
diff --git a/Master/texmf-dist/doc/latex/unbtex/unbtex-example.pdf b/Master/texmf-dist/doc/latex/unbtex/unbtex-example.pdf
index f1498c69859..0b6493ed0bb 100644
--- a/Master/texmf-dist/doc/latex/unbtex/unbtex-example.pdf
+++ b/Master/texmf-dist/doc/latex/unbtex/unbtex-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/unbtex/unbtex-example.tex b/Master/texmf-dist/doc/latex/unbtex/unbtex-example.tex
index 1ad00190034..33872900a58 100644
--- a/Master/texmf-dist/doc/latex/unbtex/unbtex-example.tex
+++ b/Master/texmf-dist/doc/latex/unbtex/unbtex-example.tex
@@ -1,7 +1,7 @@
%%
%% UnBTeX: A class for bachelor, master, and doctoral thesis at the
%% University of Brasilia (UnB), Brazil
-%% Version 1.5.1 2024/03/02
+%% Version 1.5.2 2024/07/04
%% Copyright (C) 2021-2024 by Henrique C. Ferreira <hcferreira@unb.br>
%%
%% This class file may be distributed and/or modified under the conditions
@@ -55,7 +55,7 @@
% ---
% Diretório das figuras
-\graphicspath{{unbtex-example/figuras/}}
+\graphicspath{{unbtex-example/figuras}}
% ---
% ------------------------------------------------------------------------
@@ -67,7 +67,7 @@
% ---
% Título
% ---
-\titulo{Modelo de trabalho \\ acadêmico com UnB\TeX} % No idioma principal do texto
+\titulo{Modelo de trabalho\\ acadêmico com UnB\TeX} % No idioma principal do texto
% Insira \\ caso queira forçar quebras de linha no título
% Não utilize caixa alta para o título do trabalho e nem das seções (com exceção de siglas)
% ---
@@ -102,35 +102,35 @@
% ---
% Informações do trabalho
% ---
-\tipotrabalho{Projeto Final de Curso} % Dissertação de Mestrado; Tese de Doutorado (em português, mesmo que o trabalho seja em inglês)
+\tipotrabalho{Trabalho de Conclusão de Curso} % Dissertação de Mestrado; Tese de Doutorado (em português, mesmo que o trabalho seja em inglês)
%\tipotrabalho{Tese de Doutorado}
% ---
-\tipocurso{Engenharia de Controle e Automação} % Nome do curso de graduação ou do programa de pós-graduação, em português
+\tipocurso{Engenharia Elétrica} % Nome do curso de graduação ou do programa de pós-graduação, em português
%\tipocurso{Programa de Pós-Graduação em Engenharia Elétrica}
% ---
% Texto que aparece na folha de rosto e na folha de aprovação
-\preambulo{Projeto Final de Curso submetido como requisito parcial para obtenção do grau de Engenheiro de Controle e Automação.}
+\preambulo{Trabalho de Conclusão de Curso submetido como requisito parcial para obtenção do grau de Engenheiro Eletricista.}
%\preambulo{Tese de Doutorado submetida ao Programa de Pós-Graduação em Engenharia Elétrica da Universidade de Brasília como parte dos requisitos necessários para obtenção do grau de Doutor.}
% Consulte a secretaria/coordenação do curso para saber o que deve ser escrito no preâmbulo. Use português mesmo que o trabalho seja em inglês.
% ---
% Informação adicional para ser impressa na folha de rosto
\publicacao{} % Deixe o argumento vazio caso não haja
-%\publicacao{Publicação PPGEE 201/23} % Também imprime as informações no trabalho no topo da página da ficha catalográfica
+%\publicacao{Publicação PPGEE 201/23} % Também imprime as informações do trabalho no topo da página da ficha catalográfica
% ---
% ---
% Instituição
% ---
-\instituicao[Universidade de Brasília]{Faculdade de Tecnologia}{} % Use português mesmo que o trabalho seja em inglês
-%\instituicao[Universidade de Brasília]{Faculdade de Tecnologia}{Departamento de Engenharia Elétrica} % Caso queira incluir o departamento da unidade acadêmica
+%\instituicao[Universidade de Brasília]{Faculdade de Tecnologia}{} % Use português mesmo que o trabalho seja em inglês
+\instituicao[Universidade de Brasília]{Faculdade de Tecnologia}{Departamento de Engenharia Elétrica} % Caso queira incluir o departamento da unidade acadêmica
% ---
% ---
% Local e data da defesa
% ---
\local{Brasília}
-\dia{2}
-\mes{março}
+\dia{4}
+\mes{julho}
\ano{2024}
% ---
@@ -148,7 +148,7 @@
\membrodabancav{} % Deixe vazio se não tiver o quinto membro
\membrodabancavfuncao{Examinador externo}
% Comprimento da linha da assinatura (ajuste conforme necessidade)
-\setlength{\ABNTEXsignwidth}{9cm}
+\signlinewidth{9cm}
% ---
% ---
@@ -212,7 +212,7 @@ Agradecimentos do segundo autor.
% Primeiro autor
\begin{DedicatoriaAutorI}
-Este trabalho é dedicado às crianças adultas que, \\
+Este trabalho é dedicado às crianças adultas que,\\
quando pequenas, sonharam em se tornar cientistas.
\end{DedicatoriaAutorI}
@@ -334,6 +334,7 @@ Dedicatória do segundo autor.
% Referências bibliográficas
% ---
% Arquivo com as referências bibliográficas
+\bibhang{2.2em} % Recuo da margem esquerda da lista de referências
\bibliography{unbtex-example/referencias} % O estilo de citação é selecionado automaticamente
% ---
diff --git a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/anexo-b.tex b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/anexo-b.tex
index 63bad4c7b53..d482ac0000b 100644
--- a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/anexo-b.tex
+++ b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/anexo-b.tex
@@ -7,6 +7,9 @@ A \cpageref{marcaunb.1} foi extraída do \emph{manual de identidade visual}\foot
\cleardoublepage
\newcounter{includepdfpage} % para referenciar no texto páginas pdf incluídas
+\makepagestyle{simple}
+\makeevenhead{simple}{\footnotesize\thepage}{}{}
+\makeoddhead{simple}{}{}{\footnotesize\thepage}
\includepdf[
pages=-, % intervalo das páginas do arquivo pdf que serão incluídas
diff --git a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo2.tex b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo2.tex
index 46eed2b2bc3..1eb8ccc3b27 100644
--- a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo2.tex
+++ b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo2.tex
@@ -264,9 +264,7 @@ A \cref{sec:citacao} descreve o ambiente \texttt{citacao}, que pode receber como
A ficha catalográfica é um elemento pré-textual obrigatório para todos os trabalhos acadêmicos (teses, dissertações e trabalhos de conclusão de curso). No site da Biblioteca Central da UnB\footnote{\url{https://bce.unb.br/servicos/elaboracao-de-fichas-catalograficas/}} há mais informações a respeito. A classe UnB\TeX\ gera automaticamente a ficha catalográfica com as informações do trabalho, com opção de inclusão do código Cutter.
-A Tabela Cutter-Sanborn é uma codificação elaborada por Charles Ammi Cutter e, posteriormente, expandida por Kate F. Sanborn. Na Tabela Cutter-Sanborn é possível obter o código correspondente ao sobrenome do autor.
-
-Em vários sites da internet\footnote{\url{https://www.tabelacutter.com/}}\footnote{\url{https://cuttersonline.com.br/registrador-gratuito}} há ferramentas online para obtenção do código. Se o nome do primeiro autor do trabalho for, digamos, Carlos Lisboa, a entrada da ferramenta online deverá ser:
+A Tabela Cutter-Sanborn é uma codificação elaborada por Charles Ammi Cutter e, posteriormente, expandida por Kate F. Sanborn. Na Tabela Cutter-Sanborn é possível obter o código correspondente ao sobrenome do autor. Em vários sites da internet\footnote{\url{https://www.tabelacutter.com/}}\footnote{\url{https://cuttersonline.com.br/registrador-gratuito}} há ferramentas online para obtenção do código. Se o nome do primeiro autor do trabalho for, digamos, Carlos Lisboa, a entrada da ferramenta online deverá ser:
\begin{verbatim}
Lisboa, Carlos
\end{verbatim}
@@ -276,7 +274,7 @@ Nenhuma outra informação é necessária para gerar o código que, no caso dess
\end{verbatim}
Note que na ficha catalográfica gerada aparecerá \texttt{L769m}. A letra \textbf{L} maiúscula, correspondente à primeira letra do sobrenome \textbf{Lisboa}, é automaticamente adicionada na frente do número. A letra \textbf{m} minúscula, correspondente à primeira letra do título do trabalho (neste caso, \emph{Modelo de trabalho acadêmico com UnB\TeX}), é adicionada no final do número.
-Se seu nome for, por exemplo, Carlos de Souza, utilize
+Se o nome do autor for, por exemplo, Carlos de Souza, utilize
\begin{verbatim}
Souza, Carlos de
\end{verbatim}
@@ -289,12 +287,12 @@ como entrada da ferramenta online que gera o código Cutter. Caso não deseje im
\section{Inclusão de outros arquivos}\label{sec:include}
% ---
-É uma boa prática dividir o seu documento em diversos arquivos, e não apenas escrever tudo em um único. Esse recurso foi utilizado neste documento. Para incluir diferentes arquivos em um arquivo principal, de modo que cada arquivo incluído fique em uma página diferente, utilize o comando:
+É uma boa prática dividir o seu documento em diversos arquivos, e não apenas escrever tudo em um único. Para incluir diferentes arquivos em um arquivo principal, de modo que cada arquivo incluído fique em uma página diferente, utilize o comando:
\begin{verbatim}
\include{documento-a-ser-incluido} % sem a extensão .tex
\end{verbatim}
-Para incluir documentos sem que haja necessariamente quebra de páginas, utilize o comando:
+Para incluir documentos haver necessariamente quebra de páginas, utilize o comando:
\begin{verbatim}
\input{documento-a-ser-incluido} % sem a extensão .tex
\end{verbatim}
diff --git a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo3.tex b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo3.tex
index 30514e0f81f..676cedb21cd 100644
--- a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo3.tex
+++ b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo3.tex
@@ -136,7 +136,7 @@ O pacote \textsf{subfig} foi utilizado para inserir as \cref{fig:subfigura_circu
\caption{Figura com subfiguras}
\label{fig:subfiguras}
\subfloat[Primeira subfigura]{\label{fig:subfigura_circuito} \centering
- \includegraphics[scale=1]{circuito.pdf}}
+ \includegraphics[scale=1]{circuito.pdf}}
\subfloat[Segunda subfigura]{\label{fig:subfigura_grafico} \hspace{0.4em}
\centering \includegraphics[scale=1.2]{diodocurva.pdf}}
\end{figure}
@@ -175,15 +175,13 @@ Caso queira utilizar as mesmas fontes tipográficas do texto para escrever dentr
\label{fig:psgrag}
\end{figure}
-Crie no Overleaf um novo projeto que tenha o conteúdo do \cref{cod:tex} dentro de um arquivo \texttt{tex} nomeado, por exemplo, como \texttt{blockdiagram.tex}. No menu do Overleaf, altere o compilador de \texttt{pdfLaTeX} para \texttt{LaTeX} e defina o arquivo \texttt{blockdiagram.tex} como principal. Coloque o arquivo \texttt{blockdiagram.eps} dentro do projeto e compile. A saída gerada, corresponde à \cref{fig:psfrag1}, deve ser salva como \texttt{blockdiagram.pdf}. Este arquivo poderá ser carregado no projeto do texto do trabalho (TCC, dissertação ou tese) que você estiver escrevendo com o UnB\TeX\ (que usa o \texttt{pdfLaTeX} como compilador).
-
-\lstinputlisting[numbers=none,float,caption={\texttt{blockdiagram.tex}},label={cod:tex}]{unbtex-example/codigos/blockdiagram.tex}
-
-Observe na \cref{fig:psfrag2} que o ``\texttt{g}'' é substituído por ``$G(s)$'' na \cref{fig:psfrag1}. Para tal, o \cref{cod:tex} utiliza o seguinte comando do pacote \textsf{psfrag}:
+Crie no Overleaf um novo projeto que tenha o conteúdo do \cref{cod:tex} dentro de um arquivo \texttt{tex} nomeado, por exemplo, como \texttt{blockdiagram.tex}. No menu do Overleaf, altere o compilador de \texttt{pdfLaTeX} para \texttt{LaTeX} e defina o arquivo \texttt{blockdiagram.tex} como principal. Coloque o arquivo \texttt{blockdiagram.eps} dentro do projeto e compile. A saída gerada, corresponde à \cref{fig:psfrag1}, deve ser salva como \texttt{blockdiagram.pdf}. Este arquivo poderá ser carregado no projeto do texto do trabalho (TCC, dissertação ou tese) que você estiver escrevendo com o UnB\TeX\ (que usa o \texttt{pdfLaTeX} como compilador). Observe na \cref{fig:psfrag2} que o ``\texttt{g}'' é substituído por ``$G(s)$'' na \cref{fig:psfrag1}. Para tal, o \cref{cod:tex} utiliza o seguinte comando do pacote \textsf{psfrag}:
\begin{verbatim}
\psfrag{g}[c][c]{\footnotesize $G(s)$}
\end{verbatim}
+\lstinputlisting[numbers=none,float,caption={\texttt{blockdiagram.tex}},label={cod:tex}]{unbtex-example/codigos/blockdiagram.tex}
+
O pacote \textsf{psfrag} funciona apenas com o compilador \texttt{LaTeX}, o que torna a criação de um novo projeto no Overleaf uma boa solução. Este projeto poderá ser aproveitado para gerar outras figuras do documento principal. Para mais informações sobre o pacote, consulte seu manual\footnote{Disponível em \url{http://mirrors.ctan.org/macros/latex/contrib/psfrag/pfgguide.pdf}}.
Evite o uso de figuras no formato \texttt{eps} no documento principal. Documentos que usam a classe UnB\TeX\ precisam ser compilados pelo \texttt{pdfLaTeX}, que inicialmente converte os arquivos \texttt{eps} para o formato \texttt{pdf}, exigindo maior tempo de processamento. O projeto auxiliar (\cref{cod:tex}) usa a classe \texttt{article} e admite compilador \texttt{LaTeX}, que não necessita de etapas adicionais para processar códigos que chamam arquivos \texttt{eps}. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo4.tex b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo4.tex
index cb9577b192e..71c5eaf5c6c 100644
--- a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo4.tex
+++ b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/capitulo4.tex
@@ -1,5 +1,5 @@
% ----------------------------------------------------------
-\chapter{Ambientes}
+\chapter{Ambientes do UnB\TeX}
% ----------------------------------------------------------
A classe UnB\TeX\ disponibiliza alguns ``ambientes'', ou seja, caixas de texto com formatação especial para certos tipos de elementos, que podem ser automaticamente numerados (por exemplo, \cref{thm:WYSIWYG}, \cref{exc:in}, \cref{alg:NNMPC}, etc.). Esses ambientes foram adaptados a partir do modelo de \citeonline{Castro2019}.
@@ -51,7 +51,7 @@ O WYSIWYG (ou ``What You See Is What You Get - O que você vê é o formato fina
\section{Algoritmo}
-O \cref{alg:NNMPC} é um pseudo-código para obtenção de um controlador preditivo baseado em modelo e em redes neurais.
+O \cref{alg:NNMPC} é um exemplo de pseudo-código.
\begin{algorithm}[htb]
%\linespread{1.0}\selectfont % espaçamento entre as linhas do algoritmo
diff --git a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/referencias.bib b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/referencias.bib
index d2478284007..699d20461fe 100644
--- a/Master/texmf-dist/doc/latex/unbtex/unbtex-example/referencias.bib
+++ b/Master/texmf-dist/doc/latex/unbtex/unbtex-example/referencias.bib
@@ -12,7 +12,7 @@
pages = {342--351}}
@article{van86,
- author = {{van}, Gigch, John P. and Leo L. Pipino},
+ author = {John P. van Gigch and Leo L. Pipino},
journal = {Future Computing Systems},
number = {1},
pages = {71-97},
@@ -53,7 +53,7 @@
@inproceedings{martin1997,
address = {Rio de Janeiro},
- author = {Martin, Neto, L. and C. Bayer and J. Mielniczuk},
+ author = {L. Martin{ }Neto and C. Bayer and J. Mielniczuk},
booktitle = {Resumos do [...]},
conference-number = {26},
conference-year = {1997},
diff --git a/Master/texmf-dist/doc/latex/wrapstuff-doc-en/README.md b/Master/texmf-dist/doc/latex/wrapstuff-doc-en/README.md
new file mode 100644
index 00000000000..3aa62709da1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/wrapstuff-doc-en/README.md
@@ -0,0 +1,11 @@
+## Introduction
+
+English version of the wrapstuff package documentation
+
+## Author
+
+Siyu Wu 2401336502@qq.com
+
+## License
+
+LPPL v1.3c or later \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.pdf b/Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.pdf
new file mode 100644
index 00000000000..765387601db
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.tex b/Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.tex
new file mode 100644
index 00000000000..cd8599d7cd1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/wrapstuff-doc-en/wrapstuff-doc-en.tex
@@ -0,0 +1,264 @@
+\documentclass{l3doc}
+\usepackage{wrapstuff}
+\usepackage{graphicx}
+\usepackage{lipsum}
+\title{The \textsf{wrapstuff} package\thanks{Corresponding to version v0.3*
+ of the Chinese documentation.}}
+\author{Author: Qing Lee \\ Translator: Siyu Wu}
+\date{\today}
+\newcommand{\opt}[1]{\texttt{#1}}
+\ExplSyntaxOn
+\makeatletter
+\DeclareDocumentCommand \ADDSPECEIALKEY { m }
+ {
+ \cs_gset_eq:NN \@@_codedoc_names_typeset_save:
+ \__codedoc_names_typeset:
+ \cs_gset_protected:Npn \__codedoc_names_typeset:
+ {
+ \cs_gset_eq:NN \__codedoc_names_typeset:
+ \@@_codedoc_names_typeset_save:
+ \__codedoc_names_typeset:
+ #1 \\
+ }
+ }
+\makeatother
+\ExplSyntaxOff
+\begin{document}
+
+\maketitle
+
+\section{Basic Usage}
+
+The \pkg{wrapstuff} package provides another implementation
+of wrapping text around a figure.
+\pkg{wrapstuff} tries to integrate and extend the function
+of some similar packages such as \pkg{picinpar}, \pkg{floatflt},
+\pkg{wrapfig}, \pkg{cutwin} and \pkg{wrapfig2}.
+This package is compatible with \pkg{caption}, \pkg{float}
+and \pkg{floatrow}. And it tries to be compatible with display
+math and various kinds of \LaTeX{} list environments so that
+they can wrap figures and tables correctly.
+
+The implementation of \pkg{wrapstuff} depends on the paragraph
+hooks provided by \LaTeX{} 2021-06-01, and also depends on
+\LaTeX3 2022-04-10 or later version.
+
+\begin{function}{wrapstuff}
+ \begin{syntax}
+ \cs{begin}\{wrapstuff\}\oarg{options}
+ \meta{wrapped contents}
+ \cs{end}\{wrapstuff\}
+ \meta{main text}
+ \end{syntax}
+\end{function}
+
+\pkg{wrapstuff} only provides one environment called \env{wrapstuff},
+which will wrap text from the paragraph after this environment on.
+For example,
+
+\begin{verbatim}
+ \begin{wrapstuff}[c,top=1]
+ \includegraphics[width=\dimeval{\linewidth/3}]{example-image.pdf}
+ \end{wrapstuff}
+ \lipsum[1-2]
+\end{verbatim}
+
+\begin{wrapstuff}[c,top=1]
+ \includegraphics[width=\dimeval{\linewidth/3}]{example-image.pdf}
+\end{wrapstuff}
+\lipsum[1]
+
+\begin{function}{\wrapstuffset}
+ \begin{syntax}
+ \cs{wrapstuff}\marg{option list}
+ \end{syntax}
+ The options of \pkg{wrapstuff} can be set when invoking the package,
+ but they can also be set using \cs{wrapstuffset}.
+\end{function}
+
+\ADDSPECEIALKEY{\textrm{\meta{n}}}
+\begin{function}{top}
+ \begin{syntax}
+ top = \meta{non-negative integer}
+ \end{syntax}
+ sets the number of the line after which \pkg{wrapstuff} begins to wrap text.
+ \meta{n} is the abbreviation of setting \texttt{top} to \meta{n}.
+ The initial value is 0.
+\end{function}
+
+\begin{function}{width}
+ \begin{syntax}
+ width = \meta{width}
+ \end{syntax}
+ sets the width of wrapped contents. The initial value is 0pt,
+ which represents for the natural width.
+ At this time, the contents in the \env{wrapstuff} environment
+ can only have one line and users are not permitted to use
+ \cmd\\ to break line or \cs{par} to start new paragraph.
+ If one needs to break line or start a new paragraph in the environment,
+ he has to set proper value for \texttt{width}.
+\end{function}
+
+\begin{function}{height}
+ \begin{syntax}
+ height = \meta{height}
+ \end{syntax}
+ sets the height of the wrapped contents. The initial value is 0pt,
+ which represents for the natural height.
+\end{function}
+
+\begin{function}{lines}
+ \begin{syntax}
+ lines = \meta{positive integer}
+ \end{syntax}
+ sets the number of lines occupied by the wrapped contents.
+ The initial value is empty, which means that the number will
+ be calculated automatically.
+\end{function}
+
+\begin{function}{linewidth}
+ \begin{syntax}
+ linewidth = \meta{width}
+ \end{syntax}
+ sets the line width of the main text.
+ The initial value is \cs{linewidth} and typically it is unnecessary
+ to adjust it.
+\end{function}
+
+\begin{function}{l,r,c,i,o,ratio}
+ \begin{syntax}
+ l/r/c/i/o
+ ratio = \meta{real number}
+ \end{syntax}
+ These options set the position of the wrapped contents relative to
+ the main text. Options \opt{l/r/c/i/o} means left, right, center,
+ inner and outer respectively. The option \opt{ratio} sets the
+ ratio of the line width occupied by the main text on the left side
+ of the wrapped contents. One can set \opt{ratio} to any proper real number
+ between the interval $[0,1]$.
+ Options \opt{i/o} can be used together with \opt{ratio}.
+ The initial value is \opt{r}.
+\end{function}
+
+\begin{function}{column}
+ \begin{syntax}
+ column = \meta{true|false|par}
+ \end{syntax}
+ controls whether to display the main text around the wrapped contents
+ as two columns or not. Only when setting the option \opt{c}
+ or setting \opt{ratio} in $(0,1)$ this option has its effect.
+ \opt{false} means not displaying the main text in two columns
+ and \opt{par} means displaying the main text as two columns
+ but with per paragraph as a separate unit.
+\end{function}
+
+\begin{verbatim}
+ \def\lorem{%
+ Just then her head struck against the roof of the hall:
+ in fact she was now more than nine feet high, and she
+ at once took up the little golden key and hurried off
+ to the garden door.\par
+ Poor Alice! It was as much as she could do, lying down
+ on one side, to look through into the garden with one eye;
+ but to get through was more hopeless than ever:
+ she sat down and began to cry again.}
+
+ \begin{wrapstuff}[c,column=par]
+ \includegraphics[width=3cm]{example-image.pdf}
+ \end{wrapstuff}
+ \lorem
+
+ \begin{wrapstuff}[c]
+ \includegraphics[width=3cm]{example-image.pdf}
+ \end{wrapstuff}
+ \lorem
+
+ \begin{wrapstuff}[c,column=false]
+ \includegraphics[width=3cm]{example-image.pdf}
+ \end{wrapstuff}
+ \lorem
+\end{verbatim}
+
+\def\lorem{%
+Just then her head struck against the roof of the hall: in fact she was now more than nine feet high, and she at once took up the little golden key and hurried off to the garden door.\par
+Poor Alice! It was as much as she could do, lying down on one side, to look through into the garden with one eye; but to get through was more hopeless than ever: she sat down and began to cry again.}
+\begin{wrapstuff}[c,column=par]
+ \includegraphics[width=3cm]{example-image.pdf}
+\end{wrapstuff}
+\lorem
+
+\begin{wrapstuff}[c]
+ \includegraphics[width=3cm]{example-image.pdf}
+\end{wrapstuff}
+\lorem
+
+\begin{wrapstuff}[c,column=false]
+ \includegraphics[width=3cm]{example-image.pdf}
+\end{wrapstuff}
+\lorem
+
+\begin{function}{leftsep,rightsep,hsep}
+ \begin{syntax}
+ leftsep = \meta{length}
+ rightsep = \meta{length}
+ hsep = \meta{length}
+ \end{syntax}
+ set the left/right space between wrapped contents and main text.
+ The option \texttt{hsep} sets \texttt{leftsep} and \texttt{rightsep}
+ simultaneously. The initial value is 1em.
+\end{function}
+
+\begin{function}{abovesep,belowsep,vsep}
+ \begin{syntax}
+ abovesep = \meta{length}
+ belowsep = \meta{length}
+ vsep = \meta{length}
+ \end{syntax}
+ set the upper/lower space between wrapped contents and main text.
+ The option \texttt{vsep} sets \texttt{abovesep} and \texttt{belowsep}
+ simultaneously. The initial value is 0pt.
+\end{function}
+
+\begin{function}{hoffset}
+ \begin{syntax}
+ hoffset = \meta{length}
+ \end{syntax}
+ sets the length of the wrapped contents that extend beyond
+ the main text area. When \texttt{c} is used or \texttt{ratio}
+ is set between $(0,1)$, this option loses effect.
+ One special value \cs{width} is used to represent the total width
+ of wrapped contents and the corresponding spacing.
+ If setting \opt{hoffset} equals to \cs{width}, then
+ the wrapped contents are totally placed outside of the main text area.
+ The initial value is 0pt.
+\end{function}
+
+\begin{function}{voffset}
+ \begin{syntax}
+ voffset = \meta{length}
+ \end{syntax}
+ is used to adjust the vertical position of the wrapped contents.
+ The initial value is 0pt.
+\end{function}
+
+\begin{function}{type}
+ \begin{syntax}
+ type = \meta{float type}
+ \end{syntax}
+ sets the type of float of the wrapped contents.
+ The initial value is empty.
+ If one needs to use \cs{caption} in \env{wrapstuff},
+ then he has to set \opt{type} to \opt{figure} or \opt{table}
+ and set the value for \opt{width}.
+\end{function}
+
+\begin{function}{\wrapstuffclear}
+ If the number of lines in the current paragraph is not enough,
+ the effect of \pkg{wrapstuff} will continue to the next paragraph.
+ Sometimes it may cause some undesirable results,
+ in which case one could issue \cs{wrapstuffclear} to eliminate
+ the effect.
+\end{function}
+
+\PrintIndex
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/longmath/README b/Master/texmf-dist/doc/lualatex/longmath/README
index da1e5228912..5699c68b84c 100644
--- a/Master/texmf-dist/doc/lualatex/longmath/README
+++ b/Master/texmf-dist/doc/lualatex/longmath/README
@@ -23,16 +23,12 @@ A special environment is provided as well, which allows multi line
expressions to be placed inside a displayed equation and make TeX
do the line splitting and alignment.
-This is the first and in parts still experimental version. If anyone
-actually uses it, the author would be happy to receive bug reports,
-critics and suggestions.
-
(c) 2024 Hans-Jürgen Matschull [ hjm.tex@matschull.net ]
This work may be distributed and/or modified under the conditions
of the LaTeX Project Public License version 1.3 or later.
-The following files belong to the longmath package version 0.1:
+The following files belong to the longmath package version 1.0:
package and documentation: longmath.sty longmath.lua longmath-doc.pdf
diff --git a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.cls b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.cls
index 04ce8b2e3d7..6ff03fc0948 100644
--- a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.cls
+++ b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.cls
@@ -1,5 +1,5 @@
%%
-%% longmath-doc.cls is part of longmath version 0.1.
+%% longmath-doc.cls is part of longmath version 1.0.
%%
%% (c) 2024 Hans-Jürgen Matschull
%%
@@ -18,7 +18,7 @@
%% see README for a list of files belonging to longmath.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{longmath-doc}[2024/03/25]
+\ProvidesClass{longmath-doc}[2024/07/04]
\LoadClass[a4paper,10pt]{scrartcl}
\RequirePackage{geometry}
\geometry{hmargin=20mm,vmargin={20mm,30mm}}
diff --git a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.lua b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.lua
index e334cc2e573..56da1ef4d06 100644
--- a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.lua
+++ b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.lua
@@ -1,5 +1,5 @@
--
--- longmath-doc.lua is part of longmath version 0.1.
+-- longmath-doc.lua is part of longmath version 1.0.
--
-- (c) 2024 Hans-Jürgen Matschull
--
diff --git a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.pdf b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.pdf
index 2d82bd0a3f8..84093de4363 100644
--- a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.pdf
+++ b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.tex b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.tex
index 8e64064d87e..516e1d22cf8 100644
--- a/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.tex
+++ b/Master/texmf-dist/doc/lualatex/longmath/longmath-doc.tex
@@ -1,5 +1,5 @@
%%
-%% longmath-doc.tex is part of longmath version 0.1.
+%% longmath-doc.tex is part of longmath version 1.0.
%%
%% (c) 2024 Hans-Jürgen Matschull
%%
@@ -46,10 +46,6 @@ or across the whole document.
A special environment is provided as well, which allows multi line
expressions to be placed inside a displayed equation and make \TeX\
do the line splitting and alignment.
-
-This is the first and in parts still experimental version. If anyone
-actually uses it, the author would be happy to receive bug reports,
-critics and suggestions.
}
\newcommand{\icol}[1]{% inline column vector
@@ -116,10 +112,10 @@ critics and suggestions.
\node[color=yellow!85!black,rotate=-17,scale=1.8] at (-0.7,0)
{$\displaystyle \mathcal{L} = \begin{longmath}[t]{110mm+30mm} \lagrange \end{longmath}$};
\node[txt,scale=1.8] at (0,7.2) {\Huge\textbf{\p{longmath}}};
- \node[txt,scale=1.2] at (0,5.4) {\Large Documentation for Version 0.1};
+ \node[txt,scale=1.2] at (0,5.4) {\Large Documentation for Version 1.0};
\node[txt,scale=1.2] at (0,4.0) {\large Hans-Jürgen Matschull};
\node[txt,scale=1.2] at (0,3.3) {\texttt{hjm.tex@matschull.net}};
- \node[txt,scale=1.2] at (0,1.7) {\texttt{2024/03/25}};
+ \node[txt,scale=1.2] at (0,1.7) {\texttt{2024/07/04}};
\node[txt,scale=1.0] at (0,-3) {\begin{minipage}{130mm}\parskip 1.3ex \intro\end{minipage}};
\end{tikzpicture}
\end{center}
@@ -130,7 +126,7 @@ critics and suggestions.
\lineskip 2pt plus 1pt
\lineskiplimit 2pt
-\newpage
+\newpage
\section{Delimiters}
\label{delims}
@@ -142,6 +138,8 @@ The \p{longmath} package provides ``long'' versions of the "\left" and "\right"
\comm{"\rright" [°scale°] °delimiter°} marks the end of a delimiter group and inserts a closing °delimiter°.
The optional °scale° argument will be explained below. The °delimiter° can be anything that is also accepted by "\left" and "\right", including a dot representing an invisible or null delimiter, any character with a "\delcode", or an explicit "\delimiter" or "\Udelimiter". If you want to use the \p{longmath} package with existing documents, or just stick to the familiar notation, and provided that this does not cause conflicts with other packages manipulating the original primitives, it is even save to say "\let\left\lleft" and "\let\right\rright".
+
+Here is a simple example. Of course, as \LaTeX\ authors, we should better use some math environment instead of "$$", but let's stick to them here just to save some space, and indicate that everything should work regardless of what environment we use.
\begin{code}
The Sellmann-Yokuzi contribution to the
Johansson Entropy is given by
@@ -667,61 +665,51 @@ If the nesting level exceeds the number of sample pairs provided, the outermost
D + \frac{ \lleft* X + Y \rright* × Z }{ W }
\rright* · E \rright* · F \rright* · G \rright* $$
\end{exec}
-If variable delimiters are mixed with explicit delimiters, there is an interaction between them. If you use one of the pairs from the collection, it is treated as if it was inserted automatically. Any enclosing bracket will be the next one from the collection. Let's define a larger collection to demonstrate this.
+Automatic delimiters can be mixed with explicit delimiters. When the nesting level is determined, only the "*" delimiters are taken into account. To demonstrate this, let's choose a different collection and set a negative value for "\delimitershortfall". This makes the bracket size increase linearly with the nesting level.
\autodelimiters{ < \lceil \lfloor [ \{ ( * ) \} ] \rfloor \rceil > }
\begin{code*}
- \autodelimiters{ < \lceil \lfloor [ \{ ( * ) \} ] \rfloor \rceil > }
+ \delimitershortfall -2pt
+ \autodelimiters{ < \lceil \lfloor [ \{ ( * ) \} ] \rfloor \rceil > }
\end{code*}
-This is what we get with automatic brackets only. The numbers indicate the actually used level. A negative value for "\delimitershortfall" makes the bracket size increase linearly with the nesting level.
+This is what we get with automatic brackets only. The numbers indicate the actually used level.
\begin{code}
- \delimitershortfall -2pt
$$ \lleft* 5 + \lleft* 4 + \lleft* 3
+ \lleft* 2 + \lleft* 1 + A \rright* + B \rright*
+ C \rright* + D \rright* + E \rright* $$
\end{code}
-\begin{exec}
+\begin{exec}\:
\delimitershortfall -2pt
$$ \lleft* 5 + \lleft* 4 + \lleft* 3
+ \lleft* 2 + \lleft* 1 + A \rright* + B \rright*
+ C \rright* + D \rright* + E \rright* $$
\end{exec}
-If we replace the second level by explicit square brackets, these are identified as the third level, and the counting continues from there.
+If we replace the second level by explicit square brackets, the counting continues at the third level.
\begin{code}
- $$ \lleft* 6 + \lleft* 5 + \lleft* 4
- + \lleft[ 3 + \lleft* 1 + A \rright* + B \rright]
+ $$ \lleft* 4 + \lleft* 3 + \lleft* 2
+ + \lleft[ 0 + \lleft* 1 + A \rright* + B \rright]
+ C \rright* + D \rright* + E \rright* $$
\end{code}
\begin{exec}\:
\delimitershortfall -2pt
- $$ \lleft* 6 + \lleft* 5 + \lleft* 4
- + \lleft[ 3 + \lleft* 1 + A \rright* + B \rright]
+ $$ \lleft* 4 + \lleft* 3 + \lleft* 2
+ + \lleft[ 0 + \lleft* 1 + A \rright* + B \rright]
+ C \rright* + D \rright* + E \rright* $$
\end{exec}
-And here the counting restarts further out.
-\begin{code}
- $$ \lleft* 2 + \lleft( 1 + \lleft* 3
- + \lleft* 2 + \lleft* 1 + A \rright* + B \rright*
- + C \rright* + D \rright) + E \rright* $$
-\end{code}
-\begin{exec}\:
- \delimitershortfall -2pt
- $$ \lleft* 2 + \lleft( 1 + \lleft* 3
- + \lleft* 2 + \lleft* 1 + A \rright* + B \rright*
- + C \rright* + D \rright) + E \rright* $$
-\end{exec}
-A pair that is not in the collection is ignored and the counting continues at the next level.
+And here two levels are skipped.
\begin{code}
- $$ \lleft* 4 + \lleft* 3 + \lleft\uparrow 0
- + \lleft* 2 + \lleft* 1 + A \rright* + B \rright*
- + C \rright\downarrow + D \rright* + E \rright* $$
+ $$ \lleft* 3 + \lleft| 0 + \lleft* 2
+ + \lleft[ 0 + \lleft* 1 + A \rright* + B \rright]
+ + C \rright* + D \rright| + E \rright* $$
\end{code}
\begin{exec}\:
\delimitershortfall -2pt
- $$ \lleft* 4 + \lleft* 3 + \lleft\uparrow 0
- + \lleft* 2 + \lleft* 1 + A \rright* + B \rright*
- + C \rright\downarrow + D \rright* + E \rright* $$
+ $$ \lleft* 3 + \lleft| 0 + \lleft* 2
+ + \lleft[ 0 + \lleft* 1 + A \rright* + B \rright]
+ + C \rright* + D \rright| + E \rright* $$
\end{exec}
-If variable delimiters are tagged and aligned, this also applies to the chosen delimiter from the collection. Here is a typical example. Without tagging, we get this.
+In the first experimental version of this packages, there was an interaction between automatic and explicit brackets. This has been removed. It didn't work well with linked groups, and it caused problems with bracktes used for purposes other than grouping, like function arguments, binomial coeffiecients etc.
+
+If automatic delimiters are tagged and aligned, this also applies to the chosen delimiter from the collection. Here is a typical example. Without tagging, we get this.
\begin{code}
$$ \lleft * \frac{ n+1 }{ n^2 } \rright * ^2
+ \lleft * \frac{ n }{ \lleft * n - 1 \rright *^2 } %%%
@@ -743,7 +731,7 @@ If the outer brackets are aligned, both become second level brackets.
+ \lleft {qx} * \frac{ n }{ \lleft * n - 1 \rright *^2}
\rright * ^2 $$
\end{exec}
-As a last challenge, let's consider the array from the previous section with a slight modification. If we replace all brackets with variable delimiters, but do not link the cells, we get this.
+As a last challenge, let's consider the array from the previous section with a slight modification. If we replace all brackets with automatic delimiters, but do not link the cells, we get this.
\begin{code}
$$ \begin{array}{dsdsdsd}
\lleft * Z & - & \sum_k A & × &
@@ -882,7 +870,7 @@ To make this look a bit nicer, you can add some extra space to the width of the
$$ \lleft[ \begin{longmath}[c]{0.33+0.07}
\polyA
\end{longmath} \rright] =
- \lleft[ \begin{longmath}[c]{0.33+0.0.7}
+ \lleft[ \begin{longmath}[c]{0.33+0.07}
\lleft( \polyB \rright) \cdot %%%
\lleft( \polyC \rright)
\end{longmath} \rright] $$
diff --git a/Master/texmf-dist/doc/lualatex/tango/README b/Master/texmf-dist/doc/lualatex/tango/README
new file mode 100644
index 00000000000..014ae456a22
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/README
@@ -0,0 +1,42 @@
+Tango is a LaTeX document class for use by mathematics teachers. It requires lualatex, some LaTeX packages (see the complete documentation for details), and a recent version of LaTeX (see paragraph 4 below).
+
+Author: Michel Bovani <Michel.Bovani@icloud.com>
+Tango Web Page: https://tango.mathriochka.net
+
+1 Versions history
+0.8.0 (2024-07-17) This version
+New: Language complete support for
+french, english, british, american, canadian, australian, newzealand, german, ngerman, naustrian, nswissgerman, italian, spanish.
+
+0.7.2 (2024-07-12)
+New in this version
+• correction of the countername in subparagraph definition for titlesec.
+• fix incorrect vertical space in the \exo command.
+
+0.7.1 First release (2024-07-08)
+
+2 License
+Tango is released under Latex public project licence (LPPL), version 1.3c
+See https://www.latex-project.org/lppl/lppl-1-3c/
+
+3 Installation
+Just put the tango.cls file in a latex directory of a texmf tree, for example:
+TEXMF/tex/lualatex/tango/tango.cls
+
+4 Usage
+\documentclass[<options>]{tango}
+The tango document class requires recent versions of LaTeX and lualatex. At my home it runs on TeXLive 2024, TeXLive 2023 and on the last update of TeXlive 2022.
+
+5 About examples
+Example files are provided for testing the tango document class and for learning how to adapt margins, headings &Co.
+
+The files to typeset are:
+
+book-mathematics.tex
+handout-euler.tex
+handout-polynomes-deg2.tex
+schoolwork.tex
+candide.tex (the result is best in the two-pages mode of your pdf viewer).
+
+6 Internet website (new french only for now)
+https://tango.mathriochka.net \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/Ch-1-15.tex b/Master/texmf-dist/doc/lualatex/tango/examples/Ch-1-15.tex
new file mode 100644
index 00000000000..4f3d7984d14
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/Ch-1-15.tex
@@ -0,0 +1,1312 @@
+\chapter[Comment \bname{Candide} fut élevé…]
+{Comment \bname{Candide} fut élevé dans un\\ beau château,\\ et comment il fut
+chassé d’icelui}
+
+
+\lettrine{I}{l y avait} en \bname{Westphalie}, dans le château de M.~le baron de
+Thunder-ten-tronckh, un jeune garçon à qui la nature avait donné les
+mœurs les plus douces. Sa physionomie annonçait son âme. Il avait le
+jugement assez droit, avec l’esprit le plus simple; c’est, je crois,
+pour cette raison qu’on le nommait \bname{Candide}. Les anciens domestiques de
+la maison soupçonnaient qu’il était fils de la sœur de M.~le
+baron et d’un bon et honnête gentilhomme du voisinage, que cette
+demoiselle ne voulut jamais épouser parce qu’il n’avait pu prouver que
+soixante et onze quartiers, et que le reste de son arbre généalogique
+avait été perdu par l’injure du temps.
+
+M. le baron était un des plus puissants seigneurs de la
+\bname{Westphalie}, car son château avait une porte et des fenêtres. Sa grande
+salle même était ornée d’une tapisserie. Tous les chiens de ses
+basses-cours composaient une meute dans le besoin; ses palefreniers
+étaient ses piqueurs; le vicaire du village était son grand-aumônier.
+Ils l’appelaient tous \bname{Monseigneur}, et ils riaient quand il faisait des
+contes.
+
+M\up{me} la baronne, qui pesait environ trois cent cinquante livres,
+s’attirait par là une très grande considération, et faisait les honneurs
+de la maison avec une dignité qui la rendait encore plus respectable.
+Sa fille \bname{Cunégonde}, âgée de dix-sept ans, était haute en couleur,
+fraîche, grasse, appétissante. Le fils du baron paraissait en tout
+digne de son père. Le précepteur \bname{Pangloss} était l’oracle de la
+maison, et le petit \bname{Candide} écoutait ses leçons avec toute la bonne foi
+de son âge et de son caractère.
+
+
+
+
+\bname{Pangloss} enseignait la métaphysico-théologo-cosmo\-lo\-ni\-go\-logie. Il
+prouvait admirablement qu’il n’y a point d’effet sans cause, et que,
+dans ce meilleur des mondes possibles, le château de monseigneur le
+baron était le plus beau des châteaux, et madame la meilleure des
+baronnes possibles.
+
+
+
+\frquote{Il est démontré, disait-il, que les choses ne peuvent être autrement;
+car tout étant fait pour une fin, tout est nécessairement pour la
+meilleure fin. Remarquez bien que les nez ont été faits pour porter des
+lunettes; aussi avons-nous des lunettes. Les jambes sont visiblement
+instituées pour être chaussées, et nous avons des chausses. Les pierres
+ont été formées pour être taillées et pour en faire des châteaux; aussi
+monseigneur a un très beau château: le plus grand baron de la province
+doit être le mieux logé; et les cochons étant faits pour être mangés,
+nous mangeons du porc toute l’année: par conséquent, ceux qui ont
+avancé que tout est bien ont dit une sottise; il fallait dire que tout
+est au mieux.}
+
+
+
+\bname{Candide} écoutait attentivement, et croyait innocemment; car il trouvait
+M\up{lle}~\bname{Cunégonde} extrêmement belle, quoiqu’il ne prît jamais la
+hardiesse de le lui dire. Il concluait qu’après le bonheur d’être né
+baron de Thunder-ten-tronckh, le second degré de bonheur était d’être
+M\up{lle}~\bname{Cunégonde}; le troisième, de la voir tous les jours; et le
+quatrième, d’entendre maître \bname{Pangloss}, le plus grand philosophe de la
+province, et par conséquent de toute la terre.
+
+
+Un jour \bname{Cunégonde}, en se promenant auprès du château, dans le petit
+bois qu’on appelait \emph{parc}, vit entre des broussailes le docteur
+\bname{Pangloss} qui donnait une leçon de physique expérimentale à la femme de
+chambre de sa mère, petite brune très jolie et très docile. Comme
+M\up{lle}~\bname{Cunégonde} avait beaucoup de dispositions pour les sciences,
+elle observa, sans souffler, les expériences réitérées dont elle fut
+témoin; elle vit clairement la raison suffisante du docteur, les effets
+et les causes, et s’en retourna tout agitée, toute pensive, toute
+remplie du désir d’être savante, songeant qu’elle pourrait bien être la
+raison suffisante du jeune \bname{Candide},\linebreak qui pouvait aussi être la sienne.
+
+Elle rencontra \bname{Candide} en revenant au château, et rougit: \bname{Candide}
+rougit aussi. Elle lui dit bonjour d’une voix entrecoupée; et \bname{Candide}
+lui parla sans savoir ce qu’il disait. Le lendemain, après le dîner,
+comme on sortait de table, \bname{Cunégonde} et \bname{Candide} se trouvèrent derrière
+un paravent; \bname{Cunégonde} laissa tomber son mouchoir, \bname{Candide} le ramassa;
+elle lui prit innocemment la main; le jeune homme baisa innocemment la
+main de la jeune demoiselle avec une vivacité, une sensibilité, une
+grâce toute particulière; leurs bouches se rencontrèrent, leurs yeux
+s’enflammèrent, leurs genoux tremblèrent, leurs mains s’égarèrent.
+M.~le baron de Thunder-ten-tronckh passa auprès du paravent, et voyant
+cette cause et cet effet, chassa \bname{Candide} du château à grands coups de
+pied dans le derrière. \bname{Cunégonde} s’évanouit: elle fut souffletée par
+M\up{me}~la baronne dès qu’elle fut revenue à elle-même; et tout fut
+consterné dans le plus beau et le plus agréable des châteaux possibles.
+
+
+
+
+\chapter{Ce que devint \bname{Candide} parmi les Bulgares}
+
+
+\lettrine{C}{andide}, chassé du paradis terrestre, marcha longtemps sans savoir où,
+pleurant, levant les yeux au ciel, les tournant souvent vers le plus
+beau des châteaux qui renfermait la plus belle des baronnettes; il se
+coucha sans souper au milieu des champs entre deux sillons; la neige
+tombait à gros flocons. \bname{Candide}, tout transi, se traîna le lendemain
+vers la ville voisine, qui s’appelle Valdberghoff-trarbk-dikdorff,
+n’ayant point d’argent, mourant de faim et de lassitude. Il s’arrêta
+tristement à la porte d’un cabaret. Deux hommes habillés de bleu le
+remarquèrent: «Camarade, dit l’un, voilà un jeune homme très bien fait,
+et qui a la taille requise.» Ils s’avancèrent vers \bname{Candide} et le
+prièrent à dîner très civilement. «Messieurs, leur dit \bname{Candide} avec une
+modestie charmante, vous me faites beaucoup d’honneur, mais je n’ai pas
+de quoi payer mon écot. — Ah! monsieur, lui dit un des bleus, les
+personnes de votre figure et de votre mérite ne paient jamais rien:
+n’avez-vous pas cinq pieds cinq pouces de haut? — Oui, messieurs, c’est
+ma taille, dit-il en faisant la révérence. — Ah! monsieur, mettez-vous à
+table; non seulement nous vous défraierons, mais nous ne souffrirons
+jamais qu’un homme comme vous manque d’argent; les hommes ne sont faits
+que pour se secourir les uns les autres. — Vous avez raison, dit \bname{Candide};
+c’est ce que M. \bname{Pangloss} m’a toujours dit, et je vois bien que tout est
+au mieux.» On le prie d’accepter quelques écus, il les prend et veut
+faire son billet; on n’en veut point, on se met à table. «N’aimez-vous
+pas tendrement?… — Oh! oui, répond-il, j’aime tendrement M\up{lle}~\bname{Cunégonde}. — Non, dit l’un de ces messieurs, nous vous demandons si vous
+n’aimez pas tendrement le roi des Bulgares? — Point du tout, dit-il, car
+je ne l’ai jamais vu. — Comment! c’est le plus charmant des rois, et il
+faut boire à sa santé. — Oh! très volontiers, messieurs.» Et il boit. «C’en
+est assez, lui dit-on, vous voilà l’appui, le soutien, le défenseur, le
+héros des Bulgares; votre fortune est faite, et votre gloire est
+assurée.» On lui met sur-le-champ les fers aux pieds, et on le mène au
+régiment. On le fait tourner à droite, à gauche, hausser la baguette,
+remettre la baguette, coucher en joue, tirer, doubler le pas, et on lui
+donne trente coups de bâton; le lendemain, il fait l’exercice un peu
+moins mal, et il ne reçoit que vingt coups; le surlendemain, on ne lui
+en donne que dix, et il est regardé par ses camarades comme un prodige.
+
+
+\bname{Candide}, tout stupéfait, ne démêlait pas encore trop bien comment il
+était un héros. Il s’avisa un beau jour de printemps de s’aller
+promener, marchant tout droit devant lui, croyant que c’était un
+privilège de l’espèce humaine, comme de l’espèce animale, de se servir
+de ses jambes à son plaisir. Il n’eut pas fait deux lieues que voilà
+quatre autres héros de six pieds qui l’atteignent, qui le lient, qui le
+mènent dans un cachot. On lui demanda juridiquement ce qu’il aimait le
+mieux d’être fustigé trente-six fois par tout le régiment, ou de
+recevoir à-la-fois douze balles de plomb dans la cervelle. Il eut beau
+dire que les volontés sont libres, et qu’il ne voulait ni l’un ni
+l’autre, il fallut faire un choix; il se détermina, en vertu du don de
+Dieu qu’on nomme \textit{liberté}, à passer trente-six fois par les baguettes;
+il essuya deux promenades. Le régiment était composé de deux mille
+hommes; cela lui composa quatre mille coups de baguette, qui, depuis la
+nuque du cou jusqu’au cul, lui découvrirent les muscles et les nerfs.
+Comme on allait procéder à la troisième course, \bname{Candide}, n’en pouvant
+plus, demanda en grâce qu’on voulût bien avoir la bonté de lui casser
+la tête; il obtint cette faveur; on lui bande les yeux; on le fait
+mettre à genoux. Le roi des Bulgares passe dans ce moment, s’informe du
+crime du patient; et comme ce roi avait un grand génie, il comprit, par
+tout ce qu’il apprit de \bname{Candide}, que c’était un jeune métaphysicien
+fort ignorant des choses de ce monde, et il lui accorda sa grâce avec
+une clémence qui sera louée dans tous les journaux et dans tous les
+siècles. Un brave chirurgien guérit \bname{Candide} en trois semaines avec les
+émollients enseignés par \bname{Dioscoride}. Il avait déjà un peu de peau et
+pouvait marcher, quand le roi des Bulgares livra bataille au roi des
+Abares.
+
+
+
+\chapter[Comment \bname{Candide} se sauva…]{Comment \bname{Candide} se sauva d’entre\\ les Bulgares, et ce qu’il devint}
+
+
+\lettrine{R}{ien} n’était si beau, si leste, si brillant, si bien ordonné que les
+deux armées. Les trompettes, les fifres, les hautbois, les tambours,
+les canons, formaient une harmonie telle qu’il n’y en eut jamais en
+enfer. Les canons renversèrent d’abord à peu près six mille hommes de
+chaque côté; ensuite la mousqueterie ôta du meilleur des mondes environ
+neuf à dix mille coquins qui en infectaient la surface. La baïonnette
+fut aussi la raison suffisante de la mort de quelques milliers
+d’hommes. Le tout pouvait bien se monter à une trentaine de mille âmes.
+\bname{Candide}, qui tremblait comme un philosophe, se cacha du mieux qu’il put
+pendant cette boucherie héroïque.
+
+Enfin, tandis que les deux rois faisaient chanter des \textit{Te Deum}, chacun
+dans son camp, il prit le parti d’aller raisonner ailleurs des effets
+et des causes. Il passa par-dessus des tas de morts et de mourants, et
+gagna d’abord un village voisin; il était en cendres: c’était un
+village abare que les Bulgares avaient brûlé, selon les lois du droit
+public. Ici des vieillards criblés de coups regardaient mourir leurs
+femmes égorgées, qui tenaient leurs enfants à leurs mamelles
+sanglantes; là des filles éventrées après avoir assouvi les besoins
+naturels de quelques héros, rendaient les derniers soupirs; d’autres à
+demi brûlées criaient qu’on achevât de leur donner la mort. Des
+cervelles étaient répandues sur la terre à côté de bras et de jambes
+\bname{coupés}.
+
+\bname{Candide} s’enfuit au plus vite dans un autre village: il appartenait à
+des Bulgares, et les héros abares l’avaient traité de même. \bname{Candide},
+toujours marchant sur des membres palpitants ou à travers des ruines,
+arriva enfin hors du théâtre de la guerre, portant quelques petites
+provisions dans son bissac, et n’oubliant jamais M\up{lle}~\bname{Cunégonde}. Ses provisions lui manquèrent quand il fut en \bname{Hollande}; mais
+ayant entendu dire que tout le monde était riche dans ce pays-là, et
+qu’on y était chrétien, il ne douta pas qu’on ne le traitât aussi bien
+qu’il l’avait été dans le château de M.~le baron, avant qu’il en eût
+été chassé pour les beaux yeux de M\up{lle}~\bname{Cunégonde}.
+
+Il demanda l’aumône à plusieurs graves personnages, qui lui répondirent
+tous que, s’il continuait à faire ce métier, on l’enfermerait dans une
+maison de correction pour lui apprendre à vivre.
+
+Il s’adressa ensuite à un homme qui venait de parler tout seul une
+heure de suite sur la charité dans une grande assemblée. Cet orateur le
+regardant de travers lui dit: «Que venez-vous faire ici? y êtes-vous
+pour la bonne cause? — Il n’y a point d’effet sans cause, répondit
+modestement \bname{Candide}; tout est enchaîné nécessairement et arrangé pour
+le mieux. Il a fallu que je fusse chassé d’auprès de M\up{lle}~\bname{Cunégonde}, que j’aie passé par les baguettes, et il faut que je demande
+mon pain, jusqu’à ce que je puisse en gagner; tout cela ne pouvait être
+autrement. — Mon ami, lui dit l’orateur, croyez-vous que le pape soit
+l’antechrist? — Je ne l’avais pas encore entendu dire, répondit \bname{Candide}:
+mais qu’il le soit, ou qu’il ne le soit pas, je manque de pain. — Tu ne
+mérites pas d’en manger, dit l’autre: va, coquin, va, misérable, ne
+m’approche de ta vie.» La femme de l’orateur ayant mis la tête à la
+fenêtre, et avisant un homme qui doutait que le pape fût antechrist,
+lui répandit sur le chef un plein… Ô ciel! à quel excès se porte le
+zèle de la religion dans les dames!
+
+Un homme qui n’avait point été baptisé, un bon anabaptiste, nommé
+Jacques, vit la manière cruelle et
+ignominieuse dont on traitait ainsi
+un de ses frères, un être à deux pieds sans plumes, qui avait une âme;
+il l’amena chez lui, le nettoya, lui donna du pain et de la bière, lui
+fit présent de deux florins, et voulut même lui apprendre à travailler
+dans ses manufactures aux étoffes de Perse qu’on fabrique en \bname{Hollande}.
+\bname{Candide} se prosternant presque devant lui, s’écriait: «Maître \bname{Pangloss}
+me l’avait bien dit que tout est au mieux dans ce monde, car je suis
+infiniment plus touché de votre extrême générosité que de la dureté de
+ce monsieur à manteau noir, et de madame son épouse.»
+
+Le lendemain, en se promenant, il rencontra un gueux tout couvert de
+pustules, les yeux morts, le bout du nez rongé, la bouche de travers,
+les dents noires, et parlant de la gorge, tourmenté d’une toux
+violente, et crachant une dent à chaque effort.
+
+
+
+
+
+\chapter[Comment \bname{Candide} rencontra…]{Comment \bname{Candide} rencontra son ancien maître de\\ philosophie, le docteur
+\bname{Pangloss}, et ce qui en advint}
+
+
+\lettrine{C}{andide}, plus ému encore de compassion que d’horreur, donna à cet
+épouvantable gueux les deux florins qu’il avait reçus de son honnête
+anabaptiste Jacques. \textls[-10]{Le fantôme le regarda fixement, versa des larmes,
+et sauta à son cou. \bname{Candide} effrayé recule. «Hélas! dit le misérable à
+l’autre misérable, ne reconnaissez-vous plus votre cher \bname{Pangloss}?
+— Qu’entends-je? vous, mon cher maître! vous, dans cet état horrible!
+Quel malheur vous est-il donc arrivé? Pourquoi n’êtes-vous plus dans le
+plus beau des châteaux? qu’est devenue M\up{lle}~\bname{Cunégonde}, la perle
+des filles, le chef-d’œuvre de la nature? — Je n’en peux plus, dit
+\bname{Pangloss}.» Aussitôt \bname{Candide} le mena dans l’étable de l’anabaptiste, où
+il lui fit manger un peu de pain; et quand \bname{Pangloss} fut refait: «Eh
+bien! lui dit-il, \bname{Cunégonde}? — Elle est morte, reprit l’autre.»} \bname{Candide}
+s’évanouit à ce mot: son ami rappela ses sens avec un peu de mauvais
+vinaigre qui se trouva par hasard dans l’étable. \bname{Candide} rouvre les
+yeux. «\bname{Cunégonde} est morte! Ah! meilleur des mondes, où êtes-vous? Mais
+de quelle maladie est-elle morte? ne serait-ce point de m’avoir vu
+chasser du beau château de monsieur son père à grands coups de pied?
+— Non, dit \bname{Pangloss}, elle a été éventrée par des soldats bulgares, après
+avoir été violée autant qu’on peut l’être; ils ont cassé la tête à
+M. le baron qui voulait la défendre; M\up{me}~la baronne a été
+coupée en morceaux; mon pauvre pupille traité précisément comme sa
+sœur; et quant au château, il n’est pas resté pierre sur pierre, pas
+une grange, pas un mouton, pas un canard, pas un arbre; mais nous avons
+été bien vengés, car les Abares en ont fait autant dans une baronnie
+voisine qui appartenait à un seigneur bulgare.»
+
+À ce discours, \bname{Candide} s’évanouit encore; mais revenu à soi, et ayant
+dit tout ce qu’il devait dire, il s’enquit de la cause et de l’effet,
+et de la raison suffisante qui avait mis \bname{Pangloss} dans un si piteux
+état. «Hélas! dit l’autre, c’est l’amour: l’amour, le consolateur du
+genre humain, le conservateur de l’univers, l’âme de tous les êtres
+sensibles, le tendre amour. — Hélas! dit \bname{Candide}, je l’ai connu cet
+amour, ce souverain des cœurs, cette âme de notre âme; il ne m’a
+jamais valu qu’un baiser et vingt coups de pied au cul. Comment cette
+belle cause a-t-elle pu produire en vous un effet si abominable?»
+
+\bname{Pangloss} répondit en ces termes: «Ô mon cher \bname{Candide}! vous avez connu
+\bname{Paquette}, cette jolie suivante de notre auguste baronne: j’ai goûté
+dans ses bras les délices du paradis, qui ont produit ces tourments
+d’enfer dont vous me voyez dévoré; elle en était infectée, elle en est
+peut-être morte. \bname{Paquette} tenait ce présent d’un cordelier très savant
+qui avait remonté à la source, car il l’avait eu d’une vieille
+comtesse, qui l’avait reçu d’un capitaine de cavalerie, qui le devait à
+une marquise, qui le tenait d’un page, qui l’avait reçu d’un jésuite,
+qui, étant novice, l’avait eu en droite ligne d’un des compagnons de
+Christophe Colomb. Pour moi, je ne le donnerai à personne, car je me
+meurs.
+
+
+— Ô \bname{Pangloss}! s’écria \bname{Candide}, voilà une étrange généalogie! n’est-ce pas
+le diable qui en fut la souche? — Point du tout, répliqua ce grand homme;
+c’était une chose indispensable dans le meilleur des mondes, un
+ingrédient nécessaire; car si \bname{Colomb} n’avait pas attrapé dans une île
+de \mbox{l’Amérique} cette maladie qui empoisonne la source de la
+génération,
+ qui souvent même empêche la génération, et qui est
+évidemment l’opposé du grand but de la nature, nous n’aurions ni le
+chocolat ni la cochenille; il faut encore observer que
+jusqu’aujourd’hui, dans notre continent, cette maladie nous est
+particulière, comme la controverse. Les \bname{Turcs}, les \bname{Indiens}, les
+\bname{Persans}, les \bname{Chinois}, les \bname{Siamois}, les \bname{Japonais}, ne la connaissent pas
+encore; mais il y a une raison suffisante pour qu’ils la connaissent à
+leur tour dans quelques siècles. En attendant elle a fait un
+merveilleux progrès parmi nous, et surtout dans ces grandes armées
+composées d’honnêtes stipendiaires bien élevés, qui décident du destin
+des états; on peut assurer que, quand trente mille hommes combattent en
+bataille rangée contre des troupes égales en nombre, il y a environ
+vingt mille vérolés de chaque côté.
+
+— Voilà qui est admirable, dit \bname{Candide}; mais il faut vous faire guérir.
+— Et comment le puis-je? dit \bname{Pangloss}; je n’ai pas le sou, mon ami, et
+dans toute l’étendue de ce globe on ne peut ni se faire saigner, ni
+prendre un lavement sans payer, ou sans qu’il y ait quelqu’un qui paie
+pour nous.»
+
+\looseness=-1
+Ce dernier discours détermina \bname{Candide}; il alla se jeter aux pieds de
+son charitable anabaptiste Jacques, et lui fit une peinture si
+touchante de l’état où son ami était réduit, que le bonhomme n’hésita
+pas à recueillir le docteur \bname{Pangloss}; il le fit guérir à ses dépens.
+\bname{Pangloss}, dans la cure, ne perdit qu’un œil et une oreille. Il
+écrivait bien, et savait parfaitement l’arithmétique. L’anabaptiste
+Jacques en fit son teneur de livres. Au bout de deux mois, étant obligé
+d’aller à \bname{Lisbonne} pour les affaires de son commerce, il mena dans son
+vaisseau ses deux philosophes. \bname{Pangloss} lui expliqua comment tout était
+on ne peut mieux. Jacques n’était pas de cet avis. «Il faut bien,
+disait-il, que les hommes aient un peu corrompu la nature, car ils ne
+sont point nés loups, et ils sont devenus loups. Dieu ne leur a donné
+ni canons de vingt-quatre, ni baïonnettes, et ils se sont fait des
+baïonnettes et des canons pour se détruire. Je pourrais mettre en ligne
+de compte les banqueroutes, et la justice qui s’empare des biens des
+banqueroutiers pour en frustrer les créanciers. — Tout cela était
+indispensable, répliquait le docteur borgne, et les malheurs
+particuliers font le bien général; de sorte que plus il y a de malheurs
+particuliers, et plus tout est bien.» Tandis qu’il raisonnait, l’air
+s’obscurcit, les vents soufflèrent des quatre coins du monde, et le
+vaisseau fut assailli de la plus horrible tempête, à la vue du port de
+\bname{Lisbonne}.
+
+
+
+
+
+\chapter[Tempête, naufrage, tremblement de terre…]{Tempête, naufrage, tremblement de terre,\\et ce qui advint du docteur
+\bname{Pangloss}, de \bname{Candide},\\et de l’anabaptiste Jacques}
+
+
+\lettrine[findent=-3pt,nindent=0.6em]{L}{a moitié}
+des passagers affaiblis, expirants de ces angoisses
+inconcevables que le roulis d’un vaisseau porte dans les nerfs et dans
+toutes les humeurs du corps agitées en sens contraires, n’avait pas
+même la force de s’inquiéter du danger. L’autre moitié jetait des cris
+et faisait des prières; les voiles étaient déchirées, les mâts brisés,
+le vaisseau entr’ouvert. Travaillait qui pouvait, personne ne
+s’entendait, personne ne commandait. L’anabaptiste aidait un peu à la
+manœuvre; il était sur le tillac; un matelot furieux le frappe
+rudement et l’étend sur les planches; mais du coup qu’il lui donna, il
+eut lui-même une si violente secousse, qu’il tomba hors du vaisseau, la
+tête la première. Il restait suspendu et accroché à une partie de mât
+rompu. Le bon Jacques court à son secours, l’aide à remonter, et de
+l’effort qu’il fait, il est précipité dans la mer à la vue du matelot,
+qui le laissa périr sans daigner seulement le regarder. \bname{Candide}
+approche, voit son bienfaiteur qui reparaît un moment, et qui est
+englouti pour jamais. Il veut se jeter après lui dans la mer: le
+philosophe \bname{Pangloss} l’en empêche, en lui prouvant que la rade de
+\bname{\bname{Lisbonne}} avait été formée exprès pour que cet anabaptiste s’y noyât.
+Tandis qu’il le prouvait \textit{a priori}, le vaisseau s’entr’ouvre, tout
+périt à la réserve de \bname{Pangloss}, de \bname{Candide}, et de ce brutal de
+matelot
+qui avait noyé le vertueux anabaptiste; le coquin nagea heureusement
+jusqu’au rivage, où \bname{Pangloss} et \bname{Candide} furent portés sur une planche.
+
+Quand ils furent revenus un peu à eux, ils marchèrent vers \bname{Lisbonne}; il
+leur restait quelque argent, avec lequel ils espéraient se sauver de la
+faim après avoir échappé à la \bname{tempête}.
+
+
+À peine ont-ils mis le pied dans la ville, en pleurant la mort de leur
+bienfaiteur, qu’ils sentent la terre trembler sous leurs pas; la mer
+s’élève en bouillonnant dans le port, et brise les vaisseaux qui sont à
+l’ancre. Des tourbillons de flammes et de cendres couvrent les rues et
+les places publiques; les maisons s’écroulent, les toits sont renversés
+sur les fondements, et les fondements se dispersent; trente mille
+habitants de tout âge et de tout sexe sont écrasés sous des ruines. Le
+matelot disait en sifflant et en jurant: «Il y aura quelque chose à
+gagner ici. — Quelle peut être la raison suffisante de ce phénomène?
+disait \bname{Pangloss}. — Voici le dernier jour du monde!» s’écriait \bname{Candide}. Le matelot court incontinent au milieu des débris, affronte la mort pour
+trouver de l’argent, en trouve, s’en empare, s’enivre, et ayant cuvé
+son vin, achète les faveurs de la première fille de bonne volonté qu’il
+rencontre sur les ruines des maisons détruites, et au milieu des
+mourants et des morts. \bname{Pangloss} le tirait cependant par la manche: «Mon
+ami, lui disait-il, cela n’est pas bien, vous manquez à la raison
+universelle, vous prenez mal votre temps. — Tête et sang, répondit
+l’autre, je suis matelot et né à Batavia; j’ai marché quatre fois sur
+le crucifix dans quatre voyages au Japon; tu as bien trouvé ton
+homme avec ta \linebreak raison universelle!»
+
+
+Quelques éclats de pierre avaient blessé \bname{Candide}; il était étendu dans
+la rue et couvert de débris. Il disait à \bname{Pangloss}: «Hélas! procure-moi
+un peu de vin et d’huile; je me meurs. — Ce tremblement de terre n’est
+pas une chose nouvelle, répondit \bname{Pangloss}; la ville de Lima éprouva les
+mêmes secousses en Amérique l’année passée; mêmes causes, mêmes effets;
+il y a certainement une traînée de soufre sous terre depuis Lima
+jusqu’à \bname{Lisbonne}. — Rien n’est plus probable, dit \bname{Candide}; mais, pour
+Dieu, un peu d’huile et de vin. — Comment probable? répliqua le
+philosophe, je soutiens que la chose est démontrée.» \bname{Candide} perdit
+connaissance, et \bname{Pangloss} lui apporta un peu d’eau d’une fontaine
+voisine.
+
+\textls[-10]{Le lendemain, ayant trouvé quelques provisions de bouche en se glissant
+à travers des décombres,} ils réparèrent un peu leurs forces. Ensuite
+ils travaillèrent comme les autres à soulager les habitants échappés à
+la mort. Quelques citoyens, secourus par eux, leur donnèrent un aussi
+bon dîner qu’on le pouvait dans un tel désastre: il est vrai que le
+repas était triste; les convives arrosaient leur pain de leurs larmes;
+mais \bname{Pangloss} les consola, en les assurant que les choses ne pouvaient
+être autrement: «Car, dit-il, tout ceci est ce qu’il y a de mieux; car
+s’il y a un volcan à \bname{Lisbonne}, il ne pouvait être ailleurs; car il est
+impossible que les choses ne soient pas où elles sont, car tout est
+bien.»
+
+
+Un petit homme noir, familier de l’inquisition, lequel était à côté de
+lui, prit poliment la parole et dit: «Apparemment que monsieur ne croit
+pas au péché originel; car si tout est au mieux, il n’y a donc eu ni
+chute ni punition.
+
+— Je demande très humblement pardon à votre excellence, répondit \bname{Pangloss}
+encore plus poliment, car la chute de l’homme et la malédiction
+entraient nécessairement dans le meilleur des mondes possibles.
+— \bname{Monsieur} ne croit donc pas à la liberté? dit le familier. — Votre
+excellence m’excusera, dit \bname{Pangloss}; la liberté peut subsister avec la
+nécessité absolue; car il était nécessaire que nous fussions libres;
+car enfin la volonté déterminée…» \bname{Pangloss} était au milieu de sa
+phrase, quand le familier fit un signe de tête à son estafier qui lui
+servait à boire du vin de Porto ou d’Oporto.
+
+
+
+
+
+\chapter[Comment on fit un bel auto-da-fé…]{Comment on fit un bel auto-da-fé pour empêcher les\\tremblements de
+terre, et comment \bname{Candide} fut fessé}
+
+
+\lettrine{A}{près} le tremblement de terre qui avait détruit les trois quarts de
+\bname{Lisbonne}, les sages du pays n’avaient pas trouvé un moyen plus efficace
+pour prévenir une ruine totale que de donner au peuple un bel
+auto-da-fé; il était décidé par l’université de Coïmbre que le
+spectacle de quelques personnes brûlées à petit feu, en grande
+cérémonie, est un secret infaillible pour empêcher la terre de
+trembler.
+
+On avait en conséquence saisi un Biscayen convaincu d’avoir épousé sa
+commère, et deux Portugais qui en mangeant un poulet en avaient arraché
+le lard: on vint lier après le dîner le docteur \bname{Pangloss} et son
+disciple \bname{Candide}, l’un pour avoir parlé, et l’autre pour l’avoir écouté
+avec un air d’approbation: tous deux furent menés séparément dans des
+appartements d’une extrême fraîcheur, dans lesquels on n’était jamais
+incommodé du soleil: huit jours après ils furent tous deux
+revêtus d’un
+\emph{san-benito}, et on orna leurs têtes de mitres de papier: la mitre et le
+san-benito de \bname{Candide} étaient peints de flammes renversées, et de
+diables qui n’avaient ni queues ni griffes; mais les diables de
+\bname{Pangloss} portaient griffes et queues, et les flammes étaient droites.
+Ils marchèrent en procession ainsi vêtus, et entendirent un sermon très
+pathétique, suivi d’une belle musique en faux-bourdon. \bname{Candide} fut
+fessé en cadence, pendant qu’on chantait; le Biscayen et les deux
+hommes qui n’avaient point voulu manger de lard furent
+brûlés, et
+\bname{Pangloss} fut pendu, quoique ce ne soit pas la coutume. Le même jour la
+terre trembla de nouveau avec un fracas épouvantable.
+
+\bname{Candide} épouvanté, interdit, éperdu, tout sanglant, tout palpitant, se
+disait à lui-même: «Si c’est ici le meilleur des mondes possibles, que
+sont donc les autres? passe encore si je n’étais que fessé, je l’ai été
+chez les Bulgares; mais, ô mon cher \bname{Pangloss}! le plus grand des
+philosophes, faut-il vous avoir vu pendre, sans que je sache pourquoi!
+ô mon cher anabaptiste! le meilleur des hommes, faut-il que vous ayez
+été noyé dans le port! Ô mademoiselle~\bname{Cunégonde}! la perle des filles,
+faut-il qu’on vous ait fendu le ventre!»
+
+Il s’en retournait, se soutenant à peine, prêché, fessé, absous, et
+béni, lorsqu’une vieille l’aborda, et lui dit: «Mon fils, prenez
+courage, suivez-moi.»
+
+
+
+
+
+
+\chapter[Comment une vieille prit soin de \bname{Candide}…]{Comment une vieille prit soin de \bname{Candide},\\et comment il retrouva ce
+qu’il aimait}
+
+\lettrine{C}{andide} ne prit point courage, mais il suivit la vieille dans une
+masure: elle lui donna un pot de pommade pour se frotter, lui laissa à
+manger et à boire; elle lui montra un petit lit assez propre; il y
+avait auprès du lit un habit complet. «Mangez, buvez, dormez, lui
+dit-elle, et que Notre-Dame d’Atocha, M\up{gr} saint Antoine de
+Padoue, et M\up{gr} saint Jacques de Compostelle prennent soin de
+vous! je reviendrai demain.» \bname{Candide}, toujours étonné de tout ce qu’il
+avait vu, de tout ce qu’il avait souffert, et encore plus de la charité
+de la vieille, voulut lui baiser la main. «Ce n’est pas ma main qu’il
+faut baiser, dit la vieille; je reviendrai demain. Frottez-vous de
+pommade, mangez et dormez.»
+
+
+
+\bname{Candide}, malgré tant de malheurs, mangea et dormit. Le lendemain la
+vieille lui apporte à déjeuner, visite son dos, le frotte elle-même
+d’une autre pommade: elle lui apporte ensuite à dîner: elle revient sur
+le soir et apporte à souper. Le surlendemain elle fit encore les mêmes
+cérémonies. «Qui êtes-vous? lui disait toujours \bname{Candide}; qui vous a
+inspiré tant de bonté? quelles grâces puis-je vous rendre?» La bonne
+femme ne répondait jamais rien. Elle revint sur le soir, et n’apporta
+point à souper: «Venez avec moi, dit-elle, et ne dites mot.» Elle le
+prend sous le bras, et marche avec lui dans la campagne environ un
+quart de mille: ils arrivent à une maison isolée, entourée de jardins
+et de canaux. La vieille frappe à une petite porte. On ouvre; elle mène
+\bname{Candide}, par un escalier dérobé, dans un cabinet doré, le laisse sur un
+canapé de brocart, referme la porte, et s’en va. \bname{Candide} croyait rêver,
+et regardait toute sa vie comme un songe funeste, et le moment présent
+comme un songe agréable.
+
+\textls[-5]
+{La vieille reparut bientôt; elle soutenait avec peine une femme
+tremblante, d’une taille majestueuse, brillante de pierreries, et
+couverte d’un voile. «Ôtez ce voile», dit la vieille à \bname{Candide}. Le jeune
+homme approche; il lève le voile d’une main timide. Quel moment! quelle
+surprise! il croit voir M\up{lle}~\bname{Cunégonde}; il la voyait en effet,
+c’était elle-même. La force lui manque, il ne peut proférer une parole,
+il tombe à ses pieds. \bname{Cunégonde} tombe sur le canapé. La vieille les
+accable d’eaux spiritueuses, ils reprennent leurs sens, ils se parlent:
+ce sont d’abord des mots entrecoupés, des demandes et des réponses qui
+se croisent, des soupirs, des larmes, des cris. La vieille leur
+recommande de faire moins de bruit, et les laisse en liberté. «Quoi!
+c’est vous, lui dit \bname{Candide}, vous vivez! Je vous retrouve en Portugal!
+On ne vous a donc pas violée? on ne vous a point fendu le ventre, comme
+le philosophe \bname{Pangloss} me l’avait assuré?» — Si fait, dit la belle
+\bname{Cunégonde}; mais on ne meurt pas toujours de ces deux accidents. — Mais
+votre père et votre mère ont-ils été tués? — Il n’est que trop vrai, dit
+\bname{Cunégonde} en pleurant. — Et votre frère? — Mon frère a été tué aussi. — Et
+pourquoi êtes-vous en Portugal? et comment avez-vous su que j’y étais?
+et par quelle étrange aventure m’avez-vous fait conduire dans cette
+maison? — Je vous dirai tout cela, répliqua la dame; mais il faut
+auparavant que vous m’appreniez tout ce qui vous est arrivé depuis le
+baiser innocent que vous me donnâtes, et les coups de pied que vous
+reçûtes.»}
+
+
+
+\bname{Candide} lui obéit avec un profond respect; et quoiqu’il fût interdit,
+quoique sa voix fût faible et tremblante, quoique l’échine lui fît
+encore un peu mal, il lui raconta de la manière la plus naïve tout ce
+qu’il avait éprouvé depuis le moment de leur séparation. \bname{Cunégonde}
+levait les yeux au ciel: elle donna des larmes à la mort du bon
+anabaptiste et de \bname{\bname{Pangloss}}; après quoi elle parla en ces termes à
+\bname{Candide}, qui ne perdait pas une parole, et qui la dévorait des yeux.
+
+
+
+
+
+
+\chapter{Histoire de Cunégonde}
+
+
+\lettrine[ante={«}]{J'}{étais} dans mon lit et je dormais profondément, quand il plut au ciel
+d’envoyer les Bulgares dans notre beau château de Thunder-ten-tronckh;
+ils égorgèrent mon père et mon frère, et coupèrent ma mère par
+morceaux. Un grand Bulgare, haut de six pieds, voyant qu’à ce spectacle
+j’avais perdu connaissance, se mit à me violer; cela me fit revenir, je
+repris mes sens, je criai, je me débattis, je mordis, j’égratignai, je
+voulais arracher les yeux à ce grand Bulgare, ne sachant pas que tout
+ce qui arrivait dans le château de mon père était une chose d’usage: le
+brutal me donna un coup de couteau dans le flanc gauche dont je porte
+encore la marque. — Hélas! j’espère bien la voir, dit le naïf \bname{Candide}.
+— Vous la verrez, dit \bname{Cunégonde}; mais continuons. — Continuez», dit \bname{Candide}.
+
+{\parfillskip=1em
+Elle reprit ainsi le fil de son histoire: «Un capitaine bulgare entra,
+il me vit toute sanglante, et le soldat ne se dérangeait pas. Le
+capitaine se mit en colère du peu de respect que lui témoignait, ce
+brutal, et le tua sur mon corps. Ensuite il me fit panser, et m’emmena
+prisonnière de guerre dans son quartier. Je blanchissais le peu de
+chemises qu’il avait, je faisais sa cuisine; il me trouvait fort jolie,
+il faut l’avouer; et je ne nierai pas qu’il ne fût très bien fait, et
+qu’il n’eût la peau blanche et douce; d’ailleurs peu d’esprit, peu de
+philosophie: on voyait bien qu’il n’avait pas été élevé par le docteur
+\bname{Pangloss}. Au bout de trois mois, ayant perdu tout son argent, et
+s’étant dégoûté de moi, il me vendit à un Juif nommé don Issachar, qui
+trafiquait en \bname{Hollande} et en Portugal, et qui aimait passionnément les
+femmes. Ce Juif s’attacha beaucoup à ma personne, mais il ne pouvait en
+triompher; je lui ai mieux résisté qu’au soldat bulgare. Une personne
+d’honneur peut être violée une fois, mais sa vertu s’en affermit. Le
+Juif, pour m’apprivoiser, me mena dans cette maison de campagne que
+vous voyez. J’avais cru jusque-là qu’il n’y avait rien sur la terre de
+si beau que le château de Thunder-ten-tronckh; j’ai été détrompée.
+
+}
+
+«Le grand inquisiteur m’aperçut un jour à la messe; il me lorgna
+beaucoup, et me fit dire qu’il avait à me parler pour des affaires
+secrètes. Je fus conduite à son palais; je lui appris ma naissance; il
+me représenta combien il était au-dessous de mon rang d’appartenir à un
+Israélite. On proposa de sa part à don Issachar de me céder à
+monseigneur. Don Issachar, qui est le banquier de la cour, et homme de
+crédit, n’en voulut rien faire. L’inquisiteur le menaça d’un
+auto-da-fé. Enfin mon Juif intimidé conclut un marché par lequel la
+maison et moi leur appartiendraient à tous deux en commun; que le Juif
+aurait pour lui les lundis, mercredis, et le jour du sabbat, et que
+l’inquisiteur aurait les autres jours de la semaine. Il y a six mois
+que cette convention subsiste. Ce n’a pas été sans querelles; car
+souvent il a été indécis si la nuit du samedi au dimanche appartenait à
+l’ancienne loi ou à la nouvelle. Pour moi, j’ai résisté jusqu’à présent
+à toutes les deux; et je crois que c’est pour cette raison que j’ai
+toujours été aimée.
+
+«Enfin, pour détourner le fléau des tremblements de terre, et pour
+intimider don Issachar, il plut à \bname{monseigneur} l’inquisiteur de célébrer
+un auto-da-fé. Il me fit l’honneur de m’y inviter. Je fus très bien
+placée; on servit aux dames des rafraîchissements entre la messe et
+l’exécution. Je fus, à la vérité, saisie d’horreur en voyant brûler ces
+deux Juifs et cet honnête Biscayen qui avait épousé sa commère: mais
+quelle fut ma surprise, mon effroi, mon trouble, quand je vis dans un
+san-benito,
+ et sous une mitre, une figure qui ressemblait à celle de
+\bname{Pangloss}! Je me
+frottai les yeux, je regardai attentivement, je le vis
+pendre; je tombai en faiblesse. À peine reprenais-je mes sens, que je
+vous vis dépouillé tout nu; ce fut là le comble de l’horreur, de la
+consternation, de la douleur, du désespoir. Je vous dirai, avec vérité,
+que votre peau est encore plus blanche, et d’un incarnat plus parfait
+que celle de mon capitaine des Bulgares. Cette vue redoubla tous les
+sentiments qui m’accablaient, qui me dévoraient. Je m’écriai, je voulus
+dire, «Arrêtez, barbares!» mais la voix me manqua, et mes cris auraient
+été inutiles. Quand vous eûtes été bien fessé: \frquote{\localleftbox{« }Comment se peut-il
+faire, disais-je, que l’aimable \bname{Candide} et le sage \bname{Pangloss} se trouvent
+à \bname{Lisbonne}, l’un pour recevoir cent coups de fouet, et l’autre pour
+être pendu par l’ordre de \bname{Monseigneur} l’inquisiteur, dont je suis la
+bien-aimée? \bname{Pangloss} m’a donc bien cruellement trompée, quand il me
+disait que tout va le mieux du monde!}\localleftbox{}
+
+«Agitée, éperdue, tantôt hors de moi-même, et tantôt prête de mourir de
+faiblesse, j’avais la tête remplie du massacre de mon père, de ma mère,
+de mon frère, de l’insolence de mon vilain soldat bulgare, du coup de
+couteau qu’il me donna, de ma servitude, de mon métier de cuisinière,
+de mon capitaine bulgare, de mon vilain don~\bname{Issachar}, de mon abominable
+inquisiteur, de la pendaison du docteur \bname{Pangloss}, de ce grand \emph{Miserere}
+en faux-bourdon pendant lequel on vous fessait, et surtout du baiser
+que je vous avais donné derrière un paravent, le jour que je vous avais
+vu pour la dernière fois. Je louai Dieu, qui vous ramenait à moi par
+tant d’épreuves. Je recommandai à ma vieille d’avoir soin de vous, et
+de vous amener ici dès qu’elle le pourrait. Elle a très bien exécuté ma
+commission; j’ai goûté le plaisir inexprimable de vous revoir, de vous
+entendre, de vous parler. Vous devez avoir une faim dévorante; j’ai
+grand appétit; commençons par souper.»
+
+Les voilà qui se mettent tous deux à table; et, après le souper, ils se
+replacent sur ce beau canapé dont on a déjà parlé; ils y étaient quand
+le signor don Issachar, l’un des maîtres de la maison, arriva. C’était
+le jour du sabbat. Il venait jouir de ses droits, et expliquer son
+tendre amour.
+
+
+
+
+
+\chapter[Ce qui advint de Cunégonde, de Candide…]{Ce qui advint de \bname{Cunégonde}, de \bname{Candide},\\du grand inquisiteur, et d’un
+Juif}
+
+
+\lettrine{C}{et} Issachar était le plus colérique Hébreu qu’on eût vu dans Israël,
+depuis la captivité en Babylone. «Quoi! dit-il, chienne de galiléenne,
+ce n’est pas assez de M. l’inquisiteur? il faut que ce coquin
+partage aussi avec moi?» En disant cela il tire un long poignard dont il
+était toujours pourvu, et, ne croyant pas que son adverse partie eût
+des armes, il se jette sur \bname{Candide}; mais notre bon Westphalien avait
+reçu une belle épée de la vieille avec l’habit complet. Il tire son
+épée, quoiqu’il eût les mœurs fort douces, et vous étend l’Israélite
+roide mort sur le carreau, aux pieds de la belle \bname{Cunégonde}.
+
+«Sainte Vierge! s’écria-t-elle, qu’allons-nous devenir? un homme tué
+chez moi! si la justice vient, nous sommes perdus. — Si \bname{Pangloss} n’avait
+pas été pendu, dit \bname{Candide}, il nous donnerait un bon conseil dans cette
+extrémité, car c’était un grand philosophe. À son défaut, consultons la
+vieille.» Elle était fort prudente, et commençait à dire son avis quand
+une autre petite porte s’ouvrit. Il était une heure après minuit,
+c’était le commencement du dimanche. Ce jour appartenait à monseigneur
+l’inquisiteur. Il entre et voit le fessé \bname{Candide}, l’épée à la main, un
+mort étendu par terre, \bname{Cunégonde} effarée, et la vieille donnant des
+conseils.
+
+Voici dans ce moment ce qui se passa dans l’âme de \bname{Candide}, et comment
+il raisonna: «Si ce saint homme appelle du secours, il me fera
+infailliblement brûler, il pourra en faire autant de \bname{Cunégonde}; il m’a
+fait fouetter impitoyablement; il est mon rival; je suis en train de
+tuer; il n’y a pas à balancer.» Ce raisonnement fut net et rapide; et,
+sans donner le temps à l’inquisiteur de revenir de sa surprise, il le
+perce d’outre en outre, et le jette à côté du Juif. «En voici bien d’une
+autre, dit \bname{Cunégonde}; il n’y a plus de rémission; nous sommes
+excommuniés, notre dernière heure est venue! Comment avez-vous fait,
+vous qui êtes né si doux, pour tuer en deux minutes un Juif et un
+prélat? — Ma belle demoiselle, répondit\bname{Candide}, quand on est amoureux,
+jaloux, et fouetté par l’inquisition, on ne se connaît plus.»
+
+La vieille prit alors la parole, et dit: «Il y a trois chevaux andalous
+dans l’écurie, avec leurs selles et leurs brides, que le brave \bname{Candide}
+les prépare; madame a des moyadors et des diamants, montons vite à
+cheval, quoique je ne puisse me tenir que sur une fesse, et allons à
+Cadix; il fait le plus beau temps du monde, et c’est un grand plaisir
+de voyager pendant la fraîcheur de la nuit.»
+
+Aussitôt \bname{Candide} selle les trois chevaux; \bname{Cunégonde}, la vieille, et
+lui, font trente milles d’une traite. Pendant qu’ils s’éloignaient, la
+Sainte-Hermandad arrive dans la maison, on enterre monseigneur dans une
+belle église, on jette Issachar à la voirie.
+
+\bname{Candide}, \bname{Cunégonde}, et la vieille, étaient déjà dans la petite ville
+\bname{d’Avacéna}, au milieu des montagnes de la Sierra Morena; et ils
+parlaient ainsi dans un cabaret.
+
+
+
+
+\chapter[Dans quelle détresse Candide…]{Dans quelle détresse \bname{Candide}, \bname{Cunégonde},\\et la vieille, arrivent à
+Cadix, et leur embarquement}
+
+
+\lettrine[ante={«}]{Q}{ui a donc} pu me voler mes pistoles et mes diamants? disait en pleurant
+\bname{Cunégonde}; de quoi vivrons-nous? comment ferons-nous? où trouver des
+inquisiteurs et des Juifs qui m’en donnent d’autres? — Hélas! dit la
+vieille, je soupçonne fort un révérend père cordelier, qui coucha hier
+dans la même auberge que nous à \bname{Badajos}; Dieu me garde de faire un
+jugement téméraire! mais il entra deux fois dans notre chambre, et il
+partit longtemps avant nous. — Hélas! dit \bname{Candide}, le bon \bname{Pangloss}
+m’avait souvent prouvé que les biens de la terre sont communs à tous
+les hommes, que chacun y a un droit égal. Ce cordelier devait bien,
+suivant ces principes, nous laisser de quoi achever notre voyage. Il ne
+vous reste donc rien du tout, ma belle \bname{Cunégonde}? — Pas un maravédis,
+dit-elle. — Quel parti prendre? dit \bname{Candide}. — Vendons un des chevaux, dit
+la vieille; je monterai en croupe derrière mademoiselle, quoique je ne
+puisse me tenir que sur une fesse, et nous arriverons à Cadix.»
+
+Il y avait dans la même hôtellerie un prieur de bénédictins; il acheta
+le cheval bon marché. \bname{Candide}, \bname{Cunégonde}, et la vieille, passèrent par
+Lucena, par Chillas, par Lebrixa, et arrivèrent enfin à Cadix. On y
+équipait une flotte, et on y assemblait des troupes pour mettre à la
+raison les révérends pères jésuites du Paraguay, qu’on accusait d’avoir
+fait révolter une de leurs hordes contre les rois d’Espagne et de
+Portugal, auprès de la ville du Saint-Sacrement. \bname{Candide}, ayant
+servi chez les Bulgares, fit l’exercice bulgarien devant le général de
+la petite armée avec tant de grâce, de célérité, d’adresse, de fierté,
+d’agilité, qu’on lui donna une compagnie d’infanterie à commander. Le
+voilà capitaine; il s’embarque avec M\up{lle}~\bname{Cunégonde}, la vieille,
+deux valets, et les deux chevaux andalous qui avaient appartenu à M. le
+grand inquisiteur de Portugal.
+
+\looseness=-1
+Pendant toute la traversée ils raisonnèrent beaucoup sur la philosophie
+du pauvre \bname{Pangloss}. «Nous allons dans un autre univers, disait \bname{Candide};
+c’est dans celui-là, sans doute, que tout est bien: car il faut avouer
+qu’on pourrait gémir un peu de ce qui se passe dans le nôtre en
+physique et en morale. — Je vous aime de tout mon cœur, disait
+\bname{Cunégonde}; mais j’ai encore l’âme tout effarouchée de ce que j’ai vu,
+de ce que j’ai éprouvé. — Tout ira bien, répliquait \bname{Candide}; la mer de ce
+nouveau monde vaut déjà mieux que les mers de notre Europe; elle est
+plus calme, les vents plus constants. C’est certainement le
+nouveau monde qui est le meilleur des univers possibles. — Dieu le
+veuille! disait \bname{Cunégonde}: mais j’ai été si horriblement malheureuse
+dans le mien, que mon cœur est presque fermé à l’espérance. — Vous vous
+plaignez, leur dit la vieille; hélas! vous n’avez pas éprouvé des
+infortunes telles que les miennes.» \bname{Cunégonde} se mit presque à rire, et
+trouva cette bonne femme fort plaisante de prétendre être plus
+malheureuse qu’elle. «Hélas! lui dit-elle, ma bonne, à moins que vous
+n’ayez été violée par deux Bulgares, que vous n’ayez reçu deux coups de
+couteau dans le ventre, qu’on n’ait démoli deux de vos châteaux, qu’on
+n’ait égorgé à vos yeux deux mères et deux pères, et que vous n’ayez vu
+deux de vos amants fouettés dans un auto-da-fé, je ne vois pas que vous
+puissiez l’emporter sur moi; ajoutez que je suis née baronne avec
+soixante et douze quartiers, et que j’ai été cuisinière. — Mademoiselle,
+répondit la vieille, vous ne savez pas quelle est ma naissance; et si
+je vous montrais mon derrière, vous ne parleriez pas comme vous faites,
+et vous suspendriez votre jugement.» Ce discours fit naître une extrême
+curiosité dans l’esprit de \bname{Cunégonde} et de \bname{Candide}. La vieille leur
+parla en ces termes.\quad\null
+
+
+\chapter{Histoire de la vieille}
+
+
+\lettrine[ante=«]{J}{e n’ai} pas eu toujours les yeux éraillés et bordés d’écarlate; mon nez
+n’a pas toujours touché à mon menton, et je n’ai pas toujours été
+servante. Je suis la fille du pape \bname{Urbain}~X et de la princesse de
+\bname{Palestrine}.
+On m’éleva jusqu’à quatorze ans dans un palais auquel
+tous les châteaux de vos barons allemands n’auraient pas servi
+d’écurie; et une de mes robes valait mieux que toutes les magnificences
+de la \bname{Westphalie}. Je croissais en beauté, en grâces, en talents, au
+milieu des plaisirs, des respects, et des espérances: j’inspirais déjà
+de l’amour; ma gorge se formait; et quelle gorge! blanche, ferme,
+taillée comme celle de la Vénus de \bname{Médicis}; et quels yeux! quelles
+paupières! quels sourcils noirs! quelles flammes brillaient dans mes
+deux prunelles, et effaçaient la scintillation des étoiles! comme me
+disaient les poètes du quartier. Les femmes qui m’habillaient et qui me
+déshabillaient tombaient en extase en me regardant par-devant et
+par-derrière; et tous les hommes auraient voulu être à leur place.
+
+
+«Je fus fiancée à un prince souverain de Massa-Carrara: quel prince!
+aussi beau que moi, pétri de douceur et d’agréments, brillant d’esprit
+et brûlant d’amour; je l’aimais comme on aime pour la première fois,
+avec idolâtrie, avec emportement. Les noces furent préparées: c’était
+une pompe, une magnificence inouïe; c’étaient des fêtes, des
+carrousels, des opéra-buffa continuels; et toute l’Italie fit pour moi
+des sonnets dont il n’y eut pas un seul de passable. Je touchais au
+moment
+de mon bonheur, quand une vieille marquise, qui avait été
+maîtresse de mon prince, l’invita à prendre du chocolat chez elle; il
+mourut en moins de deux heures avec des convulsions épouvantables; mais
+ce n’est qu’une bagatelle. Ma mère au désespoir, et bien moins affligée
+que moi, voulut s’arracher pour quelque temps à un séjour si funeste.
+Elle avait une très belle terre auprès de Gaète: nous nous embarquâmes
+sur une galère du pays, dorée comme l’autel de Saint-Pierre de Rome.
+Voilà qu’un corsaire de Salé fond sur nous et nous aborde: nos soldats
+se défendirent comme des soldats du pape; ils se mirent tous à genoux
+en jetant leurs armes, et en demandant au corsaire une absolution \emph{in
+articulo mortis}.
+
+«Aussitôt on les dépouilla nus comme des singes, et ma mère aussi, nos
+filles d’honneur aussi, et moi aussi. C’est une chose admirable que la
+diligence avec laquelle ces messieurs déshabillent le monde; mais ce
+qui me surprit davantage, c’est qu’ils nous mirent à tous le doigt dans
+un endroit où nous autres femmes nous ne nous laissons mettre
+d’ordinaire que des canules. Cette cérémonie me paraissait bien
+étrange: voilà comme on juge de tout quand on n’est pas sorti de son
+pays. J’appris bientôt que c’était pour voir si nous n’avions pas caché
+là quelques diamants; c’est un usage établi de temps immémorial parmi
+les nations policées qui courent sur mer. J’ai su que messieurs les
+religieux chevaliers de Malte n’y manquent jamais quand ils prennent
+des Turcs et des Turques; c’est une loi du droit des gens à laquelle on
+n’a jamais dérogé.
+
+«Je ne vous dirai point combien il est dur pour une jeune princesse
+d’être menée esclave à Maroc avec sa mère: vous concevez assez tout ce
+que nous eûmes à souffrir dans le vaisseau corsaire. Ma mère était
+encore très belle: nos filles d’honneur, nos simples femmes de chambre
+avaient plus de charmes qu’on n’en peut trouver dans toute l’Afrique.
+Pour moi, j’étais ravissante, j’étais la beauté, la grâce même, et
+j’étais pucelle: je ne le fus pas longtemps; cette fleur, qui avait
+été réservée pour le beau prince de Massa-Carrara, me fut ravie par le
+capitaine corsaire; c’était un nègre abominable, qui croyait encore me
+faire beaucoup d’honneur. Certes il fallait que M\up{me} la princesse de
+\bname{Palestrine} et moi fussions bien fortes pour résister à tout ce que nous
+éprouvâmes jusqu’à notre arrivée à Maroc! Mais passons; ce sont des
+choses si communes, qu’elles ne valent pas la peine qu’on en parle.
+
+«Maroc nageait dans le sang quand nous arrivâmes. Cinquante fils de
+l’empereur Muley-Ismaël avaient chacun leur parti; ce qui produisait
+en effet cinquante guerres civiles, de noirs contre noirs, de noirs
+contre basanés, de basanés contre basanés, de mulâtres contre mulâtres:
+c’était un carnage continuel dans toute l’étendue de l’empire.
+
+
+
+«À peine fûmes-nous débarquées, que des noirs d’une faction ennemie de
+celle de mon corsaire se présentèrent pour lui enlever son butin. Nous
+étions, après les diamants et l’or, ce qu’il avait de plus précieux. Je
+fus témoin d’un combat tel que vous n’en voyez jamais dans vos climats
+d’Europe. Les peuples septentrionaux n’ont pas le sang assez ardent;
+ils n’ont pas la rage des femmes au point où elle est commune en
+Afrique. Il semble que vos Européens aient du lait dans les veines;
+c’est du vitriol, c’est du feu qui coule dans celles des habitants du
+mont Atlas et des pays voisins. On combattit avec la fureur des lions,
+des tigres, et des serpents de la contrée, pour savoir qui nous aurait.
+Un Maure saisit ma mère par le bras droit, le lieutenant de mon
+capitaine la retint par le bras gauche; un soldat maure la prit par une
+jambe, un de nos pirates la tenait par l’autre. Nos filles se
+trouvèrent presque toutes en un moment tirées ainsi à quatre soldats.
+Mon capitaine me tenait cachée derrière lui; il avait le cimeterre au
+poing, et tuait tout ce qui s’opposait à sa rage. Enfin je vis toutes
+nos Italiennes et ma mère déchirées, coupées, massacrées par les
+monstres qui se les disputaient. Les captifs, mes compagnons, ceux qui
+les avaient pris, soldats, matelots, noirs, basanés, blancs, mulâtres,
+et enfin mon capitaine, tout fut tué, et je demeurai mourante sur un
+tas de morts. Des scènes pareilles se passaient, comme on sait, dans
+l’étendue de plus de trois cents lieues, sans qu’on manquât aux cinq
+prières par jour ordonnées par Mahomet.
+
+«Je me débarrassai avec beaucoup de peine de la foule de tant de
+cadavres sanglants entassés, et je me traînai sous un grand oranger au
+bord d’un ruisseau voisin; j’y tombai d’effroi, de lassitude,
+d’horreur, de désespoir, et de faim. Bientôt après, mes sens accablés se
+livrèrent à un sommeil qui tenait plus de l’évanouissement que du
+repos. J’étais dans cet état de faiblesse et d’insensibilité, entre la
+mort et la vie, quand je me sentis pressée de quelque chose qui
+s’agitait sur mon corps; j’ouvris les yeux, je vis un homme blanc et de
+bonne mine qui soupirait, et qui disait entre ses dents: \emph{O che
+sciagura d’essere senza coglioni!}
+
+
+
+
+\chapter{Suite des malheurs de la vieille}
+
+
+\lettrine[ante=«]{É}{tonnée} et ravie d’entendre la langue de ma patrie, et non moins
+surprise des paroles que proférait cet homme, je lui répondis qu’il y
+avait de plus grands malheurs que celui dont il se plaignait; je
+l’instruisis en peu de mots des horreurs que j’avais essuyées, et je
+retombai en faiblesse. Il m’emporta dans une maison voisine, me fit
+mettre au lit, me fit donner à manger, me servit, me consola, me
+flatta, me dit qu’il n’avait rien vu de si beau que moi, et que jamais
+il n’avait tant regretté ce que personne ne pouvait lui rendre. \frquote{\localleftbox{« }Je suis
+né à Naples, me dit-il; on y chaponne deux ou trois mille enfants tous
+les ans; les uns en meurent, les autres acquièrent une voix plus belle
+que celle des femmes, les autres vont gouverner des états. On me fit
+cette opération avec un très grand succès, et j’ai été musicien de la
+chapelle de M\up{me} la princesse de \bname{Palestrine}. — De ma mère! m’écriai-je.
+— De votre mère! s’écria-t-il en pleurant. Quoi! vous seriez cette jeune
+princesse que j’ai élevée jusqu’à l’âge de six ans, et qui promettait
+déjà d’être aussi belle que vous êtes? — C’est moi-même; ma mère est à
+quatre cents pas d’ici coupée en quartiers sous un tas de morts…}\localleftbox{}
+
+
+
+
+«Je lui contai tout ce qui m’était arrivé; il me conta aussi ses
+aventures, et m’apprit comment il avait été envoyé chez le roi de Maroc
+par une puissance chrétienne, pour conclure avec ce monarque un traité
+par lequel on lui fournirait de la poudre, des canons, et des
+vaisseaux, pour l’aider à exterminer le commerce des autres chrétiens.
+\frquote{\localleftbox{« }Ma mission est faite, dit cet honnête eunuque; je vais m’embarquer à
+Ceuta, et je vous ramènerai en Italie. \emph{Ma che sciagura d’essere senza
+coglioni!}}\localleftbox{}
+
+
+«Je le remerciai avec des larmes d’attendrissement; et au lieu de me
+mener en Italie, il me conduisit à Alger, et me vendit au dey de cette
+province. À peine fus-je vendue, que cette peste qui a fait le tour de
+l’Afrique, de l’Asie, de l’Europe, se déclara dans Alger avec fureur.
+«Vous avez vu des tremblements de terre; mais, mademoiselle, avez-vous
+jamais eu la peste? — Jamais, répondit la baronne.
+
+%\looseness=1
+— Si vous l’aviez eue, reprit la vieille, vous avoueriez qu’elle est bien
+au-dessus d’un tremblement de terre. Elle est fort commune en Afrique;
+j’en fus attaquée. Figurez-vous quelle situation pour la fille d’un
+pape, âgée de quinze ans, qui en trois mois de temps avait éprouvé la
+pauvreté, l’esclavage, avait été violée presque tous les jours, avait
+vu couper sa mère en quatre, avait essuyé la faim et la guerre, et
+mourait pestiférée dans Alger! Je n’en mourus pourtant pas; mais mon
+eunuque et le dey, et presque tout le sérail \linebreak d’Alger périrent.
+
+
+
+«Quand les premiers ravages de cette épouvantable peste furent passés,
+on vendit les esclaves du dey. Un marchand m’acheta, et me mena à
+Tunis; il me vendit à un autre marchand qui me revendit à Tripoli; de
+Tripoli je fus revendue à Alexandrie, d’Alexandrie revendue à Smyrne;
+de Smyrne à Constantinople. J’appartins enfin à un aga des janissaires,
+qui fut bientôt commandé pour aller défendre Azof contre les Russes qui
+l’assiégeaient.
+
+«L’aga, qui était un très galant homme, mena avec lui tout son sérail,
+et nous logea dans un petit fort sur les Palus-Méotides, gardé par deux
+eunuques noirs et vingt soldats. On tua prodigieusement de Russes, mais
+ils nous le rendirent bien: Azof fut mis à feu et à sang, et on ne
+pardonna ni au sexe, ni à l’âge; il ne resta que notre petit fort; les
+ennemis voulurent nous prendre par famine. Les vingt janissaires
+avaient juré de ne se jamais rendre. Les extrémités de la faim où ils
+furent réduits les contraignirent à manger nos deux eunuques, de peur
+de violer leur serment. Au bout de quelques jours ils résolurent de
+manger les femmes.
+
+
+«Nous avions un iman très pieux et très compatissant, qui leur fit un
+beau sermon par lequel il leur persuada de ne nous pas tuer
+tout-à-fait. \frquote{\localleftbox{« }Coupez, dit-il, seulement une fesse à chacune de ces
+dames, vous ferez très bonne chère; s’il faut y revenir, vous en aurez
+encore autant dans quelques jours; le ciel vous saura gré d’une action
+si charitable, et vous serez secourus.}\localleftbox{}
+
+«Il avait beaucoup d’éloquence; il les persuada: on nous fit cette
+horrible opération; l’iman nous appliqua le même baume qu’on met aux
+enfants qu’on vient de circoncire: nous étions toutes à la mort.
+
+
+«À peine les janissaires eurent-ils fait le repas que nous leur avions
+fourni, que les Russes arrivent sur des bateaux plats; pas un
+janissaire ne réchappa. Les Russes ne firent aucune attention à l’état
+où nous étions. Il y a partout des chirurgiens français: un d’eux qui
+était fort adroit prit soin de nous, il nous guérit; et je me
+souviendrai toute ma vie, que quand mes plaies furent bien fermées, il
+me fit des propositions. Au reste, il nous dit à toutes de nous
+consoler; il nous assura que dans plusieurs sièges pareille chose était
+arrivée, et que c’était la loi de la guerre.
+
+
+«Dès que mes compagnes purent marcher, on les fit aller à Moscou;
+j’échus en partage à un boyard qui me fit sa jardinière, et qui me
+donnait vingt coups de fouet par jour; mais ce seigneur ayant été roué
+au bout de deux ans avec une trentaine de boyards pour quelque
+tracasserie de cour, je profitai de cette aventure; je m’enfuis; je
+traversai toute la Russie; je fus longtemps servante de cabaret à
+Riga, puis à Rostock, à Vismar, à Leipsick, à Cassel, à Utrecht, à
+Leyde, à La Haye, à Rotterdam: j’ai vieilli dans la misère et dans
+l’opprobre, n’ayant que la moitié d’un derrière, me souvenant toujours
+que j’étais fille d’un pape; je voulus cent fois me tuer, mais j’aimais
+encore la vie. Cette faiblesse ridicule est peut-être un de nos
+penchants les plus funestes; car y a-t-il rien de plus sot que de
+vouloir porter continuellement un fardeau qu’on veut toujours jeter par
+terre; d’avoir son être en horreur, et de tenir à son être; enfin de
+\bname{caresser} le serpent qui nous dévore, jusqu’à ce qu’il nous ait \linebreak mangé le
+cœur?
+
+
+
+«J’ai vu dans les pays que le sort m’a fait parcourir, et dans les
+cabarets où j’ai servi, un nombre prodigieux de personnes qui avaient
+leur existence en exécration; mais je n’en ai vu que douze qui aient
+mis volontairement fin à leur misère, trois nègres, quatre Anglais,
+quatre Genevois, et un professeur allemand nommé Robeck. J’ai fini
+par être servante chez le Juif don Issachar; il me mit auprès de vous,
+ma belle demoiselle; je me suis attachée à votre destinée, et j’ai été
+plus occupée de vos aventures que des miennes. Je ne vous aurais même
+jamais parlé de mes malheurs, si vous ne m’aviez pas un peu piquée, et
+s’il n’était d’usage, dans un vaisseau, de conter des histoires pour se
+désennuyer. Enfin, mademoiselle, j’ai de l’expérience, je connais le
+monde; donnez-vous un plaisir, engagez chaque passager à vous conter
+son histoire, et s’il s’en trouve un seul qui n’ait souvent maudit sa
+vie, qui ne se soit souvent dit à lui-même qu’il était le plus
+malheureux des hommes, jetez-moi dans la mer la tête la première.»
+
+
+
+
+\chapter[Comment Candide fut obligé de se séparer…]{Comment \bname{Candide} fut obligé de se séparer\\de la belle \bname{Cunégonde} et de la
+vieille}
+
+
+\lettrine{L}{a belle} \bname{Cunégonde}, ayant entendu l’histoire de la vieille, lui fit
+toutes les politesses qu’on devait à une personne de son rang et de son
+mérite. Elle accepta la proposition; elle engagea tous les passagers,
+l’un après l’autre, à lui conter leurs aventures. \bname{Candide} et elle
+avouèrent que la vieille avait raison. C’est bien dommage, disait
+\bname{Candide}, que le sage \bname{Pangloss} ait été pendu contre la coutume dans un
+auto-da-fé; il nous dirait des choses admirables sur le mal physique et
+sur le mal moral qui couvrent la terre et la mer, et je me sentirais
+assez de force pour oser lui faire respectueusement quelques
+objections.
+
+À mesure que chacun racontait son histoire, le vaisseau avançait. On
+aborda dans \bname{Buenos} Aires. \bname{Cunégonde}, le capitaine \bname{Candide}, et la
+vieille, allèrent chez le gouverneur don \bname{Fernando} \bname{d’Ibaraa}, y Figueora,
+y \bname{Mascarenes}, y \bname{Lampourdos}, y Souza. Ce seigneur avait une fierté
+convenable à un homme qui portait tant de noms. Il parlait aux hommes
+avec le dédain le plus noble, portant le nez si haut, élevant si
+impitoyablement la voix, prenant un ton si imposant, affectant une
+démarche si altière, que tous ceux qui le saluaient étaient tentés de
+le battre. Il aimait les femmes à la fureur. \bname{Cunégonde} lui parut ce
+qu’il avait jamais vu de plus beau. La première chose qu’il fit fut de
+demander si elle n’était point la femme du capitaine. L’air dont il fit
+cette question alarma \bname{Candide}: il n’osa pas dire qu’elle était sa
+femme, parce qu’en effet elle ne l’était point; il n’osait pas dire que
+c’était sa sœur, parce qu’elle ne l’était pas non plus; et quoique ce
+mensonge officieux eût été autrefois très à la mode chez les
+anciens, et qu’il pût être utile aux modernes, son âme était trop
+pure pour trahir la vérité. «M\up{lle}~\bname{Cunégonde}, dit-il, doit me
+faire l’honneur de m’épouser, et nous supplions Votre Excellence de
+daigner faire notre noce.»
+
+Don Fernando d’Ibaraa, y Figueora, y Mascarenes, y \bname{Lampourdos}, y Souza,
+relevant sa moustache, sourit amèrement, et ordonna au \mbox{capitaine}
+\bname{Candide} d’aller faire la revue de sa compagnie. \bname{Candide} obéit; le
+gouverneur demeura avec M\up{lle}~\bname{Cunégonde}. Il lui déclara sa
+passion, lui protesta que le lendemain il l’épouserait à la face de
+l’Église, ou autrement, ainsi qu’il plairait à ses charmes. \bname{Cunégonde}
+lui demanda un quart d’heure pour se recueillir, pour consulter la
+vieille, et pour se déterminer.
+
+La vieille dit à \bname{Cunégonde}: «Mademoiselle, vous avez soixante et douze
+quartiers et pas une obole; il ne tient qu’à vous d’être la femme du
+plus grand seigneur de l’Amérique méridionale, qui a une très belle
+moustache; est-ce à vous de vous piquer d’une fidélité à toute épreuve?
+Vous avez été violée par les Bulgares; un Juif et un inquisiteur ont eu
+vos bonnes grâces: les malheurs donnent des droits. J’avoue que si
+j’étais à votre place, je ne ferais aucun scrupule d’épouser M.~le gouverneur, et de faire la fortune de M.~le capitaine \bname{Candide}.»
+Tandis que la vieille parlait avec toute la prudence que l’âge et
+l’expérience donnent, on vit entrer dans le port un petit vaisseau; il
+portait un alcade et des alguazils, et voici ce qui était arrivé.
+
+La vieille avait très bien deviné que ce fut un cordelier à la grande
+manche qui vola l’argent et les bijoux de \bname{Cunégonde} dans la ville de
+\bname{Badajos}, lorsqu’elle fuyait en hâte avec \bname{Candide}. Ce moine voulut
+vendre quelques unes des
+pierreries
+à un joaillier. Le marchand les
+reconnut pour celles du grand-inquisiteur. Le cordelier, avant d’être
+pendu, avoua qu’il les avait volées: il indiqua les personnes, et la
+route qu’elles prenaient. La fuite de \bname{Cunégonde} et de \bname{Candide} était
+déjà connue. On les suivit à Cadix: on envoya, sans perdre de temps, un
+vaisseau à leur poursuite. Le vaisseau était déjà dans le port de
+\bname{Buenos} Aires. Le bruit se répandit qu’un alcade allait débarquer, et
+qu’on poursuivait les meurtriers de monseigneur le grand inquisiteur.
+La prudente vieille vit dans l’instant tout ce qui était à faire. «Vous
+ne pouvez fuir, dit-elle à \bname{Cunégonde}, et vous n’avez rien à craindre;
+ce n’est pas vous qui avez tué monseigneur, et d’ailleurs le
+gouverneur, qui vous aime, ne souffrira pas qu’on vous maltraite;
+demeurez.» Elle court sur-le-champ à \bname{Candide}: «Fuyez, dit-elle, ou dans
+une heure vous allez être brûlé. Il n’y avait pas un moment à perdre»;
+mais comment se séparer de \bname{Cunégonde}, et où se réfugier?
+
+
+
+
+\chapter[Comment Candide et \bname{Cacambo} furent reçus…]{Comment \bname{Candide} et \bname{Cacambo} furent reçus\\chez les jésuites du Paraguay}
+
+
+\lettrine{C}{andide} avait amené de Cadix un valet tel qu’on en trouve beaucoup sur
+les côtes d’Espagne et dans les colonies. C’était un quart \bname{d’Espagnol},
+né d’un métis dans le Tucuman; il avait été enfant de chœur,
+sacristain, matelot, moine, facteur, soldat, laquais. Il s’appelait
+\bname{Cacambo}, et aimait fort son maître, parce que son maître était un fort
+bon homme. Il sella au plus vite les deux chevaux andalous. «Allons, mon
+maître, suivons le conseil de la vieille, partons, et courons sans
+regarder derrière nous.» \bname{Candide} versa des larmes: «Ô ma chère \bname{Cunégonde}!
+faut-il vous abandonner dans le temps que M. le gouverneur va
+faire nos noces! \bname{Cunégonde} amenée de si loin, que deviendrez-vous? — Elle
+deviendra ce qu’elle pourra, dit \bname{Cacambo}; les femmes ne sont jamais
+embarrassées d’elles; Dieu y pourvoit; courons. — Où me mènes-tu? où
+allons-nous? que ferons-nous sans \bname{Cunégonde}? disait \bname{Candide}. — Par saint
+Jacques de Compostelle, dit \bname{Cacambo}, vous alliez faire la guerre aux
+jésuites, allons la faire pour eux; je sais assez les chemins, je vous
+mènerai dans leur royaume, ils seront charmés d’avoir un capitaine qui
+fasse l’exercice à la bulgare; vous ferez une fortune prodigieuse;
+quand on n’a pas son compte dans un monde, on le trouve dans un autre.
+C’est un très grand plaisir de voir et de faire des choses nouvelles.
+
+
+— Tu as donc été déjà dans le Paraguay? dit \bname{Candide}. — Eh vraiment oui! dit
+\bname{Cacambo}; j’ai été cuistre dans le collège de l’Assomption, et je
+connais le gouvernement de Los Padres comme je connais les rues de
+Cadix. C’est une chose admirable que ce gouvernement. Le royaume a déjà
+plus de trois cents lieues de diamètre; il est divisé en trente
+provinces. Los Padres y ont tout, et les peuples rien; c’est le
+chef-d’œuvre de la raison et de la justice. Pour moi, je ne vois rien
+de si divin que Los Padres, qui font ici la guerre au roi d’Espagne et
+au roi de Portugal, et qui en Europe confessent ces rois; qui tuent ici
+des Espagnols, et qui à Madrid les envoient au ciel; cela me ravit;
+avançons: vous allez être le plus heureux de tous les hommes. Quel
+plaisir auront Los Padres, quand ils sauront qu’il leur vient un
+capitaine qui sait l’exercice bulgare!»
+
+
+
+Dès qu’ils furent arrivés à la première barrière, \bname{Cacambo} dit à la
+garde avancée qu’un capitaine demandait à parler à monseigneur le
+commandant. On alla avertir la grande garde. Un officier paraguain
+courut aux pieds du commandant lui donner part de la nouvelle. \bname{Candide}
+et \bname{Cacambo} furent d’abord désarmés; on se saisit de leurs deux chevaux
+andalous. Les deux étrangers sont introduits au milieu de deux files de
+soldats; le commandant était au bout, le bonnet à trois cornes en tête,
+la robe retroussée, l’épée au côté, l’esponton à la main. Il fit un
+signe; aussitôt vingt-quatre soldats entourent les deux nouveaux venus.
+Un sergent leur dit qu’il faut attendre, que le commandant ne peut leur
+parler, que le révérend père provincial ne permet pas qu’aucun Espagnol
+ouvre la bouche qu’en sa présence, et demeure plus de trois heures dans
+le pays. «Et où est le révérend père provincial? dit \bname{Cacambo}. — Il est à
+la parade après avoir dit sa messe, répondit le sergent, et vous ne
+pourrez baiser ses éperons que dans trois heures. — Mais, dit \bname{Cacambo},
+M. le capitaine, qui meurt de faim comme moi, n’est point
+espagnol, il est allemand; ne pourrions-nous point déjeuner en
+attendant Sa Révérence?»
+
+Le sergent alla sur-le-champ rendre compte de ce discours au
+commandant. «Dieu soit béni! dit ce seigneur, puisqu’il est allemand, je
+peux lui parler; qu’on le mène dans ma feuillée.» Aussitôt on conduit
+\bname{Candide} dans un cabinet de verdure, orné d’une très jolie colonnade de
+marbre vert et or, et de treillages qui renfermaient des perroquets,
+des colibris, des oiseaux-mouches, des pintades, et tous les oiseaux
+les plus rares. Un excellent déjeuner était préparé dans des vases
+d’or; et tandis que les Paraguains mangèrent du maïs dans des écuelles
+de bois, en plein champ, à l’ardeur du soleil, le révérend père
+commandant entra dans la feuillée.
+
+C’était un très beau jeune homme, le visage plein, assez blanc, haut en
+couleur, le sourcil relevé, l’œil vif, l’oreille rouge, les lèvres
+vermeilles, l’air fier, mais d’une fierté qui n’était ni celle d’un
+Espagnol ni celle d’un jésuite. On rendit à \bname{Candide} et à \bname{Cacambo} leurs
+armes, qu’on leur avait saisies, ainsi que les deux
+chevaux
+ andalous;
+\bname{Cacambo} leur fit manger l’avoine auprès de la feuillée, ayant toujours
+l’œil sur eux, crainte de surprise.
+
+
+\bname{Candide} baisa d’abord le bas de la robe du commandant, ensuite ils se
+mirent à table. «Vous êtes donc allemand? lui dit le jésuite en cette
+langue. — Oui, mon
+Révérend
+Père», dit \bname{Candide}. L’un et l’autre, en
+prononçant ces paroles, se regardaient avec une extrême surprise, et
+une émotion dont ils n’étaient pas les maîtres. «Et de quel pays
+d’Allemagne êtes-vous? dit le jésuite. — De la sale province de
+\bname{Westphalie}, dit \bname{Candide}: je suis né dans le château de
+Thunder-ten-tronckh. — Ô ciel! est-il possible! s’écria le commandant.
+— Quel miracle! s’écria \bname{Candide}. — Serait-ce vous? dit le commandant. — Cela
+n’est pas possible», dit \bname{Candide}. Ils se laissent tomber tous deux à la
+renverse, ils s’embrassent, ils versent des ruisseaux de larmes. «Quoi!
+serait-ce vous, mon Révérend Père? vous, le frère de la belle
+\bname{Cunégonde}! vous qui fûtes tué par les Bulgares! vous le fils de
+M. le baron! vous jésuite au Paraguay! Il faut avouer que ce
+monde est une étrange chose. Ô \bname{Pangloss}! \bname{Pangloss}! que vous seriez aise
+si vous n’aviez pas été pendu!»
+
+
+Le commandant fit retirer les esclaves nègres et les \bname{Paraguains} qui
+servaient à boire dans des gobelets de cristal de roche. Il remercia
+Dieu et saint Ignace mille fois; il serrait \bname{Candide} entre ses bras,
+leurs visages étaient baignés de pleurs. «Vous seriez bien plus étonné,
+plus attendri, plus hors de vous-même, dit \bname{Candide}, si je vous disais
+que M\up{lle}~\bname{Cunégonde}, votre sœur, que vous avez crue éventrée,
+est pleine de santé. — Où? — Dans votre voisinage, chez M.~le gouverneur de
+\bname{Buenos} \bname{Aires}; et je venais pour vous faire la guerre.» Chaque mot qu’ils
+prononcèrent dans cette longue conversation accumulait prodige sur
+prodige. Leur âme tout entière volait sur leur langue, était attentive
+dans leurs oreilles, et étincelante dans leurs yeux. Comme ils étaient
+Allemands, ils tinrent table longtemps, en attendant le révérend père
+provincial; et le commandant parla ainsi à son cher \bname{Candide}.
+
+
+
+
+\chapter[Comment \bname{Candide} tua le frère…]{Comment \bname{Candide} tua le frère de sa chère \bname{Cunégonde}}
+
+
+\lettrine[ante=«]{J’}{aurai} toute ma vie présent à la mémoire le jour horrible où je vis
+tuer mon père et ma mère, et violer ma sœur. \textls[-5]{Quand les Bulgares furent
+retirés, on ne trouva point cette sœur adorable, et on mit dans une
+charrette ma mère, mon père, et moi, deux servantes et trois petits
+garçons égorgés, pour nous aller enterrer dans une chapelle de
+jésuites, à deux lieues du château de mes pères. Un jésuite nous jeta
+de l’eau bénite; elle était horriblement salée; il en entra quelques
+gouttes dans mes yeux; le père s’aperçut que ma paupière faisait un
+petit mouvement: il mit la main sur mon cœur, et le sentit palpiter;
+je fus secouru, et au bout de trois semaines il n’y paraissait pas.
+Vous savez, mon cher \bname{Candide}, que j’étais fort joli; je le devins
+encore davantage; aussi le révérend père Croust, supérieur de la
+maison, prit pour moi la plus tendre amitié; il me donna l’habit de
+novice; quelque temps après je fus envoyé à Rome. Le père général avait
+besoin d’une recrue de jeunes jésuites allemands. Les
+souverains
+du
+Paraguay reçoivent le moins qu’ils peuvent de jésuites espagnols; ils
+aiment mieux les étrangers, dont ils se croient plus maîtres. Je fus
+jugé propre par le révérend père général pour aller travailler dans
+cette vigne.
+Nous partîmes, un Polonais, un Tyrolien, et moi. Je fus
+honoré, en arrivant, du sous-diaconat et d’une lieutenance: je suis
+aujourd’hui colonel et prêtre. Nous recevrons vigoureusement les
+troupes du roi d’Espagne; je vous réponds qu’elles seront excommuniées
+et battues. La Providence vous envoie ici pour nous seconder. Mais
+est-il bien vrai que ma chère sœur \bname{Cunégonde} soit dans le voisinage,
+chez le gouverneur de \bname{Buenos} Aires?» \bname{Candide} l’assura par serment que
+rien n’était plus vrai. Leurs larmes recommencèrent à couler.}
+
+
+Le baron ne pouvait se lasser d’embrasser \bname{Candide}; il l’appelait son
+frère, son sauveur. «Ah! peut-être, lui dit-il, nous pourrons ensemble,
+mon cher \bname{Candide}, entrer en vainqueurs dans la ville, et reprendre ma
+sœur \bname{Cunégonde}. — C’est tout ce que je souhaite, dit \bname{Candide}; car je
+comptais l’épouser, et je l’espère encore. — Vous, insolent! répondit le
+baron, vous auriez l’impudence d’épouser ma sœur qui a soixante et
+douze quartiers! Je vous trouve bien effronté d’oser me parler d’un
+dessein si téméraire!» \bname{Candide}, pétrifié d’un tel discours, lui
+répondit: «Mon Révérend Père, tous les quartiers du monde n’y font rien;
+j’ai tiré votre sœur des bras d’un Juif et d’un inquisiteur; elle m’a
+assez d’obligations, elle veut m’épouser. Maître \bname{Pangloss} m’a toujours
+dit que les hommes sont égaux; et assurément je l’épouserai. — C’est ce
+que nous verrons, coquin!» dit le jésuite baron de Thunder-ten-tronckh;
+et en même temps il lui donna un grand coup du plat de son épée sur le
+visage. \bname{Candide} dans l’instant tire la sienne, et l’enfonce jusqu’à la
+garde dans le ventre du baron jésuite; mais en la retirant toute
+fumante, il se mit à pleurer: «Hélas! mon Dieu! dit-il, j’ai tué mon
+ancien maître, mon ami, mon beau-frère; je suis le meilleur homme du
+monde, et voilà déjà trois hommes que je tue; et dans ces trois il y a
+deux prêtres.»
+
+\bname{Cacambo}, qui faisait sentinelle à la porte de la feuillée, accourut. «Il
+ne nous reste qu’à vendre cher notre vie, lui dit son maître; on va,
+sans doute, entrer dans la feuillée; il faut mourir les armes à la
+main.» \bname{Cacambo}, qui en avait bien vu d’autres, ne perdit point la tête;
+il prit la robe de jésuite que portait le baron, la mit sur le corps de
+\bname{Candide}, lui donna le bonnet carré du mort, et le fit monter à cheval.
+Tout cela se fit en un clin d’œil. «Galopons, mon maître; tout le monde
+vous prendra pour un jésuite qui va donner des ordres; et nous aurons
+passé les frontières avant qu’on puisse courir après nous.» Il volait
+déjà en prononçant ces paroles, et en criant en espagnol: «Place, place
+pour le révérend père colonel!»
+
+\endinput
+
+
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/Ch-16-30.tex b/Master/texmf-dist/doc/lualatex/tango/examples/Ch-16-30.tex
new file mode 100644
index 00000000000..ca52af53a82
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/Ch-16-30.tex
@@ -0,0 +1,2061 @@
+
+
+\chapter[Ce qui advint aux deux voyageurs…]{Ce qui advint aux deux voyageurs avec deux filles,\\ deux singes, et les
+sauvages nommés Oreillons}
+
+
+\lettrine{C}{andide} et son valet furent au-delà des barrières, et personne ne
+savait encore dans le camp la mort du jésuite allemand. Le vigilant
+\bname{Cacambo} avait eu soin de remplir sa valise de pain, de chocolat, de
+jambon, de fruits, et de quelques mesures de vin. Ils s’enfoncèrent
+avec leurs chevaux andalous dans un pays inconnu où ils ne découvrirent
+aucune route. Enfin une belle prairie entrecoupée de ruisseaux se
+présenta devant eux. Nos deux voyageurs font repaître leurs montures.
+\bname{Cacambo} propose à son maître de manger, et lui en donne l’exemple.
+«Comment veux-tu, disait \bname{Candide}, que je mange du jambon, quand j’ai tué
+le fils de M.~le baron, et que je me vois condamné à ne revoir la
+belle \bname{Cunégonde} de ma vie? à quoi me servira de prolonger mes
+misérables jours, puisque je dois les traîner loin d’elle dans les
+remords et dans le désespoir? et que dira le Journal de Trévoux?»
+
+
+En parlant ainsi, il ne laissa pas de manger. Le soleil se couchait.
+Les deux égarés entendirent quelques petits cris qui paraissaient
+poussés par des femmes. Ils ne savaient si ces cris étaient de douleur
+ou de joie; mais ils se levèrent précipitamment avec cette inquiétude
+et cette alarme que tout inspire dans un pays inconnu. Ces clameurs
+partaient de deux filles toutes nues qui couraient légèrement au bord
+de la prairie, tandis que deux singes les suivaient en leur mordant les
+fesses. \bname{Candide} fut touché de pitié; il avait appris à tirer chez les
+Bulgares, et il aurait abattu une noisette dans un buisson sans toucher
+aux feuilles. Il prend son fusil espagnol à deux coups, tire, et tue
+les deux singes. «Dieu soit loué, mon cher \bname{Cacambo}! j’ai délivré d’un
+grand péril ces deux pauvres créatures: si j’ai commis un péché en
+tuant un inquisiteur et un jésuite, je l’ai bien réparé en sauvant la
+vie à deux filles. Ce sont peut-être deux demoiselles de condition, et
+cette aventure nous peut procurer de très grands avantages dans le
+pays.»
+
+
+Il allait continuer, mais sa langue devint percluse quand il vit ces
+deux filles embrasser tendrement les deux singes, fondre en larmes sur
+leurs corps, et remplir l’air des cris les plus douloureux. «Je ne
+m’attendais pas à tant de bonté d’âme», dit-il enfin à \bname{Cacambo}; lequel
+lui répliqua: «Vous avez fait là un beau chef d’œuvre, mon maître; vous
+avez tué les deux amants de ces demoiselles. — Leurs amants! serait-il
+possible? vous vous moquez de moi, \bname{Cacambo}; le moyen de vous croire?
+— Mon cher maître, repartit \bname{Cacambo}, vous êtes toujours étonné de tout;
+pourquoi trouvez-vous si étrange que dans quelques pays il y ait des
+singes qui obtiennent les bonnes grâces des dames? Ils sont des quarts
+d’homme, comme je suis un quart d’Espagnol. — Hélas! reprit \bname{Candide}, je
+me souviens d’avoir entendu dire à maître \bname{Pangloss} qu’autrefois pareils
+accidents étaient arrivés, et que ces mélanges avaient produit des
+égypans, des faunes, des satyres; que plusieurs grands personnages de
+l’antiquité en avaient vu; mais je prenais cela pour des fables. — Vous
+devez être convaincu à présent, dit \bname{Cacambo}, que c’est une vérité, et
+vous voyez comment en usent les personnes qui n’ont pas reçu une
+certaine éducation; tout ce que je crains, c’est que ces dames ne nous
+fassent quelque méchante affaire.»
+
+Ces réflexions solides engagèrent \bname{Candide} à quitter la prairie, et à
+s’enfoncer dans un bois. Il y soupa avec \bname{Cacambo}; et tous deux, après
+avoir maudit l’inquisiteur de Portugal, le gouverneur de \bname{Buenos} Aires,
+et le baron, s’endormirent sur de la mousse. À leur réveil, ils
+sentirent qu’ils ne pouvaient remuer; la raison en était que pendant la
+nuit les Oreillons, habitants du pays, à qui les deux dames les avaient
+dénoncés, les avaient garrottés avec des cordes d’écorces d’arbre.
+Ils étaient entourés d’une cinquantaine d’Oreillons tout nus, armés de
+flèches, de massues, et de haches de caillou: les uns faisaient bouillir
+une grande chaudière; les autres préparaient des broches, et tous
+criaient: «C’est un jésuite, c’est un jésuite! nous serons vengés, et
+nous ferons bonne chère; mangeons du jésuite, mangeons du jésuite!»
+
+«Je vous l’avais bien dit, mon cher maître, s’écria tristement \bname{Cacambo},
+que ces deux filles nous joueraient d’un mauvais tour.» \bname{Candide}
+apercevant la chaudière et les broches s’écria: «Nous allons
+certainement être rôtis ou bouillis. Ah! que dirait maître \bname{Pangloss},
+s’il voyait comme la pure nature est faite? Tout est bien; soit, mais
+j’avoue qu’il est bien cruel, d’avoir perdu M\up{lle}~\bname{Cunégonde}, et
+d’être mis à la broche par des Oreillons.» \bname{Cacambo} ne perdait jamais la
+tête. «Ne désespérez de rien, dit-il au désolé \bname{Candide}; j’entends un peu
+le jargon de ces peuples, je vais leur parler. — Ne manquez pas, dit
+\bname{Candide}, de leur représenter quelle est l’inhumanité affreuse de faire
+cuire des hommes, et combien cela est peu chrétien.»
+
+«Messieurs, dit \bname{Cacambo}, vous comptez donc manger aujourd’hui un
+jésuite : c’est très bien fait; rien n’est plus juste que de traiter
+ainsi ses ennemis. En effet le droit naturel nous enseigne à tuer notre
+prochain, et c’est ainsi qu’on en agit dans toute la terre. Si nous
+n’usons pas du droit de le manger, c’est que nous avons d’ailleurs de
+quoi faire bonne chère; mais vous n’avez pas les mêmes ressources que
+nous: certainement il vaut mieux manger ses ennemis que
+d’abandonner
+ aux corbeaux et aux corneilles le fruit de sa victoire. Mais,
+messieurs, vous ne voudriez pas manger vos amis. Vous croyez aller
+mettre un jésuite en broche, et c’est votre défenseur, c’est l’ennemi
+de vos ennemis que vous allez rôtir. Pour moi, je suis né dans votre
+pays; monsieur que vous voyez est mon maître, et bien loin d’être
+jésuite, il vient de tuer un jésuite, il en porte les dépouilles; voilà
+le sujet de votre méprise. Pour vérifier ce que je vous dis, prenez sa
+robe, portez-la à la première barrière du royaume de Los Padres;
+informez-vous si mon maître n’a pas tué un officier jésuite. Il vous
+faudra peu de temps; vous pourrez toujours nous manger, si vous trouvez
+que je vous ai menti. Mais, si je vous ai dit la vérité, vous
+connaissez trop les principes du droit public, les mœurs, et les lois,
+pour ne nous pas faire grâce.»
+
+Les Oreillons trouvèrent ce discours très raisonnable; ils députèrent
+deux notables pour aller en diligence s’informer de la vérité; les deux
+députés s’acquittèrent de leur commission en gens d’esprit, et
+revinrent bientôt apporter de bonnes nouvelles. Les Oreillons délièrent
+leurs deux prisonniers, leur firent toutes sortes de civilités, leur
+offrirent des filles, leur donnèrent des rafraîchissements, et les
+reconduisirent jusqu’aux confins de leurs états, en criant avec
+allégresse: «Il n’est point jésuite, il n’est point jésuite!»
+
+\bname{Candide} ne se lassait point d’admirer le sujet de sa délivrance. «Quel
+peuple! disait-il, quels hommes! quelles mœurs! si je n’avais pas eu
+le bonheur de donner un grand coup d’épée au travers du corps du frère
+de M\up{lle}~\bname{Cunégonde}, j’étais mangé sans rémission. Mais, après
+tout, la pure nature est bonne, puisque ces gens-ci, au lieu de me
+manger, m’ont fait mille honnêtetés, dès qu’ils ont su que je n’étais
+pas jésuite.»
+
+
+
+\chapter[Arrivée de \bname{Candide} et de son valet…]{Arrivée de \bname{Candide} et de son valet\\au pays d’Eldorado, et ce qu’ils y
+virent}
+
+
+\lettrine{Q}{uand} ils furent aux frontières des Oreillons: «Vous voyez, dit \bname{Cacambo}
+à \bname{Candide}, que cet hémisphère-ci ne vaut pas mieux que l’autre;
+croyez-moi, retournons en Europe par le plus court chemin. — Comment y
+retourner, dit \bname{Candide}; et où aller? Si je vais dans mon pays, les
+Bulgares et les Abares y égorgent tout; si je retourne en Portugal, j’y
+suis brûlé; si nous restons dans ce pays-ci, nous risquons à tout
+moment d’être mis en broche. Mais comment se résoudre à quitter la
+partie du monde que M\up{lle}~\bname{Cunégonde} habite?
+
+ — Tournons vers la Cayenne, dit \bname{Cacambo}, nous y trouverons des Français
+qui vont par tout le monde; ils pourront nous aider. Dieu aura
+peut-être pitié de nous.»
+
+Il n’était pas facile d’aller à la Cayenne: ils savaient bien à peu
+près de quel côté il fallait marcher; mais des montagnes, des fleuves,
+des précipices, des brigands, des sauvages, étaient partout de
+terribles obstacles. Leurs
+chevaux
+ moururent de fatigue; leurs
+provisions furent consumées; ils se nourrirent un mois entier de fruits
+sauvages, et se trouvèrent enfin auprès d’une petite rivière bordée de
+cocotiers qui soutinrent leur vie et leurs espérances.
+
+\bname{Cacambo}, qui donnait toujours d’aussi bons conseils que la vieille, dit
+à \bname{Candide}: «Nous n’en pouvons plus, nous avons assez marché; j’aperçois
+un canot vide sur le rivage, emplissons-le de cocos, jetons-nous dans
+cette petite barque, laissons-nous aller au courant; une rivière mène
+toujours à quelque endroit habité. Si nous ne trouvons pas des choses
+agréables, nous trouverons du moins des choses nouvelles. — Allons, dit
+\bname{Candide}, recommandons-nous à la \bname{Providence}.»
+
+
+Ils voguèrent quelques lieues entre des bords, tantôt fleuris, tantôt
+arides, tantôt unis, tantôt escarpés. La rivière s’élargissait
+toujours; enfin elle se perdait sous une voûte de rochers épouvantables
+qui s’élevaient jusqu’au ciel. Les deux voyageurs eurent la hardiesse
+de s’abandonner aux flots sous cette voûte. Le fleuve resserré en cet
+endroit les porta avec une rapidité et un bruit horrible. Au bout de
+vingt-quatre heures ils revirent le jour; mais leur canot se fracassa
+contre les écueils; il fallut se traîner de rocher en rocher pendant
+une lieue entière; enfin ils découvrirent un horizon immense, bordé de
+montagnes inaccessibles. Le pays était cultivé pour le plaisir comme
+pour le besoin; partout l’utile était agréable: les chemins étaient
+couverts ou plutôt ornés de voitures d’une forme et d’une matière
+brillante, portant des hommes et des femmes d’une beauté singulière,
+traînés rapidement par de gros moutons rouges qui surpassaient en
+vitesse les plus beaux chevaux d’\bname{Andalousie}, de \bname{Tétuan}, et de \bname{Méquinez}.
+
+
+
+
+«Voilà pourtant, dit \bname{Candide}, un pays qui vaut mieux que la \bname{Westphalie}.»
+Il mit pied à terre avec \bname{Cacambo} auprès du premier village qu’il
+rencontra. Quelques enfants du village, couverts de brocarts d’or tout
+déchirés, jouaient au palet à l’entrée du bourg; nos deux hommes de
+l’autre monde s’amusèrent à les regarder: leurs palets étaient d’assez
+larges pièces rondes, jaunes, rouges, vertes, qui jetaient un éclat
+singulier. Il prit envie aux voyageurs d’en ramasser quelques uns;
+c’était de l’or, c’était des émeraudes, des rubis, dont le moindre
+aurait été le plus grand ornement du trône du Mogol. «Sans doute, dit
+\bname{Cacambo}, ces enfants sont les fils du roi du pays qui jouent au petit
+palet.» Le magister du village parut dans ce moment pour les faire
+rentrer à l’école. «Voilà, dit \bname{Candide}, le précepteur de la famille
+royale.»
+
+Les petits gueux quittèrent aussitôt le jeu, en laissant à terre leurs
+palets, et tout ce qui avait servi à leurs divertissements.\bname{Candide} les
+ramasse, court au précepteur et les lui présente humblement, lui faisant
+entendre par signes que leurs altesses royales avaient oublié leur or
+et leurs pierreries. Le magister du village, en souriant, les jeta par
+terre, regarda un moment la figure de \bname{Candide} avec beaucoup de
+surprise, et continua son chemin.
+
+
+Les voyageurs ne manquèrent pas de ramasser l’or, les rubis, et les
+émeraudes. «Où sommes-nous? s’écria \bname{Candide}. Il faut que les enfants des
+rois de ce pays soient bien élevés, puisqu’on leur apprend à mépriser
+l’or et les pierreries.» \bname{Cacambo} était aussi surpris que \bname{Candide}. Ils
+approchèrent enfin de la première maison du village; elle était bâtie
+comme un palais d’Europe. Une foule de monde s’empressait à la porte,
+et encore plus dans le logis; une musique très agréable se faisait
+entendre, et une odeur délicieuse de cuisine se faisait sentir. \bname{Cacambo}
+s’approcha de la porte, et entendit qu’on parlait péruvien; c’était sa
+langue maternelle; car tout le monde sait que \bname{Cacambo} était né au
+Tucuman, dans un village où l’on ne connaissait que cette langue. «Je
+vous servirai d’interprète, dit-il à \bname{Candide}; entrons, c’est ici un
+cabaret.»
+
+Aussitôt deux garçons et deux filles de l’hôtellerie, vêtus de drap
+d’or, et les cheveux renoués avec des rubans, les invitent à se mettre
+à la table de l’hôte. On servit quatre potages garnis chacun de deux
+perroquets, un contour bouilli qui pesait deux cents livres, deux
+singes rôtis d’un goût excellent, trois cents colibris dans un plat, et
+six cents oiseaux-mouches dans un autre; des ragoûts exquis, des
+pâtisseries délicieuses; le tout dans des plats d’une espèce de cristal
+de roche. Les garçons et les filles de l’hôtellerie versaient plusieurs
+liqueurs faites de cannes de sucre.
+
+Les convives étaient pour la plupart des marchands et des voituriers,
+tous d’une politesse extrême, qui firent quelques questions à \bname{Cacambo}
+avec la discrétion la plus circonspecte, et qui répondirent aux siennes
+d’une manière à le satisfaire.
+
+Quand le repas fut fini, \bname{Cacambo} crut, ainsi que \bname{Candide}, bien payer
+son écot, en jetant sur la table de l’hôte deux de ces larges pièces
+d’or qu’il avait ramassées; l’hôte et l’hôtesse éclatèrent de rire, et
+se tinrent longtemps les côtés. Enfin ils se remirent. «Messieurs, dit
+l’hôte, nous voyons bien que vous êtes des étrangers; nous ne sommes
+pas accoutumés à en voir. Pardonnez-nous si nous nous sommes mis à rire
+quand vous nous avez offert en paiement les cailloux de nos grands
+chemins. Vous n’avez pas sans doute de la monnaie du pays, mais il
+n’est pas nécessaire d’en avoir pour dîner ici. Toutes les hôtelleries
+établies pour la commodité du commerce sont payées par le gouvernement.
+Vous avez fait mauvaise chère ici, parce que c’est un pauvre village,
+mais partout ailleurs vous serez reçus comme vous méritez de l’être.»
+\bname{Cacambo} expliquait à \bname{Candide} tous les discours de l’hôte, et \bname{Candide}
+les écoutait avec la même admiration et le même égarement que son ami
+\bname{Cacambo} les rendait. «Quel est donc ce pays, disaient-ils l’un et
+l’autre, inconnu à tout le reste de la terre, et où toute la nature est
+d’une espèce si différente de la nôtre? C’est probablement le pays où
+tout va bien; car il faut absolument qu’il y en ait un de cette espèce.
+Et, quoi qu’en dît maître \bname{Pangloss}, je me suis souvent aperçu que tout
+allait assez mal en \bname{Westphalie}.»
+
+
+\chapter{Ce qu’ils virent dans le pays d’Eldorado}
+
+
+
+\lettrine{C}{acambo} témoigna à son hôte toute sa curiosité; l’hôte lui dit: «Je suis
+fort ignorant, et je m’en trouve bien; mais nous avons ici un vieillard
+retiré de la cour qui est le plus savant homme du royaume, et le plus
+communicatif.» \textls[5]{Aussitôt il mène \bname{Cacambo} chez le vieillard. \bname{Candide} ne
+jouait plus que le second personnage, et accompagnait son valet. Ils
+entrèrent dans une maison fort simple, car la porte n’était que
+d’argent, et les lambris des appartements n’étaient que d’or, mais
+travaillés avec tant de goût, que les plus riches lambris ne
+l’effaçaient pas. L’antichambre n’était à la vérité incrustée que de
+rubis et d’émeraudes; mais l’ordre dans lequel tout était arrangé
+réparait bien cette extrême simplicité.
+
+Le vieillard reçut les deux étrangers sur un sofa matelassé de plumes
+de colibri, et leur fit présenter des liqueurs dans des vases de
+diamant; après quoi il satisfit à leur curiosité en ces termes:
+
+
+«Je suis âgé de cent soixante et douze ans, et j’ai appris de feu mon
+père, écuyer du roi, les étonnantes révolutions du Pérou dont il avait
+été témoin. Le royaume où nous sommes est l’ancienne patrie des Incas,
+qui en sortirent très imprudemment pour aller subjuguer une partie du
+monde, et qui furent enfin détruits par les Espagnols.
+
+«Les princes de leur famille qui restèrent dans leur pays natal furent
+plus sages; ils ordonnèrent, du consentement de la nation, qu’aucun
+habitant ne sortirait jamais de notre petit royaume; et c’est ce qui
+nous a conservé notre innocence et notre félicité. Les Espagnols ont eu
+une connaissance confuse de ce pays, ils l’ont appelé El Dorado; et un
+\bname{Anglais}, nommé le chevalier Raleigh, en a même approché il y a environ
+cent années; mais, comme nous sommes entourés de rochers inabordables
+et de précipices, nous avons toujours été jusqu’à présent à l’abri de
+la rapacité des nations de l’Europe, qui ont une fureur inconcevable
+pour les cailloux et pour la fange de notre terre, et qui, pour en
+avoir, nous tueraient tous jusqu’au dernier.»
+
+La conversation fut longue; elle roula sur la forme du gouvernement,
+sur les mœurs, sur les femmes, sur les spectacles publics, sur les
+arts. Enfin \bname{Candide}, qui avait
+toujours
+ du goût pour la métaphysique,
+fit demander par \bname{Cacambo} si dans le pays il y avait une religion.
+
+%\looseness=1
+Le vieillard rougit un peu. «Comment donc! dit-il, en pouvez-vous
+douter? Est-ce que vous nous prenez pour des ingrats?» \bname{Cacambo} demanda
+humblement quelle était la religion d’Eldorado. Le vieillard rougit
+encore: «Est-ce qu’il peut y avoir deux religions? dit-il. Nous avons,
+je crois, la religion de tout le monde; nous adorons Dieu du soir
+jusqu’au matin. — N’adorez vous qu’un seul Dieu? dit \bname{Cacambo}, qui servait
+toujours d’interprète aux doutes de \bname{Candide}. — Apparemment, dit le
+vieillard, qu’il n’y en a ni deux, ni trois, ni quatre. Je vous avoue
+que les gens de votre monde font des questions bien singulières.»
+\bname{Candide} ne se lassait pas de faire interroger ce bon vieillard; il
+voulut savoir comment on priait Dieu dans Eldorado. «Nous ne le prions
+point, dit le bon et respectable sage; nous n’avons rien à lui
+demander, il nous a donné tout ce qu’il nous faut; nous le remercions
+sans cesse.» \bname{Candide} eut la curiosité de voir des prêtres; il fit
+demander où ils étaient. Le bon vieillard sourit. «Mes amis, dit-il,
+nous sommes tous prêtres; le roi et tous les chefs de famille chantent
+des
+cantiques d’actions de grâces solennellement tous les matins, et
+cinq ou six mille musiciens les accompagnent.
+
+— Quoi! vous n’avez point
+de moines qui enseignent, qui disputent, qui gouvernent, qui cabalent,
+et qui font brûler les gens qui ne sont pas de leur avis? — Il faudrait
+que nous fussions fous, dit le vieillard; nous sommes tous ici du même
+avis, et nous n’entendons pas ce que vous voulez dire avec vos moines.»
+\bname{Candide} à tous ces discours demeurait en extase, et disait en lui-même:
+«Ceci est bien différent de la \bname{Westphalie} et du château de monsieur le
+baron: si notre ami \bname{Pangloss} avait vu Eldorado, il n’aurait plus dit
+que le château de Thunder-ten-tronckh était ce qu’il y avait de mieux
+sur la terre; il est certain qu’il faut voyager.»
+
+
+Après cette longue conversation, le bon vieillard fit atteler un
+carrosse à six moutons, et donna douze de ses domestiques aux deux
+voyageurs pour les conduire à la cour. «Excusez-moi, leur dit-il, si mon
+âge me prive de l’honneur de vous accompagner. Le roi vous recevra
+d’une manière dont vous ne serez pas mécontents, et vous pardonnerez
+sans doute aux usages du pays, s’il y en a quelques uns qui vous
+déplaisent.»
+
+
+\bname{Candide} et \bname{Cacambo} montent en carrosse; les six moutons volaient, et en
+moins de quatre heures on arriva au palais du roi, situé à un bout de
+la capitale. Le portail était de deux cent vingt pieds de haut, et de
+cent de large; il est impossible d’exprimer quelle en était la matière.
+On voit assez quelle supériorité prodigieuse elle devait avoir sur ces
+cailloux et sur ce sable que nous nommons \emph{or} et {pierreries}.
+
+
+Vingt belles filles de la garde reçurent \bname{Candide} et \bname{Cacambo} à la
+descente du carrosse, les conduisirent aux bains, les vêtirent de robes
+d’un tissu de duvet de colibri; après quoi les grands officiers et les
+grandes officières de la couronne les
+menèrent à l’appartement de Sa
+Majesté au milieu de deux files, chacune de mille musiciens, selon
+l’usage ordinaire. Quand ils approchèrent de la salle du trône, \bname{Cacambo}
+demanda à un grand officier comment il fallait s’y prendre pour saluer
+Sa Majesté: si on se jetait à genoux ou ventre à terre; si on mettait
+les mains sur la tête ou sur le derrière; si on léchait la poussière de
+la salle: en un mot, quelle était la cérémonie. «L’usage, dit le
+grand-officier, est d’embrasser le roi et de le baiser des deux côtés.»
+\bname{Candide} et \bname{Cacambo} sautèrent au cou de Sa Majesté, qui les reçut avec
+toute la grâce imaginable, et qui les pria poliment à souper.
+
+
+En attendant, on leur fit voir la ville, les édifices publics élevés
+jusqu’aux nues, les marchés ornés de mille colonnes, les fontaines
+d’eau pure, les fontaines d’eau rose, celles de liqueurs de canne de
+sucre qui coulaient continuellement dans de grandes places pavées d’une
+espèce de pierreries qui répandaient une odeur semblable à celle du
+girofle et de la cannelle. \bname{Candide} demanda à voir la cour de justice,
+le parlement; on lui dit qu’il n’y en avait point, et qu’on ne plaidait
+jamais. Il s’informa s’il y avait des prisons, et on lui dit que non.
+Ce qui le surprit davantage, et qui lui fit le plus de plaisir, ce fut
+le palais des sciences, dans lequel il vit une galerie de deux mille
+pas, toute pleine d’instruments de mathématiques et de physique.}
+
+
+Après avoir parcouru toute l’après-dinée à peu près la millième partie
+de la ville, on les ramena chez le roi. \bname{Candide} se mit à table entre Sa
+\bname{Majesté}, son valet \bname{Cacambo}, et plusieurs dames. Jamais on ne fit
+meilleure chère, et jamais on n’eut plus d’esprit à souper qu’en eut Sa
+\bname{Majesté}. \bname{Cacambo} expliquait les bons mots du roi à \bname{Candide}, et quoique
+traduits, ils paraissaient toujours des bons mots. De tout ce qui
+étonnait \bname{Candide}, ce n’était pas ce qui l’étonna le moins.
+
+Ils passèrent un mois dans cet hospice. \bname{Candide} ne cessait de dire à
+\bname{Cacambo}: «Il est vrai, mon ami, encore une fois, que le château où je
+suis né ne vaut pas le pays où nous sommes; mais enfin M\up{lle}~\bname{Cunégonde} n’y est pas, et vous avez sans doute quelque maîtresse en
+Europe. Si nous restons ici, nous n’y serons que comme les autres; au
+lieu que si nous retournons dans notre monde, seulement avec douze
+moutons chargés de cailloux d’Eldorado, nous serons plus riches que
+tous les rois ensemble, nous n’aurons plus d’inquisiteurs à craindre,
+et nous pourrons aisément reprendre M\up{lle}~\bname{Cunégonde}.»
+
+Ce discours plut à \bname{Cacambo}; on aime tant à courir, à se faire valoir
+chez les siens, à faire parade de ce qu’on a vu dans ses voyages, que
+les deux heureux résolurent de ne plus l’être, et de demander leur
+congé à Sa Majesté.
+
+«Vous faites une sottise, leur dit le roi: je sais bien que mon pays est
+peu de chose; mais, quand on est passablement quelque part, il faut y
+rester. Je n’ai pas assurément le droit de retenir des étrangers; c’est
+une tyrannie qui n’est ni dans nos mœurs ni dans nos lois; tous les
+hommes sont libres; partez quand vous voudrez, mais la sortie est bien
+difficile. Il est impossible de remonter la rivière rapide sur laquelle
+vous êtes arrivés par miracle, et qui court sous des voûtes de rochers.
+Les montagnes qui entourent tout mon royaume ont dix mille pieds de
+hauteur, et sont droites comme des murailles: elles occupent chacune en
+largeur un espace de plus de dix lieues; on ne peut en descendre que
+par des précipices. Cependant, puisque vous voulez absolument partir,
+je vais donner ordre aux intendants des machines d’en faire une qui
+puisse vous transporter commodément. Quand on vous aura conduits au
+revers des montagnes, personne ne pourra vous accompagner; car mes
+sujets ont fait vœu de ne jamais sortir de leur enceinte, et ils sont
+trop sages pour rompre leur vœu. Demandez-moi d’ailleurs tout ce qu’il
+vous plaira. — Nous ne demandons à Votre Majesté, dit \bname{Cacambo}, que
+quelques moutons chargés de vivres, de cailloux, et de la boue du pays.»
+Le roi rit: «Je ne conçois pas, dit-il, quel goût vos gens d’Europe ont
+pour notre boue jaune: mais emportez-en tant que vous voudrez, et grand
+bien vous fasse.»
+
+Il donna l’ordre sur-le-champ à ses ingénieurs de faire une machine
+pour guinder ces deux hommes extraordinaires hors du royaume. Trois
+mille bons physiciens y travaillèrent; elle fut prête au bout de quinze
+jours, et ne coûta pas plus de vingt millions de livres sterling,
+monnaie du pays. On mit sur la machine \bname{Candide} et \bname{Cacambo}; il y avait
+deux grands moutons rouges sellés et bridés pour leur servir de monture
+quand ils auraient franchi les montagnes, vingt moutons de bât chargés
+de vivres, trente qui portaient des présents de ce que le pays a de
+plus curieux, et cinquante chargés d’or, de pierreries, et de diamants.
+Le roi embrassa tendrement les deux vagabonds.
+
+Ce fut un beau spectacle que leur départ, et la manière ingénieuse dont
+ils furent hissés eux et leurs moutons au haut des montagnes. Les
+physiciens prirent congé d’eux après les avoir mis en sûreté, et
+\bname{Candide} n’eut plus d’autre désir et d’autre objet que d’aller présenter
+ses moutons à M\up{lle}~\bname{Cunégonde}. «Nous avons, dit-il, de quoi payer
+le gouverneur de \bname{Buenos} Aires, si M\up{lle}~\bname{Cunégonde} peut être mise
+à prix. Marchons vers la Cayenne, embarquons-nous, et nous verrons
+ensuite quel royaume nous pourrons acheter.»
+
+
+
+
+\chapter[Ce qui leur arriva à Surinam…]{Ce qui leur arriva à Surinam, et comment \bname{Candide} fit connaissance avec
+\bname{Martin}}
+
+
+\lettrine{L}{a première} journée de nos deux voyageurs fut assez agréable. Ils
+étaient encouragés par l’idée de se voir possesseurs de plus de trésors
+que l’Asie, \bname{l’Europe}, et l’Afrique, n’en pouvaient rassembler. \bname{Candide}
+transporté écrivit le nom de \bname{Cunégonde} sur les arbres. À la seconde
+journée deux de leurs moutons s’enfoncèrent dans des marais, et y
+furent abîmés avec leurs charges; deux autres moutons moururent de
+fatigue quelques jours après; sept ou huit périrent ensuite de faim
+dans un désert; d’autres tombèrent au bout de quelques jours dans des
+précipices. Enfin, après cent jours de marche, il ne leur resta que
+deux moutons. \bname{Candide} dit à \bname{Cacambo}: «Mon ami, vous voyez comme les
+richesses de ce monde sont périssables; il n’y a rien de solide que la
+vertu et le bonheur de revoir M\up{lle}~\bname{Cunégonde}. — Je l’avoue, dit
+\bname{Cacambo}; mais il nous reste encore deux moutons avec plus de trésors
+que n’en aura jamais le roi d’Espagne; et je vois bien de loin une
+ville que je soupçonne être Surinam, appartenante aux Hollandais. Nous
+sommes au bout de nos peines et au commencement de notre félicité.»
+
+%\looseness=1
+En approchant de la ville, ils rencontrèrent un nègre étendu par terre,
+n’ayant plus que la moitié de son habit, c’est-à-dire d’un caleçon de
+toile bleue; il manquait à ce pauvre homme la jambe gauche et la main
+droite. «Eh! mon Dieu! lui dit \bname{Candide} en hollandais, que fais-tu là,
+mon ami, dans l’état horrible où je te vois? — J’attends mon maître, M.~\bname{Vanderdendur}, le fameux négociant, répondit le nègre. — Est-ce M.~\bname{Vanderdendur}, dit \bname{Candide}, qui t’a traité ainsi? — Oui, monsieur, dit le
+nègre, c’est l’usage. On nous donne un caleçon de toile pour tout
+vêtement deux fois l’année. Quand nous travaillons aux sucreries, et
+que la meule nous attrape le doigt, on nous coupe la main: quand nous
+voulons nous enfuir, on nous coupe la jambe: je me suis trouvé dans les
+deux cas. C’est à ce prix que vous mangez du sucre en Europe.
+Cependant, lorsque ma mère me vendit dix écus patagons sur la côte de
+Guinée, elle me disait: \frquote{\localleftbox{« }Mon cher enfant, bénis nos fétiches, adore-les
+toujours, ils te feront vivre heureux; tu as l’honneur d’être esclave
+de nos seigneurs les blancs, et tu fais par là la fortune de ton père
+et de ta mère.}\localleftbox{} Hélas! je ne sais pas si j’ai fait leur fortune, mais
+ils n’ont pas fait la mienne. Les chiens, les singes, et les
+perroquets, sont mille fois moins malheureux que nous: les fétiches
+hollandais qui m’ont converti me disent tous les dimanches que nous
+sommes tous enfants d’Adam, blancs et noirs. Je ne suis pas
+généalogiste; mais si ces prêcheurs disent vrai, nous sommes tous
+cousins issus de germain. Or vous m’avouerez qu’on ne peut pas en user
+avec ses parents d’une manière \linebreak plus horrible.
+
+
+— Ô \bname{Pangloss}! s’écria \bname{Candide}, tu n’avais pas deviné cette abomination;
+c’en est fait, il faudra qu’à la fin je renonce à ton optimisme.
+— Qu’est-ce qu’optimisme? disait \bname{Cacambo}. — Hélas! dit \bname{Candide}, c’est la
+rage de soutenir que tout est bien quand on est mal»; et il versait des
+larmes en regardant son nègre; et en pleurant, il entra dans \bname{Surinam}.
+
+La première chose dont ils s’informent, c’est s’il n’y a point au port
+quelque vaisseau qu’on pût envoyer à \bname{Buenos} Aires. Celui à qui ils
+s’adressèrent était justement un patron espagnol qui s’offrit à faire
+avec eux un marché honnête. Il leur donna rendez-vous dans un cabaret.
+\bname{Candide} et le fidèle \bname{Cacambo} allèrent l’y attendre avec leurs deux
+moutons.
+
+
+\bname{Candide}, qui avait le cœur sur les lèvres, conta à \bname{l’Espagnol} toutes
+ses aventures, et lui avoua qu’il voulait enlever mademoiselle
+\bname{Cunégonde}. «Je me garderai bien de vous passer à \bname{Buenos} Aires, dit le
+patron: je serais pendu, et vous aussi; la belle \bname{Cunégonde} est la
+maîtresse favorite de monseigneur.» Ce fut un coup de foudre pour
+\bname{Candide}, il pleura longtemps; enfin il tira à part \bname{Cacambo}. «Voici, mon
+cher ami, lui dit-il, ce qu’il faut que tu fasses. Nous avons chacun
+dans nos poches pour cinq ou six millions de diamants, tu es plus
+habile que moi; va prendre M\up{lle}~\bname{Cunégonde} à \bname{Buenos} Aires. Si le
+gouverneur fait quelque difficulté, donne-lui un million: s’il ne se
+rend pas, donne-lui-en deux; tu n’as point tué d’inquisiteur, on ne se
+défiera point de toi. J’équiperai un autre vaisseau, j’irai t’attendre
+à \bname{Venise}: c’est un pays libre où l’on n’a rien à craindre ni des
+Bulgares, ni des Abares, ni des Juifs, ni des inquisiteurs.» \bname{Cacambo}
+applaudit, à cette sage résolution. Il était au désespoir de se séparer
+d’un bon maître devenu son ami intime; mais le plaisir de lui être
+utile l’emporta sur la douleur de le quitter. Ils s’embrassèrent en
+versant des larmes: \bname{Candide} lui recommanda de ne point oublier la bonne
+vieille. \bname{Cacambo} partit dès le jour même: c’était un très bon homme que
+ce \bname{Cacambo}.
+
+\bname{Candide} resta encore quelque temps à Surinam, et attendit qu’un autre
+patron voulût le mener en Italie lui et les deux moutons qui lui
+restaient. Il prit des domestiques, et acheta tout ce qui lui était
+nécessaire pour un long voyage; enfin M.~\bname{Vanderdendur}, maître d’un gros
+vaisseau, vint se présenter à lui. «Combien voulez-vous, demanda-t-il à
+cet homme, pour me mener en droiture à \bname{Venise}, moi, mes gens, mon
+bagage, et les deux moutons que voilà?» Le patron s’accorda à dix mille
+piastres: \bname{Candide} n’hésita pas.
+
+
+«Oh! oh! dit à part soi le prudent Vanderdendur, cet étranger donne dix
+mille piastres tout d’un coup! il faut qu’il soit bien riche.» Puis
+revenant un moment après, il signifia qu’il ne pouvait partir à moins
+de vingt mille. «Eh bien! vous les aurez, dit \bname{Candide}.
+
+«Ouais, se dit tout bas le marchand, cet homme donne vingt mille
+piastres aussi aisément que dix mille.» Il revint encore, et dit qu’il
+ne pouvait le conduire à \bname{Venise} à moins de trente mille piastres. «Vous
+en aurez donc trente mille», répondit \bname{Candide}.
+
+«Oh! oh! se dit encore le marchand hollandais, trente mille piastres ne
+coûtent rien à cet homme-ci; sans doute les deux moutons portent des
+trésors immenses; n’insistons pas davantage: faisons-nous d’abord payer
+les trente mille piastres, et puis nous verrons.» \bname{Candide}, vendit deux
+petits diamants, dont le moindre valait plus que tout l’argent que
+demandait le patron. Il le paya d’avance. Les deux moutons furent
+embarqués. \bname{Candide} suivait dans un petit bateau pour joindre le
+vaisseau à la rade; le patron prend son temps, met à la voile, démarre;
+le vent le favorise. \bname{Candide} éperdu et stupéfait le perd bientôt de
+vue. «Hélas! cria-t-il, voilà un tour digne de l’Ancien Monde.» Il
+retourne au rivage, abîmé dans la douleur; car enfin il avait perdu de
+quoi faire la fortune de vingt monarques.
+
+Il se transporte chez le juge hollandais; et, comme il était un peu
+troublé, il frappe rudement à la porte; il entre, expose son aventure,
+et crie un peu plus haut qu’il ne convenait. Le juge commença par lui
+faire payer dix mille piastres pour le bruit qu’il avait fait: ensuite
+il l’écouta patiemment, lui promit d’examiner son affaire sitôt que le
+marchand serait revenu, et se fit payer dix mille autres piastres pour
+les frais de l’audience.
+
+Ce procédé acheva de désespérer \bname{Candide}; il avait à la vérité essuyé
+des malheurs mille fois plus douloureux; mais le sang froid du juge, et
+celui du patron dont il était volé, alluma sa bile, et le plongea dans
+une noire
+mélancolie. La méchanceté des hommes se présentait à son
+esprit dans toute sa laideur, il ne se nourrissait que d’idées tristes.
+Enfin un vaisseau français étant sur le point de partir pour Bordeaux,
+comme il n’avait plus de moutons chargés de diamants à embarquer, il
+loua une chambre du vaisseau à juste prix, et fit signifier dans la
+ville qu’il paierait le passage, la nourriture, et donnerait deux mille
+piastres à un honnête homme qui voudrait faire le voyage avec lui, à
+condition que cet homme serait le plus dégoûté de son état, et le plus
+malheureux de la province.
+
+
+Il se présenta une foule de prétendants qu’une flotte n’aurait pu
+contenir. \bname{Candide}, voulant choisir entre les plus apparents, il
+distingua une vingtaine de personnes qui lui paraissaient sociables, et
+qui toutes prétendaient mériter la préférence. Il les assembla dans son
+cabaret, et leur donna à souper, à condition que chacun ferait serment
+de raconter fidèlement son histoire, promettant de choisir celui qui
+lui paraîtrait le plus à plaindre et le plus mécontent de son état, à
+plus juste titre, et de donner aux autres quelques gratifications.
+
+La séance dura jusqu’à quatre heures du matin. \bname{Candide}, en écoutant
+toutes leurs aventures, se ressouvenait de ce que lui avait dit la
+vieille en allant à \bname{Buenos} Aires, et de la gageure qu’elle avait faite,
+qu’il n’y avait personne sur le vaisseau à qui il ne fût arrivé de très
+grands malheurs. Il songeait à \bname{Pangloss} à chaque aventure qu’on lui
+contait. Ce \bname{Pangloss}, disait-il, serait bien embarrassé à démontrer son
+système. Je voudrais qu’il fût ici. Certainement si tout va bien, c’est
+dans Eldorado, et non pas dans le reste de la terre. Enfin il se
+détermina en faveur d’un pauvre savant qui avait travaillé dix ans pour
+les libraires à Amsterdam. Il jugea qu’il n’y avait point de métier au
+monde dont on dût être plus dégoûté.
+
+Ce savant, qui était d’ailleurs un bon homme, avait été volé par sa
+femme, battu par son fils, et abandonné de sa fille, qui s’était fait
+enlever par un Portugais. Il venait d’être privé d’un petit emploi
+duquel il subsistait; et les prédicants de Surinam le persécutaient,
+parce qu’ils le prenaient pour un socinien. Il faut avouer que les
+autres étaient pour le moins aussi malheureux que lui; mais \bname{Candide}
+espérait que le \bname{savant} le désennuierait dans le voyage. Tous ses autres
+rivaux trouvèrent que \bname{Candide} leur faisait une grande injustice; mais il
+les apaisa en leur donnant à chacun cent piastres.
+
+
+
+\chapter{Ce qui arriva sur mer à \bname{Candide} et à \bname{Martin}}
+
+
+\lettrine{L}{e vieux} savant, qui s’appelait \bname{Martin}, s’embarqua donc pour Bordeaux
+avec \bname{Candide}. L’un et l’autre avaient beaucoup vu et beaucoup souffert;
+et quand le vaisseau aurait dû faire voile de Surinam au Japon par le
+cap de Bonne-Espérance, ils auraient eu de quoi s’entretenir du mal
+moral et du mal physique pendant tout le voyage.
+
+
+Cependant \bname{Candide} avait un grand avantage sur \bname{Martin}, c’est qu’il
+espérait toujours revoir M\up{lle}~\bname{Cunégonde}, et que \bname{Martin} n’avait
+rien à espérer; de plus il avait de l’or et des diamants; et, quoiqu’il
+eût perdu cent gros moutons rouges chargés des plus grands trésors de
+la terre, quoiqu’il eût toujours sur le cœur la friponnerie du patron
+hollandais, cependant quand il songeait à ce qui lui restait dans ses
+poches, et quand il parlait de \bname{Cunégonde}, surtout à la fin du repas, il
+penchait alors pour le système de \bname{Pangloss}.
+
+
+«Mais vous, monsieur \bname{Martin}, dit-il au savant, que pensez-vous de tout
+cela? quelle est votre idée sur le mal moral et le mal physique?
+— Monsieur, répondit \bname{Martin}, mes prêtres m’ont accusé d’être socinien;
+mais la vérité du fait est que je suis manichéen. — Vous vous moquez
+de moi, dit \bname{Candide}; il n’y a plus de manichéens dans le monde. — Il y a
+moi, dit \bname{Martin}: je ne sais qu’y faire; mais je ne peux penser
+autrement. — Il faut que vous ayez le diable au corps, dit \bname{Candide}. — Il se
+mêle si fort des affaires de ce monde, dit \bname{Martin}, qu’il pourrait bien
+être dans mon corps, comme partout ailleurs; mais je vous avoue qu’en
+jetant la vue sur ce globe, ou plutôt sur ce globule, je pense que Dieu
+l’a abandonné à quelque être malfaisant; j’en excepte toujours
+Eldorado. Je n’ai guère vu de ville qui ne désirât la ruine de la ville
+voisine, point de famille qui ne voulût exterminer quelque autre
+famille. Partout les faibles ont en exécration les puissants devant
+lesquels ils rampent, et les puissants les traitent comme des troupeaux
+dont on vend la laine et la chair. Un million d’assassins enrégimentés,
+courant d’un bout de \bname{l’Europe} à
+ l’autre, exerce le meurtre et le
+brigandage avec discipline pour gagner son pain, parce qu’il n’a pas de
+métier plus honnête; et dans les villes qui paraissent jouir de la
+paix, et où les arts fleurissent, les hommes sont dévorés de plus
+d’envie, de soins, et d’inquiétudes, qu’une ville assiégée n’éprouve de
+fléaux. Les chagrins secrets sont encore plus cruels que les misères
+publiques. En un mot j’en ai tant vu et tant éprouvé, que \linebreak je suis
+manichéen.
+
+
+
+— Il y a pourtant du bon, répliquait \bname{Candide}. — Cela peut être, disait
+\bname{Martin}; mais je ne le connais pas.»
+
+
+
+Au milieu de cette dispute, on entendit un bruit de canon. Le bruit
+redouble de moment en moment. Chacun prend sa lunette. On aperçoit deux
+vaisseaux qui combattaient à la distance d’environ trois milles: le
+vent les amena l’un et l’autre si près du vaisseau français, qu’on eut
+le plaisir de voir le combat tout à son aise. Enfin l’un des deux
+vaisseaux lâcha à l’autre une bordée si bas et si juste, qu’il le coula
+à fond. \bname{Candide} et \bname{Martin} aperçurent distinctement une centaine
+d’hommes sur le tillac du vaisseau qui s’enfonçait; ils levaient tous
+les mains au ciel, et jetaient des clameurs effroyables; en un moment
+tout fut englouti.
+
+Eh bien! dit \bname{Martin}, voilà comme les hommes se traitent les uns les
+autres. Il est vrai, dit \bname{Candide}, qu’il y a quelque chose de diabolique
+dans cette affaire. En parlant ainsi, il aperçut je ne sais quoi d’un
+rouge éclatant, qui nageait auprès de son vaisseau. On détacha la
+chaloupe pour voir ce que ce pouvait être; c’était un de ses moutons.
+\bname{Candide} eut plus de joie de retrouver ce mouton, qu’il n’avait été
+affligé d’en perdre cent tous chargés de gros diamants d’Eldorado.
+
+Le capitaine français aperçut bientôt que le capitaine du vaisseau
+submergeant était espagnol, et que celui du vaisseau submergé était un
+pirate hollandais; c’était celui-là même qui avait volé \bname{Candide}. Les
+richesses immenses dont ce scélérat s’était emparé furent ensevelies
+avec lui dans la mer, et il n’y eut qu’un mouton de sauvé. «Vous voyez,
+dit \bname{Candide} à \bname{Martin}, que le crime est puni quelquefois; ce coquin de
+patron hollandais a eu le sort qu’il méritait. — Oui, dit \bname{Martin}; mais
+fallait-il que les passagers qui étaient sur son vaisseau périssent
+aussi? Dieu a puni ce fripon, le diable a noyé \linebreak les autres.»
+
+Cependant le vaisseau français et l’espagnol continuèrent leur route,
+et \bname{Candide} continua ses conversations avec \bname{Martin}. Ils disputèrent
+quinze jours de suite, et au bout de quinze jours ils étaient aussi
+avancés que le premier. Mais enfin ils parlaient, ils se communiquaient
+des idées, ils se consolaient. \bname{Candide} caressait son mouton. «Puisque je
+t’ai retrouvé, dit-il, je pourrai bien retrouver \bname{Cunégonde}.»
+
+
+
+\chapter[Candide et \bname{Martin} approchent des côtes…]{Candide et \bname{Martin} approchent des côtes\\ de France, et raisonnent.}
+
+
+\lettrine{O}{n aperçut} enfin les côtes de France. «Avez-vous jamais été en France,
+monsieur \bname{Martin}? dit \bname{Candide}. — Oui, dit \bname{Martin}, j’ai parcouru plusieurs
+provinces. Il y en a où la moitié des habitants est folle, quelques
+unes où l’on est trop rusé, d’autres où l’on est communément assez doux
+et assez bête, d’autres où l’on fait le bel esprit; et, dans toutes, la
+principale occupation est l’amour, la seconde, de médire; et la
+troisième, de dire des sottises. — Mais, monsieur \bname{Martin}, avez-vous vu
+Paris? — Oui, j’ai vu Paris; il tient de toutes ces espèces-là; c’est un
+chaos, c’est une presse dans laquelle tout le monde cherche le plaisir,
+et où presque personne ne le trouve, du moins à ce qu’il m’a paru. J’y
+ai séjourné peu; j’y fus volé, en arrivant, de tout ce que j’avais, par
+des filous, à la foire Saint-Germain; on me prit moi-même pour un
+voleur, et je fus huit jours en prison; après quoi je me fis correcteur
+d’imprimerie pour gagner de quoi retourner à pied en \bname{Hollande}. Je
+connus la canaille écrivante, la canaille cabalante, et la canaille
+convulsionnaire. On dit qu’il y a des gens fort polis dans cette
+ville-là: je le veux croire.
+
+— Pour moi, je n’ai nulle curiosité de voir la France, dit \bname{Candide}; vous
+devinez aisément que quand on a passé un mois dans Eldorado, on ne se
+soucie plus de rien voir sur la terre que M\up{lle}~\bname{Cunégonde}; je
+vais l’attendre à \bname{Venise}; nous
+traverserons
+ la France pour aller en
+Italie; ne m’accompagnerez-vous pas? — Très volontiers, dit \bname{Martin}: on
+dit que \bname{Venise} n’est bonne que pour les nobles Vénitiens, mais que
+cependant on y reçoit très bien les étrangers quand ils ont beaucoup
+d’argent; je n’en ai point; vous en avez, je vous suivrai partout. — À
+propos, dit \bname{Candide}, pensez-vous que la terre ait été originairement
+une mer, comme on l’assure dans ce gros livre qui appartient au
+capitaine du vaisseau? — Je n’en crois rien du tout, dit \bname{Martin}, non
+plus que de toutes les rêveries qu’on nous débite depuis quelque temps.
+— Mais à quelle fin ce monde a-t-il donc été formé? dit \bname{Candide}. — Pour
+nous faire enrager, répondit \bname{Martin}. — N’êtes-vous pas bien étonné,
+continua \bname{Candide}, de l’amour que ces deux filles du pays des Oreillons
+avaient pour ces deux singes, et dont je vous ai conté l’aventure?
+— Point du tout, dit \bname{Martin}, je ne vois pas ce que cette passion a
+d’étrange; j’ai tant vu de choses extraordinaires, qu’il n’y a plus
+rien d’extraordinaire pour moi. — Croyez-vous, dit \bname{Candide}, que les
+hommes se soient toujours mutuellement massacrés comme ils font
+aujourd’hui? qu’ils aient toujours été menteurs, fourbes, perfides,
+ingrats, brigands, faibles, volages, lâches, envieux, gourmands,
+ivrognes, avares, ambitieux, sanguinaires, calomniateurs, débauchés,
+fanatiques, hypocrites, et sots? — Croyez-vous, dit \bname{Martin}, que les
+éperviers aient toujours mangé des pigeons quand ils en ont trouvé?
+— Oui, sans doute, dit \bname{Candide}. — Eh bien! dit \bname{Martin}, si les éperviers ont
+toujours eu le même caractère, pourquoi voulez-vous que les hommes
+aient changé le leur? — Oh! dit \bname{Candide}, il y a bien de la différence,
+car le libre arbitre…» En raisonnant ainsi, ils arrivèrent à Bordeaux.
+
+
+
+\chapter[Ce qui arriva en France…]{Ce qui arriva en France à Candide et à \bname{Martin}}
+
+
+
+\lettrine{C}{andide} ne s’arrêta dans Bordeaux qu’autant de temps qu’il en fallait
+pour vendre quelques cailloux du \bname{Dorado}, et pour s’accommoder d’une
+bonne chaise à deux places; car il ne pouvait plus se passer de son
+philosophe \bname{Martin}; il fut seulement très fâché de se séparer de son
+mouton, qu’il laissa à l’académie des sciences de Bordeaux, laquelle
+proposa pour le sujet du prix de cette année de trouver pourquoi la
+laine de ce mouton était rouge; et le prix fut adjugé à un savant du
+Nord, qui démontra par A, plus B, moins C divisé par Z, que le mouton
+devait être rouge, et mourir de la clavelée.
+
+
+
+Cependant tous les voyageurs que \bname{Candide} rencontra dans les cabarets de
+la route lui disaient: «Nous allons à Paris.» Cet empressement général
+lui donna enfin l’envie de voir cette capitale; ce n’était pas beaucoup
+se détourner du chemin de \bname{Venise}.
+
+Il entra par le faubourg Saint-Marceau, et crut être dans le plus
+vilain village de la \bname{Westphalie}.
+
+
+À peine \bname{Candide} fut-il dans son auberge, qu’il fut attaqué d’une
+maladie légère, causée par ses fatigues. Comme il avait au doigt un
+diamant énorme, et qu’on avait aperçu dans son équipage une cassette
+prodigieusement pesante, il eut aussitôt auprès de lui deux médecins
+qu’il n’avait pas mandés, quelques amis intimes qui ne le quittèrent
+pas, et deux dévotes qui faisaient chauffer ses bouillons. \bname{Martin}
+disait: «Je me souviens d’avoir été malade aussi à Paris dans mon
+premier voyage; j’étais fort pauvre: aussi n’eus-je ni amis, ni
+dévotes, ni médecins, et je guéris.»
+
+Cependant, à force de médecines et de saignées, la maladie de \bname{Candide}
+devint sérieuse. Un habitué du quartier vint avec douceur lui demander
+un billet payable au porteur pour l’autre monde: \bname{Candide} n’en voulut
+rien faire; les dévotes l’assurèrent que c’était une nouvelle mode:
+\bname{Candide} répondit qu’il n’était point homme à la mode. \bname{Martin} voulut
+jeter l’habitué par les fenêtres. Le clerc jura qu’on n’enterrerait
+point \bname{Candide}. \bname{Martin} jura qu’il enterrerait le clerc, s’il continuait
+à les importuner. La querelle s’échauffa: \bname{Martin} le prit par les
+épaules, et le chassa rudement; ce qui causa un grand scandale, dont on
+fit un procès-verbal.
+
+\bname{Candide} guérit; et pendant sa convalescence il eut très bonne compagnie
+à souper chez lui. On jouait gros jeu. \bname{Candide} était tout étonné que
+jamais les as ne lui vinssent; et \bname{Martin} ne s’en étonnait pas.
+
+Parmi ceux qui lui faisaient les honneurs de la ville, il y avait un
+petit abbé périgourdin, l’un de ces gens empressés, toujours alertes,
+toujours serviables, effrontés, caressants, accommodants, qui guettent
+les étrangers à leur passage, leur content l’histoire scandaleuse de la
+ville, et leur offrent des plaisirs à tout prix. Celui-ci mena d’abord
+\bname{Candide} et \bname{Martin} à la comédie. On y jouait une tragédie nouvelle.
+\bname{Candide} se trouva placé auprès de quelques beaux esprits. Cela ne
+l’empêcha pas de pleurer à des scènes jouées parfaitement. Un des
+raisonneurs qui étaient à ses côtés lui dit dans un entr’acte: «Vous
+avez grand tort de pleurer, cette actrice est fort mauvaise; l’acteur
+qui joue avec elle est plus mauvais acteur encore; la pièce est encore
+plus mauvaise que les acteurs; l’auteur ne sait pas un mot d’arabe, et
+cependant la scène est en \bname{Arabie}; et, de plus, c’est un homme qui ne
+croit pas aux idées innées; je vous apporterai demain vingt
+brochures
+contre lui. — Monsieur, combien avez-vous de pièces de théâtre en
+France?» dit \bname{Candide} à l’abbé; lequel répondit: «Cinq ou six mille. — C’est
+beaucoup, dit \bname{Candide}: combien y en a-t-il de bonnes? —Quinze ou seize,
+répliqua l’autre. — C’est beaucoup», dit \bname{Martin}.
+
+
+
+\bname{Candide} fut très content d’une actrice qui faisait la reine Élisabeth,
+dans une assez plate tragédie, que l’on joue quelquefois. «Cette
+actrice, dit-il à \bname{Martin}, me plaît beaucoup; elle a un faux air de
+M\up{lle}~\bname{Cunégonde}; je serais bien aise de la saluer.» L’abbé
+périgourdin s’offrit à l’introduire chez elle. \bname{Candide}, élevé en
+\bname{Allemagne}, demanda quelle était l’étiquette, et comment on traitait en
+France les reines d’Angleterre. «Il faut distinguer, dit l’abbé: en
+province, on les mène au cabaret; à Paris, on les respecte quand elles
+sont belles, et on les jette à la voirie quand elles sont mortes. — Des
+reines à la voirie! dit \bname{Candide}. — Oui vraiment, dit \bname{Martin}; monsieur
+l’abbé a raison; j’étais à Paris quand M\up{lle}~Monime passa,
+comme on dit, de cette vie à l’autre; on lui refusa, ce que ces gens-ci
+appellent les \emph{honneurs de la sépulture}, c’est-à-dire de pourrir avec
+tous les gueux du quartier dans un vilain cimetière; elle fut enterrée
+toute seule de sa bande au coin de la rue de Bourgogne; ce qui dut lui
+faire une peine extrême, car elle pensait très noblement. — Cela est bien
+impoli, dit \bname{Candide}. — Que voulez-vous? dit \bname{Martin}; ces gens-ci sont
+ainsi faits. Imaginez toutes les contradictions, toutes les
+incompatibilités possibles, vous les verrez dans le gouvernement, dans
+les tribunaux, dans les églises, dans les spectacles de cette drôle de
+nation. — Est-il vrai qu’on rit toujours à Paris? dit \bname{Candide}. — Oui, dit
+l’abbé, mais c’est en enrageant; car on s’y plaint de tout avec de
+grands éclats de rire; même on y fait en riant les actions les plus
+\linebreak détestables.
+
+
+
+— Quel est, dit \bname{Candide}, ce gros cochon qui me disait tant de mal de la
+pièce où j’ai tant pleuré, et des acteurs qui m’ont fait tant de
+plaisir? — C’est un mal-vivant, répondit l’abbé, qui gagne sa vie à dire
+du mal de toutes les pièces et de tous les livres; il hait quiconque
+réussit, comme les eunuques haïssent les jouissants; c’est un de ces
+serpents de la littérature qui se nourrissent de fange et de venin;
+c’est un folliculaire. — Qu’appelez-vous folliculaire? dit \bname{Candide}.
+— C’est, dit l’abbé, un faiseur de feuilles, un \emph{Fréron}.»
+
+C’est ainsi que \bname{Candide}, \bname{Martin}, et le Périgourdin, raisonnaient sur
+l’escalier, en voyant défiler le monde au sortir de la pièce. «Quoique
+je sois très empressé de revoir M\up{lle}~\bname{Cunégonde}, dit \bname{Candide}, je
+voudrais pourtant souper avec M\up{lle}~Clairon, car elle m’a paru
+admirable.»
+
+L’abbé n’était pas homme à approcher de M\up{lle}~\bname{Clairon}, qui ne
+voyait que bonne compagnie. «Elle est engagée pour ce soir, dit-il; mais
+j’aurai l’honneur de vous mener chez une dame de qualité, et là vous
+connaîtrez Paris comme si vous y aviez été quatre ans.»
+
+\bname{Candide}, qui était naturellement curieux, se laissa mener chez la dame,
+au fond du faubourg Saint-Honoré; on y était occupé d’un pharaon; douze
+tristes pontes tenaient chacun en main un petit livre de cartes,
+registre cornu de leurs infortunes. Un profond silence régnait, la
+pâleur était sur le front des pontes, l’inquiétude sur celui du
+banquier; et la dame du logis, assise auprès de ce banquier
+impitoyable, remarquait avec des yeux de lynx tous les parolis, tous
+les sept et le va de campagne, dont chaque joueur cornait ses cartes;
+elle les faisait décorner avec une attention sévère, mais polie, et ne
+se fâchait point, de peur de perdre ses pratiques. La dame se faisait
+appeler la marquise de Parolignac. Sa fille, âgée de quinze ans, était
+au nombre des pontes, et avertissait d’un clin d’œil des friponneries
+de ces pauvres gens qui tâchaient de réparer les cruautés du sort.
+L’abbé périgourdin, \bname{Candide}, et \bname{Martin}, entrèrent; personne ne se leva,
+ni les salua, ni les regarda; tous étaient profondément occupés de
+leurs cartes. «M\up{me} la baronne de Thunder-ten-tronckh était plus
+civile», dit \bname{Candide}.
+
+Cependant l’abbé s’approcha de l’oreille de la marquise, qui se leva à
+moitié, honora \bname{Candide} d’un sourire gracieux, et \bname{Martin} d’un air de
+tête tout-à-fait noble; elle fit donner un siège et un jeu de cartes à
+\bname{Candide}, qui perdit cinquante mille francs en deux tailles: après quoi
+on soupa très gaiement; et tout le monde était étonné que \bname{Candide} ne
+fût pas ému de sa perte; les laquais disaient entre eux, dans leur
+langage de laquais: «Il faut que ce soit quelque milord anglais.» Le
+souper fut comme la plupart des soupers de Paris, d’abord du silence,
+ensuite un bruit de paroles qu’on ne distingue point, puis des
+plaisanteries dont la plupart sont insipides, de fausses nouvelles, de
+mauvais raisonnements, un peu de politique, et beaucoup de médisance;
+on parla même de livres nouveaux. «Avez-vous vu, dit l’abbé périgourdin,
+le roman du sieur Gauchat, docteur en théologie? — Oui, répondit un des
+convives, mais je n’ai pu l’achever. Nous avons une foule d’écrits
+impertinents; mais tous ensemble n’approchent pas de l’impertinence de
+\bname{Gauchat}, docteur en théologie; je suis si rassasié de cette
+immensité de détestables livres qui nous inondent, que je me suis mis à
+ponter au pharaon. — Et les \emph{\bname{Mélanges}} de l’archidiacre Trublet, qu’en
+dites-vous? dit l’abbé. — Ah! dit M\up{me} de Parolignac, l’ennuyeux
+mortel! comme il vous dit curieusement ce que tout le monde sait! comme
+il discute pesamment ce qui ne vaut pas la peine d’être remarqué
+légèrement! comme il s’approprie, sans esprit, l’esprit des autres!
+comme il gâte ce qu’il pille! comme il me dégoûte! mais il ne me
+dégoûtera plus; c’est assez d’avoir lu quelques pages de l’archidiacre.»
+
+
+Il y avait à table un homme savant et de goût qui appuya ce que disait
+la marquise. On parla ensuite de
+tragédies;
+ la dame demanda pourquoi il
+y avait des tragédies qu’on jouait quelquefois, et qu’on ne pouvait
+lire. L’homme de goût expliqua très bien comment une pièce pouvait
+avoir quelque intérêt, et n’avoir presque aucun mérite; il prouva en
+peu de mots que ce n’était pas assez d’amener une ou deux de ces
+situations qu’on trouve dans tous les romans, et qui séduisent toujours
+les spectateurs; mais qu’il faut être neuf sans être bizarre, souvent
+sublime et toujours naturel, connaître le cœur humain et le faire
+parler; être grand poète, sans que jamais aucun personnage de la pièce
+paraisse poète; savoir parfaitement sa langue, la parler avec pureté,
+avec une harmonie continue, sans que jamais la rime coûte rien au sens.
+«\bname{Quiconque}, ajouta-t-il,
+n’observe
+ pas toutes ces règles, peut faire une
+ou deux tragédies applaudies au théâtre, mais il ne sera jamais compté
+au rang des bons écrivains; il y a très peu de bonnes tragédies: les
+unes sont des idylles en dialogues bien écrits et bien rimés; les
+autres, des raisonnements politiques qui endorment, ou des
+amplifications qui rebutent; les autres, des rêves d’énergumène, en
+style barbare, des propos interrompus, de longues apostrophes aux
+dieux, parce qu’on ne sait point parler aux hommes, des maximes fausses,
+des lieux communs ampoulés.»
+
+
+\bname{Candide} écouta ce propos avec attention, et conçut une grande idée du
+discoureur; et, comme la marquise avait eu soin de le placer à côté
+d’elle, il s’approcha de son oreille, et prit la liberté de lui
+demander qui était cet homme qui parlait si bien. «C’est un savant, dit
+la dame, qui ne ponte point, et que l’abbé m’amène quelquefois à
+souper; il se connaît parfaitement en tragédies et en livres, et il a
+fait une tragédie sifflée, et un livre dont on n’a jamais vu hors de la
+boutique de son libraire qu’un exemplaire qu’il m’a dédié. — Le grand
+homme! dit \bname{Candide}, c’est un autre \bname{Pangloss}.»
+
+Alors se tournant vers lui, il lui dit: «Monsieur, vous pensez, sans
+doute, que tout est au mieux dans le monde physique et dans le moral,
+et que rien ne pouvait être autrement? — Moi, monsieur, lui répondit le
+savant, je ne pense rien de tout cela; je trouve que tout va de travers
+chez nous; que personne ne sait ni quel est son rang, ni quelle est sa
+charge, ni ce qu’il fait, ni ce qu’il doit faire, et qu’excepté le
+souper, qui est assez gai, et où il paraît assez d’union, tout le reste
+du temps se passe en querelles impertinentes; jansénistes contre
+molinistes, gens du parlement contre gens d’église, gens de lettres
+contre gens de lettres, courtisans contre courtisans, financiers contre
+le peuple, femmes contre maris, parents contre parents; c’est une
+guerre éternelle.»
+
+
+\bname{Candide} lui répliqua: «J’ai vu pis; mais un sage, qui depuis a eu le
+malheur d’être pendu, m’apprit que tout cela est à merveille; ce sont
+des ombres à un beau tableau. — Votre pendu se moquait du monde, dit
+\bname{Martin}; vos ombres sont des taches horribles. — Ce sont les hommes qui
+font les taches, dit \bname{Candide}, et ils ne peuvent pas s’en dispenser. — Ce
+n’est donc pas leur faute», dit \bname{Martin}. La plupart des pontes, qui
+n’entendaient rien à ce langage, buvaient; et \bname{Martin} raisonna avec le
+savant, et \bname{Candide} raconta une partie de ses aventures à la dame du
+logis.
+
+Après souper, la marquise mena \bname{Candide} dans son cabinet, et le fit
+asseoir sur un canapé. «Eh bien! lui dit-elle, vous aimez donc toujours
+éperdument M\up{lle}~\bname{Cunégonde} de Thunder-ten-tronckh? — Oui, madame,
+répondit \bname{Candide}.» La marquise lui répliqua avec un souris tendre: «Vous
+me répondez comme un jeune homme de \bname{Westphalie}; un Français m’aurait
+dit: Il est vrai que j’ai aimé M\up{lle}~\bname{Cunégonde}; mais en vous
+voyant, madame, je crains de ne la plus aimer. — Hélas! madame, dit
+\bname{Candide}, je répondrai comme vous voudrez. — Votre passion pour elle, dit
+la marquise, a commencé en ramassant son mouchoir; je veux que vous
+ramassiez ma jarretière. — De tout mon cœur, dit \bname{Candide}; et il la
+ramassa. — Mais je veux que vous me la remettiez», dit la dame; et \bname{Candide}
+la lui remit. «Voyez-vous, dit la dame, vous êtes étranger; je fais
+quelquefois languir mes amants de Paris quinze jours, mais je me rends
+à vous dès la première nuit, parce qu’il faut faire les honneurs de son
+pays à un jeune homme de \bname{Westphalie}.» La belle ayant aperçu deux énormes
+diamants aux deux mains de son jeune étranger, les loua de si bonne
+foi, que des doigts de \bname{Candide} ils passèrent aux doigts de la marquise.
+
+\looseness=1
+\bname{Candide}, en s’en retournant avec son abbé périgourdin, sentit quelques
+remords d’avoir fait une infidélité à M\up{lle}~\bname{Cunégonde}. M. l’abbé
+entra dans sa peine; il n’avait qu’une légère part aux cinquante mille
+livres perdues au jeu par \bname{Candide}, et à la valeur des deux brillants
+moitié donnés, moitié extorqués. Son dessein était de profiter, autant
+qu’il le pourrait, des avantages que la connaissance de \bname{Candide} pouvait
+lui procurer. Il lui parla beaucoup de \bname{Cunégonde}; et \bname{Candide} lui dit
+qu’il demanderait bien pardon à cette belle de son infidélité, quand il
+la verrait à \bname{ \bname{Venise}}.
+
+Le Périgourdin redoublait de politesses et d’attentions, et prenait un
+intérêt tendre à tout ce que \bname{Candide} disait, à tout ce qu’il faisait, à
+tout ce qu’il voulait faire.
+
+«Vous avez donc, monsieur, lui dit-il, un rendez-vous à \bname{Venise}? — Oui,
+monsieur l’abbé, dit \bname{Candide}; il faut absolument que j’aille trouver
+M\up{lle}~\bname{Cunégonde}.» Alors, engagé par le plaisir de parler de ce
+qu’il aimait, il conta, selon son usage, une partie de ses aventures
+avec cette illustre \bname{Westphalienne}.
+
+
+«Je crois, dit l’abbé, que M\up{lle}~\bname{Cunégonde} a bien de l’esprit, et
+qu’elle écrit des lettres charmantes. — Je n’en ai jamais reçu, dit
+\bname{Candide}; car, figurez-vous qu’ayant été chassé du château pour l’amour
+d’elle, je ne pus lui écrire; que bientôt après j’appris qu’elle était
+morte, qu’ensuite je la retrouvai, et que je la perdis, et que je lui
+ai envoyé à deux mille cinq cents lieues d’ici un exprès dont j’attends
+la réponse.»
+
+L’abbé écoutait attentivement, et paraissait un peu rêveur. Il prit
+bientôt congé des deux étrangers, après les avoir tendrement embrassés.
+Le lendemain \bname{Candide} reçut à son réveil une lettre conçue en ces
+termes:
+\par\vspace{\baselineskip}\par
+{\itshape Monsieur mon très cher amant, il y a huit jours que je suis malade en
+cette ville; j’apprends que vous y êtes. Je volerais dans vos bras si
+je pouvais remuer. J’ai su votre passage à Bordeaux; j’y ai laissé le
+fidèle \bname{Cacambo} et la vieille, qui doivent bientôt me suivre. Le
+gouverneur de \bname{Buenos} Aires a tout pris, mais il me reste votre cœur.
+Venez; votre présence me rendra la vie ou me fera mourir de plaisir.
+
+}
+\par\vspace{\baselineskip}\par
+Cette lettre charmante, cette lettre inespérée, transporta \bname{Candide}
+d’une joie inexprimable; et la maladie de sa chère \bname{Cunégonde} l’accabla
+de douleur. Partagé entre ces deux sentiments, il prend son or et ses
+diamants, et se fait conduire avec \bname{Martin} à l’hôtel où
+mademoiselle
+\bname{Cunégonde} demeurait. Il entre en tremblant d’émotion, son cœur
+palpite, sa voix sanglote; il veut ouvrir les rideaux du lit; il veut
+faire apporter de la lumière. «Gardez-vous-en bien, lui dit la suivante;
+la lumière la tue»; et soudain elle referme le rideau. «Ma chère
+\bname{Cunégonde}, dit \bname{Candide} en pleurant, comment vous portez-vous? si vous
+ne pouvez me voir, parlez-moi du moins. — Elle ne peut parler», dit la
+suivante, la dame alors tire du lit une main potelée que \bname{Candide} arrose
+longtemps de ses larmes, et qu’il remplit ensuite de diamants, en
+laissant un sac plein d’or sur le fauteuil.
+
+
+Au milieu de ses transports arrive un exempt suivi de l’abbé
+périgourdin et d’une escouade. «Voilà donc, dit-il, ces deux étrangers
+suspects?» Il les fait incontinent saisir, et ordonne à ses braves de
+les traîner en prison. «Ce n’est pas ainsi qu’on traite les voyageurs
+dans Eldorado, dit \bname{Candide}. — Je suis plus manichéen que jamais, dit
+\bname{Martin}. — Mais, monsieur, où nous menez-vous? dit \bname{Candide}. — Dans un cul de
+basse-fosse», dit l’exempt.
+
+\bname{Martin}, ayant repris son sang froid, jugea que la dame qui se
+prétendait \bname{Cunégonde} était une friponne, M. l’abbé périgourdin un
+fripon, qui avait abusé au plus vite de
+l'innocence
+ de \bname{Candide}, et
+l’exempt un autre fripon dont on pouvait aisément se débarrasser.
+
+
+Plutôt que de s’exposer aux procédures de la justice, \bname{Candide}, éclairé
+par son conseil, et d’ailleurs toujours impatient de revoir la
+véritable \bname{Cunégonde}, propose à l’exempt trois petits diamants d’environ
+trois mille pistoles chacun. — Ah! monsieur, lui dit l’homme au bâton
+d’ivoire, eussiez-vous commis tous les crimes imaginables, vous êtes le
+plus honnête homme du monde; trois diamants! chacun de trois mille
+pistoles! Monsieur! je me ferais tuer pour vous, au lieu de vous mener
+dans un cachot. On arrête tous les étrangers, mais laissez-moi faire;
+j’ai un frère à Dieppe en Normandie; je vais vous y mener; et si vous
+avez quelque diamant à lui donner, il aura soin de vous comme moi-même.
+
+— Et pourquoi arrête-t-on tous les étrangers? dit \bname{Candide}. L’abbé
+périgourdin prit alors la parole, et dit: «C’est parce qu’un gueux du
+pays d’Atrébatie a entendu dire des sottises; cela seul lui a fait
+commettre un parricide, non pas tel que celui de 1610 au mois de
+mai, mais tel que celui de 1594 au mois de décembre, et tel que
+plusieurs autres commis dans d’autres années et dans d’autres mois par
+d’autres gueux qui avaient entendu dire des sottises.»
+
+
+
+L’exempt alors expliqua de quoi il s’agissait. «Ah! les monstres!
+s’écria \bname{Candide}; quoi! de telles horreurs chez un peuple qui danse et
+qui chante! Ne pourrai-je sortir au plus vite de ce pays où des singes
+agacent des tigres? J’ai vu des ours dans mon pays; je n’ai vu des
+hommes que dans le Dorado. Au nom de Dieu, monsieur l’exempt, menez-moi
+à \bname{Venise}, où je dois attendre M\up{lle}~\bname{Cunégonde}. — Je ne peux vous
+mener qu’en Basse-Normandie, dit le barigel.» Aussitôt il lui fait
+ôter ses fers, dit qu’il s’est mépris, renvoie ses gens, emmène à
+Dieppe \bname{Candide} et \bname{Martin}, et les laisse entre les mains de son frère.
+Il y avait un petit vaisseau hollandais à la rade. Le Normand, à l’aide
+de trois autres diamants, devenu le plus serviable des hommes, embarque
+\bname{Candide} et ses gens dans le vaisseau qui allait faire voile pour
+Portsmouth en Angleterre. Ce n’était pas le chemin de \bname{Venise}; mais
+\bname{Candide} croyait être délivré de l’enfer; et il comptait bien reprendre
+la route de \bname{Venise} à la première occasion.
+
+
+
+
+
+\chapter[Candide et \bname{Martin} vont sur les côtes…]{Candide et \bname{Martin} vont sur les côtes d’Angleterre;\\ ce qu’ils y voient}
+
+
+\lettrine[ante=«]{A}{h! \bname{Pangloss}!} \bname{Pangloss}! Ah! \bname{Martin}! \bname{Martin}! Ah! ma chère \bname{Cunégonde}!
+qu’est-ce que ce monde-ci?» disait \bname{Candide} sur le vaisseau hollandais.
+— Quelque chose de bien fou et de bien abominable, répondait \bname{Martin}. — Vous
+connaissez l’Angleterre; y est-on aussi fou qu’en France? — C’est une
+autre espèce de folie, dit \bname{Martin}. Vous savez que ces deux nations sont
+en guerre pour quelques arpents de neige vers le Canada, et qu’elles
+dépensent pour cette belle guerre beaucoup plus que tout le Canada ne
+vaut.
+De vous dire précisément s’il y a plus de gens à lier dans un
+pays que dans un autre, c’est ce que mes faibles lumières ne me
+permettent pas; je sais seulement qu’en général les gens que nous
+allons voir sont fort atrabilaires.»
+
+
+En causant ainsi ils abordèrent à Portsmouth; une multitude de peuple
+couvrait le rivage, et regardait attentivement un assez gros homme qui
+était à genoux, les yeux bandés, sur le tillac d’un des vaisseaux de la
+flotte; quatre soldats, postés vis-à-vis de cet homme, lui tirèrent
+chacun trois balles dans le crâne, le plus paisiblement du monde; et
+toute l’assemblée s’en retourna extrêmement satisfaite. «Qu’est-ce
+donc que tout ceci? dit \bname{Candide}; et quel démon exerce partout son
+empire?» Il demanda qui était ce gros homme qu’on venait de tuer en
+cérémonie.
+«C’est un amiral, lui répondit-on. — Et pourquoi tuer cet
+amiral? — C’est, lui dit-on, parce qu’il n’a pas fait tuer assez de monde;
+il a livré un combat à un amiral français, et on a trouvé qu’il n’était
+pas assez près de lui. — Mais, dit \bname{Candide}, l’amiral français était aussi
+loin de l’amiral anglais que celui-ci l’était de l’autre! — Cela est
+incontestable, lui répliqua-t-on; mais dans ce pays-ci il est bon de
+tuer de temps en temps un amiral pour encourager les autres.»
+
+
+\bname{Candide} fut si étourdi et si choqué de ce qu’il voyait et de ce qu’il
+entendait, qu’il ne voulut pas seulement mettre pied à terre, et qu’il
+fit son marché avec le patron hollandais (dût-il le voler comme celui
+de Surinam), pour le conduire sans délai à \bname{Venise}.
+
+Le patron fut prêt au bout de deux jours. On côtoya la France; on passa
+à la vue de Lisbonne, et \bname{Candide} frémit. On entra dans le détroit et
+dans la \bname{Méditerranée}, enfin on aborda à \bname{Venise}. «Dieu soit loué! dit
+\bname{Candide}, en embrassant \bname{Martin}; c’est ici que je reverrai la belle
+\bname{Cunégonde}. Je compte sur \bname{Cacambo} comme sur moi-même. Tout est bien,
+tout va bien, tout va le mieux qu’il soit possible.»
+
+
+\chapter{De \bname{Paquette}, et de frère Giroflée}
+
+
+\lettrine{D}{ès} qu’il fut à \bname{Venise}, il fit chercher \bname{Cacambo} dans tous les cabarets,
+dans tous les cafés, chez toutes les filles de joie, et ne le trouva
+point. Il envoyait tous les jours à la découverte de tous les vaisseaux
+et de toutes les barques: nulles nouvelles de \bname{Cacambo}. «Quoi! disait-il
+à \bname{Martin}, j’ai eu le temps de passer de Surinam à Bordeaux, d’aller de
+Bordeaux à Paris, de Paris à Dieppe, de Dieppe à Portsmouth, de côtoyer
+le Portugal et l’Espagne, de traverser toute la Méditerranée, de passer
+quelques mois à \bname{Venise}; et la belle \bname{Cunégonde} n’est point venue! Je
+n’ai rencontré au lieu d’elle qu’une drôlesse et un abbé périgourdin!
+\bname{Cunégonde} est morte, sans doute; je n’ai plus qu’à mourir. Ah! il
+valait mieux rester dans le paradis du Dorado que de revenir dans cette
+maudite Europe. Que vous avez raison, mon cher \bname{Martin}! tout n’est
+qu’illusion et calamité.»
+
+Il tomba dans une mélancolie noire, et ne prit aucune part à l’opéra
+\emph{alla moda}, ni aux autres divertissements du carnaval; pas une dame ne
+lui donna la moindre
+tentation. \bname{Martin} lui dit: «Vous êtes bien simple,
+en vérité, de vous figurer qu’un valet métis, qui a cinq ou six
+millions dans ses poches, ira chercher votre maîtresse au bout du
+monde, et vous l’amènera à \bname{Venise}. Il la prendra pour lui, s’il la
+trouve; s’il ne la trouve pas, il en prendra une autre: je vous
+conseille d’oublier votre valet \bname{Cacambo} et votre maîtresse \bname{Cunégonde}.»
+\bname{Martin} n’était pas consolant. La mélancolie de \bname{Candide} augmenta, et
+\bname{Martin} ne cessait de lui prouver qu’il y avait peu de vertu et peu de
+bonheur sur la terre; excepté peut-être dans Eldorado, où personne
+ne pouvait aller.
+
+
+
+En disputant sur cette matière importante, et en attendant \bname{Cunégonde},
+\bname{Candide} aperçut un jeune théatin dans la place Saint-Marc, qui tenait
+sous le bras une fille. Le théatin paraissait frais, potelé, vigoureux;
+ses yeux étaient brillants, son air assuré, sa mine haute, sa démarche
+fière. La fille était très jolie, et chantait; elle regardait
+amoureusement son théatin, et de temps en temps lui pinçait ses grosses
+joues. «Vous m’avouerez du moins, dit \bname{Candide} à \bname{Martin}, que ces gens-ci
+sont heureux. Je n’ai trouvé jusqu’à présent dans toute la terre
+habitable, excepté dans Eldorado, que des infortunés; mais pour cette
+fille et ce théatin, je gage que ce sont des créatures très heureuses.
+«Je gage que non, dit \bname{Martin}. — Il n’y a qu’à les prier à dîner, dit
+\bname{Candide}, et vous verrez si je me trompe.»
+
+Aussitôt il les aborde, il leur fait son compliment, et les invite à
+venir à son hôtellerie manger des macaronis, des perdrix de Lombardie,
+des œufs d’esturgeon, et à boire du vin de Montepulciano, du
+lacryma-christi, du chypre, et du samos. La demoiselle rougit, le
+théatin accepta la partie, et la fille le suivit en regardant \bname{Candide}
+avec des yeux de surprise et de confusion, qui furent obscurcis de
+quelques larmes. À peine fut-elle entrée dans la chambre de \bname{Candide},
+qu’elle lui dit: «Eh quoi! monsieur \bname{Candide} ne reconnaît plus \bname{Paquette}!»
+À ces mots \bname{Candide}, qui ne l’avait pas considérée jusque-là avec
+attention, parce qu’il n’était occupé que de \bname{Cunégonde}, lui dit: «Hélas!
+ma pauvre enfant, c’est donc vous qui avez mis le docteur \bname{Pangloss} dans
+le bel état où je l’ai vu?
+
+
+— Hélas! monsieur, c’est moi-même, dit \bname{Paquette}; je vois que vous êtes
+instruit de tout. J’ai su les malheurs
+épouvantables
+ arrivés à toute la
+maison de M\up{me} la baronne et à la belle \bname{Cunégonde}. Je vous jure que
+ma destinée n’a guère été moins triste. J’étais fort innocente quand
+vous m’avez vue. Un cordelier, qui était mon confesseur, me séduisit
+aisément. Les suites en furent affreuses; je fus obligée de sortir du
+château quelque temps après que M.~le baron vous eut renvoyé à grands
+coups de pied dans le derrière. Si un fameux médecin n’avait pas pris
+pitié de moi, j’étais morte. Je fus quelque temps par reconnaissance la
+maîtresse de ce médecin. Sa femme, qui était jalouse à la rage, me
+battait tous les jours impitoyablement; c’était une furie. Ce médecin
+était le plus laid de tous les hommes, et moi la plus malheureuse de
+toutes les créatures d’être battue continuellement pour un homme que je
+n’aimais pas. Vous savez, monsieur, combien il est dangereux pour une
+femme acariâtre d’être l’épouse d’un médecin. Celui-ci, outré des
+procédés de sa femme, lui donna un jour, pour la guérir d’un petit
+rhume, une médecine si efficace, qu’elle en mourut en deux heures de
+temps dans des convulsions horribles. Les parents de madame intentèrent
+à monsieur un procès criminel; il prit la fuite, et moi je fus mise en
+prison. Mon innocence ne m’aurait pas sauvée, si je n’avais été un peu
+jolie. Le juge m’élargit à condition qu’il succéderait au médecin. Je
+fus bientôt supplantée par une rivale, chassée sans récompense, et
+obligée de continuer ce métier abominable qui vous paraît si plaisant à
+vous autres hommes, et qui n’est pour nous qu’un abîme de misère.
+J’allai exercer la profession à \bname{Venise}. Ah! monsieur, si vous pouviez
+vous imaginer ce que c’est que d’être obligée de caresser
+indifféremment un vieux marchand, un avocat, un moine, un gondolier, un
+abbé; d’être exposée à toutes les insultes, à toutes les avanies;
+d’être souvent réduite à emprunter une jupe pour aller se la faire
+lever par un homme dégoûtant; d’être volée par l’un de ce qu’on a gagné
+avec l’autre; d’être rançonnée par les officiers de justice, et de
+n’avoir en perspective qu’une vieillesse affreuse, un hôpital, et un
+fumier, vous concluriez que je suis une des plus malheureuses créatures
+du monde.»
+
+\bname{Paquette} ouvrait ainsi son cœur au bon \bname{Candide}, dans un cabinet, en
+présence de \bname{Martin}, qui disait à \bname{Candide}: «Vous voyez que j’ai déjà
+gagné la moitié de la gageure.»
+
+
+Frère Giroflée était resté dans la salle à manger, et buvait un coup en
+attendant le dîner. «Mais, dit \bname{Candide} à \bname{Paquette}, vous aviez l’air si
+gai, si content, quand je vous ai rencontrée; vous chantiez, vous
+caressiez le théatin avec une complaisance naturelle; vous m’avez paru
+aussi heureuse que vous prétendez être infortunée. — Ah! monsieur,
+répondit \bname{Paquette}, c’est encore là une des misères du métier. J’ai été
+hier volée et battue par un officier, et il faut aujourd’hui que je
+paraisse de bonne humeur pour plaire à un moine.»
+
+\bname{Candide} n’en voulut pas davantage; il avoua que \bname{Martin} avait raison. On
+se mit à table avec \bname{Paquette} et le théatin; le repas fut assez amusant,
+et sur la fin on se parla avec quelque confiance. «Mon père, dit \bname{Candide}
+au moine, vous me paraissez jouir d’une destinée que tout le monde doit
+envier; la fleur de la santé brille sur votre visage, votre physionomie
+annonce le bonheur; vous avez une très jolie fille pour votre
+récréation, et vous paraissez très content de votre état de théatin.
+
+
+— Ma foi, monsieur, dit frère Giroflée, je voudrais que tous les théatins
+fussent au fond de la mer. J’ai été tenté cent fois de mettre le feu au
+couvent, et d’aller me faire turc. Mes parents me forcèrent, à l’âge de
+quinze ans, d’endosser cette détestable robe, pour laisser plus de
+fortune à un maudit frère aîné, que Dieu confonde! La jalousie, la
+discorde, la rage, habitent dans le couvent. Il est vrai que j’ai
+prêché quelques mauvais sermons qui m’ont valu un peu d’argent dont le
+prieur me vole la moitié; le reste me sert à entretenir des filles:
+mais quand je rentre le soir dans le monastère, je suis prêt à me
+casser la tête contre les murs du dortoir; et tous mes confrères sont
+dans le même cas.»
+
+\bname{Martin} se tournant vers \bname{Candide} avec son sang froid ordinaire: «Eh bien!
+lui dit-il, n’ai-je pas gagné la gageure tout entière?» \bname{Candide} donna
+deux mille piastres à \bname{Paquette}, et mille piastres à frère Giroflée. «Je
+vous réponds, dit-il, qu’avec cela ils seront heureux. — Je n’en crois
+rien du tout, dit \bname{Martin}; vous les rendrez peut-être avec ces piastres
+beaucoup plus malheureux encore. — Il en sera ce qui pourra, dit \bname{Candide}:
+mais une chose me console, je vois qu’on retrouve souvent les gens
+qu’on ne croyait jamais retrouver; il se pourra bien faire qu’ayant
+rencontré mon mouton rouge et \bname{Paquette}, je rencontre aussi \bname{Cunégonde}.
+— Je souhaite, dit \bname{Martin}, qu’elle fasse un jour votre bonheur; mais
+c’est de quoi je doute fort. — Vous êtes bien dur, dit \bname{Candide}. — C’est que
+j’ai vécu, dit \bname{Martin}.
+
+— Mais regardez ces gondoliers, dit \bname{Candide}: ne
+chantent-ils pas sans cesse? — Vous ne les voyez pas dans leur ménage,
+avec leurs femmes et leurs marmots d’enfants, dit \bname{Martin}. Le doge a ses
+chagrins, les gondoliers ont les leurs. Il est vrai qu’à tout prendre
+le sort d’un gondolier est préférable à celui d’un doge; mais je crois
+la différence si médiocre, que cela ne vaut pas la peine d’être
+examiné.
+
+— On parle, dit \bname{Candide}, du sénateur \bname{Pococurante}, qui demeure dans ce
+beau palais sur la Brenta, et qui reçoit assez bien les étrangers. On
+prétend que c’est un homme qui n’a jamais eu de chagrin. — Je voudrais
+voir une espèce si rare, dit \bname{Martin}.» \bname{Candide} aussitôt fit demander au
+seigneur \bname{Pococurante} la permission de venir le voir le lendemain.
+
+
+
+\chapter[Visite chez le seigneur \bname{Pococurante}…]{Visite chez le seigneur \bname{Pococurante}, noble vénitien}
+
+
+\lettrine{C}{andide} et \bname{Martin} allèrent en gondole sur la Brenta, et arrivèrent au
+palais du noble \bname{Pococurante}. Les jardins étaient bien entendus, et
+ornés de belles statues de marbre; le palais d’une belle architecture.
+Le maître du logis, homme de soixante ans, fort riche, reçut très
+poliment les deux curieux, mais avec très peu d’empressement, ce qui
+déconcerta \bname{Candide}, et ne déplut point à \bname{Martin}.
+
+
+ D’abord deux filles jolies et proprement mises servirent du chocolat,
+qu’elles firent très bien mousser. \bname{Candide} ne put s’empêcher de les
+louer sur leur beauté, sur leur bonne grâce, et sur leur adresse. «Ce
+sont d’assez bonnes créatures, dit le sénateur \bname{Pococurante}; je les fais
+quelquefois coucher dans mon lit; car je suis bien las des dames de la
+ville, de leurs coquetteries, de leurs jalousies, de leurs querelles,
+de leurs humeurs, de leurs petitesses, de leur orgueil, de leurs
+sottises, et des sonnets qu’il faut faire ou commander pour elles;
+mais, après tout, ces deux filles commencent fort à m’ennuyer.»
+
+
+\bname{Candide}, après le déjeuner, se promenant dans une longue galerie, fut
+surpris de la beauté des tableaux. Il demanda de quel maître étaient
+les deux premiers. «Ils sont de \bname{Raphaël}, dit le sénateur; je les achetai
+fort cher par vanité, il y a quelques années; on dit que c’est ce qu’il
+y a de plus beau en Italie, mais ils ne me plaisent point du tout: la
+couleur en est très rembrunie, les figures ne sont pas assez arrondies,
+et ne sortent point assez; les draperies ne ressemblent en rien à une
+étoffe: en un mot, quoi qu’on en dise, je ne trouve point là une
+imitation vraie de la nature. Je n’aimerai un tableau que quand je
+croirai voir la nature elle-même: il n’y en a point de cette espèce.
+J’ai beaucoup de tableaux, mais je ne les regarde plus.»
+
+\bname{Pococurante}, en attendant le dîner, se fit donner un concerto. \bname{Candide}
+trouva la musique délicieuse. «Ce bruit, dit \bname{Pococurante}, peut amuser
+une demi-heure; mais s’il dure plus long-temps, il fatigue tout le
+monde, quoique personne n’ose l’avouer. La musique aujourd’hui n’est
+plus que l’art d’exécuter des choses difficiles, et ce qui n’est que
+difficile ne plaît point à la longue.
+
+«J’aimerais peut être mieux l’opéra, si on n’avait pas trouvé le secret
+d’en faire un monstre qui me révolte. Ira voir qui voudra de mauvaises
+tragédies en musique, où les scènes ne sont faites que pour amener très
+mal à propos deux ou trois chansons ridicules qui font valoir le gosier
+d’une actrice; se pâmera de plaisir qui voudra ou qui pourra, en voyant
+un châtré fredonner le rôle de \bname{César} et de \bname{Caton}, et se promener d’un
+air gauche sur des planches: pour moi, il y a long-temps que j’ai
+renoncé à ces pauvretés qui font aujourd’hui la gloire de l’Italie, et
+que des souverains paient si chèrement.» \bname{Candide} disputa un peu, mais
+avec discrétion. \bname{Martin} fut entièrement de l’avis du sénateur.
+
+
+On se mit à table; et, après un excellent dîner, on entra dans la
+bibliothèque. \bname{Candide}, en voyant un Homère magnifiquement relié, loua
+l’illustrissime sur son bon goût. «Voilà, dit-il, un livre qui faisait
+les délices du grand \bname{Pangloss}, le meilleur philosophe de l’Allemagne.
+— Il ne fait pas les miennes, dit froidement \bname{Pococurante}: on me fit
+accroire autrefois que j’avais du plaisir en le lisant; mais cette
+répétition continuelle de combats qui se ressemblent tous, ces dieux
+qui agissent toujours pour ne rien faire de décisif, cette Hélène qui
+est le sujet de la guerre, et qui à peine est une actrice de la pièce;
+cette Troie qu’on assiège et qu’on ne prend point; tout cela me causait
+le plus mortel ennui. J’ai demandé quelquefois à des savants s’ils
+s’ennuyaient autant que moi à cette lecture: tous les gens sincères
+m’ont avoué que le livre leur tombait des mains, mais qu’il fallait
+toujours l’avoir dans sa bibliothèque, comme un monument de
+l’antiquité, et comme ces médailles rouillées qui ne peuvent être de
+commerce.
+
+— Votre excellence ne pense pas ainsi de Virgile? dit \bname{Candide}. — Je
+conviens, dit \bname{Pococurante}, que le second, le quatrième, et le sixième
+livre de son Énéide, sont excellents; mais pour son pieux Énée, et le
+fort Cloanthe, et l’ami Achates, et le petit Ascanius, et l’imbécile
+roi \bname{Latinus}, et la bourgeoise Amata, et l’insipide Lavinia, je ne crois
+pas qu’il y ait rien de si froid et de plus désagréable. J’aime mieux
+le Tasse et les contes à dormir debout de l’Arioste.
+
+
+— Oserais-je vous demander, monsieur, dit \bname{Candide}, si vous n’avez pas un
+grand plaisir à lire Horace? — Il y a des maximes, dit \bname{Pococurante}, dont
+un homme du monde peut faire son profit, et qui, étant resserrées dans
+des vers énergiques, se gravent plus aisément dans la mémoire: mais je
+me soucie fort peu de son voyage à Brindes, et de sa description d’un
+mauvais dîner, et de la querelle de crocheteurs entre je ne sais quel
+Pupilus dont les paroles, dit-il, \emph{étaient pleines de pus}, et un
+autre dont les paroles \emph{étaient du vinaigre}. Je n’ai lu qu’avec un
+extrême dégoût ses vers grossiers contre des vieilles et contre des
+sorcières; et je ne vois pas quel mérite il peut y avoir à dire à son
+ami Mæcenas que, s’il est mis par lui au rang des poètes lyriques, il
+frappera les astres de son front sublime. Les sots admirent tout
+dans un auteur estimé. Je ne lis que pour moi; je n’aime que ce qui est
+à mon usage.» \bname{Candide}, qui avait été élevé à ne jamais juger de rien par
+lui-même, était fort étonné de ce qu’il entendait; et \bname{Martin} trouvait
+la façon de penser de \bname{Pococurante} assez raisonnable.
+
+
+\looseness=1
+«Oh! voici un Cicéron, dit \bname{Candide}: pour ce grand homme-là, je pense que
+vous ne vous lassez point de le lire.
+%
+— Je ne le lis jamais, répondit le
+Vénitien. Que m’importe qu’il ait plaidé pour Rabirius ou pour
+Cluentius? J’ai bien assez des procès que je juge; je me serais mieux
+accommodé de ses œuvres philosophiques; mais quand j’ai vu qu’il
+doutait de tout, j’ai conclu que j’en savais autant que lui, et que je
+n’avais besoin de personne pour être ignorant.
+
+
+
+— Ah! voilà quatre-vingts volumes de recueils d’une académie des
+sciences, s’écria \bname{Martin}; il se peut qu’il y ait là du bon. — Il y en
+aurait, dit \bname{Pococurante}, si un seul des auteurs de ces fatras avait
+inventé seulement l’art de faire des épingles; mais il n’y a dans tous
+ces livres que de vains systèmes, et pas une seule chose utile.
+
+— Que de pièces de théâtre je vois là, dit \bname{Candide}, en italien, en
+espagnol, en français! — Oui, dit le sénateur, il y en a trois mille, et
+pas trois douzaines de bonnes. Pour ces recueils de sermons, qui tous
+ensemble ne valent pas une page de Sénèque, et tous ces gros volumes de
+théologie, vous pensez bien que je ne les ouvre jamais, ni moi ni
+personne.»
+
+
+
+\bname{Martin} aperçut des rayons chargés de livres anglais. «Je crois, dit-il,
+qu’un républicain doit se plaire à la plupart de ces ouvrages écrits si
+librement. — Oui, répondit \bname{Pococurante}, il est beau d’écrire ce qu’on
+pense; c’est le privilège de l’homme. Dans toute notre Italie, on
+n’écrit que ce qu’on ne pense pas; ceux qui habitent la patrie des
+Césars et des \bname{Antonins} n’osent avoir une idée sans la permission d’un
+jacobin. Je serais content de la liberté qui inspire les génies
+anglais, si la passion et l’esprit de parti ne corrompaient pas tout ce
+que cette précieuse liberté a d’estimable.»
+
+\looseness=1
+\bname{Candide} apercevant un Milton, lui demanda s’il ne regardait pas cet
+auteur comme un grand homme. «Qui? dit \bname{Pococurante}, ce barbare, qui fait
+un long commentaire du premier chapitre de la Genèse, en dix livres de
+vers durs? ce grossier imitateur des Grecs, qui défigure la création,
+et qui, tandis que Moïse représente l’Être éternel produisant le monde
+par la parole, fait prendre un grand compas par le Messiah dans une
+armoire du ciel pour tracer son ouvrage? Moi, j’estimerais celui qui a
+gâté l’enfer et le diable du Tasse; qui déguise Lucifer tantôt en
+crapaud, tantôt en pygmée; qui lui fait rebattre cent fois les mêmes
+discours; qui le fait disputer sur la théologie; qui, en imitant
+sérieusement l’invention comique des armes à feu de l’Arioste, fait
+tirer le canon dans le ciel par les diables? Ni moi, ni personne en
+Italie n’a pu se plaire à toutes ces tristes extravagances. Le mariage
+du péché et de la mort et les couleuvres dont le péché accouche, font
+vomir tout homme qui a le goût un peu délicat; et sa longue description
+d’un hôpital n’est bonne que pour un fossoyeur. Ce poème obscur,
+bizarre, et dégoûtant, fut méprisé à sa naissance; je le traite
+aujourd’hui comme il fut traité dans sa patrie par les
+contemporains. Au reste je dis ce que je pense, et je me soucie fort
+peu que les autres pensent comme moi.» \bname{Candide} était affligé de ces
+discours; il respectait Homère, il aimait un peu Milton. «Hélas! dit-il
+tout bas à \bname{Martin}, j’ai bien peur que cet homme-ci n’ait un souverain
+mépris pour nos poètes allemands. — Il n’y aurait pas grand mal à cela,
+dit \bname{Martin}. — Oh! quel homme supérieur! disait encore \bname{Candide} entre ses
+dents, quel grand génie que ce \bname{Pococurante}! rien ne peut lui plaire.
+
+
+
+Après avoir fait ainsi la revue de tous les livres, ils descendirent
+dans le jardin. \bname{Candide} en loua toutes les beautés. «Je ne sais rien de
+si mauvais goût, dit le maître; nous n’avons ici que des colifichets:
+mais je vais dès demain en faire planter un d’un dessin plus noble.»
+
+
+Quand les deux curieux eurent pris congé de son excellence: «Or çà, dit
+\bname{Candide} à \bname{Martin}, vous conviendrez que voilà le plus heureux de tous
+les hommes, car il est au-dessus de tout ce qu’il possède. — Ne
+voyez-vous pas, dit \bname{Martin}, qu’il est dégoûté de tout ce qu’il possède?
+Platon a dit, il y a long-temps, que les meilleurs estomacs ne sont pas
+ceux qui rebutent tous les aliments. — Mais, dit \bname{Candide}, n’y a-t-il pas
+du plaisir à tout critiquer, à sentir des défauts où les autres hommes
+croient voir des
+beautés? — C’est-à-dire, reprit \bname{Martin}, qu’il y a du
+plaisir à n’avoir pas de plaisir? — Oh bien! dit \bname{Candide}, il n’y a donc
+d’heureux que moi, quand je reverrai M\up{lle}~\bname{Cunégonde}. — C’est
+toujours bien fait d’espérer, dit \bname{Martin}.
+
+Cependant les jours, les semaines, s’écoulaient; \bname{Cacambo} ne revenait
+point, et \bname{Candide} était si abîmé dans sa douleur, qu’il ne fit pas même
+réflexion que \bname{Paquette} et frère Giroflée n’étaient pas venus seulement
+le remercier.
+
+
+\chapter[D’un souper que Candide et Martin firent…]{D’un souper que \bname{Candide} et \bname{Martin} firent\\avec six étrangers, et qui ils
+étaient}
+
+
+\lettrine{U}{n soir} que \bname{Candide}, suivi de \bname{Martin}, allait se mettre à table avec les
+étrangers qui logeaient dans la même hôtellerie, un homme à visage
+couleur de suie l’aborda par derrière, et, le prenant par le bras, lui
+dit: «Soyez prêt à partir avec nous, n’y manquez pas.» Il se retourne, et
+voit \bname{Cacambo}. Il n’y avait que la vue de \bname{Cunégonde} qui pût l’étonner et
+lui plaire davantage. Il fut sur le point de devenir fou de joie. Il
+embrasse son cher ami. «\bname{Cunégonde} est ici, sans doute? où est-elle?
+Mène-moi vers elle, que je meure de joie avec elle. — \bname{Cunégonde} n’est
+point ici, dit \bname{Cacambo}, elle est à Constantinople. — Ah ciel! à
+Constantinople! mais fût-elle à la Chine, j’y vole, partons. — Nous
+partirons après souper, reprit \bname{Cacambo}; je ne peux vous en dire
+davantage; je suis esclave, mon maître m’attend; il faut que j’aille le
+servir à table: ne dites mot, soupez, et tenez-vous prêt.»
+
+\bname{Candide}, partagé entre la joie et la douleur, charmé d’avoir revu son
+agent fidèle, étonné de le voir esclave, plein de l’idée de retrouver
+sa maîtresse, le cœur agité, l’esprit bouleversé, se mit à table avec
+\bname{Martin}, qui voyait de sang froid toutes ces aventures, et avec six
+étrangers, qui étaient venus passer le carnaval à \bname{Venise}.
+
+
+\bname{Cacambo}, qui versait à boire à l’un de ces six étrangers, s’approcha de
+l’oreille de son maître, sur la fin du repas, et lui dit: «Sire, Votre
+Majesté partira quand elle voudra, le vaisseau est prêt.» Ayant dit ces
+mots, il sortit. Les convives étonnés se regardaient sans proférer une
+seule parole, lorsqu’un autre domestique s’approchant de son maître,
+lui dit: «Sire, la chaise de Votre Majesté est à Padoue, et la barque
+est prête.» Le maître fit un signe, et le domestique partit. Tous les
+convives se regardèrent encore, et la surprise commune redoubla. Un
+troisième valet s’approchant aussi d’un troisième étranger, lui dit:
+«Sire, croyez-moi, Votre Majesté ne doit pas rester ici plus longtemps,
+je vais tout préparer»; et aussitôt il disparut.
+
+\bname{Candide} et \bname{Martin} ne doutèrent pas alors que ce ne fût une mascarade du
+carnaval. Un quatrième domestique dit au quatrième maître: «Votre
+Majesté partira quand elle voudra», et sortit comme les autres. Le
+cinquième valet en dit autant au cinquième maître. Mais le sixième
+valet parla différemment au sixième étranger qui était auprès de
+\bname{Candide}; il lui dit: «Ma foi, sire, on ne veut plus faire crédit à Votre
+Majesté ni à moi non plus, et nous pourrions bien être coffrés cette
+nuit vous et moi; je vais pourvoir à mes affaires: adieu.»
+
+Tous les domestiques ayant disparu, les six étrangers, \bname{Candide}, et
+\bname{Martin}, demeurèrent dans un profond silence. Enfin \bname{Candide} le rompit:
+«Messieurs, dit-il, voilà une singulière plaisanterie. Pourquoi
+êtes-vous tous rois? pour moi, je vous avoue que ni moi ni \bname{Martin} nous
+ne le sommes.»
+
+Le maître de \bname{Cacambo} prit alors gravement la parole, et dit en italien:
+«Je ne suis point plaisant, je m’appelle Achmet III; j’ai été
+grand-sultan plusieurs années; je détrônai mon frère; mon neveu m’a
+détrôné; on a coupé le cou à mes vizirs; j’achève ma vie dans le vieux
+sérail; mon neveu le grand-sultan Mahmoud me permet de voyager
+quelquefois pour ma santé; et je suis venu passer le carnaval à \bname{Venise}.»
+
+Un jeune homme qui était auprès d’Achmet parla après lui, et dit: «Je
+m’appelle Ivan; j’ai été empereur de toutes les Russies; j’ai été
+détrôné au berceau; mon père et ma mère ont été enfermés; on m’a élevé
+en prison; j’ai quelquefois la permission de voyager, accompagné de
+ceux qui me gardent; et je suis venu passer le carnaval à \bname{Venise}.»
+
+
+
+Le troisième dit: «Je suis Charles-Édouard, roi \bname{d’Angleterre};
+ mon
+père m’a cédé ses droits au royaume; j’ai combattu pour les soutenir;
+on a arraché le cœur à huit cents de mes partisans, et on leur en a
+battu les joues; j’ai été mis en prison; je vais à Rome faire une
+visite au roi mon père, détrôné ainsi que moi et mon grand-père; et je
+suis venu passer le carnaval à \bname{Venise}.»
+
+
+
+Le quatrième prit alors la parole et dit: «Je suis roi des Polaques; le
+sort de la guerre m’a privé de mes états héréditaires; mon père a
+éprouvé les mêmes revers; je me résigne à la Providence comme le sultan
+Achmet, l’empereur Ivan, et le roi Charles-Édouard, à qui Dieu donne
+une longue vie; et je suis venu passer le carnaval à \bname{Venise}.»
+
+
+
+Le cinquième dit: «Je suis aussi roi des Polaques; j’ai perdu mon
+royaume deux fois; mais la Providence m’a donné un autre état dans
+lequel j’ai fait plus de bien que tous les rois des Sarmates ensemble
+n’en ont jamais pu faire sur les bords de la Vistule. Je me résigne
+aussi à la Providence; et je suis venu passer le carnaval à \bname{Venise}.»
+
+
+
+Il restait au sixième monarque à parler. «Messieurs, dit-il, je ne suis
+pas si grand seigneur que vous; mais enfin j’ai été roi tout comme un
+autre; je suis Théodore; on m’a élu roi en Corse; on m’a appelé
+\textit{Votre Majesté}, et à présent à peine m’appelle-t-on \textit{monsieur}; j’ai
+fait frapper de la monnaie, et je ne possède pas un denier; j’ai eu
+deux secrétaires d’état, et j’ai à peine un valet; je me suis vu sur un
+trône, et j’ai longtemps été à Londres en prison sur la paille; j’ai
+bien peur d’être traité de même ici, quoique je sois venu, comme Vos
+Majestés, passer le carnaval à \bname{Venise}.»
+
+
+Les cinq autres rois écoutèrent ce discours avec une noble compassion.
+Chacun d’eux donna vingt sequins au roi \bname{Théodore} pour avoir des habits
+et des chemises; \bname{Candide} lui fit présent d’un diamant de deux mille
+sequins. «Quel est donc, disaient les cinq rois, cet homme qui est en
+état de donner cent fois autant que chacun de nous, et qui le donne?
+Êtes-vous roi aussi, monsieur? — Non, messieurs, et n’en ai nulle envie.»
+
+Dans l’instant qu’on sortait de table, il arriva dans la même
+hôtellerie quatre altesses sérénissimes qui avaient aussi perdu leurs
+états par le sort de la guerre, et qui venaient passer le reste du
+carnaval à \bname{Venise}; mais \bname{Candide} ne prit pas seulement garde à ces
+nouveaux venus. Il n’était occupé que d’aller trouver sa chère
+\bname{Cunégonde} à \bname{Constantinople}.
+
+
+
+\chapter{Voyage de \bname{Candide} à Constantinople}
+
+
+\lettrine{L}{e fidèle} \bname{Cacambo} avait déjà obtenu du patron turc qui allait
+reconduire le sultan Achmet à Constantinople qu’il recevrait \bname{Candide} et
+\bname{Martin} sur son bord. L’un et l’autre s’y rendirent après s’être
+prosternés devant Sa misérable Hautesse. \bname{Candide}, chemin faisant, disait
+à \bname{Martin}: «Voilà pourtant six rois détrônés avec qui nous avons soupé!
+et encore dans ces six rois il y en a un à qui j’ai fait l’aumône.
+Peut-être y a-t-il beaucoup d’autres princes plus infortunés. Pour moi,
+je n’ai perdu que cent moutons, et je vole dans les bras de \bname{Cunégonde}.
+Mon cher \bname{Martin}, encore une fois, \bname{Pangloss} avait raison, tout est bien.
+— Je le souhaite, dit \bname{Martin}. — Mais, dit \bname{Candide}, voilà une aventure bien
+peu vraisemblable que nous avons eue à \bname{Venise}. On n’avait jamais vu ni
+ouï conter que six rois détrônés soupassent ensemble au cabaret. — Cela
+n’est pas plus extraordinaire, dit \bname{Martin}, que la plupart des choses
+qui nous sont arrivées. Il est très commun que des rois soient
+détrônés; et à l’égard de l’honneur que nous avons eu de souper avec
+eux, c’est une bagatelle qui ne mérite pas notre attention.»
+% Qu’importe avec qui l’on soupe, pourvu qu’on fasse bonne chère?»
+
+À peine \bname{Candide} fut-il dans le vaisseau, qu’il sauta au cou de son
+ancien valet, de son ami \bname{Cacambo}. «Eh bien! lui dit-il, que fait
+\bname{Cunégonde}? est-elle toujours un prodige de beauté? m’aime-t-elle
+toujours? comment se porte-t-elle? Tu lui as, sans doute, acheté un
+palais à Constantinople?
+
+
+
+— Mon cher maître, répondit \bname{Cacambo}, \bname{Cunégonde} lave les écuelles sur le
+bord de la Propontide, chez un prince qui a très peu d’écuelles; elle
+est esclave dans la maison d’un ancien souverain, nommé \bname{Ragotski}, à
+qui le Grand-Turc donne trois écus par jour dans son asile; mais, ce
+qui est bien plus triste, c’est qu’elle a perdu sa beauté, et qu’elle
+est devenue horriblement laide. — Ah! belle ou laide, dit \bname{Candide}, je
+suis honnête homme, et mon devoir est de l’aimer toujours. Mais comment
+peut-elle être réduite à un état si abject avec les cinq ou six
+millions que tu avais emportés? — Bon, dit \bname{Cacambo}, ne m’en a-t-il pas
+fallu donner deux au senor don \bname{Fernando} d’Ibaraa, y Figueora, y
+Mascarenès, y \bname{Lampourdos}, y Souza, gouverneur de \bname{Buenos} Aires, pour
+avoir la permission de reprendre M\up{lle}~\bname{Cunégonde}? et un pirate
+ne nous a-t-il pas bravement dépouillés de tout le reste? Ce pirate ne
+nous a-t-il pas menés au cap de Matapan, à Milo, à Nicarie, à Samos, à
+Petra, aux \bname{Dardanelles}, à Marmara, à \bname{Scutari}? \bname{Cunégonde} et la vieille
+servent chez ce prince dont je vous ai parlé, et moi je suis esclave du
+sultan détrôné. — Que d’épouvantables calamités enchaînées les unes aux
+autres! dit \bname{Candide}. Mais, après tout, j’ai encore quelques diamants;
+je délivrerai aisément \bname{Cunégonde}. C’est bien dommage qu’elle soit
+devenue si laide.»
+
+
+
+Ensuite, se tournant vers \bname{Martin}: «Que pensez-vous, dit-il, qui soit le
+plus à plaindre, de l’empereur Achmet, de l’empereur Ivan, du roi
+Charles-Édouard, ou de moi? — Je n’en sais rien, dit \bname{Martin}; il faudrait
+que je fusse dans vos cœurs pour le savoir. — Ah! dit \bname{Candide}, si
+\bname{Pangloss} était ici, il le saurait, et nous l’apprendrait. — Je ne sais,
+dit \bname{Martin}, avec quelles balances votre \bname{Pangloss} aurait pu peser les
+infortunes des hommes, et apprécier leurs douleurs. Tout ce que je
+présume c’est qu’il y a des millions d’hommes sur la terre cent fois
+plus à plaindre que le roi Charles-Édouard, l’empereur Ivan, et le
+sultan Achmet. — Cela pourrait bien être», dit \bname{Candide}.
+
+On arriva en peu de jours sur le canal de la mer Noire. \bname{Candide}
+commença par racheter \bname{Cacambo} fort cher; et, sans perdre de temps, il
+se jeta dans une galère, avec ses compagnons, pour aller sur le rivage
+de la Propontide chercher \bname{Cunégonde}, quelque laide qu’elle pût être.
+
+
+Il y avait dans la chiourme deux forçats qui ramaient fort mal, et à
+qui le levanti patron appliquait de temps en temps quelques coups de
+nerf de bœuf sur leurs épaules nues; \bname{Candide}, par un mouvement
+naturel, les regarda plus attentivement que les autres galériens, et
+s’approcha d’eux avec pitié. Quelques traits de leurs visages défigurés
+lui parurent avoir un peu de ressemblance avec \bname{Pangloss} et avec ce
+malheureux jésuite, ce baron, ce frère de M\up{lle}~\bname{Cunégonde}. Cette
+idée l’émut et l’attrista. Il les considéra encore plus attentivement.
+«En vérité, dit-il à \bname{Cacambo}, si je n’avais pas vu pendre maître
+\bname{Pangloss}, et si je n’avais pas eu le malheur de tuer le baron, je
+croirais que ce sont eux qui rament dans cette galère.»
+
+
+Au nom du baron et de \bname{Pangloss} les deux forçats poussèrent un grand
+cri, s’arrêtèrent sur leur banc, et laissèrent tomber leurs rames. Le
+levanti patron accourait sur eux, et les coups de nerf de bœuf
+\bname{redoublaient}. «Arrêtez! arrêtez! seigneur, s’écria \bname{Candide}; je vous
+donnerai tant d’argent que vous voudrez. — Quoi! c’est \bname{Candide}! disait
+l’un des forçats; — quoi! c’est \bname{Candide}! disait l’autre. — Est-ce un songe?
+dit \bname{Candide}; veillé-je? suis-je dans cette galère? Est-ce là M.
+le baron, que j’ai tué? est-ce là maître \bname{Pangloss}, que j’ai vu pendre?
+
+
+— C’est nous-mêmes, c’est nous-mêmes, répondaient-ils. — Quoi! c’est là ce
+grand philosophe? disait \bname{Martin}. — Eh! monsieur le levanti patron, dit
+\bname{Candide}, combien voulez-vous d’argent pour la rançon de M. de
+Thunder-ten-tronckh, un des premiers barons de l’empire, et de M.~\bname{Pangloss}, le plus profond métaphysicien d’Allemagne? — Chien de chrétien,
+répondit le levanti patron, puisque ces deux chiens de forçats
+chrétiens sont des barons et des métaphysiciens, ce qui est sans doute
+une grande dignité dans leur pays, tu m’en donneras cinquante mille
+sequins. — Vous les aurez, monsieur; ramenez-moi comme un éclair à
+Constantinople, et vous serez payé sur-le-champ. Mais non, menez-moi
+chez M\up{lle}~\bname{Cunégonde}.» Le levanti patron, sur la première offre
+de \bname{Candide}, avait déjà tourné la proue vers la ville, et il faisait
+ramer plus vite qu’un oiseau ne fend les airs.
+
+\bname{Candide} embrassa cent fois le baron et \bname{Pangloss}. «Et comment ne vous
+ai-je pas tué, mon cher baron? et mon cher \bname{Pangloss}, comment êtes-vous
+en vie, après avoir été pendu? et pourquoi êtes-vous tous deux aux
+galères en Turquie? — Est-il bien vrai que ma chère sœur soit dans ce
+pays? disait le baron. — Oui, répondait \bname{Cacambo}. — Je revois donc mon cher
+\bname{Candide}! s’écriait \bname{Pangloss}.» \bname{Candide} leur présentait \bname{Martin} et \bname{Cacambo}.
+Ils s’embrassaient tous; ils parlaient tous à-la-fois. La galère
+volait, ils étaient déjà dans le port. On fit venir un Juif, à qui
+\bname{Candide} vendit pour cinquante mille sequins un diamant de la valeur de
+cent mille, et qui lui jura par Abraham qu’il n’en pouvait donner
+davantage. Il paya incontinent la rançon du baron et de \bname{Pangloss}.
+Celui-ci se jeta aux pieds de son libérateur, et les baigna de larmes;
+l’autre le remercia par un signe de tête, et lui promit de lui rendre
+cet argent à la première occasion. «Mais est-il bien possible que ma
+sœur soit en Turquie? disait-il. — Rien n’est si possible, reprit
+\bname{Cacambo}, puisqu’elle écure la vaisselle chez un prince de \bname{Transylvanie}.»
+On fit aussitôt venir deux Juifs; \bname{Candide} vendit encore des diamants;
+et ils repartirent tous dans une autre galère pour aller délivrer
+\bname{Cunégonde}.
+
+
+\chapter[Ce qui arriva à Candide, à Cunégonde…]{Ce qui arriva à \bname{Candide}, à \bname{Cunégonde},\\à \bname{Pangloss}, à \bname{Martin}, etc.}
+
+
+\lettrine[findent=1pt,ante=«]{P}{ardon}, encore une fois, dit \bname{Candide} au baron; pardon, mon Révérend
+Père, de vous avoir donné un grand coup d’épée au travers du corps.
+— N’en parlons plus, dit le baron; je fus un peu trop vif, je l’avoue;
+mais puisque vous voulez savoir par quel hasard vous m’avez vu aux
+galères, je vous dirai qu’après avoir été guéri de ma blessure par le
+frère apothicaire du collège, je fus attaqué et enlevé par un parti
+espagnol; on me mit en prison à \bname{Buenos} Aires dans le temps que ma sœur
+venait d’en partir. Je demandai à retourner à Rome auprès du père
+général. Je fus nommé pour aller servir d’aumônier à Constantinople
+auprès de M. l’ambassadeur de France. Il n’y avait pas huit jours
+que j’étais entré en fonction, quand je trouvai sur le soir un jeune
+icoglan très bien fait. Il faisait fort chaud: le jeune homme voulut se
+baigner; je pris cette occasion de me baigner aussi. Je ne savais pas
+que ce fût un crime capital pour un chrétien d’être trouvé tout nu avec
+un jeune musulman. Un cadi me fit donner cent coups de bâton sous la
+plante des pieds, et me condamna aux galères. Je ne crois pas qu’on ait
+fait une plus horrible injustice. Mais je voudrais bien savoir pourquoi
+ma sœur est dans la cuisine d’un souverain de \bname{Transylvanie} réfugié
+chez les Turcs.
+
+
+— Mais vous, mon cher \bname{Pangloss}, dit \bname{Candide}, comment se peut-il que je
+vous revoie? — Il est vrai, dit \bname{Pangloss}, que vous m’avez vu pendre; je
+devais naturellement être brûlé mais vous vous souvenez qu’il plut à
+verse lorsqu’on allait me cuire: l’orage fut si violent qu’on désespéra
+d’allumer le feu; je fus pendu, parce qu’on ne put mieux faire: un
+chirurgien acheta mon corps, m’emporta chez lui, et me disséqua. Il me
+fit d’abord une incision cruciale depuis le nombril jusqu’à la
+clavicule. On ne pouvait pas avoir été plus mal pendu que je l’avais
+été. L’exécuteur des hautes œuvres de la sainte inquisition, lequel
+était sous-diacre, brûlait à la vérité les gens à merveille, mais il
+n’était pas accoutumé à pendre: la corde était mouillée et glissa mal,
+elle fut mal nouée; enfin je respirais encore: l’incision cruciale me
+fit jeter un si grand cri, que mon chirurgien tomba à la renverse; et
+croyant qu’il disséquait le diable, il s’enfuit en mourant de peur, et
+tomba encore sur l’escalier en fuyant. Sa femme accourut au bruit d’un
+cabinet voisin: elle me vit sur la table étendu avec mon incision
+cruciale; elle eut encore plus de peur que son mari, s’enfuit, et tomba
+sur lui. Quand ils furent un peu revenus à eux, j’entendis la
+chirurgienne qui disait au chirurgien: \frquote{\localleftbox{« }Mon bon, de quoi vous
+avisez-vous aussi de disséquer un hérétique? ne savez-vous pas que le diable est toujours dans le corps de ces gens-là? je vais vite chercher un prêtre pour l’exorciser.}\localleftbox{}
+Je frémis à ce propos, et je ramassai le
+peu de forces qui me restaient pour crier: «Ayez pitié de moi!» Enfin le
+barbier portugais s’enhardit: il recousit ma peau; sa femme même eut
+soin de moi; je fus sur pied au bout de quinze jours. Le barbier me
+trouva une condition, et me fit laquais d’un chevalier de Malte qui
+allait à \bname{Venise}: mais mon maître n’ayant pas de quoi me payer, je me
+mis au service d’un marchand vénitien, et je le suivis à
+Constantinople.
+
+
+«Un jour il me prit fantaisie d’entrer dans une mosquée; il n’y avait
+qu’un vieil iman et une jeune dévote très jolie qui disait ses
+patenôtres; sa gorge était toute découverte: elle avait entre ses deux
+tétons un beau bouquet de tulipes, de roses, d’anémones, de renoncules,
+d’hyacinthes, et d’oreilles d’ours: elle laissa tomber son
+bouquet; je
+le ramassai, et je le lui remis avec un empressement très respectueux.
+Je fus si longtemps à le lui remettre, que l’iman se mit en colère, et
+voyant que j’étais chrétien, il cria à l’aide. On me mena chez le cadi,
+qui me fit donner cent coups de latte sous la plante des pieds, et
+m’envoya aux galères. Je fus enchaîné précisément dans la même galère
+et au même banc que M.~le baron. Il y avait dans cette galère
+quatre jeunes gens de Marseille, cinq prêtres napolitains, et deux
+moines de Corfou, qui nous dirent que de pareilles aventures arrivaient
+tous les jours. M.~le baron prétendait qu’il avait essuyé une
+plus grande injustice que moi: je prétendais, moi, qu’il était beaucoup
+plus permis de remettre un bouquet sur la gorge d’une femme que d’être
+tout nu avec un icoglan. Nous disputions sans cesse, et nous recevions
+vingt coups de nerf de bœuf par jour, lorsque l’enchaînement des
+événements de cet univers vous a conduit dans notre galère, et que vous
+nous avez rachetés.
+
+— Eh bien! mon cher \bname{Pangloss}, lui dit \bname{Candide}, quand vous avez été pendu,
+disséqué, roué de coups, et que vous avez ramé aux galères, avez-vous
+toujours pensé que tout allait le mieux du monde? — Je suis toujours de
+mon premier sentiment, répondit \bname{Pangloss}; car enfin je suis philosophe;
+il ne me convient pas de me dédire, Leibnitz ne pouvant pas avoir tort,
+et l’harmonie préétablie étant d’ailleurs la plus belle chose du monde,
+aussi bien que le plein et la matière subtile.»
+
+
+
+\chapter{Comment \bname{Candide} retrouva \bname{Cunégonde} et la vieille}
+
+
+\lettrine{P}{endant} que \bname{Candide}, le baron, \bname{Pangloss}, \bname{Martin}, et \bname{Cacambo}, contaient
+leurs aventures, qu’ils raisonnaient sur les événements contingents ou
+non contingents de cet univers, qu’ils disputaient sur les effets et
+les causes, sur le mal moral et sur le mal physique, sur la liberté et
+la nécessité, sur les consolations que l’on peut éprouver lorsqu’on est
+aux galères en Turquie, ils abordèrent sur le rivage de la Propontide,
+à la maison du prince de \bname{Transylvanie}. Les premiers objets qui se
+présentèrent furent \bname{Cunégonde} et la vieille, qui étendaient des
+serviettes sur des ficelles pour les faire sécher.
+
+Le baron pâlit à cette vue. Le tendre amant \bname{Candide} en voyant sa belle
+\bname{Cunégonde} rembrunie, les yeux éraillés, la gorge sèche, les joues
+ridées, les bras rouges et écaillés, recula trois pas, saisi d’horreur,
+et avança ensuite par bon procédé. Elle embrassa \bname{Candide} et son frère:
+on embrassa la vieille: \bname{Candide} les racheta toutes deux.
+
+Il y avait une petite métairie dans le voisinage; la vieille proposa à
+\bname{Candide} de s’en accommoder, en attendant que toute la troupe eût une
+meilleure destinée. \bname{Cunégonde} ne savait pas qu’elle était enlaidie,
+personne ne l’en avait avertie: elle fit souvenir \bname{Candide} de ses
+promesses avec un ton si absolu, que le bon \bname{Candide} n’osa pas la
+refuser. Il signifia donc au baron qu’il allait se marier avec sa
+sœur. «Je ne souffrirai jamais, dit le baron, une telle bassesse de sa
+part, et une telle insolence de la vôtre; cette infamie ne me sera
+jamais reprochée: les enfants de ma sœur ne pourraient entrer dans les
+chapitres d’Allemagne. Non, jamais ma sœur n’épousera qu’un baron de
+l’empire.» \bname{Cunégonde} se jeta à ses pieds, et les baigna de larmes; il
+fut inflexible. «Maître fou, lui dit \bname{Candide}, je t’ai réchappé des
+galères, j’ai payé ta rançon, j’ai payé celle de ta sœur; elle lavait
+ici des écuelles, elle est laide, j’ai la bonté d’en faire ma femme; et
+tu prétends encore t’y opposer! je te retuerais si j’en croyais ma
+colère. — Tu peux me tuer encore, dit le baron, mais tu n’épouseras pas
+ma sœur de mon vivant.»
+
+
+
+
+\chapter{Conclusion}
+
+
+\lettrine{C}{andide}, dans le fond de son cœur, n’avait aucune envie d’épouser
+\bname{Cunégonde}; mais l’impertinence extrême du baron le déterminait à
+conclure le mariage; et \bname{Cunégonde} le pressait si vivement qu’il ne
+pouvait s’en dédire. Il consulta \bname{Pangloss}, \bname{Martin}, et le fidèle
+\bname{Cacambo}. \bname{Pangloss} fit un beau mémoire par lequel il prouvait que le
+baron n’avait nul droit sur sa sœur, et qu’elle pouvait, selon toutes
+les lois de l’empire, épouser \bname{Candide} de la main gauche. \bname{Martin} conclut
+à jeter le baron dans la mer; \bname{Cacambo} décida qu’il fallait le rendre au
+levanti patron, et le remettre aux galères, après quoi on l’enverrait à
+Rome au père général par le premier vaisseau. L’avis fut trouvé fort
+bon; la vieille l’approuva; on n’en dit rien à sa sœur; la chose fut
+exécutée pour quelque argent, et on eut le plaisir d’attraper un
+jésuite, et de punir l’orgueil d’un baron allemand.
+
+
+Il était tout naturel d’imaginer qu’après tant de désastres, \bname{Candide}
+marié avec sa maîtresse, et vivant avec le philosophe \bname{Pangloss}, le
+philosophe \bname{Martin}, le prudent \bname{Cacambo}, et la vieille, ayant d’ailleurs
+rapporté tant de diamants de la patrie des anciens Incas, mènerait la
+vie du monde la plus agréable; mais il fut tant friponné par les Juifs,
+qu’il ne lui resta plus rien que sa petite métairie; sa femme devenant
+tous les jours plus laide devint acariâtre et insupportable: la vieille
+était infirme, et fut encore de plus mauvaise humeur que \bname{Cunégonde}.
+\bname{Cacambo}, qui travaillait au jardin, et qui allait vendre des \bname{légumes} à
+Constantinople, était excédé de travail, et maudissait sa destinée.
+\bname{Pangloss} était au désespoir de ne pas briller dans quelque université
+d’Allemagne. Pour \bname{Martin}, il était fermement persuadé qu’on est
+également mal partout; il prenait les choses en patience. \bname{Candide},
+\bname{Martin}, et \bname{Pangloss}, disputaient quelquefois de métaphysique et de
+morale. On voyait souvent passer sous les fenêtres de la métairie des
+bateaux chargés d’effendis, de bachas, de cadis, qu’on envoyait en exil
+à Lemnos, à Mytilène, à Erzeroum: on voyait venir d’autres cadis,
+d’autres bachas, d’autres effendis, qui prenaient la place des
+expulsés, et qui étaient expulsés à leur tour: on voyait des têtes
+proprement empaillées qu’on allait présenter à la sublime Porte. Ces
+spectacles faisaient redoubler les dissertations; et quand on ne
+disputait pas, l’ennui était si excessif, que la vieille osa un jour
+leur dire: «Je voudrais savoir lequel est le pire, ou d’être violée cent
+fois par des pirates nègres, d’avoir une fesse coupée, de passer par
+les baguettes chez les \bname{Bulgares}, d’être fouetté et pendu dans un
+auto-da-fé, d’être disséqué, de ramer en galère, d’éprouver enfin
+toutes les misères par lesquelles nous avons tous passé, ou bien de
+rester ici à ne rien faire? — C’est une grande question», dit \bname{Candide}.
+
+
+
+
+
+
+Ce discours fit naître de nouvelles réflexions, et \bname{Martin} surtout
+conclut que l’homme était né pour vivre dans les convulsions de
+l’inquiétude, ou dans la léthargie de l’ennui. \bname{Candide} n’en convenait
+pas, mais il n’assurait rien. \bname{Pangloss} avouait qu’il avait toujours
+horriblement souffert; mais ayant soutenu une fois que tout allait à
+merveille, il le soutenait toujours, et n’en croyait rien.
+
+Une chose acheva de confirmer \bname{Martin} dans ses détestables principes, de
+faire hésiter plus que jamais \bname{Candide} et d’embarrasser \bname{Pangloss}. C’est
+qu’ils virent un jour aborder dans leur métairie \bname{Paquette} et le frère
+Giroflée, qui étaient dans la plus extrême misère; ils avaient bien
+vite mangé leurs trois mille piastres, s’étaient quittés, s’étaient
+raccommodés, s’étaient brouillés, avaient été mis en
+prison; s’étaient
+enfuis, et enfin frère Giroflée s’était fait turc. \bname{Paquette} continuait
+son métier partout, et n’y gagnait plus rien. «Je l’avais bien prévu,
+dit \bname{Martin} à \bname{Candide}, que vos présents seraient bientôt dissipés, et ne
+les rendraient que plus misérables. Vous avez regorgé de millions de
+piastres, vous et \bname{Cacambo}, et vous n’êtes pas plus heureux que frère
+Giroflée et \bname{Paquette}. — Ah! ah! dit \bname{Pangloss} à \bname{Paquette}, le ciel vous
+ramène donc ici parmi nous. Ma pauvre enfant! savez-vous bien que vous
+m’avez coûté le bout du nez, un œil, et une oreille? Comme vous voilà
+faite! Eh! qu’est-ce que ce monde!» Cette nouvelle aventure les engagea
+à philosopher plus que jamais.
+
+Il y avait dans le voisinage un derviche très fameux qui passait pour
+le meilleur philosophe de la Turquie; ils allèrent le consulter;
+\bname{Pangloss} porta la parole, et lui dit: «Maître, nous venons vous prier de
+nous dire pourquoi un aussi étrange animal que l’homme a été formé.
+
+
+
+
+
+
+— De quoi te mêles-tu? lui dit le derviche; est-ce là ton affaire? — Mais,
+mon Révérend Père, dit \bname{Candide}, il y a horriblement de mal sur la
+terre. — Qu’importe, dit le derviche, qu’il y ait du mal ou du bien?
+quand Sa Hautesse envoie un vaisseau en Égypte, s’embarrasse-t-elle si
+les souris qui sont dans le vaisseau sont à leur aise ou non? — Que
+faut-il donc faire? dit \bname{Pangloss}. — Te taire, dit le derviche. — Je me
+flattais, dit \bname{Pangloss}, de raisonner un peu avec vous des effets et des
+causes, du meilleur des mondes possibles, de l’origine du mal, de la
+nature de l’âme, et de l’harmonie préétablie.» Le derviche, à ces mots,
+leur ferma la porte au nez.
+
+
+
+Pendant cette conversation, la nouvelle s’était répandue qu’on venait
+d’étrangler à Constantinople deux vizirs du banc et le muphti, et qu’on
+avait empalé plusieurs de leurs amis. Cette catastrophe faisait partout
+un grand bruit pendant quelques heures. \bname{Pangloss}, \bname{Candide}, et \bname{Martin},
+en retournant à la petite métairie, rencontrèrent un bon vieillard qui
+prenait le frais à sa porte sous un berceau d’orangers. \bname{Pangloss}, qui
+était aussi curieux que raisonneur, lui demanda comment se nommait le
+muphti qu’on venait d’étrangler. «Je n’en sais rien, répondit le
+bonhomme, et je n’ai jamais su le nom d’aucun muphti ni d’aucun vizir.
+J’ignore absolument l’aventure dont vous me parlez; je présume qu’en
+général ceux qui se mêlent des affaires publiques périssent quelquefois
+misérablement, et qu’ils le méritent; mais je ne m’informe jamais de ce
+qu’on fait à Constantinople; je me contente d’y envoyer vendre les
+fruits du jardin que je cultive.» Ayant dit ces mots, il fit entrer les
+étrangers dans sa maison; ses deux filles et ses deux fils leur
+présentèrent plusieurs sortes de sorbets qu’ils faisaient eux-mêmes, du
+kaïmak piqué d’écorces de cédrat confit, des oranges, des citrons, des
+limons, des ananas, des dattes, des pistaches, du café de Moka qui
+n’était point mêlé avec le mauvais café de Batavia et des îles. Après
+quoi les deux filles de ce bon musulman parfumèrent les barbes de
+\bname{Candide}, de \bname{Pangloss}, et de \bname{Martin}.
+
+
+
+«Vous devez avoir, dit \bname{Candide} au Turc, une vaste et magnifique terre?
+— Je n’ai que vingt arpents, répondit le Turc; je les cultive avec mes
+enfants; le travail éloigne de nous trois grands maux, l’ennui, le
+vice, et le besoin.»
+
+
+\bname{Candide} en retournant dans sa métairie fit de profondes réflexions sur
+le discours du Turc. Il dit à \bname{Pangloss} et à \bname{Martin}: «Ce bon vieillard me
+paraît s’être fait un sort bien préférable à celui des six rois avec
+qui nous avons eu l’honneur de souper. — Les grandeurs, dit \bname{Pangloss},
+sont fort dangereuses, selon le rapport de tous les philosophes; car
+enfin Églon, roi des Moabites, fut assassiné par Aod; \bname{Absalon} fut pendu
+par les cheveux et percé de trois dards; le roi \bname{Nadab}, fils de
+\bname{Jéroboam}, fut tué par \bname{Baasa}; le roi Éla, par \bname{Zambri}; \bname{Ochosias}, par
+\bname{Jéhu}; \bname{Athalie}, par \bname{Joïada}; les rois \bname{Joachim}, \bname{Jéchonias}, \bname{Sédécias},
+furent esclaves. Vous savez comment périrent \bname{Crésus}, \bname{Astyage}, \bname{Darius},
+\bname{Denys} de \bname{Syracuse}, \bname{Pyrrhus}, \bname{Persée}, \bname{Annibal}, \bname{Jugurtha}, \bname{Arioviste},
+\bname{César}, \bname{Pompée}, \bname{Néron}, \bname{Othon}, \bname{Vitellius}, \bname{Domitien}, \bname{Richard}~II
+\bname{d’Angleterre}, \bname{Édouard}~II, \bname{Henri}~VI, \bname{Richard}~III, \mbox{Marie Stuart}, Charles~I\up{er}, les trois \bname{Henri} de France, l’empereur \bname{Henri}~IV? Vous savez… — Je
+sais aussi, dit \bname{Candide}, qu’il faut cultiver notre jardin. — Vous avez
+raison, dit \bname{Pangloss}; car, quand l’homme fut mis dans le jardin d’Éden,
+il y fut mis \emph{ut operaretur eum}, pour qu’il travaillât; ce qui prouve
+que l’homme n’est pas né pour le repos. — Travaillons sans raisonner, dit
+\bname{Martin}, c’est le seul moyen de rendre la vie supportable.
+
+Toute la petite société entra dans ce louable dessein; chacun se mit à
+exercer ses talents. La petite terre rapporta beaucoup. \bname{Cunégonde}
+était, à la vérité, bien laide; mais elle devint une excellente
+pâtissière; \bname{Paquette} broda; la vieille eut soin du linge. Il n’y eut
+pas jusqu’à frère Giroflée qui ne rendît service; il fut un très bon
+menuisier, et même devint honnête homme: et \bname{Pangloss} disait quelquefois
+à \bname{Candide}: «Tous les événements sont enchaînés dans le meilleur des
+mondes possibles; car enfin si vous n’aviez pas été chassé d’un beau
+château à grands coups de pied dans le derrière pour l’amour de
+M\up{lle}~\bname{Cunégonde}, si vous n’aviez pas été mis à l’inquisition, si
+vous n’aviez pas couru l’Amérique à pied, si vous n’aviez pas donné un
+bon coup d’épée au baron, si vous n’aviez pas perdu tous vos moutons du
+bon pays d’Eldorado, vous ne mangeriez pas ici des cédrats confits et
+des pistaches. — Cela est bien dit, répondit \bname{Candide}, mais il faut
+cultiver notre jardin.»
+
+
+\endinput
+
+
+
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/book-mathematics.tex b/Master/texmf-dist/doc/lualatex/tango/examples/book-mathematics.tex
new file mode 100644
index 00000000000..cbcebe1ae45
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/book-mathematics.tex
@@ -0,0 +1,44 @@
+% !TEX TS-program = LuaLaTeX
+\documentclass[french,PubliClass=book,ColorTheme=Steel,FontSize=11pt,
+StylisticSet={parallelslant,leqslant}]{tango}
+\renewcommand{\arraystretch}{1.3}
+\usepackage{tikz}
+\usetikzlibrary{calc,through,arrows}
+\tgosmartlists
+\AtBeginDocument{%
+\RenewCommandCopy{\setminus}{\smallsetminus}
+}
+\NewDocumentCommand\N{}{\ensuremath{\symbb{N}}}
+\NewDocumentCommand\Z{}{\ensuremath{\symbb{Z}}}
+\NewDocumentCommand\Q{}{\ensuremath{\symbb{Q}}}
+\NewDocumentCommand\R{}{\ensuremath{\symbb{R}}}
+\NewDocumentCommand\C{}{\ensuremath{\symbb{C}}}
+\NewDocumentCommand\Pt{m}{\ensuremath{\symfrak{P}(#1)}}
+\NewDocumentCommand\rond{}{\mathrel{\circ}}
+\NewDocumentCommand\mesalg{m}{\overline{#1}}
+\NewDocumentCommand\Vector{m}{\overrightarrow{#1}}
+\DeclareMathOperator{\cl}{cl}
+\DeclareMathOperator{\sgn}{sgn}
+\newcounter{prop}
+\newstatement{prop}{prop}{Propriété}
+\newfixedcaption{\figcaption}{figure}
+%%
+\includeonly{rel-bin,recurrence,polynome-deg2,euler,puissance-cercle}
+%\includeonly{polynome-deg2}
+%%
+%\tangoSmartLists
+\begin{document}
+\frontmatter
+\tableofcontents
+\mainmatter
+%\tgosetup{ColorTheme=Framboise}
+\part{Algèbre}
+\include{rel-bin}
+\include{recurrence}
+\include{polynome-deg2}
+%\tgosetup{ColorTheme=Sapin}
+\part{Géométrie}
+\include{euler}
+\include{puissance-cercle}
+\backmatter
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/candide.tex b/Master/texmf-dist/doc/lualatex/tango/examples/candide.tex
new file mode 100644
index 00000000000..bd3432e7bf5
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/candide.tex
@@ -0,0 +1,61 @@
+% !TEX TS-program = LuaLaTeX
+%
+\documentclass[french,Output=SmallTablet,PubliClass=book,twoside,Numbers=OldStyle,FontSize=9pt]{tango}
+
+\geometry{paperheight=18.5cm,paperwidth=11.2cm,heightrounded,top=1.2cm,bottom=2.8cm,headheight=14pt,headsep=12pt,footskip=13pt,inner=1.2cm,outer=2cm,}
+%
+\titleformat{\chapter}[display]{\filcenter\large\itshape\addfontfeature{RawFeature={-onum}}}
+{\normalfont\Large\scshape\addfontfeature{RawFeature={+c2sc}} \chaptername\space\thechapter}{1em}{}
+\titleformat{name=\chapter,numberless}[display]{\filcenter\large\itshape\addfontfeature{RawFeature={-onum}}}
+{}{0em}{}%
+\titlespacing{\chapter}{0pt}{20pt plus 8pt}{20pt plus 8pt}%
+%
+\newpagestyle{candide}{%
+ \sethead
+ [\addfontfeature{RawFeature=+onum}\thepage]
+[\addfontfeature{RawFeature=+c2sc}\MakeUppercase\chaptertitlename\space\thechapter][] % even
+ {}{\addfontfeature{RawFeature=+c2sc}\MakeUppercase\chaptertitle}
+ {\addfontfeature{RawFeature=+onum}\thepage} % odd
+ }
+ \newpagestyle{candidetoc}{%
+ \sethead
+ [\addfontfeature{RawFeature=+onum}\thepage]
+[\addfontfeature{RawFeature=+c2sc}\MakeUppercase\frenchcontentsname][] % even
+ {}{\addfontfeature{RawFeature=+c2sc}\MakeUppercase\frenchcontentsname}
+ {\addfontfeature{RawFeature=+onum}\thepage} % odd
+ }
+
+ \renewcommand\thechapter{\Roman{chapter}}
+ \titlecontents{chapter}
+ [3.5em] % ie, 1.5em (chapter) + 2.3em
+ {\normalfont}
+ {\contentslabel{3.5em}}
+ {\hspace*{-1.5em}}
+ {\titlerule*[1pc]{.}\contentspage}
+
+ %%%%%%%%%%%%
+\pagestyle{candide}
+%
+
+\usepackage{lettrine}
+
+
+\includeonly{Ch-1-15, Ch-16-30}
+
+\hypersetup{pdfpagelayout=TwoPageRight}
+
+\begin{document}
+
+
+
+\include{Ch-1-15}
+\include{Ch-16-30}
+\backmatter
+\pagestyle{candidetoc}
+\tableofcontents
+
+\end{document}
+
+
+
+
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/euler.tex b/Master/texmf-dist/doc/lualatex/tango/examples/euler.tex
new file mode 100644
index 00000000000..4d3ea545715
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/euler.tex
@@ -0,0 +1,512 @@
+
+\tgotitle{Droite et cercle d'Euler}
+\tgoshorttoc
+\section{Cercle circonscrit à un triangle}
+\subsection{Un résultat préliminaire}
+On sait depuis le collège que la droite qui joint les milieux de deux côtés d'un triangle est parallèle au troisième côté. Nous précisons ce résultat à l'aide d'un théorème qui nous sera utile par la suite (voir figure \ref{figmilieux}).
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=left:$B$](B) at (0,0);
+\coordinate[label=right:$C$](C) at (4,0);
+\coordinate (T) at ($(B)!1!38:(C)$);
+\coordinate (S) at ($(C)!1!105:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B);
+\draw (A)--(C);
+\coordinate [label=right:$B'$] (B') at ($(A)!0.5!(C)$);
+\coordinate [label=left:$C'$] (C') at ($(A)!0.5!(B)$);
+\draw[>=stealth,->,semithick](B)--(C);
+\draw[>=stealth,->,semithick](C')--(B');
+\foreach \point in {A,B,C,C',B'}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figmilieux}
+\end{figure}
+
+\begin{thm}
+Soit un triangle $ABC$ et soit $B'$ et $C'$ les milieux respectifs de $[AC]$ et $[AB]$. Alors
+les droites $(BC)$ et $(C'B')$ sont parallèles et $\overrightarrow{BC}=2\overrightarrow{C'B'}$.
+\label{thmilieux}
+\end{thm}
+
+\begin{proof}
+La relation de Chasles permet d'écrire
+\begin{align*}
+\overrightarrow{BC}&=\overrightarrow{BA}+\overrightarrow{AC},\\
+\intertext{puis, en utilisant une caractérisation vectorielle du milieu,}
+\overrightarrow{BC}&=2\overrightarrow{C'A}+2\overrightarrow{AB'},\\
+\overrightarrow{BC}&=2\left(\overrightarrow{C'A}+\overrightarrow{AB'}\right),\\
+\overrightarrow{BC}&=2\overrightarrow{C'B'}.\qedhere
+\end{align*}
+\end{proof}
+
+\subsection{Médiatrices des côtés d'un triangle}
+%%%%% Version 1
+ La médiatrice d'un segment est par définition la droite perpendiculaire à ce segment en son milieu. Nous admettrons que la médiatrice d'un segment est aussi l'ensemble des points qui sont équidistants des extrémités de ce segment (voir figure \ref{figcerccir}). Nous formulons alors le théorème suivant :
+%%%%%%
+%%%%%%
+%%%%%%
+%%%%% Version 2
+%La médiatrice d'un segment est par définition l'ensemble des points équidistants des extrémités de ce segment. Il est clair que le milieu du segment appartient à la médiatrice. On a même :
+% %
+%\begin{thm}
+%La médiatrice d'un segment est la droite perpendiculaire à ce segment en son milieu.
+%\end{thm}\label{caracmed}
+%
+%\begin{proof}
+%Soit un segment $[AB]$ et $I$ son milieu. Notons $\symcal{E}$ la médiatrice de $[AB]$ et $\symcal{D}$ la droite perpendiculaire à $[AB]$ en $I$. Montrons que $\symcal{E}=\symcal{D}$ par double inclusion.
+%Soit un point $M$ appartenant à la médiatrice $\symcal{E}$ de $[AB]$. On a $IA=IB$ et $MA=MB$ par définition de la médiatrice. Les triangles $MIA$ et $MIB$ sont donc superposables. Si $\alpha$ et $\beta$ sont les mesures respectives de $\widehat{MIA}$ et $\widehat{MIB}$, on en déduit que $\alpha=\beta$. L'angle $\widehat{AIB}$ et plat de mesure $\alpha+\beta$ :
+%\[\left.\begin{aligned} \alpha=\beta&\\\alpha+\beta=180\degre\end{aligned}\right\}\implies \alpha=\beta=90\degre.\]
+%Le point $M$ appartient donc à la droite $\symcal{D}$ : $\symcal{E}\subset\symcal{D}$.
+%
+%Réciproquement, supposons que $M\in\symcal{D}$. Considérons la réflexion $s$ d'axe $\symcal{D}$ : on a $s(A)=B$ et $s(M)=M$ (car l'ensemble des points invariants de $s$ est la droite $\symcal{D}$). Par conservation des distances, on a $MA=s(M)s(A)=MB$. Donc $M$ appartient à $\symcal{E}$ : $\symcal{E}\subset\symcal{D}$.
+%
+%On a donc bien $\symcal{E}=\symcal{D}$.
+%\end{proof}
+%
+%
+
+\begin{thm}
+Les médiatrices des trois côtés d'un triangle sont concourantes en un point équidistant des trois sommets et centre de l'unique cercle passant par ces derniers.
+\end{thm}
+
+\vspace{1ex}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=left:$B$](B) at (0,0);
+\coordinate[label=right:$C$](C) at (4,0);
+\coordinate (T) at ($(B)!1!38:(C)$);
+\coordinate (S) at ($(C)!1!105:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B)--(C)--cycle;
+\coordinate [label=below:$A'$] (A') at ($(B)!0.5!(C)$);
+\coordinate [label=right:$B'$] (B') at ($(A)!0.5!(C)$);
+\coordinate [label=left:$C'$] (C') at ($(A)!0.5!(B)$);
+\coordinate (X) at ($(C')!1!90:(B)$);
+\coordinate (Y) at ($(B')!1!90:(C)$);
+\coordinate [label=above:$O${\rule[-1mm]{0mm}{1mm}}](O) at (intersection of C'--X and B'--Y);
+\draw(C')--(O);
+\draw (B')--(O);
+\draw[dotted,semithick](A')--(O);
+\node [draw] at (O) [circle through={(C)}] {};
+\draw[gray](O)--(A);
+\draw[gray](O)--(B);
+\draw[gray](O)--(C);
+\foreach \point in {A,B,C,C',A',B',O}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figcerccir}
+\end{figure}
+
+
+
+\begin{proof}
+Reprenons la figure \ref{figmilieux} et nommons $A'$ le milieu de $[BC]$. Les médatrices des côtés $[AB]$ et $[AC]$ sont sécantes en un point $O$. (On rappelle qu'un triangle est la donnée de trois points non alignés, autrement dit, un triangle aplati ne peut être considéré comme un triangle : cela assure que les deux médiatrices sont bien sécantes.) Le point $O$ se trouve à la fois sur la médiatrice de $[AB]$ et sur la médiatrice de $[AC]$ : il est donc à la fois équidistant de $A$ et $B$ ($OA=OB$) et équidistant de $A$ et $C$ ($OA=OC$). On a donc finalement $OB=OC$, ce qui assure que la médiatrice de $[BC]$ passe par $O$. Les trois médiatrices sont donc concourantes en $O$, point équidistant des trois sommets du triangle et par conséquent centre d'un cercle passant par ces sommets. Pour établir l'unicité d'un tel cercle, il suffit de remarquer que le centre d'un cercle passant par les sommets est nécessairement équidistant des sommets donc point de concours des médiatrices.
+\end{proof}
+
+Le cercle en question est le \emph{cercle circonscrit} au triangle.
+
+\subsection{Un cas particulier}
+Le cas du cercle circonscrit au triangle rectangle est bien connu (voir figure \ref{figtrec}).
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=left:$B$](B) at (0,0);
+\coordinate[label=right:$C$](C) at (4,0);
+\coordinate (T) at ($(B)!1!30:(C)$);
+\coordinate (S) at ($(C)!1!120:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B)--(C)--cycle;
+\coordinate [label=below:$A'$] (A') at ($(B)!0.5!(C)$);
+\coordinate [label=left:$B'${\rule{1.3mm}{0mm}}] (B') at ($(A)!0.5!(C)$);
+\coordinate [label=right:{\rule{1.3mm}{0mm}}$C'$] (C') at ($(A)!0.5!(B)$);
+\coordinate (X) at ($(C')!1!90:(B)$);
+\coordinate (Y) at ($(B')!1!90:(C)$);
+\coordinate(O) at (intersection of C'--X and B'--Y);
+\draw(C')--(O);
+\draw (B')--(O);
+\draw[dotted,semithick](A')--(O);
+\node [draw] at (O) [circle through={(C)}] {};
+\draw[gray](O)--(A);
+\draw[gray](O)--(B);
+\draw[gray](O)--(C);
+\foreach \point in {A,B,C,C',A',B',O}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figtrec}
+\end{figure}
+
+
+\begin{thm}
+Si un triangle est rectangle, alors le centre de son cercle circonscrit est le milieu de l'hypoténuse qui est donc un diamètre du cercle. Réciproquement si le cercle circonscrit à un triangle admet l'un des côtés comme diamètre, alors ce triangle est rectangle et admet le côté en question pour hypoténuse.
+\label{diamtrrec}
+\end{thm}
+
+\begin{proof}
+Supposons le triangle $ABC$ rectangle en $A$. La droite $(AB)$ est alors perpendiculaire à la droite $(AC)$.
+D'après le théorème \ref{thmilieux} on sait que $\overrightarrow{AB}=2\overrightarrow{B'A'}$ et en particulier que les droites $(AB)$ et $(B'A')$ sont parallèles. On en déduit que les droites $(B'A')$ et $(AC)$ sont perpendiculaires:
+\[\left.\begin{aligned} &(AB)\parallel(A'B')\\
+\text{et}&\\
+&(AB)\perp(AC)\end{aligned}\right\}\implies (A'B')\perp(AC).
+\]
+
+La droite $(B'A')$, perpendiculaire au segment $[AC]$ en son milieu, en est la médiatrice. De même, $(C'A')$ est la médiatrice du segment $[AB]$. Le point $A'$, milieu de $[BC]$, est commun à ces deux médiatrices : il est donc le centre du cercle circonscrit au triangle.
+
+
+
+Réciproquement, supposons que le milieu $A'$ de $[BC]$ soit le centre du cercle circonscrit. Ce point est alors équidistant de $A$ et $C$, donc est un point de la médiatrice du segment $[AC]$; il en est de même pour $B'$, milieu de ce segment. La droite $(A'B')$ est donc la médiatrice du segment $[AC]$ et lui est perpendiculaire. Cette droite est aussi parallèle à $(AB)$, en vertu du théorème \ref{thmilieux}. De la même façon que précédemment, on en déduit que les droites $(AB)$ et $(AC)$ sont perpendiculaires. Le triangle $ABC$ est donc rectangle en $A$.
+\end{proof}
+
+\begin{remark} La situation représentée sur la figure \ref{figcerccir} est celle d'un triangle acutangle. On comprend assez rapidement (mais ceci ne constitue pas une démonstration) que le centre du cercle circonscrit est intérieur au triangle si les trois angles sont aigus et extérieur dans le cas où l'un des angles est obtus (voir figure \ref{figtrobtu}). Le cas du triangle rectangle constitue en quelque sorte une situation limite…
+\end{remark}
+
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=left:$B$](B) at (0,0);
+\coordinate[label=right:$C$](C) at (4,0);
+\coordinate (T) at ($(B)!1!25:(C)$);
+\coordinate (S) at ($(C)!1!140:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B)--(C)--cycle;
+\coordinate [label=above:$A'$] (A') at ($(B)!0.5!(C)$);
+\coordinate [label=left:$B'${\rule{1.3mm}{0mm}}] (B') at ($(A)!0.5!(C)$);
+\coordinate [label=right:{\rule{1.3mm}{0mm}}$C'$] (C') at ($(A)!0.5!(B)$);
+\coordinate (X) at ($(C')!1!90:(B)$);
+\coordinate (Y) at ($(B')!1!90:(C)$);
+\coordinate [label=below:$O${\rule[-1mm]{0mm}{1mm}}](O) at (intersection of C'--X and B'--Y);
+\draw(C')--(O);
+\draw (B')--(O);
+\draw[dotted,semithick](A')--(O);
+\node [draw] at (O) [circle through={(C)}] {};
+\draw[gray](O)--(A);
+\draw[gray](O)--(B);
+\draw[gray](O)--(C);
+\foreach \point in {A,B,C,C',A',B',O}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figtrobtu}
+\end{figure}
+
+
+
+\section{Centre de gravité d'un triangle}
+Il est connu que les médianes d'un triangle sont concourantes en un point situé aux deux tiers de chacune d'elles à partir du sommet. C'est à cette propriété que nous allons maintenant nous intéresser, sous un angle vectoriel (voir figure \ref{figmedianes}).
+
+
+\begin{thm}\label{thgravit}%
+Soit un triangle $ABC$ et soit $A'$, $B'$ et $C'$ les milieux respectifs des côtés $[BC]$, $[AC]$ et $[AB]$.
+Les médianes de ce triangle sont concourantes en un point $G$, nommé centre de gravité du triangle et qui est l'unique point du plan à vérifier les relations vectorielles suivantes :
+\begin{gather}
+\overrightarrow{GA}+\overrightarrow{GB}+\overrightarrow{GC}=\vec{0}\,,\label{eqisobar}\\
+\overrightarrow{AG}=\frac23\overrightarrow{AA'}\,,\quad\overrightarrow{BG}=\frac23\overrightarrow{BB'}\quad\text{et}\quad\overrightarrow{CG}=\frac23\overrightarrow{CC'}\,.\label{eqGmediane}
+\end{gather}%
+\end{thm}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$B$](B) at (0,0);
+\coordinate[label=below:$C$](C) at (4,0);
+\coordinate (T) at ($(B)!1!36:(C)$);
+\coordinate (S) at ($(C)!1!107:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B)--(C)--cycle;
+\coordinate [label=below:$A'$] (A') at ($(B)!0.5!(C)$);
+\coordinate [label=right:$B'$](B') at ($(A)!0.5!(C)$);
+\coordinate[label=left:$C'$](C') at ($(A)!0.5!(B)$);
+\coordinate (X) at ($(C')!1!90:(B)$);
+\coordinate (Y) at ($(B')!1!90:(C)$);
+\coordinate (O) at (intersection of C'--X and B'--Y);
+\coordinate[label=above:$G${\rule[-1mm]{0mm}{1mm}}] (G) at ($(A')!0.333!(A)$);
+\coordinate (H) at ($(O)!3!(G)$);
+\draw (A)--(A');
+\draw[dotted,semithick] (B)--(B');
+\draw[dotted,semithick] (C)--(C');
+\foreach \point in {A,B,C,A',G,C',B'}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figmedianes}
+\end{figure}
+
+
+
+\begin{proof}
+Pour tout point $M$ du plan, on considère le vecteur
+\[
+\overrightarrow{v(M)}=\overrightarrow{MA}+\overrightarrow{MB}+\overrightarrow{MC}.
+\]
+
+ Nous nous proposons de prouver qu'il existe un point $M$ et un seul pour lequel ce vecteur est nul : cet unique point $M$ sera le point $G$ que nous cherchons. À cet effet nous allons transformer le vecteur $\overrightarrow{v(M)}$, en faisant notamment intervenir un des milieux, ici $A'$, grâce à la relation de Chasles. Nous rappelons que ce milieu est caractérisé par $\overrightarrow{A'B}+\overrightarrow{A'C}=\vec{0}$.
+%\DinoXiPhoneCommand{%
+\begin{align*}
+\overrightarrow{v(M)}&=
+(\overrightarrow{MA'}+\overrightarrow{A'A})+
+(\overrightarrow{MA'}+\overrightarrow{A'B})+
+(\overrightarrow{MA'}+\overrightarrow{A'C}),\\
+&=
+3\overrightarrow{MA'}+\overrightarrow{A'A}+\underbrace{\overrightarrow{A'B}+\overrightarrow{A'C}}_{\vec{0}}.
+\end{align*}
+
+Nous transformons alors le vecteur $\overrightarrow{MA'}$ en faisant intervenir le point $A$ grâce à la relation de Chasles :
+\begin{align*}
+\overrightarrow{v(M)}&=3(\overrightarrow{MA}+\overrightarrow{AA'})+\overrightarrow{A'A},\\
+\intertext{puis, en développant et en remarquant que $\overrightarrow{A'A}=-\overrightarrow{AA'}$,}
+\overrightarrow{v(M)}&=3\overrightarrow{MA}+2\overrightarrow{AA'}.
+\end{align*}%}
+%\DinoiPhoneCommand{%
+%\begin{multline*}
+%\overrightarrow{MA}+\overrightarrow{MB}+\overrightarrow{MC}=
+%(\overrightarrow{MA'}+\overrightarrow{A'A})\\
+%+(\overrightarrow{MA'}+\overrightarrow{A'B})+
+%(\overrightarrow{MA'}+\overrightarrow{A'C}),\end{multline*}
+%soit
+%\begin{align*}
+%\overrightarrow{MA}+\overrightarrow{MB}+\overrightarrow{MC}&=
+%3\overrightarrow{MA'}+\overrightarrow{A'A}+\underbrace{\overrightarrow{A'B}+\overrightarrow{A'C}}_{\vec{0}},\\
+%&=3\overrightarrow{MA}+3\overrightarrow{AA'}+\overrightarrow{A'A},\\
+%&=3\overrightarrow{MA}+2\overrightarrow{AA'}.
+%\end{align*}}
+En tenant compte de $\overrightarrow{v(M)}=\overrightarrow{MA}+\overrightarrow{MB}+\overrightarrow{MC}$,
+ \begin{align}\overrightarrow{MA}+\overrightarrow{MB}+\overrightarrow{MC}=\vec{0}
+ &\iff 3\overrightarrow{MA}+2\overrightarrow{AA'}=\vec{0},\notag\\
+ &\iff 3\overrightarrow{AM}=2\overrightarrow{AA'},\notag\\
+ &\iff\overrightarrow{AM}=\dfrac23\overrightarrow{AA'}.\label{caraccg}\end{align}
+
+La relation \eqref{caraccg} définit l'unique point $M$ vérifiant $\overrightarrow{MA}+\overrightarrow{MB}+\overrightarrow{MC}=\vec{0}$. Ce point est par définition le centre de gravité du triangle $ABC$ et on le note traditionnellement $G$. Le calcul vectoriel ci-dessus aurait tout aussi bien pu être mené en utilisant $B'$ ou $C'$ plutôt que $A'$. On en déduit les trois relations annoncées en \eqref{eqGmediane}.
+\end{proof}
+
+\section{Orthocentre et droite d'Euler}
+\subsection{Orthocentre d'un triangle}
+\begin{thm}
+Les hauteurs issues des trois sommets de tout triangle sont concourantes en un point $H$ nommé orthocentre de ce triangle.
+\end{thm}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$B$](B) at (0,0);
+\coordinate[label=below:$C$](C) at (5,0);
+\coordinate (T) at ($(B)!1!36:(C)$);
+\coordinate (S) at ($(C)!1!107:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B)--(C)--cycle;
+\coordinate [label=below:$A'$] (A') at ($(B)!0.5!(C)$);
+\coordinate (B') at ($(A)!0.5!(C)$);
+\coordinate (C') at ($(A)!0.5!(B)$);
+\coordinate (X) at ($(C')!1!90:(B)$);
+\coordinate (Y) at ($(B')!1!90:(C)$);
+\coordinate [label=above:$O$](O) at (intersection of C'--X and B'--Y);
+\coordinate[label=above:$G${\rule[-1mm]{0mm}{1mm}}] (G) at ($(A')!0.333!(A)$);
+\coordinate[label=below:$H$] (H) at ($(O)!3!(G)$);
+\draw (A')--(O)--(H)--(A);
+\draw (A)--(A');
+\foreach \point in {A,B,C,A',O,G,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figeuler}
+\end{figure}
+
+
+\begin{proof}
+Nous en restons aux notations utilisées précédemment.
+Si le triangle $ABC$ est équilatéral, la hauteur, la médiane et la médiatrice relatives à chaque côté sont confondues, les points $O$, centre du cercle circonscrit, et $G$, centre de gravité de $ABC$ le sont également. Ce point unique est évidemment aussi point de concours des hauteurs. Nous supposerons désormais que le triangle $ABC$ n'est pas équilatéral.
+
+La démonstration repose alors sur la remarque qui suit.
+\begin{remark}[Remarque préliminaire]
+La hauteur issue de $A$ et la médiatrice de $[BC]$ sont deux droites parallèles, car perpendiculaires à une même troisième.
+L'observation de la figure \ref{figeuler} nous incite alors à prolonger la droite $(OG)$ et à fabriquer ainsi une configuration de Thales. Comme nous savons, de par la position de $G$ aux deux tiers de la médiane $[AA']$, que $\overrightarrow{GA}=-2\overrightarrow{GA'}$ nous allons introduire un point $H$ défini par $\overrightarrow{GH}=-2\overrightarrow{GO}$ pour ensuite ensuite établir (en exploitant de façon vectorielle notre configuration de Thales) que les vecteurs $ \overrightarrow{AH}$ et $\overrightarrow{OA'}$ sont colinéaires, ce qui établira, sauf cas particulier, que la médiatrice $(OA')$ et la droite $(AH)$ sont parallèles donc que $(AH)$ est la hauteur issue de $A$.
+\end{remark}
+
+Soit donc le point $H$ défini par $\overrightarrow{GH}=-2\overrightarrow{GO}$.
+De l'égalité \eqref{eqGmediane}, nous déduisons que $3\overrightarrow{AG}=2\overrightarrow{AA'}$, puis que $\overrightarrow{AG}=2\overrightarrow{GA'}$. Par conséquent :
+\[\begin{split} \overrightarrow{AH}&=\overrightarrow{AG}+\overrightarrow{GH},\\
+&=2\overrightarrow{GA'}+2\overrightarrow{OG},\\
+&=2(\overrightarrow{OG}+\overrightarrow{GA'}),\\
+&=2\overrightarrow{OA'}.
+\end{split}
+\]
+Les vecteurs $\overrightarrow{OA'}$ et $\overrightarrow{AH}$ sont donc colinéaires.
+
+\begin{alert}
+Si le triangle $ABC$ est rectangle, les points $O$ et $A'$ (et par conséquent les points $A$ et $H$) sont confondus. On ne peut parler des droites $(OA')$ et $(AH)$ : ce cas sera examiné plus tard.
+\end{alert}
+Supposons provisoirement que le triangle $ABC$ \emph{n'est pas} rectangle : le point $O$, centre du cercle circonscrit n'est pas confondu avec $A'$ (cf. théorème \ref{diamtrrec}) ou encore $\overrightarrow{OA'}\neq\vec{0}$. On peut dire alors que la droite $(AH)$ est parallèle à la droite $(OA')$, elle même perpendiculaire au côté $[BC]$, en tant que médiatrice. La droite $(AH)$ est donc perpendiculaire à $[BC]$ : c'est la hauteur issue de $A$.
+
+
+Le raisonnement qui vient d'être fait tient toujours si l'on remplace les points $A$ et $A'$ par $B$ et $B'$ ou par $C$ et $C'$. Le point $H$ quant à lui est fixe (il ne dépend que de $O$ et $G$) : il appartient donc à chacune des trois hauteurs. On a donc démontré que les trois hauteurs sont concourantes en $H$ : ce point $H$ est \emph{l'orthocentre} du triangle $ABC$.
+\begin{alert}
+Si maintenant le triangle est rectangle, par exemple en $A$ : les hauteurs issues de $B$ et $C$ sont respectivement $(BA)$ et $(CA)$ : les hauteurs sont concourantes en $A$. L'orthocentre $H$ est alors confondu avec $A$ de même que le centre du cercle circonscrit $O$ est confondu avec $A'$. La relation $\overrightarrow{GH} = -2\overrightarrow{GO}$ est toujours vérifiée.\qedhere
+\end{alert}
+\end{proof}
+\subsection{Droite d'Euler}
+
+
+
+Nous avons en fait montré un peu plus que ce que nous avions annoncé.
+La relation vectorielle liant $O$, $G$ et $H$ montre que si le triangle $ABC$ n'est pas équilatéral ces trois points sont alignés. La droite support est la \emph{droite d'Euler}. Résumons-nous maintenant :
+\begin{thm}
+Le centre $O$ du cercle circonscrit, le centre de gravité $G$ et l'orthocentre $H$ d'un triangle $ABC$ vérifient la relation vectorielle
+\begin{equation}\overrightarrow{GH}=-2\overrightarrow{GO}\,.\label{eulerposition}\end{equation}
+Ces trois points sont confondus si $ABC$ est équilatéral. Dans le cas contraire, ils sont alignés sur une droite nommée droite d'Euler.
+\label{eulerprecis}
+\end{thm}
+
+\section{Cercle d'Euler}
+\subsection{Neuf points remarquables}
+Le cercle d'Euler est également connu comme cercle des neuf points ou encore cercle de Feuerbach (voir figure \ref{figcercleuler}).
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$B$](B) at (0,0);
+\coordinate[label=below:$C$](C) at (5,0);
+\coordinate (T) at ($(B)!1!61:(C)$);
+\coordinate (S) at ($(C)!1!130:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B)--(C)--cycle;
+\coordinate [label=below:$A'$] (A') at ($(B)!0.5!(C)$);
+\coordinate [label=right:$B'${\rule[-1mm]{0mm}{1mm}}] (B') at ($(A)!0.5!(C)$);
+\coordinate [label=left:$C'$] (C') at ($(A)!0.5!(B)$);
+\coordinate (X) at ($(C')!1!90:(B)$);
+\coordinate (Y) at ($(B')!1!90:(C)$);
+\coordinate(O) at (intersection of C'--X and B'--Y);
+\coordinate (G) at ($(A')!0.333!(A)$);
+\coordinate[label=below:$H$] (H) at ($(O)!3!(G)$);
+\draw[dashed] (A)--(H);
+\draw[dashed] (B)--(H);
+\draw[dashed] (C)--(H);
+\coordinate[label=below:$D$](D) at at (intersection of A--H and B--C);
+\coordinate[label=right:$E${\rule[-1mm]{0mm}{1mm}}](E) at at (intersection of B--H and A--C);
+\coordinate[label=left:$F$](F) at at (intersection of C--H and B--A);
+\coordinate [label=left:$A''$] (A'') at ($(A)!0.5!(H)$);
+\coordinate [label=below:$B''$] (B'') at ($(B)!0.5!(H)$);
+\coordinate [label=below:$C''$] (C'') at ($(C)!0.5!(H)$);
+\draw (A')--(C')--(A'')--(C'')--cycle ;
+\draw (B')--(C')--(B'')--(C'')--cycle ;
+\coordinate (O') at ($(O)!1.5!(G)$);
+\node [draw,dotted,semithick] at (O') [circle through={(A')}] {\rule{2.2cm}{0mm}$\symcal{C}$};
+\foreach \point in {A,B,C,B',C',A',H,D,E,F,A'',B'',C''}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figcercleuler}
+\end{figure}
+
+
+\begin{thm}
+Pour tout triangle, les pieds des hauteurs, les milieux des côtés et les milieux des segments joignant l'orthocentre aux sommets sont situés sur un même cercle.
+\end{thm}
+\begin{remark}
+Suivant les configurations, certains de ces points peuvent être confondus.
+\end{remark}
+\begin{proof} Soit un triangle $ABC$ d'orthocentre $H$, $A'$, $B'$ et $C'$ les milieux respectifs des côtés $[BC]$, $[CA]$ et $[AB]$, $D$, $E$ et $F$ les pieds des hauteurs issues respectivement de $A$, $B$ et $C$ et $A''$, $B''$ et $C''$ les milieux respectifs des segments $[AH]$, $[BH]$ et $[CH]$.
+
+En vertu du théorème \ref{thmilieux}, appliqué successivement aux triangles $ABC$ et $HBC$
+\XSmartphoneCommand{%
+\begin{equation}
+\left.\begin{aligned}
+\overrightarrow{C'B'}=\frac12\overrightarrow{BC}&\\
+\overrightarrow{B''C''}=\frac12\overrightarrow{BC}&
+\end{aligned}\right\}\implies \overrightarrow{C'B'}=\overrightarrow{B''C''}\text{ et }(C'B')\parallel(B''C'')\parallel(BC).\label{parallelBC}
+\end{equation}}
+\SmartphoneCommand{
+\begin{equation}
+\left.\begin{aligned}
+\overrightarrow{C'B'}=\frac12\overrightarrow{BC}&\\
+\overrightarrow{B''C''}=\frac12\overrightarrow{BC}&
+\end{aligned}\right\}\implies \left\{\begin{aligned}&\overrightarrow{C'B'}=\overrightarrow{B''C''}\\ \text{et}&\\(&C'B')\parallel(B''C'')\parallel(BC).\end{aligned}\right.\label{parallelBC}
+\end{equation}}
+
+De même, en appliquant ce même théorème aux triangles $BAH$ et $CAH$
+\XSmartphoneCommand{%
+\begin{equation}
+\left.\begin{aligned}
+\overrightarrow{C'B''}=\frac12\overrightarrow{AH}&\\
+\overrightarrow{B'C''}=\frac12\overrightarrow{AH}&
+\end{aligned}\right\}\implies \overrightarrow{C'B''}=\overrightarrow{B'C''}\text{ et }(C'B'')\parallel(B'C'')\parallel(AH).\label{parallelAH}
+\end{equation}}
+\SmartphoneCommand{%
+\begin{equation}
+\left.\begin{aligned}
+\overrightarrow{C'B''}=\frac12\overrightarrow{AH}&\\
+\overrightarrow{B'C''}=\frac12\overrightarrow{AH}&
+\end{aligned}\right\}\implies\left\{\begin{aligned}&\overrightarrow{C'B''}=\overrightarrow{B'C''}\\ \text{et}&\\(&C'B'')\parallel(B'C'')\parallel(AH).\end{aligned}\right.\label{parallelAH}
+\end{equation}}
+
+À ce stade nous avons établi que $B'C'B''C''$ est un parallélogramme. Nous savons également que $(AH)$, en tant que hauteur du triangle, est perpendiculaire à $(BC)$. Grâce à cette remarque et aux relations de parallélisme avec $(BC)$ et $(AH)$ établies ci-dessus dans les implications \eqref{parallelBC} et \eqref{parallelAH}, nous pouvons affirmer que $B'C'B''C''$ est un rectangle. Ce rectangle est inscriptible dans le cercle admettant $[B'B'']$ et $[C'C'']$ pour diamètres.
+
+On montre de la même façon que $A'C'A''C''$ est un rectangle inscriptible dans le même cercle de diamètres $[C'C'']$ et $[A'A'']$. Les six points $A'$, $A''$, $B'$, $B''$, $C'$ et $C''$ appartiennent donc au cercle $\symcal{C}$ de diamètre, par exemple, $[A'A'']$.
+
+Considérons alors le point $D$ : si le triangle $ABC$ est isocèle en $A$, il est confondu avec $A'$ et appartient donc au cercle $\symcal{C}$. Sinon $D$ et $A'$ sont distincts et le triangle $ADA'$ est rectangle en $D$ : d'après le théorème \ref{diamtrrec}, $D$ appartient au cercle $\symcal{C}$ de diamètre $[AA']$. On montre de la même façon que les points $E$ et $F$ appartiennent à $\symcal{C}$.
+\end{proof}
+\begin{remark} Le cercle d'Euler est le cercle circonscrit au triangle des milieux $A'B'C'$.
+\end{remark}
+%
+\subsection{Centre du cercle d'Euler}
+Nous allons préciser la remarque précédente (voir figure \ref{centreeuler}).
+\begin{thm}
+Soit un triangle $ABC$ et soit $A'$, $B'$ et $C'$ les milieux respectifs de $[BC]$, $[CA]$ et $[AB]$.
+Soit $O$ le centre du cercle circonscrit à $ABC$, $G$ son centre de gravité et $H$ son orthocentre :
+\begin{itemize}
+\item le point $O$ est l'orthocentre du triangle $A'B'C'$ ;
+\item le point $G$ est le centre de gravité du triangle $A'B'C'$ ;
+\item le centre $O'$ du cercle circonscrit au triangle $A'B'C'$ appartient à la droite d'Euler et vérifie la relation vectorielle
+\[\overrightarrow{GO'}=-\frac12\overrightarrow{GO}.\]
+\end{itemize}
+\end{thm}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$B$](B) at (0,0);
+\coordinate[label=below:$C$](C) at (5,0);
+\coordinate (T) at ($(B)!1!32:(C)$);
+\coordinate (S) at ($(C)!1!100:(B)$);
+\coordinate[label=above:$A$](A) at at (intersection of C--S and B--T);
+\draw (A)--(B)--(C)--cycle;
+\coordinate [label=below:$A'$] (A') at ($(B)!0.5!(C)$);
+\coordinate [label=right:$B'${\rule[-1mm]{0mm}{1mm}}] (B') at ($(A)!0.5!(C)$);
+\coordinate [label=left:$C'${\rule[-1mm]{0mm}{1mm}}] (C') at ($(A)!0.5!(B)$);
+\coordinate (X) at ($(C')!1!90:(B)$);
+\coordinate (Y) at ($(B')!1!90:(C)$);
+\coordinate[label=above:$O$] (O) at (intersection of C'--X and B'--Y);
+\coordinate [label=above:$G$] (G) at ($(A')!0.333!(A)$);
+\coordinate[label=below:$H$] (H) at ($(O)!3!(G)$);
+\draw (A)--(B)--(C)--cycle ;
+\coordinate[label=above:$O'$] (O') at ($(O)!1.5!(G)$);
+\draw [dotted,semithick](A')--(B')--(C')--cycle;
+\draw (O)--(H);
+\foreach \point in {A,B,C,B',C',A',O,O',G,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{centreeuler}
+\end{figure}
+
+
+%%\DinoiPadAirCommand{\pagebreak}
+
+\begin{proof}
+\begin{itemize}
+\item La droite $(A'O)$, médiatrice de $[BC]$, est perpendiculaire à la droite $(BC)$, donc également à la droite $(C'B')$ parallèle à $(BC)$ d'après le théorème \ref{thmilieux}. Dans le triangle $A'B'C'$, le point $O$ appartient donc à la hauteur issue de $A'$. On montre de la même façon que $O$ appartient à la hauteur issue de $B'$. Le point $O$ est donc l'orthocentre de $A'B'C'$.
+\item Grâce à la relation \eqref{eqGmediane} du théorème \ref{thgravit}, on obtient
+\[\overrightarrow{GA'}=-\frac12\overrightarrow{GA},\quad \overrightarrow{GB'}=-\frac12\overrightarrow{GC}\quad\text{et}\quad\overrightarrow{GC'}=-\frac12\overrightarrow{GC}.\]
+On en déduit
+\begin{align*}
+\overrightarrow{GA'}+\overrightarrow{GB'}+\overrightarrow{GC'}&=-\frac12\Bigl(\,\underbrace{\overrightarrow{GA}+\overrightarrow{GB}+\overrightarrow{GC}}_{\vec{0}}\,\Bigr),\\
+\overrightarrow{GA'}+\overrightarrow{GB'}+\overrightarrow{GC'}&=\vec{0},
+\end{align*}
+qui prouve que $G$ est le centre de gravité de $A'B'C'$.
+\item Si l'on applique la relation \eqref{eulerposition} du théorème \ref{eulerprecis} au triangle $A'B'C'$, on obtient $\overrightarrow{GO}=-2\overrightarrow{GO'}$. On en déduit la relation
+\[\overrightarrow{GO'}=-\frac12\overrightarrow{GO}.\qedhere\]\end{itemize}
+\end{proof}
+
+\begin{remark}
+La configuration des points $(O, O', G, H)$ est remarquable. On dit qu'ils sont en \emph{division harmonique} ; cette notion fera l'objet d'une prochaine parution de la \emph{Mathematica dinosaurorum}.
+\end{remark}
+\endinput
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/handout-euler.tex b/Master/texmf-dist/doc/lualatex/tango/examples/handout-euler.tex
new file mode 100644
index 00000000000..533d96b9047
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/handout-euler.tex
@@ -0,0 +1,29 @@
+% !TEX TS-program = LuaLaTeX
+\documentclass[french,ColorTheme=Tannen,FontSize=11pt,
+StylisticSet={parallelslant,leqslant},Numbers=OldStyle]{tango}
+\renewcommand{\arraystretch}{1.3}
+\usepackage{tikz}
+\usetikzlibrary{calc,through,arrows}
+\tgosmartlists
+\AtBeginDocument{%
+\RenewCommandCopy{\setminus}{\smallsetminus}
+}
+\NewDocumentCommand\N{}{\ensuremath{\symbb{N}}}
+\NewDocumentCommand\Z{}{\ensuremath{\symbb{Z}}}
+\NewDocumentCommand\Q{}{\ensuremath{\symbb{Q}}}
+\NewDocumentCommand\R{}{\ensuremath{\symbb{R}}}
+\NewDocumentCommand\C{}{\ensuremath{\symbb{C}}}
+\NewDocumentCommand\Pt{m}{\ensuremath{\symfrak{P}(#1)}}
+\NewDocumentCommand\rond{}{\mathrel{\circ}}
+\NewDocumentCommand\mesalg{m}{\overline{#1}}
+\NewDocumentCommand\Vector{m}{\overrightarrow{#1}}
+\DeclareMathOperator{\cl}{cl}
+\DeclareMathOperator{\sgn}{sgn}
+\newcounter{prop}
+\newstatement{prop}{prop}{Propriété}
+\newfixedcaption{\figcaption}{figure}
+%%
+%\tangoSmartLists
+\begin{document}
+\include{euler}
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/handout-polynomes-deg2.tex b/Master/texmf-dist/doc/lualatex/tango/examples/handout-polynomes-deg2.tex
new file mode 100644
index 00000000000..3e260be4a98
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/handout-polynomes-deg2.tex
@@ -0,0 +1,27 @@
+% !TEX TS-program = LuaLaTeX
+\documentclass[french,ColorTheme=BlackAndWhite,FontSize=11pt]{tango}
+\renewcommand{\arraystretch}{1.3}
+\usepackage{tikz}
+\usetikzlibrary{calc,through,arrows}
+\tgosmartlists
+\AtBeginDocument{%
+\RenewCommandCopy{\setminus}{\smallsetminus}
+}
+\NewDocumentCommand\N{}{\ensuremath{\symbb{N}}}
+\NewDocumentCommand\Z{}{\ensuremath{\symbb{Z}}}
+\NewDocumentCommand\Q{}{\ensuremath{\symbb{Q}}}
+\NewDocumentCommand\R{}{\ensuremath{\symbb{R}}}
+\NewDocumentCommand\C{}{\ensuremath{\symbb{C}}}
+\NewDocumentCommand\Pt{m}{\ensuremath{\symfrak{P}(#1)}}
+\NewDocumentCommand\rond{}{\mathrel{\circ}}
+\NewDocumentCommand\mesalg{m}{\overline{#1}}
+\NewDocumentCommand\Vector{m}{\overrightarrow{#1}}
+\DeclareMathOperator{\cl}{cl}
+\DeclareMathOperator{\sgn}{sgn}
+\newcounter{prop}
+\newstatement{prop}{prop}{Propriété}
+\newfixedcaption{\figcaption}{figure}
+%%
+\begin{document}
+\input{polynome-deg2}
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/polynome-deg2.tex b/Master/texmf-dist/doc/lualatex/tango/examples/polynome-deg2.tex
new file mode 100644
index 00000000000..bf91400a55a
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/polynome-deg2.tex
@@ -0,0 +1,557 @@
+\renewcommand{\arraystretch}{1.3}
+%\renewcommand*{\DinoThmLogo}{\textcolor{ColorOne}{\oldpilcrowfour}\ignorespaces}
+%\renewcommand*{\DinoThmLogo}{\hspace*{\DinoTitleIndent-3pt}\ignorespaces}
+
+%\textcolor{ColorOne}{\oldpilcrowfour}\ignorespaces
+
+%%%%%% quelques figures, le début arrive ensuite
+\newcommand{\paraone}{
+\begin{tikzpicture}[domain=-5:5,samples=100,x=6mm,y=6mm]
+ \clip (-2,-3.5) rectangle (3.5,3);
+ \draw[very thin,color=gray,xstep=0.5,ystep=0.5] (-2,-2.5) grid (3.5,3);
+ \draw [->](-2,0) -- (3.5,0) node[above=15mm,left=4mm] {$\symcal{C}_P$};
+ \draw[->] (-1.9,-2.5) -- (-1.9,3) node[above] {};
+ \draw[semithick,domain=-2:3.5,label=left:$\symcal{C}_P$] plot (\x,{0.5(\x+1)*(\x-2)});
+ \draw [fill=white] (-1,0) circle (1.2pt) node[below=2mm,left] {$\beta$};
+\draw [fill=white] (2,0) circle (1.2pt) node[below=2mm,right] {$\alpha$};
+\node[below] at (.75,-2.5){$\Delta>0\;\text{ et }\; a>0$};
+ \end{tikzpicture}
+}
+\newcommand{\paratwo}{
+ \begin{tikzpicture}[domain=-5:5,samples=100,x=6mm,y=6mm]
+ \clip (-2,-4) rectangle (3.5,2.5);
+ \draw[very thin,color=gray,xstep=0.5,ystep=0.5] (-2,-3) grid (3.5,2.5);
+ \draw [->](-2,0) -- (3.5,0) node[above=12mm,left=8mm] {$\symcal{C}_P$};
+ \draw[->] (-1.9,-3) -- (-1.9,2.5) node[above] {};
+ \draw[semithick,domain=-2:3.5,label=left:$\symcal{C}_P$] plot (\x,{-(\x+1)*(\x-2)});
+ \draw [fill=white] (-1,0) circle (1.2pt) node[above=2mm,left] {$\alpha$};
+\draw [fill=white] (2,0) circle (1.2pt) node[above=2mm,right] {$\beta$};
+\draw[fill=white,white] (-2,-4) rectangle (3.5,-3);
+\node[below] at (.75,-3){$\Delta>0\;\text{ et }\; a<0$};
+ \end{tikzpicture}
+}
+
+\newcommand{\parathree}{
+\begin{tikzpicture}[domain=-5:5,samples=100,x=6mm,y=6mm]
+ \clip (-2,-1.5) rectangle (3.5,5);
+ \draw[very thin,color=gray,xstep=0.5,ystep=0.5] (-2,-.5) grid (3.5,5);
+ \draw [->](-2,0) -- (3.5,0) node[above=25mm,left=6mm] {$\symcal{C}_P$};
+ \draw[->] (-1.9,-.5) -- (-1.9,5) node[above] {};
+ \draw[semithick,domain=-2:3.5] plot (\x,{(\x+1)*(\x-2)+2.25});
+ \draw [fill=white] (0.5,0) circle (1.2pt) node[above=1mm] {$\frac{-b}{2a}$};
+\node[below] at (.75,-0.5){$\Delta=0\;\text{ et }\; a>0$};
+ \end{tikzpicture}
+}
+
+\newcommand{\parafour}{
+\begin{tikzpicture}[domain=-5:5,samples=100,x=6mm,y=6mm]
+ \clip (-2,-6) rectangle (3.5,0.5);
+ \draw[very thin,color=gray,xstep=0.5,ystep=0.5] (-2,-5) grid (3.5,.5);
+ \draw [->](-2,0) -- (3.5,0) node[below=25mm,left=6mm] {$\symcal{C}_P$};
+ \draw[->] (-1.9,-5) -- (-1.9,.5) node[above] {};
+ \draw[semithick,domain=-2:3.5] plot (\x,{-(\x+1)*(\x-2)-2.25});
+ \draw [fill=white] (0.5,0) circle (1.2pt) node[below=1mm] {$\frac{-b}{2a}$};
+\draw[fill=white,white] (-2,-6) rectangle (3.5,-5);
+\node[below] at (.75,-5){$\Delta=0\;\text{ et }\; a<0$};
+ \end{tikzpicture}
+}
+
+\newcommand{\parafive}{
+\begin{tikzpicture}[domain=-5:5,samples=100,x=6mm,y=6mm]
+ \clip (-2,-1.5) rectangle (3.5,5);
+ \draw[very thin,color=gray,xstep=0.5,ystep=0.5] (-2,-.5) grid (3.5,5);
+ \draw [->](-2,0) -- (3.5,0) node[above=25mm,left=6mm] {$\symcal{C}_P$};
+ \draw[->] (-1.9,-.5) -- (-1.9,5) node[above] {};
+ \draw[semithick,domain=-2:3.5] plot (\x,{(\x+1)*(\x-2)+2.75});
+\node[below] at (.75,-.5){$\Delta<0\;\text{ et }\; a>0$};
+ \end{tikzpicture}
+}
+
+\newcommand{\parasix}{
+ \begin{tikzpicture}[domain=-5:5,samples=100,x=6mm,y=6mm]
+ \clip (-2,-6) rectangle (3.5,0.5);
+ \draw[very thin,color=gray,xstep=0.5,ystep=0.5] (-2,-5) grid (3.5,.5);
+ \draw [->](-2,0) -- (3.5,0) node[below=25mm,left=6mm] {$\symcal{C}_P$};
+ \draw[->] (-1.9,-5) -- (-1.9,.5) node[above] {};
+ \draw[semithick,domain=-2:3.5] plot (\x,{-(\x+1)*(\x-2)-2.75});
+\draw[fill=white,white] (-2,-6) rectangle (3.5,-5);
+\node[below] at (.75,-5){$\Delta<0\;\text{ et }\; a<0$};
+ \end{tikzpicture}
+}
+%%%%
+\tgotitle{Polynômes du second degré}
+\tgoshorttoc
+\section{Généralités}
+\subsection{Fonction polynôme du second degré}
+On dit qu'une fonction $P$, définie sur l'ensemble $\R$ des nombres réels et à valeurs dans $\R$, est une fonction polynôme du second degré s'il existe un réel $a$ non nul ainsi que deux réels $b$ et $c$ tels que
+\[\forall x\in\R,\; P(x)=ax^2+bx+c.\]
+On convient alors de dire que $ax^2+bx+c$ est un polynôme du second degré.
+
+\begin{remark}
+Cette définition n'entraîne évidemment pas qu'une fonction polynôme de degré 2 donnée ne puisse pas s'écrire sous une forme différente. Par exemple :
+\begin{itemize}
+\item Cas de $P : \R\rightarrow\R,\; x\mapsto x^2-3x+2$ : $\forall\,x\in\R$, $P(x)=(x-1)(x-2)$.
+\item Cas de $Q : \R\rightarrow\R,\; x\mapsto x^2-1$ : $\forall\,x\in\R$,
+ \[Q(x)=\frac{x^4-1}{x^2+1}.\]
+ \item Cas de $R : \R\rightarrow\R,\; x\mapsto x^2-2x+5$ : $\forall\,x\in\R$, $R(x)=\left(\left({x-1}\right)^2\right)+4$.
+\end{itemize}
+\end{remark}
+\subsection{Écriture unique}
+Il existe cependant un certaine unicité de l'écriture d'un polynôme de degré~2, qui concerne plus précisément ses \emph{coefficients} $a$, $b$ et $c$.
+\begin{thm}
+Soit $(a,a')\in\R^*\times\R^*$, $(b,b')\in\R\times\R$ et $(c,c')\in\R\times\R$ tels que
+\[\forall x\in\R,\; ax^2+bx+c=a'x^2+b'x+c',\]
+alors $a=a'$, $b=b'$ et $c=c'$.
+\label{thunicite}
+\end{thm}
+\begin{proof}
+L'égalité entre les deux expressions étant vraie pour tout $x\in\R$, elle l'est en particulier pour $x=0$. On en déduit que $c=c'$ et par conséquent
+\begin{align*}
+\forall x\in\R,\; ax^2+bx&=a'x^2+b'x,\\
+\forall x\in\R,\; x(ax+b)&=x(a'x+b'),\\
+\intertext{Soit, en simplifiant par $x\neq0$}
+\forall x\in\R^*,\;ax+b&=a'x+b'.
+\end{align*}
+
+En donnant alors successivement à $x$ les valeurs $1$ et $2$, on obtient :
+\[\left\{\begin{aligned}
+(a-a')+(b-b')&=0\\
+2(a-a')+(b-b')&=0
+\end{aligned}\right.\;,\]
+dont la résolution amène à $a-a'=0$ et $b-b'=0$, c.-à-d. : $a=a'$ et $b=b'$.
+\end{proof}
+
+\section{Forme canonique}
+\subsection{Méthode de complétion au carré}\label{sec2-1}
+Fixons nous un réel $m$. On rappelle que, pour tout $x\in\R$, $(x+m)^2=x^2+2mx+m^2$. Ou encore :
+\begin{equation}
+\forall x\in\R, \; x^2+2mx=\left(x+m\right)^2-m^2.
+\end{equation}
+
+Dans le cas de $P : \R\rightarrow\R, x\mapsto x^2+2mx+p$, on remarque que l'on peut alors écrire
+\begin{equation}
+x^2+2mx+p=\left(x+m\right)^2-m^2+p.\label{eqfcreduite}
+\end{equation}
+
+Cette remarque fonde la \emph{méthode de complétion au carré}.
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item \label{explefactor}
+On souhaite résoudre l'équation $x^2-6x+7=0$. On remarque que \[x^2-6x+7=(x-3)^2-9+7\] et on se ramène ainsi à
+\begin{align*}
+(x-3)^2-2&=0,\\
+(x-3)^2-\bigl(\sqrt{2}\bigr)^2&=0,\\
+\intertext{puis en employant une identité remarquable}
+\bigl(x-3+\sqrt{2}\bigr)\bigl(x-3-\sqrt{2}\bigr)&=0.
+\end{align*}
+D'où l'on déduit que l'ensemble des solutions de $x^2-6x+7=0$ est
+\[
+\symcal{S}=\bigl\{3-\sqrt{2}, 3+\sqrt{2}\bigr\}.
+\]
+\item Démontrer que $x^2+x+1$ est strictement positif pour tout $x\in\R$.
+On écrit
+\begin{align*}
+x^2+x+1&=x^2+2\times\frac12x+1,\\
+&=\left(x+\frac12\right)^2-\frac14+1,\\
+&=\left(x+\frac12\right)^2+\frac34\,.
+\end{align*}
+
+On en déduit que, pour tout $x\in\R$,
+\[x^2+x+1≥\frac34\:.\]
+On a donc finalement : $\forall x\in\R,\; x^2+x+1>0$.
+\end{enumerate}
+\end{example}
+\subsection{Cas général}
+En factorisant $a$ dans $P(x)$, on obtient le théorème suivant :
+\begin{thm}
+Soit $P$, la fonction polynôme de degré 2 définie sur $\R$ par $P(x)=ax^2+bx+c$. On a
+\begin{equation}
+\forall x\in\R,\;P(x)=a\left(\left(x+\frac{b}{2a}\right)^2-\frac{\Delta}{4a^2}\vphantom{\frac{b^2}{4a^2}}\right),\label{eqformcan}
+\end{equation}
+où $\Delta$, que l'on nomme \emph{discriminant} du polynôme $P(x)$, vaut $\Delta=b^2-4ac$.
+\label{thformcan}
+\end{thm}
+\begin{proof}
+On commence par factoriser $a$ dans $P(x)$ :
+\[P(x)=a\left(x^2+\frac{b}{a}x+\frac{c}{a}\right),\]
+puis on utilise l'égalité \eqref{eqfcreduite} avec $m=b/(2a)$ et $p=c/a$. On obtient
+\[P(x)=a\left(\left(x+\frac{b}{2a}\right)^2-\frac{b^2}{4a^2}+\frac{c}{a}\right).
+\]
+%D'où le résultat annoncé.
+Une réduction au même dénominateur amène alors au résultat annoncé.
+\end{proof}
+
+\subsubsection{Discriminant réduit}
+Dans le cas où $b$ se met agréablement sous la forme $2b'$ (par exemple, lorsque $b$ est un entier pair) on peut remarquer que $b/2a=b'/a$ et que $\Delta=4b'^2-4ac$.
+ On est alors amené à poser $\Delta'=b'^2-ac$ et l'on obtient
+\begin{equation}
+\forall x\in\R,\;P(x)=a\left(\left(x+\frac{b'}{a}\right)^2-\frac{\Delta'}{a^2}\vphantom{\frac{b^2}{4a^2}}\right).
+\end{equation}
+Le nombre $\Delta'$ est souvent nommé \emph{discriminant réduit}
+
+\subsubsection{Extrémums}
+La forme canonique de la fonction $P$ met en évidence l'existence d'un extrémum dont la nature dépend du signe de $a$.
+\begin{thm}
+Soit $P$, la fonction polynôme de degré 2 définie sur $\R$ par $P(x)=ax^2+bx+c$.
+\XSmartphoneCommand{\vspace{\baselineskip}}
+
+La fonction $P$ admet en\SmartphoneCommand{\\} $-\dfrac{b}{2a}\left\{\begin{aligned}
+\text{un \emph{minimum} égal à $\smash{-\dfrac{\Delta}{4a}}$}\; &\text{si $a>0$,}\\[2.5ex]
+\text{un \emph{maximum} égal à $\smash{-\dfrac{\Delta}{4a}}$}\; &\text{si $a<0$.}
+\end{aligned}\right.$
+\vspace{1ex}\par
+\label{thextrem}
+\end{thm}
+
+\begin{proof}
+On voit tout d'abord que
+\[\forall x\in\R,\;\left(x+\frac{b}{2a}\right)^2≥0,
+\]
+donc que
+\[
+\forall x\in\R,\;\left(x+\frac{b}{2a}\right)^2-\frac{\Delta}{4a^2}≥-\frac{\Delta}{4a^2},
+\]
+l'égalité n'étant atteinte que si le carré est nul, donc si $x=-b/(2a)$. On fait alors apparaître $P(x)$ (compte tenu de l'égalité \eqref{eqformcan} du théorème \ref{thformcan}) en multipliant chaque membre de cette inégalité par $a\neq0$, ce qui change ou non son sens, selon que a est positif ou négatif. Il vient alors :
+\begin{itemize}
+\item si $a>0$,
+\[
+\forall x\in\R,\; P(x)≥-\frac{\Delta}{4a}\;;
+\]
+\item et si $a<0$,
+\[
+\forall x\in\R,\; P(x)≤-\frac{\Delta}{4a}\,.
+\]
+\end{itemize}
+On sait de plus que dans les deux cas, l'égalité est atteinte si et seulement si $x=-b/(2a)$.
+\end{proof}
+
+\section{Factorisation}
+\subsection{Théorème de factorisation}
+La méthode vue dans l'exemple \ref{explefactor} de la section \ref{sec2-1} se généralise, pourvu que $\Delta$ soit positif. Précisément, on a le théorème
+\begin{thm}\label{thfactor}%
+Soit $P$, la fonction polynôme de degré 2 définie sur $\R$ par $P(x)=ax^2+bx+c$. Si le discriminant $\Delta$ de $P$ est positif ($\Delta≥0$), alors
+\begin{align*}
+\forall x \in\R,\;P(x)&=a(x-\alpha)(x-\beta)\\
+\text{où}\quad\alpha=\frac{-b+\sqrt{\Delta}}{2a}&\text{ et }\beta=\frac{-b-\sqrt{\Delta}}{2a}.
+\end{align*}
+\end{thm}
+\begin{remark}
+Le cas où $\Delta=0$ est particulier, puisque l'on a alors
+\[
+\alpha=\beta=\frac{-b}{2a}\quad\text{soit :}\quad\forall x\in\R,\;P(x)=a\left(x-\frac{-b}{2a}\right)^2.
+\]
+\end{remark}
+
+\begin{proof}
+On remarque que si $\Delta≥0$, on peut écrire
+\[
+\frac{\Delta}{4a^2}=\left(\frac{\sqrt{\Delta}}{2a}\right)^2.
+\]
+
+En reportant dans l'égalité \eqref{eqformcan} du théorème \ref{thformcan}, on obtient
+\[
+\forall x\in\R,\;P(x)=a\left(\left(x+\frac{b}{2a}\right)^2-\left(\frac{\sqrt{\Delta}}{2a}\right)^2\right).
+\]
+
+On obtient alors le résultat annoncé en factorisant la différence de deux carrés grâce à l'identité remarquable $A^2-B^2=(A+B)(A-B)$.
+\end{proof}
+
+\subsection{Racines}
+Soit $P$ une fonction polynôme du second degré.
+On dit que $P$ est factorisable par $(x-x_0)$ s'il existe $m\in\R^*$ et $p\in\R$ tels que
+\begin{equation}\forall x\in\R,\;P(x)=(x-x_0)(mx+p).\label{eqfactorx0}\end{equation}
+On dit qu'un réel $x_0$ est une racine de $P$ si $P(x_0)=0$ : une racine de $P$ n'est donc rien d'autre qu'une solution de l'équation $P(x)=0$.
+
+Nous pouvons maintenant formuler le théorème qui suit :
+\begin{thm}
+Soit $P$ une fonction polynôme du second degré et $x_0\in\R$. Le réel $x_0$ est une racine de $P$ si et seulement si $P$ est factorisable par $(x-x_0)$.
+\end{thm}
+
+\begin{proof}
+Tout d'abord, si $P$ est factorisable par $x_0$, il suffit de calculer $P(x_0)$ en utilisant l'égalité \eqref{eqfactorx0} pour constater que $P(x_0)=0$, donc que $x_0$ est une racine de $P$.
+
+Réciproquement supposons que $x_0$ est une racine de $P$, donc que $P(x_0)=0$. Soit alors $a$, $b$ et $c$ les coefficients de $P(x)$ : on a
+\[ax_0^2+bx_0+c=P(x_0)=0,\]
+ d'où $c=-ax_0^2-bx_0$. Et en substituant cette écriture de $c$ dans l'expression de $P(x)$ :
+\begin{align*}
+P(x)&=ax^2+bx+c\\
+&= ax^2+bx-ax_0^2-bx_0,\\
+&= a(x^2-x_0^2)+b(x-x_0),\\
+&= a(x-x_0)(x+x_0)+b(x-x_0),\\
+&=(x-x_0)(ax+ax_0+b).
+\end{align*}
+
+On en arrive à $P(x)=(x-x_0)(mx+p)$, en prenant $m=a$ et $p=ax_0+b$.
+\end{proof}
+
+\subsubsection{Racines et équation du second degré}
+Nous faisons ici le point sur les racines de $P$, autrement dit sur la résolution de l'équation
+$P(x)=0$.
+
+
+\begin{itemize}
+\item \textit{Si $\Delta<0$,} nous reprenons le théorème \ref{thextrem} : dans ce cas, la fonction $P$ possède un minimum strictement positif si $a>0$ ou un maximum strictement négatif si $a<0$. Dans chaque cas, si $\Delta<0$, l'équation $P(x)=0$ ne possède pas de solution, autrement dit $P$ n'admet aucune racine.
+
+\item \textit{Si maintenant $\Delta=0$,} la remarque qui suit le théorème \ref{thfactor} prouve que l'équation $P(x)=0$ équivaut à
+\[
+\left(x-\frac{-b}{2a}\right)^2=0
+\]
+ et admet $-b/(2a)$ pour seule solution, ou encore que ce nombre est la seule racine de $P$. Dans la mesure où le facteur $x-(-b/(2a))$ intervient par son carré, on parle alors de \emph{racine double}.
+
+ \item \textit{Enfin si $\Delta>0$,} d'après le théorème \ref{thfactor}, $P(x)=0$ équivaut à $(x-\alpha)(x-\beta)=0$.
+%\DinoXiPadminiCommand{$(x-\alpha)(x-\beta)=0$.}
+%\DinoiPadminiCommand{\[(x-\alpha)(x-\beta)=0.\]}
+ Cette équation admet donc deux solutions, ou encore $P$ admet deux racines qui sont
+ \[
+ \alpha=\frac{-b+\sqrt{\Delta}}{2a}\quad\text{et}\quad\beta=\frac{-b-\sqrt{\Delta}}{2a}.
+ \]
+\end{itemize}
+
+
+\begin{remark}
+Dons le cas où l'on a posé $b=2b'$ et utilisé le discriminant réduit $\Delta'$, il est facile de vérifier que les racines s'expriment comme suit :
+\[
+\alpha=\frac{-b'+\sqrt{\Delta'}}{a}\quad\text{et}\quad\beta=\frac{-b'-\sqrt{\Delta'}}{a}.
+\]
+\end{remark}
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item Résoudre l'équation $3x^2-5x+1=0$ : calculons $\Delta=25-12=13$. L'équation a deux solutions qui sont les racines de $3x^2-5x+1$ :
+\[
+\alpha=\frac{5+\sqrt{13}}{6}\quad\text{et}\quad\beta=\frac{5-\sqrt{13}}{6}.
+\]
+L'ensemble des solutions est $\symcal{S}=\{\alpha,\beta\}$.
+\item Factoriser si possible $-2x^2+3x+2$ : on calcule $\Delta=9+16=5^2$. Il existe deux racines qui sont $2$ et $-1/2$ ; d'où
+\[
+\forall x\in\R,\;-2x^2+3x+2=-2(x-2)\left(x+\frac12\right).
+\]
+\item Factoriser si possible $A(x)=2x^2-8$ : utilisons l'identité remarquable
+\[
+a^2-b^2=(a+b)(a-b).
+\]
+\[\forall x\in\R,\;2x^2-8=2(x^2-4)=2(x-2)(x+2).\]
+Dans un cas de ce genre, il est bien sûr inutile de calculer $\Delta$. En revanche, l'existence de deux racines distinctes nous prouve que $\Delta>0$.
+\item Résoudre l'équation $3x^2+2=0$. La fonction polynôme $x\mapsto3x^2+2$ admet un minimum strictement positif égal à $2$. Il n'y a aucune solution, l'ensemble des solutions est $\symcal{S}=\emptyset$.
+\item Factoriser $9x^2-6x+1=0$. On pourrait envisager de calculer $\Delta$, mais en observant l'expression, on reconnait un membre d'identité remarquable :
+\[\forall x\in\R,\;9x^2-6x+1=(3x-1)^2.\]
+\item Résoudre $x^2+2x=0$. La factorisation est immédiate :
+\[x^2+2x=0\iff x(x+2)=0\iff x=0\text{ ou }x+2=0.\]
+L'ensemble des solutions de cette équation est donc $\symcal{S}=\{0,-2\}$.
+\end{enumerate}
+\end{example}
+%
+%
+
+\subsection{Problème de signe}
+Nous rappelons ici que la fonction \emph{signe} est définie sur $\R$ comme suit :
+\[\forall x \in \R,\; \sgn(x)=\begin{cases}
+-1 &\text{si $x<0$,}\\
+0 &\text{si $x=0$,}\\
+1 &\text{si $x>0$.}
+\end{cases}
+\]
+Cette définition est beaucoup plus pertinente que l'usage des symboles ${+}$ et ${-}$, ne serait-ce que parce qu'elle rend exacte et claire une formulation comme \emph{le signe du produit est le produit des signes}.
+\begin{thm}
+Soit $P$, la fonction polynôme de degré 2 définie sur $\R$ par $P(x)=ax^2+bx+c$.
+\begin{itemize}
+\item Si $\Delta<0$, le signe de $P(x)$ est égal à celui de $a$ en tout $x$ réel.
+\item Si $\Delta=0$, le signe de $P(x)$ est égal au signe de $a$ en tout $x$ réel différent de $-b/(2a)$ et s'annule en $-b/(2a)$.
+\item Si $\Delta>0$, le signe de $P(x)$ est égal au signe de $-a$ en tout $x$ intérieur à l'intervalle des racines, au signe de $a$ en tout $x$ extérieur à l'intervalle des racines et s'annule aux racines.
+\end{itemize}
+\label{thsgn}
+\end{thm}
+
+Ces résultats s'interprètent sur la représentation graphique $\symcal{C}_P$ de $P$, selon les signes de $\Delta$ et $a$ (voir figure \ref{figracines}).
+\afterpage{\clearpage\begin{figure}[H]\centering
+\AfourCommand{%
+\noindent\hfill\paraone\hfill\parathree\hfill\parafive\hfill\null
+\par
+\noindent\hfill\paratwo\hfill\parafour\hfill\parasix\hfill\null
+}
+\BigTabletCommand{%
+\noindent\hfill\paraone\hfill\parathree\hfill\parafive\hfill\null
+\par
+\noindent\hfill\paratwo\hfill\parafour\hfill\parasix\hfill\null
+}
+\TabletCommand{%
+\noindent\hfill\paraone\hfill\parathree\hfill\parafive\hfill\null
+\par
+\noindent\hfill\paratwo\hfill\parafour\hfill\parasix\hfill\null
+}
+\SmartphoneCommand{%
+\noindent\hfill\paraone\hfill\paratwo\hfill\null
+\par
+\noindent\hfill\parathree\hfill\parafour\hfill\null
+\par
+\noindent\hfill\parafive\hfill\parasix\hfill\null
+}
+\SmallTabletCommand{%
+\vspace*{1.5cm}\par
+\noindent\hfill\paraone\hfill\paratwo\hfill\null
+\par
+\noindent\hfill\parathree\hfill\parafour\hfill\null
+\par
+\noindent\hfill\parafive\hfill\parasix\hfill\null
+}
+\figcaption{}\label{figracines}
+\end{figure}
+}
+
+\begin{proof}
+Examinons successivement les trois cas du théorème.
+\begin{itemize}
+\item Si $\Delta<0$, le résultat provient d'une remarque déjà faite : dans ce cas, la fonction $P$ possède un minimum strictement positif si $a>0$ ou un maximum strictement négatif si $a<0$.
+\item Si $\Delta=0$, on a
+\[
+P(x)=a\left(x+\frac{b}{2a}\right)^2.
+\]
+% La fonction $P$ admet donc $0$ pour minimum lorsque $a>0$ ou pour maximum lorsque $a>0$. Dans les deux cas cet extrémum n'est atteint qu'une fois en $-b/(2a)$.
+Le résultat annoncé se déduit du tableau de signes
+\[\begin{array}{c|ccccc}
+\hline
+x&-\infty&&-b/(2a)&&\infty\\
+\hline
+\sgn\bigl(\bigl(x+\frac{b}{2a}\bigr)^2\bigr)&&1&0&1&\\
+\hline
+\sgn(P(x))&&\sgn(a)&0&\sgn(a)&\\
+\hline
+\end{array}\]
+\item Si $\Delta>0$, on constate, en se référant à l'expression des racines $\alpha$ et $\beta$ dans théorème \ref{thfactor}, que $\alpha$ est la plus grande des deux racines si $a>0$ et la plus petite si $a<0$. En posant
+\begin{align*}\alpha'=\min(\alpha,\beta)&\text{ et }\beta'=\max(\alpha,\beta),\\
+\intertext{on obtient}
+P(x)=a(x-\alpha')(x-\beta'),\quad&\text{ avec $\alpha'<\beta'$}.
+\end{align*}
+On établit alors le tableau de signes
+{\SmartphoneCommand{\small}
+\[\begin{array}{c|ccccccc}
+\hline
+x&-\infty&&\alpha'&&\beta'&&\infty\\
+\hline
+\sgn(x-\alpha')&&-1&0&1&1&1&\\
+\hline
+\sgn(x-\beta')&&-1&-1&-1&0&1&\\
+\hline
+\sgn(P(x))&&\sgn(a)&0&\sgn(-a)&0&\sgn(a)&\\
+\hline
+\end{array}
+\]}
+Le résultat annoncé s'en déduit.\qedhere
+\end{itemize}
+\end{proof}
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item Résoudre $x^2-x-6≤0$ : le discriminant vaut $\Delta=1+24=25$. Il existe deux racines qui sont $-2$ et $3$. On veut que $x^2-x-6$ soit négatif donc nul ou du signe de~$-a$ : cela se produit aux racines ou à l'intérieur de l'intervalle des racines. L'ensemble des solutions est $\symcal{S}=[-2,3]$.
+
+On aurait pu également, une fois les racines calculées, utiliser la forme factorisée du polynôme $P(x)=x^2-x-6$. Ainsi $P(x)=(x+2)(x-3)$, d'où le tableau de signes :
+\[\begin{array}{c|ccccccc}
+\hline
+x&-\infty&&\quad-2\quad&&\quad3\quad&&\infty\\
+\hline
+\sgn(x+2)&&-1&0&1&1&1&\\
+\hline
+\sgn(x-3)&&-1&-1&-1&0&1&\\
+\hline
+\sgn(P(x))&&1&0&-1&0&1&\\
+\hline
+\end{array}
+\]
+On retrouve la solution donnée par la première méthode.
+
+\item Résoudre $(2x-6)^2>0$ : ce carré est positif pour tout $x\in\R$ et s'annule si et seulement si $x=3$. Par conséquent, l'ensemble des solutions de cette inéquation est $\symcal{S}=\R\smallsetminus\{3\}$. Si l'on avait eu la très mauvaise idée de développer pour calculer le discriminant, on aurait trouvé $\Delta=0$ et une racine double égale à $3$.
+\item Résoudre $3x^2-4x-1≥0$ : c'est l'occasion d'utiliser le discriminant réduit.
+
+On trouve $\Delta'=4+3=7$.
+Il existe deux racines :
+\[
+\alpha=\frac{2+\sqrt{7}}{3}\quad\text{et}\quad\beta=\frac{2-\sqrt{7}}{3}.
+\]
+On veut que $3x^2-4x-1$ soit positif, donc nul ou du signe de $a$ : cela se produit aux racines ou à l'extérieur de l'intervalle des racines. L'ensemble des solutions est donc
+\[
+\symcal{S}=\left]-\infty, \beta\right] \cup \left[\alpha, \infty\right[.
+\]
+\item Résoudre $5x-2x^2>0$. La factorisation se fait à vue :
+\[
+5x-2x^2=-2x\left(x-\frac52\right),
+\]
+ il y a donc deux racines : $\alpha=0$ et $\beta=5/2$.
+
+On peut ensuite soit faire un tableau de signes, soit utiliser le théorème \ref{thsgn}, ce que nous ferons ici.
+On veut que $5x-2x^2$ soit strictement positif, donc du signe de $-a$ : cela se produit si et seulement si $x$ est à l'intérieur de l'intervalle des racines. L'ensemble des solutions est donc
+$\symcal{S}=\left]0,\, 5/2\right[$.
+\item Résoudre $x^2-x+1>0$ : on trouve $\Delta=-3$. Il n'y a pas de racines, donc $x^2-x+1$ admet pour signe $1$ pour tout $x\in\R$. Tout $x$ réel est donc solution : l'ensemble des solutions est $\symcal{S}=\R$.
+\end{enumerate}
+\end{example}
+\section{Somme et produit des racines}
+\subsection{Expression de la somme et du produit des racines}
+On suppose ici que $\Delta≥0$, c'est-à-dire que le polynôme $P$ deux racines $\alpha$ et $\beta$, confondues en une racine double au cas où $\Delta=0$. On a le théorème suivant:
+\begin{thm}\label{thsomprod}%
+Soit $P$, la fonction polynôme de degré 2 définie sur $\R$ par $P(x)=ax^2+bx+c$. Si le discriminant $\Delta$ de $P$ est positif, la somme et le produit des racines de $P$ sont données par
+\[
+\alpha+\beta=-\frac{b}{a} \quad\text{et}\quad \alpha\beta=\frac{c}{a}\:.
+\]
+\end{thm}
+
+\begin{remark}
+On sait que si $\Delta=0$, on a $\alpha=\beta=-b/(2a)$. On retrouve bien
+\[\alpha+\beta=2\times\left(-\frac{b}{2a}\right)=-\frac{b}{a}\;;\]
+on remarque également que, puisque $\Delta=0$, on a $b^2=4ac$ et par conséquent
+\[
+\alpha\beta=\left(-\frac{b}{2a}\right)^2=\frac{b^2}{4a^2}=\frac{4ac}{4a^2}=\frac{c}{a}\:.
+\]
+\end{remark}
+
+\begin{proof}On utilise la forme factorisée de $P(x)$ :
+\begin{align*}
+\forall x\in\R,\;P(x)&=a(x-\alpha)(x-\beta),\\
+&=a(x^2-\alpha x-\beta x +\alpha\beta),\\
+&=a\left(x^2-(\alpha+\beta)x+\alpha\beta\right),\\
+&=ax^2-a(\alpha+\beta)x +a\alpha\beta.
+\end{align*}
+
+D'après le théorème \ref{thunicite}, on peut identifier les coefficients : $-a(\alpha+\beta)=b$ et $a\alpha\beta=c$. Le résultat annoncé en découle immédiatement.
+\end{proof}
+\subsubsection{Racine apparente ou connue}
+On dit que $\alpha$ est une \frquote{racine apparente} (on dit également \frquote{évidente}) du polynôme $P$ lorsqu'un simple calcul à vue permet de montrer que $P(\alpha)=0$. On parle de racine connue lorsqu'un calcul antérieur a permis d'établir cette égalité. Dans une telle situation, il est facile de déterminer $\beta$, l'autre racine de $P$, grâce à la somme ou au produit :
+\[
+ \beta=-\frac{b}{a}-\alpha \quad \text{ou (dans le cas où $\alpha\neq0$)}\quad\beta=\frac{c}{a\alpha}.
+\]
+\begin{example}[Exemples]
+\begin{enumerate}
+\item Factoriser le polynôme $P$, défini sur $\R$ par $P(x)=3x^2+9x+6$. Un calcul immédiat montre que $P(-1)=0$ : le réel $-1$ est donc racine de $P$, tandis que l'autre racine $\beta$ vérifie~\mbox{$-1\times\beta=6/3=2$}. D'où $\beta=-2$ et la factorisation : \[P(x)=3(x+1)(x+2).\]
+\item On pose $Q(x)=2x^2-13x+15$. Calculer $Q(5)$ et résoudre l'équation $Q(x)=0$. On trouve $Q(5)=0$ : le réel $5$ est donc racine de $Q$. L'autre racine vérifie $5+\beta=6{,}5$, d'où $\beta=1{,}5$ : l'ensemble des solutions de l'équation proposée est \[\symcal{S}=\left\{5, \frac32\right\}\,.\]
+
+\end{enumerate}
+\end{example}
+
+\subsection{Trouver deux nombres connaissant leur somme et leur produit}
+
+\begin{thm}
+Deux réels $s$ et $p$ étant donnés, il existe deux nombres réels $\alpha$ et $\beta$ dont la somme vaut $s$ et le produit $p$ si et seulement si le nombre $\Delta=s^2-4p$ est positif. Dans ce cas, les nombres $\alpha$ et $\beta$ sont les racines de la fonction polynôme de degré $2$ définie par $P(x)=x^2-sx+p$, de discriminant $\Delta$.
+\end{thm}
+\begin{proof}
+\begin{itemize}
+\item Tout d'abord, si $s^2-4p≥0$, la fonction polynôme $P$, de discriminant $\Delta=s^2-4p$ admet deux racines dont la somme est $s$ et le produit $p$ d'après le théorème \ref{thsomprod}.
+
+\item Réciproquement, s'il existe deux nombres $\alpha$ et $\beta$ tels que
+\[
+\alpha+\beta=s \quad\text{et}\quad \alpha\beta=p,
+\]
+on a, d'après la première équation, $\beta=s-\alpha$, puis en substituant dans la seconde
+\[\alpha(s-\alpha)=p\quad\text{soit}\quad\alpha^2-s\alpha+p=0,\]
+c'est-à-dire $P(\alpha)=0$.
+
+Il est donc nécessaire que $\alpha$ soit une racine de $P$, ce qui entraîne que le discriminant $s^2-4p$ soit positif. Enfin, la relation $\beta=s-\alpha$ entraîne que $\beta$ est alors la seconde racine de $P$.\qedhere
+\end{itemize}
+\end{proof}
+\begin{example}[Exemples]
+\begin{enumerate}
+\item Trouver deux nombres dont la somme vaut $1$ et le produit $-12$. Ces deux nombres doivent être racines de $x^2+x-12$ dont le discriminant est $49$ et qui admet $-3$ et $4$ pour racines. Les deux nombres cherchés sont donc $-3$ et $4$.
+\item Trouver deux nombres dont la somme vaut $6$ et le produit $9$. On forme le polynôme $x^2-6x+9$, égal à $(x-3)^2$, dont le discriminant est nul et qui admet $3$ pour racine double : les nombres $\alpha$ et $\beta$ dont le produit vaut $9$ et la somme $6$ sont tous deux égaux à $3$.
+\item Trouver deux nombres dont la somme vaut $s=5$ et le produit $p=8$. On calcule $s^2-4p=-7$ : le problème n'a pas de solution (tout comme le polynôme $x^2-5x+8$ n'admet pas de racines).
+\end{enumerate}
+\end{example}
+\endinput
+
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/puissance-cercle.tex b/Master/texmf-dist/doc/lualatex/tango/examples/puissance-cercle.tex
new file mode 100644
index 00000000000..0263bcb20f5
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/puissance-cercle.tex
@@ -0,0 +1,713 @@
+\tgotitle{Puissance d'un point par rapport à un cercle}
+
+\section{Mesure algébrique}
+On définit la mesure algébrique d'un bipoint~$(A,B)$ dans un repère de la droite~$(AB)$ comme la différence des abscisses $x_B-x_A$ (voir figure~\ref{figmesalg}). Dans le contexte euclidien qui nous intéresse ici, les repères des droites sont normés : la mesure algébrique ne dépend que de l'orientation de la droite (elle est définie \frquote{au signe près}). On notera cependant que le produit ou le quotient de deux mesures algébriques sont quant à eux indépendants du choix du repère, puisqu'en cas de changement d'orientation les signes des deux quantités considérées changent simultanément.
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=above:$A$] (A) at (-1.3,0);
+\coordinate [label=below:$x_A$] (xA) at (-1.3,0);
+\coordinate[label=above:$B$] (B) at (1.7,0);
+\coordinate [label=below:$x_B$] (xB) at (1.7,0);
+\coordinate (Z) at ($(A)!1.1!(B)$);
+\coordinate (T) at ($(B)!1.1!(A)$);
+\draw (Z)--(T);
+\node[below] at ($(A)!0.5!(B)$){$\mesalg{AB}=x_B-x_A$};
+\foreach \point in {A,B}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figmesalg}
+\end{figure}
+
+De la définition qui vient d'être donnée, on déduit immédiatement que :
+\begin{itemize}
+\item Pour tout point $A$, $\mesalg{AA}=0$.
+\item Pour tout couple de points $A$ et $B$, $\mesalg{BA}$ et $\mesalg{AB}$ sont deux nombres opposés.
+\end{itemize}
+Plus généralement, on peut énoncer le
+\begin{thm}\label{thchasles}%
+Soit $A$, $B$ et $C$ trois points donnés sur une droite dans un ordre quelconque. On a l'égalité suivante (relation de Chasles pour les mesures algébriques)
+\[\mesalg{AC}=\mesalg{AB}+\mesalg{BC}.\]
+\end{thm}
+
+\begin{proof} La vérification est immédiate.
+\begin{align*}\mesalg{AB}+\mesalg{BC}&=(x_B-x_A)+(x_C-x_B),\\
+&=x_C-x_A,\\
+&=\mesalg{AC}.\qedhere
+\end{align*}
+\end{proof}
+
+Nous donnons maintenant deux compléments sur la notion de mesure algébrique, qui faciliteront la compréhension de la suite.
+
+\begin{remark}[Lien avec le produit d'un vecteur par un réel]
+La notion de mesure algébrique est fortement liée à celle de produit d'un vecteur par un réel. Si $O$ et $A$ sont deux points distincts, $\lambda$ un réel et $M$ un point quelconque du plan, on a l'équivalence
+\[
+(\Vector{OM}=\lambda\Vector{OA})\iff(M\in (OA) \text{ et }\mesalg{OM}=\lambda\mesalg{OA}).
+\]
+Il s'en déduit que le milieu $I$ d'un segment $[AB]$ peut être caractérisé par des relations entre mesures algébriques, qu'il est parfois intéressant de substituer aux égalités vectorielles correspondantes :
+\begin{align}
+I \text{ est le milieu de }[AB]&\iff \mesalg{AI}=\mesalg{IB}=\frac12\mesalg{AB},\\
+&\iff\mesalg{IA}+\mesalg{IB}=0.\label{eqcaracmilieu}
+\end{align}
+\end{remark}
+
+\begin{remark}[Lien avec le produit scalaire]
+La mesure algébrique peut également intervenir dans l'expression du cosinus d'un angle et du produit scalaire. Précisément, si $A$ et $B$ sont deux points tous deux distincts du point $O$, le produit scalaire $\Vector{OA}\cdot\Vector{OB}$ peut être défini par
+\begin{equation}\Vector{OA}\cdot\Vector{OB}=OA\times OB\times \cos(\widehat{AOB}).\label{pscal1}
+\end{equation}
+%\[
+%\Vector{OA}\cdot\Vector{OB}=OA\times OB\times \rho([OA),[OB)),
+%\]
+%où $\rho([OA),[OB))$ désigne le rapport de projection orthogonale de la demi-droite $[OB)$ sur la demi-droite $[OA)$.
+
+On désigne par $H$ le projeté orthogonal de $B$ sur la \emph{droite} $(OA)$.
+La définition~\eqref{pscal1} permet d'affirmer que le produit scalaire $\Vector{OA}\cdot\Vector{OB}$ est de même signe que $\cos(\widehat{AOB})$, soit positif, si l'angle $\widehat{AOB}$ est aigu et négatif si cet angle est obtus. Le point $H$ appartient dans ce dernier cas à la demi-droite opposée à $[OA)$ (voir figure~\ref{figpscal0}). On a donc :
+\begin{equation*}
+\cos(\widehat{AOB})=
+\begin{cases}
+\hphantom{-}OH/OB&\text{si $\widehat{AOB}$ est aigu},\\
+-OH/OB&\text{si $\widehat{AOB}$ est obtus}.\\
+\end{cases}
+\end{equation*}
+
+%\[\cos(\widehat{AOB})=\frac{\mesalg{OH}}{\mesalg{OB}}.\]
+En reportant dans~\eqref{pscal1} et en simplifiant par $OB$, on obtient une autre expression du produit scalaire :
+\begin{equation*}
+\Vector{OA}\cdot\Vector{OB}=
+\begin{cases}
+\hphantom{-}OA\times OH&\text{si $\widehat{AOB}$ est aigu},\\
+-OA\times OH&\text{si $\widehat{AOB}$ est obtus}.
+\end{cases}%\label{pscal0}
+\end{equation*}
+
+
+
+On remarque alors que les demi-droites $[OA)$ et $[OH)$ sont de même sens si $\widehat{AOB}$ est aigu, et de sens contraire si $\widehat{AOB}$ est obtus. D'où une expression du produit scalaire utilisant les mesures algébriques :
+\begin{equation}
+\Vector{OA}\cdot\Vector{OB}=\mesalg{OA}\times\mesalg{OH}.\label{pscal0}
+\end{equation}
+
+%\dinofig{\figcaption{}\label{figpscal0}}
+\XSmartphoneCommand{
+\begin{figure}[ht]
+\hfill
+\begin{tikzpicture}
+\coordinate[label=left:$O$] (O) at (0,0);
+\coordinate(X) at (1,0);
+\coordinate[label=below:$B$](B) at ($(O)!3!350:(X)$);
+\coordinate(Y) at ($(O)!0.5!(B)$);
+\coordinate[label=above:$H$](H) at ($(Y)!1!50:(B)$);
+\coordinate[label=right:$A$](A) at ($(O)!1.3!(H)$);
+\draw[semithick,->] (O)--(B);
+\draw[semithick,->] (O)--(A);
+\draw[dashed](B)--(H);
+\foreach \point in {O,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\hfill\hfill
+\begin{tikzpicture}
+\coordinate[label=below:$O$] (O) at (0,0);
+\coordinate(X) at (1,0);
+\coordinate[label=above:$B$](B) at ($(O)!2.9!160:(X)$);
+\coordinate(Y) at ($(O)!0.5!(B)$);
+\coordinate[label=below:$H$](H) at ($(Y)!1!50:(B)$);
+\coordinate(Z) at ($(O)!1.2!(H)$);
+\coordinate[label=above:$A$](A) at ($(O)!-0.6!(H)$);
+\draw[semithick,->] (O)--(B);
+\draw[semithick,->] (O)--(A);
+\draw(O)--(Z);
+\draw[dashed](B)--(H);
+\foreach \point in {O,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\hfill\null
+\figcaption{}\label{figpscal0}
+\end{figure}
+}
+\SmartphoneCommand{
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=left:$O$] (O) at (0,0);
+\coordinate(X) at (1,0);
+\coordinate[label=below:$B$](B) at ($(O)!3!350:(X)$);
+\coordinate(Y) at ($(O)!0.5!(B)$);
+\coordinate[label=above:$H$](H) at ($(Y)!1!50:(B)$);
+\coordinate[label=right:$A$](A) at ($(O)!1.3!(H)$);
+\draw[semithick,->] (O)--(B);
+\draw[semithick,->] (O)--(A);
+\draw[dashed](B)--(H);
+\foreach \point in {O,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\\[1ex]
+\begin{tikzpicture}
+\coordinate[label=below:$O$] (O) at (0,0);
+\coordinate(X) at (1,0);
+\coordinate[label=above:$B$](B) at ($(O)!2.9!160:(X)$);
+\coordinate(Y) at ($(O)!0.5!(B)$);
+\coordinate[label=below:$H$](H) at ($(Y)!1!50:(B)$);
+\coordinate(Z) at ($(O)!1.2!(H)$);
+\coordinate[label=above:$A$](A) at ($(O)!-0.6!(H)$);
+\draw[semithick,->] (O)--(B);
+\draw[semithick,->] (O)--(A);
+\draw(O)--(Z);
+\draw[dashed](B)--(H);
+\foreach \point in {O,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figpscal0}
+\end{figure}
+}
+\begin{example}[Remarques]
+\begin{enumerate}
+\item L'angle noté $\widehat{AOB}$ est un angle \emph{non orienté} de demi-droites ; autrement dit, il n'y a pas lieu de distinguer $\widehat{AOB}$ et $\widehat{BOA}$. Il en découle que le produit scalaire est commutatif (le terme \frquote{symétrique} serait sans doute plus adapté).
+
+On aurait donc pu tout aussi bien utiliser le projeté de $A$ sur $(OB)$.
+\item L'indépendance du cosinus par rapport à l'ordre des deux demi droites $[OA)$ et $[OB)$ provient de ce que $\cos(\widehat{AOB})$ est égal au rapport de projection orthogonale, noté $\rho([OA),[OB))$, de la demi-droite $[OB)$ sur la demi-droite $[OA)$. On sait en effet (c'est en général considéré comme un des axiomes de la géométrie plane) que
+\[\rho([OA),[OB))=\rho([OB),[OA)).\]
+
+ \item Lorsque les points $A$ et $B$ sont confondus, on a
+ \begin{align*}
+ \Vector{OA}\cdot\Vector{OB}&=\Vector{OA}\cdot\Vector{OA},\\
+ &=OA^2\times \cos(\widehat{AOA}).
+ \end{align*}
+ L'angle $\widehat{AOA}$ est nul : on a donc $\cos(\widehat{AOA})=1$ d'où finalement
+ \begin{equation}
+\Vector{OA}\cdot\Vector{OA}=\bigl({\Vector{OA}}\bigr)^2=OA^2.\label{eqcarres}
+\end{equation}
+\end{enumerate}
+\end{example}
+\end{remark}
+
+\section{Point et cercle}
+\subsection{Une définition}
+Étant donné un cercle $\symcal{C}$, de centre $O$ et de rayon $r$, et un point $P$ quelconque, la puissance du point $P$ par rapport au cercle $\symcal{C}$ est par définition le nombre
+\[\symcal{C}(P)=OP^2-r^2 \text{ (voir figure~\ref{figdefppc})}.\]
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$O$] (O) at (2,0);
+\coordinate(X) at (3,0);
+\node[draw,label=above:$\symcal{C}$] (c) at (O) [circle through={(X)}]{};
+\coordinate[label=right:$P$] (P) at ($(O)!3.2!15:(X)$);
+\coordinate[label=right:$A$](A) at ($(O)!1!312:(X)$);
+\draw[semithick](P)--(O)--(A);
+\node[right] at (X){$\symcal{C}(P)=OP^2-OA^2$};
+\node[right=1.3cm,below=1mm] at (X){$\text{pour tout }A\in\symcal{C}$};
+\foreach \point in {P,O,A}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figdefppc}
+\end{figure}
+
+Par conséquent, la puissance d'un point $P$ par rapport à un cercle est :
+\begin{itemize}
+\item strictement positive si le point $P$ est extérieur au cercle;
+\item nulle si le point $P$ appartient au cercle;
+\item strictement négative et au minimum égale à $-r^2$ si le point $P$ est intérieur au cercle.
+\end{itemize}
+
+\subsection{Avec une tangente}\label{subsectangente}
+On se place ici dans le cas où le point $P$ est extérieur au cercle. Il est alors possible de s'intéresser aux tangentes issues de $P$.
+\begin{thm}
+Soit un cercle $\symcal{C}$ de centre $O$, un point $P$ extérieur au cercle et $T$ le point de contact de l'une des tangentes à $\symcal{C}$ issues de $P$. La puissance de $P$ par rapport à $\symcal{C}$ vaut
+\[\symcal{C}(P)=PT^2.\]
+\end{thm}
+
+
+\begin{proof}
+On pourra se référer à la figure \ref{figtangente}. La droite $(PT)$ étant tangente à $\symcal{C}$, le triangle $OTP$ est rectangle en $T$. D'après le théorème de Pythagore, on a
+\[\symcal{C}(P)=OP^2-OT^2=PT^2.\qedhere\]
+\end{proof}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=left:$O$] (O) at (2,0);
+\coordinate(X) at (3.5,0);
+\node[draw,label=above:$\symcal{C}$] (c) at (O) [circle through={(X)}]{};
+\coordinate[label=right:$P$] (P) at ($(O)!1.7!345:(X)$);
+\coordinate(Y) at ($(O)!0.5!(P)$);
+\node[draw,dashed] (x) at (Y) [circle through={(P)}]{};
+\coordinate[label=above:$T$](T) at (intersection 2 of c and x);
+\draw (P)--(T)--(O)--cycle;
+\foreach \point in {P,T,O}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figtangente}
+\end{figure}
+
+\subsection{Avec une sécante}\label{subsecsecante}
+Le point $P$ est cette fois-ci quelconque. On considère alors une droite sécante au cercle et passant par $P$ (voir la figure \ref{figsecante}).
+\begin{thm}
+Soit un cercle $\symcal{C}$ de centre $O$, un point $P$ quelconque et une droite passant par $P$ sécante au cercle en $A$ et $B$. La puissance de $P$ par rapport à $\symcal{C}$ vaut alors
+\[\symcal{C}(P)=\mesalg{PA}\times\mesalg{PB}.\]
+\end{thm}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$O$] (O) at (2,0);
+\coordinate(X) at (3.5,0);
+\node[draw,label=above:$\symcal{C}$] (c) at (O) [circle through={(X)}]{};
+\coordinate[label=left:$A$] (A) at ($(O)!1!155:(X)$);
+\coordinate(A') at ($(A)!2!(O)$);
+\coordinate[label=right:$P$] (P) at ($(O)!1.8!35:(X)$);
+\coordinate(Z) at ($(A')!0.5!(P)$);
+\node (x) at (Z) [circle through={(P)}]{};
+\coordinate[label=above:$B$](B) at (intersection 2 of c and x);
+\coordinate[label=above:$I$](I) at ($(A)!0.5!(B)$);
+\draw (P)--(B)--(I)--(A);
+\draw(A)--(O)--(B);
+\draw(P)--(O)--(I);
+\foreach \point in {A,P,B,O,I}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figsecante}
+\end{figure}
+
+\begin{proof}
+Soit $I$ le milieu de $[AB]$ : $AOB$ étant isocèle en $O$, la droite $(OI)$ est la médiatrice de $[AB]$. Les triangles $OIP$ et $OIA$ sont rectangles en $I$. On a donc $OP^2=OI^2+IP^2$ et $OA^2=OI^2+IA^2$.
+
+ Par conséquent,
+\begin{align*}
+\symcal{C}(P)&=PO^2-OA^2,\\
+&=(OI^2+IP^2)-(OI^2+IA^2),\\
+\intertext{soit en réduisant,}
+\symcal{C}(P)&=IP^2-IA^2,\\
+\intertext{puis en utilisant une identité remarquable et les égalités~\eqref{eqcarres} et~\eqref{eqcaracmilieu}}
+\symcal{C}(P)&=\mesalg{PI}^2-\mesalg{IA}^2,\\
+&=(\mesalg{PI}+\mesalg{IA})(\mesalg{PI}-\mesalg{IA}),\\
+&=(\mesalg{PI}+\mesalg{IA})(\mesalg{PI}+\mesalg{IB}),\\
+\intertext{et enfin, grâce au théorème~\ref{thchasles}}
+\symcal{C}(P)&=\mesalg{PA}\times\mesalg{PB}.\qedhere
+\end{align*}
+
+\end{proof}
+
+\begin{example}[Remarques]
+\begin{enumerate}
+\item Il est remarquable que la quantité $\mesalg{PA}\times\mesalg{PB}$ ne dépende pas de la sécante choisie : autrement dit, si deux sécantes passant par $P$ coupent le cercle respectivement en $A$ et $B$ et en $C$ et $D$, alors
+\[\mesalg{PA}\times\mesalg{PB}=\mesalg{PC}\times\mesalg{PD}.\]
+\item Si $P$ est intérieur au cercle, les demi-droites $[PA)$ et $[PB)$ sont de sens contraires : on retrouve le fait que $\symcal{C}(P)$ est dans ce cas négatif.
+\item Une tangente issue de $P$, comme on l'a évoqué en \ref{subsectangente}, peut être considérée comme une position limite d'une sécante pivotant autour de $P$, les points $A$ et $B$ étant alors confondus en $T$ : on aura bien de ce point de vue $\mesalg{PA}\times\mesalg{PB}=PT^2$.
+\end{enumerate}
+\end{example}
+
+\subsection{Utilisation du produit scalaire}
+On utilise ici la relation~\eqref{pscal0} pour donner une autre expression de la puissance d'un point par rapport à un cercle (voir figure~\ref{figpscal2}).
+\begin{thm}
+Soit un cercle $\symcal{C}$ de centre $O$, un point $P$ quelconque, et deux points de $\symcal{C}$ diamétralement opposés $A_1$ et $A_2$. La puissance de $P$ par rapport à $\symcal{C}$ vaut alors
+\[\symcal{C}(P)=\Vector{PA_1}\cdot\Vector{PA_2}.\]
+\end{thm}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$O$] (O) at (2,0);
+\coordinate(X) at (3.5,0);
+\node[draw,label=above:$\symcal{C}$] (c) at (O) [circle through={(X)}]{};
+\coordinate[label=left:$A_1$] (A) at ($(O)!1!160:(X)$);
+\coordinate[label=right:$A_2$] (A') at ($(A)!2!(O)$);
+\coordinate[label=right:$P$] (P) at ($(O)!2.2!32:(X)$);
+\coordinate(Z) at ($(A')!0.5!(P)$);
+\node (x) at (Z) [circle through={(P)}]{};
+\coordinate[label=above:$B$](B) at (intersection 2 of c and x);
+\draw [semithick,->](P)--(A);
+\draw[semithick,->](P)--(A');
+\draw(A')--(B);
+\foreach \point in {P,B,O}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figpscal2}
+\end{figure}
+
+\begin{proof}%\sloppy
+Tout d'abord, les droites $(PA_1)$ et $(PA_2)$ ne peuvent être toutes les deux tangentes à $\symcal{C}$ : en effet, deux tangentes en des points diamétralement opposés sont parallèles disjointes et ne peuvent avoir le point $P$ en commun. Quitte à permuter $A_1$ et $A_2$, il n'est donc pas restrictif de supposer que la droite $(PA_1)$ est sécante (et non tangente) à $\symcal{C}$.
+
+Soit alors $B$ la seconde intersection de la droite $(PA_1)$ avec le cercle. Le segment $[A_1A_2]$ étant un diamètre du cercle, le point $B$ est le projeté orthogonal de $A_2$ sur $(PA_1)$. On a donc d'après \ref{subsectangente}
+\begin{align*}
+\symcal{C}(P)&=\mesalg{PA_1}\times\mesalg{PB},\\
+&=\Vector{PA_1}\cdot\Vector{PA_2}.\qedhere
+\end{align*}
+\end{proof}
+
+
+\begin{remark}
+On se persuadera facilement, en observant la figure \ref{figpscal3}, que le raisonnement précédent est indépendant de la position de $P$ par rapport au cercle.
+\end{remark}
+%\dinofig[-0.5]{\figcaption{}\label{figpscal3}}
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$O$] (O) at (2,0);
+\coordinate(X) at (3.5,0);
+\node[draw,label=above:$\symcal{C}$] (c) at (O) [circle through={(X)}]{};
+\coordinate[label=left:$A_1$] (A) at ($(O)!1!160:(X)$);
+\coordinate[label=right:$A_2$] (A') at ($(A)!2!(O)$);
+\coordinate[label=above:$P$] (P) at ($(O)!0.6!70:(X)$);
+\coordinate(Z) at ($(A')!0.5!(P)$);
+\node (x) at (Z) [circle through={(P)}]{};
+\coordinate[label=above:$B$](B) at (intersection 2 of c and x);
+\draw [semithick,->](P)--(A);
+\draw[semithick,->](P)--(A');
+\draw(P)--(B);
+\draw(A')--(B);
+\foreach \point in {P,B,O}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figpscal3}
+\end{figure}
+
+\subsection{Dans un repère orthonormal}
+On se place ici dans un repère orthonormal et l'on considère un cercle $\symcal{C}$ de centre $\Omega(a,b)$ et de rayon $r$. On s'intéresse alors à l'expression de la puissance d'un point $M(x,y)$ quelconque par rapport au cercle $\symcal{C}$.
+\begin{thm}\label{threp}
+Soit dans le plan rapporté à un repère orthonormal un cercle $\symcal{C}$ de centre $\Omega(a,b)$ et de rayon $r$. Soit un point $M(x,y)$. La puissance de $M$ par rapport à $\symcal{C}$ est
+\[\symcal{C}(M) = x^2+y^2-2ax-2by+a^2+b^2-r^2.\]
+\end{thm}
+
+\begin{proof}
+On a
+\begin{align*}\symcal{C}(M)&=\Omega M^2-r^2\\
+&={(x-a)}^2+{(y-b)}^2-r^2,\\
+&=x^2-2ax+a^2+y^2-2by+b^2-r^2.\qedhere
+\end{align*}
+\end{proof}
+
+De plus, en remarquant que $M\in\symcal{C}$ si et seulement si la puissance de $M$ par rapport à $\symcal{C}$ est nulle, on établit le corollaire suivant :
+%\DinoAfourNBCommand{\par\pagebreak}
+\begin{coro*}
+Dans le plan rapporté à un repère orthonormal, le cercle $\symcal{C}$ de centre $\Omega(a,b)$ et de rayon $r$ admet pour équation
+\[x^2+y^2-2ax-2by+c=0,\]
+où $c=a^2+b^2-r^2$.
+\end{coro*}
+
+\section{Cocyclicité}
+On dit que quatre points distincts sont cocycliques s'ils appartiennent à un même cercle (un tel cercle est évidemment unique : ce que l'on affirme en disant que les points sont cocycliques est que cercle circonscrit au triangle formé par trois quelconques de ces points passe par le quatrième). On se propose d'établir le théorème suivant (voir figure~\ref{figcocy}).
+
+\begin{thm} Soit quatre points distincts $A$, $B$, $C$ et $D$ tels que les droites $(AB)$ et $(CD)$ soient sécantes en $P$. Les points $A$, $B$, $C$, $D$ sont cocycliques si et seulement si
+\[\mesalg{PA}\times\mesalg{PB}=\mesalg{PC}\times\mesalg{PD}.\]
+\end{thm}
+
+%\dinofig{\figcaption{}\label{figcocy}}
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate (O) at (2,0);
+\coordinate(X) at (4,0);
+\node[draw,label=above:$\symcal{C}$] (c) at (O) [circle through={(X)}]{};
+\coordinate[label=left:$A$] (A) at ($(O)!1!140:(X)$);
+\coordinate[label=below:$B$] (B) at ($(O)!1!310:(X)$);
+\coordinate[label=left:$C$] (C) at ($(O)!1!210:(X)$);
+\coordinate[label=above:$D$] (D) at ($(O)!1!65:(X)$);
+\coordinate[label=right:$\kern3pt P$](P) at (intersection of A--B and C--D);
+\draw(A)--(B);
+\draw(C)--(D);
+\foreach \point in {A,B,C,D,P}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figcocy}
+\end{figure}
+
+\begin{proof}
+Il s'agit de démontrer une équivalence. Nous procéderons donc classiquement en deux temps : d'abord le sens direct, puis la réciproque.
+
+Supposons pour commencer que les points $A$, $B$, $C$, $D$ soient sur un même cercle $\symcal{C}$. Alors les droites $(AB)$ et $(CD)$ étant des sécantes au cercle contenant chacune le point $P$, on a
+\[\symcal{C}(P)=\mesalg{PA}\times\mesalg{PB}=\mesalg{PC}\times\mesalg{PD}.\]
+
+Réciproquement, supposons que $\mesalg{PA}\times\mesalg{PB}=\mesalg{PC}\times\mesalg{PD}$. Soit alors $\symcal{C}\;$ le cercle circonscrit au triangle $ABC$ : il nous suffit de prouver que $D\in\symcal{C}$. La droite $(CD)$ coupe le cercle en $C$ et en un second point $M$ tel que
+\begin{align*}\mesalg{PC}\times\mesalg{PM}&=\symcal{C}(P)\\
+&=\mesalg{PA}\times\mesalg{PB}\\
+&=\mesalg{PC}\times\mesalg{PD}, \text{ par hypothèse.}
+\end{align*}
+On en déduit que $\mesalg{PD}=\mesalg{PM}$, donc que $D=M$ ($P$ ne peut être confondu avec $C$, car alors il serait lui même confondu avec $A$ ou $B$).
+\end{proof}
+
+
+\section{Axe radical de deux cercles}
+
+\subsection{Définition}
+On s'intéresse ici à l'ensemble des points qui ont même puissance par rapport à deux cercles non concentriques donnés.
+
+\begin{thm}
+Étant donné deux cercles non concentriques $\symcal{C}_1$ et $\symcal{C}_2$ de centres et de rayons respectifs $(O_1,r_1)$ et $(O_2,r_2)$, l'ensemble des points qui ont la même puissance par rapport à chacun des cercles est une droite $\Delta$ perpendiculaire à $(O_1O_2)$, nommée \emph{axe radical} des deux cercles.
+\end{thm}
+
+%\dinofig{\figcaption{}\label{figaxerad0}}
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\clip (0.3,-1.3) rectangle (5.1,1.9);
+\coordinate[label=below:$O_1$] (O1) at (1,0);
+\coordinate(X1) at (1.6,0);
+\node[draw,label=above:$\symcal{C_1}$] (c1) at (O1) [circle through={(X1)}]{};
+\coordinate[label=below:$O_2$] (O2) at (3.8,0);
+\coordinate[label=below:$I$] (I) at ($(O1)!0.5!(O2)$);
+\coordinate(X2) at (5,0);
+\node[draw,label=above:$\symcal{C_2}$] (c2) at (O2) [circle through={(X2)}]{};
+\coordinate(Y1) at ($(O1)!-1.2!(X1)$);
+\coordinate(Y2) at ($(O2)!1.1!(X2)$);
+\draw (Y1)--(Y2);
+\coordinate(Y) at (2,-1);
+\coordinate(U) at (2,0.5);
+\node (x) at (Y) [circle through={(U)}]{};
+\coordinate(Z1) at (intersection 1 of c1 and x);
+\coordinate(T1) at (intersection 2 of c1 and x);
+\coordinate(Z2) at (intersection 1 of c2 and x);
+\coordinate(T2) at (intersection 2 of c2 and x);
+\coordinate[label=left:$M$](M) at (intersection of Z1--T1 and Z2--T2);
+\coordinate(W1) at ($(O1)!0.5!(M)$);
+\coordinate(W2) at ($(O2)!0.5!(M)$);
+\node (w1) at (W1) [circle through={(M)}]{};
+\node(w2) at (W2) [circle through={(M)}]{};
+\coordinate[label=below:$H\kern13pt$](H) at (intersection 1 of w1 and w2);
+\coordinate[label=left:$\Delta$](V1) at ($(H)!1.5!(M)$);
+\coordinate(V2) at ($(H)!-1.1!(M)$);
+\draw[semithick](V1)--(V2);
+\foreach \point in {O1,O2,I,M,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figaxerad0}
+\end{figure}
+
+\begin{remark}
+Si les deux cercles sont concentriques et distincts, aucun point $M$ du plan n'est tel que $\symcal{C}_1(M)=\symcal{C}_2(M)$, c'est une conséquence immédiate de la définition de la puissance d'un point par rapport à un cercle.
+\end{remark}
+
+\begin{proof}
+Soit un point $M$ du plan et $H$ son projeté orthogonal sur la droite $(O_1O_2)$. Nous supposons que $\symcal{C}_1(M)=\symcal{C}_2(M)$ ; nous allons prouver que le point $H$ occupe une position fixe (indépendante de $M$) sur $(O_1O_2)$, ce qui prouvera que $M$ appartient à la perpendiculaire en $H$ à cette droite. Pour nous éviter une réciproque fastidieuse, nous procéderons par équivalence. Désignons par $I$ le milieu de $[O_1O_2]$ et exprimons l'égalité des puissances (voir la figure~\ref{figaxerad0}).
+\begin{align*}
+\symcal{C}_1(M)=\symcal{C}_2(M) &\iff O_1M^2-r_1^2=O_2M^2-r_2^2,\\
+\intertext{soit, en posant $k=r_1^2-r_2^2$,}
+\symcal{C}_1(M)=\symcal{C}_2(M) &\iff O_1M_1^2-O_2M2^2=k,\\
+&\iff (\Vector{O_1M}+\Vector{O_2M})\cdot(\Vector{O_1M}-\Vector{O_2M})=k.
+\end{align*}
+
+On remarque alors que
+\begin{equation*}
+\Vector{O_1M}+\Vector{O_2M}=\hspace{-0.5em}\underbrace{\Vector{O_1I}+\Vector{O_2I}}_{\substack{\vec{0}\text{, car } I\\\text{milieu de }[O_1O_2]}}\hspace{-0.5em}+\,2\Vector{IM}=2\Vector{IM}
+\end{equation*}
+et que
+\begin{equation*}
+\Vector{O_1M}-\Vector{O_2M}=\Vector{O_1M}+\Vector{MO_2}=\Vector{O_1O_2}.
+\end{equation*}
+
+On en déduit
+\begin{align*}
+\symcal{C}_1(M)=\symcal{C}_2(M) &\iff 2\Vector{IM}\cdot\Vector{O_1O2}=k,\\
+&\iff 2(\underbrace{\Vector{IH}+\Vector{HM}}_{\Vector{IM}})\cdot\Vector{O_1O_2}=k,\\
+&\iff 2\Vector{IH}\cdot\Vector{O_1O_2}+2\underbrace{\Vector{HM}\cdot\Vector{O_1O_2}}_{\substack{0 \text{, car}\\(HM)\perp(O_1O_2)}}=k.
+\end{align*}
+
+Puisque les points $I$, $H$, $O_1$ et $O_2$ sont sur la même droite, on peut passer aux mesures algébriques, et on obtient finalement :
+\begin{align}
+\symcal{C}_1(M)=\symcal{C}_2(M)&\iff 2\mesalg{IH}\cdot\mesalg{O_1O_2}=k,\notag\\
+&\iff\mesalg{IH}=\frac{r_1^2-r_2^2}{2\mesalg{O_1O_2}}.\label{eqposH}
+\end{align}
+
+
+On en déduit que $\symcal{C}_1(M)=\symcal{C}_2(M)$ si et seulement si le projeté orthogonal $H$ de $M$ sur $(O_1O_2)$ occupe la position (fixe) définie par la relation~\eqref{eqposH}. L'ensemble des points $M$ est donc la droite $\Delta$ perpendiculaire à $(O_1O_2)$ passant par $H$.
+\end{proof}
+
+\subsection{Détermination pratique}\label{subsecdetprat}
+On s'intéresse ici à la position relative des cercles $\symcal{C_1}$ et $\symcal{C_2}$.
+\subsubsection{Cercles sécants}
+Supposons que les cercles $\symcal{C_1}$ et $\symcal{C_2}$ soient sécants en deux points $A$ et $B$ (voir la figure~\ref{figaxerad1}). On a
+\[\symcal{C}_1(A)=\symcal{C}_2(A)=0 \text{ et }\symcal{C}_1(B)=\symcal{C}_2(B)=0 .
+\]
+Les points $A$ et $B$ ont tous deux la même puissance par rapport à chacun des deux cercles : l'axe radical $\Delta$ de $\symcal{C}_1$ et $\symcal{C}_2$ est donc la droite $(AB)$.
+
+
+%\dinofig{\figcaption{}\label{figaxerad1}}
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$O_1$] (O1) at (0.8,0);
+\coordinate(X1) at (2,0);
+\node[draw,label=above:$\symcal{C_1}$] (c1) at (O1) [circle through={(X1)}]{};
+\coordinate[label=below:$O_2$] (O2) at (3,0);
+\coordinate(X2) at (4.8,0);
+\node[draw,label=above:$\symcal{C_2}$] (c2) at (O2) [circle through={(X2)}]{};
+\coordinate(Y1) at ($(O1)!-1.2!(X1)$);
+\coordinate(Y2) at ($(O2)!1.1!(X2)$);
+\draw (Y1)--(Y2);
+\coordinate[label=right:$\kern2pt A$](A) at (intersection 2 of c1 and c2);
+\coordinate[label=right:$\kern2pt B$](B) at (intersection 1 of c1 and c2);
+\coordinate[label=below:$H\kern-13pt$](H) at (intersection of O1--O2 and A--B);
+\coordinate[label=left:$\Delta$](V1) at ($(H)!1.7!(A)$);
+\coordinate(V2) at ($(H)!1.3!(B)$);
+\draw[semithick](V1)--(V2);
+\foreach \point in {O1,O2,A,B,H}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figaxerad1}
+\end{figure}
+
+\subsubsection{Cercles tangents}
+Supposons que les cercles $\symcal{C_1}$ et $\symcal{C_2}$ soient tangents (intérieurement ou extérieurement) en un point $T$ (voir la figure~\ref{figaxerad2}). On a
+$\symcal{C}_1(T)=\symcal{C}_2(T)=0$.
+Le point $T$ a la même puissance par rapport à chacun des deux cercles : l'axe radical $\Delta$ de $\symcal{C}_1$ et $\symcal{C}_2$ est donc la droite perpendiculaire en $T$ à $(O_1O_2)$.
+
+%\dinofig{\figcaption{}\label{figaxerad2}}
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$O_1$] (O1) at (1.2,0);
+\coordinate[label=below:$\kern10pt T$](T) at (3,0);
+\node[draw,label=above:$\symcal{C_1}$] (c1) at (O1) [circle through={(T)}]{};
+\coordinate[label=below:$O_2$] (O2) at (1.8,0);
+%\coordinate(X2) at (4.8,0);
+\node[draw,label=above:$\symcal{C_2}$] (c2) at (O2) [circle through={(T)}]{};
+\coordinate(Y1) at ($(O1)!-1.3!(T)$);
+\coordinate(Y2) at ($(O2)!1.3!(T)$);
+\draw (Y1)--(Y2);
+\coordinate[label=left:$\Delta$](V1) at ($(T)!1!270:(O1)$);
+\coordinate(V2) at ($(T)!1!90:(O1)$);
+\draw[semithick](V1)--(V2);
+\foreach \point in {O1,O2,T}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figaxerad2}
+\end{figure}
+
+
+\subsubsection{Cas général}
+Il est toujours possible de tracer un cercle auxiliaire $\Gamma$ sécant à $\symcal{C}_1$ en $A_1$ et $B_1$, à $\symcal{C}_2$ en $A_2$ et $B_2$, et de telle sorte que les droites $(A_1B_1)$ et $(A_2B_2)$ soient elles-mêmes sécantes en un point $P$ (voir la figure~\ref{figaxerad3}). On est ainsi ramené à des constructions ans le cas de cercles sécants.
+
+Le point $P$ appartient à l'axe radical de $(A_1B_1)$ de $\symcal{C}_1$ et $\Gamma$, donc $\symcal{C}_1(P)=\Gamma(P)$. De même, $\symcal{C}_2(P)=\Gamma(P)$ et par conséquent $\symcal{C}_1(P)=\symcal{C}_2(P)$. Le point $P$ appartient donc à l'axe radical $\Delta$ de $\symcal{C}_1$ et $\symcal{C}_2$ : $\Delta$ est la perpendiculaire à $(O_1O_2)$ passant par $P$.
+
+\begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate[label=below:$O_1$] (O1) at (0.4,0);
+\coordinate(X1) at (1.5,0);
+\node[draw,label=above:$\symcal{C_1}$] (c1) at (O1) [circle through={(X1)}]{};
+\coordinate[label=below:$O_2$] (O2) at (3.6,0);
+\coordinate(X2) at (5,0);
+\node[draw,label=above:$\symcal{C_2}$] (c2) at (O2) [circle through={(X2)}]{};
+\coordinate(Y1) at ($(O1)!-1.2!(X1)$);
+\coordinate(Y2) at ($(O2)!1.1!(X2)$);
+\draw (Y1)--(Y2);
+\coordinate(Y) at (2,-1);
+\coordinate(U) at (2,0.5);
+\node[draw,label=below:$\kern10pt\Gamma$] (g) at (Y) [circle through={(U)}]{};
+\coordinate[label=left:$A_1${\rule[-8pt]{0pt}{10pt}}](A1) at (intersection 2 of c1 and g);
+\coordinate[label=below:$B_1\kern10pt$](B1) at (intersection 1 of c1 and g);
+\coordinate[label=right: $A_2${\rule[-8pt]{0pt}{10pt}}](A2) at (intersection 1 of c2 and g);
+\coordinate[label=below:$\kern10pt B_2$](B2) at (intersection 2 of c2 and g);
+\coordinate[label=left:$P$](P) at (intersection of A1--B1 and A2--B2);
+\draw (P)--(B1);
+\draw (P)--(B2);
+\coordinate(W1) at ($(O1)!0.5!(P)$);
+\coordinate(W2) at ($(O2)!0.5!(P)$);
+\node (w1) at (W1) [circle through={(P)}]{};
+\node(w2) at (W2) [circle through={(P)}]{};
+\coordinate[label=below:$H\kern13pt$](H) at (intersection 1 of w1 and w2);
+\coordinate[label=left:$\Delta$](V1) at ($(H)!1.5!(P)$);
+\coordinate(V2) at ($(H)!-2.4!(P)$);
+\draw[semithick](V1)--(V2);
+\foreach \point in {O1,O2,P,H,A1,B1,A2,B2}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figaxerad3}
+\end{figure}
+
+\subsubsection{Dans un repère orthonormal}
+Soit un cercle $\symcal{C}_1$ de centre $\Omega_1(a_1,b_1)$ et de rayon $r_2$, un cercle $\symcal{C}_2$ de centre $\Omega_2(a_2,b_2)$ et de rayon $r_2$. On suppose $\Omega_1\neq\Omega_2$ et on nomme $\Delta$ l'axe radical de ces deux cercles. D'après le théorème~\ref{threp} page \pageref{threp}, l'appartenance de $M(x,y)$ à $\Delta$ se traduit par
+\begin{equation*}
+x^2+y^2-2a_1x-2b_1y+c_1=x^2+y^2-2a_2x-2b_2y+c_2,
+\end{equation*}
+où $c_1=a_1^2+b_1^2-r_1^2$ et $c_2=a_2^2+b_2^2-r_2^2$.
+
+\vspace\baselineskip\par Donc, après simplification :
+\[P\in \Delta \iff (a_2-a_1)x+(b_2-b_1)y+(c_1-c_2)/2=0.\]
+L'axe radical $\Delta$ admet pour équation
+\[(a_2-a_1)x+(b_2-b_1)y+(c_1-c_2)/2=0,\]
+ où l'on constate bien que $\Delta$ admet $\Vector{\Omega_1\Omega_2}$ pour vecteur normal.
+
+ \subsection{Centre radical}
+ Lorsqu'au~\ref{subsecdetprat} nous avons, pour traiter le cas général, exploité l'idée d'un cercle auxiliaire, nous avons implicitement démontré le théorème suivant (voir la figure~\ref{figcentrerad}).
+ \begin{thm}
+ Soient trois cercles $\symcal{C}_1$, $\symcal{C}_2$ et $\Gamma$ dont les centres sont distincts et non alignés. Les axes radicaux $\Delta$ de $\symcal{C}_1$ et $\symcal{C}_2$, $\symcal{D}_1$ de $\symcal{C}_1$ et $\Gamma$ et finalement $\symcal{D}_2$ de $\symcal{C}_2$ et $\Gamma$ sont concourants en un point $P$ nommé \emph{centre radical} des trois cercles.
+ \end{thm}
+
+\newcommand{\figurecentrerad}{%
+ \begin{figure}[ht]
+\centering
+\begin{tikzpicture}
+\coordinate (O1) at (0.4,0);
+\coordinate(X1) at (1.5,0);
+\node[draw,label=above:$\symcal{C_1}$] (c1) at (O1) [circle through={(X1)}]{};
+\coordinate (O2) at (3.6,0);
+\coordinate(X2) at (5,0);
+\node[draw,label=above:$\symcal{C_2}$] (c2) at (O2) [circle through={(X2)}]{};
+\coordinate(Y) at (2,-1);
+\coordinate(U) at (2,0.5);
+\node[draw,label=below:$\kern10pt\Gamma$] (g) at (Y) [circle through={(U)}]{};
+\coordinate(A1) at (intersection 2 of c1 and g);
+\coordinate(B1) at (intersection 1 of c1 and g);
+\coordinate(A2) at (intersection 1 of c2 and g);
+\coordinate(B2) at (intersection 2 of c2 and g);
+\coordinate[label=right:$\symcal{D}_1$](Y1) at ($(A1)!1.8!(B1)$);
+\coordinate[label=left:$\symcal{D}_2$](Y2) at ($(A2)!1.5!(B2)$);
+\coordinate[label=left:$P$](P) at (intersection of A1--B1 and A2--B2);
+\draw (P)--(Y1);
+\draw (P)--(Y2);
+\coordinate(W1) at ($(O1)!0.5!(P)$);
+\coordinate(W2) at ($(O2)!0.5!(P)$);
+\node (w1) at (W1) [circle through={(P)}]{};
+\node(w2) at (W2) [circle through={(P)}]{};
+\coordinate(H) at (intersection 1 of w1 and w2);
+\coordinate[label=left:$\Delta$](V1) at ($(H)!1.5!(P)$);
+\coordinate(V2) at ($(H)!-2.4!(P)$);
+\draw(V1)--(V2);
+\foreach \point in {P,A1,B1,A2,B2}
+\draw[black,fill=white](\point) circle (1.2pt);
+\end{tikzpicture}
+\figcaption{}\label{figcentrerad}
+\end{figure}
+}
+
+%\DinoiPhoneCommand{%
+%\afterpage{\clearpage
+%\figurecentrerad
+%\par
+%\vspace{0.7cm}
+%{
+%\centering\LARGE\textcolor{ColorOne}\decoone
+
+%}
+%}}
+
+%\DinoiPadStdCommand{\figurecentrerad}
+%\DinoiPadAirCommand{\figurecentrerad}
+%\DinoiPadProCommand{\figurecentrerad}
+%%\DinoAfourNBCommand{\figurecentrerad}
+%\DinoAfourColorCommand{\figurecentrerad}
+%\DinoiPadminiCommand{\figurecentrerad}
+%%\DinoSaisieCommand{\figurecentrerad}
+%\DinoiPhoneCommand{\figurecentrerad}
+\figurecentrerad
+
+\begin{proof}
+On définit $P$ comme intersection de $\symcal{D}_1$ et $\symcal{D}_2$ (le fait que les centres ne soient pas alignés garantit l'existence de $P$) :
+\begin{align*}
+P\in \symcal{D}_1&\implies \symcal{C}_1(P)=\Gamma(P)\text{ et }\\
+P\in \symcal{D}_2&\implies \symcal{C}_2(P)=\Gamma(P),
+\end{align*}
+dont on déduit que $\symcal{C}_1(P)=\symcal{C}_2(P)$. Autrement dit $P\in \Delta$.
+\end{proof}
+%\DinoAfourColorCommand{%
+%\par
+%\vspace{1.5cm}
+%{
+%\centering\LARGE\textcolor{ColorOne}\decoone
+%
+%}
+%}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/recurrence.tex b/Master/texmf-dist/doc/lualatex/tango/examples/recurrence.tex
new file mode 100644
index 00000000000..ee823068c46
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/recurrence.tex
@@ -0,0 +1,189 @@
+% !TEX TS-program = LuaLaTeX
+
+\renewcommand{\theprop}{(\ensuremath{\fnsymbol{prop}})}
+
+\tgotitle{Raisonnement par récurrence}
+%
+\section{Une propriété des entiers naturels}
+La propriété énoncée dans cette section est parfois présentée comme un axiome. Il n'entre toutefois pas dans nos intentions de construire une ou des axiomatiques, ne serait-ce que parce que cette notion est délicate. On se contentera donc d'un point de vue naïf, selon lequel un axiome est un énoncé dont on admet qu'il est vrai. Le lecteur doit toutefois savoir que les énoncés de la propriété~\ref{propppe} et du théorème~\ref{threc} ont des rôles en quelque sorte interchangeables : dans les axiomatiques classiques permettant de fonder l'arithmétique, prendre l'un comme axiome permet de démontrer l'autre comme théorème. Pour cette raison, le lecteur pourra trouver ailleurs des présentations proposant un axiome (ou parfois un principe) de \emph{récurrence}, la propriété~\ref{propppe} devenant alors un théorème.
+\par
+\vspace{0.5\baselineskip}\par
+Nous supposons donc connu l'ensemble $\N$ des entiers naturels, muni notamment d'une relation d'ordre notée ${≤}$ et nous admettons que cet ensemble possède la propriété suivante:
+%
+\begin{prop}
+Toute partie non vide de $\N$ possède un plus petit élément.\label{propppe}
+\end{prop}
+
+On traduit souvent cette propriété en disant que \N{} est \emph{bien ordonné}.
+%x
+%\par\noindent{\color{gray}\rule{\linewidth}{5pt}}\par\addvspace{-3pt}\par\nobreak
+
+%Cette propriété peut être considérée comme un des axiomes qui permettent de décrire l'ensemble \N{} des entiers naturels. Elle peut également se démontrer à partir d'un autre système d'axiomes, de portée équivalente (axiomes de Peano, notamment) ou de portée plus générale (Zermelo-Fraenkel, par exemple).
+
+%\par\noindent\hrulefill
+\section{Récurrence}
+\subsection{Introduction}
+\label{secexplerec}
+La propriété \ref{propppe} permet de formaliser une méthode consistant à établir la validité d'une assertion \frquote{de proche en proche}. Fixons-nous par exemple un réel $a$ strictement positif et, pour tout entier naturel $n$, considérons la propriété $P(n)$
+\[(1+a)^n\geq 1+na.\]
+
+Nous nous proposons de démontrer que cette propriété est vraie pour tout entier naturel~$n$.
+
+Prouvons dans un premier temps que $P(0)$ est vraie (\mbox{c.-à-d.} que si $n=0$ alors $P(n)$ est vraie) : puisqu'il est vrai que $(1+a)^0=1$ et $1+0\times a=1$, il est établi que $(1+a)^0\geq1+0\times a$, donc que $P(0)$ est vraie.
+
+Donnons-nous alors un entier naturel $n$ et supposons que $P(n)$ est vraie. Prouvons alors que nécessairement $P(n+1)$ est vraie :
+\begin{align*}
+(1+a)^n&\geq1+na,\\
+\intertext{soit, en multipliant les deux membres par $1+a$, qui est strictement positif,}
+(1+a)^{n+1}&\geq(1+a)(1+na),\\
+\intertext{d'où}
+(1+a)^{n+1}&\geq 1+(n+1)a+na^2,\\
+\intertext{et enfin}
+(1+a)^{n+1}&\geq 1+(n+1)a,\quad \text{car $na^2\geq0$.}
+\end{align*}
+
+Nous venons d'établir que, pour tout entier naturel $n$, si $P(n)$ est vraie alors $P(n+1)$ est vraie. En termes plus formels :
+\begin{equation}
+\forall n\in\N,\; P(n)\implies P(n+1).
+\label{eqhered}
+\end{equation}
+
+Nous notons maintenant $\symcal{A}$ l'ensemble des valeurs de l'entier naturel $n$ pour lesquelles $P(n)$ \emph{est fausse}. Nous allons prouver \emph{par l'absurde} que $\symcal{A}$ est vide, autrement dit que $P(n)$ est vraie pour tout entier naturel $n$.
+
+Supposons donc que $\symcal{A}$ est non vide. En vertu de la propriété \ref{propppe}, $\symcal{A}$ possède un plus petit élément que nous notons $m$. Puisque $P(0)$ est vraie, on peut affirmer que $0\notin\symcal{A}$ donc que $m>0$, ce qui nous assure que $m-1\in\N$. Le fait que $m-1<m$ nous prouve maintenant que $m-1\notin\symcal{A}$, puisque $m$ est le plus petit élément de $\symcal{A}$. Alors $P(m-1)$ est vraie, ce qui entraîne, d'après la proposition \eqref{eqhered}, que $P(m)$ est vraie également. L'entier $m$ étant élément de $\symcal{A}$ on aboutit à une contradiction. Finalement $\symcal{A}$ est vide et la propriété $P(n)$ est vraie pour tout entier $n$.
+
+\begin{remark}
+On traduit la proposition \eqref{eqhered} en disant que la propriété $P$ est \emph{héréditaire} à partir du rang $0$.
+\end{remark}
+
+\subsection{Un théorème}
+Nous souhaitons maintenant nous éviter le recours direct à la propriété \ref{propppe}, et en particulier un raisonnement par l'absurde nécessitant l'introduction un peu lourde d'une partie telle que $\symcal{A}$. Nous souhaitons également pouvoir facilement établir qu'une propriété est vraie non pas sur \N{} tout entier, mais plutôt pour tout entier supérieur à un entier $n_0$ donné. À cet effet nous formulons maintenant le \emph{théorème de récurrence}, dont la démonstration ne sera pas très différente de celle qui a été faite sur l'exemple de la section \ref{secexplerec}.
+\begin{thm}
+Soit un entier $n_0$ fixé et une propriété $P(n)$ dont l'énoncé dépend d'un entier $n$. Si $P(n_0)$ est vraie et si pour tout entier $n$ supérieur à $n_0$ l'implication
+\[P(n)\implies P(n+1)\]
+est vraie, alors la propriété $P(n)$ est vraie pour tout entier $n$ supérieur à $n_0$.
+\label{threc}
+\end{thm}
+\begin{proof}Considérons une propriété $P(n)$ vérifiant les hypothèses de notre théorème et montrons alors que $P(n)$ est vraie pour tout entier $n\geq n_0$.
+Nous noterons $\symcal{A}$ l'ensemble des entiers naturels $k$ pour lesquels que $P(n_0+k)$ est fausse. Le fait que $P(n_0)$ est vrai se traduit par
+\[
+0\notin\symcal{A}
+\]
+ et plus généralement, pour $n≥n_0$, en remarquant que $n$ peut s'écrire $n_0+(n-n_0)$,
+ \frquote{$P(n)$ est vrai} se traduit par $(n-n_0)\notin\symcal{A}$.
+ En posant $k=n-n_0$, l'hypothèse
+ \begin{align}
+ \forall n≥n_0,\; P(n)&\implies P(n+1)\notag\\
+ \intertext{nous assure donc que}
+ \forall k\in\N,\;k\notin\symcal{A}&\implies(k+1)\notin\symcal{A}. \label{eqheredA}
+ \end{align}
+
+Prouver que la propriété $P(n)$ est vraie pour tout entier $n$ supérieur à $n_0$ revient à prouver que $\symcal{A}$ est vide. Raisonnons par l'absurde et supposons que $\symcal{A}$ est non vide : en vertu de la propriété \ref{propppe}, $\symcal{A}$ possède alors un plus petit élément que nous notons~$m$. Nous savons que $m>0$, puisque $0\notin\symcal{A}$, et cela nous assure que $m-1\in\N$. Le fait que $m-1<m$ nous prouve maintenant que $m-1\notin\symcal{A}$, puisque $m$ est le plus petit élément de $\symcal{A}$. Alors d'après la proposition \eqref{eqheredA}, $m\notin\symcal{A}$, ce qui est en contradiction avec le fait que $m$ est le plus petit élément de $\symcal{A}$. Il est alors établi que la propriété $P(n)$ est vraie pour tout $n≥n_0$.
+ \end{proof}
+%
+\begin{remark}
+Un raisonnement par récurrence consiste donc à appliquer le théorème \ref{threc} pour démontrer qu'une propriété $P(n)$ est vraie pour tout entier $n$ supérieur à un certain entier $n_0$. Il se fait en trois étapes qui doivent, pour la clarté du propos, être suffisamment mises en évidence.
+\begin{enumerate}
+\item \textit{Initialisation :} on établit que $P(n_0)$ est vraie.
+\item \textit{Preuve du caractère héréditaire de la propriété :} on démontre que
+\[
+\forall n≥n_0,\; P(n)\implies P(n+1).
+\]
+\item \textit{Conclusion :} on a ainsi établi par récurrence que $P(n)$ est vraie pour tout $n≥n_0$.
+\end{enumerate}
+\end{remark}
+
+\subsection{Applications et exemples}
+
+\subsubsection{Une somme}
+On se propose de démontrer par récurrence que la somme $S_n$ des $n$ premiers entiers non nuls est égale à $n(n+1)/2$. Par définition on a donc
+\[
+S_n=\sum_{k=1}^n k\;\text{ ou si l'on préfère }\; S_n=1+2+\cdots+n-1+n.
+\]
+On veut démontrer par récurrence que la propriété $P(n)$, définie par
+\[
+S_n=\frac{n(n+1)}{2}\;,
+\]
+est vraie pour tout $n≥1$.
+\begin{enumerate}
+\item \textit{Initialisation :} on a $S_1=1$ et pour $n=1$, $n(n+1)/2=2/2=1$. Donc $P(1)$ est vraie.
+\item \textit{Hérédité :} donnons nous un entier $n≥1$ et supposons que $P(n)$ est vraie.
+Montrons alors que $P(n+1)$ est vraie c'est à dire que $S_{n+1}=((n+1)(n+2))/2$.
+On sait que $S_{n+1}=S_{n}+n+1$, donc
+\begin{align*}
+S_{n+1}&=\frac{n(n+1)}{2}+n+1,\\
+&=\frac{n(n+1)+2(n+1)}{2}\;,\\
+&=\frac{(n+1)(n+2)}{2}\:.
+\end{align*}
+On vient d'établir que $\forall n≥1,\;P(n)\implies P(n+1)$. La propriété $P(n)$ est donc héréditaire à partir du rang $1$.
+\item \textit{Conclusion :} la propriété $P(n)$ est vraie pour tout $n≥1$.
+\[
+\forall n≥1,\;S_n=\frac{n(n+1)}{2}\:.
+\]
+\end{enumerate}
+
+\subsubsection{Une autre somme}
+On se propose cette fois de démontrer par récurrence que la somme $T_n$ des carrés des $n$ premiers entiers non nuls est égale à $\bigl(n(n+1)(2n+1)\bigr)/6$. Par définition on a donc
+\[
+T_n=\sum_{k=1}^n k^2\;\text{ ou si l'on préfère }\; T_n=1^2+2^2+\cdots+(n-1)^2+n^2.
+\]
+On veut démontrer par récurrence que la propriété $P(n)$, définie par
+\[
+T_n=\frac{n(n+1)(2n+1)}{6}\;,
+\]
+est vraie pour tout $n≥1$.
+\begin{enumerate}
+\item \textit{Initialisation :} on a $T_1=1$ et pour $n=1$,
+\[\frac{n(n+1)(2n+1)}{6}=\frac{2\times3}{6}=1.\]
+ Donc $P(1)$ est vraie.
+\item \textit{Hérédité :} donnons nous un entier $n≥1$ et supposons que $P(n)$ est vraie.
+Montrons alors que $P(n+1)$ est vraie c'est à dire que
+\begin{align*}
+T_{n+1}&=\frac{(n+1)\bigl((n+1)+1)(2(n+1)+1\bigr)}{6}\;,\\
+&=\frac{(n+1)(n+2)(2n+3)}{6}\:.
+\end{align*}
+On sait que $T_{n+1}=T_{n}+(n+1)^2$, donc
+\begin{align*}
+T_{n+1}&=\frac{n(n+1)(2n+1)}{6}+(n+1)^2,\\
+&=\frac{n(n+1)(2n+1)+6(n+1)(n+1)}{6}\;,\\
+\intertext{soit, en factorisant $n+1$}
+T_{n+1}&=\frac{(n+1)\bigl(n(2n+1)+6(n+1)\bigr)}{6}\;,\\
+&=\frac{(n+1)(2n^2+n+6n+6)}{6}\;.\\
+\intertext{On remarque alors que $n+6n=7n$, que l'on peut aussi écrire $3n+4n$ d'où}
+T_{n+1}&=\frac{(n+1)(2n^2+3n+4n+6)}{6}\;,\\
+&=\frac{(n+1)\bigl(n(2n+3)+2(2n+3)\bigr)}{6}\;,\\
+&=\frac{(n+1)(n+2)(2n+3)}{6}\:.
+\end{align*}
+On vient d'établir que $\forall n≥1,\;P(n)\implies P(n+1)$. La propriété $P(n)$ est donc héréditaire à partir du rang $1$.
+\item \textit{Conclusion :} la propriété $P(n)$ est vraie pour tout $n≥1$.
+\[
+\forall n≥1,\;T_n=\frac{n(n+1)(2n+1)}{6}\:.
+\]
+\end{enumerate}
+
+\subsubsection{Divisibilité}
+Démontrer par récurrence que, pour tout entier naturel $n$, $n^3+2n$ est un multiple de $3$.
+On veut démontrer par récurrence que la propriété $P(n)$, définie par
+\[
+\exists\, k\in\N \text{ tel que }n^3+2n=3k,
+\]
+est vraie pour tout $n≥0$.
+\begin{enumerate}
+\item \textit{Initialisation :} Si $n=0$, $n^3+2n=0$ qui s'écrit aussi $3\times0$. Donc $P(0)$ est vraie.
+\item \textit{Hérédité :} Donnons nous un entier naturel $n$ et supposons que $P(n)$ est vraie. Montrons alors que $P(n+1)$ est vraie, c.-à-d. que $(n+1)^3+2(n+1)$ est divisible par~$3$.
+\begin{align*}
+(n+1)^3+2(n+1)&=n^3+3n^2+3n+1+2n+2,\\
+&=(n^3+2n)+3(n^2+n+1).
+\end{align*}
+L'hypothèse de récurrence nous dit que $P(n)$ est vraie, donc qu'il existe un entier $k$ tel que \mbox{$n^3+2n=3k$}. Alors
+\[(n+1)^3+2(n+1)=3(k+n^2+n+1),\]
+Ce qui prouve que $(n+1)^3+2(n+1)$ est un multiple de 3.
+
+On vient d'établir que $\forall n\in\N,\;P(n)\implies P(n+1)$. La propriété $P(n)$ est donc héréditaire à partir du rang $0$.
+\item \textit{Conclusion :} la propriété $P(n)$ est vraie pour tout $n\in\N$.
+\[
+\forall n\in\N,\; n^3+2n \text{ est divisible par $3$.}
+\]
+\end{enumerate}
+
+\endinput
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/rel-bin.tex b/Master/texmf-dist/doc/lualatex/tango/examples/rel-bin.tex
new file mode 100644
index 00000000000..ae2633e9d57
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/rel-bin.tex
@@ -0,0 +1,443 @@
+% !TEX TS-program = LuaLaTeX
+%\documentclass[ColorTheme=Red]{dino-iPhone}
+
+\tgotitle{Relations binaires}
+\tgoshorttoc
+\section*{Avertissement}
+{\itshape
+Ce chapitre de la \emph{Mathematica dinosaurorum} a un statut un peu particulier, dans la mesure où il regroupe des notions somme toute assez basiques et que je ne tiens pas à présenter en introduction à d'autres chapitres. Il s'agit donc d'un texte destiné à servir de référence, et pas nécessairement à être lu d'une traite. Les exemples y sont donc peu nombreux, de même que les théorèmes, car tout ceci figure ou figurera dans les chapitres qui font référence à celui-ci.
+
+}
+
+\section{Généralités}
+\subsection{Produit cartésien}
+Deux ensembles $E$ et $F$ étant donnés, on appelle produit cartésien de $E$ et $F$ l'ensemble noté~$E\times F$ des couples $(x,y)$ où $x\in E$ et $y\in F$ :
+\[z\in E\times F \iff \exists\, x \in E, \exists\, y\in F,\;\text{tels que}\; z=(x,y).\]
+
+Dans le cas où $E=F$, on peut noter $E^2$ au lieu de $E\times E$. Ce cas particulier est important : par exemple, l'ensemble des couples des coordonnées des points du plan rapporté à un repère donné est~$\mathbb{R}^2$. On comprend alors que l'ordre de chaque couple est important et qu'il faut distinguer $(x,y)$ et~$(y,x)$, dans le cas de l'exemple qui vient d'être donné, mais aussi d'une façon générale.
+
+Cette notion se généralise à plus de deux ensembles : par exemple~$\R^3$ est l'ensemble~\mbox{$\R\times\R\times\R$} des triplets ordonnés de réels.
+
+\subsection{Parties d'un ensemble}
+On dit qu'un ensemble $X$ est une partie d'un ensemble $E$ si tout élément de $X$ est un élément de $E$. On dit aussi que~$X$ est un sous-ensemble de $E$ ou que $X$ est inclus dans $E$, ce que l'on note $X \subset E$ :
+\[X\subset E \iff \forall x,\; (x\in X\implies x\in E).\]
+
+L'ensemble vide $\emptyset$ et l'ensemble $E$ lui-même sont des parties de $E$, et l'on note~$\Pt{E}$ l'ensemble de toutes les parties de $E$.
+\[X\in \Pt{E}\iff X\subset E.\]
+
+\begin{alert}
+La propriété ci-dessus exprime le fait qu'une inclusion dans $E$ se traduit par une appartenance à $\Pt{E}$. Si $A$ et $B$ sont des parties de $E$, ce sont des \emph{éléments} de $\Pt{E}$, de même que~$\emptyset$ et~$E$. En revanche $\{A\}$, qui est un ensemble admettant pour seul élément la partie $A$ de $E$, est une partie de~$\Pt{E}$ de même que $\{\emptyset\}$ et $\{\emptyset, A, B,E\}$. En tant que parties de $\Pt{E}$, ce sont aussi des éléments de $\Pt{\Pt{E}}$! On notera aussi que l'ensemble vide~$\emptyset$, qui ne contient aucun élément, ne doit pas être confondu avec $\{\emptyset\}$, qui est un ensemble qui contient l'ensemble vide pour seul élément : ces deux ensembles sont des parties de $\Pt{E}$, distinctes l'une de l'autre. Enfin, il apparaît que $\emptyset$ est à la fois un élément et une partie de $\Pt{E}$…
+\end{alert}
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item Si $E=\{a,b\}$, $\Pt{E}=\{\emptyset,\{a\},\{b\},E\}$.
+\item Si $E=\emptyset$, $\Pt{E}=\{\emptyset\}$, $\Pt{\Pt{E}}=\{\emptyset,\{\emptyset\}\}$ et \[\Pt{\Pt{\Pt{E}}}=\{\emptyset,\{\emptyset\},\{\{\emptyset\}\},\{\emptyset,\{\emptyset\}\}\}.\]
+\end{enumerate}
+\end{example}
+
+\subsubsection{Opérations dans l'ensemble des parties}
+On définit l'union (notée $\cup$) et l'intersection (notée $\cap$) de deux parties de $E$ de la façon suivante :
+
+\smallskip\par
+\begin{itemize}
+\item\textit{Union :} $x\in A\cup B \iff ((x\in A)\;\text{ou}\;(x\in B))$.
+\item\textit{Intersection :} $x\in A\cap B \iff ((x\in A)\;\text{et}\;(x\in B))$.
+\end{itemize}
+\smallskip\par
+
+À propos de l'union, on notera qu'en mathématique le mot \frquote{ou} a \emph{toujours} un sens inclusif, c'est-à-dire \frquote{l'un ou l'autre ou les deux}. L'union et l'intersection de deux parties de $E$ sont elles-mêmes des parties de $E$.
+
+De même on définit le complémentaire d'une partie $A$ de $E$ comme étant la partie de $E$ constituée des éléments de $E$ qui n'appartiennent pas à~$A$. Ce complémentaire est noté $E\smallsetminus A$ ou~$\complement_{E} A$. Lorsque qu'il n'y a aucune ambiguïté concernant l'ensemble $E$, on peut même le noter~$\bar{A}$.
+\smallskip\par
+\begin{itemize}
+\item\textit{Complémentaire :} $x\in \complement_E A \iff ((x\in E)\;\text{et}\;(x\notin A))$.
+\end{itemize}
+
+\smallskip
+Enfin on définit également la \emph{différence ensembliste} de deux parties $A$ et $B$ de $E$, notée~$A\smallsetminus B$ comme étant l'ensemble des éléments de $A$ qui ne sont pas éléments de $B$.
+\smallskip\par
+\begin{itemize}
+\item\textit{Différence ensembliste :} $x\in A\smallsetminus B \iff ((x\in A)\;\text{et}\;(x\notin B))$.
+\end{itemize}
+
+\subsubsection{Partition d'un ensemble}
+Soit un ensemble $E$ et $\symcal{C}$ une ensemble de parties de $E$ (c'est-à-dire un sous-ensemble ou encore une partie de $\Pt{E}$), on dit que $\symcal{C}$ est une partition de $E$ si les deux conditions suivantes sont vérifiées :
+\begin{enumerate}
+\item Tout élément de $\symcal{C}$ est non vide.
+\item Tout élément de $E$ appartient à un élément de $\symcal{C}$ et un seul.\label{cond2}
+\end{enumerate}
+
+\begin{remark}On notera que la condition~\ref{cond2} ci-dessus peut s'expliciter en disant que les parties qui constituent $\symcal{C}$ sont deux à deux disjointes (c'est-à-dire d'intersection vide) et que leur réunion est égale à$E$.
+\end{remark}
+
+\subsection{Relation binaire entre deux ensembles}\label{relbin}
+Une \emph{relation binaire} $\symcal{R}$ entre deux ensembles $E$ et $F$ est définie par la donnée d'une partie~$\symcal{G}$ du produit cartésien~$E\times F$ (on a donc $\symcal{G}\in\Pt{E\times F}$). Cette partie, qui est donc un ensemble de couples, est le \emph{graphe} de la relation : par définition, un couple~$(x,y)$ de~$E\times F$ est lié par la relation~$\symcal{R}$ si~$(x,y)\in \symcal{G}$. Donner une relation binaire revient donc à donner son graphe. Si la relation est notée $\symcal{R}$, on écrit $x\mathrel{\symcal{R}}y$ ou $\symcal{R}(x,y)$ pour exprimer que~$x$ et~$y$, dans cet ordre, sont liés par la relation $\symcal{R}$. On a donc pour une relation~$\symcal{R}$ dont le graphe est $\symcal{G}$:
+\[\forall (x,y)\in E\times F, \; x\mathrel{\symcal{R}}y\iff(x,y)\in \symcal{G}.\]
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item L'égalité est une relation binaire qui peut être définie sur tout ensemble $E$. Son graphe est ce que l'on nomme la \emph{diagonale} de $E$, c'est à dire l'ensemble des couples $(x,y)$ de~$E^2$ tels que~$x=y$.
+
+%\item L'ordre strict dans l'ensemble des réels est une relation binaire notée~$<$ (on aurait également pu considérer un ordre large ou l'ordre inverse). Par définition, $x<y$ traduit le fait que $y-x$ est un réel strictement positif :
+%\[\forall (x,y) \in \R^2, \; x<y \iff (y-x)\in \R^{*}_+.\]
+%Le graphe de cette relation peut être représenté par l'ensemble des points du plan repéré dont l'ordonnée est strictement supérieure à l'abscisse, c'est à dire les points situés strictement au dessus de la droite d'équation $y=x$ (première bissectrice du repère).
+%\label{ord-strict}
+%On notera que la \emph{règle des signes}, reposant sur la \emph{partition} de $\R$ en trois ensembles qui sont $\R^*_-$, le singleton $\{0\}$ et $\R^*_+$, préexiste à la définition d'un ordre dans $\R$.
+
+\item Le relation $p$ définie entre $\R$ et $\R_+$ par
+\[\forall (x,y)\in \R\times \R_+,\; p(x,y)\iff y=x^2.\]
+Le graphe de $p$ peut être représenté, dans le demi-plan repéré des points d'ordonnée positive, par la parabole d'équation~$y=x^2$. On notera que cette relation est en réalité une fonction et que la notation $y=p(x)$ aurait été plus habituelle; nous y reviendrons.
+\end{enumerate}
+\end{example}
+
+% Dans le cas d'une
+%relation fonctionnelle (voir \S~\ref{Rfonc} ci-dessous), pour laquelle un seul élément y de $F$ est en relation avec un élément $x$ donné dans $E$, on écrit en général $y=\symcal{R}(x)$.
+%
+
+\section{Relations d'équivalence}
+\subsection{Définition}
+On dit qu'une relation $\symcal{R}$, définie sur $E$ (on se place donc dans le cas où $E=F$) est une relation d'équivalence si elle possède les trois propriétés suivantes :
+\begin{enumerate}
+\item Elle est \emph{réflexive}, c'est-à-dire que tout élément de $E$ est en relation avec lui même :
+\[\forall x \in E,\; x\mathrel{\symcal{R}}x.\]
+\item Elle est \emph{symétrique}:
+\[\forall (x,y)\in E\times E,\; (x\mathrel{\symcal{R}}y \implies y\mathrel{\symcal{R}}x).\]
+\item Elle est \emph{transitive} :
+%\[
+%\forall (x,y,z)\in E^3,\quad \left.\begin{aligned}
+%x&\mathrel{\symcal{R}}y\\
+%&\text{et}\\
+%y&\mathrel{\symcal{R}}z
+%\end{aligned}\right\}
+%\implies x\mathrel{\symcal{R}}z
+%\]
+\[
+\forall (x,y,z)\in E^3,\; \bigl((x\mathrel{\symcal{R}}y\;\text{ et }\;y\mathrel{\symcal{R}}z)\implies x\mathrel{\symcal{R}}z\bigr).
+\]
+\end{enumerate}
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item L'égalité est une relation d'équivalence sur tout ensemble, c'est une conséquence directe de la définition.
+\item Si l'on désigne par $\symfrak{D}$ l'ensemble des droites du plan, le parallélisme est une relation d'équivalence sur $\symfrak{D}$ : c'est immédiat également, on peut noter au passage que la transitivité traduit le fait que \frquote{deux droites parallèles à une même troisième sont parallèles entre elles}.
+\item Pour un ensemble $E$ donné, la relation dont le graphe est $E\times E$ est une relation d'équivalence. Tous les couples d'éléments de $E$ sont donc liés par cette relation.
+\item La relation $\equiv$ définie dans l'ensemble $\Z$ des entiers par
+\[\forall (m,n)\in\Z\times\Z,\; m\equiv n \iff (m-n) \text{ est un entier pair.}\]
+est une relation d'équivalence.
+
+Rappelons qu'un élément $p$ de $\Z$ est un entier pair s'il est divisible par~$2$, c'est-à-dire s'il existe $k$ appartenant à $\Z$ tel que~$p=2k$ et montrons que la relation~$\equiv$ remplit bien les conditions requises :
+\begin{enumerate}
+\item \emph{Réflexivité. — }Soit $m\in\Z$ un entier quelconque : $m-m=0=2\times0$. Donc~$m-m$ est pair. La relation $\equiv$ est réflexive.
+\item \emph{Symétrie. — }Soit $m$ et $n$ deux entiers tels que $m\equiv n$. Alors il existe un entier~$k$ tel que~$m-n=2k$. Il suffit alors d'écrire $n-m=2\times(-k)$ pour constater que $n\equiv m$. La relation~$\equiv$ est symétrique.
+\item\emph{Transitivité. — }Soit $(m,n,p)$ dans $\Z^3$ tels que $m\equiv n$ et $n\equiv p$. Il existe alors deux entiers~$k$ et~$k'$ tels que \mbox{$m-n=2k$} et $n-p=2k'$. Il suffit de remarquer que
+\[m-p=(m-n)+(n-p)=2(k+k'), \text{ où $(k+k')\in\Z$}\]
+pour établir que $m\equiv p$. La relation $\equiv$ est donc transitive.
+\end{enumerate}
+\end{enumerate}
+\end{example}
+%\subsection{Exemples}
+
+\subsection{Classes d'équivalence}
+Soit un ensemble $E$ et une relation d'équivalence $\symcal{R}$ sur$E$. On dit qu'une partie~$A$ de~$E$ est une classe d'équivalence modulo la relation~$\symcal{R}$ s'il existe un élément $x$ de~$E$ tel que~$A$ soit l'ensemble des éléments~$y$ de~$E$ pour lesquels la relation~$x\mathrel{\symcal{R}}y$ est vérifiée. On note alors~$A=\cl_{\symcal{R}} (x)$ ou~$A=\cl (x)$ s'il n'y a pas d'ambiguité.
+\[y\in\cl_{\symcal{R}} (x)\iff x\mathrel{\symcal{R}}y.\]
+
+\begin{thm}
+Soit un ensemble $E$ et une relation d'équivalence $\symcal{R}$ sur $E$. L'ensemble des classes d'équivalence modulo $\symcal{R}$ constitue une partition de $E$.
+\end{thm}
+
+\begin{proof}
+Tout d'abord la réflexivité de la relation $\symcal{R}$ entraîne que pour tout~$x$ appartenant à~$E$,~$x$ appartient à~$\cl(x)$. Par conséquent, tout $x\in E$ appartient à une classe et toute classe est non vide. Il nous reste à prouver que tout élément $x$ de $E$ appartient à une seule classe, c'est à dire que s'il existe un élément $y$ de $E$ tel que $x\in \cl(y)$, alors $\cl(x)=\cl(y)$.
+
+Nous allons procéder par double inclusion.
+\begin{itemize}
+\item Soit donc $y\in E$ tel que $x\in\cl(y)$. On sait que $y\mathrel{\symcal{R}}x$, donc,
+pour tout~$z\in \cl(x)$, on a à la fois $y\mathrel{\symcal{R}}x$ et $x\mathrel{\symcal{R}}z$ : par transitivité on obtient~$y\mathrel{\symcal{R}}z$, soit~$z\in\cl(y)$ :
+\[\forall z\in E, (z\in\cl(x)\implies z\in\cl(y), \text{ donc }\cl (x)\subset\cl (y).\]
+ \item Par symétrie de la relation d'équivalence $\symcal{R}$, on a aussi~$x\mathrel{\symcal{R}}y$. On peut alors refaire le même raisonnement que ci-dessus :
+ pour tout $z$ appartenant à $\cl(y)$ on a à la fois~$x\mathrel{\symcal{R}}y$ et~$y\mathrel{\symcal{R}}z$,
+ donc par transitivité $x\mathrel{\symcal{R}}z$, soit~\mbox{$z\in\cl(x)$} :
+\[\forall z\in E, (z\in\cl(y))\implies z\in\cl(x), \text{ donc }\cl (y)\subset\cl (x).\]
+\item Finalement $\cl(x)=\cl(y)$.\qedhere
+\end{itemize}
+\end{proof}
+
+\begin{remark}
+Réciproquement, toute partition $\symcal{C}$ d'un ensemble $E$ est l'ensemble des classes d'une relation d'équivalence. Il suffit en effet de considérer la relation $\sim$ telle que pour tout~$(x,y)$ dans $E^2$, on ait \textit{$x\sim y$ si $x$ appartient au même élément de $\symcal{C}$ que~$y$}, laquelle répond à la question.
+\end{remark}
+%\end{document}
+%\subsubsection{Notion de structure quotient}
+
+\section{Relations d'ordre}
+\subsection{Définition}
+On dit qu'une relation $\preccurlyeq$, définie sur $E$ (on se place donc ici encore dans le cas où~$E=F$) est une relation d'ordre si elle possède les trois propriétés suivantes :
+\begin{enumerate}
+\item Elle est \emph{réflexive}, c'est-à-dire que tout élément de $E$ est en relation avec lui même :
+\[\forall x \in E,\; x\preccurlyeq x.\]
+\item Elle est \emph{antisymétrique}:
+\[\forall (x,y)\in E\times E,\; \bigl((x\preccurlyeq y)\text{ et }(y\preccurlyeq x)\implies x=y\bigr).\]
+\item Elle est \emph{transitive} :
+%\[
+%\forall (x,y,z)\in E^3,\quad \left.\begin{aligned}
+%x&\mathrel{\symcal{R}}y\\
+%&\text{et}\\
+%y&\mathrel{\symcal{R}}z
+%\end{aligned}\right\}
+%\implies x\mathrel{\symcal{R}}z
+%\]
+\[
+\forall (x,y,z)\in E^3,\; \bigl((x\preccurlyeq y\;\text{ et }\;y\preccurlyeq z)\implies x\preccurlyeq z\bigr).
+\]
+\end{enumerate}
+
+\begin{remark}
+La démonstration du résultat suivant est immédiate.
+
+Une relation d'ordre $\preccurlyeq$ sur un ensemble $E$ étant donnée, la relation~$\succcurlyeq$, définie par
+\[\forall (x,y) \in E^2, x\succcurlyeq y \iff y\preccurlyeq x\,,\]
+est une relation d'ordre sur $\R$ nommée \emph{ordre inverse} de $\preccurlyeq$.
+\end{remark}
+
+%\begin{exemple}[Exemples]
+%\begin{enumerate}
+%\item La relation d'ordre strict sur l'ensemble $\R$ des réels, telle que nous l'avons rencontrée dans l'exemple~\ref{ord-strict} du paragraphe~\ref{relbin} n'est pas une relation d'ordre, car elle n'est pas réflexive. En revanche l'ordre large correspondant, défini par
+%\[\forall (x,y) \in \R^2, \; x\leq y \iff (y-x)\in \R_+\,,\]
+%est bien une relation d'ordre. En effet :
+%\begin{itemize}
+%\item Pour tout $x$ réel, $x-x=0$ et $0\in \R_+$, ce qui assure que la relation~$\leq$ est \emph{réflexive}.
+%\item Pour tout couple de réels $(x,y)$, si $x\leq y$ et $y\leq x$ alors $x=y$. En effet, en effet, $y\leq x$ signifie que $(x-y)\in \R_+$. Le réel $(y-x)$ se retrouve donc appartenir à la fois à $\R_+$ (car $x\leq y$) et à $\R_-$ (en tant qu'opposé de $(x-y)$) ; on en déduit que $y-x=0$ donc que $x=y$. La relation~$\leq$ est donc \emph{antisymétrique}.
+%\item Soit $(x,y,z)\in\R^3$, on a $z-x=(z-y)+(y-x)$. On en déduit que si $x\leq y$ et $y\leq z$, $z-x$ est élément de $\R_+$ et tant que somme de deux éléments de $\R_+$, ce qui revient à dire que $x\leq z$. Le relation~$\leq$ est donc \emph{transitive}.
+%\end{itemize}
+%\end{enumerate}
+%\end{exemple}
+
+\subsection{Ordre dans les ensembles de nombres}
+Les relations usuelles $<$ et $>$, définies sur les ensembles de nombres, \emph{ne sont pas} des relations d'ordre, il est facile de l'établir : ces relations \emph{ne sont pas} réflexives. Il est en revanche plus délicat de démontrer que les relations~$\leq$ et~$\geq$ sont des relations d'ordre, et même de tout simplement définir ces relations.
+ On pourrait songer à définir l'ordre dans $\R$ en disant que~$x\leq y$ si $(y-x)\in \R_{+}$… Mais alors il resterait à définir $\R_{+}$ sans utiliser l'ordre, ce qui ne semble nullement évident. C'est pour cette raison que nous nous contenterons d'affirmer que la relation $\leq$, telle que chacun la connaît, est bien une relation d'ordre sur $\R$ (ainsi d'ailleurs que sur $\N$, $\Z$, $\symbb{D}$ et $\Q$).
+
+%
+\subsection{Un peu de vocabulaire}
+On se donne dans ce paragraphe un ensemble $\symcal{E}$ sur lequel est définie une relation d'ordre~$\preccurlyeq$.
+\subsubsection{Ordre total}
+ On dit que la relation $\preccurlyeq$ définit un ordre total sur $\symcal{E}$ si pour tout couple~$(x,y)$ d'éléments de~$\symcal{E}$, la proposition
+ \XSmartphoneCommand{$\bigl((x\preccurlyeq y)\text{ ou }(y\preccurlyeq x)\bigr)$}
+ \SmartphoneCommand{%
+ \[
+ \bigl((x\preccurlyeq y)\text{ ou }(y\preccurlyeq x)\bigr)
+ \]%
+ }
+ est vraie.
+
+\subsubsection{Majorants, minorants \& C\up{ie}}
+Soit maintenant $\symcal{A}$ une partie de $\symcal{E}$.
+
+\begin{itemize}
+\item On dit qu'un élément $M$ de $\symcal{E}$ est un majorant de $\symcal{A}$, si $\forall x\in \symcal{A},\, x\preccurlyeq M$.
+\item On dit qu'un élément $m$ de $\symcal{E}$ est un minorant de $\symcal{A}$, si $\forall x\in \symcal{A},\, m\preccurlyeq x$.
+\item On dit que $\symcal{A}$ admet $A$ pour plus grand élément si $A\in \symcal{A}$ et si $A$ est un majorant de $\symcal{A}$.
+\item On dit que $\symcal{A}$ admet $a$ pour plus petit élément si $a\in \symcal{A}$ et si $a$ est un minorant de~$\symcal{A}$.
+\end{itemize}
+
+
+
+\begin{remark}
+Dans un ensemble muni d'une relation d'ordre, l'existence d'un majorant, d'un minorant, d'un plus petit ou d'un plus grand élément n'est nullement assurée. On a en revanche le résutat suivant.
+\end{remark}
+
+\begin{thm}
+Soit un ensemble $\symcal{E}$ sur lequel est définie une relation d'ordre $\preccurlyeq$ et soit $\symcal{A}$ une partie de~$\symcal{E}$. Si~$\symcal{A}$ admet une plus grand élément (respectivement un plus petit élément) pour la relation $\preccurlyeq$, ce plus grand élément (respectivement ce plus petit élément) est unique.
+\end{thm}
+\begin{proof}
+Nous proposons la démonstration dans le cas du plus petit élément, celle de l'autre cas est identique. Supposons que~$a$ et~$a'$ soient des plus petits éléments de $\symcal{A}$. D'après la définition d'un plus petit élément, on sait que pour tout~$x$ de~$\symcal{A}$, $a\preccurlyeq x$ et en particulier~\mbox{$a\preccurlyeq a'$}. Et de la même façon, on sait que pour tout $x$ de $\symcal{A}$, $a'\preccurlyeq x$ et en particulier~\mbox{$a'\preccurlyeq a$}. L'antisymétrie de la relation $\preccurlyeq$ nous assure alors que $a=a'$, d'où l'unicité du plus petit élément.
+\end{proof}
+
+Supposons maintenant que $\symcal{A}$ admette $A$ pour plus grand élément et soit $\symcal{M}$ l'ensemble de tous les majorants de $\symcal{A}$. Il va de soi que $\symcal{A}\cap\symcal{M}=\{A\}$. L'élément $A$ apparaît ainsi également comme le plus petit élément de $\symcal{M}$. De la même façon, si $\symcal{A}$ admet un plus petit élément, ce dernier est le plus grand des minorants de $\symcal{A}$.
+
+\begin{alert}
+Dans le cas où $\symcal{A}$ ne possède pas de plus grand élément, il n'est nullement assuré que~$\symcal{M}$ possède un plus petit élément, ni même d'ailleurs que $\symcal{M}$ soit non vide. Néanmoins il est possible que $\symcal{M}$ possède un plus petit élément, et ceci que $\symcal{A}$ possède ou non un plus grand élément. Ce plus petit élément de $\symcal{M}$ est alors par définition la \emph{borne supérieure} de~$\symcal{A}$ dans l'ensemble $\symcal{E}$ ordonné par $\preccurlyeq$.
+\end{alert}
+
+ \section{Applications, fonctions}\label{Rfonc}
+%%%Fonction caractéristique, cardinal de $\symcal{P}(E)$ ou $\symfrak{P}(E)$
+\subsection{Définition}
+On dit qu'une relation binaire $f$ entre deux ensembles $E$ et~$F$ est fonctionnelle ou qu'elle est une \emph{fonction} définie sur~$E$ et à valeurs dans $F$ ou encore une \emph{application} de~$E$ dans $F$ si tout élément $x$ de $E$ est en relation avec un élément~$y$ de~$F$ et un seul. Cet élément $y$ est appelé \emph{image} de~$x$ par~$f$ et noté $f(x)$ (autrement dit on écrit plus volontiers~$y=f(x)$ que~$x \mathrel{f}y$). L'ensemble $E$ est l'ensemble de départ de la fonction et l'ensemble $F$ son ensemble d'arrivée.
+
+Une application est donc déterminée par la donnée de son ensemble de départ, de son ensemble d'arrivée et d'un procédé décrivant une correspondance fonctionnelle entre ces deux ensembles. On note souvent :
+
+\begin{align*}&f\::\;E\to F\;,\quad x\longmapsto f(x)\,.\\
+\intertext{Par exemple :}
+&f\::\;\left]-1,1\right[\to\R\;,\quad x \longmapsto \frac{1}{x^2-1}\;,\\
+\intertext{ou}
+&g\::\;\Z\to\{0,1\}\;,\quad p\longmapsto
+\begin{cases} 0&\text{ si $p$ est pair,}\\
+1&\text{ sinon.}
+\end{cases}
+\end{align*}
+
+Il n'y a pas de distinction entre fonction et application, mais le contexte peut introduire certaines nuances. En effet, lorsque $E$ est une partie de l'ensemble $\R$ des nombres réels, $f(x)$ est souvent donné par une expression, sa valeur étant le résultat d'un calcul. On emploie alors plus volontiers le vocable \emph{fonction} et dans ce cas l'ensemble de départ peut ne pas être précisé et correspond alors à l'ensemble des valeurs de $x$ pour lesquelles le calcul de $f(x)$ est possible. On parle alors plutôt d'ensemble de définition que d'ensemble de départ.
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item Soit la fonction $f$ de la variable réelle $x$, telle que
+\[f(x)=\frac{x}{x^2-4}\;.
+\]
+Déterminons l'ensemble de définition $\symcal{D}_f$ de la fonction $f$. On a
+\begin{align*}
+x\in \symcal{D}_f &\iff x^2-4\neq 0\\
+&\iff x\neq -2 \text{ et } x\neq 2.
+\end{align*}
+
+Donc $\symcal{D}_f= \R\smallsetminus\{-2,2\}$.
+\item Soit la fonction $g$ telle que $g(x)=\sqrt{1-x^2}$. Déterminons l'ensemble de définition de $g$. On a
+\[
+x\in \symcal{D}_g \iff 1-x^2\geq 0.
+\]
+
+Il nous faut donc résoudre l'inéquation $1-x^2\geq0$. Le polynôme $1-x^2$ admet les nombres~$-1$ et~$1$ pour racines et le coefficient de $x^2$ est négatif :~\mbox{$1-x^2$} est donc positif dans l'intervalle des racines (on pourra consulter le volet consacré aux polynômes du second degré).
+
+Donc $\symcal{D}_g= \left[-1,1\right]$.
+\end{enumerate}
+\end{example}
+
+\subsection{Antécédents, surjections, injections \& bijections}
+\subsubsection{Notion d'antécédent}
+Soit une application $f$ de $E$ dans $F$ et soit~$b$ élément de~$F$. On dit qu'un élément~$a$ de~$E$ est un \emph{antécédent} de $b$ si $f(a)=b$, autrement dit si~$b$ est l'image de~$a$ par $f$.
+Alors que la définition d'une fonction entraîne que l'image d'un quelconque élément de $E$ existe et est unique, dans le cas d'une recherche d'antécédent, rien de ce genre n'est assuré.
+
+Considérons par exemple la fonction \emph{carré} définie par
+\[f\::\;\R\to\R\;,\quad x\longmapsto f(x)=x^2 \]
+et recherchons les antécédents par $f$ d'un élément~$y$ de~$\R$, c.-à-d. les solutions de l'équation d'inconnue~$x$ :~\mbox{$x^2=y$}.
+\begin{itemize}
+\item \textit{Si $y>0$} : $y$ admet deux antécédents qui sont $\sqrt{y}$ et $-\sqrt{y}$.
+\item \textit{Si $y=0$} : le seul antécédent de $0$ est $0$.
+\item \textit{Si $y<0$} : $y$ ne possède aucun antécédent.
+\end{itemize}
+\begin{remark}
+Il faut remarquer ici que la connaissance précise des ensembles de départ et d'arrivée est indispensable à la recherche des antécédents. Considérons la fonction
+\[g\::\;\R_+\to\R_+\;,\quad x\longmapsto g(x)=x^2. \]
+Les expressions de $g(x)$ et de $f(x)$ sont parfaitement identiques, mais, contrairement à ce que nous venons d'étudier pour la fonction $f$, dans le cas de la fonction $g$ tout élément~$y$ de l'ensemble d'arrivée possède un antécédent unique qui est $\sqrt{y}$.
+\end{remark}
+\subsubsection{Surjections, injections et bijections}
+\begin{remark}[Surjections]
+On dit qu'une application $f$ de $E$ dans $F$ est \emph{surjective} (ou encore que~$f$ est une \emph{surjection}) si tout élément de $F$ possède au moins un antécédent dans~$E$.
+\end{remark}
+\begin{remark}[Injections]
+On dit qu'une application $f$ de $E$ dans $F$ est \emph{injective} (ou encore que $f$ est une \emph{injection}) ou encore si deux éléments distincts quelconques de $E$, ont des images distinctes. De façon plus formelle,~\mbox{$f\::\;E\to F$} est injective si
+\begin{gather}\forall(x,y)\in E\times E, \;\bigl(x\neq y\implies f(x)\neq f(y)\bigr).\label{condinj1}\\
+\intertext{Ou, par contraposition, $f\::\;E\to F$ est injective si}
+\forall(x,y)\in E\times E, \;\bigl(f(x)= f(y)\implies x=y\bigr).\label{condinj2}
+\end{gather}
+
+On peut dire également que $f$ est injective si et seulement si tout élément de $F$ possède au plus un antécédent dans~$E$.
+\end{remark}
+
+\begin{remark}[Bijections]
+On dit qu'une application $f$ de $E$ dans $F$ est \emph{bijective} (ou encore que $f$ est une \emph{bijection}) si tout élément de $F$ possède un antécédent dans $E$ et un seul, autrement dit si $f$ est à la fois surjective et injective.
+
+Si l'application $f\::\;E\to F$ est bijective, l'application qui à tout élément de $F$ associe son unique antécédent dans $E$ est évidemment bijective : c'est la \emph{bijection réciproque} de~$f$, notée~$f^{-1}$.
+\end{remark}
+\begin{example}[Exemples]
+\begin{enumerate}
+\item \label{phi} Soit l'application
+\[
+\phi\::\;\R\smallsetminus\{1\}\to\R\,,\quad x\longmapsto \frac{2x}{x-1}\;.
+\]
+
+Donnons-nous un réel $y$ quelconque et recherchons ses antécédents, qui sont les solutions dans $\R\smallsetminus\{1\}$ de l'équation $\phi(x)=y$, que nous résolvons ici :
+\begin{align*}
+\frac{2x}{x-1}=y &\iff 2x=y(x-1)\text{ et } x\neq 1\,,\\
+&\iff x(2-y)=-y\text{ et } x\neq 1\,,\\
+&\iff x(y-2)=y\text{ et } x\neq 1\,.
+\end{align*}
+\begin{itemize}
+\item\textit{Si $y=2$}, l'équation est équivalente à $0=2$ et n'a donc pas de solution. Le réel $2$ n'a pas d'antécédent par $\phi$.
+\item\textit{Si $y\neq 2$}, l'équation admet \[x=\frac{y}{y-2}\] pour unique solution (il est clair en effet que $y/(y-2)$ ne peut être égal à $1$).
+\end{itemize}
+
+
+En résumé, le réel $2$ ne possède aucun antécédent et les réels différents de $2$ possèdent un antécédent et un seul. L'application $\phi$ est donc injective, mais n'est pas surjective.
+\item Soit maintenant l'application
+\[
+\psi\::\;\R\smallsetminus\{1\}\to\R\smallsetminus\{2\}\,,\quad x\longmapsto \frac{2x}{x-1}\;.
+\]
+
+On notera que les applications $\phi$ et $\psi$ ne diffèrent que par leur ensemble d'arrivée. Cependant, l'étude faite ci-dessus en \ref{phi} prouve que $\psi$ est bijective et que sa bijection réciproque est
+\[
+\psi^{-1}\::\;\R\smallsetminus\{2\}\to\R\smallsetminus\{1\}\,,\quad x\longmapsto \frac{x}{x-2}\;.
+\]
+\item L'application $\theta$ définie par
+\[
+\theta\::\;\R\to\R\,,\quad x\longmapsto x^2-1
+\]
+n'est ni injective ni surjective. En effet $\theta(x)$ est nul si et seulement si $x^2=1$, c.-à-d si et seulement si $x=-1$ ou $x=1$ : le réel $0$ possède donc deux antécedents pour $\theta$. Par ailleurs, pour tout réel~$x$,~$x^2\geq0$, donc $\theta(x)\geq-1$ : le réel $-2$, par exemple, ne possède aucun antécédent par $\theta$.
+\end{enumerate}
+\end{example}
+\subsection{Composée de deux applications}
+
+Soit deux applications $f\::\;E\to F$ et $g\::\;F\to G$, on appelle \emph{application composée de~$f$ par~$g$} et on note $g\rond f$ l'application de $E$ dans $G$ définie par :
+\[g\rond f\::\; E\to G\,,\quad x\longmapsto g\rond f(x) = g\bigl(f(x)\bigr).\]
+
+Notons qu'il est important pour définir $g\rond f$ que l'ensemble d'arrivée de $f$ coïncide avec l'ensemble de départ de~$g$.
+
+\begin{example}
+Soit
+\[
+f\::\;\R^*\to\R\,,\; x\mapsto \frac1x\;\text{ et }\;g\::\:\R\to\R\,,\; x\mapsto x^2+1\,.
+\]
+Déterminons $g\rond f$ qui est une application de $\R^*$ dans $\R$.
+
+On a pour tout $x\in\R^*$,
+\begin{align*}
+g\rond f(x) &= g\bigl(f(x)\bigr),\\
+&={\bigl(f(x)\bigr)}^2+1,\\
+&={\left(\frac1x\right)}^2+1,\\
+\intertext{ou, en réduisant au même dénominateur,}
+g\rond f(x)&= \frac{1+x^2}{x^2}\;.
+\end{align*}
+\begin{remark}
+On notera que la même lettre $x$ intervient dans les définitions de~$f$ et~$g$. Il s'agit bien sûr d'une lettre muette, qui pourrait dans chaque cas être remplacée par n'importe quelle autre lettre (en évitant tout de même les lettres $f$ et $g$!).
+\end{remark}
+\end{example}
+
+\begin{thm}Soit deux applications $f\::\;E\to F$ et $g\::\;F\to G$. Si $f$ et $g$ sont des bijections, alors l'application composée $g\rond f$ est une bijection dont la bijection réciproque est $f^{-1}\rond g^{-1}$.
+\end{thm}
+
+\begin{proof}
+Soit deux bijections $f\::\;E\to F$ et $g\::\;F\to G$. % et un élément $a$ de $E$.
+%Si $a$ est un antécédent de $b$ par $g\rond f$, on a $g\rond f(a)=c$, soit $g\bigl(f(a)\bigr)=c$.
+\begin{enumerate}
+\item\label{gofsurj} Donnons nous un élément $c$ quelconque de $G$. Les applications~$g$ et~$f$ étant surjectives, $c$ possède un antécédent~$b$ par $g$ et $b$ possède lui-même un antécédent $a$ par $f$. On a alors
+\[g\rond f(a) =g\bigl(f(a)\bigr)=g(b)=c.\]
+L'élément $c$ admet $a$ pour antécédent par $g\rond f$ qui est donc est donc application surjective.
+\item Supposons maintenant qu'il existe un élément $c$ de $G$ et $a$ et $a'$ éléments de $E$ tels que~$g\rond f(a)=g\rond f(a')$. Alors $g\bigl(f(a)\bigr)=g\bigl(f(a')\bigr)$ et puisque $g$ est injective on a, d'après la proposition \eqref{condinj2} p.~\pageref{condinj2}, $f(a) = f(a')$; l'application $f$ étant elle-même injective, on obtient finalement~$a=a'$. On a donc prouvé que
+\[\forall(a,a')\in E\times E, \;\bigl(g\rond f(a)= g\rond f(a')\implies a=a'\bigr),\]
+autrement dit que $g\rond f$ est injective.
+\item L'application $g\rond f$ est donc surjective et injective : elle est bijective. On remarque alors en employant les notations du point \ref{gofsurj} ci-dessus \mbox{que $a=f^{-1}(b)$} et $b=g^{-1}(c)$, \mbox{d'où $a=f^{-1}\bigl(g^{-1}(c)\bigr)$}, ce qui achève la démonstration en prouvant que
+\[{\bigl(g\rond f\bigr)}^{-1}=f^{-1}\rond g^{-1}.\qedhere\]
+\end{enumerate}
+\end{proof}
+
+\begin{remark}
+La réciproque de ce théorème est fausse. Considérons par exemple les applications suivantes :
+\[
+f\::\;\R_+\to\R\,,\; x\mapsto \sqrt{x}\;\text{ et }\;g\::\;\R\to\R_+\,,\; x\mapsto x^2.
+\]
+Pour tout réel $x$ positif, on a $g\bigl(f(x)\bigr)=\bigl(\sqrt{x}\bigr)^2=x$, par définition de la racine carrée. Par conséquent, on a
+\[g\rond f \::\;\R_+\to\R_+\,,\quad x\longmapsto x,\]
+qui est à l'évidence une bijection. Cependant, $f$ n'est pas surjective (les nombres strictement négatifs n'ont pas d'antécédent) et $g$ n'est pas injective (deux nombres opposés non nuls ont la même image).
+\end{remark}
+
+On a néanmoins le théorème suivant:
+\begin{thm}
+Soit deux applications $f\::\;E\to F$ et $g\::\;F\to G$. Si $g\rond f$ est injective, $f$ est injective. Si $g\rond f$ est surjective, $g$ est surjective.
+\end{thm}
+
+\begin{proof}
+\begin{itemize}
+\item Supposons $g\rond f$ injective et soit $x$ et $y$ éléments de $E$ tels que~\mbox{$f(x)=f(y)$}. Montrons que nécessairement $x=y$, ce qui établira que~$f$ est injective.
+
+Puisque $f(x)=f(y)$, $g\bigl(f(x)\bigr)=g\bigl(f(y)\bigr)$, soit $g\rond f(x)=g\rond f(y)$ : on en déduit que~$x=y$, car $g\rond f$ est injective par hypothèse. Par conséquent~$f$ est injective.
+\item Supposons $g\rond f$ surjective et soit $z$ un élément de $G$. L'application~$g\rond f$ étant surjective, il existe un élément $x$ de $E$ tel que $g\rond f(x)=z$, soit~$g\bigl(f(x)\bigr)=z$. L'élément~$z$ admet donc $f(x)$ pour antécédent par $g$, ce qui prouve que~$g$ est surjective. \qedhere
+\end{itemize}
+\end{proof}
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/tango/examples/schoolwork.tex b/Master/texmf-dist/doc/lualatex/tango/examples/schoolwork.tex
new file mode 100644
index 00000000000..9ea9f9a2f0b
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/examples/schoolwork.tex
@@ -0,0 +1,238 @@
+% !TEX TS-program = LuaLaTeX
+\documentclass[french,no-indent,FontSize=11pt]{tango}
+\usepackage{numprint}
+%
+\NewCommandCopy{\np}{\numprint}
+%
+\newcommand\headcontentL{}
+\newcommand\headcontentC{}
+\newcommand\headcontentR{}
+\newcommand\footcontentL{}
+\newcommand\footcontentC{}
+\newcommand\footcontentR{}
+\newlength\SWruleheight
+\setlength\SWruleheight{0.4pt}
+\NewDocumentCommand\headL{m}{\renewcommand\headcontentL%
+{\sffamily\fontseries{l}\selectfont#1}}
+%
+\NewDocumentCommand\headC{m}{\renewcommand\headcontentC%
+{\sffamily\fontseries{l}\selectfont#1}}
+%
+\NewDocumentCommand\headR{m}{\renewcommand\headcontentR%
+{\sffamily\fontseries{l}\selectfont#1}}
+%
+\NewDocumentCommand\footL{m}{\renewcommand\footcontentL%
+{\sffamily\fontseries{l}\selectfont#1}}
+%
+\NewDocumentCommand\footC{m}{\renewcommand\footcontentC%
+{\sffamily\fontseries{l}\selectfont#1}}
+%
+%
+\NewDocumentCommand\footR{m}{\renewcommand\footcontentR%
+{\sffamily\fontseries{l}\selectfont#1}}
+%
+\newpagestyle{schoolwork}{%
+\setheadrule{\SWruleheight}%
+\setfootrule{\SWruleheight}%
+\sethead{\headcontentL}%
+{\headcontentC}%
+{\headcontentR}%
+\setfoot{\footcontentL}%
+{\footcontentC}%
+{\footcontentR}
+}
+
+
+\headL{Le 13 novembre 2024}
+\headC{Entraînement au Devoir Commun \no 1}
+\headR{Durée : 2 heures}
+\footL{Lycée Jean-Baptiste \textsc{Colbert}}
+\footC{Classe de 1\iere~3}
+\footR{page~\thepage}
+%
+%
+\pagestyle{schoolwork}
+\geometry{top=2cm,outer=2cm,bottom=2cm,inner=2cm,headheight=18pt,headsep=25pt,footskip=34pt}
+
+\begin{document}
+
+
+\exo[Thème : suites — 4 points]
+
+
+On considère la suite $\left(u_n\right)$ définie par $u_0 = \numprint{10000}$ et pour tout entier naturel $n$
+\[u_{n+1} = 0{,}95u_n + 200.\]
+
+\begin{enumerate}
+\item Calculer $u_1$ et vérifier que $u_2 = \np{9415}$.
+\item
+ \begin{enumerate}
+ \item Démontrer, à l'aide d'un raisonnement par récurrence, que pour tout entier naturel $n$
+\[u_n >\np{4000}.\]
+\item Démontrer que la suite $\left(u_n\right)$ est décroissante. \end{enumerate}
+\item Pour tout entier naturel $n$, on considère la suite $\left(v_n\right)$ définie par $v_n = u_n - \np{4000}$.
+ \begin{enumerate}
+ \item Calculer $v_0$.
+ \item Démontrer que la suite $\left(v_n\right)$ est géométrique de raison égale à $0{,}95$.
+ \item En déduire que pour tout entier naturel $n$ :
+\[u_n = \np{4000} + \np{6000} \times 0{,}95^n.\]
+ \item Émettre une conjecture quant à la limite de la suite $\left(u_n\right)$ ?
+ \end{enumerate}
+\item En 2020, une espèce animale comptait \np{10000} individus. L'évolution observée les années précédentes conduit à estimer qu'à partir de l'année 2021, cette population baissera de 5~\% chaque début d'année.
+
+Pour ralentir cette baisse, il a été décidé de réintroduire $200$ individus à la fin de chaque année, à partir de 2021.
+
+Une responsable d'une association soutenant cette stratégie affirme que : \og l'espèce ne devrait pas s'éteindre, mais malheureusement, nous n'empêcherons pas une disparition de plus de la moitié de la population \fg.
+
+Que pensez-vous de cette affirmation ? Justifier la réponse.
+\end{enumerate}
+
+
+
+\exo[Thème : probablités — 4 points]
+
+Selon les autorités sanitaires d'un pays, 7~\% des habitants sont affectés par une certaine maladie.
+
+Dans ce pays, un test est mis au point pour détecter cette maladie. Ce test a les caractéristiques suivantes :
+\begin{itemize}
+\item Pour les individus malades, le test donne un résultat négatif dans $20 \,\%$ des cas ;
+\item Pour les individus sains, le test donne un résultat positif dans $1\,\%$ des cas.
+\end{itemize}
+
+Une personne est choisie au hasard dans la population et testée.
+
+On considère les événements suivants :
+\begin{itemize}
+\item $M$ : \og la personne est malade \fg{} ;
+\item $T$ : \og le test est positif \fg{}.
+\end{itemize}
+
+\begin{enumerate}
+\item Calculer la probabilité de l'événement $M \cap T$. On pourra s'appuyer sur un arbre pondéré.
+\item Démontrer que la probabilité que le test de la personne choisie au hasard soit positif, est de $\np{0,0653}$.
+\item On considère dans cette question que la personne choisie au hasard a eu un test positif.
+Quelle est la probabilité qu'elle soit malade ? On arrondira le résultat à $10^{-2}$.
+\item On choisit des personnes au hasard dans la population. La taille de la population de ce pays permet d'assimiler ce prélèvement à un tirage avec remise.
+
+On note $X$ la variable aléatoire qui donne le nombre d'individus ayant un test positif parmi les 10 personnes.
+ \begin{enumerate}
+ \item Préciser la nature et les paramètres de la loi de probabilité suivie par $X$.
+ \item Déterminer la probabilité pour qu'exactement deux personnes aient un test positif. On arrondira le résultat à $10^{-2}$ près.
+ \end{enumerate}
+\end{enumerate}
+
+\exo[Thème : géométrie dans l'espace — 2 points]
+
+
+
+Dans l'espace rapporté à un repère orthonormé $(O,\vec\imath,\vec\jmath,\vec k)$ , on considère les points
+\[A(-1,-1,3),\qquad B(1,1,2),\qquad C(1,-1,7).\]
+
+On considère également la droite $\Delta$ passant par les points $D(-1,6,8)$ et $E(11,- 9,2)$.
+
+Pour chacune des questions posées, quatre affirmations \textbf{dont une seule est correcte} sont proposées.
+Entourer la bonne réponse directement sur l'énoncé.
+
+Aucune justification n'est attendue.
+
+Une réponse correcte apporte 0,5 point. Une réponse incorrecte ou une absence de réponse n'enlève pas de point.
+
+
+ \begin{enumerate}
+ \item Une représentation paramétrique de la droite $\Delta$ est
+\medskip
+
+\textbf{a.} $\left\{
+ \begin{aligned}
+ x&= -1 + 11t\\
+ y&= 6 - 9t\\
+ z&= 8 +2t\\
+ \end{aligned} \right.~(t \in \symbb{R})$
+ \hfill
+\textbf{b.} $\left\{
+ \begin{aligned}
+ x&= -1 + 4t\\
+ y&= 6 - 5t\\
+ z&= 8 -2t\\
+ \end{aligned} \right.~(t \in \symbb{R})$
+ \hfill
+\textbf{c.} $\left\{
+ \begin{aligned}
+ x&= 11 -t\\
+ y&= - 9+6t\\
+ z&= 2 +8t\\
+ \end{aligned} \right.~(t \in \symbb{R})$
+ \hfill
+ \textbf{d.}
+ $\left\{
+ \begin{aligned}
+ x&= 4 -t\\
+ y&= -5 +6t\\
+ z&= -2 + 8 t\\
+ \end{aligned} \right.~(t \in \symbb{R})$\hfill\null
+
+\bigskip
+
+ \item Lequel de ces points appartient-il à la droite $\Delta$ ?
+
+\medskip
+
+ \textbf{a.} Le point $F(-3,1,6)$
+ \hfill \textbf{b.} Le point $G (5,\:-1{,}5,\:5)$
+ \hfill \textbf{c.} Le point $H (10,-3,10)$
+ \hfill \textbf{d.} Le point $K (12,-15,-6)$
+
+\bigskip
+
+ \item Pour savoir si les points $A$, $B$ et $C$ définissent un plan, il faut vérifier que $\overrightarrow{AB}$ et $\overrightarrow{AC}$ :
+
+\medskip
+
+ \textbf{a.} sont colinéaires.
+ \hfill \textbf{b.} sont coplanaires.
+ \hfill \textbf{c.} ne sont pas colinéaires.
+ \hfill \textbf{d.} ne sont pas coplanaires.
+
+\bigskip
+
+ \item La droite $\Delta$ et le plan (ABC) :
+
+\medskip
+
+ \begin{tabular}{ll}
+ \textbf{a.} sont strictement parallèles.
+ &\textbf{b.} ont une infinité de points communs.\\[12pt]
+ \textbf{c.} sont sécants en $I(-13,21,14)$
+ &\textbf{d.} sont sécants en $J(3,1,6)$
+ \end{tabular}
+
+ \bigskip
+
+\item Les droites $\delta$ et $\delta'$ de représentations paramétriques respectives :
+
+ $ \delta : \left\{
+ \begin{aligned}
+ x&= -1 + 11k\\
+ y&= 6 - 9k\\
+ z&= 8 +2k\\
+ \end{aligned} \right.~(k \in \symbb{R})$
+ \quad et\quad $\delta' : \left\{
+ \begin{aligned}
+ x&= 11 -\ell\\
+ y&= - 9+6\ell\\
+ z&= 2 +8\ell\\
+ \end{aligned} \right.~(\ell \in \symbb{R})$\quad sont :
+
+ \medskip
+
+ \begin{tabular}{ll}
+ \textbf{a.} sécantes au point de coordonnées $(1,1,1)$.
+ & \textbf{b.} sécantes au point de coordonnées $(-12,15,6)$.\\[12pt]
+ \textbf{c.} sécantes en un autre point
+ &\textbf{d.} non sécantes.
+ \end{tabular}
+
+
+\end{enumerate}
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/lualatex/tango/tango-en.pdf b/Master/texmf-dist/doc/lualatex/tango/tango-en.pdf
new file mode 100644
index 00000000000..d7969f1cb58
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/tango-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/tango/tango-en.tex b/Master/texmf-dist/doc/lualatex/tango/tango-en.tex
new file mode 100644
index 00000000000..bf7995ef176
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/tango-en.tex
@@ -0,0 +1,753 @@
+% !TEX TS-program = LuaLaTeX
+\documentclass[english,ColorTheme=Red,FontSize=10pt]{tango}
+%\setmonofont{Latin Modern Mono}[Scale=MatchUppercase]
+\usepackage{longtable,csquotes,lipsum,tcolorbox}
+\usepackage[dvipsnames]{xcolor}
+\newcommand\DO[1]{\textcolor{ColorOne}{\bfseries #1}}
+\newcommand\TO[1]{\textsf{#1}}
+%%
+\NewDocumentCommand\showtheme{m}
+{{\tgosetup{ColorTheme=#1}
+\parbox{2.1cm}{\centering
+\textsf{#1\rule[-3pt]{0pt}{10pt}}\\
+\colorbox{ColorOne}{\parbox{1.5cm}{\rule[-5pt]{0pt}{15pt}}}
+\par
+\colorbox{ColorTwo}{\parbox{1.5cm}{\rule[-5pt]{0pt}{15pt}}}
+\par
+}}}
+%
+%\tgosmartlists
+\renewtgolabels1{\lefthand}
+\definecolor{ColorThree}{rgb}{0.93,0.95,0.97}
+\tcbset{colback=ColorTwo,colframe=ColorTwo,sharp corners}
+\frenchspacing
+%\setcounter{section}{88}
+\begin{document}
+
+\renewcommand{\arraystretch}{1.1}
+\title{\textcolor{ColorOne}{\floweroneleft}\,The tango document class\,\textcolor{ColorOne}{\floweroneright}}
+\author{\href{mailto:michel.bovani@icloud.com}{Michel \textsc{Bovani}}\\
+Tango web page: \href{https://tango.mathriochka.net}{https://tango.mathriochka.net}}
+\date{\today\\v. 0.8.0}
+{\sffamily
+\maketitle
+
+}
+\thispagestyle{empty}
+
+\tgoshorttoc
+\section{What the tango document class is}
+
+
+Tango is a Latex document class (\verb=\documentclass[<options>]{tango}=) for use by mathematics teachers (roughly speaking, from high school to undergraduate level). It makes it possible to typeset several types of documents, from the short handout to the complete textbook. The \enquote{maths dedicated aspect} essentially consists in:
+\begin{itemize}
+\item loading maths packages;
+\item offering dedicated commands and environments for statements (definitions, propositions, theorems…), exercises, numbering.
+\end{itemize}
+
+Tango is reasonably configurable, even if certain choices are imposed: mandatory use of lualatex, opentype fonts and recent installation, in particular. The tango class defines eight output formats, five of which are suitable for tablets, e-readers and smartphones; a system currently under development can be used to introduce a particular input for a given output format (for example, forcing a page break for the A5 format only). Finally, the tango class can be used for projects of a more general nature than maths lessons: science courses, but even more general usage with some extra configuration effort (see the Candide directory in the examples).
+
+Another class of documents for presenting school work (training exercises, test or exam subjects) will soon be available, called \enquote{bravo}.
+
+
+
+
+\section{Options overview}
+Please note that the table below only lists the options actually managed by the tango class. Other options, if used when calling the class, can simply be passed to certain packages. This is the case, for example, with the babel language options, or the \TO{math-style} option, which is systematically passed to the \TO{unicode-math} package.
+
+Default values are in bold red. Bold options marked with a \TO{\textbf{star*}} can be used in the preamble and in the body of the document with the \verb=\tgosetup{}= command: for example, in order to change the colors inside the document, you can use \verb+\tgosetup{ColorTheme=Navy}+. Other options can only be mentioned when the tango class is called.
+
+
+\begin{longtable}{p{0.23\linewidth}p{0.7\linewidth}}
+\caption[]{The tango class options}\\
+\textbf{Option}&\textbf{Usage}\\
+\hline\endhead
+\hline\multicolumn{2}{r}{\emph{Continued next page}}\endfoot
+\hline\endlastfoot
+
+\hline
+\TO{%
+french, english, british, american, canadian, australian, newzealand, german, ngerman, naustrian, nswissgerman, italian, spanish}.& Tango will transmit all language options to the \TO{babel} package. However, the translation of specific names used by tango (such as theorem, exercise, etc.) is only guaranteed for the languages listed opposite. Please note that even English speakers must \emph{imperatively} pass a language option to tango.
+
+See section~\ref{lang} below.\\
+\hline
+\TO{no-statement}&\TO{no-statement=true/\DO{false}}. The \TO{thm}, \TO{defin}, \TO{lem}, \TO{coro}, \TO{propo} environments (for theorems, definitions, lemmas, corollaries, propositions) are defined by default. The no-statement option allows you to define them later, on request (see \verb=\newstatement= and \verb=\renewstatement= commands in section~\ref{st-section} page~\pageref{st-section}).\\
+\hline
+\TO{no-hyperref}&\TO{no-hyperref=true/\DO{false}}. If you're only planning a single paper output….\\
+\hline
+\TO{no-indent/indent}&\TO{no-indent=true/\DO{false}}. Indents are present by default. The option \TO{noindent} (meaning \TO{no-indent = true}) returns us to the left margin. The \TO{indent} option also exists, but is not very useful!\\
+\hline
+\TO{no-titleindent}/\TO{titleindent}&Title indents are present by default only in French (because in French typography, the first paragraph after a title must be indented: so I prefer in this case the titles to be indented too). You can use no-tiltleindent in French and titleindent in English to change the default behavior. These options must be called after the language options.\\
+\hline
+\TO{\textbf{ThmNamePos*}}&\TO{ThmNamePos=<value>} where \TO{<value>} can be \TO{\DO{left}} or \TO{right}. The name of the statement (Theorem, Definition, etc.) is displayed to the left or right of the box.\\
+\hline
+\TO{PubliClass}&\TO{PubliClass=<value>} where \TO{<value>} can be \TO{\DO{article}} or \TO{book}. Indicates the base document class used (Latex standard \TO{article} document class or Latex standard \TO{book} document class.) The tango class is designed so that short handouts or monographs composed with the \TO{article} version can then be grouped together as chapters in the same volume with the \TO{book} version. See the \texttt{mathematics} directory in the \texttt{examples} documentation. With the \TO{article} version, the \verb=\part= and \verb=\tableofontents= commands are disabled. The \verb=\tgoshorttoc= command can be used to obtain a summary at the beginning of a monograph.\\
+\hline
+\TO{oneside/twoside}& The option \TO{twoside} makes recto/verso, \TO{oneside} simply makes recto. The default is \TO{\DO{oneside}}. For now, there's no adjustment of inner and outer margins with twoside but it's easy to adapt it to your needs with the \verb=\geometry= command in the preamble. Note that one may prefer \TO{twoside=false} to \TO{oneside} (why not?).\\
+\hline
+\TO{FontSize}&\TO{FontSize=<value>} where \TO{<value>} can be \TO{9pt}, \TO{\DO{10pt}}, \TO{11pt} ou \TO{12pt}.\\
+\hline
+\TO{\textbf{ColorTheme*}}&\TO{ColorTheme=<value>} where \TO{<value>} can be \TO{Blue, Navy, USAF, Azur, Red, Framboise, Brique, Sienne, Caramel, Olive, Tannen, \DO{GrayGray}, BlackAndWhite, Ink} or \TO{Steel}. These values are worth trying out: each defines a set of two colors, one solid (ColorOne) for titles and one very light (ColorTwo) for box backgrounds.\\
+\hline
+\TO{\textbf{ColorOne*}/\textbf{ColorTwo*}}& These options allow the user to define the colors of a personal theme separately; the argument must be a suitable argument for \verb=\definecolor=. See xcolor package (loaded without options by the tango class) documentation.
+\begin{example}[Examples]
+ \begin{itemize}
+ \item\TO{ColorOne=}\verb={rgb}{0.75,0.1,0.05}=
+ \item\TO{ColorOne=}\verb={cmyk}{0,0.8,0.8,0.2}=
+ \item\TO{ColorTwo=}\verb={{rgb}{0.75,0.96,0.75}}= (note that external braces may be used, but are not mandatory).
+\end{itemize}
+\end{example}
+\\
+\hline
+\TO{\textbf{ColorOneNamed*}} / \\
+\TO{\textbf{ColorTwoNamed*}}&
+These options allow the user to define the colors of a personal theme separately; the argument must be a suitable argument for \verb=\colorlet=. See xcolor package (loaded without options by the tango class) documentation.
+\begin{example}[Examples]
+ \begin{itemize}
+ \item\TO{ColorOneNamed=}\verb={red!70!blue}=
+\item\TO{ColorTwoNamed=}\verb={yellow!12}=
+ \end{itemize}
+\end{example}
+If you want to use a predefined set of colors, say \TO{dvipsnames}, you may reload the \TO{xcolor} package with the \TO{dvipsnames} option in your preamble, and then use the \verb=\tgosetup= command:
+\begin{itemize}
+\item \verb+\tgosetup{ColorOneNamed={RedOrange!80!BrickRed}}+
+ \end{itemize}
+\\
+\hline
+\TO{Output}&\TO{Output=<value>} where \TO{<value>} can be \TO{\DO{A4paper}, Letter, A5paper, BigTablet, Tablet, SmallTablet, eReader} or \TO{Smartphone}. \TO{BigTablet}, \TO{Tablet} and \TO{SmallTablet} correspond to 13-, 11- and 8.5-inch screens respectively. \TO{eReader} is for a 6-inch e-reader. It should be noted that in the case of \TO{eReader} and \TO{Smartphone}, the requested format is larger than the actual format, so that the font sizes are much smaller than required. So the \TO{FontSize=9pt} option produces a result on their screens that may be difficult to read.\\
+\hline
+ \TO{Numbers}& \TO{Numbers=<value>} where \TO{<value>} can be \TO{TextOldStyle, OldStyle, MathOldStyle, FullOldstyle}. If you don't ask for anything, you get the \enquote{lining} numbers.
+\begin{itemize}
+\item \TO{Numbers=TextOldStyle} activates oldstyle (or lower-case) digits (like these {\olddigits 0123456789}) of the erewhon font (basic text font) for the entire document.
+\item \TO{Numbers=OldStyle} activates oldsyle (or lower-case) digits for all text fonts used in the document.
+\item \TO{Numbers=MathOldStyle} activates lower-case digits only in mathematics (I can't think of any good reason to do this!).
+\item \TO{Numbers=FullOldStyle} activates lower-case digits for all text fonts as well as for mathematics.
+\end{itemize}
+It should be noted that it is always possible to switch locally from the digits selected with this option to one of their variants (for example, section titles are systematically numbered using \enquote{lining} digits, since these titles are themselves capitalized).\\
+\hline
+\TO{StylisticSet}&\TO{StylisticSet=\{<value1>, <value2>,…\}} where \TO{<value1>, <value2>,} etc. are to be taken from \TO{upint, leqslant, smaller, subsetneq} and \TO{parallelslant}. These options concern the Erewhon-Math font, which is a (very) extended opentype version by Daniel \textsc{Flipo} of the math fonts of the Fourier-Gutenberg system. For more information, see the Erewhon-Math documentation (\verb=texdoc erewhon-math= in any good terminal).\\
+\hline
+\TO{CharacterVariant}&\TO{CharacterVariant=\{<value1>, <value2>,…\}} where \TO{<value1>, <value2>,} etc. can be chosen from \TO{zero, hslash, emptyset, epsilon, kappa, pi, phi, rho, sigma, theta, partial, Ecal, Qcal} and \TO{Tcal}. These options concern the Erewhon-Math font, which is a (very) extended opentype version by Daniel \textsc{Flipo} of the math fonts of the Fourier-Gutenberg system. For more information, see the Erewhon-Math documentation (\verb=texdoc erewhon-math= in any good terminal).\end{longtable}
+
+%\medskip
+
+\section{Packages loaded by the tango document class}
+I only mention here the packages directly loaded by the tango class. Each of these packages can in turn load others...
+\begin{itemize}
+\item \verb=\RequirePackage{xcolor}=. The \TO{xcolor} package is used by the tango class to define the colors of the various themes. It is called without any options, but you can reload it in the preamble of your document with options such as \TO{dvipsnames}, \TO{svgnames} or \TO{x11names}.
+\item\verb=\RequirePackage{mathtools}=. The \TO{mathtools} package loads the \TO{amsmath} package, to which it adds a complement.
+\item\verb=\RequirePackage{geometry}=. Used by the tango class in order to define the page design of the various outputs formats. You can use the \verb=\geometry=. command in the document preamble to modify this layout.
+\item\verb=\RequirePackage{enumitem}=. Used by the tango class to configure the various \TO{list}-based environments in its own way (see section~\ref{lists}). These settings can be modified by the user in the preamble.
+\item\verb=\RequirePackage{titletoc}=. Used by the tango class to fix the table of contents appearance which can be modified by the user in the preamble.
+\item\verb=\RequirePackage[pagestyles,toctitles,newlinetospace,clearempty]{titlesec}=. Used by the tango class to configure the appearance of titles at different levels. This can be modified by the user in the preamble. The default English version adds the \TO{noindentafter} option.
+\item\verb=\RequirePackage{ccaption,caption}=. Used by the tango class to configure the captions appearance for figures and tables. (See section~\ref{figtable}).
+\item\verb=\RequirePackage{fontspec}\RequirePackage{unicode-math}=. The tango class requires \TO{lualatex}, opentype fonts, and Unicode settings.
+\item\verb=\RequirePackage{fourier-orns}=. See the section~\ref{fnts} below.
+\item\verb=\RequirePackage{iflang}=. Used by tango to send a class error message if no language option is given.
+\item\verb=\RequirePackage{babel}=. The babel package is called without options. It is up to you to pass babel options to the tango class. See section~\ref{lang} below.
+\item\verb+\RequirePackage[colorlinks,linkcolor=ColorOne,urlcolor=ColorOne]{hyperref}+. This \TO{hyperref} configuration can be modified using the \verb=\hypersetup= command in your preamble. You can also use the \TO{no-hyperref} option.
+\item\verb=\RequirePackage{array,graphicx,microtype,numprint,float,afterpage}=. These packages are provided but not explicitly used by tango.
+\end{itemize}
+
+
+\section{Fonts}\label{fnts}
+
+\subsection{The tango font system}
+Tango's main font is Erewhon, an opentype version of Utopia (a PostScript type~1 font which was designed in 1989 by Robert \textsc{Slimbach} and once donated by Adobe to the X-consortium and featured on TeXlive). Unlike Utopia, Erewhon, designed by Michael \textsc{Sharpe}, covers a large number of languages and offers a wide range of functions, available through opentype features. It should be noted that Adobe distributes a commercial opentype version of Utopia, which is less rich in glyphs than Erewhon, but has an intermediate font-weight and optical character sizes.
+
+The tango mathematical font is Erewhon~Math, a scientific complement to Erewhon designed by Daniel \textsc{Flipo}. Erewhon Math is in a way the opentype counterpart of Fourier-GUTenberg, the scientific complement to Utopia type~1 designed by me in 2002. Erewhon~Math offers a large number of functions made accessible by Daniel through the \TO{fourier-otf} package. The tango class does not load \TO{fourier-otf}, but uses all its functions through a system of options.
+
+The sans-serif font of the tango system is Noto Sans, scaled. Noto Sans is a sans-serif font for text in Latin, Cyrillic and Greek characters, with multiple weights and widths.
+
+The main (chapter) title font is Roboto Condensed Bold (as a condensed version of Noto Sans is not available on TeXlive).
+
+The monospaced font is Inconsolatazi4, scaled.
+
+Finally, tango calls the \TO{fourier-orns} package, a symbols and logos complement to the fourier system which has now an opentype version.
+
+\subsection{Replacing the tango font system}
+It is, of course, possible to use the \TO{fontspec} \verb=\setmainfont=, \verb=\setsansfont= and \verb=\setmonofont= commands and the \TO{unicode-math} \verb=\setmathfont= command in the preamble in order to modify the parameters of the tango class: this is not advisable, in my humble opinion. But one day there will probably be another class in the tango distribution which will use another font system. Such a document class could be called charlie, or foxtrot or zulu….
+
+\subsection{Font commands and text font commands}
+Here, I call \enquote{Font commands} commands whose scope can only be limited by a group or an environment. I call \enquote{Text font commands}, on the other hand, commands whose scope is limited to their argument, which must not contain a paragraph break. For example, \verb=\bfseries= is a \enquote{font command} and \verb=\textbf= is a \enquote{text font command}. Here is what is provided by tango (see table~\ref{otfcmd}, \pageref{otfcmd}). All these commands should work with Erewhon and with Noto Sans as well.
+\begin{table}[ht]
+\XTabletCommand{\centering\setlength\tabcolsep{9pt}}
+\TabletCommand{\centering}
+\caption{Tango opentype commands}\label{otfcmd}
+\ifTgoTabletOutput\begin{tabular}{l | l | l | l}%
+\else
+\begin{tabular}{llll}%
+\fi
+\hline
+\multicolumn{1}{c}{\textsf{\bfseries Command}}&
+\multicolumn{1}{c}{\textsf{\bfseries Nature}}&
+\multicolumn{1}{c}{\textsf{\bfseries Example}}&
+\multicolumn{1}{c}{\textsf{\bfseries Result}}\\
+\hline
+\verb=\superiors=&\textsf{font command} & \verb=M{\superiors rs}=&M{\superiors rs}\\
+\hline
+\verb=\scinferiors=&\textsf{font command} &\verb={\scinferiors C6H12O3}= &{\scinferiors C6H12O3}\\
+\hline
+\verb=\smartfracs=&\textsf{font command} &\verb=2{\smartfracs1/3}= &2{\smartfracs1/3} \\
+\hline
+\verb=\fullsc=&\textsf{text font command} &\verb=\fullsc{Chapter}= &\fullsc{Chapter} \\
+\hline
+\verb=\textsup=&\textsf{text font command} &\verb=M\textsup{rs}=&M\textsup{rs} \\
+\hline
+\verb=\textscinf=&\textsf{text font command} &\verb=\textscinf{C6H12O3}= &\textscinf{C6H12O3} \\
+\hline
+\verb=\smartfrac=&\textsf{text font command} &\verb=2\smartfrac{3/4}= &2\smartfrac{3/4} \\
+\hline
+\verb=\olddigits=&\textsf{font command} &\verb={\olddigits01234}= &{\olddigits01234} \\
+\hline
+\verb=\liningdigits=&\textsf{font command} &\verb={\olddigits01\liningdigits01}= &{\olddigits01\liningdigits01} \\
+\hline
+\verb=\propdigits=&\textsf{font command} &\verb={\propdigits011\olddigits011}= &{\propdigits011\olddigits011} \\
+\hline
+\verb=\tabulardigits=&\textsf{font command} &\verb={\tabulardigits011\olddigits011}= &{\tabulardigits011\olddigits011} \\
+\hline
+\end{tabular}
+
+
+\end{table}
+
+
+\section{Using tango}
+
+\subsection{Generalities}
+The tango interface is not so different from that of the standard \TO{article} and \TO{book} document classes. Configuration is essentially a matter of choosing options.
+
+For advanced use, it is useful to refer to the documentation for the various packages: first, of course, \TO{unicode-math}, \TO{fontspec}, \TO{mathtools} and \TO{amsmath}. But if you want to change the style of titles, for example, you could take a look at the \TO{titlesec} documentation, and to change the style of lists (enumerate, itemize, etc.), take a look at \TO{enumitem}. The \TO{geometry} package is essential for anyone wanting to obtain a particular layout. And so on.
+\subsection{Modified standard commands}
+Since documents designed with the \TO{article} option can become chapters in a book composed later with the \TO{book} option, the \verb+\part+ command inherited from the \TO{article} class has been deactivated (only for article-typeset documents)
+
+Similarly, the \TO{article} version benefits from a \verb+\tgotitle+ command that lets you define the main title of the document. The \verb+\tgotitle*+ version exists but does nothing more or less than the unstarred command. However, in the \TO{book} version, \verb+\tgotitle+ is an alias for \verb+\chapter+ (and \verb+\tgotitle*+ is an alias for \verb+\chapter*+), so the unnumbered title of a handout very easily becomes the numbered title of a chapter in a book. This, of course, assumes that the \verb+\includeonly+/\verb+\include+ mechanism is used... A model (currently written in French) is provided in the \TO{examples} directory.
+
+The command \verb+\tableofcontents+ can only be used with the \TO{book} option; it is deactivated with the \TO{article} option: in this case, you have to use \verb+\tgoshorttoc+ instead (of course \verb+\tgoshorttoc+ is in turn deactivated in the \TO{book} version). Note that, if you need multiple or partial tocs, you have to use a dedicated package.
+
+\subsection{Using two or more output formats}
+What I'm describing here is still rudimentary and experimental. It will be developed further if it proves successful.
+
+For each output format, two particular commands are provided. For example, in case of the \TO{Smartphone} output option, you have \verb+\SmartphoneCommand+ and \verb+\XSmartphoneCommand+. The \verb+\SmartphoneCommand+ argument is only taken into account if \TO{Output=Smartphone} have been used. Conversely, the \verb+\XSmartphoneCommand+ argument is only taken into account if this option has not been used.
+\begin{example}[Examples]
+\begin{itemize}
+\item \verb+\SmartphoneCommand{\pagebreak}+ asks for a page break only for the smartphone output.
+\item \verb+\XSmartphoneCommand{\[< long math formula >\]}+
+\par \verb+\SmartphoneCommand{\begin{multline*}<split formula>\end{multine*}}+
+\par asks for a multline version of a formula only for the smartphone output
+\end{itemize}
+\end{example}
+
+Provided commands are:
+\begin{itemize}
+\item\verb+\AfourCommand+ and \verb+\XAfourCommand+ for the A4 format;
+\item\verb+\LetterCommand+ and \verb+\XLetterCommand+ for the letter format;
+\item\verb+\AfiveCommand+ and \verb+\XAfiveCommand+ for the A5 format;
+\item\verb+\BigTabletCommand+ and \verb+\XBigTabletCommand+ for the big tablet format;
+\item\verb+\TabletCommand+ and \verb+\XTabletCommand+ for the tablet format;
+\item\verb+\SmallTabletCommand+ and \verb+\XSmallTabletCommand+ for the small tablet format;
+\item\verb+\eReaderCommand+ and \verb+\XeReaderCommand+ for the e-reader format;
+\item\verb+\SmartphoneCommand+ and \verb+\XSmartphoneCommand+ for the smartphone format.
+\end{itemize}
+\subsection{All the color themes}
+\indent\par
+\hspace*{0pt}\hfil\showtheme{Blue}\hfil\showtheme{Azur}\hfil\showtheme{Navy}\hfil\showtheme{USAF}\hfil%
+\showtheme{Framboise}\hfil\null
+\par\bigskip\par
+\hspace*{0pt}\hfil\showtheme{Red}\hfil\showtheme{Brique}\hfil\showtheme{Caramel}\hfil\showtheme{Sienne}\hfil\showtheme{Olive}\hfil\null
+\par\bigskip\par
+\hspace*{0pt}\hfil\showtheme{Tannen}\hfil\showtheme{GrayGray}\hfil\showtheme{Steel}\hfil\showtheme{Ink}\hfil\showtheme{BlackAndWhite}\hfil\null
+
+\section{Language settings}\label{lang}
+A language option \emph{must} be passed to the \TO{babel} package via the tango class: this is true \emph{even} for English-speaking people. A class error message will be generated otherwise. If you ignore this message you will get no hyphenation patterns at all!
+
+Tango also has some reserved words, which are (when an english language option is passed to tango):\begin{verbatim}
+\newcommand\TgoTheoremName{Theorem}
+\newcommand\TgoDefinitionName{Definition}
+\newcommand\TgoPropositionName{Proposition}
+\newcommand\TgoLemmaName{Lemma}
+\newcommand\TgoCorollaryName{Corollary}
+\newcommand\TgoRemarkName{Remark}
+\newcommand\TgoExampleName{Example}
+\newcommand\TgoContentsName{Contents}
+\newcommand\TgoExerciseName{Exercise}
+\newcommand\TgoExercisesSubsectionName{Exercises}
+\newcommand\TgoExercisesSectionName{Exercises}
+\end{verbatim}
+
+Although any language option recognized by babel will (in principle) be taken into account as soon as it is passed to tango, the translation of these reserved words only happens for the following languages:
+\begin{itemize}
+\item\TO{french};
+\item\TO{english, british, american, canadian, australian, newzealand};
+\item\TO{german, ngerman, naustrian, nswissgerman};
+\item\TO{italian};
+\item\TO{spanish}.
+\end{itemize}
+
+Other languages benefit from babel's facilities, but tango's reserved words are not translated.
+So here's what concerned users can do.
+
+\begin{enumerate}
+\item Translate these names in your language (for now it is done only for the french language), using \verb+\renewcommand+.
+\item (Better) Mail me all the necessary information (at least babel language option used and your translation of the tango names) and I will adapt the tango class to your language.
+\end{enumerate}
+\section{Statements}\label{st-section}
+
+\subsection{Predefined statements}
+The environments offered by the tango document class for the statements were defined using the \verb+\newstatement+ command, whose syntax is:
+\begin{tcolorbox}
+\begin{verbatim}
+\newstatement{<environment>}{<counter>}{<statement-name>}[<optionnal-font-command>]
+\end{verbatim}
+\end{tcolorbox}
+For example, the \TO{thm}, \TO{defin}, \TO{propo}, \TO{coro} and \TO{lem} environments have been defined using something like:
+\begin{tcolorbox}
+\begin{verbatim}
+\newcounter{thm} \newstatement{thm}{thm}{Theorem}[\itshape]
+\newcounter{defin} \newstatement{defin}{defin}{Definition}
+\newcounter{propo} \newstatement{propo}{propo}{Proposition}[\itshape]
+\newcounter{coro} \newstatement{coro}{coro}{Corollary}
+\newcounter{lem} \newstatement{lem}{lem}{Lemma}
+\end{verbatim}
+\end{tcolorbox}
+
+
+If you type:
+
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{propo}
+The sum of two odd integers is an even integer.
+\end{propo}
+\begin{thm}[pons asinorum]
+The angles at the base of an isosceles triangle are equal.
+\end{thm}
+\end{verbatim}
+\end{tcolorbox}
+
+you will obtain:
+\begin{propo}
+The sum of two odd integers is an even integer.
+\end{propo}
+\begin{thm}[pons asinorum]
+The angles at the base of an isosceles triangle are equal.
+\end{thm}
+
+As you can see, each statement defined with \verb+\newstatement+ has an optional bracketed argument (which is displayed within parentheses after the statement name and number). Please, note that these environments should not be used inside a \TO{list}-based environment (like center, quote, enumerate, itemize…).
+
+For each statement defined with \verb+\newstatement+ there is also
+\begin{itemize}
+\item a starred form with no statement number:
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{coro*}
+The angles at the base of an isosceles triangle are equal.
+\end{coro*}
+\end{verbatim}
+\end{tcolorbox}
+\end{itemize}
+\begin{coro*}
+The angles at the base of an isosceles triangle are equal.
+\end{coro*}
+\begin{itemize}
+\item and an optional first argument delimited with \verb+< >+ to replace locally the full theorem name.
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{thm*}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with
+complex coefficients has at least one complex root.
+\end{thm*}
+\end{verbatim}
+\end{tcolorbox}
+\end{itemize}
+\begin{thm*}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with complex coefficients has at least one complex root.
+\end{thm*}
+
+\subsection{Defining your own statements}
+If you need a new statement type, say an axm environment for axioms, it's easy:
+\begin{tcolorbox}
+\begin{verbatim}
+\newcounter{axio} \newstatement{axm}{axio}{Axiom}
+\end{verbatim}
+\end{tcolorbox}
+Note that it is up to you to define the counter for this new environment: if this counter does not still exist, it has to be created with \verb+\newcounter+. Of course, the counter name may be different from the environment name. If you have used the \TO{no-statement} option, you will have to define all the statements you need, with the environment names you prefer.
+
+\subsection{Redefining existing statements}
+The \verb+\newstatement+ command has a \verb+\renewstatement+ companion to redefine existing statement environment. Precisely, you need to use \verb+\renewstatement{foo}…+ instead of \verb+\newstatement{foo}…+ if and only if the \verb+foo+ environment has already been defined.
+
+\begin{example}[Examples]
+\begin{enumerate}
+\item You can redefine the \TO{propo} environment in such a way that it uses the same counter as the \TO{thm} environment and is displayed in the upright font:
+\begin{tcolorbox}
+\begin{verbatim}
+\renewstatement{propo}{thm}{Proposition}
+\setcounter{thm}{0}
+\begin{propo}
+The sum of two odd integers is an even integer.
+\end{propo}
+\begin{thm}
+The angles at the base of an isosceles triangle are equal.
+\end{thm}
+\end{verbatim}
+\end{tcolorbox}
+\end{enumerate}
+\renewstatement{propo}{thm}{Proposition}
+\setcounter{thm}{0}
+\begin{propo}
+The sum of two odd integers is an even integer.
+\end{propo}
+\begin{thm}
+The angles at the base of an isosceles triangle are equal.
+\end{thm}
+
+\begin{enumerate}[resume]
+\item If you have already written \emph{all} your algebra book in Latex, with propositions, theorems and corollaries and you realize that, \emph{now}, you want there is no more difference between propositions, theorems and corollaries: the three types of statements should be typeset in italic, named \enquote{Proposition} and numbered with the same counter, you can just use in your preamble:
+
+\begin{tcolorbox}
+\begin{verbatim}
+\renewstatement{coro}{thm}{Proposition}[\itshape]
+\renewstatement{propo}{thm}{Proposition}[\itshape]
+\renewstatement{thm}{thm}{Proposition}[\itshape]
+\setcounter{thm}{0}
+\begin{propo}
+The sum of two odd integers is an even integer.
+\end{propo}
+\begin{thm}
+The sum of two even integers is an even integer.
+\end{thm}
+\begin{coro}
+If two integers have the same parity, their sum is even.
+\end{coro}
+\end{verbatim}
+\end{tcolorbox}
+and you will get
+
+\end{enumerate}
+\renewstatement{coro}{thm}{Proposition}[\itshape]
+\renewstatement{propo}{thm}{Proposition}[\itshape]
+\renewstatement{thm}{thm}{Proposition}[\itshape]
+\setcounter{thm}{0}
+\begin{propo}
+The sum of two odd integers is an even integer.
+\end{propo}
+\begin{thm}
+The sum of two even integers is an even integer.
+\end{thm}
+\begin{coro}
+If two integers have the same parity, their sum is even.
+\end{coro}
+
+
+instead of
+
+\setcounter{thm}{0}\setcounter{propo}{0}
+\renewstatement{thm}{thm}{Theorem}[\itshape]
+\renewstatement{propo}{propo}{Proposition}[\itshape]
+\renewstatement{coro}{coro}{Corollary}
+\begin{propo}
+The sum of two odd integers is an even integer.
+\end{propo}
+\begin{thm}
+The sum of two even integers is an even integer.
+\end{thm}
+\begin{coro}
+If two integers have the same parity, their sum is even.
+\end{coro}
+\begin{enumerate}[resume]
+\item And finally \verb+\renewstatement+ and \verb+\newstatement+ have a starred form with which statement numbers are displayed \emph{before} the statement name. More, if the statement counter is the subsection or subsubsection counter, the concerned statement titles are displayed in the same form and placement as subsection or subsubsection titles; of course the placement depends on the value of \TO{notitleindent}.
+\begin{tcolorbox}
+\begin{verbatim}
+\renewstatement*{thm}{thm}{Theorem}
+\begin{thm}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with
+complex coefficients has at least one complex root.
+\end{thm}
+\renewstatement*{thm}{subsection}{Theorem}[\itshape]
+\begin{thm}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with
+complex coefficients has at least one complex root.
+\end{thm}
+\renewstatement*{thm}{subsubsection}{Theorem}
+\begin{thm}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with
+complex coefficients has at least one complex root.
+\end{thm}
+\end{verbatim}
+\end{tcolorbox}
+\end{enumerate}
+\end{example}
+\renewstatement*{thm}{thm}{Theorem}
+\begin{thm}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with complex coefficients has
+at least one complex root.
+\end{thm}
+\renewstatement*{thm}{subsection}{Theorem}[\itshape]
+\begin{thm}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with complex coefficients has
+at least one complex root.
+\end{thm}
+\renewstatement*{thm}{subsubsection}{Theorem}
+\begin{thm}<D'Alembert-Gauss theorem>[fundamental theorem of algebra]
+Every non-constant single-variable polynomial with complex coefficients has
+at least one complex root.
+\end{thm}
+
+
+
+\section{Exercises}
+\subsection{Typesetting exercises}
+Tango provides the \verb+\exo+ command which lets you typeset a numbered exercise (the counter is \TO{tgoexo}). There is a starred version, which is not numbered. As for the statements, the bracketed option provides a complementary title between parenthesis and the \enquote{\TO{< >}} marked first option provides a substitution title.
+\begin{tcolorbox}
+\begin{verbatim}
+\exo
+Prove that if $G$ is a finite group and $H$ a subgroup of $G$,
+then the order of $H$ divides the order of $G$.
+\exo[Lagrange theorem]
+Prove that if $G$ is a finite group and $H$ a subgroup of $G$,
+then the order of $H$ divides the order of $G$.
+\end{verbatim}
+\end{tcolorbox}
+\exo
+Prove that if $G$ is a finite group and $H$ a subgroup of $G$, then the order of $H$ divides the order of $G$.
+\exo[Lagrange theorem]
+Prove that if $G$ is a finite group and $H$ a subgroup of $G$,
+then the order of $H$ divides the order of $G$.
+\begin{tcolorbox}
+\begin{verbatim}
+\newcommand\tgostar{\raisebox{-0.5ex}{\large\textborn}}
+\exo*<Chinese remainder problem>[\tgostar\tgostar\tgostar]
+Let $n_1,\ldots, n_k$ be integers greater than $1$ and let us denote by $N$
+the product of the $n_i$. Prove that if the $n_i are pairwise coprime, and if
+$a_1,\ldots, a_k$ are any integers, then the system
+\begin{align*}
+x&\equiv a_1 \pmod{n_1}\\
+&\!\vdots\\
+x&\equiv a_k \pmod{n_k}
+\end{align*}
+has a solution, and any two solutions are congruent modulo $N$.
+\end{verbatim}
+\end{tcolorbox}
+\newcommand\tgostar{\raisebox{-0.5ex}{\large\textborn}}
+\exo*<Chinese remainder problem>[\tgostar\tgostar\tgostar]
+Let $n_1,\ldots, n_k$ be integers greater than $1$ and let us denote by $N$ the product of the $n_i$.
+Prove that if the $n_i$ are pairwise coprime, and if $a_1,\ldots, a_k$ are any integers, then the system
+\begin{align*}
+x&\equiv a_1 \pmod{n_1}\\
+&\!\vdots\\
+x&\equiv a_k \pmod{n_k}
+\end{align*}
+has a solution, and any two solutions are congruent modulo $N$.
+\subsection{The secexo and chapexo environments}
+These environments are designed to present a part devoted to exercises at the end of a section (in the case of \TO{secexo}) or a chapter (in the case of \TO{chapexo}). Within these environments, you can use the command \verb+\exo+
+
+The title, in capitals and centred, is \enquote{EXERCISES} by default. The optional argument in square brackets allows you to choose another. This title is added to the table of contents.
+
+Finally, there is a starred form (\verb+\begin{secexo*)+…\verb+\end{secexo*}+ which allows you to compose the exercises within these sections in a smaller font size (exept if the main font size is nine points).
+
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{secexo*}[Example of an exercises subsection]
+\exo Prove that the sum of two even integers is an even integer.
+\exo Prove that the sum of two odd integers is an even integer.
+\end{secexo*}
+\end{verbatim}
+\end{tcolorbox}
+\begin{secexo*}[Example of an exercises subsection]
+\exo Prove that the sum of two even integers is an even integer.
+\exo Prove that the sum of two odd integers is an even integer.
+\end{secexo*}
+
+\section{Lists}\label{lists}
+\subsection{General principles}
+All the horizontal motion in tango is performed in steps equal to an integer multiple of the \verb+\TgoStandardMargin+ length parameter. When the tango class is loaded, the value of this parameter is set to 1.5em, as are paragraph indentation and title indentation (unless these two values are fixed to zero). Successive labels in the enumerate and itemize environments are therefore successively positioned at 1.5em, 3em, 4.5em, etc. from the main margin. It could be unadvised to change these settings (or this should be done using the enumitem package).
+\subsection{List based environments}
+There are two main lists configurations. The first, active by default, is set with \verb+\tgostandardlists+; the second is set with \verb+\tgosmartlists+.
+%
+With \verb+\tgostandardlists+ the text corresponding to a given level is shifted to the right (by a value equal to \verb+\TgoStandardMargin+...) with respect to the corresponding label.
+%
+With \verb+\tgosmartlists+, conversely, the text corresponding to a given level is shifted to the left (by a value equal to \verb+\TgoStandardMargin+...) in relation to the corresponding label.
+\renewtgolabels*\tgostandardlists
+
+Here is the default behaviour of the \TO{itemize} environment (\TO{enumerate} is not different).
+\begin{itemize}
+\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\begin{itemize}
+\item Integer sapien est, iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\begin{itemize}
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+\begin{itemize}
+\item Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\end{itemize}
+\item Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan eleifend, sagittis quis, diam.
+\end{itemize}\end{itemize}
+\item Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\end{itemize}
+
+\bigskip
+
+And now with \verb+\tgosmartlists+ \tgosmartlists
+\begin{itemize}
+\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\begin{itemize}
+\item Integer sapien est, iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\begin{itemize}
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+\begin{itemize}
+\item Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\end{itemize}
+\item Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan eleifend, sagittis quis, diam.
+\end{itemize}\end{itemize}
+\item Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\end{itemize}
+
+Note that \verb+\tgosmartlists+ seems most interesting when you use mainly the first level of these environments.
+Since the \verb+\tgosmartlists+ doesn't support very well a construction like
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{enumerate}
+\item\begin{enumerate}\item
+…
+\end{verbatim}
+\end{tcolorbox}
+that is frequent in exercises questions,
+the \TO{secexo} and \TO{chapexo} environments set locally the lists to \verb+\tgostandardlists+. It is not the case with the \verb+\exo+ command which has no local context. \tgostandardlists
+
+\subsection{Redefining labels of itemize lists}
+Tango provides a \verb+\renewtgolabels+ command which permits to modify the labels of the \TO{itemize} environment. Arguments are numbered from 1 to 4 (there is four levels of itemize lists in Latex) and must be used like in the examples below.
+\begin{example}[Examples]
+\begin{itemize}
+\item\verb=\renewtgolabels1{\lefthand}= will replace the first label by the \verb=\lefthand= symbol.
+\renewtgolabels1{\lefthand}
+\item\verb=\renewtgolabels4{\textbullet}1{\openbullet}3{\textemdash}= changes the label for the first (again), the third and the fourth levels. Level 2 remains unchanged. As you can see, the order of the arguments is unimportant. \renewtgolabels4{\textbullet}1{\openbullet}3{\textemdash}
+\end{itemize}
+\end{example}
+
+There is also a starred form that restore the initial label (as at the load of the class) which are \verb=\textbullet=, \textbullet, for the level 1, \verb=\textopenbullet=, \textopenbullet, for the level 2, \verb=\starredbullet=, \starredbullet, for the level 3 and \verb=\textperiodcentered=, \textperiodcentered{} for the level 4 (note that this is the tango default, but \emph{not} the Latex default).
+
+\renewtgolabels*
+\begin{example}[Examples]
+\begin{itemize}
+\item\verb=\renewtgolabels*= restore all the initial values.
+\item\verb=\renewtgolabels*2{\textendash}= restore initial values except for the second level which is changed to \textendash.
+\end{itemize}
+\end{example}
+
+
+\section{Other environments}
+In addition to the statements environments, the tango class offers the following environments:
+\subsection{The remark and example environments}
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{remark}
+This is a very good remark.
+\end{remark}
+\begin{example}
+This is a very short example.
+\end{example}
+\end{verbatim}
+\end{tcolorbox}
+\begin{remark}
+This is a very good remark.
+\end{remark}
+\begin{example}
+This is a very short example.
+\end{example}
+
+These two environments have a bracketed optional argument which displays a replacement title. For example:
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{example}[Remarks]
+\begin{enumerate}
+\item A first (very good) remark.
+\item A second remark (which is best, if possible).
+\end{enumerate}
+\end{example}
+\end{verbatim}
+\end{tcolorbox}
+\begin{example}[Remarks]
+\begin{enumerate}
+\item A first (very good) remark.
+\item A second remark (which is best, if possible).
+\end{enumerate}
+\end{example}
+
+\subsection{The alert environment}
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{alert}
+You should not even try to use \verb+\expandafter\expandafter\expandafter+
+unless you are actually a very experimented \TeX{} user, because you could get
+a terrible headhache.
+\end{alert}
+\end{verbatim}
+\end{tcolorbox}
+\begin{alert}
+ You should not even try to use \verb+\expandafter\expandafter\expandafter+
+unless you are actually a very experimented \TeX{} user, because you could get
+a terrible headhache.
+\end{alert}
+
+The \TO{alert} environment also support an optional bracketed argument.
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{alert}[\bomb]
+You should not even try to use \verb+\expandafter\expandafter\expandafter+
+unless you are actually a very experimented \TeX{} user, because you could get
+a terrible headhache.
+\end{alert}
+\end{verbatim}
+\end{tcolorbox}
+\begin{alert}[\bomb]
+ You should not even try to use \verb+\expandafter\expandafter\expandafter+
+unless you are actually a very experimented \TeX{} user, because you could get
+a terrible headhache.
+\end{alert}
+
+\subsection{The proof environment}
+The \TO{proof} environment is adapted from the \TO{amsthm} package. It also support a bracketed optional argument for a replacement title. The \verb+\qedhere+ command is also usable.
+\renewstatement{thm}{thm}{Theorem}[\itshape]
+\setcounter{thm}{0}
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{thm}
+The sum of two odd integers is an even integer.
+\end{thm}
+\begin{proof}
+Let $p$ and $q$ be two odd integers. We have to prove that there
+exists an integer $n$ such that $p+q=2n$.
+We know that there is an integer $p_1$ and an integer $q_1$ such that
+\[p=2p_1+1\text{ and } q=2q_1+1,\]
+hence
+\begin{align*}p+q&=(2p_1+1)+(2q_1+1)\\
+&=2\underbrace{(p_1+q_1+1)}_{n}\qedhere
+\end{align*}
+\end{proof}
+\end{verbatim}
+\end{tcolorbox}
+\begin{thm}
+The sum of two odd integers is an even integer.
+\end{thm}
+\begin{proof}
+Let $p$ and $q$ be two odd integers. We have to prove that there exists an integer $n$ such that $p+q=2n$.
+We know that there is an integer $p_1$ and an integer $q_1$ such that
+\[p=2p_1+1\text{ and } q=2q_1+1,\]
+hence
+\begin{align*}p+q&=(2p_1+1)+(2q_1+1)\\
+&=2\underbrace{(p_1+q_1+1)}_{n}\qedhere
+\end{align*}
+\end{proof}
+
+\section{Figures, tables, floats and captions}\label{figtable}
+Thanks to the \TO{caption} package, the following have been defined:
+\begin{itemize}
+\item\verb+\tgofigcaption+ (for figures);
+\item and \verb+\tgotabcaption+ (for tables).
+\end{itemize}
+These two commands provide captions similar in appearance to what could be obtained with \verb+\caption+, but also work in the case of non-floating objects.
+
+In this way it is possible to include small tables and figures in a fixed position, with nothing in their appearance to distinguish them from floating objects (whose use is still recommended in most cases).
+
+\end{document}
diff --git a/Master/texmf-dist/doc/lualatex/tango/tango-fr.pdf b/Master/texmf-dist/doc/lualatex/tango/tango-fr.pdf
new file mode 100644
index 00000000000..a4438d58ded
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/tango-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/tango/tango-fr.tex b/Master/texmf-dist/doc/lualatex/tango/tango-fr.tex
new file mode 100644
index 00000000000..1ed1a70abff
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/tango/tango-fr.tex
@@ -0,0 +1,786 @@
+% !TEX TS-program = LuaLaTeX
+\documentclass[french,ColorTheme=USAF,FontSize=10pt]{tango}
+%\setmonofont{Latin Modern Mono}[Scale=MatchUppercase]
+\usepackage{longtable,csquotes,lipsum,tcolorbox}
+\usepackage[dvipsnames]{xcolor}
+\newcommand\DO[1]{\textcolor{ColorOne}{\bfseries #1}}
+\newcommand\TO[1]{\textsf{#1}}
+%%
+\NewDocumentCommand\showtheme{m}
+{{\tgosetup{ColorTheme=#1}
+\parbox{2.1cm}{\centering
+\textsf{#1\rule[-3pt]{0pt}{10pt}}\\
+\colorbox{ColorOne}{\parbox{1.5cm}{\rule[-5pt]{0pt}{15pt}}}
+\par
+\colorbox{ColorTwo}{\parbox{1.5cm}{\rule[-5pt]{0pt}{15pt}}}
+\par
+}}}
+%
+%\tgosmartlists
+\renewtgolabels1{\lefthand}
+\definecolor{ColorThree}{rgb}{0.93,0.95,0.97}
+\tcbset{colback=ColorTwo,colframe=ColorTwo,sharp corners}
+\frenchspacing
+%\setcounter{section}{88}
+\begin{document}
+
+\renewcommand{\arraystretch}{1.1}
+\title{\textcolor{ColorOne}{\floweroneleft}\,La classe de documents tango\,\textcolor{ColorOne}{\floweroneright}}
+\author{\href{mailto:michel.bovani@icloud.com}{Michel \textsc{Bovani}}\\
+Page internet de tango: \href{https://tango.mathriochka.net}{https://tango.mathriochka.net}}
+\date{\today\\v. 0.8.0}
+{\sffamily
+\maketitle
+
+}
+\thispagestyle{empty}
+
+\tgoshorttoc
+\section{Qu'est-ce que la classe tango ?}
+
+
+Tango est une classe de documents pour le système de composition Latex (au début du document source, il convient donc de saisir \verb=\documentclass[<options>]{tango}=) à l'usage des professeurs de mathématiques (\emph{grosso modo}, sur le segment bac$-3$-bac$+3$). Elle est conçue pour la composition de divers types de documents, du petit polycopié au livre complet. Pour l'essentiel, le côté \frquote{dédié aux maths} consiste à :
+\begin{itemize}
+\item Charger des packages dédiés (amsmath, unicode-math \&Co).
+\item Proposer des commandes et des environnements pour les théorèmes, propositions, définitions, exercices, etc.
+\end{itemize}
+
+Tango est raisonnablement configurable, même si j'ai dû imposer certains choix : utilisation obligatoire de lualatex, des fontes opentype, et d'une installation récente, notamment. La classe propose huit formats de sortie, dont cinq sont adaptés aux tablettes, liseuses ou smartphones. Un procédé encore imparfait permet d'introduire une saisie particulière pour un format de sortie donné (par exemple de forcer un saut de page pour le format A5 seulement). La classe tango peut aussi être utilisée pour des projets de portée plus générale que des cours de mathématiques : des cours de sciences, bien sûr, mais aussi des choses très différentes, si l'on est prêt à un effort de configuration supplémentaire (voir le répertoire \TO{candide} dans les exemples).
+
+Une autre classe Latex, conçue pour réaliser des documents support au travail scolaire (énoncés d'exercices, sujets de devoirs ou d'examens) devrait être disponible sous peu. Il est prévu qu'elle se nomme \frquote{\TO{bravo}}.
+
+\section{Panorama des options}
+Veuillez noter que le tableau ci-dessous mentionne pour l’essentiel les options effectivement traitées par tango. D'autres options peuvent être, lorsqu’elles sont utilisées à l'appel de la classe, simplement transmises à certains packages. C'est le cas par exemple des options de langues de babel, ou de l'option \TO{math-style} passée au package unicode-math.
+
+Les valeurs par défaut sont présentées en bleu gras. Les options en gras, marquées d'un astérisque, peuvent être activées dans le préambule ou le corps du document à l'aide de la commande \verb+\tgosetup+ : par exemple, vous pouvez utiliser \verb+\tgosetup{ColorTheme=Navy}+ pour changer les couleurs à l'intérieur de votre document. Les autres options ne peuvent être utilisées qu'à l'appel de la classe.
+
+\begin{longtable}{p{0.23\linewidth}p{0.7\linewidth}}
+\caption[]{Les options de la classe tango}\\
+\textbf{Option}&\textbf{Utilisation}\\
+\hline\endhead
+\hline\multicolumn{2}{r}{\emph{Voir page suivante}}\endfoot
+\hline\endlastfoot
+\TO{%
+french, english, british, american, canadian, australian, newzealand, german, ngerman, naustrian, nswissgerman, italian, spanish}.& Tango transmettra au package \TO{babel} toutes les options de langue. En revanche, la traduction des noms spécifiques employés par tango (comme théorème, exercice, etc.) n'est assurée que pour les langues listées ci-contre. Notez bien que même les locuteurs anglais doivent \emph{impérativement} passer une option de langue à tango.
+
+Voir la section~\ref{lang} plus loin.\\
+\hline
+\TO{no-statement}&\TO{no-statement=true/\DO{false}}. Des environnements \TO{thm}, \TO{defin}, \TO{lem}, \TO{coro}, \TO{propo} (pour présenter les théorèmes, définitions, lemmes, corollaires et propositions) sont définis par défaut. L'option \DO{no-statement} vous permet de définir ces environnements vous-même avec une configuration plus personnelle (voir les commandes \verb=\newstatement= and \verb=\renewstatement= dans la section~\ref{st-section} page~\pageref{st-section}).\\
+\hline
+\TO{no-hyperref}&\TO{no-hyperref=true/\DO{false}}. Si vous souhaitez vous contenter d'une sortie papier…\\
+\hline
+\TO{no-indent/indent}&\TO{no-indent=true/\DO{false}}. Les retraits d'alinéa sont présents par défaut. L'option \TO{no-indent} (alias court de \TO{no-indent = true}) les supprime. Une option \TO{indent} existe également, quoiqu'elle ne soit pas très utile.\\
+\hline
+\TO{no-titleindent}/\TO{titleindent}&Les retraits d'alinéa pour les titres sont présents par défaut en français uniquement. (La raison en est qu'en typographie française le premier paragraphe après un titre subit ce retrait comme les autres paragraphes, ce qui n'est pas le cas en typo anglaise : je préfère donc dans ce cas, mais cela peut être débattu, que le titre subisse lui aussi ce retrait.) Vous pouvez utiliser \TO{no-tiltleindent} en français ou \TO{titleindent} en anglais pour changer le comportement pas défaut. Ces deux options doivent être appelées \emph{après} l'option de langue.\\
+\hline
+\TO{\textbf{ThmNamePos*}}&\TO{ThmNamePos=<valeur>} ou \TO{<valeur>} peut être \TO{\DO{left}} ou \TO{right}. Le nom de l'énoncé (Théorème, Définition, etc.) est affiché à gauche ou à droite de l'encadré.\\
+\hline
+\TO{PubliClass}&\TO{PubliClass=<valeur>} où \TO{<valeur>} peut être \TO{\DO{article}} ou \TO{book}. Indique la classe de base souhaitée (la classe standard \TO{article} ou la classe standard \TO{book}). La classe tango est conçue de telle sorte que des petits polycopiés fabriqués au jour le jour et composés avec l'option \TO{article} puissent être regroupés et devenir les chapitres d'un même volume avec l'option \TO{book}. Voyez le répertoire \texttt{mathematics} dans la partie exemples de la documentation. Avec l'option \TO{article}, les commandes \verb=\part= et \verb=\tableofontents= sont désactivées. La commande \verb=\tgoshorttoc= peut être utilisée pour obtenir un sommaire au début d'une monographie ou d'un polycopié.\\
+\hline
+\TO{oneside/twoside}& L'option \TO{twoside} est pour une sortie en recto verso, alors que \TO{oneside} est adaptée au recto simple. La valeur par défaut est \TO{\DO{oneside}}. Pour l'instant, il n'y a pas d'ajustement des marges intérieures et extérieures avec \TO{twoside} mais il est techniquement facile de réaliser des blancs tournants à votre convenance grâce à la commande \verb=\geometry= employée dans le préambule. Notez que les gens compliqués ou amateurs de détours pourront préférer \TO{twoside=false} à \TO{oneside}.\\
+\hline
+\TO{FontSize}&\TO{FontSize=<valeur>} où \TO{<valeur>} peut être \TO{9pt}, \TO{\DO{10pt}}, \TO{11pt} ou \TO{12pt}.\\
+\hline
+\TO{\textbf{ColorTheme*}}&\TO{ColorTheme=<valeur>} où \TO{<valeur>} peut être \TO{Blue, Navy, USAF, Azur, Red, Framboise, Brique, Sienne, Caramel, Olive, Tannen, \DO{GrayGray}, BlackAndWhite, Ink} or \TO{Steel}. Chaque choix définit un ensemble de deux couleurs, une soutenue (ColorOne) pour les titres et une très claire (ColorTwo) pour le fond des encadrés.\\
+\hline
+\TO{\textbf{ColorOne*}/\textbf{ColorTwo*}}& Ces options permettent à l'utilisateur de définir les couleurs d'un thème personnel; dans les deux cas la valeur doit être un argument acceptable pour la commande \verb=\definecolor=. Voir la documentation du package xcolor, chargé sans option par tango.
+\begin{example}[Exemples]
+ \begin{itemize}
+ \item\TO{ColorOne=}\verb={rgb}{0.75,0.1,0.05}=
+ \item\TO{ColorOne=}\verb={cmyk}{0,0.8,0.8,0.2}=
+ \item\TO{ColorTwo=}\verb={{rgb}{0.75,0.96,0.75}}= (notez que les accolades extérieures sont acceptées sans être obligatoires).
+\end{itemize}
+\end{example}
+\\
+\hline
+\TO{\textbf{ColorOneNamed*}} / \\
+\TO{\textbf{ColorTwoNamed*}}&
+ Ces options permettent à l'utilisateur de définir les couleurs d'un thème personnel; dans les deux cas la valeur doit être un argument acceptable pour la commande \verb=\colorlet=. Voir la documentation du package xcolor, chargé sans options par tango.
+\begin{example}[Exemples]
+ \begin{itemize}
+ \item\TO{ColorOneNamed=}\verb={red!70!blue}=
+\item\TO{ColorTwoNamed=}\verb={yellow!12}=
+ \end{itemize}
+\end{example}
+Si vous souhaitez utiliser un ensemble de couleurs prédéfinies, disons par exemple \TO{dvipsnames}, il vous suffit de recharger le package \TO{xcolor} avec l'option \TO{dvipsnames} dans le préambule, puis d'utiliser la commande \verb=\tgosetup= :
+\begin{itemize}
+\item \verb+\tgosetup{ColorOneNamed={RedOrange!80!BrickRed}}+
+ \end{itemize}
+\\
+\hline
+\TO{Output}&\TO{Output=<valeur>} où \TO{<valeur>} peut être \TO{\DO{A4paper}, Letter, A5paper, BigTablet, Tablet, SmallTablet, eReader} ou \TO{Smartphone}. \TO{BigTablet}, \TO{Tablet} et \TO{SmallTablet} correspondent à des écrans de 13, 11 et 8.5 pouces respectivement; \TO{eReader} configurée pour une liseuse 6 pouces. Veuillez noter qu'en ce qui concerne les formats \TO{eReader} et \TO{Smartphone}, tango demande à Latex un format supérieur au format réel, si bien que les tailles des polices sont inférieures à ce que l'on pourrait attendre. Ainsi, l'option \TO{FontSize=9pt} peut fournir des résultats qui sembleront difficilement lisibles.\\
+\hline
+ \TO{Numbers}& \TO{Numbers=<valeur>} où \TO{<valeur>} peut être \TO{TextOldStyle, OldStyle, MathOldStyle, FullOldstyle}. Si vous ne demandez rien, vous obtenez les chiffres habituels, à hauteur d'une lettre capitale, parfois nommés \frquote{lining}.
+\begin{itemize}
+\item \TO{Numbers=TextOldStyle} sélectionne les chiffres bas de casse ({\olddigits 0123456789}) of de la police erewhon (fonte texte de base) pour tout.
+\item \TO{Numbers=OldStyle} sélectionne les chiffres bas de casse pour toutes les fontes de texte du document.
+\item \TO{Numbers=MathOldStyle} sélectionne les chiffres bas de casse uniquement pour les mathématiques (je ne vois aucune bonne raison de procéder ainsi).
+\item \TO{Numbers=FullOldStyle} sélectionne les chiffres bas de casse aussi bien pour les fontes de texte que pour les mathématiques.
+\end{itemize}
+Remarquons qu'il est toujours possible de basculer localement des chiffres sélectionnés par cette option à une de leurs variantes (par exemple les titres de section sont numérotés à l'aide de \frquote{grands} chiffres, dans la mesure où ces titres sont eux-mêmes en capitales).\\
+\hline
+\TO{StylisticSet}&\TO{StylisticSet=\{<valeur1>, <valeur2>,…\}} où \TO{<valeur1>, <valeur2>,} etc. sont à prendre parmi \TO{upint, leqslant, smaller, subsetneq} et \TO{parallelslant}. Ces options concernent la fonte Erewhon-Math, qui est une version opentype du système scientifique Fourier-Gutenberg, (très) étendue par Daniel \textsc{Flipo}. Pour plus d'informations, voir la documentation d'Erewhon-Math (\verb=texdoc erewhon-math= dans un terminal).\\
+\hline
+\TO{CharacterVariant}&\TO{CharacterVariant=\{<valeur1>, <valeur2>,…\}} \TO{<valeur1>, <valeur2>,} etc. sont à prendre parmi \TO{zero, hslash, emptyset, epsilon, kappa, pi, phi, rho, sigma, theta, partial, Ecal, Qcal} et \TO{Tcal}. Ces options concernent la fonte Erewhon-Math, qui est une version opentype du système scientifique Fourier-Gutenberg, (très) étendue par Daniel \textsc{Flipo}. Pour plus d'informations, voir la documentation d'Erewhon-Math (\verb=texdoc erewhon-math= dans un terminal).\\
+\end{longtable}
+
+\section{Liste des packages chargés par la classe tango}
+Je ne mentionne ici que les packages directement chargés par tango. Chacun d'eux peut à son tour charger d'autres packages.
+
+\begin{itemize}
+\item \verb=\RequirePackage{xcolor}=. Le package \TO{xcolor} est utilisé par la classe tango pour définir les couleurs des différents thèmes. Il est appelé sans option, mais vous pouvez le recharger dans le préambule avec des options comme \TO{dvipsnames}, \TO{svgnames} ou \TO{x11names}.
+\item\verb=\RequirePackage{mathtools}=. Le package \TO{mathtools} charge le package \TO{amsmath}.
+\item\verb=\RequirePackage{geometry}=. Utilisé par tango pour définir l'empagement des différents formats de sortie. Vous pouvez utiliser la commande \verb=\geometry= dans votre préambule pour modifier ce empagement, et même la maquette entière.
+\item\verb=\RequirePackage{enumitem}=. Utilisé par la classe tango pour configurer les différents environnements basés sur \TO{list} (voir la section~\ref{lists}). Ces configurations peuvent être modifiées par l'utilisateur dans le préambule.
+\item\verb=\RequirePackage{titletoc}=. Utilisé par la classe tango pour fixer l'apparence de la table des matières, que l'utilisateur peut modifier dans le préambule.
+\item\verb=\RequirePackage[pagestyles,toctitles,newlinetospace,clearempty,noindentafter]{titlesec}=. Utilisé par la classe tango pour modifier l'apparence des titres de différents niveaux. Ces configurations peuvent être modifiées par l'utilisateur dans le préambule.
+\item\verb=\RequirePackage{ccaption,caption}=. Utilisé par la classe tango pour configurer l'apparence des légendes des figures et des tables. (voir la section~\ref{figtable}).
+\item\verb=\RequirePackage{fontspec}\RequirePackage{unicode-math}=. La classe tango requiert \TO{lualatex} et les fontes opentype, y compris pour la composition des mathématiques. Voir la section~\ref{fnts} ci-dessous.
+\item\verb=\RequirePackage{iflang}=. La classe tango utilise ce package pour envoyer un message d'erreur dans le cas où elle n'a reçu aucune option de langue pour \TO{babel}.
+\item\verb=\RequirePackage{babel}=. Le package babel est appelé sans option. Les options de babel lui seront transmises par la classe tango. %See section~\ref{lang} below.
+\item\verb+\RequirePackage[colorlinks,linkcolor=ColorOne,urlcolor=ColorOne]{hyperref}+.\par Cette configuration d'\TO{hyperref} peut être modifiée en utilisant la commande \verb=\hypersetup= dans le préambule. Vous pouvez aussi utiliser l'option \TO{no-hyperref}.
+\item\verb=\RequirePackage{array,graphicx,microtype,numprint,float,afterpage}=. Ces packages sont chargés mais non explicitement utilisés par tango.
+\end{itemize}
+
+\section{Fontes}\label{fnts}
+
+\subsection{Le système de fontes de tango}
+La fonte principale est Erewhon, une version opentype d'Utopia (une fonte PosScript de type~1 qui fut conçue par Robert \textsc{Slimbach} en 1989, puis donnée au X-consortium par Adobe et figurant finalement sur TeXlive. Contrairement à Utopia, Erewhon, dessinée par Michael \textsc{Sharpe}, couvre un assez grand nombre de langues et offre de nombreuses possibilités accessibles à travers les fonctionnalités du format opentype. Il faut savoir également qu'Adobe commercialise une version opentype d'Utopia, moins riche en glyphes qu'Erewhon, mais pourvue d'une graisse intermédiaire et de corps optiques.
+
+La fonte scientifique est Erewhon~Math, un complément scientifique à Erewhon, conçu par Daniel \textsc{Flipo}. D'un certain point de vue, Erewhon est le pendant opentype de Fourier-Gutenberg, le complément scientifique d'Utopia type~1 conçu par mes soins en 2002. Erewhon~Math offre un grand nombre de fonctionnalités, rendues accessibles par Daniel à travers le package \TO{fourier-otf}. La classe tango ne charge pas le package \TO{fourier-otf} mais propose toutes ses fonctionnalités à travers son système d'options.
+
+La fonte sans sérif de tango est Noto Sans, mise à l'échelle. Il s'agit d'une fonte de texte, supportant les alphabets latin, grec et cyrillique, et pourvue de graisses multiples.
+
+La fonte utilisée pour les Titres de premier niveau (commande \verb=\tgotitle=) est Roboto Condensed Bold (puisque les graisses condensées de Noto Sans ne figurent pas sur TeXlive).
+
+La fonte à chasse fixe est Inconsolatazi4, mise à l'échelle.
+
+Enfin, tango appelle le package fourier-orns: il s'agit d'une fonte de logos et de symboles conçue par mes soins comme complément au système fourier et récemment pourvue d'une version opentype.
+
+\subsection{Utiliser tango avec un autre système de fontes}
+Il est évidemment possible d'utiliser les commandes \verb=\setmainfont=, \verb=\setsansfont= et \verb=\setmonofont= du package \TO{fontspec}, ainsi que la commande \verb=\setmathfont= du package \TO{unicode-math} dans le préambule de votre document afin de modifier les paramètres de la classe tango. Ce ne sont pas des modifications que je recommande. En revanche, la distribution tango pourrait à l'avenir proposer une autre classe pourvue d'un autre système de fontes. Une telle classe Latex pourrait se nommer charlie, ou foxtrot ou zulu…
+
+
+\subsection{“Font commands” et “text font commands”}
+Je nomme ici “Font commands” des commandes dont la portée n'est limitée que par un groupe ou un environnement. Je nomme “Text font commands”, à l'opposé, des commandes dont la portée est limitée à leur argument, lequel ne doit contenir aucun saut de paragraphe. Par exemple, \verb=\bfseries= est une “font command” et \verb=\textbf= est une “text font command”. La raison de ces dénominations, dont j'admets qu'elles sont fort critiquables, est que \verb+\textbf+ est défini de façon interne par :
+\begin{tcolorbox}
+\begin{verbatim}
+\DeclareTextFontCommand{\textbf}{\bfseries}
+\end{verbatim}
+\end{tcolorbox}
+
+Voici ce qui est proposé par la classe tango (voir le tableau~\ref{otfcmd}, \pageref{otfcmd}). Toutes ces commandes devraient fonctionner aussi bien avec Erewhon qu'avec Noto Sans.
+
+\begin{table}[ht]
+\XTabletCommand{\centering\setlength\tabcolsep{9pt}}
+\TabletCommand{\centering}
+\caption{Les commandes opentype de la classe tango}\label{otfcmd}
+\ifTgoTabletOutput\begin{tabular}{l | l | l | l}%
+\else
+\begin{tabular}{llll}%
+\fi
+\hline
+\multicolumn{1}{c}{\textsf{\bfseries Commande}}&
+\multicolumn{1}{c}{\textsf{\bfseries Nature}}&
+\multicolumn{1}{c}{\textsf{\bfseries Exemple}}&
+\multicolumn{1}{c}{\textsf{\bfseries Resultat}}\\
+\hline
+\verb=\superiors=&\textsf{font command} & \verb=1{\superiors re}=&1{\superiors re}\\
+\hline
+\verb=\scinferiors=&\textsf{font command} &\verb={\scinferiors C6H12O3}= &{\scinferiors C6H12O3}\\
+\hline
+\verb=\smartfracs=&\textsf{font command} &\verb=2{\smartfracs1/3}= &2{\smartfracs1/3} \\
+\hline
+\verb=\fullsc=&\textsf{text font command} &\verb=\fullsc{Chapitre}= &\fullsc{Chapitre} \\
+\hline
+\verb=\textsup=&\textsf{text font command} &\verb=1\textsup{re}=&1\textsup{re} \\
+\hline
+\verb=\textscinf=&\textsf{text font command} &\verb=\textscinf{C6H12O3}= &\textscinf{C6H12O3} \\
+\hline
+\verb=\smartfrac=&\textsf{text font command} &\verb=2\smartfrac{3/4}= &2\smartfrac{3/4} \\
+\hline
+\verb=\olddigits=&\textsf{font command} &\verb={\olddigits01234}= &{\olddigits01234} \\
+\hline
+\verb=\liningdigits=&\textsf{font command} &\verb={\olddigits01\liningdigits01}= &{\olddigits01\liningdigits01} \\
+\hline
+\verb=\propdigits=&\textsf{font command} &\verb={\propdigits011\olddigits011}= &{\propdigits011\olddigits011} \\
+\hline
+\verb=\tabulardigits=&\textsf{font command} &\verb={\tabulardigits011\olddigits011}= &{\tabulardigits011\olddigits011} \\
+\hline
+\end{tabular}
+
+
+\end{table}
+
+
+
+%\medskip
+
+
+\section{Utilisation de la classe tango}
+
+\subsection{Généralités}
+Concernant l'interface utilisateur, tango n'est pas très différente des classes \TO{article} ou \TO{book}. La configuration se fait essentiellement à travers le choix des options.
+
+Les utilisateurs avancés devraient se référer à la documentation des différents packages : tout d'abord \TO{unicode-math}, \TO{fontspec}, \TO{mathtools} et \TO{amsmath}. Mais si vous souhaitez, par exemple, changer le style des titres, vous pourrez consulter la documentation \TO{titlesec} ; afin de changer le style d'une liste (enumerate, itemize, etc.), voyez plutôt \TO{enumitem}. Le package \TO{geometry} est essentiel pour quiconque souhaiterait obtenir une mise en page particulière. Et ainsi de suite.
+
+
+
+\subsection{Modification de commandes standard par la classe tango}
+
+Afin que des documents composés avec l'option \TO{article} puissent devenir les chapitres d'un livre composé de façon ultérieure avec l'option \TO{book}, la commande \verb+\part+, héritée de la classe \TO{article}, a été désactivée (seulement pour les documents composés avec l'option \TO{article}).
+
+
+De même, la version \TO{article} bénéficie de la commande \verb+\tgotitle+ qui permet de définir le titre principal du document. La version étoilée \verb+\tgotitle*+ existe, mais fait exactement la même chose que la commande non étoilée. Cependant, dans la version \TO{book}, \verb+\tgotitle+ est un alias pour \verb+\chapter+ (et \verb+\tgotitle*+ est de même un alias de \verb+\chapter*+), ainsi, un titre non numéroté dans un polycopié peut facilement devenir le titre numéroté d'un chapitre de livre. Sous réserve évidemment qu'un mécanisme comme \verb+\includeonly+/\verb+\include+ ait été utilisé. Un modèle (pour l'instant en français) est fourni dans le répertoire \TO{examples}.
+
+La commande \verb+\tableofcontents+ ne peut être utilisée qu'avec l'option \TO{book}; elle est désactivée avec l'option \TO{article}: elle est alors remplacée par la commande \verb+\tgoshortoc+ (qui est elle-même désactivée avec l'option \TO{book}). Si vous avez besoin de tables des matières multiples et/ou partielles, il faudra vous tourner vers un package spécialisé.
+
+\subsection{Utiliser deux ou plusieurs formats de sortie}
+Les fonctionnalités décrites ici ont un caractère rudimentaire et sont de nature expérimentale. Elles pourront, selon leur succès, être développées dans les versions ultérieures de la classe tango.
+
+Pour chaque format de sortie, deux commandes particulières sont fournies. Par exemple, dans le cas de l'option \TO{Output=Smartphone}, vous disposez de \verb+\SmartphoneCommand+ et \verb+\XSmartphoneCommand+. L'argument de la commande \verb+\SmartphoneCommand+ n'est pris en compte que si le format de sortie \TO{Smartphone} a été sélectionné. Inversement, l'argument de \verb+\XSmartphoneCommand+ n'est pris en compte que si ce format \emph{n'a pas été} utilisé.
+\begin{example}[Exemples]
+\begin{itemize}
+\item \verb+\SmartphoneCommand{\pagebreak}+ crée un saut de page uniquement pour la sortie smartphone.
+\item \verb+\XSmartphoneCommand{\[<longue formule de maths>\]}+
+\par \verb+\SmartphoneCommand{\begin{multline*}<formule sur plusieurs lignes>\end{multine*}}+
+\par crée une version \TO{multline} (cf. \TO{amsmath}) d'une formule pour la sortie smartphone uniquement.
+\end{itemize}
+\end{example}
+
+Les commandes proposées par tango sont :
+\begin{itemize}
+\item\verb+\AfourCommand+ and \verb+\XAfourCommand+ pour la sortie A4paper;
+\item\verb+\LetterCommand+ and \verb+\XLetterCommand+pour la sortie letter;
+\item\verb+\AfiveCommand+ and \verb+\XAfiveCommand+ pour la sortie A5paper;
+\item\verb+\BigTabletCommand+ and \verb+\XBigTabletCommand+ pour la sortie BigTablet;
+\item\verb+\TabletCommand+ and \verb+\XTabletCommand+ pour la sortie Tablet;
+\item\verb+\SmallTabletCommand+ and \verb+\XSmallTabletCommand+ pour la sortie SmallTablet;
+\item\verb+\eReaderCommand+ and \verb+\XeReaderCommand+ pour la sortie eReader;
+\item\verb+\SmartphoneCommand+ and \verb+\XSmartphoneCommand+ pour la sortie Smartphone.
+\end{itemize}
+\subsection{Tous les thèmes de couleur}
+\indent\par
+\hspace*{0pt}\hfil\showtheme{Blue}\hfil\showtheme{Azur}\hfil\showtheme{Navy}\hfil\showtheme{USAF}\hfil%
+\showtheme{Framboise}\hfil\null
+\par\bigskip\par
+\hspace*{0pt}\hfil\showtheme{Red}\hfil\showtheme{Brique}\hfil\showtheme{Caramel}\hfil\showtheme{Sienne}\hfil\showtheme{Olive}\hfil\null
+\par\bigskip\par
+\hspace*{0pt}\hfil\showtheme{Tannen}\hfil\showtheme{GrayGray}\hfil\showtheme{Steel}\hfil\showtheme{Ink}\hfil\showtheme{BlackAndWhite}\hfil\null
+
+\section{Sélection de la langue}\label{lang}
+Il est impératif de passer une option de langue à babel par l'intermédiaire de la classe tango : cela est vrai même pour les personnes de langue anglaise. Un message d'erreur sera généré par la classe tango si celle-ci n'a reçu aucune option de langue à transmettre à \TO{babel} ; si vous ignorez ce message, vous devrez travailler sans aucun motif de césure.
+
+Tango possède également certains mots réservés qui sont (lorsque l'option french est passée à tango) :
+
+\begin{tcolorbox}
+\begin{verbatim}
+\renewcommand\TgoTheoremName{Théorème}
+\renewcommand\TgoDefinitionName{Définition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemme}
+\renewcommand\TgoCorollaryName{Corollaire}
+\renewcommand\TgoRemarkName{Remarque}
+\renewcommand\TgoExampleName{Exemple}
+\renewcommand\TgoContentsName{Sommaire}
+\renewcommand\TgoExerciseName{Exercice}
+\renewcommand\TgoExercisesSubsectionName{Exercices}
+\renewcommand\TgoExercisesSectionName{Exercices}
+\end{verbatim}
+\end{tcolorbox}
+
+Même si toute option de langue reconnue par babel sera (en principe) prise en compte dès lors qu'elle est passée à tango, la traduction de ces mots réservés n'a lieu que pour les langues suivantes :
+\begin{itemize}
+\item\TO{french};
+\item\TO{english, british, american, canadian, australian, newzealand};
+\item\TO{german, ngerman, naustrian, nswissgerman};
+\item\TO{italian};
+\item\TO{spanish}.
+\end{itemize}
+
+Les autres langues bénéficient des facilités offertes par babel, mais les mots réservés de tango ne sont pas traduits.
+Voici donc ce que peuvent faire les utilisateurs concernés.
+\begin{enumerate}
+\item Utiliser \verb+\renewcommand+ pour faire ces traductions eux-mêmes.
+\item (Mieux) me communiquer par mail toute l'information nécessaire (au moins l'option de langue utilisée pour babel et une traduction des mots réservés) de façon à ce que je puisse procéder aux adaptations nécessaires.
+\end{enumerate}
+
+\section{Théorèmes et énoncés divers}\label{st-section}
+
+\subsection{Éléments prédéfinis}
+Les environnements permettant de saisir les divers énoncés indispensables aux enseignants de mathématiques (définitions, théorèmes, propositions, etc.) sont définis grâce à la commande \verb+\newstatement+ dont la syntaxe est :
+\begin{tcolorbox}
+\begin{verbatim}
+\newstatement{<environnement>}{<compteur>}{<nom-générique-de-l'énoncé>}[<font-command-optionnelle>]
+\end{verbatim}
+\end{tcolorbox}
+Par exemple, les environnements, \TO{thm}, \TO{defin}, \TO{propo}, \TO{coro} et \TO{lem} ont été définis par quelque chose comme :
+\begin{tcolorbox}
+\begin{verbatim}
+\newcounter{thm} \newstatement{thm}{thm}{Théorème}[\itshape]
+\newcounter{defin} \newstatement{defin}{defin}{Définition}
+\newcounter{propo} \newstatement{propo}{propo}{Proposition}[\itshape]
+\newcounter{coro} \newstatement{coro}{coro}{Corollaire}
+\newcounter{lem} \newstatement{lem}{lem}{Lemme}
+\end{verbatim}
+\end{tcolorbox}
+
+Si vous saisissez
+%
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{propo}
+La somme de deux entiers impairs est un entier pair.
+\end{propo}
+\begin{thm}[pons asinorum]
+Les angles à la base d'un triangle isocèle sont égaux.
+\end{thm}
+\end{verbatim}
+\end{tcolorbox}
+%
+vous obtenez
+\begin{propo}
+La somme de deux entiers impairs est un entier pair.
+\end{propo}
+\begin{thm}[pons asinorum]
+Les angles à la base d'un triangle isocèle sont égaux.
+\end{thm}
+
+Comme vous pouvez le voir, chaque énoncé défini à l'aide de \verb+\newstatement+ dispose d'un argument optionnel délimité par des crochets (dont le contenu s'affiche entre parenthèses après le nom et le numéro de l'énoncé). Notez également que ces environnements ne devraient pas être utilisés à l'intérieur d'un autre environnement basé sur \TO{list} (comme \TO{center, quote, enumerate, itemize}…).
+
+Pour chaque type d'énoncé défini à l'aide de \verb+\newstatement+ existe également
+\begin{itemize}
+\item une forme étoilée non numérotée:
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{coro*}
+Les angles à la base d'un triangle isocèle sont égaux.
+\end{coro*}
+\end{verbatim}
+\end{tcolorbox}
+\end{itemize}
+\begin{coro*}
+Les angles à la base d'un triangle isocèle sont égaux.
+\end{coro*}
+\begin{itemize}
+\item un premier argument optionnel délimité par \verb+< >+ qui permet de remplacer localement le nom générique de l'énoncé.
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{thm*}<Théorème de d'Alembert-Gauss>
+[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes
+possède au moins une racine complexe.
+\end{thm*}
+\end{verbatim}
+\end{tcolorbox}
+\end{itemize}
+\begin{thm*}<Théorème de d'Alembert-Gauss>[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes possède au moins une racine complexe.
+\end{thm*}
+
+
+\subsection{Configurer vos propres types énoncés}
+Si vous avez besoin d'un nouveau type d'énoncé, disons un environnement \TO{axm} pour les axiomes, c'est tout simple:
+\begin{tcolorbox}
+\begin{verbatim}
+\newcounter{axio} \newstatement{axm}{axio}{Axiom}
+\end{verbatim}
+\end{tcolorbox}
+Remarquez bien qu'il vous revient alors de définir le compteur utilisé par cet environnement : si ce compteur n'existe pas déjà, il vous faut le créer à l'aide de la commande \verb+\newcounter+. Bien sûr, le nom du compteur peut être différent de celui de l'environnement. Si vous avez utilisé l'option \TO{no-statement}, vous aurez d'ailleurs à définir tous les types d'énoncé dont vous avez besoin, avec des noms et des compteurs de votre choix.
+
+\subsection{Redéfinir des types d'énoncés}
+La commande \verb+\newstatement+ a pour compagnon \verb+\renewstatement+ qui permet de redéfinir l'environnement associé à un type d'énoncé préexistant. Précisément, vous devez employer \verb+\renewstatement{foo}…+ plutôt que \verb+\newstatement{foo}…+ si et seulement si l'environnement \verb+foo+ a déjà été défini.
+
+\begin{example}[Exemples]
+\begin{enumerate}
+\item Vous pouvez redéfinir l'environnement \TO{propo} de telle façon qu'il utilise le même compteur que l'environnement \TO{thm} avec un contenu affiché en caractères romains:
+\begin{tcolorbox}
+\begin{verbatim}
+\renewstatement{propo}{thm}{Proposition}
+\setcounter{thm}{0}
+\begin{propo}
+La somme de deux entiers impairs est un entier pair.
+\end{propo}
+\begin{thm}
+Les angles à la base d'un triangle isocèle sont égaux.
+\end{thm}
+\end{verbatim}
+\end{tcolorbox}
+\end{enumerate}
+\renewstatement{propo}{thm}{Proposition}
+\setcounter{thm}{0}
+\begin{propo}
+La somme de deux entiers impairs est un entier pair.
+\end{propo}
+\begin{thm}
+Les angles à la base d'un triangle isocèle sont égaux.
+\end{thm}
+
+\begin{enumerate}[resume]
+\item Si vous venez de terminer la saisie en Latex de \emph{l'intégralité} de votre traité d'algèbre, lequel contient propositions, théorèmes et corollaires, et que vous réalisez maintenant que ce que vous voulez c'est qu'il n'y ait plus de différence entre propositions, théorèmes et corollaires, les trois types d'énoncés devant être composés en italique, se nommer \frquote{proposition} et être numérotés avec le même compteur, vous pouvez simplement saisir dans le préambule:
+
+\begin{tcolorbox}
+\begin{verbatim}
+\renewstatement{coro}{thm}{Proposition}[\itshape]
+\renewstatement{propo}{thm}{Proposition}[\itshape]
+\renewstatement{thm}{thm}{Proposition}[\itshape]
+\end{verbatim}
+\end{tcolorbox}
+Alors avec
+\begin{tcolorbox}
+\begin{verbatim}
+\setcounter{thm}{0}
+\begin{propo}
+La somme de deux entiers impairs est un entier pair.
+\end{propo}
+\begin{thm}
+La somme de deux entiers pairs est un entier pair.\end{thm}
+\begin{coro}
+Si deux entiers ont la même parité, leur somme est un entier pair.
+\end{coro}
+\end{verbatim}
+\end{tcolorbox}
+vous obtiendrez:
+\end{enumerate}
+\renewstatement{coro}{thm}{Proposition}[\itshape]
+\renewstatement{propo}{thm}{Proposition}[\itshape]
+\renewstatement{thm}{thm}{Proposition}[\itshape]
+\setcounter{thm}{0}
+\begin{propo}
+La somme de deux entiers impairs est un entier pair.
+\end{propo}
+\begin{thm}
+La somme de deux entiers pairs est un entier pair.
+\end{thm}
+\begin{coro}
+Si deux entiers ont la même parité, leur somme est un entier pair.
+\end{coro}
+%
+au lieu de
+%
+\setcounter{thm}{0}\setcounter{propo}{0}
+\renewstatement{thm}{thm}{Théorème}[\itshape]
+\renewstatement{propo}{propo}{Proposition}[\itshape]
+\renewstatement{coro}{coro}{Corollaire}
+\begin{propo}
+La somme de deux entiers impairs est un entier pair.
+\end{propo}
+\begin{thm}
+La somme de deux entiers pairs est un entier pair.
+\end{thm}
+\begin{coro}
+Si deux entiers ont la même parité, leur somme est un entier pair.
+\end{coro}
+\begin{enumerate}[resume]
+\item Pour finir, \verb+\renewstatement+ et \verb+\newstatement+ ont une forme étoilée qui permet d'obtenir un type d'énoncé dont le numéro est affiché avant le nom. Mieux, si le compteur utilisé pour ce type d'énoncé est \TO{subsection} ou \TO{subsubsection}, les titres de ces énoncés sont affichés avec la même apparence et le même placement que les titres de subsection ou de subsubsection; bien sûr ce placement dépend de la valeur de \TO{notitleindent}.
+\begin{tcolorbox}
+\begin{verbatim}
+\renewstatement*{thm}{thm}{Theorème}
+\begin{thm}<Théorème de d'Alembert-Gauss>
+[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes
+ possède au moins une racine complexe.
+\end{thm}
+\renewstatement*{thm}{subsection}{Theorème}[\itshape]
+\begin{thm}<Théorème de d'Alembert-Gauss>
+[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes
+ possède au moins une racine complexe.
+\end{thm}
+\renewstatement*{thm}{subsubsection}{Theorème}
+\begin{thm}<Théorème de d'Alembert-Gauss>
+[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes
+ possède au moins une racine complexe.
+\end{thm}
+\end{verbatim}
+\end{tcolorbox}
+\end{enumerate}
+\end{example}
+\renewstatement*{thm}{thm}{Theorème}
+\begin{thm}<Théorème de d'Alembert-Gauss>
+[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes
+ possède au moins une racine complexe.
+\end{thm}
+\renewstatement*{thm}{subsection}{Theorème}[\itshape]
+\begin{thm}<Théorème de d'Alembert-Gauss>
+[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes
+ possède au moins une racine complexe.
+\end{thm}
+\renewstatement*{thm}{subsubsection}{Theorème}
+\begin{thm}<Théorème de d'Alembert-Gauss>
+[théorème fondamental de l'algèbre]
+Tout polynôme non constant à coefficients complexes
+ possède au moins une racine complexe.
+\end{thm}
+
+
+
+\section{Exercices}
+\subsection{Commandes permettant la mise en forme d'exercices}
+La classe tango fournit la commande \verb+\exo+ qui permet de présenter des énoncés d'exercices numérotés (le compteur est \TO{tgoexo}). Il existe une version étoilée, sans numéro. Comme pour les types d'énoncés, l'argument optionnel entre crochets permet d'obtenir un complément au titre, composé entre parenthèses et la première option, balisée par \frquote{\TO{< >}} permet d'obtenir un titre de substitution.
+\begin{tcolorbox}
+\begin{verbatim}
+\exo
+Démontrer que si $G$ est un groupe fini et $H$ un
+sous-groupe de $G$, l'ordre de $H$ divise l'ordre de $G$.
+\exo[théorème de Lagrange]
+Démontrer que si $G$ est un groupe fini et $H$ un
+sous-groupe de $G$, l'ordre de $H$ divise l'ordre de $G$.
+\end{verbatim}
+\end{tcolorbox}
+\exo
+Démontrer que si $G$ est un groupe fini et $H$ un
+sous-groupe de $G$, l'ordre de $H$ divise l'ordre de $G$.
+\exo[théorème de Lagrange]
+Démontrer que si $G$ est un groupe fini et $H$ un
+sous-groupe de $G$, l'ordre de $H$ divise l'ordre de $G$.
+\begin{tcolorbox}
+\begin{verbatim}
+\newcommand\tgostar{\raisebox{-0.5ex}{\large\textborn}}
+\exo*<Problème des restes chinois>[\tgostar\tgostar\tgostar]
+Soit $n_1,\ldots, n_k$ $k$ entiers strictement supérieurs à $1$. Notons $N$
+le produit des $n_i$. Démontrer que si les $n_i$ sont premiers entre eux deux
+à deux et si $a_1,\ldots, a_k$ sont des entiers quelconques, le système
+\begin{align*}
+x&\equiv a_1 \pmod{n_1}\\
+&\!\vdots\\
+x&\equiv a_k \pmod{n_k}
+\end{align*}
+possède une solution, unique modulo $N$.
+\end{verbatim}
+\end{tcolorbox}
+\newcommand\tgostar{\raisebox{-0.5ex}{\large\textborn}}
+\exo*<Problème des restes chinois>[\tgostar\tgostar\tgostar]
+Soit $n_1,\ldots, n_k$ $k$ entiers strictement supérieurs à $1$. Notons $N$
+le produit des $n_i$. Démontrer que si les $n_i$ sont premiers entre eux deux à deux et si
+$a_1,\ldots, a_k$ sont des entiers quelconques, le système
+\begin{align*}
+x&\equiv a_1 \pmod{n_1}\\
+&\!\vdots\\
+x&\equiv a_k \pmod{n_k}
+\end{align*}
+possède une solution, unique modulo $N$.
+\subsection{Environnements secexo et chapexo}
+Ces deux environnements conçus pour présenter une partie consacrée aux exercices à la fin d'une section (dans le cas de \TO{secexo}) ou d'un chapitre (dans le cas de \TO{chapexo}). À l'intérieur de ces environnements, on utilise en principe la commande \verb+\exo+.
+
+Le titre, en capitales et centré, est \frquote{EXERCICES} par défaut; l'argument optionnel entre crochets vous permet d'en choisir un autre. Ce titre est ajouté à la table des matières ou au sommaire.
+
+Enfin, ces commandes possèdent des formes étoilées (\verb+\begin{secexo*)+…\verb+\end{secexo*}+) qui vous permettront de composer ces parties consacrées aux exercices dans un corps plus petit (excepté si la taille de la fonte principale du document est 9pt).
+
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{secexo*}[Exemple d'une partie consacrée aux exercices]
+\exo Démontrer que la somme de deux entiers pairs est un entier pair.
+\exo Démontrer que la somme de deux entiers impairs est un entier pair.
+\end{secexo*}
+\end{verbatim}
+\end{tcolorbox}
+\begin{secexo*}[Exemple d'une partie consacrée aux exercices]
+\exo Démontrer que la somme de deux entiers pairs est un entier pair.
+\exo Démontrer que la somme de deux entiers impairs est un entier pair.
+\end{secexo*}
+
+\section{Listes}\label{lists}
+\subsection{Principes généraux}
+En ce qui concerne les marges, les déplacements horizontaux dans tango se font par pas multiples entiers de \verb+\TgoStandardMargin+. Au chargement de la classe, la valeur de ce paramètre est fixée à 1.5em, ainsi que les retraits d'alinéas et les retraits subis par les titres (à moins que ces valeurs ne soient fixées à zéro). les marqueurs successifs des environnements itemize et enumerate sont donc positionnés à 1.5em, 3em, 4.5em, etc. de la marge principale. Il n'est pas forcément recommandé de changer cette configuration (si vous souhaitez le faire, il convient d'utiliser le package \TO{enumitem}).
+
+\subsection{Environnements basés sur l'environnement list}
+Il existe deux façons de configurer les listes dans tango. La première, active par défaut, est obtenue grâce à la commande \verb+\tgostandardlists+; la seconde grâce à la commande \verb+\tgosmartlists+.
+%
+Avec \verb+\tgostandardlists+, le texte correspondant à un niveau donné est décalé vers la droite (d'une quantité égale à \verb+\TgoStandardMargin+...) par rapport au marqueur correspondant.
+%
+Avec \verb+\tgosmartlists+, à l'inverse, le texte correspondant à un niveau donné est décalé vers la gauche (d'une quantité égale à \verb+\TgoStandardMargin+...) par rapport au marqueur correspondant.
+\renewtgolabels*\tgostandardlists
+
+Voici le comportement par défaut de l'environnement \TO{itemize} (de ce point de vue \TO{enumerate} n'est pas différent).
+\begin{itemize}
+\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\begin{itemize}
+\item Integer sapien est, iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\begin{itemize}
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+\begin{itemize}
+\item Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\end{itemize}
+\item Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan eleifend, sagittis quis, diam.
+\end{itemize}\end{itemize}
+\item Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\end{itemize}
+
+\bigskip
+
+Et maintenant, avec \verb+\tgosmartlists+ \tgosmartlists
+\begin{itemize}
+\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\begin{itemize}
+\item Integer sapien est, iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\begin{itemize}
+\item Donec vehicula augue eu neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+\begin{itemize}
+\item Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris ut leo. Praesent eget sem vel leo ultrices bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar at, mollis ac, nulla. Curabitur auctor semper nulla.
+\end{itemize}
+\item Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan eleifend, sagittis quis, diam.
+\end{itemize}\end{itemize}
+\item Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat.
+\end{itemize}
+
+Notez que \verb+\tgosmartlists+ peut sembler intéressant lorsque l'on utilise essentiellement le premier niveau de ces environnements.
+Dans la mesure où \verb+\tgosmartlists+ supporte assez mal une construction comme
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{enumerate}
+\item\begin{enumerate}\item
+…
+\end{verbatim}
+\end{tcolorbox}
+fréquente dans la numérotation des questions d'exercices,
+les environnements \TO{secexo} et \TO{chapexo} basculent localement vers \verb+\tgostandardlists+. Cela n'est pas le cas de \verb+\exo+ qui, en en tant que commande, n'a pas de contexte propre, contrairement aux environnements. \tgostandardlists
+
+\subsection{Redéfinition de certains marqueurs de liste pour itemize}
+La classe tango fournit la commande \verb+\renewtgolabels+ qui permet de modifier les marqueurs de l'environnement \TO{itemize}. Les arguments des quatre niveaux sont numérotés de 1 à 4 et doivent être utilisés comme ci-dessous.
+
+\begin{example}[Exemples]
+\begin{itemize}
+\item\verb=\renewtgolabels1{\lefthand}= remplace le marqueur du niveau 1 par le symbole \lefthand.
+\renewtgolabels1{\lefthand}
+\item\verb=\renewtgolabels4{\textbullet}1{\openbullet}3{\textemdash}= change les marqueurs des premier, troisième et quatrième niveaux. Le marquer du niveau 2 est inchangé. Comme vous le voyez, l'ordre des arguments est sans importance. \renewtgolabels4{\textbullet}1{\openbullet}3{\textemdash}
+\end{itemize}
+\end{example}
+
+Il existe également une version étoilée, qui restaure l'état initial des marqueurs (tel qu'au chargement de la classe), soit \verb=\textbullet=, \textbullet, pour le niveaul~1, \verb=\textopenbullet=, \textopenbullet, pour le niveau~2, \verb=\starredbullet=, \starredbullet, pour le niveau~3 et \verb=\textperiodcentered=, \textperiodcentered{} pour le niveau~4 (remarquez que ce sont les valeurs par défaut pour tango, mais \emph{non} pour Latex).
+
+\renewtgolabels*
+\begin{example}[Exemples]
+\begin{itemize}
+\item\verb=\renewtgolabels*= restaure toutes les valeurs initiales.
+\item\verb=\renewtgolabels*2{\textendash}= restaure les valeurs initiales, sauf pour le deuxième niveau qui utilisera désormais \textendash.
+\end{itemize}
+\end{example}
+
+
+\section{Autres environnements}
+En plus des environnements définis pour les types d'énoncés, la classe tango offre les quatre environnements suivants.
+
+\subsection{Environnements remark et example}
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{remark}
+Voici une excellente remarque.
+\end{remark}
+\begin{example}
+Voici un très court exemple.
+\end{example}
+\end{verbatim}
+\end{tcolorbox}
+\begin{remark}
+Voici une excellente remarque.
+\end{remark}
+\begin{example}
+Voici un très court exemple.
+\end{example}
+
+Ces deux environnements ont un argument optionnel entre crochets qui permet de définir un titre alternatif. Par exemple:
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{example}[Remarques]
+\begin{enumerate}
+\item Une première (et excellente) remarque.
+\item Une seconde remarque (encore meilleure, si cela est possible).
+\end{enumerate}
+\end{example}
+\end{verbatim}
+\end{tcolorbox}
+\begin{example}[Remarques]
+\begin{enumerate}
+\item Une première (et excellente) remarque.
+\item Une seconde remarque (encore meilleure, si cela est possible).
+\end{enumerate}
+\end{example}
+
+\subsection{Environnement alert}
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{alert}
+Vous ne devriez pas envisager d'utiliser
+\verb+\expandafter\expandafter\expandafter+
+à moins que vous ne soyez un utilisateur expérimenté de
+\TeX{}, car vous pourriez attraper une terrible migraine.
+\end{alert}
+\end{verbatim}
+\end{tcolorbox}
+\begin{alert}
+Vous ne devriez pas envisager d'utiliser \verb+\expandafter\expandafter\expandafter+
+à moins que vous ne soyez un utilisateur expérimenté de \TeX{}, car vous pourriez attraper une terrible migraine.
+\end{alert}
+
+L'environnement \TO{alert} propose lui aussi un argument optionnel entre crochets.
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{alert}[\bomb]
+Vous ne devriez pas envisager d'utiliser
+\verb+\expandafter\expandafter\expandafter+
+à moins que vous ne soyez un utilisateur expérimenté de
+\TeX{}, car vous pourriez attraper une terrible migraine.
+\end{alert}
+\end{verbatim}
+\end{tcolorbox}
+\begin{alert}[\bomb]
+Vous ne devriez pas envisager d'utiliser
+\verb+\expandafter\expandafter\expandafter+
+à moins que vous ne soyez un utilisateur expérimenté de
+\TeX{}, car vous pourriez attraper une terrible migraine.
+\end{alert}
+
+\subsection{Environnement proof}
+L'environnement \TO{proof} est une adaptation de ce que fournit le package \TO{amsthm}. Un titre alternatif est rendu possible grâce à l'argument optionnel entre crochets. La commande \verb+\qedhere+ est également utilisable.
+\renewstatement{thm}{thm}{Théorème}[\itshape]
+\setcounter{thm}{0}
+\begin{tcolorbox}
+\begin{verbatim}
+\begin{thm}
+La somme de deux entiers impairs est un entier pair.
+\end{thm}
+\begin{proof}
+Soit $p$ et $q$ deux entiers impairs. Nous devons
+établir qu'il existe un entier $n$ tel que $p+q=2n$.
+Nous connaissons l'existence d'un entier $p_1$
+et d'un entier $q_1$ tels que
+\[p=2p_1+1\text{ et } q=2q_1+1,\]
+par conséquent
+\begin{align*}p+q&=(2p_1+1)+(2q_1+1)\\
+&=2\underbrace{(p_1+q_1+1)}_{n}\qedhere
+\end{align*}
+\end{proof}
+\end{verbatim}
+\end{tcolorbox}
+\begin{thm}
+La somme de deux entiers impairs est un entier pair.
+\end{thm}
+\begin{proof}
+Soit $p$ et $q$ deux entiers impairs. Nous devons
+établir qu'il existe un entier $n$ tel que $p+q=2n$.
+Nous connaissons l'existence d'un entier $p_1$
+et d'un entier $q_1$ tels que
+\[p=2p_1+1\text{ et } q=2q_1+1,\]
+par conséquent
+\begin{align*}p+q&=(2p_1+1)+(2q_1+1)\\
+&=2\underbrace{(p_1+q_1+1)}_{n}\qedhere
+\end{align*}
+\end{proof}
+
+\section{Figures, tableaux, flottants et légendes}\label{figtable}
+Grâce au package \TO{caption}, les commandes suivantes ont été définies:
+\begin{itemize}
+\item\verb+\tgofigcaption+ (pour les figures);
+\item and \verb+\tgotabcaption+ (pour les tableaux).
+\end{itemize}
+Ces deux commandes permettent d'obtenir des légendes de même apparence que ce que ferait la commande \verb+\caption+, mais fonctionnent également dans le cas d'objets non flottants.
+
+Ainsi il devient possible d'inclure des tableaux et des figures en position fixe, sans que rien ne permette de les distinguer des objets flottants (dont l'usage reste recommandé dans la plupart des cas).
+
+\end{document}
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 81f07ac38fa..c97974fc200 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/NEWS
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -1,5 +1,26 @@
History of the luamplib package
+2024/07/17 2.34.0
+ * support transparency group with metafun format
+ * fix regarding default value in circular fading mode
+ * fix regarging the scope of graphics state
+
+2024/07/14 2.33.1
+ * refactor the manual, including some minor items undocumented so far
+ * improve fading routine to get possibly smaller pdf file
+
+2024/07/08 2.33.0
+ * provide a new metapost operator 'withfademethod' and related macros,
+ which make the color of an object gradiently transparent. see luamplib
+ document for details.
+
+ * fix spot-color shading routine to support user-defined colorspace
+
+2024/07/03 2.32.4
+ * make the variable 'patterns' local
+ * 'math.randomseed' on plain TeX
+ * remove redundant code 'fullcircle scaled 0'
+
2024/06/21 2.32.3
* 'coloured' is a synonym of the option 'colored' in pattern definition.
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index e51324ffe40..d59201ed00f 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
+++ b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
index c2d8cb498bf..b2f2f63cb70 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
@@ -7,7 +7,7 @@
\usepackage{fontspec}
\setmainfont{latin modern roman}
\usepackage{luamplib}
-\usepackage{xcolor}
+\usepackage{graphicx,xcolor}
\everymplib{ beginfig(0); }
\everyendmplib{ endfig; }
\mpliblegacybehavior{true}%
@@ -268,19 +268,64 @@ draw mpliboutlinetext.b ("$\displaystyle\frac{1}{1-x^2}$")
\tiny\TeX
\end{mppattern}\relax
\mpfig
- picture tex; tex := mpliboutlinetext.p ("\bfseries \TeX");
- i:=0;
- for item within tex:
- i:=i+1;
- if i < length tex:
- fill pathpart item scaled 10 withpostscript "collect";
- else:
- draw pathpart item scaled 10 withpattern "pattuncolored"
- withpen pencircle scaled 1/2
- withcolor 0.7 blue;
- fi
+ picture tex;
+ tex = mpliboutlinetext.p ("\bfseries \TeX");
+ for i=1 upto mpliboutlinenum:
+ j:=0;
+ for item within mpliboutlinepic[i]:
+ j:=j+1;
+ draw pathpart item scaled 10
+ if j < length mpliboutlinepic[i]:
+ withpostscript "collect"
+ else:
+ withpattern "pattuncolored"
+ withfademethod "linear"
+ withfadebbox (10 llcorner mpliboutlinepic[i], 10 urcorner mpliboutlinepic[i])
+ withpen pencircle scaled 1/2
+ withcolor (i/4)[red,blue]
+ fi;
+ endfor
endfor
\endmpfig
+\par\leavevmode
+\mpfig
+ picture mill; mill = btex \includegraphics[width=100bp]{mill} etex;
+ draw mill;
+ mill := mill shifted 125right;
+ draw mill
+ withfademethod "circular"
+ withfadecenter (center mill, center mill)
+ withfaderadius (20, abs(lrcorner mill - llcorner mill)/2)
+ withfadeopacity (1, 0)
+ ;
+\endmpfig
+\par
+\def\test#1{%
+ \mpfig
+ fill unitsquare shifted -center unitsquare scaled 200
+ withshademethod "linear"
+ withshadecolors (.3[red,white], .3[blue,white])
+ ;
+ label( btex MetaPost etex scaled 3, origin) ;
+ draw image(
+ fill fullcircle scaled 100 shifted 25left
+ withcolor .8white
+ withtransparency (2,1)
+ ;
+ fill fullcircle scaled 100 shifted 25right
+ withcolor .8white
+ withtransparency (2,1)
+ ;
+ )
+ asgroup "#1"
+ withtransparency (1,.5)
+ ;
+ currentpicture := currentpicture scaled 3/4;
+ \endmpfig
+}%
+\hbox{\test{isolated,knockout}\,\test{isolated}\vbox to\MPheight{\vss\hbox{~isolated}\vss}}%
+\hbox{\test{knockout}\,\test{}}%
+\hbox to\MPwidth{\hss knockout\hss}%
\tracingcommands0
\vskip 2\baselineskip
diff --git a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
index c178acb31a7..622932ca104 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
@@ -261,19 +261,39 @@ draw mpliboutlinetext.b ("$\overbrace{x+\cdots+x}^k$")
\fiverm\TeX
\endmppattern
\mpfig
- picture tex; tex := mpliboutlinetext.p ("\bf \TeX");
- i:=0;
- for item within tex:
- i:=i+1;
- if i < length tex:
- fill pathpart item scaled 10 withpostscript "collect";
- else:
- draw pathpart item scaled 10 withpattern "pattuncolored"
- withpen pencircle scaled 1/2
- withcolor 0.7 blue;
- fi
+ picture tex;
+ tex = mpliboutlinetext.p ("\bf \TeX");
+ for i=1 upto mpliboutlinenum:
+ j:=0;
+ for item within mpliboutlinepic[i]:
+ j:=j+1;
+ draw pathpart item scaled 10
+ if j < length mpliboutlinepic[i]:
+ withpostscript "collect"
+ else:
+ withpattern "pattuncolored"
+ withfademethod "linear"
+ withfadebbox (10 llcorner tex, 10 urcorner tex)
+ withpen pencircle scaled 1/2
+ withcolor (i/4)[red,blue]
+ fi;
+ endfor
endfor
\endmpfig
+\mpfig
+fill fullcircle scaled 125 withcolor 2/3[blue,white];
+draw image(
+ draw (left--right) rotated 45 scaled 50
+ withpen pencircle scaled 20
+ ;
+ draw (left--right) rotated -45 scaled 50
+ withpen pencircle scaled 20
+ ;
+ )
+ asgroup ""
+ withprescript "tr_transparency=.3"
+ ;
+\endmpfig
\tracingcommands0
\vskip 2\baselineskip
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 9224c83b0b1..0bc40ac6434 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20240514.0
+The LuaTeX-ja Package 20240714.0
--------------------------------
Copyright (c) 2011--2024 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -42,7 +42,7 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20240514.0 in the Git repository by
+ or tagged as 20240714.0 in the Git repository by
<https://github.com/luatexja/luatexja/archive/refs/tags/$VER.zip>
b. Extract the archive and process following three files by LuaLaTeX
@@ -92,4 +92,4 @@ Notes
This file and ltj-kinsoku.lua are not used anymore.
(Do not remove ltj-kinsoku.tex.)
-Last commit date: Tue May 14 19:12:05 2024 +0900
+Last commit date: Sun Jul 14 08:56:04 2024 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index de28e1d279c..eac7af315de 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index 49a8a6feef0..ee55789a603 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
index b550dc58d44..9ad52094656 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
@@ -1467,14 +1467,19 @@ Alphabetic fonts
&\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\
\midrule
Japanese fonts
-&\cs{newjfontfamily}&\cs{renewjfontfamily}&\cs{setjfontfamily}\\
+&\cs{newjfontfamily}&\cs{renewjfontfamily}&\cs{setjfontfamily}&\cs{providejfontfamily}\\
Alphabetic fonts
-&\cs{newfontfamily}&\cs{renewfontfamily}&\cs{setfontfamily}\\
+&\cs{newfontfamily}&\cs{renewfontfamily}&\cs{setfontfamily}&\cs{providefontfamily}\\
\midrule
Japanese fonts
-&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
+&\cs{newjfontface}&\cs{renewjfontface}&\cs{setjfontface}&\cs{providejfontface}\\
Alphabetic fonts
-&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
+&\cs{newfontface}&\cs{renewfontface}&\cs{setfontface}&\cs{providefontface}\\
+\midrule
+Japanese fonts
+&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
+Alphabetic fonts
+&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
\bottomrule
\end{tabular}\par}
\end{table}
@@ -1492,14 +1497,19 @@ Alphabetic fonts
&\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\
\midrule
\emph{和文}
-&\cs{newjfontfamily}&\cs{renewjfontfamily}&\cs{setjfontfamily}\\
+&\cs{newjfontfamily}&\cs{renewjfontfamily}&\cs{setjfontfamily}&\cs{providejfontfamily}\\
+\emph{欧文}
+&\cs{newfontfamily}&\cs{renewfontfamily}&\cs{setfontfamily}&\cs{providefontfamily}\\
+\midrule
+\emph{和文}
+&\cs{newjfontface}&\cs{renewjfontface}&\cs{setjfontface}&\cs{providejfontface}\\
\emph{欧文}
-&\cs{newfontfamily}&\cs{renewfontfamily}&\cs{setfontfamily}\\
+&\cs{newfontface}&\cs{renewfontface}&\cs{setfontface}&\cs{providefontface}\\
\midrule
\emph{和文}
-&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
+&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
\emph{欧文}
-&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
+&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
\bottomrule
\end{tabular}\par}
\end{table}
@@ -7833,7 +7843,7 @@ stretch_priority={kanjiskip=-35,xkanjiskip=-25,others=50}
さらに,バージョン20220211.0以降では次の命令が提供される.
\begin{cslist}
- \item[\cs{ltjghostbeginjachar}]
+ \item[\cs{ltjghostbeforejachar}]
\LuaTeX-ja本体が提供している\cs{ltjfakeparbegin}, \cs{ltjfakeboxbdd}と類似の命令である.
実行された箇所が(限定・非限定を問わず)水平モードであった場合に,実行された箇所は
「文字クラス0の\textbf{JAchar}」の直前であると,
@@ -7850,7 +7860,7 @@ A\LG 字 \par% ==> ALchar--(xkanjiskip)--\LG
\end{LTXexample}
\item[\cs{ltjghostafterjachar}]
- \cs{ltjghostbeginjachar}と対を成す命令で,実行された箇所は
+ \cs{ltjghostbeforejachar}と対を成す命令で,実行された箇所は
「文字クラス0の\textbf{JAchar}」の直後であると,
\LuaTeX-jaの和文処理グルー挿入処理に認識させる.以下の実行例を参照.
diff --git a/Master/texmf-dist/doc/luatex/luaxml/README b/Master/texmf-dist/doc/luatex/luaxml/README
index 5df074c453b..6a81ab25ce0 100644
--- a/Master/texmf-dist/doc/luatex/luaxml/README
+++ b/Master/texmf-dist/doc/luatex/luaxml/README
@@ -32,7 +32,7 @@ Author
------
Michal Hoftich
Email: michal.h21@gmail.com
-Version: v0.1r, 2024-02-23
+Version: v0.2, 2024-07-14
Original authors: Paul Chakravarti and Manoel Campos (http://manoelcampos.com)
diff --git a/Master/texmf-dist/doc/luatex/luaxml/luaxml.pdf b/Master/texmf-dist/doc/luatex/luaxml/luaxml.pdf
index f574a0a5287..071fa4e4cd0 100644
--- a/Master/texmf-dist/doc/luatex/luaxml/luaxml.pdf
+++ b/Master/texmf-dist/doc/luatex/luaxml/luaxml.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex b/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex
index 5031a0468e2..bf3b8fbaa74 100644
--- a/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex
+++ b/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex
@@ -7,7 +7,7 @@
\usepackage{framed}
% Version is defined in the makefile, use default values when compiled directly
\ifdefined\version\else
-\def\version{v0.1r}
+\def\version{v0.2}
\let\gitdate\date
\fi
\newcommand\modulename[1]{\subsection{#1}\label{sec:#1}}
@@ -99,6 +99,67 @@ end
\end{luacode*}
\end{framed}
+\subsection{HTML parsing}
+
+You can parse HTML documents using the \verb|DOM_Object.html_parse| function. This parser is slower
+than the default XML parser, but it can load files that would cause errors in the XML mode.
+It can handle wrongly nested HTML tags, inline JavaScript and CSS styles, and other HTML features
+that would cause XML errors.
+
+\begin{verbatim}
+dom = require "luaxml-domobject"
+local document = [[
+<html>
+<head><title>sample</title></head>
+<body>
+<h1>test</h1>
+<p>hello
+<p>another paragraph
+<ul>
+<li>first
+<li>second
+</ul>
+</body>
+</html>
+ ]]
+
+-- dom.html_parse returns the DOM_Object
+obj = dom.html_parse(document)
+-- print names of all elements contained in body
+for _, x in ipairs(obj:query_selector("body *")) do
+ tex.print(x:get_element_name().. "\\par")
+end
+\end{verbatim}
+
+
+\begin{framed}
+\begin{luacode*}
+dom = require "luaxml-domobject"
+local document = [[
+<html>
+<head><title>sample</title></head>
+<body>
+<h1>test</h1>
+<p>hello
+<p>another paragraph
+<ul>
+<li>first
+<li>second
+</ul>
+</body>
+</html>
+ ]]
+
+-- dom.html_parse returns the DOM_Object
+obj = dom.html_parse(document)
+-- print names of all elements contained in body
+for _, x in ipairs(obj:query_selector("body *")) do
+ tex.print(x:get_element_name().. "\\par")
+end
+\end{luacode*}
+\end{framed}
+
+
\subsection{Void elements}
The \verb|DOM_Object.parse| function tries to support the HTML void elements,
@@ -641,6 +702,35 @@ transform.print_tex("\\verb|" .. result .. "|")
\end{luacode*}
\end{framed}
+\section{Character sets handling}
+
+The \texttt{luaxml-encodings} library provides functions to convert texts in legacy 8-bit encodings such as WINDOWS-1250
+or ISO-8859-2 to UTF-8. This can be useful in fixing document encoding before HTML parsing using the \texttt{luaxml-mod-html}
+library.
+
+\subsection{Example}
+
+
+\begin{verbatim}
+kpse.set_program_name "luatex"
+local encodings = require "luaxml-encodings"
+
+--read HTML page from the standard input
+local text = io.read("*all")
+-- find the character encoding in HTML metadata
+local enc = encodings.find_html_encoding(text)
+if enc then
+ -- local conversion table for the found encoding
+ local mapping = encodings.load_mapping(enc)
+ if mapping then
+ -- if the mapping exists, recode the HTML input and print it
+ local converted = encodings.recode(text, mapping)
+ print(converted)
+ end
+end
+\end{verbatim}
+
+
\section{The API documentation}
diff --git a/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf b/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
index 58f3955e40d..1cc73521b36 100644
--- a/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf b/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
index bcdac1307c6..48b30c5187f 100644
--- a/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/typog-grep.1 b/Master/texmf-dist/doc/man/man1/typog-grep.1
index 372c87bc5ff..7506156a012 100644
--- a/Master/texmf-dist/doc/man/man1/typog-grep.1
+++ b/Master/texmf-dist/doc/man/man1/typog-grep.1
@@ -1,4 +1,5 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
+.\" -*- mode: troff; coding: utf-8 -*-
+.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -15,29 +16,12 @@
.ft R
.fi
..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>.
.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
. ds C` ""
. ds C' ""
'br\}
.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
. ds C`
. ds C'
'br\}
@@ -68,180 +52,163 @@
. \}
.\}
.rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
.IX Title "TYPOG-GREP 1"
-.TH TYPOG-GREP 1 "2024-05-07" "perl v5.36.0" "User Contributed Perl Documentation"
+.TH TYPOG-GREP 1 2024/07/08 0.4 "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
.\" Turn off justification.
.na
-.SH "NAME"
-typog\-grep \- grep for typog\-inspect elements in LaTeX log files
-.SH "SYNOPSIS"
+.SH NAME
+typog\-grep \- specialized grep for typog\-inspect elements in LaTeX log files
+.SH SYNOPSIS
.IX Header "SYNOPSIS"
-.IP "\fBtypog-grep\fR \-a|\-\-all|\-\-any [\fI\s-1OPTION\s0\fR...] \fILOG-FILE\fR..." 4
+.IP "\fBtypog-grep\fR \-a|\-\-all|\-\-any [\fIOPTION\fR...] \fILOG-FILE\fR..." 4
.IX Item "typog-grep -a|--all|--any [OPTION...] LOG-FILE..."
.PD 0
-.IP "\fBtypog-grep\fR [\fI\s-1OPTION\s0\fR...] \fI\s-1REGEXP\s0\fR \fILOG-FILE\fR..." 4
+.IP "\fBtypog-grep\fR [\fIOPTION\fR...] \fIREGEXP\fR \fILOG-FILE\fR..." 4
.IX Item "typog-grep [OPTION...] REGEXP LOG-FILE..."
.PD
.PP
-The first form shows all \f(CW\*(C`<typog\-inspect id="\f(CIID\f(CW" ...>\*(C'\fR elements in \fILOG-FILE\fR.
+The first form, ``discovery mode'', shows all \fIID\fRs of
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" ...>
+.EE
+.RE
+.PP
+
+elements in \fILOG-FILE\fR.
.PP
-The second form shows the contents of \f(CW\*(C`<typog\-inspect id="\f(CIID\f(CW" ...>\*(C'\fR elements
-whose \fI\s-1ID\s0\fRs match \fI\s-1REGEXP\s0\fR in \fILOG-FILE\fR.
+The second form shows the contents, \fILOG-DATA\fR, of the elements
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" ...>
+\fILOG-DATA\fP
+</typog-inspect>
+.EE
+.RE
+.PP
+
+whose \fIID\fRs match \fIREGEXP\fR in \fILOG-FILE\fR.
.PP
If no \fILOG-FILE\fR is given read from \fIstdin\fR.
The filename\ \f(CW\*(C`\-\*(C'\fR is synonymous to \fIstdin\fR.
-.SH "DESCRIPTION"
+.SH DESCRIPTION
.IX Header "DESCRIPTION"
-\&\fBtypog-grep\fR is a tailored post-processor for LaTeX log files
-and the \f(CW\*(C`typoginspect\*(C'\fR environment as provided by package\ typog.
+\&\fBtypog-grep\fR is a tailored post-processor for LaTeX \fIlog\fR\ files
+and the \f(CW\*(C`typoginspect\*(C'\fR environment as provided by the LaTeX\ package\ typog.
It shares more with the venerable
\&\fBsgrep\fR <https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html>
-than with \s-1POSIX\s0\ \fBgrep\fR <https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html>.
-.PP
-The LaTeX user brackets her text in
+than with POSIX\ \fBgrep\fR\ <https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html>.
.PP
-.Vb 3
-\& \ebegin{typoginspect}{ID}
-\& Text and code to investigate
-\& \eend{typoginspect}
-.Ve
+In the LaTeX source file the user brackets her text or code
+in a \f(CW\*(C`typoginspect\*(C'\fR environment:
+.RS
+.EX
+\ebegin{typoginspect}{\fI\,ID\/\fP}
+\fITEXT-OR-CODE-TO-INVESTIGATE\fP
+\eend{typoginspect}
+.EE
+.RE
.PP
-where \fI\s-1ID\s0\fR is used to identify one or more bracketed snippets.
-\&\fI\s-1ID\s0\fR does not have to be unique.
-The \fI\s-1REGEXP\s0\fR mechanism makes it easy to select groups of related \fI\s-1ID\s0\fRs
+
+where \fIID\fR is used to identify one or more bracketed snippets.
+\&\fIID\fR does not have to be unique.
+The \fIREGEXP\fR mechanism makes it easy to select groups of related \fIID\fRs
if they are named accordingly.
.PP
-In \fILOG-FILE\fR the environment shows up, packed with tracing information, as
-.PP
-.Vb 3
-\& <typog\-inspect id="ID" job="JOB\-NAME" line="LINE\-NUMBER" page="PAGE\-NUMBER">
-\& Trace Data
-\& </typog\-inspect>
-.Ve
+In \fILOG-FILE\fR the result of the environment shows up,
+packed with tracing information, as
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" job="\fI\,JOB-NAME\/\fP" line="\fI\,LINE-NUMBER\/\fP" page="\fI\,PAGE-NUMBER\/\fP">
+\fILOG-DATA\fP
+</typog-inspect>
+.EE
+.RE
.PP
+
where all the capital-letter sequences are meta-variables
and in particular
\&\fIJOB-NAME\fR is the expansion of \f(CW\*(C`\ejobname\*(C'\fR,
\&\fILINE-NUMBER\fR is the LaTeX source file line number
of the beginning of the \f(CW\*(C`typoginspect\*(C'\fR environment,
and \fIPAGE-NUMBER\fR is the page where
-the output of \f(CW\*(C`Text\ and\ code\ to\ investigate\*(C'\fR occurs.
+the output of \f(CW\*(C`TEXT\-OR\-CODE\-TO\-INVESTIGATE\*(C'\fR occurs.
.PP
\&\fBtypog-grep\fR reveals the contents of \fILOG-FILE\fR
-between \f(CW\*(C`<typog\-inspect id="\f(CIID\f(CW" ...>\*(C'\fR
-and \f(CW\*(C`</typog\-inspect>\*(C'\fR excluding the XML-tags.
+between \f(CW\*(C`<typog\-inspect id="\fR\f(CIID\fR\f(CW" ...>\*(C'\fR
+and \f(CW\*(C`</typog\-inspect>\*(C'\fR excluding the XML-tags themselves.
Access the \fIJOB-NAME\fR, \fILINE-NUMBER\fR, and \fIPAGE-NUMBER\fR
with the commandline options
-\&\fB\-\-job\-name\fR, \fB\-\-line\-number\fR, and \fB\-\-page\-number\fR, respectively.
-Use \fB\-\-id\fR to show the name of the IDs that matched \fI\s-1REGEXP\s0\fR.
+\&\fB\-\-job\-name\fR, \fB\-\-line\-number\fR, and \fB\-\-page\-number\fR, respectively.
+Use \fB\-\-id\fR to show the name of the IDs that matched \fIREGEXP\fR.
.PP
\&\f(CW\*(C`typoginspect\*(C'\fR environments can be nested.
\&\fBtypog-grep\fR respects the nesting,
-i.e., if the \fI\s-1ID\s0\fR of the nested environment does not match \fI\s-1REGEXP\s0\fR
+i.e., if the \fIID\fR of the nested environment does not match \fIREGEXP\fR
it will not be included in the program's output.
-.SH "OPTIONS"
+.SH OPTIONS
.IX Header "OPTIONS"
The list of options is sorted by the names of the long options.
.IP "\fB\-a\fR, \fB\-\-all\fR, \fB\-\-any\fR" 4
.IX Item "-a, --all, --any"
ID-discovery mode:
-Show all \f(CW\*(C`typog\-inspect\*(C'\fR elements independent of any matching patterns.
-.IP "\fB\-\-color\fR, \fBcolour\fR \fI\s-1WHEN\s0\fR" 4
+Discover all \f(CW\*(C`typog\-inspect\*(C'\fR elements independent of any matching patterns
+and print their \fIID\fRs.
+The results are printed in their order of occurrence in the respective \fILOG-FILE\fRs.
+Pipe the output into \fBsort\fR to get alphabetically ordered \fIID\fRs.
+.Sp
+Augment with options
+\&\fB\-\-job\-name\fR, \fB\-\-line\-number\fR, \fB\-\-log\-line\-number\fR, or \fB\-\-page\-number\fR
+for more information.
+.IP "\fB\-\-color\fR, \fBcolour\fR \fIWHEN\fR" 4
.IX Item "--color, colour WHEN"
-Colorize specific log contents for the matching ids.
-The argument\ \fI\s-1WHEN\s0\fR determines when to apply color:
+Colorize specific log contents for the matching \fIID\fRs.
+The argument\ \fIWHEN\fR determines when to apply color:
\&\f(CW\*(C`always\*(C'\fR, \f(CW\*(C`never\*(C'\fR, or\ \f(CW\*(C`auto\*(C'\fR.
The setting \f(CW\*(C`auto\*(C'\fR checks whether standard output has been redirected.
This is the default.
-.IP "\fB\-C\fR, \fB\-\-config\fR \fI\s-1KEY\s0\fR=\fI\s-1VALUE\s0\fR[:\fI\s-1KEY\s0\fR=\fI\s-1VALUE\s0\fR[:...]]" 4
+.IP "\fB\-C\fR, \fB\-\-config\fR \fIKEY\fR=\fIVALUE\fR[:\fIKEY\fR=\fIVALUE\fR[:...]]" 4
.IX Item "-C, --config KEY=VALUE[:KEY=VALUE[:...]]"
-Set one or more configuration \fI\s-1KEY\s0\fR to \fI\s-1VALUE\s0\fR pairs.
-See Sec.\ \s-1CONFIGURATION\s0 below for a description of all available configuration items.
-Use option \fB\-\-show\-config\fR to display the default configuration.
-.IP "\fB\-\-debug\fR" 4
+Set one or more configuration \fIKEY\fR to \fIVALUE\fR pairs.
+See section "CONFIGURATION" for a description
+of all available configuration items.
+Use option\ \fB\-\-show\-config\fR to display the default configuration.
+.IP \fB\-\-debug\fR 4
.IX Item "--debug"
Turn on debug output on \fIstderr\fR.
+.IP "\fB\-E\fR, \fB\-\-encoding\fR \fIENCODING\fR" 4
+.IX Item "-E, --encoding ENCODING"
+Set the \fIENCODING\fR of \fILOG-FILE\fR for the translation to UTF\-8.
+The default is unset.
+.Sp
+Use this option to get rid of pesky
+"<\fIHEX-DIGITS\fR>"\ escapes on UTF\-8 terminals.
+See option\ \fB\-\-show\-encodings\fR for the known encodings and
+Encode::Supported for a summary of all encodings.
+See also section\ "Some\ Common\ Encodings".
+.Sp
+Apply \fBiconv\fR <https://pubs.opengroup.org/onlinepubs/9699919799/utilities/iconv.html>
+(POSIX) or \fBrecode\fR <https://github.com/rrthomas/recode/> (GNU) on \fILOG-FILE\fR
+before this tool to avoid having to use option\ \fB\-\-encoding\fR.
.IP "\fB\-h\fR, \fB\-\-help\fR" 4
.IX Item "-h, --help"
Display brief help then exit.
.IP "\fB\-i\fR, \fB\-\-[no\-]id\fR" 4
.IX Item "-i, --[no-]id"
-Print the actual id name that matched \fI\s-1REGEXP\s0\fR.
-Control the appearance of the matching id with configuration item\ \f(CW\*(C`id\-heading\*(C'\fR.
+Print the actual ID-name that matched \fIREGEXP\fR.
+Control the appearance of the matching \fIID\fR with configuration item\ \f(CW\*(C`id\-heading\*(C'\fR.
.IP "\fB\-y\fR, \fB\-\-[no\-]ignore\-case\fR" 4
.IX Item "-y, --[no-]ignore-case"
-Match ids while ignoring case distinctions in patterns and data.
+Match \fIID\fRs while ignoring case distinctions in patterns and data.
.IP "\fB\-j\fR, \fB\-\-[no\-]job\-name\fR" 4
.IX Item "-j, --[no-]job-name"
-Print the \f(CW\*(C`\ejobname\*(C'\fR that \fBtex\fR associated with the input file.
+Print the \f(CW\*(C`\ejobname\*(C'\fR that \fBlatex\fR associated with the input file.
.IP "\fB\-n\fR, \fB\-\-[no\-]line\-number\fR" 4
.IX Item "-n, --[no-]line-number"
Print the line number where the \f(CW\*(C`typoginspect\*(C'\fR\ environment
@@ -256,76 +223,79 @@ starts in the typeset document.
.IP "\fB\-P\fR, \fB\-\-[no\-]pager\fR" 4
.IX Item "-P, --[no-]pager"
Redirect output from \fIstdout\fR to the configured pager.
-.IP "\fB\-\-show\-config\fR" 4
+.IP \fB\-\-show\-config\fR 4
.IX Item "--show-config"
Show the default configuration and exit.
+.IP \fB\-\-show\-encodings\fR 4
+.IX Item "--show-encodings"
+Show all known encodings and exit.
.IP "\fB\-V\fR, \fB\-\-version\fR" 4
.IX Item "-V, --version"
Show version information and exit.
.IP "\fB\-w\fR, \fB\-\-[no\-]word\-regexp\fR" 4
.IX Item "-w, --[no-]word-regexp"
Match only whole words.
-.SH "CONFIGURATION"
+.SH CONFIGURATION
.IX Header "CONFIGURATION"
-.ie n .IP """id\-format""=\fI\s-1FORMAT\s0\fR" 4
-.el .IP "\f(CWid\-format\fR=\fI\s-1FORMAT\s0\fR" 4
+.ie n .IP """id\-format""=\fIFORMAT\fR" 4
+.el .IP \f(CWid\-format\fR=\fIFORMAT\fR 4
.IX Item "id-format=FORMAT"
-Control the \fI\s-1FORMAT\s0\fR for printing matching ids in inline-mode,
-where \fI\s-1FORMAT\s0\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
+Control the \fIFORMAT\fR for printing matching ids in inline-mode,
+where \fIFORMAT\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
Default:\ \f(CW%s:\fR.
.ie n .IP """id\-heading""=0|1" 4
-.el .IP "\f(CWid\-heading\fR=\f(CW0\fR|\f(CW1\fR" 4
+.el .IP \f(CWid\-heading\fR=\f(CW0\fR|\f(CW1\fR 4
.IX Item "id-heading=0|1"
-Choose between printing the matching ids with option\ \fB\-\-id\fR:
+Choose between printing the matching \fIID\fRs with option\ \fB\-\-id\fR:
Inline\ (\f(CW0\fR) or heading before the matching data (\f(CW1\fR).
Default:\ \f(CW0\fR.
-.ie n .IP """id\-heading\-format""=\fI\s-1FORMAT\s0\fR" 4
-.el .IP "\f(CWid\-heading\-format\fR=\fI\s-1FORMAT\s0\fR" 4
+.ie n .IP """id\-heading\-format""=\fIFORMAT\fR" 4
+.el .IP \f(CWid\-heading\-format\fR=\fIFORMAT\fR 4
.IX Item "id-heading-format=FORMAT"
-Control the \fI\s-1FORMAT\s0\fR for printing matching ids in heading-mode,
-where \fI\s-1FORMAT\s0\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
+Control the \fIFORMAT\fR for printing matching \fIID\fRs in heading-mode,
+where \fIFORMAT\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
Default:\ \f(CW\*(C`\-\->\ %s\ <\-\-\*(C'\fR.
-.ie n .IP """id\-indent""=\fI\s-1INDENT\s0\fR" 4
-.el .IP "\f(CWid\-indent\fR=\fI\s-1INDENT\s0\fR" 4
+.ie n .IP """id\-indent""=\fIINDENT\fR" 4
+.el .IP \f(CWid\-indent\fR=\fIINDENT\fR 4
.IX Item "id-indent=INDENT"
Indentation of nested typog-inspect tags.
-Only used in ``discovery'' mode (first form), i.e., if \fB\-\-all\fR is active.
+Only used in ``discovery mode'' (first form), i.e., if \fB\-\-all\fR is active.
Default:\ 8.
.ie n .IP """id\-max\-length""=\fIMAXIMUM-LENGTH\fR" 4
-.el .IP "\f(CWid\-max\-length\fR=\fIMAXIMUM-LENGTH\fR" 4
+.el .IP \f(CWid\-max\-length\fR=\fIMAXIMUM-LENGTH\fR 4
.IX Item "id-max-length=MAXIMUM-LENGTH"
-Set the maximum length of a matching id for printing.
-It a matching id exceeds this length it will be truncated
+Set the maximum length of a matching \fIID\fR for printing.
+It a matching \fIID\fR exceeds this length it will be truncated
and the last three characters (short of \fIMAXIMUM-LENGTH\fR) will be replaced by dots.
Default:\ 40.
-.ie n .IP """line\-number\-format""=\fI\s-1FORMAT\s0\fR" 4
-.el .IP "\f(CWline\-number\-format\fR=\fI\s-1FORMAT\s0\fR" 4
+.ie n .IP """line\-number\-format""=\fIFORMAT\fR" 4
+.el .IP \f(CWline\-number\-format\fR=\fIFORMAT\fR 4
.IX Item "line-number-format=FORMAT"
-Control the \fI\s-1FORMAT\s0\fR for printing TeX source line numbers,
-where \fI\s-1FORMAT\s0\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
+Control the \fIFORMAT\fR for printing TeX source line numbers,
+where \fIFORMAT\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
Default:\ \f(CW%5d\fR.
-.ie n .IP """log\-line\-number\-format""=\fI\s-1FORMAT\s0\fR" 4
-.el .IP "\f(CWlog\-line\-number\-format\fR=\fI\s-1FORMAT\s0\fR" 4
+.ie n .IP """log\-line\-number\-format""=\fIFORMAT\fR" 4
+.el .IP \f(CWlog\-line\-number\-format\fR=\fIFORMAT\fR 4
.IX Item "log-line-number-format=FORMAT"
-Control the \fI\s-1FORMAT\s0\fR for printing log line numbers,
-where \fI\s-1FORMAT\s0\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
+Control the \fIFORMAT\fR for printing log line numbers,
+where \fIFORMAT\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
Default:\ \f(CW%6d\fR.
-.ie n .IP """page\-number\-format""=\fI\s-1FORMAT\s0\fR" 4
-.el .IP "\f(CWpage\-number\-format\fR=\fI\s-1FORMAT\s0\fR" 4
+.ie n .IP """page\-number\-format""=\fIFORMAT\fR" 4
+.el .IP \f(CWpage\-number\-format\fR=\fIFORMAT\fR 4
.IX Item "page-number-format=FORMAT"
-Control the \fI\s-1FORMAT\s0\fR for printing page numbers,
-where \fI\s-1FORMAT\s0\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
+Control the \fIFORMAT\fR for printing page numbers,
+where \fIFORMAT\fR is passed to Perl's \f(CW\*(C`printf\*(C'\fR.
Default:\ \f(CW\*(C`[%3d]\*(C'\fR.
-.ie n .IP """pager""=\fI\s-1PAGER\s0\fR" 4
-.el .IP "\f(CWpager\fR=\fI\s-1PAGER\s0\fR" 4
+.ie n .IP """pager""=\fIPAGER\fR" 4
+.el .IP \f(CWpager\fR=\fIPAGER\fR 4
.IX Item "pager=PAGER"
Name of pager application to pipe output into
if run with option\ \fB\-\-pager\fR.
Default:\ \f(CW\*(C`less\*(C'\fR.
-.ie n .IP """pager\-flags""=\fI\s-1FLAGS\s0\fR" 4
-.el .IP "\f(CWpager\-flags\fR=\fI\s-1FLAGS\s0\fR" 4
+.ie n .IP """pager\-flags""=\fIFLAGS\fR" 4
+.el .IP \f(CWpager\-flags\fR=\fIFLAGS\fR 4
.IX Item "pager-flags=FLAGS"
-Pass \fI\s-1FLAGS\s0\fR to \fI\s-1PAGER\s0\fR.
+Pass \fIFLAGS\fR to \fIPAGER\fR.
Default:\ \f(CW\*(C`\-\-quit\-if\-one\-screen\*(C'\fR.
.IP "Color Configuration" 4
.IX Item "Color Configuration"
@@ -333,64 +303,64 @@ For the syntax of the color specifications consult
the manual page of Term::ANSIColor(pm).
.RS 4
.ie n .IP """file\-header\-color""" 4
-.el .IP "\f(CWfile\-header\-color\fR" 4
+.el .IP \f(CWfile\-header\-color\fR 4
.IX Item "file-header-color"
Color of the filename header.
.ie n .IP """fill\-state\-color""" 4
-.el .IP "\f(CWfill\-state\-color\fR" 4
+.el .IP \f(CWfill\-state\-color\fR 4
.IX Item "fill-state-color"
Color of the messages that report ``Underfull hbox'' or ``Overfull hbox''.
.ie n .IP """first\-vbox\-color""" 4
-.el .IP "\f(CWfirst\-vbox\-color\fR" 4
+.el .IP \f(CWfirst\-vbox\-color\fR 4
.IX Item "first-vbox-color"
Color of the first vbox on a page.
.ie n .IP """font\-spec\-color""" 4
-.el .IP "\f(CWfont\-spec\-color\fR" 4
+.el .IP \f(CWfont\-spec\-color\fR 4
.IX Item "font-spec-color"
Color of font specifications.
.ie n .IP """horizontal\-break\-candidate\-color""" 4
-.el .IP "\f(CWhorizontal\-break\-candidate\-color\fR" 4
+.el .IP \f(CWhorizontal\-break\-candidate\-color\fR 4
.IX Item "horizontal-break-candidate-color"
Color of lines with horizontal-breakpoint candidates\ \f(CW\*(C`@\*(C'\fR.
.ie n .IP """horizontal\-breakpoint\-color""" 4
-.el .IP "\f(CWhorizontal\-breakpoint\-color\fR" 4
+.el .IP \f(CWhorizontal\-breakpoint\-color\fR 4
.IX Item "horizontal-breakpoint-color"
Color of lines with horizontal breakpoints\ \f(CW\*(C`@@\*(C'\fR.
.ie n .IP """id\-color""" 4
-.el .IP "\f(CWid\-color\fR" 4
+.el .IP \f(CWid\-color\fR 4
.IX Item "id-color"
-Color of matching ids when printed inline.
+Color of matching \fIID\fRs when printed inline.
.ie n .IP """id\-heading\-color""" 4
-.el .IP "\f(CWid\-heading\-color\fR" 4
+.el .IP \f(CWid\-heading\-color\fR 4
.IX Item "id-heading-color"
-Color of matching ids when printed in heading form.
+Color of matching \fIID\fRs when printed in heading form.
.ie n .IP """line\-break\-pass\-color""" 4
-.el .IP "\f(CWline\-break\-pass\-color\fR" 4
+.el .IP \f(CWline\-break\-pass\-color\fR 4
.IX Item "line-break-pass-color"
Color of the lines showing which pass (e.g., \f(CW@firstpass\fR)
of the line-breaking algorithm is active.
.ie n .IP """line\-number\-color""" 4
-.el .IP "\f(CWline\-number\-color\fR" 4
+.el .IP \f(CWline\-number\-color\fR 4
.IX Item "line-number-color"
Color of TeX-source-file line numbers.
.ie n .IP """log\-line\-number\-color""" 4
-.el .IP "\f(CWlog\-line\-number\-color\fR" 4
+.el .IP \f(CWlog\-line\-number\-color\fR 4
.IX Item "log-line-number-color"
Color of log-file line numbers.
.ie n .IP """math\-color""" 4
-.el .IP "\f(CWmath\-color\fR" 4
+.el .IP \f(CWmath\-color\fR 4
.IX Item "math-color"
Color used for math expressions including their font specs.
.ie n .IP """page\-number\-color""" 4
-.el .IP "\f(CWpage\-number\-color\fR" 4
+.el .IP \f(CWpage\-number\-color\fR 4
.IX Item "page-number-color"
Color of page numbers of the final output.
.ie n .IP """tightness\-color""" 4
-.el .IP "\f(CWtightness\-color\fR" 4
+.el .IP \f(CWtightness\-color\fR 4
.IX Item "tightness-color"
Color of lines with Tight/Loose hbox reports.
.ie n .IP """vertical\-breakpoint\-color""" 4
-.el .IP "\f(CWvertical\-breakpoint\-color\fR" 4
+.el .IP \f(CWvertical\-breakpoint\-color\fR 4
.IX Item "vertical-breakpoint-color"
Color of possible vertical breakpoints.
.RE
@@ -419,10 +389,65 @@ Replace \f(CW\*(C`on_\*(C'\fR with \f(CW\*(C`on_bright_\*(C'\fR for high-intensi
.IP "Text Attribute" 4
.IX Item "Text Attribute"
\&\f(CW\*(C`bold\*(C'\fR, \f(CW\*(C`dark\*(C'\fR, \f(CW\*(C`italic\*(C'\fR, \f(CW\*(C`underline\*(C'\fR, \f(CW\*(C`reverse\*(C'\fR
+.SS "Some Common Encodings"
+.IX Subsection "Some Common Encodings"
+The following list shows some encodings
+that are suitable for option\ \fB\-\-encoding\fR.
+.IP "Latin\-1, Western European" 4
+.IX Item "Latin-1, Western European"
+\&\f(CW\*(C`iso\-8859\-1\*(C'\fR, \f(CW\*(C`cp850\*(C'\fR, \f(CW\*(C`cp860\*(C'\fR, \f(CW\*(C`cp1252\*(C'\fR
+.IP "Latin\-2, Central European" 4
+.IX Item "Latin-2, Central European"
+\&\f(CW\*(C`iso\-8859\-2\*(C'\fR, \f(CW\*(C`cp852\*(C'\fR, \f(CW\*(C`cp1250\*(C'\fR
+.IP "Latin\-3, South European (Esperanto, Maltese)" 4
+.IX Item "Latin-3, South European (Esperanto, Maltese)"
+\&\f(CW\*(C`iso\-8859\-3\*(C'\fR
+.IP "Latin\-4, North European (Baltics)" 4
+.IX Item "Latin-4, North European (Baltics)"
+\&\f(CW\*(C`iso\-8859\-4\*(C'\fR
+.IP Cyrillics 4
+.IX Item "Cyrillics"
+\&\f(CW\*(C`iso\-8859\-5\*(C'\fR, \f(CW\*(C`cp855\*(C'\fR, \f(CW\*(C`cp866\*(C'\fR (Ukrainian), \f(CW\*(C`cp1251\*(C'\fR
+.IP Arabic 4
+.IX Item "Arabic"
+\&\f(CW\*(C`iso\-8859\-6\*(C'\fR, \f(CW\*(C`cp864\*(C'\fR, \f(CW\*(C`cp1006\*(C'\fR (Farsi), \f(CW\*(C`cp1256\*(C'\fR
+.IP Greek 4
+.IX Item "Greek"
+\&\f(CW\*(C`iso\-8859\-7\*(C'\fR, \f(CW\*(C`cp737\*(C'\fR, \f(CW\*(C`cp1253\*(C'\fR
+.IP Hebrew 4
+.IX Item "Hebrew"
+\&\f(CW\*(C`iso\-8859\-8\*(C'\fR, \f(CW\*(C`cp862\*(C'\fR, \f(CW\*(C`cp1255\*(C'\fR
+.IP Turkish 4
+.IX Item "Turkish"
+\&\f(CW\*(C`iso\-8859\-9\*(C'\fR, \f(CW\*(C`cp857\*(C'\fR, \f(CW\*(C`cp1254\*(C'\fR
+.IP Nordic 4
+.IX Item "Nordic"
+\&\f(CW\*(C`iso\-8859\-10\*(C'\fR, \f(CW\*(C`cp865\*(C'\fR, \f(CW\*(C`cp861\*(C'\fR (Icelandic)
+.IP Thai 4
+.IX Item "Thai"
+\&\f(CW\*(C`iso\-8859\-11\*(C'\fR, \f(CW\*(C`cp874\*(C'\fR
+.IP Baltic 4
+.IX Item "Baltic"
+\&\f(CW\*(C`iso\-8859\-13\*(C'\fR, \f(CW\*(C`cp775\*(C'\fR, \f(CW\*(C`cp1257\*(C'\fR
+.IP Celtic 4
+.IX Item "Celtic"
+\&\f(CW\*(C`iso\-8859\-14\*(C'\fR
+.IP "Latin\-9 (sometimes called Latin0)" 4
+.IX Item "Latin-9 (sometimes called Latin0)"
+\&\f(CW\*(C`iso\-8859\-15\*(C'\fR
+.IP Latin\-10 4
+.IX Item "Latin-10"
+\&\f(CW\*(C`iso\-8859\-16\*(C'\fR
.SH "EXIT STATUS"
.IX Header "EXIT STATUS"
-The exit status is 0 if at least one \fI\s-1ID\s0\fR matched \fI\s-1REGEXP\s0\fR,
-1 if no \fI\s-1ID\s0\fR matched \fI\s-1REGEXP\s0\fR, and 2 if an error occurred.
+The exit status is 0 if at least one \fIID\fR matched \fIREGEXP\fR,
+1 if no \fIID\fR matched \fIREGEXP\fR, and 2 if an error occurred.
+.SH CAVEATS
+.IX Header "CAVEATS"
+The end tag \f(CW\*(C`</typog\-inspect>\*(C'\fR sometimes gets placed too early in the output and the trace
+\&\fIseems\fR truncated. However, LaTeX reliably logs the requested the trace information, but the
+write operations for trace data and the code which is used to print the end\ tag are not
+synchronized.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
-\&\fBgrep\fR(1), \fBprintf\fR(3), \fBTerm::ANSIColor\fR(pm)
+\&\fBgrep\fR(1), \fBprintf\fR(3), \fBEncode::Supported\fR(pm), \fBTerm::ANSIColor\fR(pm)
diff --git a/Master/texmf-dist/doc/man/man1/typog-grep.man1.pdf b/Master/texmf-dist/doc/man/man1/typog-grep.man1.pdf
index ca0157d129b..6444f8038b1 100644
--- a/Master/texmf-dist/doc/man/man1/typog-grep.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/typog-grep.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README
index 0b58c4ee729..4e7614af59e 100644
--- a/Master/texmf-dist/doc/support/latexindent/README
+++ b/Master/texmf-dist/doc/support/latexindent/README
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- latexindent.pl, version 3.24.2, 2024-06-15
+ latexindent.pl, version 3.24.3, 2024-07-14
PERL script to indent code within environments, and align delimited
environments in .tex files.
diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json b/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json
index 8f457e916f3..c22386d80d0 100644
--- a/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json
+++ b/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json
@@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/schema",
"$id": "latexindent-yaml-schema.json",
"title": "latexindent.pl YAML schema",
- "description": "latexindent.pl YAML schema helper, V3.24.2 2024-06-15",
+ "description": "latexindent.pl YAML schema helper, V3.24.3 2024-07-14",
"type": "object",
"properties": {
"fileExtensionPreference": {
diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
index 60f57e8d37c..ebfe16f0e05 100644
--- a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
+++ b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.tex b/Master/texmf-dist/doc/support/latexindent/latexindent.tex
index e5a2ae3b160..fefde34ec25 100644
--- a/Master/texmf-dist/doc/support/latexindent/latexindent.tex
+++ b/Master/texmf-dist/doc/support/latexindent/latexindent.tex
@@ -131,6 +131,7 @@
% bibliographies
\addbibresource{latex-indent}
\addbibresource{contributors}
+\BiblatexSplitbibDefernumbersWarningOff
% http://tex.stackexchange.com/questions/122135/how-to-add-a-png-icon-on-the-right-side-of-a-tcolorbox-title
\newtcolorbox{warning}{parbox=false,
@@ -585,14 +586,14 @@
title={example~\thetcbcounter},
fonttitle=\bfseries\sffamily,
detach title,
- before upper={\llap{\tcbtitle\hspace{5mm}}},
coltitle=black,
colback=white,
grow to left by=6mm,
%
% circles and line by the side
%
- overlay unbroken={%
+ overlay unbroken and first={%
+ \node at ([xshift=-8mm,yshift=-4.5mm]interior.north west) {\bfseries example \thetcbcounter};
\path [fill=black] ([xshift=1mm,yshift=3mm]interior.south east) node{\hbox{\rule{1ex}{1ex}}};
},
overlay last={%
@@ -859,7 +860,7 @@
throughout this document for details}.
\subsection{Quick start}\label{sec:quickstart}
- When \texttt{latexindent.pl} reads and writes files, the files are read and written in UTF-8 format by default.
+ When \texttt{latexindent.pl} reads and writes files, the files are read and written in UTF-8 format by default.
That is to say, the encoding format for tex and yaml files needs to be in UTF-8 format.
If you'd like to get started with \texttt{latexindent.pl} then simply type
@@ -8563,8 +8564,8 @@ perl latexindent-module-installer.pl
\begin{commandshell}
sudo apt-get install perlbrew
perlbrew init
-perlbrew install perl-5.39.1
-perlbrew switch perl-5.39.1
+perlbrew install perl-5.40.0
+perlbrew switch perl-5.40.0
sudo apt-get install curl
curl -L http://cpanmin.us | perl - App::cpanminus
cpanm YAML::Tiny
diff --git a/Master/texmf-dist/doc/support/mf2pt1/ChangeLog b/Master/texmf-dist/doc/support/mf2pt1/ChangeLog
index a8e6d2d9105..6df8f950676 100644
--- a/Master/texmf-dist/doc/support/mf2pt1/ChangeLog
+++ b/Master/texmf-dist/doc/support/mf2pt1/ChangeLog
@@ -1,4 +1,15 @@
-2021-12-04 Scott Pakin <pakin@pakin.org>
+2024-07-06 Scott Pakin <scott+mf@pakin.org>
+
+ * README, mf2pt1.texi, mf2pt1.mp, mf2pt1.pl: Updated the copyright
+ year to 2024.
+
+ * mf2pt1.pl: Applied a patch from Werner Lemberg <wl@gnu.org> that
+ adds extrema later in the FontForge postprocessing script. This
+ patch originally was submitted as a LilyPond merge request
+ (https://gitlab.com/lilypond/lilypond/-/merge_requests/2374).
+ Updated the program version to 2.8.
+
+2021-12-04 Scott Pakin <scott+mf@pakin.org>
* README, mf2pt1.texi: Updated the copyright year to 2021.
@@ -7,7 +18,7 @@
already exist. Updated the copyright year to 2021. Updated the
version to 2.7.
-2021-11-28 Scott Pakin <pakin@pakin.org>
+2021-11-28 Scott Pakin <scott+mf@pakin.org>
* Makefile, mf2pt1.pl, mf2pt1.texi:
Documented that environment variables for programs can now include
@@ -18,13 +29,13 @@
commands to be overridden by environment variables that can also
include program parameters.
-2021-11-27 Scott Pakin <pakin@pakin.org>
+2021-11-27 Scott Pakin <scott+mf@pakin.org>
* mf2pt1.pl:
Introduced a --save-temps option to suppress deletion of intermediate
files.
-2020-11-27 Scott Pakin <pakin@pakin.org>
+2020-11-27 Scott Pakin <scott+mf@pakin.org>
* ChangeLog, README, mf2pt1.mp, mf2pt1.pl, mf2pt1.texi:
mf2pt1 no longer generates a UniqueID automatically, only when
diff --git a/Master/texmf-dist/doc/support/mf2pt1/README b/Master/texmf-dist/doc/support/mf2pt1/README
index 0eb57ca8fcf..e101952ff99 100644
--- a/Master/texmf-dist/doc/support/mf2pt1/README
+++ b/Master/texmf-dist/doc/support/mf2pt1/README
@@ -27,7 +27,7 @@ For installation instructions, see the mf2pt1 manual (mf2pt1.pdf).
Copyright and license
---------------------
-Copyright (C) 2005-2021 Scott Pakin, scott+mf@pakin.org
+Copyright (C) 2005-2024 Scott Pakin, scott+mf@pakin.org
This package may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.3c of this
diff --git a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf
index a28895171a0..e702482c745 100644
--- a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf
+++ b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi
index 9260689d18c..f18ed6694cf 100644
--- a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi
+++ b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi
@@ -11,7 +11,7 @@
@c %**end of header
@copying
-Copyright @copyright{} 2005--2021 Scott Pakin
+Copyright @copyright{} 2005--2024 Scott Pakin
@sp 2
@@ -30,8 +30,8 @@ version 2006/05/20 or later.
@end copying
-@set VERSION 2.7
-@set DATE 4 December 2021
+@set VERSION 2.8
+@set DATE 6 July 2024
@c Define some fonts we intend to use.
@iftex
@@ -679,9 +679,9 @@ parameters that @command{mf2pt1} accepts:
@noindent
@b{if} known @i{ps_output}:
-@multitable {@b{if}} {@b{font_underline_thickness}} {@t{"Copyright (C) 2021 Scott Pakin.";}}
+@multitable {@b{if}} {@b{font_underline_thickness}} {@t{"Copyright (C) 2005-2024 Scott Pakin.";}}
@item @tab @b{font_coding_scheme} @tab @t{"ot1"};
-@item @tab @b{font_comment} @tab @t{"Copyright (C) 2021 Scott Pakin."};
+@item @tab @b{font_comment} @tab @t{"Copyright (C) 2005-2024 Scott Pakin."};
@item @tab @b{font_family} @tab @t{"Kerplotz"};
@item @tab @b{font_fixed_pitch} @tab @b{false};
@item @tab @b{font_identifier} @tab @t{"Kerplotz Light Oblique"};
@@ -708,7 +708,7 @@ The same parameters can also be specified on the command line as
follows:
@example
-mf2pt1 --encoding=ot1 --comment="Copyright (C) 2021 Scott Pakin."
+mf2pt1 --encoding=ot1 --comment="Copyright (C) 2005-2024 Scott Pakin."
--family=Kerplotz --nofixedpitch --fullname="Kerplotz Light Oblique"
--name=Kerplotz-LightOblique --designsize=10 --italicangle=-9.5
--underpos=-100 --underthick=50 --uniqueid=4112233 --version=002.005
@@ -881,7 +881,7 @@ character position the current encoding has designated for the
@section Restoring @file{mfplain} defaults
@command{mf2pt1} normally redefines @strong{filldraw} as @strong{fill}
-and @strong{unfilldraw} and @strong{unfill} because @w{Type 1} fonts
+and @strong{unfilldraw} as @strong{unfill} because @w{Type 1} fonts
don't allow overlapping curves. Similarly, @command{mf2pt1} redefines
@strong{pencircle} as a 20-gon to coerce MetaPost into drawing it
using a filled instead of a stroked PostScript path.
@@ -957,7 +957,7 @@ more robust way to dump @file{mf2pt1.mem}; for directing me to the
overlap-removal code mentioned in @ref{Restrictions}; for supplying
the @emph{crossproduct}, @emph{makeline}, and @emph{is_clockwise}
functions used by @file{mf2pt1.mp}; for proposing the @copt{bpppix}
-command-line option; and for suggesting various features and
+command-line option; and for suggesting numerous features and
improvements to @command{mf2pt1}. Thanks also go to Werner Lemberg
and
@iftex
diff --git a/Master/texmf-dist/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty b/Master/texmf-dist/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty
index e6c02cfc179..9f5e48fd243 100644
--- a/Master/texmf-dist/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty
+++ b/Master/texmf-dist/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty
@@ -5,12 +5,15 @@
\RequirePackage{xeCJK}
\parindent=20pt
\defaultfontfeatures{Mapping=tex-text}
-\setCJKmainfont[BoldFont=Source Han Sans SC, ItalicFont=AR PL UKai CN]{Songti SC}
-\setCJKmonofont[Scale=0.9]{AR PL UKai CN}
-\setCJKfamilyfont{song}[BoldFont=Source Han Sans SC]{Songti SC}
+% \setCJKmainfont[BoldFont=Source Han Sans SC, ItalicFont=AR PL UKai CN]{Songti SC}
+\setCJKmainfont[BoldFont=Source Han Sans SC, ItalicFont=AR PL KaitiM GB]{Source Han Serif SC}
+% \setCJKmonofont[Scale=0.9]{AR PL UKai CN}
+\setCJKmonofont[Scale=1.1]{AR PL KaitiM GB}
+% \setCJKfamilyfont{song}[BoldFont=Source Han Sans SC]{Songti SC}
+\setCJKfamilyfont{song}[BoldFont=Source Han Sans SC]{Source Han Serif SC}
\setCJKfamilyfont{sf}[BoldFont=Source Han Sans SC]{Source Han Sans SC}
-\RequirePackage{tex-live}
+\RequirePackage{../texlive-en/tex-live}
\renewcommand\contentsname{目录}
\renewcommand\listfigurename{插图列表}
diff --git a/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf b/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf
index 886adf580db..858516c44ab 100644
--- a/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf
+++ b/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex b/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex
index 562c0ba19a3..d848b591438 100644
--- a/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex
+++ b/Master/texmf-dist/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex
@@ -13,14 +13,14 @@
\usepackage{tex-live-zh-cn, indentfirst}
\title{%
- {\huge \textit{\TeX\ Live 指南---2020}}%
+ {\huge \textit{\TeX\ Live 指南---2024}}%
}
\author{Karl Berry 编写 \\[3mm]
\url{https://tug.org/texlive/}
}
-\date{2020 年 3 月}
+\date{2024 年 5 月}
\begin{document}
\maketitle
@@ -36,60 +36,56 @@
\subsection{\protect\TeX\protect\ Live 与 \protect\TeX\protect\ Collection}
本文档描述 \TL{} 软件的主要功能和特性,\TL{} 是 \TeX{} 及其相关程序在
-GNU/Linux 及其他类 Unix 系统、\MacOSX\ 和 Windows
+GNU/Linux 及其他类 Unix 系统、\macOS{} 和 Windows
系统下的一套发行版。
-你可以直接下载 \TL{},也可以在 \TeX{} 用户组织给会员分发的 \TK{}
-\DVD 中找到。第~\ref{sec:tl-coll-dists}~节中,简要地介绍了
-\DVD 的内容。这两套发行版都是用户组织共同协作完成的。
+你可以通过下载、从 \TeX{} 用户组织分发给会员的 \TK{}
+\DVD{} 或其他途径获得 \TL{}。\TL{} 和 \TK{} 都由 \TeX{} 用户组织共同协作
+完成,第~\ref{sec:tl-coll-dists}~节将简要介绍 \DVD 的内容。
这篇文档, 主要介绍 \TL{} 本身。
-\TL{} 包括了 \TeX{}, \LaTeXe{}, \ConTeXt, \MF, \MP, \BibTeX{}
-等许多可执行程序;种类繁多的宏包、字体和文档,并支持世界上许多
-不同的语言。
+\TL{} 包含了 \TeX{}, \LaTeXe{}, \ConTeXt, \MF, \MP, \BibTeX{}
+和许多其他程序的可执行文件; 种类繁多的宏包、字体和文档; 并支持世界上许多
+不同种语言的排版。
文档末尾的第~\ref{sec:history}~节 (第~\pageref{sec:history}~页)
-介绍了这一版 \TL{} 的重要改变。
+将简要介绍这一版 \TL{} 的重要改变。
\htmlanchor{platforms}
\subsection{操作系统支持}
\label{sec:os-support}
-\TL{} 为多种基于 Unix 的平台提供了可执行文件,包括 \GNU/Linux、
-\MacOSX{}、和 Cygwin。它还包含了源代码,可供在没有提
-供可执行文件的平台上编译安装。
+\TL{} 为多种基于 Unix 的平台提供了二进制文件,包括 \GNU/Linux、
+\macOS{}、和 Cygwin。它所包含的源代码还可在没有二进制文件的平台上编译安装。
-至于 Windows,\TL{} 仅支持 Windows~7 或后续版本。
-Windows Vista 可能可以继续工作,但 \TL{} 不能在 Windows XP
-或者更早的版本上运行。\TL{} 没有包含 64 位的 Windows
-可执行文件,不过 32 位的可执行文件也能 64 位的系统上正常运行。
+至于 Windows,\TL{} 仅支持 Windows~7 及后续版本。
+Windows Vista \emph{或许}还可以继续工作,但 \TL{} 不能在 Windows XP
+或者更早的版本上运行。\TL{} 包含了 64 位的 Windows
+可执行文件。
-除了 \TL{} 以外,Windows 和 \MacOSX 用户还有其它的选择,请参考
+除了 \TL{} 以外,Windows 和 \macOS{} 用户还有其它的选择,请参考
第~\ref{sec:tl-coll-dists}~节。
\subsection{\protect\TL{} 的基本安装}
\label{sec:basic}
-你可以使用 \DVD{} 方式或者网络方式来安装 \TL{}
+你可以用 \DVD{} 或通过网络来安装 \TL{}
(\url{https://tug.org/texlive/acquire.html})。
-通过网络的安装程序本身非常小,它可以从网上下载所有的你所要求的软
-件包。网络安装程序对仅使用 \TL{} 一小部分的用户来说非常适宜。
+网络安装程序本身很小,而且它会从网上下载一切所需的东西。
-\DVD{} 安装程序可以把 \TL{} 安装到你的本地磁盘上。你不能直接从 \TK{}
-\DVD{} (或者它的 \code{.iso} 镜像) 上运行 \TL{},但你可以在一个 \USB{} 盘上
-安装一套可以运行的版本 (参见 \ref{sec:portable-tl})。安装方法将
-在下面的章节介绍 (\p.\pageref{sec:install}),这里提供一个快速入门:
+\DVD{} 的安装程序可以把 \TL{} 安装到你的本地磁盘上,但你不能直接从 \TK{}
+\DVD{} (或者 \TK{} 和 \TL{} 的 \code{.iso} 镜像) 上运行 \TL{}。
+你\emph{可以}在 \USB{} 盘上安装一套可运行的版本 (参见 \ref{sec:portable-tl})。
+安装方法将在下面的章节介绍 (\p.\pageref{sec:install}),这里提供一个快速入门:
\begin{itemize*}
-\item 安装脚本的名称是 \filename{install-tl}。它可以在指定了
-\code{-gui} 选项的情况下以“GUI”模式 (Windows 和 \MacOSX{} 下的默认模式)
-工作,或指定 \code{-gui=text} 选项以文本模式 (其它系统下默认模式)
-工作。在 Unix 平台上如果安装了 Perl/Tk,以前的 Perl/Tk 和向导模式还可以
-通过 \code{-gui=perltk} 选项启用。关于 Windows 下的使用参见
-\ref{sec:wininst} 一节。
+\item 对于 Unix,安装脚本是 \filename{install-tl}; 在 Windows 则需要调用
+\filename{install-tl-windows}。安装程序将在指定了 \code{-gui} 选项的情况下
+以图形界面模式工作 (这是 Windows 下的默认模式),或在指定了 \code{-gui=text}
+选项的情况下以文本模式工作 (这是其它系统下的默认模式)。
-\item 安装完成后可以得到一个名为 \prog{tlmgr} 的程序:`\TL\ Manager'。
+\item 安装完成后可以得到一个名为 \prog{tlmgr} 的程序: `\TL\ Manager'。
和安装程序一样,它可以在 \GUI{} 模式或文本模式下运行。你不但可以用它
来安装或卸载软件包,还可以用来完成各种配置工作。
@@ -99,21 +95,22 @@ Windows Vista 可能可以继续工作,但 \TL{} 不能在 Windows XP
\subsection{关于安全的考虑}
\label{sec:security}
-尽我们所知,核心的 \TeX\ 程序本身是 (而且一直是) 非常健壮的。但是尽管
-大家都做了最大的努力,\TeX\ Live 中大家贡献的程序不一定能达到同样的程
-度。所以,在运行程序的输入来自未经信任的来源时,你应该一直保持警惕;
-为了增加安全性,在一个单独的子目录或者 chroot 环境下执行程序。
+尽我们所知,核心的 \TeX\ 程序本身是 (而且一直是) 非常健壮的。然而,尽
+管每个人都尽力而为,大家贡献给 \TeX\ Live 的程序却不一定能达到同样的程度,
+所以,当运行不受信任的输入程序时,你应该一直保持警惕; 为了提高安全性,
+请使用单独的子目录或者 chroot。
-最需要小心的系统是 Windows,因为通常 Windows 首先使用当前目录下的程序,
-然后再寻找其他搜索路径下的目录。这给许多可能的攻击带来了方便。我们已经
-堵住了很多漏洞,但毫无疑问的是有些漏洞依然存在,尤其是存在于第三方程序
-中。因此,我们建议检查当前目录下的可疑文件,尤其是可执行文件 (二进制文
-件或者脚本)。一般他们不应该存在,而且更不应该在处理文档时生成。
+在 Windows 系统上特别需要注意对当前目录的文件进行检查,因为通常情况下,
+Windows 会忽视搜索路径而优先使用当前目录下的程序。这给许多可能的攻击带
+来了方便。我们已经堵住了很多漏洞,但毫无疑问还有漏洞存在,尤其是在第三
+方程序方面。因此,我们建议检查当前目录下的可疑文件,尤其是可执行文件
+(二进制文件或者脚本)。一般情况下,它们不应该存在,而且更不应该在处理文
+档时生成。
-最后,\TeX\ (及其相关程序) 在处理文档时是可以写文件的,这个功能可以被各种
-方式滥用。所以我们再一次强调最保险的是在新的子目录下处理未知的文档。
+最后,\TeX\ (及其相关程序) 在处理文档时是可以写文件的,这个功能可能被
+各方滥用,所以我们再一次强调在新的子目录下处理未知文档是最保险的选择。
-安全的另一个方面是保证下载的内容与内容创建时一致。如果安装了 \prog{gpg}
+另一个关乎安全的方面是确保下载的内容与它被创建时一致。如果安装了 \prog{gpg}
(GNU Privacy Guard) 程序,\prog{tlmgr} 程序 (第~\ref{sec:tlmgr}~节) 会自动
对现在内容进行加密验证。\prog{gpg} 不和 \TL{} 一起分发,但可以参见
\url{https://texlive.info/tlgpg/} 了解更多信息。
@@ -126,113 +123,97 @@ Windows Vista 可能可以继续工作,但 \TL{} 不能在 Windows XP
有保障的商业性技术支持,可以放弃 \TL{},改为购买商业 \TeX{} 系统,在
\url{https://tug.org/interest.html#vendors} 上有一份销售商的列表。)
-按照推荐使用的顺序,我们列出了这样一份资源列表:
+大概按照推荐使用的顺序,我们列出了这样一份资源列表:
\begin{description}
-\item [起步] 如果你刚刚接触 \TeX,\url{https://tug.org/begin.html}
-这个网页提供了这个系统的简短介绍。
+\item [起步] 如果你刚刚接触 \TeX,\url{https://tug.org/begin.html}~页面提供了这个
+系统的简短介绍。
-\item [\TeX{} FAQ] 这套庞大的 \TeX{} FAQ 对各种各样的
-问题——从最基础到最晦涩的——都给予了简明的回答,它在 \TL{} 的
-\OnCD{texmf-dist/doc/generic/FAQ-en/},也可以在
-\url{https://texfaq.org} 网站上找到。有问题时请先看看这里能否找
-到解答。
+\item [CTAN] 如果你在寻找某个特定的宏包、字体、程序等等,CTAN 就是你首先该找的地方。
+这里是一个所有 \TeX{} 相关内容的巨大集合。目录表条目还可以告诉你一个宏包能否用于 \TL{}
+或 MiK\TeX。参见 \url{https://ctan.org}。
-\item [\TeX{} Catalogue] 如果你在寻找某个特定的宏包、字体、程序等等,\TeX{}
-Catalogue 就是你首先该找的地方。这里是所有 \TeX{} 相关内容的一个巨大集合。参见
-\url{https://ctan.org/pkg/catalogue}。
+\item [\TeX{} FAQ] \TeX{} FAQ 汇集了各类问题——从最基础到最晦涩的。它可以在
+\url{https://texfaq.org}~页面找到。
\item [\TeX{} 网上资源] \url{https://tug.org/interest.html}~页面上有
许多和 \TeX{} 相关的链接,包括讨论这个系统方方面面的许多书籍、手册和文章。
-\item [支持信息的归档] 最重要的 \TeX\ 技术支持论坛是
-\LaTeX{} 社区网站 \url{http://latex-community.org/}, 问答网站
-\url{https://tex.stackexchange.com}, Usenet 的新闻组 \url{news:comp.text.tex}
-和邮件列表 \email{texhax@tug.org}。它们的内容归档中有多年以来的提问和回答供你
-搜索。最后两种你可以用 \\
-\url{http://groups.google.com/groups?group=comp.text.tex} 和 \\
-\url{https://tug.org/mail-archives/texhax} 进行查询。当然,一般性的搜索
-方式也没有坏处。
+\item [支持网站] 一般性的网络检索没有坏处。最重要的 \TeX\ 技术支持网站包括
+\LaTeX{} 社区网站 \url{http://latex.org/}, 问答网站 \url{https://tex.stackexchange.com},
+和邮件列表 \url{https://lists.tug.org/texhax}。它们的内容归档中有多年以来的提问和
+回答供你搜索。
\item [提问] 如果你还是找不到答案,可以在 \url{https://latex.org} 和
-\url{https://tex.stackexchange.com/} 网站上提问,通过 Google
-或者你的新闻组阅读器在 \dirname{comp.text.tex} 上提问,或者发送邮件到
-\email{texhax@tug.org}。不过,在提问之前请先阅读 FAQ 上的这一条:
-\url{https://texfaq.org/FAQ-askquestion},
-它能提高你获得回答的可能性。
+\url{https://tex.stackexchange.com/} 网站上提问,或者发送邮件到
+\email{texhax@tug.org} (提问并不需要订阅)。不过,在提问前,
+请先阅读 FAQ 上的这一条: \url{https://texfaq.org/FAQ-askquestion},
+它能提高你获得有用回答的可能性。
-\item [\TL{} 技术支持] 如果你需要报告 bug,或者提出对 \TL{} 的发行、安装或
+\item [\TL{} 技术支持] 如果你需要报告错误,或者提出对 \TL{} 的发行、安装或
文档的建议和意见,可以使用 \email{tex-live@tug.org} 这个邮件列表。不过,如果问题
是针对 \TL{} 中包含的某个特定程序,那最好还是写信给这个程序的维护者或邮件列表。
-用 \code{-{}-help} 参数来运行程序都一般能得到用来报告其 bug 的地址。
+用 \code{-{}-help} 参数来运行程序一般都能得到用来报告其 bug 的地址。
\end{description}
-另一方面,你也不妨帮助其他有问题的朋友,所有以上资源都是对所有人开放的,请尽管参
-与进去,在你能力所及的范围内提供帮助。
+另一方面,你也不妨帮助其他有问题的朋友。上述所有资源对所有人开放,所以请随时参
+与,开始阅读,在你能力所及的范围内提供帮助。
% don't use \TL so the \uppercase in the headline works. Also so
% tex4ht ends up with the right TeX. Likewise the \protect's.
\section{\protect\TeX\protect\ Live 概览}
\label{sec:overview-tl}
-这个小节描述的是 \TL{} 的内容,以及包含 \TL{} 的 \TK{}。
+这个小节描述的是 \TL{} 以及它所属的 \TK{} 的内容。
\subsection{\protect\TeX\protect\ Collection: \protect\TL,
- pro\protect\TeX{}t, Mac\protect\TeX}
+ Mac\protect\TeX, MiK\protect\TeX, CTAN}
\label{sec:tl-coll-dists}
-\TK{} 的 \DVD{} 包含了以下内容:
+\TK{} \DVD{} 包含了以下内容:
\begin{description}
-\item [\TL] 是一个完整的 \TeX{} 系统,它可以安装在本
+\item [\TL] 是一个完全跨平台的 \TeX{} 系统,它可以安装在本
地磁盘上。主页: \url{https://tug.org/texlive/}。
-\item [Mac\TeX] 在 \TL{} 的基础上增加了原生的 \MacOSX\ (目前 Apple 把它称作
-macOS,但在这份文档中我们还沿用它的旧名字) 的安装程序和一些其它的
-Mac 应用程序。它的主页在 \url{https://tug.org/mactex/}。
+\item [Mac\TeX] 针对 \macOS{},在 \TL{} 的基础上增加了原生的 \macOS{} 的安装程序
+和一些其它的 Mac 应用程序。主页: \url{https://tug.org/mactex/}。
-\item [pro\TeX{}t] 是 Windows 下的 \MIKTEX\ 发行版的一个增强版本。\ProTeXt\ 在
-\MIKTEX\ 基础上增加了一些工具,简化了安装。它完全独立于 \TL{},有其
-自己的安装步骤。主页: \url{https://tug.org/protext}。
+\item [\MIKTEX] 另一个用于 Windows、GNU/Linux 和 \macOS{} 的完全跨平台的
+\TeX\ 发行版 (但 DVD 上只包含Windows 的二进制文件)。它有一个集成的包管理器,
+可以根据需要从互联网安装缺失的组件。主页: \url{https://miktex.org/}。
\item [CTAN] 一份 \CTAN{} 仓库的快照 (\url{https://ctan.org/})。
+\CTAN{} 并不一定遵循 \TL{} 的版权协议,因此在分发或修改时要格外小心。
\end{description}
-\CTAN{} 和 \pkgname{protext} 并不一定遵循 \TL{} 的版权协议,因此在分发或修改时要
-格外地小心。
-
\subsection{\protect\TL{} 的顶层目录}
\label{sec:tld}
-这里是 \TL{} 发行版顶层目录的一个简短的列表和描述。
+这是一个简短的 \TL{} 发行版顶层目录的列表及描述。
\begin{ttdescription}
\item[bin] \TeX{} 系统程序,按平台组织。
-%
-\item[readme.html] 网页,提供了多种语言的简介和有用的链接。
-\item[readme-*.dir] \TL{} 多种语言的简介和有用的链接,同时有 \HTML{}
+
+\item[readme-*.dir] 关于 \TL{} 的多种语言的简介和有用的链接,同时有 \HTML{}
和纯文本版本。
-%
-\item[source] 所有程序的源代码,包括主要的基于 \Webc{} 的 \TeX{}
- 发行版。
-%
+\item[source] 所有程序的源代码,包括主要的基于 \Webc{} 的 \TeX{} 发行版。
+
\item[texmf-dist] 最主要的文件树,见下文的 \dirname{TEXMFDIST}。
-%
-\item[tlpkg] 用来维护安装程序所用到的脚本,程序和数据,以及对
-Windows 的特殊支持。
+
+\item[tlpkg] 用来维护安装程序所用到的脚本、程序和数据,以及对 Windows 的特殊支持。
\end{ttdescription}
-至于文档,顶层目录下的 \OnCD{doc.html} 文件中提供的完整的链接会有帮助。
-几乎所有内容的文档 (宏包、格式文件、字体、程序手册,man page, Info 文件等) 在
-\dirname{texmf-dist/doc} 目录下,因为这些程序本身是属于 \dirname{texmf} 目录的。
-\TeX\ 宏包与格式文件的文档则放在 \dirname{texmf-dist/doc} 目录。但不管放在哪个地
-方,你都可以使用 \cmdname{texdoc} 程序来寻找这些文档。
+至于文档,顶层目录下的 \OnCD{doc.html} 文件中提供的完整链接会有帮助。
+几乎所有内容的文档 (宏包、格式文件、字体、程序手册、man page、 Info 文件等) 都在
+\dirname{texmf-dist/doc} 目录下,不管它被放在哪里,你都可以使用
+\cmdname{texdoc} 程序来寻找这些文档。
-\TL\ 本身的文档在 \dirname{texmf-dist/doc/texlive} 目录下,有以下这些语言的版本:
+\TL\ 本身的文档在 \dirname{texmf-dist/doc/texlive} 目录下,有以下这些语言的版本:
\begin{itemize*}
\item{捷克/斯洛伐克语:} \OnCD{texmf-dist/doc/texlive/texlive-cz}
@@ -244,6 +225,7 @@ Windows 的特殊支持。
\item{波兰语:} \OnCD{texmf-dist/doc/texlive/texlive-pl}
\item{俄语:} \OnCD{texmf-dist/doc/texlive/texlive-ru}
\item{塞尔维亚语:} \OnCD{texmf-dist/doc/texlive/texlive-sr}
+\item{西班牙语:} \OnCD{texmf-dist/doc/texlive/texlive-es}
\item{简体中文:} \OnCD{texmf-dist/doc/texlive/texlive-zh-cn}
\end{itemize*}
@@ -256,50 +238,59 @@ Windows 的特殊支持。
以列出这些变量的值,这样你可以很容易找到它们和你所安装到的目录
名称的对应关系。
-所有这些目录树,包括个人的,都应该遵循 \TeX\ 目录结构 (\TDS,
-\url{https://tug.org/tds}),包括其中所有细小的子目录,否则文件就
-可能找不到。第 \ref{sec:local-personal-macros} 节 (第
-\pageref{sec:local-personal-macros} 页) 有更详细的介绍。这里描述的顺序和搜索的
-优先级相反,也就是说,列在更靠后的目录树会被更优先搜索。
+所有这些目录树,包括个人的,都应该遵循 \TeX\ 目录结构 (\TeX\
+Directory Structure, \TDS, \url{https://tug.org/tds}),
+包括其中所有细小的子目录,否则文件就可能找不到。
+第 \ref{sec:local-personal-macros} 节 (第
+\pageref{sec:local-personal-macros} 页) 有更详细的介绍。
+这里描述的顺序和搜索的优先级相反,也就是说,
+列在更靠后的目录树会被更优先搜索。
\begin{ttdescription}
\item [TEXMFDIST] 这个目录树包含几乎所有原有发行版本的文件——配置文件、脚本、宏
-包、字体等等。唯一的例外是每个平台的可执行文件,存储在与它同级的 \code{bin/} 目
-录下。
-\item [TEXMFSYSVAR] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和
-\verb+fmtutil-sys+ 还有 \verb+tlmgr+ 这几个命令存储、缓存运行时使用的格式文件和
-生成的 map 文件,对整个系统都有效。
+包、字体等等。(主要的例外是每个平台的可执行文件,它们存储在同级的 \code{bin/} 目
+录下。)
+
+\item [TEXMFSYSVAR] 给 \verb+texconfig-sys+、\verb+updmap-sys+、\verb+fmtutil-sys+
+和 \verb+tlmgr+ 使用的 (全站的) 目录树,用于存储 (缓存) 运行时的数据,如格式文件和
+生成的映射文件。
+
\item [TEXMFSYSCONFIG] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和
-\verb+fmtutil-sys+ 这些程序存储修改过的全局文件.
-\item [TEXMFLOCAL] 系统管理员用来安装供整个系统使用的额外的或更新过的宏包、字体
-的目录。
-\item [TEXMFHOME] 给用户存放它们自己独立安装的的宏包、字体等等。
-这个变量根据不同的用户选择不同的主目录。
-\item [TEXMFVAR] 这个目录是给 \verb+texconfig+、\verb+updmap-user+ 和
- \verb+fmtutil-user+ 存储 (缓存) 格式文件、生成 map 文件这类运行时个人数据的。
+\verb+fmtutil-sys+ 使用的 (全站的) 目录树,用于存储修改过的配置数据。
+
+\item [TEXMFLOCAL] 系统管理员用来安装供整个系统使用的额外的或更新过的宏包、字体等
+的目录树。
+
+\item [TEXMFHOME] 用户用来安装供他们自己独立使用的的额外的或更新过的宏包、字体等的目录树。
+这个变量根据不同的用户选择不同的个人目录。
+
+\item [TEXMFVAR] 给 \verb+texconfig+、\verb+updmap-user+ 和 \verb+fmtutil-user+
+使用的 (个人的) 目录树,用于存储 (缓存) 运行时的数据,如格式文件和生成的映射文件。
+
\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap-sys+、和 \verb+fmtutil-sys+
-这些程序存储个人修改过的配置文件。
-\item [TEXMFCACHE] \ConTeXt\ MkIV 和 Lua\LaTeX\ 用来保存 (缓存的) 运行时
-数据的目录树;缺省为 \code{TEXMFSYSVAR},如果该目录不可写,则使用
+使用的 (个人的) 目录树,用于存储修改过的配置数据。
+
+\item [TEXMFCACHE] 给 \ConTeXt\ MkIV 和 Lua\LaTeX\ 使用的目录树,
+用于存储 (缓存) 运行时的数据。缺省为 \code{TEXMFSYSVAR}; 若该目录不可写,则使用
\code{TEXMFVAR}。
\end{ttdescription}
\noindent
-默认的目录结构:
+默认的目录结构:
\begin{description}
\item[全系统根目录] 可以包含多个 \TL{} 版本:
(在 Unix 下默认是 \texttt{/usr/local/texlive})
\begin{ttdescription}
- \item[2019] 上一个版本。
- \item[2020] 当前版本。
+ \item[2023] 上一个版本。
+ \item[2024] 当前版本。
\begin{ttdescription}
\item [bin] ~
\begin{ttdescription}
\item [i386-linux] \GNU/Linux 二进制文件 (32 位)
\item [...]
- \item [x86\_64-darwin] \MacOSX\ 二进制文件
+ \item [universal-darwin] \macOS{}\ 二进制文件
\item [x86\_64-linux] \GNU/Linux 二进制文件 (64 位)
- \item [win32] Windows 二进制文件
+ \item [windows] Windows 二进制文件 (64 位)
\end{ttdescription}
\item [texmf-dist\ \ ] \envname{TEXMFDIST} 和 \envname{TEXMFMAIN}
\item [texmf-var \ \ ] \envname{TEXMFSYSVAR}, \envname{TEXMFCACHE}
@@ -310,57 +301,59 @@ Windows 的特殊支持。
\item[用户主 (home) 目录] (\texttt{\$HOME} 或
\texttt{\%USERPROFILE\%})
\begin{ttdescription}
- \item[.texlive2019] 给上个版本的,个人生成和配置的数据。
- \item[.texlive2020] 给这个版本的,个人生成和配置的数据。
+ \item[.texlive2023] 给上个版本的,个人生成和配置的数据。
+ \item[.texlive2024] 给这个版本的,个人生成和配置的数据。
\begin{ttdescription}
\item [texmf-var\ \ \ ] \envname{TEXMFVAR}, \envname{TEXMFCACHE}
\item [texmf-config] \envname{TEXMFCONFIG}
\end{ttdescription}
\item[texmf] \envname{TEXMFHOME} 个人的宏包文件,等等。
- \textit{等等。}
\end{ttdescription}
\end{description}
-
\subsection{\protect\TeX\ 的扩展版本}
\label{sec:tex-extensions}
-原始的 Knuth \TeX{} 本身的开发已经冻结了,仅仅修改除去发现的
-极其少量的错误。它在 \TL\ 中仍然作为 \prog{tex} 程序出现,在
-可见的未来也仍然如此。\TL{} 包括了一些建立在 \TeX\ 基础上的
-扩展程序 (也称为 \TeX\ 引擎):
+Knuth 所开发的原始 \TeX{} 本身已经冻结了,仅修改少量的错误。
+它在 \TL\ 中仍然作为 \prog{tex} 程序出现,在可预见的未来也仍然如此。
+\TL{} 包括了一些建立在 \TeX\ 基础上的扩展程序 (也称为 \TeX\ 引擎):
\begin{description}
\item [\eTeX] 为 \TeX\ 增加了一套新的原语 (primitive)。
\label{text:etex} (包括宏展开,字符扫描,mark 的分类,额外的调试功能,等等)
-以及用于双向排版的 \TeXXeT{} 扩展模式。在默认模式下,\eTeX{} 是与原始的 \TeX\
-100\% 兼容的。参见 \OnCD{texmf-dist/doc/etex/base/etex_man.pdf}。
+以及用于双向排版的 \TeXXeT{} 扩展模式。在默认情况下,\eTeX{} 100\% 兼容原始的 \TeX。
+参见 \OnCD{texmf-dist/doc/etex/base/etex_man.pdf}。
\item [pdf\TeX] 在 \eTeX\ 扩展的基础上构建,在 \dvi{} 输出之外增加对
-PDF 输出的支持,以及许多其他的扩展。
-这是针对 \prog{etex}, \prog{latex} 或 \prog{pdflatex} 这些格式使用的缺省程序。
-它的主页在 \url{http://www.pdftex.org/},文档在
+PDF 输出的支持,以及许多非输出相关的扩展。
+它是许多常见格式,如 \prog{etex}, \prog{latex} 或 \prog{pdflatex},调用的程序 。
+它的主页在 \url{http://www.pdftex.org/},文档见
\OnCD{texmf-dist/doc/pdftex/manual/pdftex-a.pdf}。可以在
\OnCD{texmf-dist/doc/pdftex/samplepdftex/samplepdf.tex} 找到展示部分功能的例
子。
-\item [Lua\TeX] 是 pdf\TeX\ 指定的后继者,而且对 pdf\TeX\ 保持大部分
-(但不是完全地) 向下兼容。它也希望包含 Aleph (见后) 的功能,尽管未必能完美兼容。
-它内置的 Lua 语言解释器 (\url{https://lua.org}) 为许多棘手的 \TeX{}
-问题提供了优雅的解决方案。当以 \filename{texlua} 命令执行时,它就像一个标准的
-Lua 解释器一样工作,所以,Lua\TeX\ 在 \TL\ 中也被作为 Lua 程序的解释器。
-见 \url{http://www.luatex.org} 和 \OnCD{texmf-dist/doc/luatex/luatex.pdf}。
+\item [Lua\TeX] 增加了对 Unicode 输入以及 OpenType/TrueType 字体和系统字体的支持。
+它集成的 Lua 语言解释器 (\url{https://lua.org}) 为许多棘手的 \TeX{}
+问题提供了解决方案。当以 \filename{texlua} 命令执行时,它就像一个独立的
+Lua 解释器一样运行。其网站是 \url{http://www.luatex.org},
+参考手册在 \OnCD{texmf-dist/doc/luatex/luatex.pdf}。
-\item [Xe\TeX] 通过第三方库,增加对 Unicode 输入文本和 OpenType 字体的支持,
-能够直接使用系统字体。参见 \url{https://tug.org/xetex}。
+\item [(e)(u)p\TeX] 原生支持日语排版需求;
+p\TeX\ 是基本引擎,而 ep\TeX 添加了\eTeX\ 功能,
+而 up\TeX\ 添加了 Unicode 支持。
+
+\item [Xe\TeX] 通过标准的第三方库,
+增加了对 Unicode 输入以及 OpenType/TrueType 字体和系统字体的支持。
+参见 \url{https://tug.org/xetex}。
\item [\OMEGA\ (Omega)] 基于 Unicode (16 位字符集),因而同时支持处理世界上
-几乎所有的语言。它同时还支持所谓的 `\OMEGA{} Translation Processes' (OTP),
-用于对任意输入进行复杂的变换操作。Omega 现在已经不作为单独的程序出现在 \TL{}
-中了;改为只支持 Aleph:
+几乎所有的语言文字。它同时还支持所谓的 `\OMEGA{} 翻译过程'
+(\OMEGA{} Translation Processes, OTPs),
+用于对任意输入进行复杂的变换操作。Omega 现在已经不作为独立的程序出现在 \TL{}
+中了; 改为只支持 Aleph:
-\item [Aleph] 将 \OMEGA\ 与 \eTeX\ 扩展合并到一起得到的。
+\item [Aleph] 结合了 \OMEGA\ 与 \eTeX\ 扩展。
参见 \OnCD{texmf-dist/doc/aleph/base}。
\end{description}
@@ -368,23 +361,23 @@ Lua 解释器一样工作,所以,Lua\TeX\ 在 \TL\ 中也被作为 Lua 程
\subsection{\protect\TL\ 中其他值得一提的程序}
-这里是在 \TL{} 中其他的一些常用程序:
+这里给出 \TL{} 中其他的一些常用程序:
\begin{cmddescription}
\item [bibtex, biber] 参考文献支持。
-\item [makeindex, xindy] 索引支持。
+\item [makeindex, upmendex, xindex, xindy] 索引支持。
\item [dvips] 将 \dvi{} 转换为 \PS{}。
-\item [xdvi] X Window System 下的 \dvi{} 阅读器。
-
-\item [dviconcat, dviselect] 从 \dvi{} 文件中复制和粘贴页面。
-
\item [dvipdfmx] 将 \dvi{} 转换为 PDF,是 (前面提到过的)
pdf\TeX\ 的一套替换方案。
+\item [xdvi] X Window 系统下的 \dvi{} 阅读器。
+
+\item [dviconcat, dviselect] 从 \dvi{} 文件中剪切和粘贴页面。
+
\item [psselect, psnup, \ldots] \PS{} 实用程序。
\item [pdfjam, pdfjoin, \ldots] PDF 实用程序。
@@ -392,7 +385,7 @@ pdf\TeX\ 的一套替换方案。
\item [context, mtxrun] Con\TeX{}t 和 PDF 处理工具。
\item [htlatex, \ldots] \cmdname{tex4ht}: \AllTeX{} 到 HTML (还有 XML
-等其他格式) 的转换器。
+以及 DocX等其他格式) 的转换器。
\end{cmddescription}
@@ -407,144 +400,153 @@ pdf\TeX\ 的一套替换方案。
\url{https://tug.org/texlive/acquire.html} 以了解更多关于获得这个软件的信息和方法。
\begin{description}
-\item [网络安装程序,.zip 或 .tar.gz 格式:] 在 \CTAN 的 \dirname{systems/texlive/tlnet}
-目录下可以下载,\url{http://mirror.ctan.org/systems/texlive/tlnet} 这个地址应该
-能将你导向一个附近的、保持更新的镜像。你可以下载同时支持 Unix 和
+\item [网络安装程序,.zip 或 .tar.gz 格式: ] 从 \CTAN 的 \dirname{systems/texlive/tlnet}
+下载压缩包; 链接 \url{http://mirror.ctan.org/systems/texlive/tlnet} 应该
+能重定位到一个附近的、保持更新的镜像。你可以下载同时支持 Unix 和
Windows 的 \filename{install-tl.zip} 或者小得多、但只支持 Unix 的
\filename{install-unx.tar.gz}。解压后,\filename{install-tl} 和
\filename{install-tl-windows.bat} 就会出现在 \dirname{install-tl} 子目录中。
\item[网络安装程序,Windows .exe:] 和上述一样从 \CTAN{} 下载,然后双击。它会作为
-第一阶段的安装程序和解压工具启动;见图~\ref{fig:nsis}。它提供了两个选项:
+第一阶段的安装程序和解压工具启动; 见图~\ref{fig:nsis}。它提供了两个选项:
``Install'' 和 ``Unpack only''。
-\item [\TeX{} Collection \DVD:] 打开 \DVD\ 的 \dirname{texlive} 这个子目录。
-在 Windows 下安装程序通常在插入 \DVD 后就自动启动了。要获得 \DVD 的
-话可以加入一个 \TeX\ 用户组织 (推荐这么做,参见
-\url{https://tug.org/usergroups.html}) 或是单独购买 (通过
-\url{https://tug.org/store}),又或者是自己从 \ISO\ 镜像刻录。
-在多数系统里你都可以直接挂载这个 \ISO{}。在从 \DVD\ 或者 \ISO{} 安装后,
-如果还希望从 Internet 获得持续的更新,请看第 \ref{sec:dvd-install-net-updates}
-节。
+\item [\TeX{} Collection \DVD:] 打开 \DVD\ 的 \dirname{texlive} 子目录。
+在 Windows 下,安装程序通常在插入 \DVD 后就自动启动了。要获得 \DVD 的
+话,可以加入一个 \TeX\ 用户组织 (非常推荐这么做,\url{https://tug.org/usergroups.html})
+或是单独购买 (\url{https://tug.org/store})。又或者是自己从 CTAN 下载 \ISO\ 镜像刻录 \DVD。
+在从 \DVD\ 或者 \ISO{} 安装后,如果还希望从 Internet 获得持续的更新,请看第~\ref{sec:dvd-install-net-updates}~节。
\end{description}
\begin{figure}[tb]
-\tlpng{nsis_installer}{.6\linewidth}
-\caption{第一阶段的 Windows \code{.exe} 安装程序}\label{fig:nsis}
+ \centering
+ \def\figdesc{Windows \code{.exe} 安装程序的第一阶段}
+ \tlpng{../texlive-common/nsis_installer}{.6\linewidth}{\figdesc}
+ \caption{\figdesc. 点击 Install 选项将出现如图~\ref{fig:basic-w32} 所示的窗口.}\label{fig:nsis}
\end{figure}
-不管从哪里载入,执行的都是同一个安装程序。两者最明显的区别是通过网络安装
-得到的当前可用的程序包。这和和 \DVD\ 或者 \ISO\ 镜像在主版本之间不能更新
-不同。
+无论安装程序的来源如何,所运行的都是相同的安装程序。
+两者最显著的区别在于,使用网络安装程序时,最终得到的是当前可用的软件包。
+这与 DVD 和 ISO 镜像不同,后者在主要公开发布版本之间不会更新。
-如果你需要用代理服务器来下载,Wget 的代理服务器设置可以使用 \filename{~/.wgetrc}
-文件或者环境变量来指定
+如果你需要通过代理服务器下载,使用 \filename{~/.wgetrc}
+文件或设置环境变量来配置 Wget 的代理设置
(\url{https://www.gnu.org/software/wget/manual/html_node/Proxies.html}),
-或者你使用的下载工具对应的配置文件。如果你是从 \DVD\ 或者 \ISO\ 镜像来安装就
+或者等效地设置你所使用的下载工具。如果你是从 \DVD\ 或者 \ISO\ 镜像来安装就
没有关系了。
-下面的章节介绍更详细地介绍了安装程序的启动。
+下一小节将更详细地介绍安装程序的启动。
\subsubsection{Unix}
-\filename{install-tl} 是一个 Perl 脚本。在 Unix 兼容的系统下启动它最简单
-的方法是这样的:
-
+下面的内容中,\texttt{>} 表示命令提示符; 用户输入显示成 \Ucom{\texttt{bold}} 的样子。
+\filename{install-tl} 是一个 Perl 脚本。在 Unix 兼容的系统下最简单
+的启动它的方法是这样的:
\begin{alltt}
> \Ucom{perl /path/to/installer/install-tl}
\end{alltt}
-(你也许可以直接运行 \Ucom{/path/to/installer/install-tl} 如果这个文件有可执行属
-性,或者先 \texttt{cd} 到这个目录中,等等。我们不会把所有这些执行方法列出来。)
-你可能需要扩大终端窗口的大小才能在一屏内显示完整的文本安装程序界面
+(或者你可以直接运行 \Ucom{/path/to/installer/install-tl} 一旦它有可执行属性,
+或者先 \texttt{cd} 到这个目录中,等等;
+我们不会把所有这些执行方法列出来。)
+你可能需要扩大终端窗口才能在一屏内显示完整的文本安装程序界面
(图~\ref{fig:text-main})。
-要在 \GUI\ 模式下安装 (见图~\ref{fig:advanced-lnx}),你需要安装 Tcl/Tk。所以你可
-以运行:
+要在 \GUI\ 模式下安装 (见图~\ref{fig:advanced-lnx}),你需要安装 Tcl/Tk。
+安装后你可以运行:
\begin{alltt}
> \Ucom{perl install-tl -gui}
\end{alltt}
-原有的 \code{wizard} 和 \code{perltk}/\code{expert} 选项仍然存在。它们需要加入了
-XFT 支持的 \dirname{Perl::TK} 模块,\GNU/Linux 下通常都是这样,
-但其他系统下可能不是。要列出所有这些选项:
+原有的 \code{-wizard} 和 \code{-perltk}/\code{-expert} 选项现在做着和 \code{-gui} 选项同样的事。
+要列出所有这些选项:
\begin{alltt}
> \Ucom{perl install-tl -help}
\end{alltt}
-\textbf{关于 Unix 下的权限:} 在安装过程中,\TL{} 安装程序将会
-遵照你的 \code{umask} 行事。所以如果你需要让你的安装能给其他用户使
-用,就必须保证你设置的权限足够,比如 \code{umask 002}。更多关于
+\textbf{关于 Unix 权限: } \TL{} 安装程序将遵照你安装时的 \code{umask} 设置。
+因此,如果你希望你的安装能被除你之外的其他用户使用,
+就必须保证你设置的权限足够,比如 \code{umask 002}。更多关于
\code{umask} 的信息请参见你自己系统的文档。
-\textbf{关于 Cygwin 的特殊考虑:} 和其他 Unix 兼容系统不同,Cygwin
-并没有包含所有运行 \TL{} 安装程序所必须的程序,见第~\ref{sec:cygwin}~节。
+\textbf{关于 Cygwin 的特殊考虑: } 和其他 Unix 兼容系统不同,Cygwin
+默认并没有包含一切运行 \TL{} 安装程序所必须的程序,见第~\ref{sec:cygwin}~节。
-\subsubsection{\MacOSX}
+\subsubsection{\macOS{}}
\label{sec:macosx}
-如第~\ref{sec:tl-coll-dists}~节提到的,我们给 \MacOSX 准备了一套独立的
-发行版,叫做 Mac\TeX\ (\url{https://tug.org/mactex})。我们推荐使用原生的
-Mac\TeX\ 安装程序,而不是 \TL\ 自带的那个,因为原生的安装程序做了一些
-针对 Mac 的调整,尤其是使用 \TeX{}Dist 数据结构方便在 \MacOSX 下的多个 \TeX\ 发
-行版 (Mac\TeX, Fink, MacPorts, \ldots) 之间切换。
+如第~\ref{sec:tl-coll-dists}~节提到的,我们给 \macOS{} 准备了一套独立的
+发行版,叫做 Mac\TeX\ (\url{https://tug.org/mactex})。我们推荐在 \macOS{}
+使用原生的 Mac\TeX\ 安装程序,而不是 \TL,因为原生的安装程序做了一些
+针对 Mac 的调整,尤其是方便在 \macOS{} 下的多个 \TL\ 发行版之间切换,
+这使用了被称为 \TeX{}Dist 的数据结构。
-Mac\TeX\ 是严格依赖 \TL 构建的,所以主 \TeX\ 树和二进制文件也是完全一致的。不过
+Mac\TeX\ 严格依赖 \TL 构建,所以主 \TeX\ 树和二进制文件也是完全一致的。不过
它添加了一些用来存放 Mac 专有文档和程序的目录。
\subsubsection{Windows}\label{sec:wininst}
-如果你使用的是下载 zip 解压后的目录,又或者 \DVD 安装程序无法自动启动了,请
+如果你使用的是下载了 zip 并解压后的目录,又或者 \DVD 安装程序无法自动启动了,请
双击 \filename{install-tl-windows.bat}。
-你也可以从命令行提示符下启动安装程序。下面 \texttt{>} 表示的就是提示符,
-用户输入用 \Ucom{\texttt{bold}} 体表示。如果你正在安装程序目录下,只需要
-运行:
+你也可以从命令行提示符下启动安装程序。下面 用 \texttt{>} 表示命令提示符;
+用户输入显示成 \Ucom{\texttt{bold}} 的样子。如果你正在安装程序目录下,
+只需要运行:
\begin{alltt}
> \Ucom{install-tl-windows}
\end{alltt}
-或者你也可以通过绝对路径来运行,比如:
+或者你也可以通过绝对路径来运行,比如:
\begin{alltt}
> \Ucom{D:\bs{}texlive\bs{}install-tl-windows}
\end{alltt}
这是对 \TK\ \DVD 而言的,假定 \dirname{D:} 是光驱。图~\ref{fig:basic-w32}
-展示了 \GUI\ 安装程序的初始基本屏幕,它是 Windows 下的默认形式。
+展示了 \GUI\ 安装程序的初始基本界面,它是 Windows 下的默认形式。
-要在文本模式下安装,使用:
+要在文本模式下安装,使用:
\begin{alltt}
> \Ucom{install-tl-windows -no-gui}
\end{alltt}
-要列出所有可用的选项:
+要列出所有可用的选项:
\begin{alltt}
> \Ucom{install-tl-windows -help}
\end{alltt}
+如果同一目录中还包含 \texttt{install-tl-windows.exe},
+则在以上命令中添加 \texttt{.bat} 扩展名。
+这通常不会发生,除非你已经在本地获取了 \dirname{tlnet} 目录的镜像。
+
+在 \TL\ 安装路径中,应避免使用非 ASCII 字符。
+这尤其是在 Windows 11 下可能会出现的问题,
+因为它的用户被强制使用微软网络帐户。
+请参阅 \url{https://tug.org/texlive/windows.html\#nonascii} 了解一些解决方法。
+
\begin{figure}[tb]
\begin{boxedverbatim}
-Installing TeX Live 2020 from: ...
+Installing TeX Live 2024 from: ...
Platform: x86_64-linux => 'GNU/Linux on x86_64'
Distribution: inst (compressed)
Directory for temporary files: /tmp
...
Detected platform: GNU/Linux on Intel x86_64
+
+ <B> binary platforms: 1 out of 16
- <B> platforms: 1 out of 16
-
- <S> Set installation scheme: scheme-full
+ <S> set installation scheme: scheme-full
<C> customizing installation collections
- 40 collections out of 41, disk space required: 6536 MB
+ 40 collections out of 41, disk space required: 8296 MB (free: 138718 MB)
<D> directories:
TEXDIR (the main TeX directory):
- /usr/local/texlive/2020
+ /usr/local/texlive/2024
...
<O> options:
+ [ ] use letter size instead of A4 by default
...
-
+
<V> set up for portable installation
Actions:
@@ -553,30 +555,30 @@ Actions:
<H> help
<Q> quit
\end{boxedverbatim}
-\vskip-\baselineskip
+\vskip-.5\baselineskip
\caption{文本安装程序主界面 (\GNU/Linux)}\label{fig:text-main}
\end{figure}
\begin{figure}[tb]
-\tlpng{basic-w32}{.6\linewidth}
-\caption{基本安装界面 (Windows);Advanced 按钮会提供类似
-图~\ref{fig:advanced-lnx} 的界面}\label{fig:basic-w32}
+\tlpng{../texlive-common/basic-w32}{.6\linewidth}{基本安装界面 (Windows)}
+\caption{基本安装界面 (Windows);
+ Advanced 按钮会提供类似图~\ref{fig:advanced-lnx} 的界面}\label{fig:basic-w32}
\end{figure}
\begin{figure}[tb]
-\tlpng{advanced-lnx}{\linewidth}
+\tlpng{../texlive-common/advanced-lnx}{\linewidth}{Advanced installer screen (\GNU/Linux)}
\caption{高级 \GUI{} 安装界面
(\GNU/Linux)}\label{fig:advanced-lnx}
\end{figure}
-
+
\htmlanchor{cygwin}
\subsubsection{Cygwin}
\label{sec:cygwin}
-在开始安装之前,请先使用 Cygwin 的 \filename{setup.exe} 程序安装
-\filename{perl} 和 \filename{wget} 软件包,如果你还没装过。此外
-还推荐安装下列软件包:
+在开始安装之前,如果你还没装过\filename{perl} 和 \filename{wget} 软件包,
+请先使用 Cygwin 的 \filename{setup.exe} 程序安装它们。
+此外还推荐安装下列软件包:
\begin{itemize*}
\item \filename{fontconfig} [\XeTeX\ 和 Lua\TeX\ 需要]
\item \filename{ghostscript} [各种实用工具需要]
@@ -584,33 +586,31 @@ Actions:
\item \filename{ncurses} [给安装程序提供 \code{clear} 命令]
\end{itemize*}
-\subsubsection{文本界面安装程序}
+\subsubsection{文本化安装程序}
图~\ref{fig:text-main} 展示了 Unix 下文本模式的主界面,这是 Unix
下安装程序的默认界面。
-这是一个完全用命令行操作的安装程序,完全不支持光标移动。所以你无法
-在多选框或者输入框之间用 Tab 上下切换,只能在提示符下输入特定的字符
-(大小写敏感的) 然后按下 Enter,整个终端窗口就会把新的内容刷新出来。
+这只是一个命令行安装程序; 完全没有光标支持。
+例如,你无法在复选框或输入字段之间用 Tab 上下切换。
+你只能在提示符下输入特定的字符
+(注意大小写) 然后按下 Enter,
+之后整个终端窗口就会把新的内容刷新出来。
-文本安装程序之所以这么简陋是因为它要尽可能支持最多的平台,就算
+文本化安装程序之所以这么简陋是因为它要尽可能支持最多的平台,就算
只有一个 Perl 的系统也能运行它。
-\subsubsection{图形界面安装程序}
+\subsubsection{图形化安装程序}
\label{sec:graphical-inst}
-默认的图形界面安装程序的初始界面很简单,只有几个选项;见图~\ref{fig:basic-w32}。
-它可以这样启动:
+默认的图形化安装程序的初始界面很简单,只有几个选项; 见图~\ref{fig:basic-w32}。
+它可以这样启动:
\begin{alltt}
> \Ucom{install-tl -gui}
\end{alltt}
-按下 Advanced 按钮可以获得文本界面安装程序大部分的选项;见图~\ref{fig:advanced-lnx}。
-
-\subsubsection{旧版本安装程序}
+按下 Advanced 按钮可以获得文本化安装程序的大部分选项; 见图~\ref{fig:advanced-lnx}。
-安装了 Perl/Tk 的系统仍然可以使用 \texttt{perltk}/\texttt{expert} 和
-\texttt{wizard} 模式。它们可以分别使用 \texttt{-gui=perltk} 和 \texttt{-gui=wizard}
-选项启动。
+\texttt{perltk}/\texttt{expert} 和 \texttt{wizard} GUI 选项现在调用常规的图形化安装程序。
\subsection{执行安装程序}
\label{sec:runinstall}
@@ -624,31 +624,31 @@ Actions:
\begin{boxedverbatim}
Available platforms:
===============================================================================
- a [ ] Cygwin on Intel x86 (i386-cygwin)
- b [ ] Cygwin on x86_64 (x86_64-cygwin)
- c [ ] MacOSX current (10.13-) on x86_64 (x86_64-darwin)
- d [ ] MacOSX legacy (10.6-) on x86_64 (x86_64-darwinlegacy)
- e [ ] FreeBSD on x86_64 (amd64-freebsd)
- f [ ] FreeBSD on Intel x86 (i386-freebsd)
- g [ ] GNU/Linux on ARM64 (aarch64-linux)
- h [ ] GNU/Linux on ARMv6/RPi (armhf-linux)
- i [ ] GNU/Linux on Intel x86 (i386-linux)
- j [X] GNU/Linux on x86_64 (x86_64-linux)
- k [ ] GNU/Linux on x86_64 with musl (x86_64-linuxmusl)
- l [ ] NetBSD on x86_64 (amd64-netbsd)
- m [ ] NetBSD on Intel x86 (i386-netbsd)
- o [ ] Solaris on Intel x86 (i386-solaris)
- p [ ] Solaris on x86_64 (x86_64-solaris)
- s [ ] Windows (win32)
+ a [ ] Cygwin on x86_64 (x86_64-cygwin)
+ b [ ] MacOSX current (10.14-) on ARM/x86_64 (universal-darwin)
+ c [ ] MacOSX legacy (10.6-) on x86_64 (x86_64-darwinlegacy)
+ d [ ] FreeBSD on x86_64 (amd64-freebsd)
+ e [ ] FreeBSD on Intel x86 (i386-freebsd)
+ f [ ] GNU/Linux on ARM64 (aarch64-linux)
+ g [ ] GNU/Linux on RPi(32-bit) and ARMv7 (armhf-linux)
+ h [ ] GNU/Linux on Intel x86 (i386-linux)
+ i [X] GNU/Linux on x86_64 (x86_64-linux)
+ j [ ] GNU/Linux on x86_64 with musl (x86_64-linuxmusl)
+ k [ ] NetBSD on x86_64 (amd64-netbsd)
+ l [ ] NetBSD on Intel x86 (i386-netbsd)
+ m [ ] Solaris on Intel x86 (i386-solaris)
+ o [ ] Solaris on x86_64 (x86_64-solaris)
+ p [ ] Windows (64-bit) (windows)
\end{boxedverbatim}
-\vskip-\baselineskip
+\vskip-.5\baselineskip
\caption{Binaries (二进制程序) 菜单}\label{fig:bin-text}
\end{figure}
图~\ref{fig:bin-text} 展示了文本模式下的 binaries (二进制程序)
菜单。默认情况下只会安装你当前平台下的二进制程序。在这个菜单下,
-你可以选择安装其他平台的二进制程序。这对你要将 \TeX\ 树共享在
-异构网络上的情况比较有用,又或者用于双启动的系统。
+你也可以选择安装其他平台的二进制程序。
+如果你要将 \TeX\ 树共享在异构网络上,又或者将使用双启动的系统,
+这会比较有用。
\subsubsection{选择要安装的组件}
\label{sec:components}
@@ -662,36 +662,38 @@ Select scheme:
c [ ] small scheme (basic + xetex, metapost, a few languages)
d [ ] basic scheme (plain and latex)
e [ ] minimal scheme (plain only)
- f [ ] ConTeXt scheme
- g [ ] GUST TeX Live scheme
- h [ ] infrastructure-only scheme (no TeX at all)
- i [ ] teTeX scheme (more than medium, but nowhere near full)
- j [ ] custom selection of collections
+ f [ ] infrastructure-only scheme (no TeX at all)
+ g [ ] book publishing scheme (core LaTeX and add-ons)
+ h [ ] ConTeXt scheme
+ i [ ] GUST TeX Live scheme
+ j [ ] teTeX scheme (more than medium, but nowhere near full)
+ k [ ] custom selection of collections
\end{boxedverbatim}
-\vskip-\baselineskip
+\vskip-.5\baselineskip
\caption{Scheme (安装方案) 菜单}\label{fig:scheme-text}
\end{figure}
-图~\ref{fig:scheme-text} 展示了 \TL\ 的安装方案菜单;从这里你选择的是
+图~\ref{fig:scheme-text} 展示了 \TL\ 的安装方案菜单; 从这里你选择的是
一套``安装方案'',也就是对软件包集合的一个统一划分。默认的 \optname{full}
-方案会把所有可用的都装上。这是推荐方案,不过你也可以选择 \optname{basic} 方案来
-只获得 plain 和 \LaTeX{},\optname{small} 获得比那稍微多一点程序 (相当于 Mac\TeX
-中的 Basic\TeX\ 安装),为测试选用 \optname{minimal} 方案,又或者是
-介乎其间的 \optname{medium} 或 \optname{teTeX} 方案。还有许多特殊或者
-专门针对特定国家的方案。
+方案会把所有可用的都装上。这是推荐方案,不过你也可以选择其他的方案:
+\optname{basic} 方案只获得 plain 和 \LaTeX{},
+\optname{small} 方案会获得比它稍微多一点的程序 (相当于 Mac\TeX 中的 Basic\TeX\ 安装),
+\optname{minimal} 方案可供测试选用,
+而 \optname{medium} 或 \optname{teTeX} 方案则介乎其间。
+还有许多特殊或者专门针对特定国家的方案。
\begin{figure}[tb]
-\tlpng{stdcoll}{.7\linewidth}
-\caption{Collections (集合) 菜单}\label{fig:collections-gui}
+\def\figdesc{Collections (集合) 菜单}
+\centering \tlpng{../texlive-common/stdcoll}{.7\linewidth}{\figdesc}
+\caption{\figdesc}\label{fig:collections-gui}
\end{figure}
-你可以使用 `collections' 菜单来详细
-选择安装方案。(图~\ref{fig:collections-gui} 显示了 \GUI 模式下修改的情
-况。)
+你可以使用 `collections' 菜单来详细选择安装方案。
+(图~\ref{fig:collections-gui} 显示了 \GUI 模式下修改的情况。)
-Collection (安装集合) 是比 scheme (方案) 要更细的一层 \Dash 实际上一个
-方案包含了多个集合,而一个集合又包含了一到多个软件包,然后每个软件包
-(\TL 中最小的组织单位) 则包含了实际的 \TeX\ 宏文件,字体文件,等等。
+Collection (安装集合) 是比 scheme (方案) 要更细的一层——实际上一个
+方案包含了多个安装集合,而一个安装集合又包含了至少一个软件包,然后每个软件包
+(\TL 中最小的组织单位) 则包含了实际的 \TeX\ 宏文件、字体文件等等。
如果你觉得 collection 菜单对安装控制还不够细,可以在安装后使用
\TeX\ Live Manager (\prog{tlmgr}) 程序 (参见第~\ref{sec:tlmgr}~节),
@@ -702,44 +704,48 @@ Collection (安装集合) 是比 scheme (方案) 要更细的一层 \Dash 实际
缺省的目录布局在第~\ref{sec:texmftrees}~节有过叙述,见
第~\pageref{sec:texmftrees}~页。在 Unix 下默认的安装目录是
-\dirname{/usr/local/texlive/2020} 而 Windows 下是
-|%SystemDrive%\texlive\2020|。这样的安排允许你有多个并行存在的 \TL\ 安装,每年的
-发行版本一个,你可以通过修改搜索路径来在它们中间切换。
+\dirname{/usr/local/texlive/2024} 而 Windows 下是
+|C:\texlive\2024|。这样的安排允许你有多个并行的 \TL\ 安装存在,
+例如每个版本都有一个 (通常按年份,如此处),
+你可以通过修改搜索路径来在它们中间切换。
-这个安装路径可以通过设置安装程序中的 \dirname{TEXDIR} 来修改。这个选项和其他选项
+这个安装路径可以通过设置安装程序中的 \dirname{TEXDIR} 来修改。这个选项和其他选项的 GUI 界面
如图~\ref{fig:advanced-lnx} 所示。最常见的更改它的原因要么是该分区没有足够的空间 (完
-整的 \TL\ 安装需要好几 GB 的空间),要么是没有默认位置的写权限。(虽然要安装
-\TL\ 不需要是管理员或者 root 用户,但你至少得对安装的目的目录有写权限。)
+整的 \TL\ 安装需要好几 GB 的空间),要么是没有默认位置的写权限 (虽然要安装
+\TL\ 不需要是管理员或者 root 用户,但你至少得对安装的目标目录有写权限)。
-你也可以通过在运行安装程序以前修改特定的环境变量来改变安装目录,最常见的是
-\envname{TEXLIVE\_INSTALL\_PREFIX} 或者 \envname{TEXLIVE\_INSTALL\_TEXDIR},参见
-|install-tl --help| 的文档 (\url{https://tug.org/texlive/doc/install-tl.html} 有
+在 Windows 下,通常你不需要是管理员就能创建 |C:\texlive\2024|
+(或者,更一般而言,是 |%SystemDrive%\texlive\2024|)。
+
+你也可以通过在运行安装程序以前修改特定的环境变量来改变安装目录 (最常见的是
+\envname{TEXLIVE\_INSTALL\_PREFIX} 或者 \envname{TEXLIVE\_INSTALL\_TEXDIR});
+参见 |install-tl --help| 调出的文档 (\url{https://tug.org/texlive/doc/install-tl.html} 有
在线版本) 以了解完整的列表和更多的信息。
一个合理的选择是你自己主目录下的一个子目录,尤其在只有你一个人
-使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2020|'。
+使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2024|'。
-我们建议在目录名称中保留年份,这样可以让你保留多个不同版本的
-\TL{}。(你可能希望还维护一个类似 \dirname{/usr/local/texlive-cur}
-这样的名字作为指向当前版本的符号链接,这样的目录名就和版本无
-关了,你只要在新版本出来直接重新指向符号链接即可。)
+我们建议在目录名称中保留年份,这样可以让你保留多个不同版本的 \TL{}。
+(你可能还希望通过符号链接保留一个与版本无关的名称,
+如 \dirname{/usr/local/texlive-cur},
+以便在测试新版本后重新指向该名称。)
-在安装程序中修改 \dirname{TEXDIR} 之后还会同时修改
+在安装程序中修改 \dirname{TEXDIR} 还会同时修改
\dirname{TEXMFLOCAL}, \dirname{TEXMFSYSVAR} 和
\dirname{TEXMFSYSCONFIG}。
-\dirname{TEXMFHOME} 是推荐用来存放个人宏文件和软件包的目录。
+\dirname{TEXMFHOME} 是被推荐的用来存放个人宏文件和软件包的目录。
其缺省值是 |~/texmf| (Mac 下是 |~/Library/texmf|)。与 \dirname{TEXDIR}
不同,其中包含的 |~| 会被不加转换地写进配置文件,因为它能在 \TeX 系统运行时
自动被替换为每个用户自己的主目录。在 Unix 它会被展开为
\dirname{$HOME},而 Windows 下展开为 \verb|%USERPROFILE%|。
-多加一句:\envname{TEXMFHOME} 和所有的目录树一样,都必须按照
+多说一句: \envname{TEXMFHOME} 和所有的目录树一样,都必须按照
\TDS\ 组织,否则文件可能会找不到。
\dirname{TEXMFVAR} 是用来给每个用户存储大多数运行时缓存数据
-的。\dirname{TEXMFCACHE} 则是给 Lua\LaTeX\ 和 \ConTeXt\ MkIV 存储缓存
-(见第 \pageref{sec:context-mkiv} 页的 \ref{sec:context-mkiv} 节);它的默认值是
-\dirname{TEXMFSYSVAR},或者如果 \dirname{TEXMFVAR},如果这个目录可以写。
+的。\dirname{TEXMFCACHE} 则为 Lua\LaTeX\ 和 \ConTeXt\ MkIV 存储缓存
+(见第 \pageref{sec:context-mkiv} 页的 \ref{sec:context-mkiv} 节); 它的缺省值是
+\dirname{TEXMFSYSVAR},或者 (如果那不可写) \dirname{TEXMFVAR}。
\subsubsection{选项}
\label{sec:options}
@@ -747,6 +753,7 @@ Collection (安装集合) 是比 scheme (方案) 要更细的一层 \Dash 实际
\begin{figure}[tbh]
\begin{boxedverbatim}
Options customization:
+===============================================================================
<P> use letter size instead of A4 by default: [ ]
<E> execution of restricted list of programs: [X]
<F> create all format files: [X]
@@ -758,28 +765,25 @@ Options customization:
info to:
<Y> after install, set CTAN as source for package updates: [X]
\end{boxedverbatim}
-\vskip-\baselineskip
+\vskip-.5\baselineskip
\caption{Options 菜单 (Unix)}\label{fig:options-text}
\end{figure}
图~\ref{fig:options-text} 显示了文本模式的选项菜单。关于这个菜单的
-每个选项:
+每个选项:
\begin{description}
-\item[use letter size instead of A4 by default:] 缺省的纸张大小选择。
-当然如果需要,每份文档都可以并且应该单独设定一个纸张大小。
+\item[use letter size instead of A4 by default:] 缺省的纸张大小选项。
+当然,如果有需要,每份文档都可以并且应该单独设定一个纸张大小。
\item[execution of restricted list of programs:] 在 \TL\ 2010 中,
默认允许执行一些外部程序。这 (很少的一部分) 允许的程序列表在
\filename{texmf.cnf} 中定义。参见 2010 版新闻 (第~\ref{sec:2010news} 节)
以了解更多信息。
-\item[create all format files:] 虽然创建不必要的格式文件会浪费一
-点时间,也会多占一些磁盘空间,但
-我们还是建议现在保持这个选项的选定状态,因为如果这次不生成,下次
-用到的时候格式文件就会在用户个人的 \dirname{TEXMFVAR} 目录树内生
-成。这样每次二进制文件或者断字模式更新的时候,这些格式文件也得不
-到更新,所以可能会导致它们的不兼容。
+\item[create all format files:] 我们建议保持这个选项的选定状态,
+以避免在动态创建格式时出现不必要的问题。
+更多内容请参见 \prog{fmtutil} 文档。
\item[install font/macro \ldots\ tree:] 下载安装大部分宏包中的文档和源代码文
件。建议选择。
@@ -788,39 +792,36 @@ Options customization:
这个选项 (只对 Unix 有效的) 可以省下设定环境变量的步骤。如果
没有选择它,就必须把 \TL{} 的对应目录添加到 \envname{PATH},
\envname{MANPATH} 和 \envname{INFOPATH} 中。如果要创建符号链
-接,你需要对这些目标目录的写权限。这个选项是为了在用户已知的
+接,你需要有这些目标目录的写权限。这个选项是为了在用户已知的
标准目录中创建符号链接设计的,比如 \dirname{/usr/local/bin},
这些目录并不包含任何 \TeX\ 文件。不要用这个选项来覆盖系统中
现有的文件,比如给它指定系统目录。最保险和推荐的做法还是不要
选择这个选项。
\item[after install, set CTAN as source for package updates:]
-从 \DVD\ 安装时,这个选项
+从 \DVD\ 或 \ISO\ 镜像安装时,这个选项
被缺省启用,因为通常你会希望在此后通过 \CTAN\ 安装一年内更新的软件
-包。禁用它唯一可能的原因是你只安装了 \DVD\ 内容的一部分,计划在以后
-扩展安装。无论如何,安装程序时和安装后的更新的软件包仓库如果需要可
-以分别设置,见第~\ref{sec:location}~节和
+包。禁用它唯一的可能是你只安装了 \DVD\ 内容的一部分,并计划在以后
+扩展安装。无论如何,安装程序时和安装后的更新的软件包仓库可
+以根据需要分别设置,见第~\ref{sec:location}~节和
第~\ref{sec:dvd-install-net-updates}~节。
\end{description}
-
-Windows 专有的选项,在高级 Perl/Tk 界面中显示有:
+Windows 专有的选项,在高级的 GUI 界面中显示:
\begin{description}
-\item[adjust PATH setting in registry] 保证所有程序都可以在它们的
+\item[adjust searchpath] 保证所有程序都可以在它们的
搜索路径中找到 \TL{} 程序目录。
\item[add menu shortcuts] 如果选择了,它会在开始菜单中创建一个 \TL{}
子菜单。除了 `TeX Live menu' 和 `No shortcuts' 之外,还有 `Launcher entry'
这个选项。这个选项在第 \ref{sec:sharedinstall} 节有详细叙述。
-\item[change file associations] The options are `Only new' (create
- file associations, but do not overwrite existing ones), `All' and
- `None'.
+\item[File associations] 选项包括 `Only new' (创建文件关联,但不覆盖现有的关联),
+`All' 和 `None'。
\item[install \TeX{}works front end]
\end{description}
-
-如果所有的设置已经齐备,你就可以在文本界面中按下 `I',或者图形界面
-中按下 `Install TeX Live' 按钮来开始安装了。安装完成后,
+如果所有的设置已经齐备,你就可以在文本界面中按下 `I',或者 GUI 界面
+中按下 `Install' 按钮来开始安装了。安装完成后,
你可以跳至第~\ref{sec:postinstall}~节来了解还需要做些什么工作。
\subsection{install-tl 命令行选项}
@@ -831,67 +832,68 @@ Windows 专有的选项,在高级 Perl/Tk 界面中显示有:
> \Ucom{install-tl -help}
\end{alltt}
可以列出所有的命令行参数。你既可以用 |-| 也可以用 |--| 来指定一个
-参数。这里有些比较常见的:
+参数。这里有些比较常见的:
\begin{ttdescription}
-\item[-gui] 尽可能用 \GUI{} 模式的安装程序。它需要 Tcl/Tk 版本 8.5 以上。在
- \MacOSX\ 上和 \TL{} 的 Windows 分发中已经满足这个条件了。原有的
- \texttt{-gui=perltk} 和 \texttt{-gui=wizard} 选项需要安装了编译进 XFT 支持的
- Perl/Tk 模块 (\url{https://tug.org/texlive/distro.html#perltk});
- 如果找不到 Perl/Tk,安装程序就会在文本模式下出现。
+\item[-gui] 尽可能用 \GUI{} 模式的安装程序。它需要 Tcl/Tk 版本 8.5 或更高。
+在旧版 \macOS{}\ 上已经分发; 对于 Big Sur 及以后版本,
+如果你没有选择用 Mac\TeX\ 来安装,你需要自己安装 Tcl/Tk。
+Tcl/Tk 已经分发于 Windows 的 \TL{} 中。
+原有的 \texttt{-gui=perltk} 和 \texttt{-gui=wizard} 仍然可以使用
+但它们调用的是相同的 GUI 界面。
+如果找不到 Tcl/Tk,安装程序就会在文本模式下出现。
\item[-no-gui] 强制使用文本模式安装程序。
\item[-lang {\sl LL}] 指定安装程序界面的语言,使用标准的 (通常是两个
-两个字符) 语言代码。安装程序会尝试自己判断出合适的语言,如果判断出的
-语言没有支持就会使用英语替代。可以运行 \verb|install-tl --help| 获得
+两个字符) 语言代码。安装程序会尝试自己判断出合适的语言,
+一旦失败或判断正确的语言无法使用,程序就会使用英语替代。
+可以运行 \verb|install-tl --help| 获得
支持的语言列表。
-\item[-portable] 为比如 \USB{} 盘上便携使用安装。也可以在
+\item[-portable] 为诸如 \USB{} 盘上便携使用安装。也可以在
文本安装程序中用 \code{V} 命令选择,或者 GUI 安装程序中选择,
参见第 \ref{sec:portable-tl} 节。
-\item[-profile {\sl profile}] 载入安装配置文件 \var{file} 以不需要
+\item[-profile {\sl file}] 载入安装配置文件 \var{file} 以不需要
用户干预的方式完成安装。安装程序会在安装到的 \dirname{tlpkg}
-子目录中创建一个叫 \filename{texlive.profile} 的文件。这个文件可以
-用作参数,在不同的系统下完成完全一致的安装。或者你也可以使用一个定
-制的配置文件,一般通过裁剪生成的文件得到,或者空文件,这样安装时会
-使用所有缺省值。
+子目录中创建一个叫 \filename{texlive.profile} 的文件。这个文件,
+比方说,它可以用作参数,在不同的系统下完成完全一致的安装。
+或者你也可以使用一个定制的配置文件,最简单的方法是从生成的配置文件开始,
+修改其中的值,或者直接使用一个空文件,这将采用所有缺省的设置。
\item [-repository {\sl url-or-directory}] 指定作为来源的软件包仓库,
参见下文。
\htmlanchor{opt-in-place}
-\item[-in-place] (补充说明:除非你清楚自己要做什么,否则不要使用这个选项。)
+\item[-in-place] (仅为了完整性记录: 除非你知道自己在做什么,否则不要使用这个选项。)
如果你已经有一份用 rsync, svn, 或者其他方式安装的
-\TL{} (参见 \url{https://tug.org/texlive/acquire-mirror.html}) 那
-这个选项会使用现有的,只执行必要的安装后操作。注意 \filename{tlpkg/texlive.tlpdb}
-文件会被覆盖,你需要自己备份它。另外,文件的删除必须手动完成。所以
-只在你知道自己在干什么的情况下才用它。这个选项不能在安装程序界面中
-选择。
-
+\TL{} 副本 (参见 \url{https://tug.org/texlive/acquire-mirror.html}) 那么
+这个选项会使用现有的副本,按原样使用,并只执行必要的安装后操作。
+注意 \filename{tlpkg/texlive.tlpdb} 文件可能被覆盖,你需要自己备份它。
+另外,包的移除必须手动完成。这个选项不能在安装程序界面中选择。
\end{ttdescription}
\subsubsection{\optname{-repository} 参数}
\label{sec:location}
-默认的网络软件包安装位置是由 \url{http://mirror.ctan.org} 自动选择
+默认的网络包仓库是由 \url{http://mirror.ctan.org} 自动选择
的 \CTAN{} 镜像。
-如果你需要自己指定,地址可以是以 \texttt{ftp:}, \texttt{http:} 或
-\texttt{file:/} 起始的 URL,或者本地路径。(如果给定了一个
-\texttt{http:} 或 \texttt{ftp:} 地址,其末尾的 `\texttt{/}' 字符
-和末尾的 `\texttt{/tlpkg}' 这段都会被忽略。)
+如果你想要覆盖这个设置,
+地址可以是以 \texttt{ftp:}、\texttt{http:}、\texttt{https:}、\texttt{file:/} 开头的 URL,
+或者是一个普通的目录路径。(当给定一个 \texttt{http:}、\texttt{https:} 或 \texttt{ftp:} 地址时,
+其末尾的 `\texttt{/}' 字符和结尾的 `\texttt{/tlpkg}' 组件都会被忽略。)
-比如你可以选择这样的一个 \CTAN\ 镜像:
+比如,你可以选择这样的一个 \CTAN\ 镜像,类似
\url{http://ctan.example.org/tex-archive/systems/texlive/tlnet/},
当然你应该把 |ctan.example.org/tex-archive| 替换为具体镜像的
-域名和特定的顶层 \CTAN\ 路径 (\url{https://ctan.org/mirrors})
-维护了一个 \CTAN\ 的镜像列表)。
+域名和特定的顶层 \CTAN\ 路径。
+\CTAN\ 的镜像列表由 \url{https://ctan.org/mirrors} 维护。
-如果给定的地址在本地磁盘上 (或者是路径或者是 \texttt{file:/}
-开头的 URL),就会使用指定路径下 \dirname{archive} 子目录中的
-压缩文件进行安装。
+如果给定的参数是本地的 (无论是路径还是 \texttt{file:/}
+开头的 URL),仓库路径下的 \dirname{archive} 子目录中的
+压缩文件将被使用 (即使同样有未压缩的文件可用)。
\subsection{安装后的操作}
\label{sec:postinstall}
@@ -902,166 +904,192 @@ Windows 专有的选项,在高级 Perl/Tk 界面中显示有:
\label{sec:env}
如果你选择了在标准路径下创建符号连接 (在第~\ref{sec:options}~节提到),
-那就不需要设置环境变量了。否则,在 Unix 系统中,你应该将自己使用的平台
-下二进制程序的目录加入搜索路径中。(在 Windows 下安装程序会负责这一步。)
+那就不需要设置环境变量了。否则,在 Unix 系统中,你必须将自己使用的平台
+下的二进制程序的目录加入搜索路径中。(在 Windows 下安装程序会负责这一步。)
每个支持的平台都在 \dirname{TEXDIR/bin} 下有自己的子目录。
-参见图~\ref{fig:bin-text} 以了解所有的这些子目录和它们对应的平台。
+图~\ref{fig:bin-text} 展示了这些子目录的列表和它们对应的平台。
-如果希望 man 和 info 能够找到,你还可以把文档的 man 和 Info 目录加
-入其对应的搜索路径中。在添加 \envname{PATH} 后,手册页页可以被自动
+另外,如果还希望 man 和 info 能够被系统工具找到,你还可以把文档的 man 和 Info 目录
+添加至其对应的搜索路径中。在添加 \envname{PATH} 后,man 页面可以被自动
找到。
-对于 \prog{bash} 这样的 Bourne 兼容 shell 而言,以 Intel x86 下的
-GNU/Linux、默认的目录设置为例,需要修改的文件是 \filename{$HOME/.profile}
-(或者其他由 \filename{.profile} 载入的文件),应该添加的内容应该类似
-这样:
+对于像 \prog{bash} 这样的 Bourne 兼容的 shell 而言,以 Intel x86 下的
+GNU/Linux 和 \TL\ 默认的目录设置为例,需要修改的文件可能是 \filename{$HOME/.profile}
+(或者其他由 \filename{.profile} 载入的文件),要添加的内容应该类似
+这样:
\begin{sverbatim}
-PATH=/usr/local/texlive/2020/bin/i386-linux:$PATH; export PATH
-MANPATH=/usr/local/texlive/2020/texmf-dist/doc/man:$MANPATH; export MANPATH
-INFOPATH=/usr/local/texlive/2020/texmf-dist/doc/info:$INFOPATH; export INFOPATH
+PATH=/usr/local/texlive/2024/bin/x86_64-linux:$PATH; export PATH
+MANPATH=/usr/local/texlive/2024/texmf-dist/doc/man:$MANPATH; export MANPATH
+INFOPATH=/usr/local/texlive/2024/texmf-dist/doc/info:$INFOPATH; export INFOPATH
\end{sverbatim}
对于 csh 或者 tcsh,需要修改的文件通常是 \filename{$HOME/.cshrc},而
-应该添加的内容类似:
+要添加的内容类似:
\begin{sverbatim}
-setenv PATH /usr/local/texlive/2020/bin/i386-linux:$PATH
-setenv MANPATH /usr/local/texlive/2020/texmf-dist/doc/man:$MANPATH
-setenv INFOPATH /usr/local/texlive/2020/texmf-dist/doc/info:$INFOPATH
+setenv PATH /usr/local/texlive/2024/bin/x86_64-linux:$PATH
+setenv MANPATH /usr/local/texlive/2024/texmf-dist/doc/man:$MANPATH
+setenv INFOPATH /usr/local/texlive/2024/texmf-dist/doc/info:$INFOPATH
\end{sverbatim}
-如果你已经在你的配置文件里写过了这样的路径设置,那就只需要
-把 \TL\ 的这些目录加进去就行了。
+如果你不是在 \code{x86\_64-linux} 平台,
+请使用相应的平台名称;
+同样,如果你没有安装在默认目录中,请更改目录名称。
+\TL\ 的安装程序在安装结束时会报告要使用的完整路径。
+
+如果你已经在启动文件中设置了 \envname{PATH},
+你可以根据需要将 \TL\ 目录合并到其中。
\subsubsection{环境变量的全局配置}
\label{sec:envglobal}
-如果你希望在整个系统范围内修改这些变量,或这样系统新增的用户自动
-继承这些变量,就得自寻方法了,因为不同的系统之间这方面的配置差异
-太大。
+如果你想要全局地或者对于新添加到系统中的用户进行这些更改,
+那你就得自己动手了;
+因为在系统中配置这些事情的方式和位置变动太大。
我们的建议是: 1)~你可能应该看看 \filename{/etc/manpath.config}
-这个文件是否存在,如果有的话,添加下面这样的内容:
+这个文件是否存在,如果有的话,添加下面这样的内容:
\begin{sverbatim}
-MANPATH_MAP /usr/local/texlive/2020/bin/i386-linux \
- /usr/local/texlive/2020/texmf-dist/doc/man
+MANPATH_MAP /usr/local/texlive/2024/bin/x86_64-linux \
+ /usr/local/texlive/2024/texmf-dist/doc/man
\end{sverbatim}
然后 2)~检查 \filename{/etc/environment} 是否定义了默认的搜索路径
和其他的默认环境变量。
-在每个 (Unix) 二进制目录下,我们都会创建一个 \code{man} 符号链接
-到 \dirname{texmf-dist/doc/man} 目录。因为
-有些 \code{man} 程序,比如 \MacOSX\ 标准的 \code{man} 就能够自动通
-过这个链接找到对应的手册页,这样你就不必手工设置手册页路径了。
+在每个 (Unix) 二进制目录下,我们都会创建一个名为 \code{man} 的符号链接
+关联 \dirname{texmf-dist/doc/man} 目录。
+有些 \code{man} 程序,比如 \macOS{}\ 标准的 \code{man},
+能够自动通过这个链接找到对应的手册页,这样就不必手工设置手册页路径了。
\subsubsection{\DVD\ 安装后的网络更新}
\label{sec:dvd-install-net-updates}
如果你从 \DVD\ 安装了 \TL\ 并希望从网络获取更新,需要在更新了搜索路径
-(如上一节所述) \emph{之后}执行这个命令:
+(如上一节所述) \emph{之后}执行这个命令:
\begin{alltt}
-> \Ucom{tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet}
+> \Ucom{tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet}
\end{alltt}
-这告诉 \cmdname{tlmgr} 从就近的 \CTAN\ 镜像获取未来更新。
-从 \DVD{} 安装时会默认完成这一步,通过第~\ref{sec:options}~节介绍
-的选项。
+这告诉 \cmdname{tlmgr} 未来从就近的 \CTAN\ 镜像获取更新。
+通过第~\ref{sec:options}~节介绍的选项,
+从 \DVD{} 安装时会默认完成这一步。
如果自动镜像选择出现了问题,你可以从 \url{https://ctan.org/mirrors}
-列表中自己指定一个 \CTAN\ 镜像。使用与上述一致的 \dirname{tlnet}
-子目录路径。
+列表中自己指定一个 \CTAN\ 镜像。使用镜像的 \dirname{tlnet}
+子目录的路径,如前所示。
+\htmlanchor{xetexfontconfig} % keep historical anchor working
+\htmlanchor{sysfontconfig}
\subsubsection{\protect\XeTeX\protect\ 和 Lua\protect\TeX 的系统字体配置}
\label{sec:font-conf-sys}
\XeTeX\ 和 Lua\TeX\ 可以使用任何系统安装的字体,而不只是 \TeX\ 目录树
-中的那些。它们使用类似但不完全一致的方式实现这一功能。
-
-在 Windows 下 \TL\ 提供的字体会自动为 \XeTeX\ 所用,只要通过字体名称就可以了。
-在 \MacOSX\ 下如果需要按字体名称查找则需要额外的步骤,参见 Mac\TeX\ 网页
-(\url{https://tug.org/mactex})。如果你在其他 Unix 系统中安装了 \filename{xetex}
-软件包,需要把系统按如下配置一番 \XeTeX\ 才能找到随 \TL\ 安装的那些字体。
-
-为了进行配置,\pkgname{xetex} 安装后 (不管是初始安装还是后来安装的) 都会在
+中的那些。
+这些系统字体 (并不属于 \TL) 常通过给出字体名来访问,
+例如 `\code{Liberation Serif}',
+虽然也可以使用系统文件名。
+
+相关问题是将 \TL\ 发行版的字体作为系统字体可用,这将使它们能通过字体名称访问。
+
+对于 Lua\TeX:
+通过字体名访问并不需要什么特别的处理。
+对于 Lua\TeX\ 来说,
+通过同时支持 \LaTeX\ 和 plain \TeX 的 \pkgname{luaotfload} 包,
+\TL\ 中的所有字体,或是通过字体名,或是通过文件名,都同样可以访问。
+有新的字体时,\pkgname{luaotfload} 包的字体名索引需要重新构建;
+当尝试加载尚未知晓的字体时,此过程会自动触发。
+
+对于 \XeTeX:
+在 Windows 下,随 \TL\ 分发的字体会自动为 \XeTeX\ 所用
+(通过运行 \cmdname{fc-cache} 程序,它在 Windows 作为 \TL\ 的一部分被提供)。
+在 \macOS{}\ 下,你需要查阅其他文档。
+对于除 \macOS 之外的 Unix 系统,步骤如下。
+
+当 \pkgname{xetex} 安装后 (不管是初始安装还是后来安装的),
+都会在
\filename{TEXMFSYSVAR/fonts/conf/texlive-fontconfig.conf} 创建一个
必需的配置文件。
-
-要在整个系统中使用 \TL{} 的字体 (假定你有足够的权限),请依照下面的
-步骤来做:
+为了让 \TL\ 的字体作为系统字体一样被调用,
\begin{enumerate*}
-\item 将 \filename{texlive-fontconfig.conf} 文件复制到
+\item 将 \filename{texlive-fontconfig.conf} 文件 (通常) 复制到
\dirname{/etc/fonts/conf.d/09-texlive.conf}。
\item 运行 \Ucom{fc-cache -fsv}。
\end{enumerate*}
-如果你没有足够的权限执行上述操作,或者只需要把 \TL{} 字体提供给你自
-己,可以这么做:
+如果你没有足够的权限执行上述操作,或者只想把 \TL{} 字体提供给仅一个用户,
+那么你可以这么做:
\begin{enumerate*}
-\item 将 \filename{texlive-fontconfig.conf} 文件复制到
- \filename{~/.fonts.conf},其中 \filename{~} 是你的主目录。
+\item 将 \filename{texlive-fontconfig.conf} 文件 (通常) 复制到
+ \filename{~/.fonts.conf.d/09-texlive.conf},其中 \filename{~} 是你的主目录。
\item 运行 \Ucom{fc-cache -fv}。
\end{enumerate*}
-你可以运行 \code{fc-list} 来查看系统字体的名称。命令
-\code{fc-list : family style file spacing} 可以列出一些有趣的信息。
+你可以运行 \code{fc-list} 来查看系统字体的名称。
+命令 \code{fc-list : family style file spacing} (所有这些参数都是字面字符串) 通常会显示一些很有趣的信息。
-\subsubsection{\protect\ConTeXt{} Mark IV}
+\subsubsection{\protect\ConTeXt{} LMTX 和 MKIV}
+\label{sec:context} % keeping both labels for backward compatibility
\label{sec:context-mkiv}
-“旧”的 \ConTeXt{} (Mark II) 和“新的” \ConTeXt{} (Mark IV)
-应该在 \TL{} 安装后直接就能运行,而且只要你一直用 \verb+tlmgr+ 来更新,
+“旧”的 \ConTeXt{} (Mark IV 或 MkIV) 和“新的” \ConTeXt{} (LMTX or MkXL)
+应该在 \TL{} 安装后能直接运行,而且,只要你一直用 \verb+tlmgr+ 来更新,
它不应该需要任何其他的处理。
-然而,因为 \ConTeXt{} MkIV 没有使用 kpathsea 库,在你手动安装
-文件 (没使用 \verb+tlmgr+) 后必须执行一定的设置。在每次安装后,每个
-MkIV 用户必须执行:
+\ConTeXt{} 不使用 kpathsea 库或系统的 \code{ls-R} 文件;
+相反,\ConTeXt{} 维护了一个针对所有已知目录的每个用户的文件名数据库。
+运行 \code{mktexlsr} 不会直接更新这些数据库,
+但是 \ConTeXt{} 将在下次运行时自动重新构建它们。
+(\TL\ 特定的文件 \code{cont-sys.mkiv} 和 \code{cont-sys.mkxl} 实现了这一点。)
+如果你想手动重新构建他们,
+运行下面的一个或所有:
\begin{sverbatim}
-context --generate
+mtxrun --generate # LMTX
+mtxrun --luatex --generate # MkIV
\end{sverbatim}
-来刷新 \ConTeXt{} 磁盘缓存数据。
-生成的文件会被保存在 \code{TEXMFCACHE} 目录下,在 \TL{} 中这个目录
+生成的文件会被保存在 \code{TEXMFCACHE} 目录下,它在 \TL\
的默认值是 \verb+TEXMFSYSVAR;TEXMFVAR+。
-\ConTeXt\ MkIV 会读取 \verb+TEXMFCACHE+ 提到的所有路径,
-并写入第一个可写东风路径。在读取时,最后找到的匹配会被优先选择。
+\ConTeXt\ 会读取 \verb+TEXMFCACHE+ 提到的所有路径,
+并写入第一个可写的路径。在读取时,对于重复的缓存数据,
+将以最后找到的匹配项为优先选择。
要了解更多信息,参见
-\url{https://wiki.contextgarden.net/Running_Mark_IV}。
+\url{https://wiki.contextgarden.net/LMTX} 和 \url{https://wiki.contextgarden.net/Running_Mark_IV}。
\subsubsection{集成本地与个人宏文件}
\label{sec:local-personal-macros}
-这在第~\ref{sec:texmftrees}~节已经顺带提到过了:\dirname{TEXMFLOCAL}
+这在第~\ref{sec:texmftrees}~节已经顺带提到过了: \dirname{TEXMFLOCAL}
目录 (它的默认值是 \dirname{/usr/local/texlive/texmf-local} 或者
-Windows 下的 \verb|%SystemDrive%\texlive\texmf-local|) 这个目录就是为了存储
-面向整个系统的本地字体和宏文件的;而 \dirname{TEXMFHOME} 目录 (其
+Windows 下的 \verb|%SystemDrive%\texlive\texmf-local|) 就是为了存储
+面向整个系统的本地字体和宏文件的; 而 \dirname{TEXMFHOME} 目录 (其
默认值是 \dirname{$HOME/texmf} 或者 \verb|%USERPROFILE%\texmf|),
-则是用来存储个人的字体和宏文件的。这些目录应该在各个 \TL{}
-版本之间共享,每个版本都能看到其内容。因此不应该把
-\dirname{TEXMFLOCAL} 改得和主 \TL{} 目录差别太大,否则新的版本出来
-你又得再改。
+则是用来存储个人的字体和宏文件的。这些目录旨在共享于各个版本之间,
+并且其内容将由新的 \TL{} 版本自动识别。因此不应该把
+\dirname{TEXMFLOCAL} 的定义改得和主 \TL{} 目录差别太大,否则新的版本出来
+后你又得手动再修改。
对于这两个目录树而言,文件都应该放到合适的 \TeX\ 目录结构 (\TDS)
-子目录中,参见 \url{https://tug.org/tds} 或者
+的子目录中,参见 \url{https://tug.org/tds} 或者
\filename{texmf-dist/web2c/texmf.cnf} 文件。比如一个 \LaTeX{} 文档类或者宏包应该
放在 \dirname{TEXMFLOCAL/tex/latex} 或者 \dirname{TEXMFHOME/tex/latex}
目录下,要不然就是它们的一个子目录下。
\dirname{TEXMFLOCAL} 目录需要一个保持更新的文件名数据库,否则新增
-的文件就无法找到。你可以使用 \cmdname{mktexlsr} 命令或者
-\TeX\ Live Manager \GUI{},configuration 选项卡中的
-`Reinit file database' 按钮来刷新它。
+的文件无法被找到。你可以使用 \cmdname{mktexlsr} 命令来刷新它,
+也可以点击 \TL\ Manager \GUI{} 的 Actions 选项卡中的
+`Update filename database' 按钮来刷新它。
默认情况下,这些变量的每一个都定义为所示单独的目录。这不是一个硬性
-规定。如果你需要在某些大的宏包的不同版本直接方便地切换,可以维护多
-个自己的目录树,这通过把 \dirname{TEXMFHOME} 设置为目录列表实现,
-大括号包围,逗号分隔:
+规定。例如,如果你需要在某些大型宏包的不同版本之间轻松切换,你自己可以根据需要维护多
+个目录树,这通过把 \dirname{TEXMFHOME} 设置为目录列表来实现,
+记得用大括号包裹内容,且目录之间以逗号分隔:
\begin{verbatim}
TEXMFHOME = {/my/dir1,/mydir2,/a/third/dir}
@@ -1071,14 +1099,17 @@ Windows 下的 \verb|%SystemDrive%\texlive\texmf-local|) 这个目录就是为
\subsubsection{集成第三方字体}
-不幸的是,这是一个非常混乱的问题。除非你愿意深入 \TeX{} 安装的细节,
-否则请不要涉足这个领域。\TL\ 已经包含了很多字体,所以请先查查。
+不幸的是,对于 \TeX\ 和 pdf\TeX,这是一个非常混乱的问题。除非你愿意深入 \TeX{} 安装的细节,
+否则请不要涉足这个领域。\TL\ 已经包含了很多字体,所以,如果你想,请先查查;
+链接 \url{https://tug.org/FontCatalogue} 里面展示了主要的 \TeX\ 发行版中包含的几乎所有文本字体,
+这些字体按不同方式分类。
-\XeTeX\ 或 Lua\TeX\ 是可行的替代方案 (参见第~\ref{sec:tex-extensions}~节),
-它们能让你使用操作系统的字体而不必将它安装到 \TeX 中。
+如果你确实想安装自己的字体,
+访问 \url{https://tug.org/fonts/fontinstall.html} 查看我们尽力描述的安装程序。
-如果你非得这么做,参见 \url{https://tug.org/fonts/fontinstall.html},
-这是我们对整个过程最好的描述。
+另外,考虑使用 \XeTeX\ 或 Lua\TeX\ (见第~\ref{sec:tex-extensions}~节),
+这些工具允许您在 \TeX 中使用操作系统的字体并无需安装。
+(但请注意,使用系统字体通常会使您的文档源文件在其他人的不同环境中无法使用。)
\subsection{测试安装是否成功}
\label{sec:test-install}
@@ -1086,20 +1117,20 @@ Windows 下的 \verb|%SystemDrive%\texlive\texmf-local|) 这个目录就是为
在完成 \TL{} 安装之后,自然你会希望试试看它是否正常工作,好让你在以后能够创建优
美的文档和字体。
-你可能马上需要的是一个用来编辑文件的前端程序。\TL{} 在 Windows 下只安装了
-\TeX{}works (\url{https://tug.org/texworks}),而 Mac\TeX\ 则安装了 TeXShop
-(\url{https://pages.uoregon.edu/koch/texshop}。在其他 Unix 系统下,由你自己选择编
-辑器。当然,存在很多选择,有些在下一小节列出了;还可以参见
-\url{https://tug.org/interest.html#editors}。任何纯文本编辑器都可以,不需要专门为
-\TeX{} 设计的。
+你可能马上需要的是一个用来编辑文件的前端程序。\TL{} 只在 Windows 下安装了
+\TeX{}works (\url{https://tug.org/texworks}),而 Mac\TeX\ 下则安装了 TeXShop
+(\url{https://pages.uoregon.edu/koch/texshop})。在其他 Unix 系统下,则由你自己选择编
+辑器。当然,存在很多选择,有些在下一小节列出了; 还可以参见
+\url{https://tug.org/interest.html#editors}。任何纯文本编辑器都可以,并不需要专门为
+\TeX{} 设计。
这个小节后面给出了一些测试系统是否正常工作的基本步骤。我们这里使用的是 Unix 命令,
-在 \MacOSX{} 和 Windows 下你更可能是使用图形界面运行这些测试的,不过其原理并无不
+在 \macOS{} 和 Windows 下,你更可能使用图形界面运行这些测试,不过其原理并无不
同。
\begin{enumerate}
-\item 首先确认你可以执行 \cmdname{tex} 程序:
+\item 首先确认你可以执行 \cmdname{tex} 程序:
\begin{alltt}
> \Ucom{tex -{}-version}
TeX 3.14159265 (TeX Live ...)
@@ -1111,12 +1142,12 @@ Copyright ... D.E. Knuth.
到 \envname{PATH} 中。参见第~\pageref{sec:env}~页关于设置环境变量
的说明。
-\item 处理一个基本的 \LaTeX{} 文件:
+\item 处理一个基本的 \LaTeX{} 文件:
\begin{alltt}
-> \Ucom{latex sample2e.tex}
+> \Ucom{pdflatex sample2e.tex}
This is pdfTeX 3.14...
...
-Output written on sample2e.dvi (3 pages, 7484 bytes).
+Output written on sample2e.pdf (3 pages, 142120 bytes).
Transcript written on sample2e.log.
\end{alltt}
如果无法找到 \filename{sample2e.tex} 或其他什么文件,很可能是因为旧的环境变量
@@ -1124,54 +1155,61 @@ Transcript written on sample2e.log.
让 \TeX{} 报告具体搜索的路径,以便仔细分析出错的原因。参见
第~\pageref{sec:debugging}~页的``调试操作''一节以了解更多信息。)
-\item 即时预览结果:
+\item 即时预览结果:
\begin{alltt}
-> \Ucom{xdvi sample2e.dvi} # Unix
-> \Ucom{dviout sample2e.dvi} # Windows
+> \Ucom{xpdf sample2e.pdf}
\end{alltt}
你应该可以看到在新窗口中出现了一篇介绍 \LaTeX{} 基础的有趣文档。
-(如果你刚接触 \TeX\ 系统,还是值得一读的。) \cmdname{xdvi}
-需要运行在 X 窗口系统下才能工作,如果没有运行窗口环境或
-\envname{DISPLAY} 环境变量设置错误,都会得到
-\samp{Can't open display} 这句错误信息。
+(如果你刚接触 \TeX\ 系统,还是值得一读的。)
+
+当然还有许多其他的 PDF 阅读器。
+在 Unix 系统,
+\cmdname{evince} 和 \cmdname{okular} 是常见的选择。
+在 Windows 系统,
+我们建议尝试 Sumatra PDF
+(\url{https://www.sumatrapdfreader.org/free-pdf-reader.html})。
+\TL{} 中并没有包含任何 PDF 阅读器,
+因此,您必须单独安装您想要使用的任意一款。
-\item 创建用于打印或显示的 \PS{} 文件:
+\item 当然你任何可以生成 \TeX\ 原始的 \dvi{} 文件:
\begin{alltt}
-> \Ucom{dvips sample2e.dvi -o sample2e.ps}
+> \Ucom{latex sample2e.tex}
\end{alltt}
-\item 创建 PDF 文件而非 \dvi{},这里采用直接处理 \filename{.tex}
-文件输出 PDF 的方式:
+\item 并且在线预览 \dvi{}
\begin{alltt}
-> \Ucom{pdflatex sample2e.tex}
+> \Ucom{xdvi sample2e.dvi} # Unix
+> \Ucom{dviout sample2e.dvi} # Windows
\end{alltt}
+\cmdname{xdvi} 需要运行在 X 窗口系统下才能工作;
+如果没有运行窗口环境或 \envname{DISPLAY} 环境变量设置错误,
+都会得到 \samp{Can't open display} 这句错误信息。
-\item 预览 PDF 文件:
+\item 由 \dvi\ 创建 \PS{} 文件:
\begin{alltt}
-> \Ucom{gv sample2e.pdf}
-\textrm{或:}
-> \Ucom{xpdf sample2e.pdf}
+> \Ucom{dvips sample2e.dvi -o sample2e.ps}
+\end{alltt}
+
+\item 或由 \dvi{} 创建 PDF 文件,
+这是一种使用 pdf\TeX\ (或 Xe\TeX\ 或 Lua\TeX) 的替代方案,
+它有时候会很有用:
+\begin{alltt}
+> \Ucom{dvipdfmx sample2e.dvi -o sample2e.pdf}
\end{alltt}
-\cmdname{gv} 和 \cmdname{xpdf} 现在都不包含在 \TL{} 中,你
-必须单独安装它们。请分别参阅 \url{https://www.gnu.org/software/gv} 和
-\url{https://www.xpdfreader.com}。(还有许多其他的 PDF 查看器。)
-Windows 下我们推荐 Sumatra PDF
-(\url{https://www.sumatrapdfreader.org/free-pdf-reader.html})。
-\item 除 \filename{sample2e.tex} 外可能会对你有用的标准测试文件:
+\item 除 \filename{sample2e.tex} 外可能会对你有用的其他标准测试文件:
\begin{ttdescription}
\item [small2e.tex] 比 \filename{sample2e} 更为简单的文档,供你在遇到问题
时尝试减少输入的内容。
\item [testpage.tex] 测试你的打印机是否带有预设的偏移量。
-\item [nfssfont.tex] 打印一份字体表格 (proofsheet) 以供测试。
+\item [nfssfont.tex] 打印一份字体表格以供测试。
\item [testfont.tex] 用 plain \TeX{} 打印字体表格。
\item [story.tex] 最经典的 (plain) \TeX{} 测试文件。在执行
\samp{tex story.tex} 之后,你还要在 \code{*} 提示符下键入 \samp{\bs bye}。
\end{ttdescription}
-你可以用与我们处理 \filename{sample2e.tex} 文件时相同的方式来处理这些文件。
-\item 如果你安装了 \filename{xetex} 包,可以按如下步骤测试它能否访问系统字体:
+\item 如果你安装了 \filename{xetex} 包,可以按如下步骤测试它能否访问系统字体:
\begin{alltt}
> \Ucom{xetex opentype-info.tex}
This is XeTeX, Version 3.14\dots
@@ -1181,11 +1219,45 @@ Transcript written on opentype-info.log.
\end{alltt}
如果你收到 ``Invalid fontname `Latin Modern Roman/ICU'\dots'' 这样
-的错误信息,就说明需要配置系统才能找到 \TL{} 自带的字体。
+的错误信息,就说明需要配置系统才能找到 \TL\ 自带的字体。
参见第~\ref{sec:font-conf-sys}~节。
\end{enumerate}
+\htmlanchor{uninstall}
+\subsection{卸载 \TL}
+\label{sec:uninstall}
+
+要卸载 \TL\ (在成功安装后; 关于 Windows 的操作,请见最后):
+
+\begin{alltt}
+\Ucom{tlmgr uninstall --all}
+\end{alltt}
+
+系统会请求确认,否则不会执行任何操作。
+(如果没有使用 \code{-{}-all},\code{uninstall} 操作将用于移除单个包。)
+
+这不会移除用户特定的目录,具体如下 (也参见第~\ref{sec:texmftrees}~节):
+
+\begin{ttdescription}
+\item [TEXMFCONFIG] 用于用户配置更改。如果你希望保留它们,请确保在删除之前知道如何重新创建它们。
+
+\item [TEXMFVAR] 用于存储自动生成的缓存数据,例如本地格式文件。
+除非你将其用于其他目的,否则删除它应该是安全的。
+
+\item [TEXMFHOME] 只包含你自己安装的文件,通常是发行版中不提供的文件。
+除非你完全停止使用 \TeX,或者想从头开始,否则你可能不希望删除此目录。
+
+\end{ttdescription}
+
+\noindent 您可以通过运行 \code{kpsewhich -var-value=\ttvar{var}} 来找到这些变量的目录路径。
+
+此 \prog{tlmgr} 卸载操作也不会撤销安装后的操作,
+如在你的 shell 初始化文件中修改的 \envname{PATH} 和系统对 \TL\ 中字体的访问
+(见第~\ref{sec:postinstall}~节)。如果需要,您必须手动撤销这些操作。
+
+在 Windows 上,卸载可以通过 \GUI 进行; 见第~\ref{sec:winfeatures}~节。
+
\subsection{其他可下载软件的链接}
如果你还是个 \TeX{} 新手,或者在编辑 \TeX{} 或 \LaTeX{} 文档时需要帮助,
@@ -1193,30 +1265,29 @@ Transcript written on opentype-info.log.
这里是一些你可能会考虑安装的其他工具的链接。
\begin{description}
-\item[Ghostscript] \url{https://ghostscript.com/}
+\item[Ghostscript] \url{https://ghostscript.com/} 一个免费的 PostScript 和 PDF 解释器。
\item[Perl] \url{https://perl.org/} 与 CPAN 中的补充包,
- \url{https://cpan.org/}
-\item[ImageMagick] \url{https://imagemagick.org}, 用于图形处理和转换
+ \url{https://cpan.org/}。
+\item[ImageMagick] \url{https://imagemagick.org}, 用于图形处理和转换。
\item[NetPBM] \url{http://netpbm.sourceforge.net}, 同样用于图形。
\item[面向 \TeX\ 的编辑器] 有很广泛的选择,一般依用户个人的口味而定。这
里按字典序列出了一些 (部分是 Windows 才有的)。
\begin{itemize*}
- \item \cmdname{GNU Emacs} 在 Windows 下也有原生版本,参见
- \url{https://www.gnu.org/software/emacs/emacs.html}。
- \item \cmdname{Emacs 的 Auc\TeX\ 包} 的 Windows 版本在 \CTAN\ 提供。
- AuC\TeX\ 的主页在 \url{https://www.gnu.org/software/auctex}。
+ \item \cmdname{GNU Emacs} 在所有的主要平台上都可以使用; 参见
+ \url{https://www.gnu.org/software/emacs}。
+ \item \cmdname{AUC\TeX} 在 Emacs 下运行; 通过 Emacs 的包管理器 \cmdname{ELPA} 可以获得。
+ 源代码也可以通过 CTAN 获取。AUC\TeX\ 的主页是 \url{https://www.gnu.org/software/auctex}。
\item \cmdname{SciTE} 在
\url{https://www.scintilla.org/SciTE.html} 提供。
\item \cmdname{Texmaker} 是自由软件,在
\url{https://www.xm1math.net/texmaker} 提供。
\item \cmdname{TeXstudio} 是 \cmdname{Texmaker} 的一个
- fork,引入了额外的功能;\url{https://texstudio.org}。
+ fork,引入了额外的功能; 在 \url{https://texstudio.org} 提供。
\item \cmdname{TeXnicCenter} 是自由软件,在
- \url{https://www.texniccenter.org} 提供,也随 pro\TeX{}t
- 发行版附带。
+ \url{https://www.texniccenter.org} 提供。
\item \cmdname{TeXworks} 是自由软件,在 \url{https://tug.org/texworks} 提供,也
- 作为 \TL{} 的一部分只在 Windows 被安装。
+ 作为 \TL{} 的一部分只在 Windows 下被安装。
\item \cmdname{Vim} 是自由软件,在
\url{https://www.vim.org} 提供。
\item \cmdname{WinEdt} 是共享软件,在
@@ -1235,10 +1306,10 @@ Transcript written on opentype-info.log.
\label{sec:sharedinstall}
\TL{} 的设计可以使它在同一个网络中的不同的系统间共享。在标准的
-目录结构下,不需要配置固定的绝对路径:\TL{} 程
-序所需要的文件都能通过都在这些程序自身的相对路径找到。你可以在
+目录结构下,不需要配置固定的绝对路径: \TL{} 程
+序所需要的文件都能通过在这些程序自身的相对路径找到。你可以在
\filename{$TEXMFDIST/web2c/texmf.cnf} 配置文件中看到实际的处理,
-它包含了类似下面的内容:
+它包含了类似下面的内容:
\begin{verbatim}
TEXMFROOT = $SELFAUTOPARENT
...
@@ -1253,8 +1324,8 @@ TEXMFLOCAL = $SELFAUTOGRANDPARENT/../texmf-local
至于 Windows,\TL{} 包含了一个叫 \filename{tlaunch} 的启动程序。它的主
窗口的菜单和按钮包括许多 \TeX\ 相关功能的程序和文档,还可以通过 \code{ini}
-定制。首次使用时,它会进行一些 Windows 专有的安装后设置,比如给当前用户
-修改搜索路径并创建文件关联。因此,在局域网络中可以访问到 \TL{} 的工作站
+定制。首次使用时,它会进行一些 Windows 专有的后安装设置,比如给当前用户
+修改搜索路径并创建文件关联。因此,在局域网络中可以访问到 \TL{} 的工作站,
只需要启动器的快捷菜单就够了。参见 \code{tlaunch} 手册 (\code{texdoc tlaunch},
或 \url{https://ctan.org/pkg/tlaunch})。
@@ -1267,14 +1338,19 @@ TEXMFLOCAL = $SELFAUTOGRANDPARENT/../texmf-local
安装,而跳过系统集成。你可以在 \USB{} 盘上创建这样的安装,或者在安装
后复制到 \USB{} 盘上。
+从技术上讲,
+通过将 \envname{TEXMFHOME}、\envname{TEXMFVAR} 和 \envname{TEXMFCONFIG} 的默认值分别设置为与
+\envname{TEXMFLOCAL}、\envname{TEXMFSYSVAR} 和 \envname{TEXMFSYSCONFIG} 相同,
+使得便携式安装成为自包含的; 因此,不会创建针对用户的配置和缓存。
+
要使用这样的便携安装来运行 \TeX{},你必须将对应的二进制目录加入终端
的搜索路径,如往常一样。
在 Windows 下,你可以双击安装根目录下的 \filename{tl-tray-menu}
-来创建一个临时的启动栏菜单,以选择执行一些常见任务,如这个截图所示:
+来创建一个临时的启动栏菜单,以选择执行一些常见任务,如这个截图所示:
\medskip
-\tlpng{tray-menu}{4cm}
+\tlpng{../texlive-common/tray-menu}{4cm}{Windows 托盘菜单}
\smallskip
\noindent `More\ldots' 项目解释了如何定制这个菜单。
@@ -1285,31 +1361,33 @@ TEXMFLOCAL = $SELFAUTOGRANDPARENT/../texmf-local
\begin{figure}[tb]
-\tlpng{tlshell-macos}{\linewidth}
-\caption{\prog{tlshell} \GUI, 显示了 Actions 菜单 (\MacOSX)}
+\def\figdesc{\prog{tlshell} \GUI, 显示 Actions 菜单 (\GNU/Linux)}
+\tlpng{../texlive-common/tlshell-linux}{\linewidth}{\figdesc}
+\caption{\figdesc}
\label{fig:tlshell}
\end{figure}
\begin{figure}[tb]
-\tlpng{tlcockpit-packages}{.8\linewidth}
-\caption{\prog{tlmgr} 的 \prog{tlcockpit} \GUI{}}
+\def\figdesc{\prog{tlmgr} 的 \prog{tlcockpit} \GUI{}}
+\tlpng{../texlive-common/tlcockpit-packages}{.8\linewidth}{\figdesc}
+\caption{\figdesc}
\label{fig:tlcockpit}
\end{figure}
\begin{figure}[tb]
-\tlpng{tlmgr-gui}{\linewidth}
-\caption{旧有的 \prog{tlmgr} \GUI\ 模式:按下 `Load' 后的主窗口}
+\def\figdesc{旧有的 \prog{tlmgr} \GUI\ 模式: 按下 `Load' 后的主窗口}
+\tlpng{../texlive-common/tlmgr-gui}{\linewidth}{\figdesc}
+\caption{\figdesc}
\label{fig:tlmgr-gui}
\end{figure}
\TL{} 包含一个叫 \prog{tlmgr} 的程序,它可以用来管理安装后的
-系统。它的功能包括:
+系统。它的功能包括:
\begin{itemize*}
-\item 列出方案 (scheme),集合和安装包;
-\item 安装、升级、备份、恢复、卸载软件包,并且能自动计算依赖关系;
-\item 查找和列出软件包以及它们的描述;
-\item 列出、添加和删除不同平台的可执行文件;
+\item 安装、更新、备份、还原和卸载各个软件包,可选择考虑依赖关系;
+\item 查找和列出软件包以及它们的描述;
+\item 列出、添加和删除不同平台的可执行文件;
\item 改变安装选项,比如纸张大小和源文件位置 (参见第~\ref{sec:location}~节)。
\end{itemize*}
@@ -1319,12 +1397,14 @@ TEXMFLOCAL = $SELFAUTOGRANDPARENT/../texmf-local
\subsection{\cmdname{tlmgr} 的 \GUI{} 界面}
-\TL{} 包含多个 \prog{tlmgr} 的 \GUI{}。图~\ref{fig:tlshell} 展示了
-\cmdname{tlshell},它是用 Tcl/Tk 编写的,在 Windows 和 \MacOSX{} 下直接就能用。
-图~\ref{fig:tlcockpit} 展示了 \prog{tlcockpit},它需要 Java 版本~8 或者更高以及
-JavaFX。这两个都是单独的安装包。
+\TL{} 包含多个 \prog{tlmgr} 的 \GUI{} 前端。
+其中两个值得注意的: 图~\ref{fig:tlshell} 展示了
+\cmdname{tlshell},它是用 Tcl/Tk 编写的,在 Windows 开箱即用。
+图~\ref{fig:tlcockpit} 展示了 \prog{tlcockpit},
+它需要 Java 版本~8 或者更高以及 JavaFX。这两个都是独立的安装包。
-\prog{tlmgr} 还有一个原生的 \GUI{} 模式 (见图~\ref{fig:tlmgr-gui}):
+\prog{tlmgr} 还有一个原生的 \GUI{} 模式 (见图~\ref{fig:tlmgr-gui}),
+启动它可以用:
\begin{alltt}
> \Ucom{tlmgr -gui}
\end{alltt}
@@ -1333,25 +1413,25 @@ JavaFX。这两个都是单独的安装包。
\subsection{\cmdname{tlmgr} 命令行使用示例}
-在初始安装之后,你可以用下面的命令更新系统:
+在初始安装之后,你可以用下面的命令更新至最新版本:
\begin{alltt}
> \Ucom{tlmgr update -all}
\end{alltt}
-如果这太激进了一点,先尝试:
+如果这太激进了一点,先尝试:
\begin{alltt}
> \Ucom{tlmgr update -all -dry-run}
\end{alltt}
-或 (产生更少输出):
+或 (产生更少输出):
\begin{alltt}
> \Ucom{tlmgr update -list}
\end{alltt}
-下面这个更复杂一点的例子从本地目录添加了一个新的软件包集合,用于 \XeTeX\ 引擎。
+下面这个更复杂一点的例子从本地目录添加了一个新的软件包集合,用于 \XeTeX\ 引擎:
\begin{alltt}
> \Ucom{tlmgr -repository /local/mirror/tlnet install collection-xetex}
\end{alltt}
-它会产生下面的输出 (节略部分):
+它会产生下面的输出 (节略部分):
\begin{fverbatim}
install: collection-xetex
install: arabxetex
@@ -1363,23 +1443,23 @@ running post install action for xetex
install: xetex-def
...
running mktexlsr
-mktexlsr: Updating /usr/local/texlive/2020/texmf-dist/ls-R...
+mktexlsr: Updating /usr/local/texlive/2024/texmf-dist/ls-R...
...
running fmtutil-sys --missing
...
Transcript written on xelatex.log.
-fmtutil: /usr/local/texlive/2020/texmf-var/web2c/xetex/xelatex.fmt installed.
+fmtutil: /usr/local/texlive/2024/texmf-var/web2c/xetex/xelatex.fmt installed.
\end{fverbatim}
如你所见,\prog{tlmgr} 会安装所有依赖的包,也会处理所有包括刷新文件名
-数据库和重新生成格式文件在内的所有必要的安装后工作。上面给 \XeTeX{}
+数据库和重新生成格式文件在内的所有必要的后安装工作。上面给 \XeTeX{}
生成了新的格式文件。
要描述一个包 (或者集合、安装方案):
\begin{alltt}
> \Ucom{tlmgr show collection-latexextra}
\end{alltt}
-会产生这样的输出:
+会输出这样的内容:
\begin{fverbatim}
package: collection-latexextra
category: Collection
@@ -1391,7 +1471,7 @@ sizes: 657941k
\end{fverbatim}
最后也是最重要的,查阅 \url{https://tug.org/texlive/tlmgr.html}
-这里的完整文档,或者:
+这里的完整文档,或者:
\begin{alltt}
> \Ucom{tlmgr -help}
\end{alltt}
@@ -1402,22 +1482,32 @@ sizes: 657941k
\subsection{针对 Windows 的特征}
\label{sec:winfeatures}
-在 Windows 下,安装程序额外地做了以下一些事情:
+在 Windows 下,安装程序执行了一些额外的操作:
\begin{description}
-\item[菜单与快捷方式。] 在开始菜单上加入了新的`\TL{}'程序菜单,主要是一些
-\GUI{} 程序 (如 \prog{tlmgr}、\prog{texdoctk} 和一些文档的菜单。
+\item[菜单与快捷方式。] 在开始菜单上加入了新的 `\TL{}' 程序菜单,主要是一些
+\GUI{} 程序, 如 \prog{tlshell} (\prog{tlmgr} 的 \GUI) 和 \prog{dviout},
+以及一些文档的菜单。
+
\item[文件关联。] 如果启用,\prog{TeXworks} 和 \prog{Dviout} 会成为它们对应文件
类型的默认程序,或者在这些文件类型的“用...打开”右键菜单中出现。
-\item[位图到 eps 转换器。] 许多位图格式会在它们的“用...打开”菜单中获得一个
- \cmdname{bitmap2eps} 项目。Bitmap2eps 是一个使用 \cmdname{sam2p} 或
- \cmdname{bmeps} 的简单脚本。
+然而,优先级更高的“用户选择”文件关联 (只能通过交互方式指定) 可能会造成干扰。
+
+\item[PostScript 支持。] 对于 PostScript 文件,
+一个 PSviewer 文件类型现在会将 PostScript 转换为临时 PDF,
+然后由默认的 PDF 查看器显示。
+各种位图格式在其“打开方式”右键菜单中会有一个 \cmdname{bitmap2eps} 条目,
+用于转换为 EPS,
+让 \cmdname{sam2p} 或 \cmdname{bmeps} 执行实际工作。
+
\item[自动路径调整。] 不需要手动配置步骤。
-\item[自动设置环境变量。] 不再需要手动的配置步骤。
-\item[反安装程序。] 安装程序为 \TL{} 创建了`添加/删除程序'条目。这与
-\TeX\ Live Manager \GUI\ 的删除按钮相对应。对于单用户安装,安装程序会在开始菜单
-创建卸载项目。
-\item[写保护。] 对于管理员安装,\TL\ 的目录会有写保护,至少在 \TL\ 被安装到 NTFS
-格式的本地磁盘时是这样的。
+
+\item[卸载程序。] 安装程序会为 \TL{} 创建一个条目,
+要么在“添加/删除程序”中 (管理员安装),
+要么在 \TL{} 菜单中 (单用户安装)。
+
+\item[写保护。] 对于管理员安装,
+如果 \TL\ 安装在正常的 NTFS 格式化的不可移动磁盘上,
+则 \TL\ 目录是写保护的。
\end{description}
另外,另一种方式可以参见 \filename{tlaunch}, 在第~\ref{sec:sharedinstall} 节有描述。
@@ -1428,10 +1518,13 @@ sizes: 657941k
\TL{} 提供了以下缺失的部分。这些程序只在 \TL{} 的 Windows 版本中提供。
\begin{description}
-\item[Perl 和 Ghostscript。] 由于 Perl 和 Ghostscript 的重要性,\TL{}
-提供了这些程序的`隐藏'拷贝。需要这些软件支持的 \TL{} 程序知道它们的位置,
-但它们不会通过环境变量和注册表设置来暴露所在的位置。它们不是完整的安装版,
-也不会与任何 Perl 或 Ghostscript 系统安装程序冲突。
+\item[Perl、Tcl/Tk 和 Ghostscript。] 由于 Perl 和 Ghostscript 的重要性,
+并且安装程序和 tlshell \GUI{} 是用 Tcl/Tk 编写的,
+\TL{} 提供了这些程序的`隐藏'拷贝。需要这些软件支持的 \TL{} 程序知道它们的位置,
+但它们不会通过环境变量和注册表设置来暴露所在的位置。它们不是完整的安装版 (除了 Ghostscript),
+也不会与任何 Perl、Tcl/Tk 或 Ghostscript 系统安装程序冲突。
+请参阅第~\ref{sec:externalwndws}~节,
+了解如何告知 \TL{} 使用您自己的外部安装来处理 \TL{} 内的贡献脚本。
\item[dviout。] 另外安装的还包括一款 DVI 预览程序 \prog{dviout}。
当你第一次使用 \cmdname{dviout} 预览文件时,因为没有安装屏幕显示字体,它
@@ -1442,25 +1535,62 @@ sizes: 657941k
\TeX\ 编辑器。
\item[命令行工具。] 与常见的 \TL{} 二进制文件一起,还安装了一些常见的
-Unix 命令行工具的 Windows 移植版本。它们包括 \cmdname{gzip}、
-\cmdname{unzip} 以及来自于 \cmdname{poppler} 套装中的一些工具
-(\cmdname{pdfinfo}, \cmdname{pdffonts}, \ldots)。
-虽然没有提供 Windows 版本的 PDF 阅读器,但有许多替代产品,其中之一是
-Sumatra PDF 阅读器,可以从 \url{https://sumatrapdfreader.org/} 获得。
+Unix 命令行工具的 Windows 移植版本。
+它们包括 \cmdname{gzip}、\cmdname{zip}、\cmdname{unzip} 以及 \cmdname{poppler} 套件中的工具
+(如 \cmdname{pdfinfo}、\cmdname{pdffonts} 等)。
-\item[fc-list、fc-cache, \ldots] 来自于 fontconfig 库的这些工具有助于 \XeTeX{}
+\item[fc-list、fc-cache 等。] 来自于 \pkgname{fontconfig} 库的这些工具有助于 \XeTeX{}
处理 Windows 的系统字体。你可以使用 \prog{fc-list} 来确定传递给经 \XeTeX
扩展后的 \cs{font} 命令的字体名称。如果需要,首先运行 \prog{fc-cache} 更新
字体信息。
\end{description}
+\subsection{使用外部的 Perl、Tcl/Tk 和 Ghostscript 程序}
+\label{sec:externalwndws}
+
+通常,
+\TL{} 会使用其内置的 Perl、Tcl/Tk 和 Ghostscript 来运行 \TL{} 内部的贡献脚本。
+如果你希望使用自己的外部版本,
+你可以在\emph{安装根目录}的 \file{texmf.cnf} 文件中进行配置。
+
+对于 Perl,
+你需要添加一行
+\begin{verbatim}
+TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 1
+\end{verbatim}
+\TL{} (特别是 \file{bin/windows/runscript.tlu}) 会在搜索路径中查找 \file{perl.exe},
+除了属于 \TL{} 底层的脚本之外。
+这是三者中最有可能有用的设置;
+尽管 \TL{} Perl 包含许多附加模块,
+但它不能支持所有的第三方脚本。
+
+同样地,
+对于 Tcl/Tk,
+你需要添加一行
+\begin{verbatim}
+TEXLIVE_WINDOWS_TRY_EXTERNAL_TCL = 1
+\end{verbatim}
+\TL{} 将会在搜索路径中查找 \file{tclkit.exe}、\file{wish.exe}、\file{wish85.exe}、\file{wish86.exe} 和 \file{wish87.exe}。
+
+Ghostscript 的处理方式有所不同,
+你需要指定命令行 Ghostscript 的文件名或完整路径:
+\begin{alltt}
+TEXLIVE_WINDOWS_EXTERNAL_GS = \var{命令行 Ghostscript 的路径}
+\end{alltt}
+另一个不同点是,
+\TL{} 附带的 Ghostscript 是完整的,
+仅缺少文档和打印机驱动程序。
+因此,你不太可能需要覆盖它。
+
+另请参阅第~\ref{sec:configfiles}~节关于 \file{texmf.cnf} 的说明。
+
\subsection{User Profile 目录相当于主目录}
\label{sec:winhome}
Windows 下对应于 Unix 下的主目录的是 \verb|%USERPROFILE%|。
在 Windows Vista 和以后的系统下,它通常位于
-\verb|C:\Documents and Settings\<username>|;
+\verb|C:\Documents and Settings\<username>|;
在 Windows Vista 和之后的版本下是 \verb|C:\Users\<username>|。通常情况下,在
\filename{texmf.cnf} 文件和 \KPS{} 中,\verb|~| 在 Windows 和 Unix 下均可以
进行合适的展开。
@@ -1468,37 +1598,63 @@ Windows 下对应于 Unix 下的主目录的是 \verb|%USERPROFILE%|。
\subsection{Windows 注册表}
\label{sec:registry}
-Windows 将几乎所有的配置数据存放在注册表中。注册表是包含几个主支的一系
-列分层组织的分支。对于安装的程序而言,最重要的主支是 \path{HKEY_CURRENT_USER}
-和 \path{HKEY_LOCAL_MACHINE},通常简写为 \path{HKCU} 和 \path{HKLM}。注册表的
-\path{HKCU} 部分位于用户的主目录 (参见~\ref{sec:winhome}~节)。\path{HKLM}
-通常位于 Windows 目录的子目录中。
+在 Windows 中,
+Unix 主目录的对应目录是 \verb|%USERPROFILE%| 目录。
+在 Windows Vista 及更高版本中,
+它是 \verb|C:\Users\<username>|。
+在 \filename{texmf.cnf} 文件中,
+以及在 \KPS{} 中的一般情况下,
+\verb|~| 将在 Windows 和 Unix 上都能适当地展开。
-在某些情况下,系统信息可以从环境变量获得,但对于其它信息,如快捷方式的位置,
-则需要访问注册表。设置永久环境变量也需要访问注册表。
+\subsection{Windows 注册表}
+\label{sec:registry}
+Windows 将几乎所有的配置数据存储在其注册表中。
+注册表包含一组层次结构组织的键,具有多个根键。
+对于安装程序来说,
+最重要的根键是 \path{HKEY_CURRENT_USER} 和 \path{HKEY_LOCAL_MACHINE},
+简称为 \path{HKCU} 和 \path{HKLM}。
+注册表的 \path{HKCU} 部分位于用户的主目录中(参见第~\ref{sec:winhome}~节)。
+\path{HKLM} 通常位于 Windows 目录的一个子目录中。
+
+在某些情况下,
+系统信息可以从环境变量中获取,
+但对于其他信息,例如快捷方式的位置,则需要查询注册表。
+永久设置环境变量也需要访问注册表。
\subsection{Windows 权限}
\label{sec:winpermissions}
-在较新的 Windows 版本中,普通用户与管理员是有区别的。只有管理员能自由访问整个操作系统。我们努力使
-得 \TL{} 的安装不需要管理员权限。
+在较新的 Windows 版本中,
+普通用户与管理员是有区别的。
+只有管理员能自由访问近乎整个操作系统。
+我们努力使得 \TL{} 的安装不需要管理员权限。
-如果安装程序以管理员权限启动,会有选项允许给所有用户安装,如果启用了这个选项,就
-会给所有用户创建快捷方式,并修改系统搜索路径。否则,安装程序只为当前用户创建快捷
-方式,并改变用户搜索路径。
+如果安装程序以管理员权限启动,
+会有选项允许给所有用户安装,
+如果启用了这个选项,
+就会给所有用户创建快捷方式,
+并修改系统搜索路径。
+否则,安装程序只为当前用户创建快捷方式,
+并改变用户搜索路径。
-无论管理员状态如何,\TL{} 预设的默认根目录总是位于 \verb|%SystemDrive%|
-下。对于当前用户安装程序总是要测试,根目录是否可写。
+无论管理员状态如何,
+\TL{} 预设的默认根目录总是位于 \verb|%SystemDrive%| 下。
+对于当前用户安装,程序总是要测试根目录是否可写。
如果用户不是管理员,并且 \TeX{} 已经存在搜索路径中,则可能会出现问题。
-因为有效搜索路径是由系统路径后接用户路径组成,新安装的 \TL{} 可能永远不会
-优先运行。为了保险起见,安装程序为命令提示符创建快捷方式。在这个快捷
-方式中,新安装的 \TL{} 的可执行目录被预设于本地的搜索路径中。当从这个
-快捷方式启动命令行任务时,便可以使用新的 \TL{}。如果安装了 \TeX{}works,
-其快捷方式也将 \TL{} 加进了搜索路径中,所以它应该不会出现路径问题。
-
-你需要知道的是:即使你以管理员身份登录系统,依旧要求你
+因为有效搜索路径是由系统路径后接用户路径组成,
+新安装的 \TL{} 可能永远不会优先运行。
+为了保险起见,安装程序为命令提示符创建快捷方式。
+在这个快捷方式中,
+新安装的 \TL{} 的可执行目录被预设于本地的搜索路径中。
+当从这个快捷方式启动命令行任务时,
+便可以使用新的 \TL{}。
+如果安装了 \TeX{}works,
+其快捷方式也将 \TL{} 加进了搜索路径中,
+所以它应该不会出现路径问题。
+
+你需要知道的是: 即使你以管理员身份登录系统,依旧要求你
提供管理员权限。实际上,是否以管理员身份登录并不是问题所在。相反,在你希望运行的
程序或快捷方式上单击右键,系统通常会给出“以管理员身份执行”这样的选择。
@@ -1515,7 +1671,7 @@ Windows 和 Cygwin (参见第~\ref{sec:cygwin}~节以了解 Cygwin 安装细节)
增加可用内存量。
对 Windows,你必须创建一个文件,例如命名为 \code{moremem.reg},包含
-如下内容:
+如下内容:
\begin{sverbatim}
Windows Registry Editor Version 5.00
@@ -1529,11 +1685,11 @@ Windows Registry Editor Version 5.00
\section{Web2C 用户指南}
-\Webc{} 是一整套 \TeX{} 相关程序的集合:\TeX{} 本身、\MF{}、\MP{}、\BibTeX{},
+\Webc{} 是一整套 \TeX{} 相关程序的集合: \TeX{} 本身、\MF{}、\MP{}、\BibTeX{},
等等。它是 \TL{} 的核心。\Webc{} 的主页及最新的手册等都在
\url{https://tug.org/web2c}。
-我们简单的介绍一下它的历史:最早它是由 Tomas Rokicki 在 1987 年实现的,他开发了第一套
+我们简单的介绍一下它的历史: 最早它是由 Tomas Rokicki 在 1987 年实现的,他开发了第一套
将 \TeX{} 系统的代码转换为 C 语言代码的系统,基于的是 Unix 下 change files
的原理,change files 的
工作是 Howard Trickey 和 Pavel Curtis 完成的。Tim Morgan 后来成为了这套系统的维护
@@ -1541,9 +1697,9 @@ Windows Registry Editor Version 5.00
接手了这个工作,到 1997 年,他把这项工作交给了 Olaf Weber。Olaf Weber 在 2006 年又
把这项工作交还给了 Karl。
-\Webc{} 系统可以在 Unix、32 位 Windows 系统、\MacOSX{} 和其他的一些操作系统下运行。
+\Webc{} 系统可以在 Unix、Windows 系统、\macOS{} 和其他的一些操作系统下运行。
它使用的是 Knuth 用 \web{} 文学编程语言编写的 \TeX{} 和其他基本程序的原始代码,将其转换为 C
-源码。用这种方法处理的核心的 \TeX{} 程序包括:
+源码。用这种方法处理的核心的 \TeX{} 程序包括:
\begin{cmddescription}
\item[bibtex] 维护参考文献。
@@ -1573,20 +1729,20 @@ Windows Registry Editor Version 5.00
档中也有相关介绍。不过,有些规则对所有这些程序都是通用的,了解这些规则有助于你更好的使用
\Webc{}。
-所有的程序都接受这些 \GNU 标准的选项:
+所有的程序都接受这些 \GNU 标准的选项:
\begin{ttdescription}
\item[-{}-help] 显示基本使用说明。
\item[-{}-version] 显示版本信息,然后退出。
\end{ttdescription}
-而大部分都接受:
+而大部分都接受:
\begin{ttdescription}
\item[-{}-verbose] 显示详细的执行过程。
\end{ttdescription}
所有的 \Webc{} 程序均使用 \KPS{} (\url{https://tug.org/kpathsea}) 路径搜索库来查找文件,
这套库结合环境变量和配置文件的
-使用来优化大量 \TeX{} 文件的搜索。\Webc{} 可以在多于一套的目录树下执行查找,这可以方
+使用来优化 (庞大的) \TeX{} 文件的搜索。\Webc{} 可以在多于一套的目录树下执行查找,这可以方
便维护类似 \TeX{} 标准发行版和本地版本的扩展这样两套目录树。为了优化搜索的速度,每个目
录树的顶层目录下都有一个 \file{ls-R} 文件,这个文件里包含了所有此目录下文件的名称和对
应的相对路径。
@@ -1598,7 +1754,7 @@ Windows Registry Editor Version 5.00
我们将目录名称称作\emph{路径元素},而把用冒号或者分号分隔的路径元素列表称
作\emph{搜索路径}。搜索路径可能是许多种来源的组合,比如在 \samp{.:/dir} 路径下
-搜索 \samp{my-file} 这个文件,\KPS{} 将逐个尝试路径中的每个元素:首先是
+搜索 \samp{my-file} 这个文件,\KPS{} 将逐个尝试路径中的每个元素: 首先是
\file{./my-file},然后是 \file{/dir/my-file},并返回找到的第一个结果 (或者
也可以返回所有的结果)。
@@ -1609,7 +1765,7 @@ Windows Registry Editor Version 5.00
数据库 (见第~\pageref{sec:filename-database}~页的``文件名数据库'') 存在,也就是说,
是否有数据库正好对应着 \var{p} 的一个前缀。如果存在,就在数据库中寻找符合的路径后缀。
-尽管最简单也最常见的路径元素是目录名称,\KPS{} 搜索的路径里还是可以使用其他额外功能的:
+尽管最简单也最常见的路径元素是目录名称,\KPS{} 搜索的路径里还可以使用其他额外功能:
多层默认值,环境变量名称、配置文件值、用户主目录,以及递归式子目录查找。所以我们把 \KPS{}
将搜索路径变换为一个或多个基本目录名的过程称为\emph{展开}路径元素的过程。展开的方式
按执行的顺序在后续小节里有叙述。
@@ -1630,16 +1786,16 @@ Windows Registry Editor Version 5.00
\subsubsection{路径的来源}
\label{sec:path-sources}
-搜索路径可能来自许多地方,\KPS{} 是按照下面的顺序查找的:
+搜索路径可能来自许多地方,\KPS{} 是按照下面的顺序查找的:
\begin{enumerate}
\item
用户设置的环境变量,例如 \envname{TEXINPUTS}\@。以 . 连接某个程序名称的环境变量
-有更高的优先级,比如若正在运行的程序是 \samp{latex},那 \envname{TEXINPUTS.latex}
-将比 \envname{TEXINPUTS} 优先级更高。
+ 有更高的优先级,比如若正在运行的程序是 \samp{latex},那 \envname{TEXINPUTS.latex}
+ 将比 \envname{TEXINPUTS} 优先级更高。
\item
专门针对某个程序的配置文件,比如 \cmdname{dvips} 的 \file{config.ps} 里出现
-\samp{S /a:/b} 这样一行。
+ \samp{S /a:/b} 这样一行。
\item \KPS{} 配置文件 \file{texmf.cnf},包含类似
\samp{TEXINPUTS=/c:/d} 这样的一行 (参见下面的解释)。
\item 编译时的缺省值。
@@ -1648,17 +1804,18 @@ Windows Registry Editor Version 5.00
``调试操作'')。
\subsubsection{配置文件}
+\label{sec:configfiles}
\KPS{} 读入\emph{运行时配置文件} \file{texmf.cnf} 来获得搜索路径和其他定义。
我们用 \envname{TEXMFCNF} 搜索路径来查找这些文件,但我们不建议设置这个 (或者任
何) 环境变量来替代系统路径。
-作为代替,标准的安装将产生文件 \file{.../2020/texmf.cnf}。如果你必须修改缺省
+作为代替,标准的安装将产生文件 \file{.../2024/texmf.cnf}。如果你必须修改缺省
值 (一般不需要),这是修改的地方。主配置文件是
-\file{.../2020/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
+\file{.../2024/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
新后会丢失修改。
-此外,如果只希望把一个个人目录加入特定的搜索路径,设置环境变量是合理的:
+此外,如果只希望把一个个人目录加入特定的搜索路径,设置环境变量是合理的:
\begin{verbatim}
TEXINPUTS=.:/my/macro/dir:
\end{verbatim}
@@ -1672,13 +1829,13 @@ Windows Registry Editor Version 5.00
\begin{itemize*}
\item
- 以 \code{\%},要么在行首,要么在空白后面,表示单行注释。
+ 以 \code{\%}——要么在行首,要么在空白后面——表示单行注释。
\item
忽略空行。
\item
行末的 \bs{} 作为连接符,即把下一行直接接上。但保留下一行行首的空白。
\item
- 所有剩余的行格式如下:\\
+ 所有剩余的行格式如下: \\
\hspace*{2em}\texttt{\var{variable} \textrm{[}.\var{progname}\textrm{]}
\textrm{[}=\textrm{]} \var{value}}\\[1pt]
\samp{=} 号和空白都是可选的。
@@ -1709,7 +1866,7 @@ Windows Registry Editor Version 5.00
\ifSingleColumn
如下:
-\verbatiminput{examples/ex5.tex}
+\verbatiminput{../texlive-common/examples/ex5.tex}
\else
见图~\ref{fig:config-sample}.
\fi
@@ -1718,7 +1875,7 @@ Windows Registry Editor Version 5.00
\label{sec:path-expansion}
和 Unix shell 类似,\KPS{} 能够识别搜索路径中的特殊字符。比如路径
-\verb+~$USER/{foo,bar}//baz+,将展开为这样的子目录:在 \texttt{\$USER}
+\verb+~$USER/{foo,bar}//baz+,将展开为这样的子目录: 在 \texttt{\$USER}
的主目录下的 \file{foo} 或 \file{bar} 目录中,且包含 \file{baz}
文件或目录。这种展开将在下面解释。
%$
@@ -1733,14 +1890,12 @@ Windows Registry Editor Version 5.00
\begin{alltt}
> \Ucom{setenv TEXINPUTS /home/karl:}
\end{alltt}
-
而 \file{texmf.cnf} 里的 \code{TEXINPUTS} 值为
\begin{alltt}
.:\$TEXMF//tex
\end{alltt}
-
-则用于搜索的最终值为:
+则用于搜索的最终值为:
\begin{alltt}
/home/karl:.:\$TEXMF//tex
@@ -1752,27 +1907,27 @@ Windows Registry Editor Version 5.00
\subsubsection{大括号展开}
\label{sec:brace-expansion}
-大括号展开是一项有用的特性,其作用是把 \verb+v{a,b}w+ 这样的转换为
+大括号展开是一项有用的特性,其作用是把例如 \verb+v{a,b}w+ 这样的转换为
\verb+vaw:vbw+,允许嵌套使用。通过把 \code{\$TEXMF} 赋值为一个括号列表,
可以构造出多套 \TeX{} 层级结构。在分发的 \file{texmf.cnf} 里有下面的定义
-(简化的例子):
+(简化的例子):
\begin{verbatim}
TEXMF = {$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFDIST}
\end{verbatim}
-比如我们可以用它来设置 \TeX\ 的输入路径:
+比如我们可以用它来设置 \TeX\ 的输入路径:
\begin{verbatim}
TEXINPUTS = .;$TEXMF/tex//
\end{verbatim}
%$
的时候,检查完当前目录后,依次检查的路径是
-\code{\$TEXMFVAR/tex}, \code{\$TEXMF/tex}, \code{\$TEXMFLOCAL/tex}
+\code{\$TEXMFVAR/tex}, \code{\$TEXMFHOME/tex}, \code{\$TEXMFLOCAL/tex}
和 \code{\$TEXMFDIST/tex} (后两个只在 \file{ls-R} 数据库中搜索)。
\subsubsection{子目录展开}
\label{sec:subdirectory-expansion}
在路径元素里的目录名称 \var{d} 后面接连使用两个或更多连续的斜杠,表示 \var{d\/} 的
-所有子目录:首先是直接处于 \var{d} 下的那些,然后是这些子目录的子目录,依此类推。
+所有子目录: 首先是直接处于 \var{d} 下的那些,然后是这些子目录的子目录,依此类推。
每层的目录出现的顺序是\emph{不一定}的。
如果你在 \samp{//} 后面还指定了文件名,匹配的将只是那些包含了指定文件的路径。
@@ -1785,7 +1940,7 @@ Windows Registry Editor Version 5.00
\subsubsection{\file{texmf.cnf} 文件中的特殊字符简要说明}
\label{sec:cnf-special-chars}
-下面的列表总结了 \KPS{} 配置文件中出现的特殊字符和构成:
+下面的列表总结了 \KPS{} 配置文件中出现的特殊字符和构成:
% need a wider space for the item labels here.
\newcommand{\CODE}[1]{\makebox[3em][l]{\code{#1}}}
@@ -1795,16 +1950,16 @@ Windows Registry Editor Version 5.00
\item[\CODE{;}] 非 Unix 系统下的路径分隔符 (和 \code{:} 功能一样)。
\item[\CODE{\$}] 变量展开。
\item[\CODE{\string~}] 表示用户的个人主目录。
-\item[\CODE{\char`\{...\char`\}}] Brace expansion.
-\item[\CODE{,}] 在路径展开时分隔项目。
+\item[\CODE{\char`\{...\char`\}}] 大括号展开.
+\item[\CODE{,}] 在大括号展开时分隔项目。
\item[\CODE{//}] 子目录展开 (可以出现在除路径开头外的任意位置)。
-\item[\CODE{\%}] 注释的起始。
+\item[\CODE{\%{\rm\ and }\#}] 注释的起始。
\item[\CODE{\bs}] 在行末连接下一行的字符,以支持跨行的设置项。
\item[\CODE{!!}] \emph{只}在数据库中搜索文件,\emph{不}搜寻磁盘。
\end{ttdescription}
具体哪一个字符会被视为特殊字符还是不会,取决于它使用的上下文。这些规则在配置文件
-的多层的解析过程中都会体现 (包括解析、展开、搜索,\ldots),所以不能简短地说明。
+的多层的解析过程中都会体现 (包括解析、展开、搜索,等等),所以不能简短地说明。
也没有通用的转义方法,尤其 \samp{\bs} 不是 \file{texmf.cnf} 文件中的“转义字符”。
在选择安装使用的目录名时,避免使用这些字符里的任何一个最为保险。
@@ -1812,81 +1967,112 @@ Windows Registry Editor Version 5.00
\subsection{文件名数据库}
\label{sec:filename-database}
-\KPS{} 使用了一些方法来减少搜索时的磁盘访问次数。尽管如此,在 \TL{} 的标准安装,
-或者安装的文件足够多,在各个可能的目录下搜索某个文件仍然可能花上很长时间。因此,
-\KPS{} 使用一个专门构建的纯文本``数据库''文件,这个文件叫做 \file{ls-R},它将
-文件和目录进行映射,避免对磁盘的大量搜索。
+\KPS{} 采取了一些措施来尽量减少搜索时的磁盘访问。
+尽管如此,
+在标准的 \TL{} 中,
+或者在任何包含足够多目录的安装中,
+为查找某个文件而搜索每一个可能的目录将会耗费过长的时间。
+因此,
+\KPS{} 可以使用一个名为 \file{ls-R} 的外部构建的纯文本``数据库''文件,
+该文件将文件映射到目录,
+从而避免了对磁盘进行全面搜索的必要。
第二个数据库 \file{aliases} 允许你给 \file{ls-R} 中的文件指定其他的名字。
\subsubsection{文件名数据库}
\label{sec:ls-R}
-前边已经解释过,主文件名数据库的名称必须是 \file{ls-R}。你可以在每个需要搜索的
-\TeX{} 目录树 (缺省是 \code{\$TEXMF}) 下放置一个这样的文件。\KPS{} 在
-\code{TEXMFDBS} 指定的路径中寻找这些 \file{ls-R} 文件。
-
-推荐使用发行版中包含的 \code{mktexlsr} 脚本来创建和维护 \samp{ls-R} 文件。各类
-\samp{mktex} 脚本也可能会间接调用这个脚本。实际上,这个脚本只是执行下面的命令:
+如上所述,
+主文件名数据库的名称必须是 \file{ls-R}。
+你可以在安装路径下每个希望被搜索的 \TeX{} 层次结构的根目录中放置一个 \file{ls-R} 文件
+(默认情况下为 \code{\$TEXMF})。
+\KPS{} 会沿着 \code{TEXMFDBS} 路径查找 \file{ls-R} 文件。
+推荐使用发行版中包含的 \code{mktexlsr} 脚本来创建和维护 \samp{ls-R} 文件。
+脚本由各种 \samp{mktex}\dots\ 脚本调用。
+原则上,这个脚本只是执行下面的命令:
\begin{alltt}
cd \var{/your/texmf/root} && \path|\|ls -1LAR ./ >ls-R
\end{alltt}
+意味着你的系统的 \code{ls} 命令生成正确的输出格式 (\GNU \code{ls} 是没问题的)。
+要保证数据库及时更新,最简单的方法是定期通过 \code{cron} 来重建。
+这样当安装的文件发生变化时 (例如安装或更新 \LaTeX{} 包之后),
+它会自动更新。
-意味着你的系统的 \code{ls} 命令的输出格式必须正确 (\GNU \code{ls} 是没
-问题的)。要保证数据库及时更新,最简单的方法是定期通过 \code{cron} 来重建。
-
-如果文件在数据库中找不到,缺省情况下 \KPS{} 会在磁盘上搜索。如果某个特定的路径元素
-是以 \samp{!!} 起始的,就\emph{只会}在针对这一元素的数据库中查找而不搜索磁盘。
-
+如果在数据库中找不到文件,
+缺省情况下 \KPS{} 会继续搜索磁盘。
+然而,如果某个特定的路径元素以 \samp{!!} 开头,
+则\emph{只会}在针对这一元素的数据库中查找而不去搜索磁盘。
\subsubsection{kpsewhich: 独立的路径搜索}
\label{sec:invoking-kpsewhich}
-\texttt{kpsewhich} 程序将路径搜索从其他专用程序中独立出来,它可以作为类似 \code{find}
-一样的程序,专门在 \TeX{} 层级结构中定位文件 (这在发行版中的 \samp{mktex}\dots\
-脚本中使用得非常多)。
+\texttt{kpsewhich} 程序独立于任何特定应用程序进行路径搜索。
+它可以作为类似 \code{find} 这样的程序,
+专门在 \TeX{} 层级结构中定位文件
+(这在发行版中的 \samp{mktex}\dots\ 脚本中使用得非常多)。
\begin{alltt}
> \Ucom{kpsewhich \var{option}\dots{} \var{filename}\dots{}}
\end{alltt}
-\ttvar{option} 处的选项可以用 \samp{-} 也可以用 \samp{-{}-} 来起始,并接受
-任何不造成疑义的缩写。
+在 \ttvar{option} 中指定的选项以 \samp{-} 或 \samp{--} 开头,
+且任何不含歧义的缩写都是可以接受的。
-\KPS{} 将第一个非选项的参数作为文件名来查找,并返回找到的第一个文件。它不提供
-寻找所有相同名称文件的功能 (你可以使用 Unix 的 \samp{find} 程序来达到这个功能)。
+\KPS{} 将命令行中的每个非选项参数视为文件名进行查找,
+并返回找到的第一个文件。
+它不提供可以返回具有特定名称的所有文件的选项
+(可以使用 Unix 的 \samp{find} 工具来实现此功能)。
-下面介绍了一些比较常见的选项。
+接下来将介绍最常用的选项。
\begin{ttdescription}
\item[\texttt{-{}-dpi=\var{num}}]\mbox{}
- 将解析度设置为 \ttvar{num},这个选项只影响 \samp{gf} 文件和 \samp{pk}
- 文件的查找。为了与 \cmdname{dvips} 兼容,提供 \samp{-D}
- 这个同义的参数,默认值是 600。
+ 将分辨率设置为 \ttvar{num};
+ 这仅影响 \samp{gf} 和 \samp{pk} 的查找。
+ 为了兼容 \cmdname{dvips},
+ \samp{-D} 是一个同义词。
+ 默认值是 600。
\item[\texttt{-{}-format=\var{name}}]\mbox{}\\
- 将查找的文件格式设置为 \ttvar{name}。默认情况下是通过文件名来猜测格式的。对于扩展名
-有二义性的格式,比如 \MP{} 支持文件和 \cmdname{dvips} 配置文件,必须以 \KPS{} 已知
-的名称指定格式,比如 \texttt{tex} 或 \texttt{enc files}。运行
- \texttt{kpsewhich -{}-help-formats} 会显示格式的列表。
+ 将查找的格式设置为 \ttvar{name}。
+ 默认情况下,
+ 格式是从文件名中猜测的。
+ 对于没有相关明确后缀的格式,
+ 例如 \MP{} 支持文件和 \cmdname{dvips} 配置文件,
+ 你必须指定 \KPS{} 已知的名称,
+ 如 \texttt{tex} 或 \texttt{enc files}。
+ 运行 \texttt{kpsewhich --help-formats} 以获取格式列表。
\item[\texttt{-{}-mode=\var{string}}]\mbox{}\\
- 设置模式为 \ttvar{string},只影响 \samp{gf} 和 \samp{pk}
- 文件的查找。默认情况匹配所有的模式。
+ 将模式名称设置为 \ttvar{string};
+ 这仅影响 \samp{gf} 和 \samp{pk} 的查找。
+ 没有缺省值:
+ 任何模式都将被找到。
+
\item[\texttt{-{}-must-exist}]\mbox{}\\
- 尽一切可能找到文件,包括直接在磁盘上搜寻。默认情况下为了效率考虑,只检查
- \file{ls-R} 数据库里的内容。
+ 尽一切可能找到文件,
+ 特别包括在磁盘上搜索。
+ 默认情况下,
+ 为了提高效率,
+ 仅检查 \file{ls-R} 数据库。
+
\item[\texttt{-{}-path=\var{string}}]\mbox{}\\
- 不通过文件名来猜测路径,沿 \ttvar{string} 指出的路径搜索
- (也使用冒号分隔)。支持 \samp{//} 和所有常见的展开方式。\samp{-{}-path} 选项
- 和 \samp{-{}-format} 选项是互斥的。
+ 沿路径 \ttvar{string} 进行搜索
+ (通常以冒号分隔),
+ 而不是从文件名中猜测搜索路径。
+ 支持 \samp{//} 和所有常见的扩展。
+ 选项 \samp{--path} 和 \samp{--format} 是互斥的。
+
\item[\texttt{-{}-progname=\var{name}}]\mbox{}\\
将执行查找的程序名称设为 \texttt{\var{name}}。
这会通过 \texttt{.\var{progname}} 特性影响搜索路径。
缺省值是 \cmdname{kpsewhich}。
+
\item[\texttt{-{}-show-path=\var{name}}]\mbox{}\\
- 显示用于查找 \texttt{\var{name}} 类型文件的路径。和 \samp{-{}-format}
- 选项一样,可以使用扩展名 (\code{.pk}, \code{.vf}, 等等) 也可以使用全名。
+ 显示用于查找 \texttt{\var{name}} 类型文件的路径。
+ 和 \samp{-{}-format} 选项一样,
+ 可以使用扩展名 (\code{.pk}, \code{.vf}, 等等) 也可以使用全名。
+
\item[\texttt{-{}-debug=\var{num}}]\mbox{}\\
将调试选项 (等级) 设置为 \texttt{\var{num}}。
\end{ttdescription}
@@ -1895,16 +2081,19 @@ cd \var{/your/texmf/root} && \path|\|ls -1LAR ./ >ls-R
\subsubsection{使用举例}
\label{sec:examples-of-use}
-现在我们看看实际使用 \KPS{} 的例子。这里是一个简单的搜索:
+现在我们看看实际使用 \KPS{} 的例子。这里是一个简单的搜索:
\begin{alltt}
> \Ucom{kpsewhich article.cls}
/usr/local/texmf-dist/tex/latex/base/article.cls
\end{alltt}
-我们寻找的是 \file{article.cls} 文件。因为 \samp{.cls} 后缀已经说明了文件的类型,所以
-我们不需要特别指明查找的是 \optname{tex} 类型的文件 (也就是要在 (\TeX{} 源文件目录下查找)。
-我们在 \samp{texmf-dist} 的 \file{tex/latex/base} 子目录下找到了这个文件。与之类似,
-下列所有文件都顺利找到,因为其扩展名没有二义。
+我们寻找的是 \file{article.cls} 文件。
+因为 \samp{.cls} 后缀已经说明了文件的类型,
+所以我们不需要特别指明查找的是 \optname{tex} 类型的文件 (也就是要在 \TeX{} 源文件目录下查找)。
+我们在 \TL\ 目录的 \samp{texmf-dist} 下的 \file{tex/latex/base} 子目录找到了这个文件。
+与之类似,
+下列所有文件都顺利找到,
+因为其扩展名没有歧义。
\begin{alltt}
> \Ucom{kpsewhich array.sty}
/usr/local/texmf-dist/tex/latex/tools/array.sty
@@ -1918,38 +2107,42 @@ cd \var{/your/texmf/root} && \path|\|ls -1LAR ./ >ls-R
/usr/local/texmf-dist/bibtex/bib/beebe/tugboat.bib
\end{alltt}
-另外,最后一个是 \textsl{TUGBoat} 文章的 \BibTeX{} 参考文献数据库。
+顺便提一下,
+最后一个是 \BibTeX{} 的文献数据库,
+用于 \textsl{TUGboat} 文章。
\begin{alltt}
> \Ucom{kpsewhich cmr10.pk}
\end{alltt}
-
-\file{.pk} 类型的字体位图文件是给 \cmdname{dvips} 或者 \cmdname{xdvi}
-这种显示程序提供的。因为 \TL{} 里没有预生成的 Computer Modern \samp{.pk}
-字体,所以没有找到任何内容\Dash \TL{} 默认使用 Type~1 版本的。
-
+类型为 \file{.pk} 的字体位图字形文件被 \cmdname{dvips} 和 \cmdname{xdvi} 等显示程序使用。
+在这种情况下,
+不会返回任何内容,
+因为 \TL{} 中没有预生成的 Computer Modern \samp{.pk} 文件——默认使用的是 Type~1 变体。
\begin{alltt}
> \Ucom{kpsewhich wsuipa10.pk}
\ifSingleColumn /usr/local/texmf-var/fonts/pk/ljfour/public/wsuipa/wsuipa10.600pk
\else /usr/local/texmf-var/fonts/pk/ljfour/public/
... wsuipa/wsuipa10.600pk
\fi\end{alltt}
-
-而这个字体 (Washington 大学的一套注音字母表) 就需要生成 \samp{.pk} 文件了。我们默认的
-\MF{} 模式是 \texttt{ljfour},基础解析度是 600\dpi{} (dots per inch),所以会得到这样一个文件。
+对于这个字体 (来自华盛顿大学的一套音标字母表) 就必须要生成 \samp{.pk} 文件了。
+我们默认的 \MF{} 模式是 \texttt{ljfour},
+基础解析度是 600\dpi{} (每英寸点数),
+所以会得到这样一个文件。
\begin{alltt}
> \Ucom{kpsewhich -dpi=300 wsuipa10.pk}
\end{alltt}
-
-一旦指明我们需要寻找的只是 300\dpi{} 的文件时 (\texttt{-dpi=300}),就会发现系统里
-没有符合要求的文件。这样 \cmdname{dvips} 或 \cmdname{xdvi} 会使用 \cmdname{mktexpk}
-脚本去创建所需的 \texttt{.pk} 文件。
-
-下面我们将注意力转向 \cmdname{dvips} 的头文件和配置文件。首先看看最常用的一个,\file{tex.pro}
-prologue 文件,然后检查通用配置文件 \file{config.ps} 和 \PS{} 字体映射文件
-\file{psfonts.map}\Dash 从 2004 年开始,映射文件和编码文件都在 \dirname{texmf}
-目录树下有其自己的搜索路径了。因为 \samp{.ps} 后缀可能会有二义,我们必须指明意思是
-\optname{dvips config}。
+在这种情况下,
+一旦指定我们感兴趣的分辨率是 300\dpi{} (\texttt{-dpi=300}) 时,
+就会发现系统里没有符合要求的文件。
+像 \cmdname{dvips} 或 \cmdname{xdvi} 这样的程序会使用 \cmdname{mktexpk} 脚本去创建所需的 \texttt{.pk} 文件。
+
+下面我们将注意力转向 \cmdname{dvips} 的头文件和配置文件。
+首先看看最常用的一个,
+即用于 \TeX{} 支持的一般序言文件 \file{tex.pro},
+然后检查通用配置文件 (\file{config.ps}) 和 \PS{} 字体映射文件 (\file{psfonts.map})
+——从 2004 年开始,映射文件和编码文件都在 \dirname{texmf} 目录树下有其自己的搜索路径了。
+因为 \samp{.ps} 后缀是模糊的,
+我们必须明确指定我们正在考虑的文件类型 (\optname{dvips config}) 用于 \texttt{config.ps} 文件。
\begin{alltt}
> \Ucom{kpsewhich tex.pro}
@@ -1960,31 +2153,27 @@ prologue 文件,然后检查通用配置文件 \file{config.ps} 和 \PS{} 字
/usr/local/texmf/fonts/map/dvips/updmap/psfonts.map
\end{alltt}
-这样我们可以更仔细地分析一下 URW Times 的 \PS{} 支持文件。依照标准的字体
-命名方案,这些文件的前缀是 \samp{utm}。首先查询的是配置文件,其中包含的是 map
-文件的名称:
-
+现在我们仔细查看 URW Times \PS{} 支持文件。
+在标准字体命名方案中,
+这些文件的前缀是 \samp{utm}。
+我们首先查看的是配置文件,
+该文件包含映射文件的名称:
\begin{alltt}
> \Ucom{kpsewhich --format="dvips config" config.utm}
/usr/local/texmf-dist/dvips/psnfss/config.utm
\end{alltt}
-
这个文件的内容是
-
\begin{alltt}
p +utm.map
\end{alltt}
-
即指向 \file{utm.map} 文件,也就是我们下一步要找的。
-
\begin{alltt}
> \Ucom{kpsewhich utm.map}
/usr/local/texmf-dist/fonts/map/dvips/times/utm.map
\end{alltt}
-
-这个 map 文件定义了 URW 集合中的 Type~1 \PS{} 字体文件名。内容差不多是下边这样
-(我们只列出了其中一部分):
-
+这个 map 文件定义了 URW 集合中的 Type~1 \PS{} 字体文件名。
+其内容如下所示
+(我们只列出了其中一部分):
\begin{alltt}
utmb8r NimbusRomNo9L-Medi ... <utmb8a.pfb
utmbi8r NimbusRomNo9L-MediItal... <utmbi8a.pfb
@@ -1993,10 +2182,9 @@ utmri8r NimbusRomNo9L-ReguItal... <utmri8a.pfb
utmbo8r NimbusRomNo9L-Medi ... <utmb8a.pfb
utmro8r NimbusRomNo9L-Regu ... <utmr8a.pfb
\end{alltt}
-
-比如我们可以以一个 Times Roman 字体 \file{utmr8a.pfb} 为例,在 \file{texmf}
-目录下的 Type~1 字体文件中寻找它的位置:
-
+例如,
+让我们以 Times Roman 实例 \file{utmr8a.pfb} 为例,
+搜索 Type~1 字体文件以找到它在 \file{texmf} 目录树中的位置:
\begin{alltt}
> \Ucom{kpsewhich utmr8a.pfb}
\ifSingleColumn /usr/local/texmf-dist/fonts/type1/urw/times/utmr8a.pfb
@@ -2004,38 +2192,41 @@ utmro8r NimbusRomNo9L-Regu ... <utmr8a.pfb
... urw/utm/utmr8a.pfb
\fi\end{alltt}
-现在你可以发现,追寻某个文件的下落是如此方便。尤其是在你怀疑找到的文件错了的时候,这些
-功能非常重要,因为 \cmdname{kpsewhich} 只能告诉你找到的第一个文件。
+从这些例子中可以清楚地看出,
+你可以轻松找到给定文件的位置。
+如果您怀疑某个文件的错误版本被意外使用,
+这一点尤其重要,
+因为 \cmdname{kpsewhich} 将显示遇到的第一个文件。
\subsubsection{调试操作}
\label{sec:debugging}
-有时你可能会需要分析程序是如何解析文件引用的。\KPS{} 提供了多层调试输出来实现这个功能:
+有时候,
+有必要调查一个程序如何解析文件引用。
+为了使这变得实际,\KPS{} 提供了各种级别的调试输出:
\begin{ttdescription}
\item[\texttt{\ 1}] \texttt{stat} 调用 (磁盘上的查询)。在 \file{ls-R}
数据库及时更新的情况下几乎不会有什么输出。
\item[\texttt{\ 2}] 对散列表的引用 (例如 \file{ls-R} 数据库,映射文件,配置文件)。
\item[\texttt{\ 4}] 文件的打开与关闭操作。
-\item[\texttt{\ 8}] \KPS{} 搜索的文件类型的通用路径信息。有助于寻找针对某一文件的
+\item[\texttt{\ 8}] \KPS{} 搜索的文件类型的通用路径信息。这有助于寻找针对某一文件的
特定路径。
\item[\texttt{16}] 每个路径元素的目录列表 (只在本地磁盘上搜索时有用)。
\item[\texttt{32}] 文件搜索。
\item[\texttt{64}] 变量的值。
\end{ttdescription}
-等级 \texttt{-1} 将启用上述所有选项,实际上这是最方便的设置方法了。
+级别 \texttt{-1} 将启用上述所有选项,实际上这是最方便的设置方法了。
-类似地,在 \cmdname{dvips} 程序中设置上述调试选项的组合,你就可以出 \cmdname{dvips}
-是从哪里找到它所需的文件的。另一方面,如果找不到某个文件,调试输出也会显示程序从哪些目录进行
-了查找,你也可以据此判断出问题出在哪里。
+同样地,通过设置一组调试开关,可以使用 \cmdname{dvips} 程序详细跟踪文件从哪里被读取。
+或者,当一个文件未找到时,调试跟踪会显示程序在查找该文件时搜索的目录,从而可以指示问题所在。
-一般而言,因为所有的程序都在其内部调用 \KPS{} 库,你可以设置 \envname{KPATHSEA\_DEBUG}
-环境变量来选择调试参数,将这个变量设置为上述参数的组合 (加法) 以获得对应的功能。
+一般来说,由于大多数程序在内部调用 \KPS{} 库,可以通过使用 \envname{KPATHSEA\_DEBUG} 环境变量并将其设置为上述列表中描述的值 (或其组合) 来选择调试选项。
-(Windows 用户请注意:因为在 Windows 下不容易把所有信息都重定向到固定的文件中,为了方便诊断,
+(Windows 用户请注意: 因为在 Windows 下不容易把所有信息都重定向到固定的文件中,为了方便诊断,
你可以临时设置 \texttt{SET KPATHSEA\_DEBUG\_OUTPUT=err.log})。
-让我们以一个简单的 \LaTeX{} 源文件 \file{hello-world.tex} 为例,其内容如下:
+让我们以一个简单的 \LaTeX{} 源文件 \file{hello-world.tex} 为例,其内容如下:
\begin{verbatim}
\documentclass{article}
\begin{document}
@@ -2048,24 +2239,25 @@ utmro8r NimbusRomNo9L-Regu ... <utmr8a.pfb
\begin{alltt}
> \Ucom{dvips -d4100 hello-world -Pcms -o}
\end{alltt}
-此时我们将 \cmdname{dvips} 的调试等级 4 (表示字体路径) 和 \KPS\ 的路径元素展开组合到
-一起 (参见 \cmdname{dvips} 参考手册。(稍作整理的) 输出见图~\ref{fig:dvipsdbga}。
+此时将 \cmdname{dvips} 的调试级别 4 (表示字体路径) 和 \KPS\ 的路径元素展开组合到
+一起 (参见 \cmdname{dvips} 参考手册)。
+(稍作整理的) 输出见图~\ref{fig:dvipsdbga}。
\begin{figure*}[tp]
\centering
-\input{examples/ex6a.tex}
+\input{../texlive-common/examples/ex6a.tex}
\caption{寻找配置文件}\label{fig:dvipsdbga}
\end{figure*}
-\cmdname{dvips} 启动后就开始搜寻其需要使用的文件。首先找到的是 \file{texmf.cnf},
-它给出了用于进一步查询其他文件的路径,然后找到的是 \file{ls-R} 文件名数据库 (用于
-优化文件搜索速度) 和 \file{aliases} 文件 (用于创建同一文件的多个别名,比如为较自然
-的长文件名创建 DOS 8.3 风格的短别名)。然后 \cmdname{dvips} 去寻找它的通用
-配置文件 \file{config.ps},接下来查找个人定制文件 \file{.dvipsrc} (不过上述例子中并
-未找到,显示 \emph{not found})。最后 \cmdname{dvips} 找到了 Computer Modern
-\PS{} 字体的配置文件 \file{config.cms} (因为执行 \cmdname{dvips} 时使用了
-\texttt{-Pcms} 选项)。这个文件里包含了字体的 \TeX{} 名称, \PS{} 名称和文件名的对
-应关系。
-
+\cmdname{dvips} 首先定位其工作文件。
+首先找到 \file{texmf.cnf},
+它定义了其他文件的搜索路径,
+然后是文件数据库 \file{ls-R} (用于优化文件搜索) 和文件 \file{aliases},
+它可以为同一个文件声明多个名称 (例如,一个简短的类似 DOS 的 8.3 名称和一个更自然的较长版本)。
+接着,\cmdname{dvips} 找到通用配置文件 \file{config.ps},
+然后寻找自定义文件 \file{.dvipsrc} (在此情况下未找到)。
+最后,\cmdname{dvips} 定位到计算机现代 \PS{} 字体的配置文件 \file{config.cms}
+(这是通过 \cmdname{dvips} 命令中的 \texttt{-Pcms} 选项启动的)。
+该文件包含定义字体的 \TeX{}、\PS{} 和文件系统名称之间关系的映射文件列表。
\begin{alltt}
> \Ucom{more /usr/local/texmf/dvips/cms/config.cms}
p +ams.map
@@ -2073,16 +2265,18 @@ utmro8r NimbusRomNo9L-Regu ... <utmr8a.pfb
p +cmbkm.map
p +amsbkm.map
\end{alltt}
-于是 \cmdname{dvips} 接下来寻找这些文件,再加上固定载入的,通用映射文件
-\file{psfonts.map} (这个文件里包含常用 \PS{} 字体的映射,参见
-第~\ref{sec:examples-of-use}~节的最后一部分,讨论了 \PS{} 映射文件的处理)。
+因此,\cmdname{dvips} 继续查找所有这些文件,
+以及通用映射文件 \file{psfonts.map},
+该文件始终会被加载 (它包含常用 \PS{} 字体的声明;
+有关 \PS{} 映射文件处理的更多详细信息,
+请参见第~\ref{sec:examples-of-use}~节的最后部分)。
-这时候 \cmdname{dvips} 向用户表示它的存在:
+这时候 \cmdname{dvips} 向用户表示它的存在:
\begin{alltt}
-This is dvips(k) 5.92b Copyright 2002 Radical Eye Software (www.radicaleye.com)
+This is dvips(k) 5.92b Copyright 2002 Radical Eye Software
\end{alltt}
\ifSingleColumn
-然后开始寻找 prolog 文件 \file{texc.pro}:
+然后开始寻找 prolog 文件 \file{texc.pro}:
\begin{alltt}\small
kdebug:start search(file=texc.pro, must\_exist=0, find\_all=0,
path=.:~/tex/dvips//:!!/usr/local/texmf/dvips//:
@@ -2093,17 +2287,20 @@ kdebug:search(texc.pro) => /usr/local/texmf/dvips/base/texc.pro
然后开始寻找 prolog 文件 \file{texc.pro} (见图~\ref{fig:dvipsdbgb})。
\fi
-找到所需文件后,\cmdname{dvips} 输出日期和时间,并告知我们它将生成
-\file{hello-world.ps} 文件,需要用到 \file{cmr10} 字体文件,
-这个字体属于``常驻 (resident) 的'',也就是不需要载入位图文件的字体:
+找到相关文件后,
+\cmdname{dvips} 输出日期和时间,
+并告知我们它将生成文件 \file{hello-world.ps},
+然后它需要字体文件 \file{cmr10},
+并且后者被声明为``常驻 (resident) 的'' (也就是不需要载入位图文件的字体):
\begin{alltt}\small
TeX output 1998.02.26:1204' -> hello-world.ps
Defining font () cmr10 at 10.0pt
Font cmr10 <CMR10> is resident.
\end{alltt}
-寻找并找到了 \file{cmr10.tfm} 文件。然后再次引用了一些 prolog 文件 (此处略去),
-最终找到了 \file{cmr10.pfb} 这个 Type~1 字体,并将它包含在输出文件中 (见最后
-一行)。
+现在开始搜索文件 \file{cmr10.tfm},该文件已找到,
+然后引用了更多的 prolog 文件 (此处未显示),
+最终找到了 \file{cmr10.pfb} 这个 Type~1 字体,
+并将它包含在输出文件中 (见最后一行)。
\begin{alltt}\small
kdebug:start search(file=cmr10.tfm, must\_exist=1, find\_all=0,
path=.:~/tex/fonts/tfm//:!!/usr/local/texmf/fonts/tfm//:
@@ -2121,65 +2318,72 @@ kdebug:search(cmr10.pfb) => /usr/local/texmf/fonts/type1/public/cm/cmr10.pfb
\subsection{运行时选项}
-\Webc{} 另一项有用的特性是可以通过 \KPS{} 读入的运行时文件 \file{texmf.cnf}
-来控制一系列的内存参数 (具体而言是数组的大小)。内存的设置可以在这个文件的第三部分找到。
-比较重要的几个设置是:
+\Webc{} 另一项有用的特性是可以通过 \KPS{} 读取的运行时文件 \file{texmf.cnf}
+来控制一系列的内存参数 (尤其是数组的大小)。
+这些内存的设置可以在该文件的第三部分找到。
+比较重要的几个设置是:
\begin{ttdescription}
\item[\texttt{main\_memory}]
- 总的可用内存数,以 word 为单位,\TeX{}, \MF{} 和 \MP\ 受此限制。
- 每修改一次都必须重新生成一个新的格式文件。比如你可以生成一个``巨型''版本的
- \TeX{},将其存为 \texttt{hugetex.fmt}。
+ \TeX{}、\MF{} 和 \MP{} 可用的总内存 word 数。
+ 对于每个不同的设置,
+ 你必须创建一个新的格式文件。
+ 例如,您可以生成一个``巨大''版本的 \TeX{},
+ 并将格式文件命名为 \texttt{hugetex.fmt}。
+ 使用 \KPS{} 指定程序名称的标准方法时,
+ 将从 \file{texmf.cnf} 中读取 \texttt{main\_memory} 变量的特定值。
\item[\texttt{extra\_mem\_bot}]
- 为``大型'' \TeX{} 数据结构预留的额外空间:boxes, glue, breakpoint 等。如果你使用
- \PiCTeX{} 时特别有用。
+ 为``大型'' \TeX{} 数据结构预留的额外空间: boxes, glue, breakpoint 等。
+ 尤其在使用 \PiCTeX{} 时特别有用。
\item[\texttt{font\_mem\_size}]
- \TeX{} 用于存储字体数据的 word 数。大致等于载入的所有 TFM 文件的总和。
+ \TeX{} 用于存储字体数据的 word 数。
+ 大致等于载入的所有 TFM 文件的总和。
\item[\texttt{hash\_extra}]
- 为存储控制序列而设置的散列表的额外空间。一般散列表足够存储将近 10,000
- 个控制序列。如果你排版的是一本有大量交叉引用的书籍,这个值可能不够用。默认的
- \texttt{hash\_extra} 是 \texttt{50000}。
+ 为存储控制序列而设置的散列表的额外空间。
+ 默认的值是 \texttt{600000}。
\end{ttdescription}
-\noindent 这项功能并非真正的动态内存和数组分配的替代,但考虑到动态分配在现在的 \TeX{}
-太难实现,才通过这些选项提供了一些灵活性。
+\noindent 此功能并不能真正替代动态数组和内存分配,
+但由于在当前的 \TeX{} 源代码中实现这些功能极其困难,
+这些运行时参数提供了一种实用的折衷方案,允许一定的灵活性。
\htmlanchor{texmfdotdir}
\subsection{\texttt{\$TEXMFDOTDIR}}
\label{sec:texmfdotdir}
-在上述许多地方,我们使用了多个以 \code{.} 起始的搜索路径,以优先搜索当前路径,
-比如
+在上述许多地方,
+我们给出了以 \code{.} 开头的各种搜索路径 (首先搜索当前目录),
+如下所示:
\begin{alltt}\small
TEXINPUTS=.;$TEXMF/tex//
\end{alltt}
-这是一种简化。我们在 \TL{} 分发的 \code{texmf.cnf} 文件使用的是
-\filename{$TEXMFDOTDIR} 而不是直接用 \samp{.},比如:
+这是一种简化。我们在 \TL{} 分发的 \code{texmf.cnf} 文件使用 \filename{$TEXMFDOTDIR} 而不仅是 \samp{.},比如:
\begin{alltt}\small
TEXINPUTS=$TEXMFDOTDIR;$TEXMF/tex//
\end{alltt}
+(在分发的文件中,第二个路径元素也比 \filename{$TEXMF/tex//} 稍微复杂一点。
+但差别不大; 而且我们这里讨论的是 \filename{$TEXMFDOTDIR} 功能。)
-(在分发的文件中,第二个路径元素也比 \filename{$TEXMF/tex//} 稍微复杂一点。但
-差别不大;而且我们这里讨论的是 \filename{$TEXMFDOTDIR} 功能。)
-
-在路径定义中使用 \filename{$TEXMFDOTDIR} 而不是直接用 \samp{.} 的原因是让它可以
-被重新定义。比如一份复杂的文档可能由来自多个子目录的源文件组成。要支持这种情况
-你可以把 \filename{TEXMFDOTDIR} 设置为 \filename{.//},这样这些子目录就都会被
-搜索到。(警告:不要默认使用 \filename{.//};这个做法一般不常用,而且搜索任意文档
-的所有子目录有可能不够安全。)
+在路径定义中使用变量 \filename{$TEXMFDOTDIR} 而不是简单地使用 \samp{.} 的原因纯粹是为了便于重载。
+例如,一份复杂的文档可能有分布在多个子目录中的很多源文件。
+为了解决这个问题,
+你可以将 \filename{TEXMFDOTDIR} 设置为 \filename{.//} (例如,在构建文档时在环境中设置),
+这样它们都会被搜索。
+(警告: 不要默认使用 \filename{.//}; 通常来说,在所有子目录中搜索任意文档的结果不理想,
+并且可能存在安全隐患。)
-另一个例子是你可能完全不希望搜索当前路径,比如你安排所有的文件都通过具体的路径
-找到。那样你可以把 \filename{$TEXMFDOTDIR} 设置为如 \filename{/nonesuch} 这样
-不存在的目录。
+另一个例子是你可能完全不希望搜索当前路径,比如你安排所有的文件都通过具体的路径找到。
+那样你可以把 \filename{$TEXMFDOTDIR} 设置为诸如 \filename{/nonesuch} 这样不存在的目录。
-在我们的 \filename{texmf.cnf} 里设置的 \filename{$TEXMFDOTDIR} 的默认值就是
-\samp{.}。
+\filename{$TEXMFDOTDIR} 的默认值就是 \samp{.},
+正如在我们的 \filename{texmf.cnf} 里设置的那样。
+\htmlanchor{ack}
\section{致谢}
-\TL{} 是在几乎所有 \TeX{} 用户组织的协力下完成的。这个版本由 Karl Berry
-监制。下面列出了过去和现在主要的贡献者:
+\TL{} 是在几乎所有 \TeX{} 用户组织的协力下完成的。
+这个版本由 Karl Berry监制。下面列出了过去和现在主要的贡献者:
\begin{itemize*}
@@ -2188,9 +2392,9 @@ TEXINPUTS=$TEXMFDOTDIR;$TEXMF/tex//
地区的 \TeX{} 社群提供了必备的技术和管理基础设施。请加入本地的 \TeX 用户组织!
(参见 \url{https://tug.org/usergroups.html}。)
-\item CTAN 团队 (\url{https://ctan.org}),值得一提的是 Robin Fairbairns 和
-Rainer Sch\"opf。他们负责分发 \TL{} 光盘镜像,为软件包更新提供支撑,\TL{} 正是
-基于这些软件包构建的。
+\item CTAN 团队 (\url{https://ctan.org}),
+负责分发 \TL{} 镜像并提供包更新的公共基础设施,
+这是 \TL{} 赖以运行的基础。
\item Nelson Beebe,他为 \TL\ 提供了许多平台,自己也进行了详尽的测试,并在参考
文献上有无与伦比的贡献。
@@ -2216,14 +2420,14 @@ Peter 在 2015 年 10 月去世,我们将持续工作以纪念他。
\item Hans Hagen,他对 \ConTeXt\ 宏包 (\url{https://pragma-ade.com}) 做了
许多测试和修改,使之能够包含在 \TL{} 的框架下,并持续推进 \TeX\ 的开发。
-\item \Thanh, Martin Schr\"oder,和 pdf\TeX\ 团队,他们持续不断地改进 \TeX\
-的功能。
+\item \Thanh, Martin Schr\"oder,和 pdf\TeX\ 团队 (\url{http://pdftex.org}),
+他们持续不断地改进 \TeX\ 的功能。
\item Hartmut Henkel,他对 pdf\TeX\, Lua\TeX 等程序的开发起到了重要的贡献。
\item Shunshaku Hirata,起始开发和坚持维护 DVIPDFM$x$。
-\item Taco Hoekwater,他对 \MP{} 和 (Lua)\TeX\ (\url{http://luatex.org})
+\item Taco Hoekwater,他对 MetaPost 和 (Lua)\TeX\ (\url{http://luatex.org})
重要的开发使之焕发新的活力。他还参与了将 \ConTeXt\ 融入 \TL{}、给
Kpathsea 添加多线程功能,等等许多工作。
@@ -2233,9 +2437,9 @@ Kpathsea 添加多线程功能,等等许多工作。
\item Pawe{\l} Jackowski,他创建了 Windows 下的安装程序 \cmdname{tlpm},
和 Tomasz {\L}uczak,因为他的 \cmdname{tlpmgui} 被用在了以前的版本。
-\item Akira Kakuto,以他的 W32TEX 发行版
-(\url{http://w32tex.org/}) 为基础提供了 Windows 下的二进制文件,以及许多
-其他的贡献。
+\item Akira Kakuto,
+感谢他通过 W32TEX 和 W64TEX 发行版为日文 \TeX{} (\url{http://w32tex.org}) 提供 Windows 二进制文件,
+以及其他许多开发贡献。
\item Jonathan Kew,他开发了非凡的 Xe\TeX{} 引擎并花了大量时间和精力集成到
\TL{} 中。以及 Mac\TeX 安装程序的早期版本,还有我们推荐的前端 \TeX{}works。
@@ -2243,7 +2447,7 @@ Kpathsea 添加多线程功能,等等许多工作。
\item Hironori Kitagawa,对 p\TeX\ 和相关的支持进行了大量的工作。
\item Dick Koch,他维护了 Mac\TeX\ (\url{https://tug.org/mactex}) 这个和
-\TL{} 联系非常紧密的发行版本。
+\TL{} 联系非常紧密的发行版本,并在此过程中保持极好的乐观态度。
\item Reinhard Kotucha,他对 \TL{} 2008 的基础架构和安装程序起到了重要贡献,
以及 Windows 下的研究性工作,\texttt{getnonfreefonts} 脚本,等等。
@@ -2270,7 +2474,7 @@ Kpathsea 添加多线程功能,等等许多工作。
\item Manuel P\'egouri\'e-Gonnard,他对宏包更新、文档改进以及
\cmdname{texdoc} 开发上的努力。
-\item Fabrice Popineau,他创建了 \TL{} 最早的 Windows 支持。
+\item Fabrice Popineau,感谢其在 \TL{} 中提供的原始 Windows 支持以及对法文文档的工作。
\item Norbert Preining,他是当前 \TL{} 基础架构和安装程序的总设计师,还
负责协调了 Debian 版本的 \TL{} 工作 (和 Frank K\"uster 一起),还有很多其他的工作。
@@ -2280,7 +2484,10 @@ Kpathsea 添加多线程功能,等等许多工作。
\item Luigi Scarso,他坚持开发 MetaPost, Lua\TeX 等等许多。
-\item Andreas Scherer,他开发了 \texttt{cwebbin},\TL{} 使用的 CWEB 实现。
+\item Andreas Scherer,感谢其为 \texttt{cwebbin} (\TL{} 中使用的 CWEB 实现) 所做的工作,
+以及对原始 CWEB 的持续维护。
+
+\item Takuji Tanaka,感谢他对 (e)(u)p\TeX{} 的维护及相关支持。
\item Tomasz Trzeciak,他为 Windows 开发提供了广泛的帮助。
@@ -2288,12 +2495,12 @@ Kpathsea 添加多线程功能,等等许多工作。
将 \cmdname{xindy} 包含进来。
\item Staszek Wawrykiewicz,\TL{} 的一个主要的测试人员,同时还是许多重要波兰语
-支持的协调人员:字体、Windows 安装,和其他许多工作。Staszek 在 2018 年 2 月去世
+支持的协调人员: 字体、Windows 安装,和其他许多工作。Staszek 在 2018 年 2 月去世
了,我们将继续工作以纪念他。
\item Olaf Weber,他在以前几年对 \Webc{} 耐心的维护。
-\item Gerben Wierda,他创建和维护了原来的 \MacOSX\ 支持。
+\item Gerben Wierda,他创建和维护了原来的 \macOS\ 支持。
\item Graham Williams,他是 \TeX\ Catalogue 的发起者。
@@ -2305,34 +2512,36 @@ Kpathsea 添加多线程功能,等等许多工作。
二进制版本的编译者:
Marc Baudoin (\pkgname{amd64-netbsd}, \pkgname{i386-netbsd}),
-Ken Brown (\pkgname{i386-cygwin}, \pkgname{x86\_64-cygwin}),
-Simon Dales (\pkgname{armhf-linux}),
-Johannes Hielscher (\pkgname{aarch64-linux}),
-Akira Kakuto (\pkgname{win32}),
-Dick Koch (\pkgname{x86\_64-darwin}),
-Nikola Le\v{c}i\'c (\pkgname{amd64-freebsd}, \pkgname{i386-freebsd}),
-Henri Menke (\pkgname{x86\_64-linuxmusl}),
-Mojca Miklavec (\pkgname{i386-linux},
- \pkgname{x86\_64-darwinlegacy},
- \pkgname{i386-solaris}, \pkgname{x86\_64-solaris},
- \pkgname{sparc-solaris}),
-Norbert Preining (\pkgname{x86\_64-linux}).
-关于 \TL{} 编译进程的信息,请查阅 \url{https://tug.org/texlive/build.html}。
-
-这份手册的翻译者:
+Ken Brown (\pkgname{x86\_64-cygwin}),
+Akira Kakuto (\pkgname{windows}),
+Dick Koch (\pkgname{universal-darwin}),
+Mojca Miklavec (\pkgname{x86\_64-darwinlegacy}),
+Norbert Preining (%
+ \pkgname{aarch64-linux},
+ \pkgname{armhf-linux},
+ \pkgname{i386-freebsd}, \pkgname{amd64-freebsd},
+ \pkgname{i386-linux}, \pkgname{x86\_64-linux},
+ \pkgname{i386-solaris}, \pkgname{x86\_64-solaris},
+ \pkgname{x86\_64-linuxmusl}).
+关于 \TL{} 编译进程的信息,
+请查阅
+\url{https://tug.org/texlive/build.html}.
+
+这份手册的翻译者:
+Takuto Asakura (Japanese),
Denis Bitouzé \& Patrick Bideault (法语),
Carlos Enriquez Figueras (西班牙语),
-Jiang Jiang, Jinsong Zhao, Yue Wang, \& Helin Gai (中文),
+Jiang Jiang, Jinsong Zhao, Yue Wang, Helin Gai \& Ran Wang (中文),
Nikola Le\v{c}i\'c (塞尔维亚语),
Marco Pallante \& Carla Maggi (意大利语),
Petr Sojka \& Jan Busa (捷克\slash 斯洛伐克语),
-Boris Veytsman (俄语),
-Zofia Walczak (波兰语),
+Boris Veytsman \& Vladimir Lomov (俄语),
Uwe Ziegenhagen (德语)。\TL{} 文档的主页是
\url{https://tug.org/texlive/doc.html}。
-当然,最重要的感谢应该致予 Donald Knuth,感谢他发明了 \TeX,也感谢他将
-\TeX\ 赠与全世界。
+当然,最重要的感谢应该致予 Donald Knuth,
+感谢他发明了 \TeX,
+也感谢他将 \TeX\ 赠与全世界。
\section{发行历史}
\label{sec:history}
@@ -2369,7 +2578,7 @@ Uwe Ziegenhagen (德语)。\TL{} 文档的主页是
地选择所需的软件集合。与语言相关的集合也重新组织过了,这样一来,选定某个语言集合时会自
动安装宏包、字体等文件,并自动设置好 \texttt{language.dat}。
-2002 年出现的第 7 版里显著的更新是添加了 \MacOSX{} 的支持,还有大量各类宏包和程序
+2002 年出现的第 7 版里显著的更新是添加了 \macOS{}{} 的支持,还有大量各类宏包和程序
的更新。这个版本的一个重要的目标是将源代码重新与 \teTeX{} 集成,因为在第 5 和第 6
版中它们偏离得太远了。
@@ -2377,7 +2586,7 @@ Uwe Ziegenhagen (德语)。\TL{} 文档的主页是
2003 年,在更新和增添持续不断到来的情况下,我们发现 \TL{} 已经过于庞大,无法在一张
\CD\ 中容纳,于是将其切分为三套不同的发行版 (参见第~\ref{sec:tl-coll-dists}
-节,\p.\pageref{sec:tl-coll-dists})。此外:
+节,\p.\pageref{sec:tl-coll-dists})。此外:
\begin{itemize*}
\item 在 \LaTeX{} 团队的要求下,我们将 \cmdname{latex} 和 \cmdname{pdflatex}
@@ -2398,13 +2607,13 @@ Uwe Ziegenhagen (德语)。\TL{} 文档的主页是
\verb|^^| 形式的输出,请将 \verb|texmf/web2c/cp8bit.tcx|
文件改名。(后续版本将提供更简洁的方式来控制。)
\item 对文档作了大量更新。
-\item 最后,因为版本号增长得实在太快,现在简单地使用年份来标识版本:\TL{} 2003。
+\item 最后,因为版本号增长得实在太快,现在简单地使用年份来标识版本: \TL{} 2003。
\end{itemize*}
\subsubsection{2004}
-2004 年有许多改变:
+2004 年有许多改变:
\begin{itemize}
@@ -2424,7 +2633,7 @@ Uwe Ziegenhagen (德语)。\TL{} 文档的主页是
(\p.\pageref{sec:overview-tl})。
\item 在原来旧版本 \TL\ 中单一的 \dirname{texmf} 目录树被分拆为三
-个:\dirname{texmf}, \dirname{texmf-dist}, 和 \dirname{texmf-doc}。参见
+个: \dirname{texmf}, \dirname{texmf-dist}, 和 \dirname{texmf-doc}。参见
第~\ref{sec:tld}~节 (\p.\pageref{sec:tld}) 及各目录下的 \filename{README}
文件。
@@ -2460,7 +2669,7 @@ plain \TeX\ (只将位置 32--126 的字符视为可见), \ConTeXt\ (0--255 都
不再是判断是否处于 PDF 输出状态的可靠方法。我们在这一年尽可能地保持向下兼容,但以后
即使在输出 DVI 时 \cs{pdfoutput} 也可能已经定义。
-\item pdf\TeX\ (\url{http://pdftex.org}) 新增了许多特性:
+\item pdf\TeX\ (\url{http://pdftex.org}) 新增了许多特性:
\begin{itemize*}
@@ -2475,17 +2684,17 @@ plain \TeX\ (只将位置 32--126 的字符视为可见), \ConTeXt\ (0--255 都
\filename{pdftex.cfg} 的配置方式。每次修改 \filename{pdftexconfig.tex}
之后都必须重新生成 \filename{.fmt} 文件。
- \item 参见 pdf\TeX\ 手册以了解更多信息:\OnCD{texmf-dist/doc/pdftex/manual/pdftex-a.pdf}。
+ \item 参见 pdf\TeX\ 手册以了解更多信息: \OnCD{texmf-dist/doc/pdftex/manual/pdftex-a.pdf}。
\end{itemize*}
\item \cmdname{tex} (以及 \cmdname{mf} 和 \cmdname{mpost}) 中的 \cs{input}
-原语现在支持通过双引号来引用包含空格和特殊字符的文件。一个典型的例子如下:
+原语现在支持通过双引号来引用包含空格和特殊字符的文件。一个典型的例子如下:
\begin{verbatim}
\input "filename with spaces" % plain
\input{"filename with spaces"} % latex
\end{verbatim}
-参阅 \Webc{} 文档以了解更多信息:\OnCD{texmf-dist/doc/web2c}。
+参阅 \Webc{} 文档以了解更多信息: \OnCD{texmf-dist/doc/web2c}。
\item enc\TeX\ 的支持现在已被包含在 \Webc{} 中,因而所有 \TeX\ 程序都可以通过
\optname{-enc} 参数启用这一支持 \Dash \emph{前提是构建好了格式文件}。enc\TeX\
@@ -2559,7 +2768,7 @@ MIPSpro 7.4 运行时库。
\item 上一年,我们将格式文件的输出改成了和这些文件本身一样的 8
位字符。在你需要的情况下,可以使用新的 TCX 文件 \filename{empty.tcx} 来获得原有的
- \verb|^^| 表示方式。例如:
+ \verb|^^| 表示方式。例如:
\begin{verbatim}
latex --translate-file=empty.tcx yourfile.tex
@@ -2671,7 +2880,7 @@ bounding box 信息,这是 \cmdname{dvipdfm} 包含但未曾出现在
在与 Omega 的作者讨论后,原来的 Omega 引擎和 Lambda 格式文件被去掉了。
更新后的 Alpeh 和 Lamed 仍然在,同时保留的还有 Omega 实用工具。
-包含了新版本的 AMS \TypeI\ 字体,包括 Computer Modern:其中部分字形
+包含了新版本的 AMS \TypeI\ 字体,包括 Computer Modern: 其中部分字形
随 Knuth 多年以来修改的 MetaFont 源代码更新,hinting 信息也更新了。
Euler 字体也整个由 Hermann Zapf 重新绘制了一遍 (参见
\url{https://tug.org/TUGboat/Articles/tb29-2/tb92hagen-euler.pdf})。
@@ -2680,7 +2889,7 @@ Euler 字体也整个由 Hermann Zapf 重新绘制了一遍 (参见
现在 Windows 和 Mac\TeX\ 都包含了新的 \GUI{} 前端 \TeX{}works。至于其他
的平台和更多的信息,请参见 \TeX{}works 的主页,\url{https://tug.org/texworks}。
-设计这个跨平台前端的灵感来自于 \MacOSX\ 下的 TeXShop 编辑器,目标就是
+设计这个跨平台前端的灵感来自于 \macOS{}\ 下的 TeXShop 编辑器,目标就是
易用。
在许多平台下包含了 Asymptote 图形程序,它实现了一套与 MetaPost 约略
@@ -2696,10 +2905,10 @@ Euler 字体也整个由 Hermann Zapf 重新绘制了一遍 (参见
而我们建议 OpenBSD 和 FreeBSD 的用户使用他们自己的包管理系统提供的 \TeX{},
另外这也是因为要编译出能在多种版本下都工作的二进制程序有些困难。
-一些更不起眼的更新:我们现在使用 \pkgname{xz} 这套稳定的压缩方式来替代
-原有的 \pkgname{lzma} (\url{https://tukaani.org/xz/});在不和现有变量名
-冲突的情况下允许文件中使用 |$| 字符;Kpathsea 库现在支持多线程了 (其中
-用到了 MetaPost);整个 \TL{} 的编译现在基于 Automake 了。
+一些更不起眼的更新: 我们现在使用 \pkgname{xz} 这套稳定的压缩方式来替代
+原有的 \pkgname{lzma} (\url{https://tukaani.org/xz/}); 在不和现有变量名
+冲突的情况下允许文件中使用 |$| 字符; Kpathsea 库现在支持多线程了 (其中
+用到了 MetaPost); 整个 \TL{} 的编译现在基于 Automake 了。
对过去历史的最终一点提示: 所有版本的 \TL{},包括 \CD\ 标签这些附属材料,
都在 \url{ftp://tug.org/historic/systems/texlive} 提供。
@@ -2721,7 +2930,7 @@ PDF,通过 \pkgname{epstopdf} 宏包。默认选项是为了避免覆盖任何
一个相关的变化是通过 \cs{write18} 特性从 \TeX\ 执行少量外部命令,现在
默认启用了。这些命令是 \code{repstopdf}, \code{makeindex}, \code{kpsewhich},
-\code{bibtex}, 和 \code{bibtex8};这个列表定义在 \code{texmf.cnf}。必须
+\code{bibtex}, 和 \code{bibtex8}; 这个列表定义在 \code{texmf.cnf}。必须
禁用这些外部命令的环境可以通过安装程序取消这个选项 (参见第~\ref{sec:options}~节),
或者在安装后通过运行 |tlmgr conf texmf shell_escape 0| 覆盖这个值。
@@ -2738,17 +2947,17 @@ PDF,通过 \pkgname{epstopdf} 宏包。默认选项是为了避免覆盖任何
\code{tlmgr restore} 恢复。如果你在安装后要执行更新,但没有足够的
磁盘空间来保存备份,可以运行 \code{tlmgr option autobackup 0}。
-包含了这些新的程序:用于排版日文的 p\TeX\ 引擎和相关实用工具;支持了
-Unicode \BibTeX\ 的 \BibTeX{}U 程序;\prog{chktex} 实用工具
+包含了这些新的程序: 用于排版日文的 p\TeX\ 引擎和相关实用工具; 支持了
+Unicode \BibTeX\ 的 \BibTeX{}U 程序; \prog{chktex} 实用工具
(\url{https://baruch.ev-en.org/proj/chktex})
-用来检查 \AllTeX\ 文档;\prog{dvisvgm}
+用来检查 \AllTeX\ 文档; \prog{dvisvgm}
(\url{https://dvisvgm.de}) 是 DVI 到 SVG 格式转换器。
-现在包含了这些新平台的可执行文件:\code{amd64-freebsd},
+现在包含了这些新平台的可执行文件: \code{amd64-freebsd},
\code{amd64-kfreebsd}, \code{i386-freebsd}, \code{i386-kfreebsd},
\code{x86\_64-darwin}, \code{x86\_64-solaris}。
-我们忘记注明的一个 \TL{} 2009 的修改是:许多 \TeX4ht 相关的可执行文件
+我们忘记注明的一个 \TL{} 2009 的修改是: 许多 \TeX4ht 相关的可执行文件
(\url{https://tug.org/tex4ht}) 被从二进制目录删除了。通用的 \code{mk4ht}
程序可以用来运行这些 \code{tex4ht} 组合的任意一种。
@@ -2758,8 +2967,8 @@ Unicode \BibTeX\ 的 \BibTeX{}U 程序;\prog{chktex} 实用工具
\subsubsection{2011}
-\MacOSX\ 二进制程序 (\code{universal-darwin} 和 \code{x86\_64-darwin})
-现在只能在 Leopard 及以后版本上工作;Panther 和 Tiger 都不再支持了。
+\macOS{}\ 二进制程序 (\code{universal-darwin} 和 \code{x86\_64-darwin})
+现在只能在 Leopard 及以后版本上工作; Panther 和 Tiger 都不再支持了。
用于参考文献处理的 \code{biber} 程序在常见平台下都已包含。它的分发和
\code{biblatex} 宏包紧密相关的,这个宏包完全重新实现了 \LaTeX{} 提供
@@ -2800,12 +3009,12 @@ MetaPost 作为一个库有关,这是另一个重要而用户不会注意的
再是全局的配置文件。这个修改应该不容易发现,除非你直接编辑过 \code{updmap.cfg}
文件。\verb|updmap --help| 输出中有更多信息。
-平台:增加了 \pkgname{armel-linux} 和 \pkgname{mipsel-linux} 平台;
+平台: 增加了 \pkgname{armel-linux} 和 \pkgname{mipsel-linux} 平台;
\pkgname{sparc-linux} 和 \pkgname{i386-netbsd} 不再出现在主发行中。
\subsubsection{2013}
-发行版布局:为了简化,顶层的 \code{texmf/} 目录被并入 \code{texmf-dist/}。
+发行版布局: 为了简化,顶层的 \code{texmf/} 目录被并入 \code{texmf-dist/}。
现在 \code{TEXMFMAIN} 和 \code{TEXMFDIST} 这两个 Kpathsea 变量都被指向
\code{texmf-dist} 了。
@@ -2832,12 +3041,12 @@ Lua\TeX: 升级到 Lua 5.2,包含一个新的库 (\code{pdfscanner}) 来处理
\pkgname{microtype.sty}: 对 \XeTeX\ 的部分支持 (protrusion) 和对 Lua\TeX\ 的支持
(protrusion, font expansion, tracking),已经其他改进。
-\cmdname{tlmgr}: 新的 \code{pinning} 操作以方便配置多个仓库;参见
+\cmdname{tlmgr}: 新的 \code{pinning} 操作以方便配置多个仓库; 参见
\verb|tlmgr --help| 的对应章节,或者在线的
\url{https://tug.org/texlive/doc/tlmgr.html#MULTIPLE-REPOSITORIES}。
平台: \pkgname{armhf-linux}, \pkgname{mips-irix}, \pkgname{i386-netbsd}, 和
-\pkgname{amd64-netbsd} 被重新加入;\pkgname{powerpc-aix} 被去除。
+\pkgname{amd64-netbsd} 被重新加入; \pkgname{powerpc-aix} 被去除。
\subsubsection{2014}
@@ -2846,8 +3055,8 @@ Lua\TeX: 升级到 Lua 5.2,包含一个新的库 (\code{pdfscanner}) 来处理
个字符串现在反应的时在启动时\emph{应该被}默认载入的格式,而不是在二进制程序中预
载入的未 dump 格式,该格式可能被很多方法覆盖。
-pdf\TeX: 新的警告忽略参数 \cs{pdfsuppresswarningpagegroup};用来制造词间空白
-(interword space) 的新命令:\cs{pdfinterwordspaceon}, \cs{pdfinterwordspaceoff},
+pdf\TeX: 新的警告忽略参数 \cs{pdfsuppresswarningpagegroup}; 用来制造词间空白
+(interword space) 的新命令: \cs{pdfinterwordspaceon}, \cs{pdfinterwordspaceoff},
\cs{pdffakespace},它们可以帮助 PDF 文本重新排版 (reflowing),
Lua\TeX: 对于字体载入和断字 (hyphenation) 有明显的变化和修正。最大的增加时一个新
@@ -2859,12 +3068,12 @@ Lua\TeX: 对于字体载入和断字 (hyphenation) 有明显的变化和修正
这样特殊的目的。
\XeTeX: 现在所有平台 (包括 Mac) 都支持所有的图像格式了。避免使用 Unicode 兼容性
-decomposition fallback (但允许其他的变体);为了与先前版本 \XeTeX\ 的兼容,优先于
+decomposition fallback (但允许其他的变体); 为了与先前版本 \XeTeX\ 的兼容,优先于
Graphite 字体使用 OpenType 字体。
\MP: 支持了一个新的数字系统 \code{decimal} (十进制),还包括一个配套的内部
-\code{numberprecision};在 \filename{plain.mp} 有 Knuth 对 \code{drawdot} 的新定
-义;SVG 和 PNG 输出的 bug 修正,等等。
+\code{numberprecision}; 在 \filename{plain.mp} 有 Knuth 对 \code{drawdot} 的新定
+义; SVG 和 PNG 输出的 bug 修正,等等。
独立的 \cmdname{pstopdf} Con\TeX{}t 实用程序会在这个版本后被去除,因为和系统同名
程序有冲突。但你仍然可以通过 \code{mtxrun --script pstopdf} 命令来执行它。
@@ -2882,7 +3091,7 @@ Mac\TeX\ 这个 \TeX\ Live 的重新发行版 (见第~\ref{sec:macosx}~节) 不
包含中文、日文和韩文的 \pkgname{langcjk} 集合被拆分为独立的语言集合,使得每个的
大小更合理。
-平台:加入了 \pkgname{x86\_64-cygwin},去除了 \pkgname{mips-irix};Microsoft 不
+平台: 加入了 \pkgname{x86\_64-cygwin},去除了 \pkgname{mips-irix}; Microsoft 不
再支持 Windows XP,所以我们的程序也可能在以后不支持这个系统。
\subsubsection{2015}
@@ -2895,30 +3104,30 @@ Mac\TeX\ 这个 \TeX\ Live 的重新发行版 (见第~\ref{sec:macosx}~节) 不
\LaTeXe\ 的内部现在包含了和 Unicode 相关的引擎配置 (包括哪些字符是字母、
primitive 的命名等等),这些配置以前是 \TeX\ Live 的一部分。这个变化对用户应该是
-没有影响的;有些底层的内部控制命令被改名或者去除了,但行为应保持一致。
+没有影响的; 有些底层的内部控制命令被改名或者去除了,但行为应保持一致。
-pdf\TeX: 支持 JPEG Exif 和 JFIF;就算在 \cs{pdfinclusionerrorlevel}
-是负值时也不输出警告;同步到 \prog{xpdf}~3.04 版本。
+pdf\TeX: 支持 JPEG Exif 和 JFIF; 就算在 \cs{pdfinclusionerrorlevel}
+是负值时也不输出警告; 同步到 \prog{xpdf}~3.04 版本。
-Lua\TeX: 加入用于扫描 token 的 \pkgname{newtokenlib};对 \code{normal} 随机数生
+Lua\TeX: 加入用于扫描 token 的 \pkgname{newtokenlib}; 对 \code{normal} 随机数生
成器等的 bug 修正。
-\XeTeX: 图像处理的修正;优先选择与 \prog{xetex} 处在同一个目录的
-\prog{xdvipdfmx} 程序;内部的 \code{XDV} 操作符有所变化。
+\XeTeX: 图像处理的修正; 优先选择与 \prog{xetex} 处在同一个目录的
+\prog{xdvipdfmx} 程序; 内部的 \code{XDV} 操作符有所变化。
-MetaPost: 新的 \code{binary} numbersystem;新的支持日语的 \prog{upmpost} 和
+MetaPost: 新的 \code{binary} numbersystem; 新的支持日语的 \prog{upmpost} 和
\prog{updvitomp} 程序,类似 \prog{up*tex}。
Mac\TeX: 更新了自带的 Ghostscript 包的 CJK 支持。\TeX\ Distribution 选项
-面板支持了 Yosemite (\MacOSX~10.10)。\XeTeX{} 不再支持 resource-fork font
-suitcase 格式 (通常没有扩展名);data-fork suitcase (\code{.dfont}) 仍然是支持的。
+面板支持了 Yosemite (\macOS{}~10.10)。\XeTeX{} 不再支持 resource-fork font
+suitcase 格式 (通常没有扩展名); data-fork suitcase (\code{.dfont}) 仍然是支持的。
-基础设施:重新实现了 \prog{fmtutil} 脚本来按每个独立的目录树读取
+基础设施: 重新实现了 \prog{fmtutil} 脚本来按每个独立的目录树读取
\filename{fmtutil.cnf} 文件,类似 \prog{updmap}。Web2C \prog{mktex*} 脚本 (包括
\prog{mktexlsr}, \prog{mktextfm}, \prog{mktexpk}) 现在优先选择自己所在目录的程
序,而不总选用当前 \envname{PATH} 里的。
-平台:\pkgname{*-kfreebsd} 被去除了,因为 \TeX\ Live 现在在这个平台下通过系统自
+平台: \pkgname{*-kfreebsd} 被去除了,因为 \TeX\ Live 现在在这个平台下通过系统自
带的安装方式已经很容易获取了。
部分额外平台提供了定制二进制包 (\url{https://tug.org/texlive/custom-bin.html})。
@@ -2932,12 +3141,12 @@ Lua\TeX: 原生命令有大量改变,包括重命名和去除,还有一些
果要了解更多细节,参见 Lua\TeX\ 手册,
\OnCD{texmf-dist/doc/luatex/base/luatex.pdf}。
-Metafont:新的实验性姊妹程序 MFlua 和 MFluajit,为了试验性目标在 \MF 中集成 Lua。
+Metafont: 新的实验性姊妹程序 MFlua 和 MFluajit,为了试验性目标在 \MF 中集成 Lua。
-MetaPost:Bug 修正和内部为了 MetaPost 2.0 做的准备。
+MetaPost: Bug 修正和内部为了 MetaPost 2.0 做的准备。
\code{SOURCE\_DATE\_EPOCH} 支持所有除 Lua\TeX\ 以外的引擎 (下一个版本支持全部引
-擎),原始的 \code{tex} 也故意不支持:如果设置了 \code{SOURCE\_DATE\_EPOCH}
+擎),原始的 \code{tex} 也故意不支持: 如果设置了 \code{SOURCE\_DATE\_EPOCH}
环境变量,它的值会被用作 PDF 输出的时间戳。如果还设置了
\code{SOURCE\_DATE\_EPOCH\_TEX\_PRIMITIVES},
\code{SOURCE\_DATE\_EPOCH} 的值会被用于初始化 \TeX\
@@ -2950,47 +3159,47 @@ pdf\TeX: 新的原生命令 \cs{pdfinfoomitdate}, \cs{pdftrailerid},
Xe\TeX: 新的原生命令 \cs{XeTeXhyphenatablelength},
\cs{XeTeXgenerateactualtext},\\ \cs{XeTeXinterwordspaceshaping},
-\cs{mdfivesum}; 字符分类限制提高到了 4096;DVI 版本提升。
+\cs{mdfivesum}; 字符分类限制提高到了 4096; DVI 版本提升。
-其他实用工具:
+其他实用工具:
\begin{itemize*}
\item \code{gregorio} 是一个新的程序,作为 \code{gregoriotex} 宏包的一部分用于
-Gregorian 圣歌音乐的排版;它缺省就被包括在了 \code{shell\_escape\_commands}
+Gregorian 圣歌音乐的排版; 它缺省就被包括在了 \code{shell\_escape\_commands}
中。
\item \code{upmendex} 是一个创建索引的程序, 基本上和 \code{makeindex}
兼容,支持了 Unicode 排序,以及其他的一些修改。
-\item \code{afm2tfm} 现在只将基于音调的高度调整上调;新选项 \code{-a}
+\item \code{afm2tfm} 现在只将基于音调的高度调整上调; 新选项 \code{-a}
忽略所有调整。
\item \code{ps2pk} 可以处理扩展 PK/GF 字体了。
\end{itemize*}
-Mac\TeX: 去除了 \TeX\ Distribution Preference Pane;它的功能现在在 TeX Live
-Utility 里提供了;更新了捆绑的 GUI 应用;给需要在 Ghostscript 中使用多种 CJK
+Mac\TeX: 去除了 \TeX\ Distribution Preference Pane; 它的功能现在在 TeX Live
+Utility 里提供了; 更新了捆绑的 GUI 应用; 给需要在 Ghostscript 中使用多种 CJK
字体的用户提供了新的 \code{cjk-gs-integrate} 脚本。
-基础架构:支持系统级别的 \code{tlmgr} 配置文件;校验包的完整性;如果有 GPG 还会
+基础架构: 支持系统级别的 \code{tlmgr} 配置文件; 校验包的完整性; 如果有 GPG 还会
校验网络更新的签名。安装程序和 \code{tlmgr} 都会作这些检查。如果没有 GPG 则跳过
这一步。
-平台:\code{alpha-linux} 和 \code{mipsel-linux} 被移除了。
+平台: \code{alpha-linux} 和 \code{mipsel-linux} 被移除了。
\subsubsection{2017}
-Lua\TeX: 更多 callback,更多排版控制,更多对内部机制的控制;在一些平台
+Lua\TeX: 更多 callback,更多排版控制,更多对内部机制的控制; 在一些平台
增加了用来动态载入代码的 \code{ffi} 库。
pdf\TeX: 去年的 |SOURCE_DATE_EPOCH_TEX_PRIMITIVES| 环境变量被改名为
|FORCE_SOURCE_DATE|,没有功能改变。如果 \cs{pdfpageattr} token 列表包含了字符串
\code{/MediaBox},则会忽略输出默认的 \code{/MediaBox}。
-Xe\TeX: Unicode/OpenType 数学支持现在是基于 HarfBuzz 的 MATH table 支持实现的;
+Xe\TeX: Unicode/OpenType 数学支持现在是基于 HarfBuzz 的 MATH table 支持实现的;
还有一些 bug 修正。
Dvips: 保证最后一次设置的 papersize special 是最后选中的纸张尺寸,和
-\code{dvipdfmx} 以及宏包希望的效果一致;\code{-L0} 选项 (\code{L0}
+\code{dvipdfmx} 以及宏包希望的效果一致; \code{-L0} 选项 (\code{L0}
配置文件设置) 可以用来恢复以前的行为,也就是第一次设置纸张尺寸的 special
才有效。
@@ -2999,13 +3208,13 @@ ep\TeX, eup\TeX: 来自 pdf\TeX\ 新的原生命令 \cs{pdfuniformdeviate},
\cs{pdfelapsedtime}, \cs{pdfresettimer}。
Mac\TeX: 从这一年开始,Mac\TeX\ 只支持 Apple 还在发布安全更新的
-\MacOSX\ 版本,使用的平台名称是 |x86_64-darwin|,目前这包括 Yosemite,
-El~Capitan, 和 Sierra (10.10 及以后的)。给更老版本的 \MacOSX\
+\macOS{}\ 版本,使用的平台名称是 |x86_64-darwin|,目前这包括 Yosemite,
+El~Capitan, 和 Sierra (10.10 及以后的)。给更老版本的 \macOS{}\
用的二进制程序不会包含在 Mac\TeX\ 里面,但 \TeX\ Live 里还会提供
(|x86_64-darwinlegacy|, \code{i386-darwin}, \code{powerpc-darwin})。
基础架构: \envname{TEXMFLOCAL} 树现在 (默认) 是在 \envname{TEXMFSYSCONFIG} 和
-\envname{TEXMFSYSVAR} 之前搜索了;这是为了更好地符合本地文件优先于系统文件的
+\envname{TEXMFSYSVAR} 之前搜索了; 这是为了更好地符合本地文件优先于系统文件的
原则。另外,\code{tlmgr} 有一个新的 \code{shell} 模式,进行交互和脚本使用,和
一个新的 \code{conf auxtrees} 功能来方便添加和删除额外的目录树。
@@ -3017,7 +3226,7 @@ El~Capitan, 和 Sierra (10.10 及以后的)。给更老版本的 \MacOSX\
\code{install-tl}: Mac 下的个人路径,比如 \envname{TEXMFHOME},现在默认设置为和
Mac\TeX\ 一样的 (|~/Library/...|)。增加了新选项 \code{-init-from-profile}
-来以特定 profile 启动安装;新命令 \code{P} 来直接保存一个 profile;新的 profile
+来以特定 profile 启动安装; 新命令 \code{P} 来直接保存一个 profile; 新的 profile
变量名 (但先前的名字也还支持)。
Sync\TeX: 临时文件的名字现在被改为了 \code{foo.synctex(busy)},而不是
@@ -3025,15 +3234,15 @@ Sync\TeX: 临时文件的名字现在被改为了 \code{foo.synctex(busy)},而
件的前端和编译系统因此需要调整。
其他工具: \code{texosquery-jre8} 是一个新的跨平台程序,用来在 \TeX\ 文档
-中获取系统 locale 和其他 OS 信息;它已经包含在了 |shell_escape_commands|
+中获取系统 locale 和其他 OS 信息; 它已经包含在了 |shell_escape_commands|
中,可以在受限的 shell 环境中执行。(texosquery 也支持更老的 JRE 版本,但
不能在受限模式下启用,因为 Oracle 由于安全问题不再支持那些版本了。)
-平台:见上述的 Mac\TeX\ 条目。没有其他的变化。
+平台: 见上述的 Mac\TeX\ 条目。没有其他的变化。
-\subsection{2018}
+\subsubsection{2018}
-Kpathsea: 对于非系统目录缺省进行大小写不敏感的文件名匹配;可以通过设置
+Kpathsea: 对于非系统目录缺省进行大小写不敏感的文件名匹配; 可以通过设置
\code{texmf.cnf} 或者将 \code{texmf\_casefold\_search} 环境变量设置为~\code{0}
来禁用。详细信息见 Kpathsea 手册 (\url{https://tug.org/kpathsea})。
@@ -3041,24 +3250,24 @@ ep\TeX, eup\TeX: 新的原语 \cs{epTeXversion}。
Lua\TeX: 准备在 2019 年升级到 Lua 5.3: 大部分平台下都提供了一个
\code{luatex53} 程序,但必须被改名为 \code{luatex} 才能使用。或者使用
-\ConTeXt\ Garden (\url{https://wiki.contextgarden.net}) 的文件;那里有
+\ConTeXt\ Garden (\url{https://wiki.contextgarden.net}) 的文件; 那里有
更多的信息。
MetaPost: 对错误的路径方向、TFM 和 PNG 输出的修正。
-pdf\TeX: 允许位图字体使用 encoding vector;当前目录不再被加入 PDF ID 的计算;关于
+pdf\TeX: 允许位图字体使用 encoding vector; 当前目录不再被加入 PDF ID 的计算; 关于
\cs{pdfprimitive} 的 bug 修正及相关改变。
-Xe\TeX: 在插入 PDF 图像文件时支持 \code{/Rotate};如果输出程序失败会返回非 0
-退出码;许多 UTF-8 和原语的修正。
+Xe\TeX: 在插入 PDF 图像文件时支持 \code{/Rotate}; 如果输出程序失败会返回非 0
+退出码; 许多 UTF-8 和原语的修正。
Mac\TeX: 参见下面关于 macOS 版本支持的变化。除此之外,Mac\TeX\ 在
-\code{/Applications/TeX/} 下安装的文件经过了重新组织使之更为清晰;现在这个目录
+\code{/Applications/TeX/} 下安装的文件经过了重新组织使之更为清晰; 现在这个目录
包含四个 GUI 程序 (BibDesk, LaTeXiT, TeX Live Utility, 和 TeXShop),它的子目录
则包含其余的实用程序和文档。
-\code{tlmgr}: 新的 \code{tlshell} (Tcl/Tk) 和 \code{tlcockpit} (Java) 前端;JSON
-输出;\code{uninstall} 现在可以替代 \code{remove} 使用;新的
+\code{tlmgr}: 新的 \code{tlshell} (Tcl/Tk) 和 \code{tlcockpit} (Java) 前端; JSON
+输出; \code{uninstall} 现在可以替代 \code{remove} 使用; 新的
\code{print-platform-info} 选项。
平台支持:
@@ -3076,15 +3285,15 @@ Mac\TeX: 参见下面关于 macOS 版本支持的变化。除此之外,Mac\TeX
\item Windows: 不再支持 XP。
\end{itemize*}
-\subsection{2019}
+\subsubsection{2019}
-Kpathsea: 更一致的括号展开和路径拆分;用来替代 \code{.} 的 \code{TEXMFDOTDIR}
+Kpathsea: 更一致的括号展开和路径拆分; 用来替代 \code{.} 的 \code{TEXMFDOTDIR}
新变量,以方便子目录搜索 (见 \code{texmf.cnf} 中的注释)。
ep\TeX, eup\TeX: 新的原语 \cs{readpapersizespecial} 和 \cs{expanded}。
Lua\TeX: 现在使用的是 Lua 5.3,随之而来的是算术和接口的变化。自带的 pplib
-用于读取 PDF 文件,所以可以去掉对于 poppler 的依赖 (也就不再依赖 C++);Lua
+用于读取 PDF 文件,所以可以去掉对于 poppler 的依赖 (也就不再依赖 C++); Lua
接口有相应的变化。
MetaPost: \code{r-mpost} 命令被认作加了 \code{--restricted} 选项的别名,并被加入
@@ -3106,15 +3315,15 @@ Xe\TeX: 新的原语 \cs{expanded},
\cs{uniformdeviate},
\cs{randomseed}; 扩展 \cs{Ucharcat} 来输出 active 的字符。
-\code{tlmgr}: 支持用 \code{curl} 作为下载程序;优先用 \code{lz4} 和 gzip 而不是
- \code{xz} 做本地备份;优先使用系统提供的压缩和下载程序,而不是 \TL\ 自带的,
+\code{tlmgr}: 支持用 \code{curl} 作为下载程序; 优先用 \code{lz4} 和 gzip 而不是
+ \code{xz} 做本地备份; 优先使用系统提供的压缩和下载程序,而不是 \TL\ 自带的,
除非设置了 \code{TEXLIVE\_PREFER\_OWN} 环境变量。
\code{install-tl}: 新的 \code{-gui} 选项 (不带参数) 现在是 Windows 和 Mac 下的默
认的选项,它会使用一个新的 Tcl/TK 图形界面 (见第~\ref{sec:basic}~节和
第~\ref{sec:graphical-inst})~节。
-实用程序:
+实用程序:
\begin{itemize*}
\item \code{cwebbin} (\url{https://ctan.org/pkg/cwebbin}) 现在是 \TeX\ Live 中的
CWEB 实现,支持更多的方言,并包括构建 mini-index 使用的 \code{ctwill} 程序。
@@ -3126,19 +3335,17 @@ CWEB 实现,支持更多的方言,并包括构建 mini-index 使用的 \code
\end{itemize*}
Mac\TeX: \code{x86\_64-darwin} 现在支持 10.12 或更新的版本 (Sierra,
-High Sierra, Mojave);\code{x86\_64-darwinlegacy} 仍然支持 10.6 或更新版本。
+High Sierra, Mojave); \code{x86\_64-darwinlegacy} 仍然支持 10.6 或更新版本。
不再包含 Excalibur 拼写检查器,因为它需要 32 位支持。
-平台支持:去除了 \code{sparc-solaris}。
+平台支持: 去除了 \code{sparc-solaris}。
-\htmlanchor{news}
-\subsection{当前版本:2020}
-\label{sec:tlcurrent}
+\subsubsection{2020}
通用的更新: \begin{itemize}
\item 所有 \TeX\ 引擎,包括 \texttt{tex} 的 \cs{input} 原语,现在都支持以组分隔
的文件名参数,作为跟系统有关的扩展。标准的用空格或者标识符分隔的文件名的使用完全
-不受影响。按组分隔的参数一开始是 Lua\TeX\ 先实现的;现在它被推广到所有的引擎中了。
+不受影响。按组分隔的参数一开始是 Lua\TeX\ 先实现的; 现在它被推广到所有的引擎中了。
ASCII 双引号字符 (\texttt{"}) 一开始会被从文件名中去掉,但在输入后不变。这个改变
目前不会影响 \LaTeX{} 的 \cs{input} 命令,因为那是对标准 \cs{input} 原语重新定义
的宏。
@@ -3152,14 +3359,14 @@ ASCII 双引号字符 (\texttt{"}) 一开始会被从文件名中去掉,但在
\end{itemize}
ep\TeX, eup\TeX: 新的原语 \cs{Uchar}, \cs{Ucharcat},
-\cs{current(x)spacingmode}, \cs{ifincsname};更新 \cs{fontchar??} 和
-\cs{iffontchar}。只针对 eup\TeX{} 的:\cs{currentcjktoken}。
+\cs{current(x)spacingmode}, \cs{ifincsname}; 更新 \cs{fontchar??} 和
+\cs{iffontchar}。只针对 eup\TeX{} 的: \cs{currentcjktoken}。
Lua\TeX: 与 HarfBuzz 库的集成,作为新引擎 \texttt{luahbtex} (被用于
-\texttt{lualatex}) 和 \texttt{luajithbtex} 提供。新的原语:
+\texttt{lualatex}) 和 \texttt{luajithbtex} 提供。新的原语:
\cs{eTeXgluestretchorder}, \cs{eTeXglueshrinkorder}。
-pdf\TeX: 新的原语 \cs{pdfmajorversion};这个命令只改变 PDF 输出的版本号;它对
+pdf\TeX: 新的原语 \cs{pdfmajorversion}; 这个命令只改变 PDF 输出的版本号; 它对
任何 PDF 内容没有影响。\cs{pdfximage} 等类似命令现在以和 \cs{openin} 相同的方式
来搜索图像文件了。
@@ -3172,7 +3379,7 @@ Dvips: 位图字体的输出编码,以更好的支持复制粘贴
(\url{https://tug.org/TUGboat/tb40-2/tb125rokicki-type3search.pdf})。
Mac\TeX: Mac\TeX\ 和 \texttt{x86\_64-darwin} 现在需要 10.13 或者更新的系统
-(High~Sierra, Mojave, 和 Catalina);
+(High~Sierra, Mojave, 和 Catalina);
\texttt{x86\_64-darwinlegacy} 支持 10.6 和更新的系统。Mac\TeX\ 已经被公证
(notarized) 命令行程序使用强化的运行时环境,因为 Apple 现在要求安装包必须提
供这些。BibDesk 和 \TeX\ Live Utility 不再是 Mac\TeX\ 的一部分,因为它们没有
@@ -3183,22 +3390,446 @@ Mac\TeX: Mac\TeX\ 和 \texttt{x86\_64-darwin} 现在需要 10.13 或者更新的
\item 新选项 \texttt{tlmgr check texmfdbs}, 用来检查每个目录树 \texttt{ls-R} 文件和
\texttt{!!} 配置的一致性。
\item 软件包容器使用带版本号的文件名,比如
-\texttt{tlnet/archive/\textsl{pkgname}.rNNN.tar.xz};对用户应该没有影响,但对于
+\texttt{tlnet/archive/\textsl{pkgname}.rNNN.tar.xz}; 对用户应该没有影响,但对于
分发来说会是一个明显的改变。
\item \texttt{catalogue-date} 信息不在从 \TeX~Catalogue 获得了,因为它通常和软件
包更新没有关系。
\end{itemize*}
+\subsubsection{2021}
+
+一般更新:
+\begin{itemize}
+\item Donald Knuth 对 \TeX{} 和 Metafont 进行的 2021 年调优更改已被整合
+(\url{https://tug.org/TUGboat/tb42-1/tb130knuth-tuneup21.pdf})。
+这些更改也可在 CTAN 上作为 \code{knuth-dist} 和 \code{knuth-local} 包提供。
+如预期的那样,这些修复仅适用于罕见情况,并不会影响实际操作中的行为。
+
+\item 除了原始 \TeX{} 外:
+如果 \cs{tracinglostchars} 设置为 3 或更高,
+缺失字符将导致错误,
+而不仅仅是在日志文件中显示消息,
+缺失的字符代码将以十六进制显示。
+
+\item 除了原始 \TeX{} 外:
+一个新的整数参数 \cs{tracingstacklevels},
+如果为正值,并且 \cs{tracingmacros} 也为正值,
+将在每个相关日志行上输出一个前缀,
+指示宏展开的深度 (例如,深度为 2 时为 |~..|)。
+此外,宏记录将在深度 $\ge$ 参数值时被截断。
+
+\end{itemize}
+
+Aleph: 基于 Aleph 的 \LaTeX{} 格式 \code{lamed} 已被移除。
+\code{aleph} 二进制文件本身仍然包含在内并支持。
+
+Lua\TeX{}:
+\begin{itemize*}
+\item Lua 5.3.6。
+\item 用于 \cs{tracingmacros} 的嵌套级别回调,
+作为新的 \cs{tracingstacklevels} 的通用变体。
+\item 将数学字符标记为保护,以防止作为文本处理。
+\item 删除传统数学代码路径的宽度/ic 补偿。
+\end{itemize*}
+
+MetaPost:
+\begin{itemize*}
+\item 支持用于可重复输出的 |SOURCE_DATE_EPOCH| 环境变量。
+\item 避免在 \texttt{mpto} 中错误地结尾 \texttt{\%}。
+\item 记录 \texttt{-T} 选项,其他手册修复。
+\item 在二进制和十进制模式下更改 \texttt{epsilon} 的值,
+以便 |mp_solve_rising_cubic| 函数按预期工作。
+\end{itemize*}
+
+pdf\TeX{}:
+\begin{itemize*}
+\item 新增原语 \cs{pdfrunninglinkoff} 和 \cs{pdfrunninglinkon};
+例如,用于禁用在页眉和页脚中生成链接。
+\item 当 “\cs{pdfendlink} 结束于与 \cs{pdfstartlink} 不同的嵌套级别” 时发出警告而不是中止。
+\item 在 \texttt{fmt} 文件中转储 \cs{pdfglyphtounicode} 分配。
+\item 源代码: 删除 \texttt{poppler} 支持,
+因为同步上游太难。
+在原生 \TL{} 中,pdf\TeX{} 一直使用 \texttt{libs/xpdf},
+这是从 \texttt{xpdf} 中裁剪和调整的代码。
+\end{itemize*}
+
+Xe\TeX{}: 修复了数学字符间距问题。
+
+Dvipdfmx:
+\begin{itemize*}
+\item 现在默认安全调用 Ghostscript;
+要覆盖此设置 (从而假设所有输入文件都是可信的),
+请使用 \verb|-i dvipdfmx-unsafe.cfg|。
+要使用 PSTricks 与 \XeTeX{},
+这是必需的,如下所示: \\
+\verb|xetex -output-driver="xdvipdfmx -i dvipdfmx-unsafe.cfg -q -E" ...|
+\item 如果找不到图像文件,则以错误状态退出。
+\item 扩展的颜色支持特殊语法。
+\item 用于操作 |ExtGState| 的特殊命令。
+\item 兼容性特殊命令 \code{pdfcolorstack} 和 \code{pdffontattr}。
+\item 实验性支持 \code{dviluatex} 的扩展 |fnt_def|。
+\item 支持虚拟字体的新特性以回退日文字体定义。
+\end{itemize*}
+
+Dvips:
+\begin{itemize*}
+\item 默认 PostScript 文档标题现在是输入文件的基本名称,可以通过新选项 \texttt{-title} 覆盖。
+\item 如果找不到 \texttt{.eps} 或其他图像文件,则以错误状态退出。
+\item 支持虚拟字体的新特性以回退日文字体定义。
+\end{itemize*}
+
+Mac\TeX{}: Mac\TeX{} 及其新的二进制文件夹 \texttt{universal-darwin} 现在需要 \macOS{} 10.14 或更高版本
+(Mojave、Catalina 和 Big~Sur);
+不再存在 |x86_64-darwin| 二进制文件夹。
+通过 Unix \texttt{install-tl} 提供的 |x86_64-darwinlegacy| 二进制文件夹支持 10.6 及更新版本。
+
+今年对 Macintosh 来说是重要的一年,
+因为 Apple 在 11 月推出了 ARM 机器,
+并将在多年内销售和支持 ARM 和 Intel 机器。
+\texttt{universal-darwin} 中的所有程序都具有 ARM 和 Intel 的可执行代码。
+两种二进制文件都从相同的源代码编译。
+
+额外的程序 Ghostscript、LaTeXiT、\TeX{} Live Utility 和 TeXShop 都是通用的,
+并且都签署了加固运行时,
+因此它们今年都包含在 Mac\TeX{} 中。
+
+\code{tlmgr} 和基础设施:
+\begin{itemize*}
+\item 仅保留主存储库的 \texttt{texlive.tlpdb} 的一个备份。
+\item 在系统和 Perl 版本之间实现更高的可移植性。
+\item \texttt{tlmgr info} 报告新的 \texttt{lcat-*} 和 \texttt{rcat-*} 字段,
+用于本地与远程目录数据。
+\item 子命令的全部日志记录移动到一个新的日志文件: \\
+\texttt{texmf-var/web2c/tlmgr-commands.log}。
+\end{itemize*}
+
+\subsubsection{2022}
+
+一般更新:
+\begin{itemize}
+\item 新引擎 \code{hitex},它输出自己的 HINT 格式,
+特别为在移动设备上阅读技术文档而设计。
+GNU/Linux、Windows 和 Android 的 HINT 查看器可以从 \TL{} 单独获取。
+
+\item \code{tangle}、\code{weave}: 支持可选的第三个参数来指定输出文件。
+
+\item Knuth 的程序 \code{twill} 现在包含在内,用于为原始 \texttt{WEB} 程序制作迷你索引。
+
+\end{itemize}
+
+跨引擎扩展(原始 \TeX{}、Aleph 和 hi\TeX{} 除外):
+\begin{itemize}
+\item 新增原语 \cs{showstream},用于将 \cs{show} 输出重定向到文件。
+\item 新增原语 \cs{partokenname} 和 \cs{partokencontext},
+允许覆盖空行、vbox 结束等时发出的 \cs{par} 标记的名称。
+\end{itemize}
+
+ep\TeX{},eup\TeX{}:
+\begin{itemize*}\raggedright
+\item 新增原语: \cs{lastnodefont}、\cs{suppresslongerror}、
+\cs{suppressoutererror}、\cs{suppressmathparerror}。
+\item 现在可用 pdf\TeX{} 扩展 \cs{vadjust pre}。
+\end{itemize*}
+
+Lua\TeX{}:
+\begin{itemize*}
+\item 支持 PDF 2.0 的结构化目标。
+\item PDF 2.0 的 PNG /Smask。
+\item \code{luahbtex} 的可变字体接口。
+\item 数学默认模式中不同的根式样式默认值。
+\item 可选地阻止选定的可分字符创建。
+\item 改进 TrueType 字体实现。
+\item 更高效的 \cs{fontdimen} 分配。
+\item 忽略只有本地 \code{par} 节点后跟方向同步节点的段落。
+\end{itemize*}
+
+MetaPost: 无限宏展开的错误修复。
+
+pdf\TeX{}:
+\begin{itemize*}\raggedright
+\item 支持 PDF 2.0 的结构化目标。
+\item 对于字母间隔字体,如果指定了显式 \cs{fontdimen}6,则使用它。
+\item 始终在行首发出警告。
+\item 对于具有自动调整字符间距 (\cs{pdfappendkern} 和 \cs{pdfprependkern}) 的字符,
+仍然进行突出显示; 同样,对隐式和显式连字符进行自动调整。
+\end{itemize*}
+
+p\TeX{} 等:
+\begin{itemize*}
+\item p\TeX{} 重大更新至 4.0.0,以更好地支持当前 \LaTeX{}。
+\item 新增原语 \cs{ptexlineendmode} 和 \cs{toucs}。
+\item \cs{ucs} (以前在 uptex、euptex 中可用) 现在在 p\TeX{} 和 ep\TeX{} 中也可用。
+\item 区分八位字符和日文字符,
+如 Hironori Kitagawa 在 TUGboat 文章中讨论的那样
+(\url{https://tug.org/TUGboat/tb41-3/tb129kitagawa-char.pdf})。
+\end{itemize*}
+
+Xe\TeX{}: 新增包装脚本 \texttt{xetex-unsafe} 和 \texttt{xelatex-unsafe},
+用于简化调用需要 \XeTeX{} 和 PSTricks 透明操作符的文档,
+这本质上是不安全的 (直到 Ghostscript 中重新实现为止)。
+为了安全,使用 Lua\AllTeX{}。
+
+Dvipdfmx:
+\begin{itemize*}
+\item 支持 PSTricks 而无需 \texttt{-dNOSAFER},除了透明度。
+\item \texttt{-r} 选项再次有效,用于设置位图字体分辨率。
+\end{itemize*}
+
+Dvips: 默认情况下,不尝试自动媒体调整以旋转纸张尺寸;
+新选项 \texttt{-{}-landscaperotate} 重新启用。
+
+\code{upmendex}: 实验性支持阿拉伯语和希伯来语; 改进的字符分类和语言支持。
+
+Kpathsea: \texttt{kpsewhich -all} 返回的第一个路径现在与常规 (非全部) 搜索相同。
+
+\code{tlmgr} 和基础设施:
+\begin{itemize*}
+\item 默认使用 https 访问 \code{mirror.ctan.org}。
+\item 使用 \code{TEXMFROOT} 而不是 \code{SELFAUTOPARENT} 以便于重新定位。
+\item \code{install-tl}: 如果下载或安装失败,将自动继续并稍后重试 (一次)。
+\end{itemize*}
+
+Mac\TeX{}: Mac\TeX{} 及其二进制文件夹 \texttt{universal-darwin} 需要 \macOS{} 10.14 或更高版本
+(Mojave、Catalina、Big~Sur、Monterey)。
+仅通过 Unix \texttt{install-tl} 提供的 |x86_64-darwinlegacy|
+二进制文件夹支持 10.6 (Snow~Leopard) 及更新版本。
+
+平台: 今年 (2022年) 没有平台支持的变化。
+但是,明年的发行版 (2023年) 我们计划将 Windows 二进制文件从 32 位切换到 64 位。
+不幸的是,我们无法同时支持两者。
+
+\subsubsection{2023}
+
+\noindent Windows: 正如之前宣布的那样,
+\TL{} 现在包含 64 位 Windows 二进制文件,
+而不是32位的。
+新目录名为 \texttt{bin/windows} (将 64 位二进制文件放入名为``32''的目录中似乎不合适)。
+我们知道这将给 Windows 用户带来额外的工作,
+但似乎没有更好的替代方案。
+如果需要 32 位的 Windows 支持,
+你需要安装\TL{} 2022。
+从 Windows 11 开始,
+基于 ARM 的 Windows 支持 64 位 AMD/Intel 的仿真,
+因此可以使用当前的 \TL。
+然而,基于 ARM 的 Windows 10 无法仿真 Intel/AMD 64位,
+因此也需要 32 位 TeX Live。
+请参阅单独的 \TL{} Windows 网页 (\url{https://tug.org/texlive/windows.html})。
+
+\noindent 跨引擎扩展 (原始 \TeX{} 和 e-\TeX{} 除外):
+\cs{special} 后跟一个新关键字``\texttt{shipout}'',
+将参数标记的扩展延迟到 \cs{shipout} 时进行,
+就像非 \verb|\immediate\write| 一样。
+
+\noindent ep\TeX{}、eup\TeX{}:
+\begin{itemize*}
+\item 不再构建``原始'' (u)ptex; (u)ptex 现在以 e(u)ptex的兼容模式运行。p\TeX{} 工具也同样,具体如下。
+\item 新增原语: \cs{tojis}、\cs{ptextracingfonts}、\cs{ptexfontname}。
+\item 对于 \cs{font},支持 JIS/UCS 的新语法。
+\end{itemize*}
+
+\noindent Lua\TeX{}:
+\begin{itemize*}
+\item 新的原语 \cs{variablefam} 允许数学字符保持其类别,同时让族适应。
+\item 改进了从右到左的注释区域
+\item 上述跨引擎``延迟\cs{special}''。
+\item 在 2023 年 5 月发布的 Lua\TeX{} 1.17.0 中:
+默认禁用了 socket 库; 新的命令行选项 \code{--socket} 启用了它,
+以及\code{--shell-escape} (而不是\code{--shell-restricted})。
+此外,mime库现在始终可用,
+并且新的函数 \code{os.socketsleep} 和 \code{os.socketgettime} 也始终可用。
+最后,修复了一些绕过各种安全功能的隐蔽方法。
+\end{itemize*}
+
+\noindent MetaPost:
+修复了一些错误。\texttt{svg->dx} 和 \texttt{svg->dy} 现在是 \texttt{double} 类型,
+以提高精度;
+更新了 \verb|mp_begin_iteration|;
+修复了 \texttt{mplib} 中的内存泄漏。
+
+\noindent pdf\TeX{}:
+\begin{itemize*}
+\item 新增原语 \cs{pdfomitinfodict},完全省略 \texttt{/Info} 字典。
+\item 新增原语 \cs{pdfomitprocset},控制省略 \texttt{/ProcSet} 数组:
+如果该参数为负,则包含 \texttt{/ProcSet};
+如果该参数为 0 并且 pdftex 生成 PDF 1.x 输出,则包含 \texttt{/ProcSet}。
+\item 使用 \cs{pdfinterwordspaceon} 时,
+如果当前字体的编码在位置 32 有一个 \texttt{/space} 字符,
+则使用该字符;
+否则,使用 (新) 默认字体 \texttt{pdftexspace} 的 \texttt{/space} 字符。
+可以使用新的原语 \cs{pdfspacefont} 覆盖该默认字体。同样的新过程用于 \cs{pdffakespace}。
+\end{itemize*}
+
+\noindent p\TeX{}等:
+\begin{itemize*}
+\item 如上所述,\texttt{ptex} 现在以兼容模式运行 \texttt{eptex},而不是单独构建。
+\item p\TeX{} 工具 (pbibtex、pdvitype、ppltotf、ptftopl) 合并到相应的 up\TeX{} 版本中,
+并以兼容模式运行。
+\end{itemize*}
+
+\noindent Xe\TeX:
+修复了 \cs{topskip} 和 \cs{splittopskip} 在 \cs{XeTeXupwardsmode} 激活时的计算;
+上述跨引擎``延迟 \cs{special}''。
+
+\noindent Dvipdfmx:
+新增选项 \texttt{-{}-pdfm-str-utf8},
+用于创建 pdfmark 和/或书签。
+
+\noindent \BibTeX{}u:
+\begin{itemize*}
+\item 这个 \BibTeX{} 变体与 \BibTeX{} 大部分向上兼容,
+具有更好的 (基于Unicode的) 多语言支持。它已经在 \TL{} 中存在多年。
+\item 今年,增加了更多支持 CJK 语言的功能,
+一些功能从日本的 (u)pbibtex 和其他程序扩展而来。
+\end{itemize*}
+
+\noindent Kpathsea:
+在类 Unix 平台上支持猜测输入文件编码,
+如同在 Windows 上一样;
+启用于 (\texttt{e}) \texttt{p} (\texttt{la}) \texttt{tex}、\texttt{pbibtex}、\texttt{mendex}。
+
+\noindent \code{tlmgr} 和基础设施:
+\begin{itemize*}
+\item 在 \macOS{} 上默认使用文本界面。
+\item 首先安装核心包,其他包重试一次。
+\item 对磁盘空间是否足够进行简单检查。
+\end{itemize*}
+
+\noindent Mac\TeX{}:
+\begin{itemize*}
+\item Mac\TeX{} 及其二进制文件夹 \texttt{universal-darwin} 需要 \macOS{} 10.14 或更高版本
+(Mojave、Catalina、Big Sur、Monterey、Ventura)。
+仅在 Unix \texttt{install-tl} 中可用的 \texttt{x86\_64-darwinlegacy} 二进制文件夹支持 10.6
+(Snow Leopard) 及更高版本。
+\item Mac\TeX{} 中的 GUI 包现在包含 \texttt{hintview},
+一个 \macOS{} 查看器用于 HINT 文档
+(由 \texttt{hitex} 和 \texttt{hilatex} 引擎为移动设备创建;
+请参阅 Hi\TeX{} 网页,
+\url{https://hint.userweb.mwn.de/hint/hitex.html})。
+GUI 包不再安装文档文件夹,
+而是用一个简短的 \texttt{READ~ME} 文件和一个关于 \texttt{hintview} 的页面取代。
+\item DVD 上的 \texttt{Extras} 文件夹中额外的 \TeX{} 软件已被包含下载链接的文档取代。
+\end{itemize*}
+
+\noindent 平台:
+\begin{itemize*}
+\item 如上所述,新的 \texttt{windows} 二进制目录包含 64 位 Windows 二进制文件。
+\item \texttt{bin/win32} 二进制目录已删除,因为我们无法同时支持 32 位和 64 位 Windows。
+\item \texttt{i386-cygwin} 二进制目录已删除,因为 Cygwin 不再支持i386。
+\end{itemize*}
+
+\htmlanchor{news}
+\subsection{当前: 2024}
+\label{sec:tlcurrent}
+
+\noindent 跨引擎变化 (原始 \TeX{}、e-\TeX{} 和 Lua\TeX{} 除外):
+\begin{itemize*}
+\item 避免因 \cs{output} 和 \cs{write} 大括号的恶意使用导致的崩溃。
+\item 微小的内循环优化。
+(这些更改均由 David Fuchs 完成。)
+\end{itemize*}
+
+\noindent Lua\TeX{}:
+\begin{itemize*}
+\item Lua 级别的文件写入检查现在与 \TeX{} 级别的检查类似。
+\item 如果设置了 Lua 值 \code{texconfig.trace\_extra\_newline},
+则在宏参数之间的日志中输出空行。
+在 2020-2023 年,这种情况是默认的;
+在此之前,不会输出此类空行,这是其他引擎的行为。
+\item 过去,Windows 平台的 \code{texlua} (而不是 \code{luatex},也不是其他平台)
+内部会对参数执行通配符扩展。现在不再发生这种情况。
+\end{itemize*}
+
+\noindent MetaPost:
+\begin{itemize*}
+\item 现在包含用于区间算术的 MPFI 库; 使用 \texttt{-{}-numbersystem=interval} 启用。
+\end{itemize*}
+
+\noindent pdf\TeX{}:
+\begin{itemize*}
+\item 在大端系统上更可靠的文本提取。
+\item 增加对损坏的 pfb、fmt、pdf 文件的检查。
+\item 避免由于不寻常的 pdf 包含导致写入损坏的 pdf 文件。
+\item 手册转换为 \LaTeX{} 并进行了彻底审查,但实质性更新较少。
+\end{itemize*}
+
+\noindent ep\TeX{}、eup\TeX{}:
+\begin{itemize*}
+\item 新的简单编码转换工具 \texttt{ptekf}。
+\item \texttt{eptex} 不再单独构建; 它在 \texttt{euptex} 的遗留编码模式下运行。
+\end{itemize*}
+
+\noindent Xe\TeX{}:
+\begin{itemize*}
+\item 支持文件名中超出基本多文种平面的 Unicode 字符。
+\end{itemize*}
+
+\noindent Dvipdfmx:
+\begin{itemize*}
+\item 以与 pdf\TeX{} 相同的方式计算时区偏移。
+\item 处理变体选择器以应对新的 Adobe-Japan1-UCS2 CMap。
+\item 在虚拟字体中为 (u)p\TeX{} 回退多字节字符到 OFM 字体。
+\item 支持 \code{pdf:image} 特殊命令中的 \code{named} 关键字。
+\end{itemize*}
+
+\noindent Kpathsea:
+\begin{itemize*}
+\item 支持扩展的安全文件名检查,
+同时允许在 \code{TEXMF}[\code{SYS}]\code{VAR} 下写入,
+适用于 Lua\AllTeX{}; 新增函数和相应的 \code{kpsewhich} 选项。
+\item 支持新的变量 \code{TEXMF\_OUTPUT\_DIRECTORY}
+(与传统的 \code{TEXMFOUTPUT} 一起),
+使子程序可以访问引擎调用中的 \texttt{-{}-output-directory} 设置。
+\end{itemize*}
+
+\noindent CWEB:
+\begin{itemize*}
+\item 支持以 Lua\TeX{} 作为后端 \TeX{} 引擎。
+\item 修复了在无换行点的行上发生的缓冲区溢出问题。
+\end{itemize*}
+
+\noindent \code{tlmgr}:
+\begin{itemize*}
+\item 新动作 \code{bug},帮助查找错误报告信息。
+\item 在所有平台上使用我们自己的根证书包,以更广泛地支持 LWP,特别是在 \macOS{} 上。
+\item 检测远程仓库是否比本地安装更旧 (即过时的镜像),并且不更新,以避免错误的包移除。
+\item 支持 \ConTeXt{} 纸张尺寸设置。
+\item 修剪镜像仓库 (主仓库和tlcontrib) 的 tlpdb 文件备份。
+\end{itemize*}
+
+\noindent 平台:
+\begin{itemize*}
+\item \ISO\ 镜像再次包含所有平台的二进制文件。
+在过去的几年中,
+一些二进制集被修剪,
+但今年我们没有作为用户组福利制作实体 DVD,
+所以可以再次包含所有内容。
+而且,即使是最大限度地修剪的镜像也太大,
+无法适应单层 DVD,
+因此修剪对 2024 年的志愿刻录者没有好处。
+更多信息请访问 \url{https://tug.org/texcollection/}。
+\item Robert Alessi 在 \url{https://sr.ht/~ralessi/texlive-openbsd/}
+提供了在 OpenBSD 上原生 \TL{} 安装的二进制文件。
+\end{itemize*}
+
+\noindent Mac\TeX{}:
+现在包含最新的 Ghostscript 10.03.0,
+所有四个 GUI 程序的更新,
+以及 (如往常一样) 所有新的 \TL{} 更改。
+二进制文件仍然支持 macOS 10.14 (Mojave,2018) 及更高版本。
+(如往常一样,更早的 Mac 版本由 \texttt{x86\_64-darwinlegacy} 二进制文件支持,
+这些文件是 \TL{} 的一部分,但不是 Mac\TeX{} 的一部分。)
+
\subsection{未来}
-\TL{} 并不完美,也永远不会达到完美。我们希望继续发行新的版本,也希望提供
-更多的帮助文档、更多的实用程序、更多的安装程序,当然还有更多更新的宏包与
-字体,以及其他一切和 \TeX\ 有关的东西。这个工作是由志愿者在其空闲时间完成的,
-所以总有更多值得做的地方。请参见 \url{https://tug.org/texlive/contribute.html}。
+我们打算继续发布新的 \TL{} 版本,
+并希望提供更多的文档、更多的程序、更完善和更全面检查的宏和字体树以及其他与 \TeX{} 相关的内容。
+所有这些工作都是由志愿者在业余时间完成的,
+而且总有更多的工作要做。
+请参阅\url{https://tug.org/texlive/contribute.html}。
-请把更正、建议或者提供帮助的意愿发送到:
+请将纠正、建议和帮助的提议发送到:
\begin{quote}
-\email{tex-live@tug.org} \\
+\email{tex-live@tug.org} {\small (您无需订阅即可发布)}\\
\url{https://tug.org/texlive}
\end{quote}
@@ -3207,7 +3838,7 @@ Mac\TeX: Mac\TeX\ 和 \texttt{x86\_64-darwin} 现在需要 10.13 或者更新的
\section{翻译说明}
-这里对简体中文版本《\TL{} 指南》,即本文档中遵循的翻译惯例作一简要说明:
+这里对简体中文版本《\TL{} 指南》,即本文档中遵循的翻译惯例作一简要说明:
\begin{itemize}
@@ -3235,4 +3866,6 @@ Helin Gai 翻译。其中 Jinsong Zhao 负责 Windows 部分的翻译,Yue Wang
2010 到 2020 年的简体中文版本都由 Jiang Jiang 翻译。
+2024 年的简体中文版本由 Ran Wang (王然) 翻译。
+
\end{document}
diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro
index b75ef89863f..4c7ee95623d 100644
--- a/Master/texmf-dist/dvips/pst-node/pst-node.pro
+++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro
@@ -1,13 +1,13 @@
-% $Id: pst-node.pro 438 2022-01-31 17:45:26Z herbert $
+% $Id: pst-node.pro 919 2024-07-10 18:31:27Z herbert $
%%
%% PostScript prologue for pst-node.tex.
-%% Version 1.15, 2014/01/27.
+%% Version 1.15a, 2024/07/10.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
%% in directory macros/latex/base/lppl.txt.
%
-%%%% EMPTY lines are not alowed!!! Problem with pst-eps -> \par
+%%%% EMPTY lines are not allowed!!! Problem with pst-eps -> \par
%
%
tx@Dict begin % from main pstricks dict
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc
index 33771573f6b..3a3c95aa605 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc
@@ -1,42 +1,4 @@
/simpleiconseight [
-/monzoicon
-/mooicon
-/moodleicon
-/moonrepoicon
-/moqupsicon
-/morrisonsicon
-/moscowmetroicon
-/motorolaicon
-/mozillaicon
-/mpvicon
-/mqtticon
-/msiicon
-/msibusinessicon
-/mtaicon
-/mtricon
-/mubiicon
-/muiicon
-/mulesofticon
-/mullericon
-/multisimicon
-/mumbleicon
-/muoicon
-/muralicon
-/musescoreicon
-/musicbrainzicon
-/mxlinuxicon
-/myanimelisticon
-/mygeticon
-/myobicon
-/myspaceicon
-/mysqlicon
-/n26icon
-/n8nicon
-/namebaseicon
-/namecheapicon
-/namemcicon
-/namesiloicon
-/namuwikiicon
/nanoicon
/nasaicon
/nationalgridicon
@@ -204,6 +166,7 @@
/orcidicon
/oreillyicon
/orgicon
+/organicmapsicon
/originicon
/osanoicon
/osficon
@@ -255,4 +218,41 @@
/paytmicon
/pcgamingwikiicon
/pdmicon
+/pdqicon
+/peakdesignicon
+/pearsonicon
+/peerlisticon
+/peertubeicon
+/pegasusairlinesicon
+/pelicanicon
+/pelotonicon
+/pennyicon
+/penpoticon
+/percyicon
+/perforceicon
+/perlicon
+/perplexityicon
+/persistenticon
+/personioicon
+/petsathomeicon
+/peugeoticon
+/pexelsicon
+/pfsenseicon
+/phabricatoricon
+/philipshueicon
+/phoenixframeworkicon
+/phonepeicon
+/phosphoriconsicon
+/photobucketicon
+/photocrowdicon
+/photonicon
+/photopeaicon
+/phpicon
+/phpmyadminicon
+/phpstormicon
+/piaggiogroupicon
+/piaproicon
+/picardsurgelesicon
+/picartodottvicon
+/picnicicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc
index d95b1c5e0ca..8108fa1151b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc
@@ -1,14 +1,4 @@
/simpleiconsfive [
-/fuelericon
-/fugacloudicon
-/fujifilmicon
-/fujitsuicon
-/funimationicon
-/furaffinityicon
-/furrynetworkicon
-/fusionauthicon
-/futurelearnicon
-/g2icon
/g2aicon
/g2gicon
/galaxusicon
@@ -110,7 +100,6 @@
/googledatastudioicon
/googledisplayandvideo360icon
/googledocsicon
-/googledomainsicon
/googledriveicon
/googleearthicon
/googleearthengineicon
@@ -118,7 +107,6 @@
/googlefontsicon
/googleformsicon
/googlegeminiicon
-/googlehangoutsicon
/googlehomeicon
/googlekeepicon
/googlelensicon
@@ -126,14 +114,11 @@
/googlemarketingplatformicon
/googlemeeticon
/googlemessagesicon
-/googlemybusinessicon
/googlenearbyicon
/googlenewsicon
-/googleoptimizeicon
/googlepayicon
/googlephotosicon
/googleplayicon
-/googlepodcastsicon
/googlepubsubicon
/googlescholaricon
/googlesearchconsoleicon
@@ -255,4 +240,19 @@
/hotwireicon
/houdiniicon
/houzzicon
+/hpicon
+/hsbcicon
+/html5icon
+/htmlacademyicon
+/htmxicon
+/htopicon
+/httpieicon
+/huaweiicon
+/hubspoticon
+/huggingfaceicon
+/hugoicon
+/humblebundleicon
+/hungryjacksicon
+/husqvarnaicon
+/hypericon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfour.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfour.enc
index a37923a1382..a5221aedfa2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfour.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfour.enc
@@ -1,13 +1,4 @@
/simpleiconsfour [
-/doctrineicon
-/docusaurusicon
-/docusignicon
-/dogecoinicon
-/doiicon
-/dolbyicon
-/doordashicon
-/dota2icon
-/dotenvicon
/dotneticon
/doubanicon
/doubanreadicon
@@ -38,7 +29,6 @@
/dvcicon
/dwavesystemsicon
/dwmicon
-/dynamics365icon
/dynatraceicon
/eicon
/e3icon
@@ -255,4 +245,14 @@
/fsecureicon
/fsharpicon
/fuboicon
+/fuelericon
+/fugacloudicon
+/fujifilmicon
+/fujitsuicon
+/funimationicon
+/furaffinityicon
+/furrynetworkicon
+/fusionauthicon
+/futurelearnicon
+/g2icon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc
index 654beabd94b..ae46e45136c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc
@@ -1,41 +1,4 @@
/simpleiconsnine [
-/pdqicon
-/peakdesignicon
-/pearsonicon
-/peerlisticon
-/peertubeicon
-/pegasusairlinesicon
-/pelicanicon
-/pelotonicon
-/pennyicon
-/penpoticon
-/percyicon
-/perforceicon
-/perlicon
-/perplexityicon
-/persistenticon
-/personioicon
-/petsathomeicon
-/peugeoticon
-/pexelsicon
-/pfsenseicon
-/phabricatoricon
-/philipshueicon
-/phoenixframeworkicon
-/phonepeicon
-/phosphoriconsicon
-/photobucketicon
-/photocrowdicon
-/photonicon
-/photopeaicon
-/phpicon
-/phpmyadminicon
-/phpstormicon
-/piaggiogroupicon
-/piaproicon
-/picardsurgelesicon
-/picartodottvicon
-/picnicicon
/picpayicon
/picrewicon
/picxyicon
@@ -73,8 +36,8 @@
/playstation3icon
/playstation4icon
/playstation5icon
+/playstationportableicon
/playstationvitaicon
-/playwrighticon
/pleromaicon
/pleskicon
/plexicon
@@ -114,14 +77,7 @@
/posthogicon
/postmanicon
/postmatesicon
-/powerappsicon
-/powerautomateicon
-/powerbiicon
-/powerfxicon
-/powerpagesicon
/powersicon
-/powershellicon
-/powervirtualagentsicon
/prdotcoicon
/preacticon
/precommiticon
@@ -255,4 +211,48 @@
/reacticon
/reactbootstrapicon
/reacthookformicon
+/reactiveresumeicon
+/reactivexicon
+/reactosicon
+/reactqueryicon
+/reactroutericon
+/reacttableicon
+/readdotcvicon
+/readmeicon
+/readthedocsicon
+/realmicon
+/reasonicon
+/reasonstudiosicon
+/recoilicon
+/redicon
+/redashicon
+/redbubbleicon
+/redbullicon
+/redditicon
+/redhaticon
+/redhatopenshifticon
+/redisicon
+/redmineicon
+/redoxicon
+/redsysicon
+/reduxicon
+/reduxsagaicon
+/redwoodjsicon
+/reebokicon
+/refineicon
+/relayicon
+/relianceindustrieslimitedicon
+/remarkicon
+/remedyentertainmenticon
+/remixicon
+/removedotbgicon
+/renaulticon
+/rendericon
+/renovateicon
+/renpyicon
+/renrenicon
+/repliticon
+/republicofgamersicon
+/rescripticon
+/rescuetimeicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc
index 037b0cb4c55..84949ec80f0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc
@@ -1,49 +1,4 @@
/simpleiconsoneone [
-/snapcrafticon
-/sncficon
-/snorticon
-/snowflakeicon
-/snowpackicon
-/snykicon
-/socialbladeicon
-/society6icon
-/socketdotioicon
-/softpediaicon
-/sogouicon
-/solanaicon
-/solidicon
-/solidityicon
-/sololearnicon
-/solusicon
-/sonaricon
-/sonarcloudicon
-/sonarlinticon
-/sonarqubeicon
-/sonarricon
-/sonatypeicon
-/songkickicon
-/songodaicon
-/sonicwallicon
-/sonosicon
-/sonyicon
-/sorianaicon
-/soundchartsicon
-/soundcloudicon
-/sourceengineicon
-/sourceforgeicon
-/sourcehuticon
-/sourcetreeicon
-/southwestairlinesicon
-/spacemacsicon
-/spaceshipicon
-/spacexicon
-/spacyicon
-/sparkaricon
-/sparkasseicon
-/sparkfunicon
-/sparkposticon
-/spdxicon
-/speakerdeckicon
/spectrumicon
/speedtesticon
/speedypageicon
@@ -194,6 +149,7 @@
/teamcityicon
/teamspeakicon
/teamviewericon
+/techcrunchicon
/tedicon
/teepublicicon
/teespringicon
@@ -255,4 +211,48 @@
/tiktokicon
/tildapublishingicon
/tileicon
+/timescaleicon
+/tinaicon
+/tindericon
+/tindieicon
+/tinkercadicon
+/tinygradicon
+/tinylettericon
+/tistoryicon
+/tldrawicon
+/tmobileicon
+/tmuxicon
+/todoisticon
+/togglicon
+/toggltrackicon
+/tokyometroicon
+/tollicon
+/tomlicon
+/tomorrowlandicon
+/tonicon
+/topcodericon
+/topdotggicon
+/toptalicon
+/torbrowsericon
+/torprojecticon
+/toshibaicon
+/totvsicon
+/tourboxicon
+/towericon
+/toyotaicon
+/tplinkicon
+/tqdmicon
+/traccaricon
+/tradingviewicon
+/traefikmeshicon
+/traefikproxyicon
+/trailforksicon
+/trainerroadicon
+/trakticon
+/transifexicon
+/transmissionicon
+/transportforirelandicon
+/transportforlondonicon
+/travisciicon
+/treehouseicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc
index bf406e6fdcc..d3c912e4b3f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc
@@ -1,62 +1,8 @@
/simpleiconsonethree [
-/wellfoundicon
-/wellsfargoicon
-/wemoicon
-/westerndigitalicon
-/westernunionicon
-/wetransfericon
-/weztermicon
-/wgpuicon
-/whatsappicon
-/wheniworkicon
-/wiiicon
-/wiiuicon
-/wikidataicon
-/wikidotggicon
-/wikidotjsicon
-/wikimediacommonsicon
-/wikimediafoundationicon
-/wikipediaicon
-/wikiquoteicon
-/wikivoyageicon
-/winampicon
-/windowsicon
-/windows10icon
-/windows95icon
-/windowsterminalicon
-/windowsxpicon
-/wiproicon
-/wireicon
-/wireguardicon
-/wiresharkicon
-/wiseicon
-/wishicon
-/wistiaicon
-/wixicon
-/wizzairicon
-/wolframicon
-/wolframlanguageicon
-/wolframmathematicaicon
-/wondershareicon
-/wondersharefilmoraicon
-/wooicon
-/woocommerceicon
-/wordpressicon
-/workplaceicon
-/worldhealthorganizationicon
-/wpengineicon
-/wpexplorericon
-/wprocketicon
-/writedotasicon
-/wweicon
-/wwiseicon
/wykopicon
/wyzeicon
/xicon
-/xamarinicon
-/xamlicon
/xamppicon
-/xboxicon
/xcodeicon
/xdadevelopersicon
/xdotorgicon
@@ -76,7 +22,6 @@
/yamahacorporationicon
/yamahamotorcorporationicon
/yamlicon
-/yammericon
/yandexcloudicon
/yarnicon
/ycombinatoricon
@@ -254,4 +199,59 @@
/.notdef
/.notdef
/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc
index eac1a81066f..25c47546a26 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc
@@ -1,48 +1,4 @@
/simpleiconsonetwo [
-/timescaleicon
-/tinaicon
-/tindericon
-/tindieicon
-/tinkercadicon
-/tinygradicon
-/tinylettericon
-/tistoryicon
-/tldrawicon
-/tmobileicon
-/tmuxicon
-/todoisticon
-/togglicon
-/toggltrackicon
-/tokyometroicon
-/tollicon
-/tomlicon
-/tomorrowlandicon
-/tonicon
-/topcodericon
-/topdotggicon
-/toptalicon
-/torbrowsericon
-/torprojecticon
-/toshibaicon
-/totvsicon
-/tourboxicon
-/towericon
-/toyotaicon
-/tplinkicon
-/tqdmicon
-/traccaricon
-/tradingviewicon
-/traefikmeshicon
-/traefikproxyicon
-/trailforksicon
-/trainerroadicon
-/trakticon
-/transifexicon
-/transmissionicon
-/transportforirelandicon
-/transportforlondonicon
-/travisciicon
-/treehouseicon
/trelloicon
/trendmicroicon
/treyarchicon
@@ -114,6 +70,7 @@
/unitedairlinesicon
/unitednationsicon
/unityicon
+/unjsicon
/unlicenseicon
/unocssicon
/unpkgicon
@@ -177,10 +134,6 @@
/virtualboxicon
/virustotalicon
/visaicon
-/visualbasicicon
-/visualstudioicon
-/visualstudioappcentericon
-/visualstudiocodeicon
/visxicon
/viteicon
/vitepressicon
@@ -243,6 +196,7 @@
/webexicon
/webflowicon
/webglicon
+/webgpuicon
/weblateicon
/webminicon
/webmoneyicon
@@ -255,4 +209,50 @@
/wegameicon
/weightsandbiasesicon
/welcometothejungleicon
+/wellfoundicon
+/wellsfargoicon
+/wemoicon
+/westerndigitalicon
+/westernunionicon
+/wetransfericon
+/weztermicon
+/wgpuicon
+/whatsappicon
+/wheniworkicon
+/wiiicon
+/wiiuicon
+/wikidataicon
+/wikidotggicon
+/wikidotjsicon
+/wikimediacommonsicon
+/wikimediafoundationicon
+/wikipediaicon
+/wikiquoteicon
+/wikivoyageicon
+/winampicon
+/wiproicon
+/wireicon
+/wireguardicon
+/wiresharkicon
+/wiseicon
+/wishicon
+/wistiaicon
+/wixicon
+/wizzairicon
+/wolframicon
+/wolframlanguageicon
+/wolframmathematicaicon
+/wondershareicon
+/wondersharefilmoraicon
+/wooicon
+/woocommerceicon
+/wordpressicon
+/workplaceicon
+/worldhealthorganizationicon
+/wpengineicon
+/wpexplorericon
+/wprocketicon
+/writedotasicon
+/wweicon
+/wwiseicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc
index d6277e5f7ab..99a27e3e86a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc
@@ -1,47 +1,4 @@
/simpleiconsonezero [
-/reactiveresumeicon
-/reactivexicon
-/reactosicon
-/reactqueryicon
-/reactroutericon
-/reacttableicon
-/readdotcvicon
-/readmeicon
-/readthedocsicon
-/realmicon
-/reasonicon
-/reasonstudiosicon
-/recoilicon
-/redicon
-/redashicon
-/redbubbleicon
-/redbullicon
-/redditicon
-/redhaticon
-/redhatopenshifticon
-/redisicon
-/redmineicon
-/redoxicon
-/reduxicon
-/reduxsagaicon
-/redwoodjsicon
-/reebokicon
-/refineicon
-/relayicon
-/relianceindustrieslimitedicon
-/remarkicon
-/remedyentertainmenticon
-/remixicon
-/removedotbgicon
-/renaulticon
-/rendericon
-/renovateboticon
-/renpyicon
-/renrenicon
-/repliticon
-/republicofgamersicon
-/rescripticon
-/rescuetimeicon
/researchgateicon
/resendicon
/resharpericon
@@ -238,8 +195,6 @@
/skodaicon
/skyicon
/skypackicon
-/skypeicon
-/skypeforbusinessicon
/skyrockicon
/slackicon
/slackwareicon
@@ -255,4 +210,49 @@
/smrticon
/smugmugicon
/snapchaticon
+/snapcrafticon
+/sncficon
+/snorticon
+/snowflakeicon
+/snowpackicon
+/snykicon
+/socialbladeicon
+/society6icon
+/socketdotioicon
+/softpediaicon
+/sogouicon
+/solanaicon
+/solidicon
+/solidityicon
+/sololearnicon
+/solusicon
+/sonaricon
+/sonarcloudicon
+/sonarlinticon
+/sonarqubeicon
+/sonarricon
+/sonatypeicon
+/songkickicon
+/songodaicon
+/sonicwallicon
+/sonosicon
+/sonyicon
+/sorianaicon
+/soundchartsicon
+/soundcloudicon
+/sourceengineicon
+/sourceforgeicon
+/sourcehuticon
+/sourcetreeicon
+/southwestairlinesicon
+/spacemacsicon
+/spaceshipicon
+/spacexicon
+/spacyicon
+/sparkaricon
+/sparkasseicon
+/sparkfunicon
+/sparkposticon
+/spdxicon
+/speakerdeckicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc
index 8745d7ba1bc..01e72955e49 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc
@@ -1,22 +1,4 @@
/simpleiconsseven [
-/lazarusicon
-/lazyvimicon
-/lbryicon
-/leaderpriceicon
-/leafleticon
-/leagueoflegendsicon
-/leanpubicon
-/leetcodeicon
-/legacygamesicon
-/leicaicon
-/lemmyicon
-/lemonsqueezyicon
-/lenovoicon
-/lensicon
-/leptosicon
-/lequipeicon
-/lernaicon
-/leroymerlinicon
/leslibrairesicon
/lessicon
/letsencrypticon
@@ -191,25 +173,6 @@
/microeditoricon
/microgeneticsicon
/micropythonicon
-/microsofticon
-/microsoftacademicicon
-/microsoftaccessicon
-/microsoftazureicon
-/microsoftbingicon
-/microsoftedgeicon
-/microsoftexcelicon
-/microsoftexchangeicon
-/microsoftonedriveicon
-/microsoftonenoteicon
-/microsoftoutlookicon
-/microsoftpowerpointicon
-/microsoftsharepointicon
-/microsoftsqlservericon
-/microsoftstoreicon
-/microsoftteamsicon
-/microsofttranslatoricon
-/microsoftvisioicon
-/microsoftwordicon
/microstationicon
/microstrategyicon
/midiicon
@@ -218,7 +181,6 @@
/milanoteicon
/milvusicon
/mindsicon
-/minecrafticon
/minetesticon
/miniicon
/minioicon
@@ -241,7 +203,6 @@
/modinicon
/modrinthicon
/modxicon
-/mojangstudiosicon
/moleculericon
/momenteoicon
/moneroicon
@@ -255,4 +216,43 @@
/monogameicon
/monoprixicon
/monstericon
+/monzoicon
+/mooicon
+/moodleicon
+/moonrepoicon
+/moqicon
+/moqupsicon
+/morrisonsicon
+/moscowmetroicon
+/motorolaicon
+/mozillaicon
+/mpvicon
+/mqtticon
+/msiicon
+/msibusinessicon
+/mtaicon
+/mtricon
+/mubiicon
+/muiicon
+/mulesofticon
+/mullericon
+/multisimicon
+/mumbleicon
+/muoicon
+/muralicon
+/musescoreicon
+/musicbrainzicon
+/mxlinuxicon
+/myanimelisticon
+/mygeticon
+/myobicon
+/myspaceicon
+/mysqlicon
+/n26icon
+/n8nicon
+/namebaseicon
+/namecheapicon
+/namemcicon
+/namesiloicon
+/namuwikiicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc
index ce24fae5d73..88585be9faa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc
@@ -1,19 +1,4 @@
/simpleiconssix [
-/hpicon
-/hsbcicon
-/html5icon
-/htmlacademyicon
-/htmxicon
-/htopicon
-/httpieicon
-/huaweiicon
-/hubspoticon
-/huggingfaceicon
-/hugoicon
-/humblebundleicon
-/hungryjacksicon
-/husqvarnaicon
-/hypericon
/hyperskillicon
/hypothesisicon
/hyprlandicon
@@ -23,9 +8,6 @@
/iataicon
/ibeaconicon
/iberiaicon
-/ibmicon
-/ibmcloudicon
-/ibmwatsonicon
/icedicon
/icelandicon
/icicibankicon
@@ -90,7 +72,6 @@
/intermarcheicon
/internetarchiveicon
/internetcomputericon
-/internetexplorericon
/intigritiicon
/intuiticon
/invisionicon
@@ -220,6 +201,7 @@
/kocicon
/kodakicon
/kodiicon
+/koenigseggicon
/kofaxicon
/kofiicon
/komooticon
@@ -255,4 +237,22 @@
/lastpassicon
/latexicon
/launchpadicon
+/lazarusicon
+/lazyvimicon
+/lbryicon
+/leaderpriceicon
+/leafleticon
+/leagueoflegendsicon
+/leanpubicon
+/leetcodeicon
+/legacygamesicon
+/leicaicon
+/lemmyicon
+/lemonsqueezyicon
+/lenovoicon
+/lensicon
+/leptosicon
+/lequipeicon
+/lernaicon
+/leroymerlinicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsthree.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsthree.enc
index 056e671d540..706cfff05d0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsthree.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsthree.enc
@@ -1,8 +1,4 @@
/simpleiconsthree [
-/chupachupsicon
-/ciliumicon
-/cinema4dicon
-/circleicon
/circleciicon
/circuitverseicon
/cirrusciicon
@@ -146,7 +142,6 @@
/cryengineicon
/cryptpadicon
/crystalicon
-/csharpicon
/css3icon
/cssdesignawardsicon
/cssmodulesicon
@@ -167,7 +162,6 @@
/daficon
/dailydotdevicon
/dailymotionicon
-/daimlericon
/daisyuiicon
/dapricon
/darkreadericon
@@ -185,7 +179,6 @@
/datagripicon
/dataikuicon
/datastaxicon
-/dataverseicon
/datefnsicon
/datevicon
/datocmsicon
@@ -219,7 +212,6 @@
/dependencycheckicon
/depositphotosicon
/derspiegelicon
-/designernewsicon
/deutschebahnicon
/deutschebankicon
/deutscheposticon
@@ -255,4 +247,12 @@
/dockericon
/docsdotrsicon
/docsifyicon
+/doctrineicon
+/docusaurusicon
+/dogecoinicon
+/doiicon
+/dolbyicon
+/doordashicon
+/dota2icon
+/dotenvicon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconstwo.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconstwo.enc
index 5d890dfb95b..7dc552afeea 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconstwo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconstwo.enc
@@ -44,11 +44,6 @@
/awssecretsmanagericon
/awwwardsicon
/axiosicon
-/azureartifactsicon
-/azuredataexplorericon
-/azuredevopsicon
-/azurefunctionsicon
-/azurepipelinesicon
/babelicon
/babelioicon
/babylondotjsicon
@@ -254,5 +249,10 @@
/chocolateyicon
/chromaticicon
/chromecasticon
+/chromewebstoreicon
/chryslericon
+/chupachupsicon
+/ciliumicon
+/cinema4dicon
+/circleicon
] def
diff --git a/Master/texmf-dist/fonts/map/dvips/gelasiomath/GelasioMath.map b/Master/texmf-dist/fonts/map/dvips/gelasiomath/GelasioMath.map
new file mode 100644
index 00000000000..60938407c4e
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/gelasiomath/GelasioMath.map
@@ -0,0 +1,4 @@
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
index fecfbc2cb7b..50a1f659474 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
@@ -10680,6 +10680,11 @@ GaramondLibre-Regular-sup-t1--base GaramondLibre-Regular " AutoEnc_wkdlc77kkm5gx
GaramondLibre-Regular-sup-t2a GaramondLibre-Regular " AutoEnc_y75trcdjmjxcjj4wfzzyxacoye ReEncodeFont " <[grmlbr_y75trc.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2b GaramondLibre-Regular " AutoEnc_af3fmk7furqbz6algofaeeeujh ReEncodeFont " <[grmlbr_af3fmk.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2c GaramondLibre-Regular " AutoEnc_6l5pxogsiubowbnn4oh47tlyuf ReEncodeFont " <[grmlbr_6l5pxo.enc <GaramondLibre-Regular.pfb
+% GelasioMath.map
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
% GotIn.map
GotIn GotischeInitialen <GotIn.pfb
% GoudyIn.map
@@ -11583,21 +11588,21 @@ Junicode-Bold-inf-ot1 Junicode-Bold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Bold-inf-t1--base Junicode-Bold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-lf-lgr Junicode-Bold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ly1 Junicode-Bold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-lgr Junicode-Bold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ly1--base Junicode-Bold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ot1--base Junicode-Bold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-t1--base Junicode-Bold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-osf-lgr Junicode-Bold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ly1--base Junicode-Bold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ot1--base Junicode-Bold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-t1--base Junicode-Bold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-sup-lgr Junicode-Bold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-sup-ly1 Junicode-Bold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Bold.pfb
@@ -11605,65 +11610,65 @@ Junicode-Bold-sup-ot1 Junicode-Bold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Bold-sup-t1--base Junicode-Bold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-lgr Junicode-Bold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ly1 Junicode-Bold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ot1--base Junicode-Bold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-t1--base Junicode-Bold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-lgr Junicode-Bold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-lgr Junicode-Bold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ly1--base Junicode-Bold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ot1--base Junicode-Bold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-t1--base Junicode-Bold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ly1 Junicode-BoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ot1 Junicode-BoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-t1--base Junicode-BoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-lgr Junicode-BoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1--base Junicode-BoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ly1--base Junicode-BoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ot1--base Junicode-BoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-t1--base Junicode-BoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-lgr Junicode-BoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ot1--base Junicode-BoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ot1 Junicode-BoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-lgr Junicode-BoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ly1 Junicode-BoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ot1 Junicode-BoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-t1--base Junicode-BoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-lgr Junicode-BoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ot1--base Junicode-BoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ot1 Junicode-BoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ot1--base Junicode-BoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-lgr Junicode-BoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ot1--base Junicode-BoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-lgr Junicode-BoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ly1--base Junicode-BoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-t1--base Junicode-BoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-Cond-inf-lgr Junicode-Cond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Cond.pfb
@@ -11671,21 +11676,21 @@ Junicode-Cond-inf-ot1 Junicode-Cond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Cond-inf-t1--base Junicode-Cond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-lf-lgr Junicode-Cond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ly1 Junicode-Cond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-lgr Junicode-Cond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ly1--base Junicode-Cond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ot1--base Junicode-Cond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-t1--base Junicode-Cond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-osf-lgr Junicode-Cond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ly1--base Junicode-Cond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ot1--base Junicode-Cond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-t1--base Junicode-Cond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-sup-lgr Junicode-Cond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-sup-ly1 Junicode-Cond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Cond.pfb
@@ -11693,65 +11698,65 @@ Junicode-Cond-sup-ot1 Junicode-Cond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Cond-sup-t1--base Junicode-Cond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-lgr Junicode-Cond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ly1 Junicode-Cond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ot1--base Junicode-Cond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-t1--base Junicode-Cond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-lgr Junicode-Cond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-lgr Junicode-Cond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ly1--base Junicode-Cond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ot1--base Junicode-Cond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-t1--base Junicode-Cond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ly1 Junicode-CondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ot1 Junicode-CondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-t1--base Junicode-CondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-lgr Junicode-CondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1--base Junicode-CondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ly1--base Junicode-CondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ot1--base Junicode-CondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-t1--base Junicode-CondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-lgr Junicode-CondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ot1--base Junicode-CondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ot1 Junicode-CondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ot1--base Junicode-CondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-lgr Junicode-CondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ly1 Junicode-CondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ot1 Junicode-CondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-t1--base Junicode-CondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-lgr Junicode-CondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ot1--base Junicode-CondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ot1 Junicode-CondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ot1--base Junicode-CondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-lgr Junicode-CondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ot1--base Junicode-CondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ot1 Junicode-CondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-lgr Junicode-CondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ly1--base Junicode-CondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ot1--base Junicode-CondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-t1--base Junicode-CondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondLight.pfb
@@ -11759,21 +11764,21 @@ Junicode-CondLight-inf-ot1 Junicode-CondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-CondLight-inf-t1--base Junicode-CondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-lgr Junicode-CondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ly1 Junicode-CondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-lgr Junicode-CondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ly1--base Junicode-CondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ot1--base Junicode-CondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-t1--base Junicode-CondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-lgr Junicode-CondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ot1--base Junicode-CondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-t1--base Junicode-CondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-lgr Junicode-CondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-ly1 Junicode-CondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondLight.pfb
@@ -11781,65 +11786,65 @@ Junicode-CondLight-sup-ot1 Junicode-CondLight " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-CondLight-sup-t1--base Junicode-CondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-lgr Junicode-CondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ly1 Junicode-CondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ot1--base Junicode-CondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-lgr Junicode-CondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-lgr Junicode-CondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ly1--base Junicode-CondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ot1--base Junicode-CondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-t1--base Junicode-CondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ly1 Junicode-CondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ot1 Junicode-CondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-t1--base Junicode-CondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1--base Junicode-CondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-t1--base Junicode-CondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-lgr Junicode-CondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ot1--base Junicode-CondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ly1 Junicode-CondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ot1 Junicode-CondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-t1--base Junicode-CondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-lgr Junicode-CondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ot1--base Junicode-CondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ot1 Junicode-CondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-lgr Junicode-CondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ot1--base Junicode-CondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-lgr Junicode-CondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-t1--base Junicode-CondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondMedium.pfb
@@ -11847,21 +11852,21 @@ Junicode-CondMedium-inf-ot1 Junicode-CondMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3p
Junicode-CondMedium-inf-t1--base Junicode-CondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-lgr Junicode-CondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ly1 Junicode-CondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ly1--base Junicode-CondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ot1--base Junicode-CondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-t1--base Junicode-CondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-lgr Junicode-CondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ot1--base Junicode-CondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-lgr Junicode-CondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-ly1 Junicode-CondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondMedium.pfb
@@ -11869,65 +11874,65 @@ Junicode-CondMedium-sup-ot1 Junicode-CondMedium " AutoEnc_ilb24pr2hmz3ktady5tx53
Junicode-CondMedium-sup-t1--base Junicode-CondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-lgr Junicode-CondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ly1 Junicode-CondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ot1--base Junicode-CondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-lgr Junicode-CondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-lgr Junicode-CondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ly1--base Junicode-CondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ot1--base Junicode-CondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-t1--base Junicode-CondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ly1 Junicode-CondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ot1 Junicode-CondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-t1--base Junicode-CondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1--base Junicode-CondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-lgr Junicode-CondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ot1--base Junicode-CondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ly1 Junicode-CondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ot1 Junicode-CondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-t1--base Junicode-CondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-lgr Junicode-CondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ot1--base Junicode-CondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ot1 Junicode-CondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-lgr Junicode-CondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ot1--base Junicode-CondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-lgr Junicode-CondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-Exp-inf-lgr Junicode-Exp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Exp.pfb
@@ -11935,21 +11940,21 @@ Junicode-Exp-inf-ot1 Junicode-Exp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeF
Junicode-Exp-inf-t1--base Junicode-Exp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-lf-lgr Junicode-Exp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ly1 Junicode-Exp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-lgr Junicode-Exp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ly1--base Junicode-Exp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ot1--base Junicode-Exp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-t1--base Junicode-Exp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-osf-lgr Junicode-Exp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ly1--base Junicode-Exp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ot1--base Junicode-Exp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-t1--base Junicode-Exp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-sup-lgr Junicode-Exp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-sup-ly1 Junicode-Exp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Exp.pfb
@@ -11957,21 +11962,21 @@ Junicode-Exp-sup-ot1 Junicode-Exp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeF
Junicode-Exp-sup-t1--base Junicode-Exp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-lgr Junicode-Exp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ly1 Junicode-Exp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ot1--base Junicode-Exp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-t1--base Junicode-Exp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-lgr Junicode-Exp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-lgr Junicode-Exp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ly1--base Junicode-Exp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ot1--base Junicode-Exp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-t1--base Junicode-Exp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpBold.pfb
@@ -11979,21 +11984,21 @@ Junicode-ExpBold-inf-ot1 Junicode-ExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-ExpBold-inf-t1--base Junicode-ExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-lgr Junicode-ExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ly1 Junicode-ExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ly1--base Junicode-ExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ot1--base Junicode-ExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-t1--base Junicode-ExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-lgr Junicode-ExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ot1--base Junicode-ExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-lgr Junicode-ExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-ly1 Junicode-ExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpBold.pfb
@@ -12001,109 +12006,109 @@ Junicode-ExpBold-sup-ot1 Junicode-ExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-ExpBold-sup-t1--base Junicode-ExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-lgr Junicode-ExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ly1 Junicode-ExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ot1--base Junicode-ExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-lgr Junicode-ExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-lgr Junicode-ExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ly1--base Junicode-ExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ot1--base Junicode-ExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-t1--base Junicode-ExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ly1 Junicode-ExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ot1 Junicode-ExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-t1--base Junicode-ExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1--base Junicode-ExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-lgr Junicode-ExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ot1--base Junicode-ExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ly1 Junicode-ExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ot1 Junicode-ExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-t1--base Junicode-ExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-lgr Junicode-ExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ot1--base Junicode-ExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ot1 Junicode-ExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-lgr Junicode-ExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ot1--base Junicode-ExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ly1 Junicode-ExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ot1 Junicode-ExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-t1--base Junicode-ExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-lgr Junicode-ExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1--base Junicode-ExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ly1--base Junicode-ExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ot1--base Junicode-ExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-t1--base Junicode-ExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-lgr Junicode-ExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ot1--base Junicode-ExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-lgr Junicode-ExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ly1 Junicode-ExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ot1 Junicode-ExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-t1--base Junicode-ExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-lgr Junicode-ExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ot1--base Junicode-ExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ot1 Junicode-ExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ot1--base Junicode-ExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-lgr Junicode-ExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ot1--base Junicode-ExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-lgr Junicode-ExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ly1--base Junicode-ExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-t1--base Junicode-ExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
@@ -12111,21 +12116,21 @@ Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-lgr Junicode-ExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ly1--base Junicode-ExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ot1--base Junicode-ExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-t1--base Junicode-ExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-lgr Junicode-ExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-lgr Junicode-ExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
@@ -12133,65 +12138,65 @@ Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-lgr Junicode-ExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ly1 Junicode-ExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ot1--base Junicode-ExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-lgr Junicode-ExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-lgr Junicode-ExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ly1--base Junicode-ExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-t1--base Junicode-ExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ly1 Junicode-ExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ot1 Junicode-ExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-t1--base Junicode-ExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1--base Junicode-ExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-lgr Junicode-ExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ot1--base Junicode-ExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ly1 Junicode-ExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ot1 Junicode-ExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-t1--base Junicode-ExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-lgr Junicode-ExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ot1--base Junicode-ExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ot1 Junicode-ExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-lgr Junicode-ExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ot1--base Junicode-ExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
@@ -12199,21 +12204,21 @@ Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-t1--base Junicode-ExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-lgr Junicode-ExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
@@ -12221,109 +12226,109 @@ Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-lgr Junicode-ExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ly1 Junicode-ExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-lgr Junicode-ExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-lgr Junicode-ExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-t1--base Junicode-ExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-lgr Junicode-ExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ly1 Junicode-ExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ot1 Junicode-ExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-lgr Junicode-ExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-lgr Junicode-ExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-Italic-inf-lgr Junicode-Italic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ly1 Junicode-Italic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ot1 Junicode-Italic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-Italic.pfb
Junicode-Italic-inf-t1--base Junicode-Italic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-Italic.pfb
Junicode-Italic-lf-lgr Junicode-Italic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1--base Junicode-Italic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-lgr Junicode-Italic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ly1--base Junicode-Italic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ot1--base Junicode-Italic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-t1--base Junicode-Italic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-Italic.pfb
Junicode-Italic-lf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-osf-lgr Junicode-Italic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ot1--base Junicode-Italic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ot1 Junicode-Italic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ly1--base Junicode-Italic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ot1--base Junicode-Italic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-t1--base Junicode-Italic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-sup-lgr Junicode-Italic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ly1 Junicode-Italic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ot1 Junicode-Italic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-Italic.pfb
Junicode-Italic-sup-t1--base Junicode-Italic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-lgr Junicode-Italic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ot1--base Junicode-Italic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ot1 Junicode-Italic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ot1--base Junicode-Italic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-t1--base Junicode-Italic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-lgr Junicode-Italic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ot1--base Junicode-Italic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ot1 Junicode-Italic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-lgr Junicode-Italic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ly1--base Junicode-Italic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ot1--base Junicode-Italic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-t1--base Junicode-Italic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Light-inf-lgr Junicode-Light " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Light.pfb
@@ -12331,21 +12336,21 @@ Junicode-Light-inf-ot1 Junicode-Light " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-Light-inf-t1--base Junicode-Light " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-lf-lgr Junicode-Light " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Light.pfb
Junicode-Light-lf-ly1 Junicode-Light " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-lgr Junicode-Light " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ly1--base Junicode-Light " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ot1--base Junicode-Light " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-t1--base Junicode-Light " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Light.pfb
Junicode-Light-lf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-osf-lgr Junicode-Light " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Light.pfb
-Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Light.pfb
+Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ly1--base Junicode-Light " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ot1--base Junicode-Light " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-t1--base Junicode-Light " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Light.pfb
-Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Light.pfb
+Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-sup-lgr Junicode-Light " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-sup-ly1 Junicode-Light " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Light.pfb
@@ -12353,65 +12358,65 @@ Junicode-Light-sup-ot1 Junicode-Light " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-Light-sup-t1--base Junicode-Light " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Light.pfb
Junicode-Light-tlf-lgr Junicode-Light " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Light.pfb
Junicode-Light-tlf-ly1 Junicode-Light " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Light.pfb
-Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Light.pfb
+Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ly1--base Junicode-Light " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ot1--base Junicode-Light " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-t1--base Junicode-Light " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Light.pfb
-Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Light.pfb
+Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-Light-tosf-lgr Junicode-Light " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Light.pfb
-Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Light.pfb
+Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-lgr Junicode-Light " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ly1--base Junicode-Light " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ot1--base Junicode-Light " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-t1--base Junicode-Light " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Light.pfb
-Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Light.pfb
+Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ly1 Junicode-LightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ot1 Junicode-LightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-t1--base Junicode-LightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-lgr Junicode-LightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1--base Junicode-LightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ly1--base Junicode-LightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ot1--base Junicode-LightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-t1--base Junicode-LightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-lgr Junicode-LightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ot1--base Junicode-LightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ot1 Junicode-LightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ot1--base Junicode-LightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-lgr Junicode-LightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ly1 Junicode-LightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ot1 Junicode-LightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-t1--base Junicode-LightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-lgr Junicode-LightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ot1--base Junicode-LightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ot1 Junicode-LightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ot1--base Junicode-LightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-lgr Junicode-LightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ot1--base Junicode-LightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ot1 Junicode-LightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-lgr Junicode-LightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ly1--base Junicode-LightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ot1--base Junicode-LightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-t1--base Junicode-LightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-Medium-inf-lgr Junicode-Medium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Medium.pfb
@@ -12419,21 +12424,21 @@ Junicode-Medium-inf-ot1 Junicode-Medium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-Medium-inf-t1--base Junicode-Medium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-lf-lgr Junicode-Medium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ly1 Junicode-Medium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-lgr Junicode-Medium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ly1--base Junicode-Medium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ot1--base Junicode-Medium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-t1--base Junicode-Medium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-osf-lgr Junicode-Medium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ly1--base Junicode-Medium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ot1--base Junicode-Medium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-t1--base Junicode-Medium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-sup-lgr Junicode-Medium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-sup-ly1 Junicode-Medium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Medium.pfb
@@ -12441,65 +12446,65 @@ Junicode-Medium-sup-ot1 Junicode-Medium " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-Medium-sup-t1--base Junicode-Medium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-lgr Junicode-Medium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ly1 Junicode-Medium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ot1--base Junicode-Medium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-t1--base Junicode-Medium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-lgr Junicode-Medium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-lgr Junicode-Medium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ly1--base Junicode-Medium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ot1--base Junicode-Medium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-t1--base Junicode-Medium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ly1 Junicode-MediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ot1 Junicode-MediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-t1--base Junicode-MediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-lgr Junicode-MediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1--base Junicode-MediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ly1--base Junicode-MediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ot1--base Junicode-MediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-t1--base Junicode-MediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-lgr Junicode-MediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ot1--base Junicode-MediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-lgr Junicode-MediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ly1 Junicode-MediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ot1 Junicode-MediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-t1--base Junicode-MediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-lgr Junicode-MediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ot1--base Junicode-MediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ot1 Junicode-MediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ot1--base Junicode-MediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-lgr Junicode-MediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ot1--base Junicode-MediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-lgr Junicode-MediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ly1--base Junicode-MediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-t1--base Junicode-MediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-Regular-inf-lgr Junicode-Regular " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Regular.pfb
@@ -12507,21 +12512,21 @@ Junicode-Regular-inf-ot1 Junicode-Regular " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-Regular-inf-t1--base Junicode-Regular " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-lf-lgr Junicode-Regular " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ly1 Junicode-Regular " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-lgr Junicode-Regular " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ly1--base Junicode-Regular " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ot1--base Junicode-Regular " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-t1--base Junicode-Regular " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-osf-lgr Junicode-Regular " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ly1--base Junicode-Regular " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ot1--base Junicode-Regular " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-t1--base Junicode-Regular " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-sup-lgr Junicode-Regular " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-sup-ly1 Junicode-Regular " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Regular.pfb
@@ -12529,21 +12534,21 @@ Junicode-Regular-sup-ot1 Junicode-Regular " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-Regular-sup-t1--base Junicode-Regular " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-lgr Junicode-Regular " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ly1 Junicode-Regular " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ot1--base Junicode-Regular " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-t1--base Junicode-Regular " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-lgr Junicode-Regular " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-lgr Junicode-Regular " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ly1--base Junicode-Regular " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ot1--base Junicode-Regular " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-t1--base Junicode-Regular " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmBold.pfb
@@ -12551,21 +12556,21 @@ Junicode-SmBold-inf-ot1 Junicode-SmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmBold-inf-t1--base Junicode-SmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-lgr Junicode-SmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ly1 Junicode-SmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-lgr Junicode-SmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ly1--base Junicode-SmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ot1--base Junicode-SmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-t1--base Junicode-SmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-lgr Junicode-SmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ot1--base Junicode-SmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-t1--base Junicode-SmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-lgr Junicode-SmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-ly1 Junicode-SmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmBold.pfb
@@ -12573,65 +12578,65 @@ Junicode-SmBold-sup-ot1 Junicode-SmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmBold-sup-t1--base Junicode-SmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-lgr Junicode-SmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ly1 Junicode-SmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ot1--base Junicode-SmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-lgr Junicode-SmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-lgr Junicode-SmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ly1--base Junicode-SmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ot1--base Junicode-SmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-t1--base Junicode-SmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ly1 Junicode-SmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ot1 Junicode-SmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-t1--base Junicode-SmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1--base Junicode-SmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-lgr Junicode-SmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ot1--base Junicode-SmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ly1 Junicode-SmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ot1 Junicode-SmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-t1--base Junicode-SmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-lgr Junicode-SmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ot1--base Junicode-SmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ot1 Junicode-SmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-lgr Junicode-SmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ot1--base Junicode-SmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-lgr Junicode-SmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCond.pfb
@@ -12639,21 +12644,21 @@ Junicode-SmCond-inf-ot1 Junicode-SmCond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmCond-inf-t1--base Junicode-SmCond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-lgr Junicode-SmCond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ly1 Junicode-SmCond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-lgr Junicode-SmCond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ly1--base Junicode-SmCond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ot1--base Junicode-SmCond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-t1--base Junicode-SmCond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-lgr Junicode-SmCond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ot1--base Junicode-SmCond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-t1--base Junicode-SmCond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-lgr Junicode-SmCond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-ly1 Junicode-SmCond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCond.pfb
@@ -12661,65 +12666,65 @@ Junicode-SmCond-sup-ot1 Junicode-SmCond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmCond-sup-t1--base Junicode-SmCond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-lgr Junicode-SmCond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ly1 Junicode-SmCond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ot1--base Junicode-SmCond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-lgr Junicode-SmCond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-lgr Junicode-SmCond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ly1--base Junicode-SmCond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ot1--base Junicode-SmCond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-t1--base Junicode-SmCond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ly1 Junicode-SmCondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ot1 Junicode-SmCondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-t1--base Junicode-SmCondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1--base Junicode-SmCondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-t1--base Junicode-SmCondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-lgr Junicode-SmCondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ot1--base Junicode-SmCondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ly1 Junicode-SmCondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ot1 Junicode-SmCondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-t1--base Junicode-SmCondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-lgr Junicode-SmCondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ot1--base Junicode-SmCondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ot1 Junicode-SmCondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-lgr Junicode-SmCondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ot1--base Junicode-SmCondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-lgr Junicode-SmCondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-t1--base Junicode-SmCondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
@@ -12727,21 +12732,21 @@ Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-lgr Junicode-SmCondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ly1--base Junicode-SmCondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ot1--base Junicode-SmCondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-t1--base Junicode-SmCondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-lgr Junicode-SmCondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-lgr Junicode-SmCondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
@@ -12749,65 +12754,65 @@ Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-lgr Junicode-SmCondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ly1 Junicode-SmCondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ot1--base Junicode-SmCondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-lgr Junicode-SmCondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-lgr Junicode-SmCondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ly1--base Junicode-SmCondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-t1--base Junicode-SmCondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ly1 Junicode-SmCondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ot1 Junicode-SmCondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-t1--base Junicode-SmCondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1--base Junicode-SmCondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-lgr Junicode-SmCondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ot1--base Junicode-SmCondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ly1 Junicode-SmCondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ot1 Junicode-SmCondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-t1--base Junicode-SmCondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-lgr Junicode-SmCondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ot1--base Junicode-SmCondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ot1 Junicode-SmCondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-lgr Junicode-SmCondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ot1--base Junicode-SmCondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
@@ -12815,21 +12820,21 @@ Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium " AutoEnc_ldcvmrfllg5ebu6xfr
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-t1--base Junicode-SmCondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-lgr Junicode-SmCondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
@@ -12837,65 +12842,65 @@ Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium " AutoEnc_ilb24pr2hmz3ktady5
Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-lgr Junicode-SmCondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ly1 Junicode-SmCondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-lgr Junicode-SmCondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-lgr Junicode-SmCondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-t1--base Junicode-SmCondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ly1 Junicode-SmCondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ot1 Junicode-SmCondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-t1--base Junicode-SmCondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-lgr Junicode-SmCondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ly1 Junicode-SmCondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ot1 Junicode-SmCondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-t1--base Junicode-SmCondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-lgr Junicode-SmCondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ot1 Junicode-SmCondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-lgr Junicode-SmCondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmExp-inf-lgr Junicode-SmExp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
Junicode-SmExp-inf-ly1 Junicode-SmExp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExp.pfb
@@ -12903,21 +12908,21 @@ Junicode-SmExp-inf-ot1 Junicode-SmExp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-SmExp-inf-t1--base Junicode-SmExp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-lgr Junicode-SmExp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ly1 Junicode-SmExp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-lgr Junicode-SmExp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ly1--base Junicode-SmExp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ot1--base Junicode-SmExp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-t1--base Junicode-SmExp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-lgr Junicode-SmExp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ot1--base Junicode-SmExp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-t1--base Junicode-SmExp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-lgr Junicode-SmExp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-ly1 Junicode-SmExp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExp.pfb
@@ -12925,21 +12930,21 @@ Junicode-SmExp-sup-ot1 Junicode-SmExp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-SmExp-sup-t1--base Junicode-SmExp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-lgr Junicode-SmExp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ot1--base Junicode-SmExp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-lgr Junicode-SmExp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ot1--base Junicode-SmExp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
@@ -12947,21 +12952,21 @@ Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-lgr Junicode-SmExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ly1--base Junicode-SmExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ot1--base Junicode-SmExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-t1--base Junicode-SmExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-lgr Junicode-SmExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-lgr Junicode-SmExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
@@ -12969,109 +12974,109 @@ Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-lgr Junicode-SmExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ly1 Junicode-SmExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ot1--base Junicode-SmExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-lgr Junicode-SmExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-lgr Junicode-SmExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ly1--base Junicode-SmExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-t1--base Junicode-SmExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ly1 Junicode-SmExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ot1 Junicode-SmExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-t1--base Junicode-SmExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-lgr Junicode-SmExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ly1 Junicode-SmExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ot1 Junicode-SmExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-t1--base Junicode-SmExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-lgr Junicode-SmExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ot1 Junicode-SmExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-lgr Junicode-SmExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ly1 Junicode-SmExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ot1 Junicode-SmExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-t1--base Junicode-SmExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1--base Junicode-SmExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-t1--base Junicode-SmExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-lgr Junicode-SmExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ot1--base Junicode-SmExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ly1 Junicode-SmExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ot1 Junicode-SmExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-t1--base Junicode-SmExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-lgr Junicode-SmExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ot1--base Junicode-SmExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ot1 Junicode-SmExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-lgr Junicode-SmExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ot1--base Junicode-SmExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-lgr Junicode-SmExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-t1--base Junicode-SmExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
@@ -13079,21 +13084,21 @@ Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-t1--base Junicode-SmExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-lgr Junicode-SmExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
@@ -13101,65 +13106,65 @@ Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-lgr Junicode-SmExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-lgr Junicode-SmExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ly1 Junicode-SmExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ot1 Junicode-SmExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-t1--base Junicode-SmExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-lgr Junicode-SmExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ly1 Junicode-SmExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ot1 Junicode-SmExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-t1--base Junicode-SmExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-lgr Junicode-SmExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-lgr Junicode-SmExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
@@ -13167,21 +13172,21 @@ Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-lgr Junicode-SmExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
@@ -13189,65 +13194,65 @@ Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-lgr Junicode-SmExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-lgr Junicode-SmExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
% Kinigcap.map
Kinigcap KinigsteinCaps <Kinigcap.pfb
@@ -18498,10 +18503,10 @@ XCharter-Bold-lf-ot1 XCharter-Bold " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEncode
XCharter-Bold-lf-sc-ly1--base XCharter-Bold " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-ot1--base XCharter-Bold " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t1--base XCharter-Bold " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t2asrb--base XCharter-Bold " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t1--base XCharter-Bold " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t2asrb XCharter-Bold " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ly1--base XCharter-Bold " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ot1 XCharter-Bold " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Bold.pfb
@@ -18511,15 +18516,15 @@ XCharter-Bold-osf-ot1 XCharter-Bold " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReEncod
XCharter-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t1--base XCharter-Bold " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t2asrb XCharter-Bold " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ly1--base XCharter-Bold " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ot1 XCharter-Bold " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t1--base XCharter-Bold " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Bold.pfb
+XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t2asrb XCharter-Bold " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ly1--base XCharter-Bold " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ot1 XCharter-Bold " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Bold.pfb
@@ -18527,20 +18532,20 @@ XCharter-Bold-tlf-ot2 XCharter-Bold " xcharterOT2enc ReEncodeFont " <[xcharter-o
XCharter-Bold-tlf-sc-ly1--base XCharter-Bold " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-ot1--base XCharter-Bold " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t1--base XCharter-Bold " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t2asrb--base XCharter-Bold " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t1--base XCharter-Bold " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t2asrb XCharter-Bold " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ly1--base XCharter-Bold " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ot1 XCharter-Bold " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t1--base XCharter-Bold " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t2asrb XCharter-Bold " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Bold.pfb
XCharter-Bold-ts1--base XCharter-Bold " AutoEnc_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch_z3wvjz.enc <XCharter-Bold.pfb
XCharter-BoldItalic-dnom-ly1--base XCharter-BoldItalic " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldItalic.pfb
@@ -18554,10 +18559,10 @@ XCharter-BoldItalic-lf-ot1 XCharter-BoldItalic " AutoEnc_ru4hosnl6h5ukcp2w3tt2ie
XCharter-BoldItalic-lf-sc-ly1--base XCharter-BoldItalic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-ot1--base XCharter-BoldItalic " AutoEnc_7qcosniepdkkhq2lidq32xyajh ReEncodeFont " <[xch_7qcosn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t1--base XCharter-BoldItalic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t1--base XCharter-BoldItalic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t2asrb XCharter-BoldItalic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ly1--base XCharter-BoldItalic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ot1 XCharter-BoldItalic " AutoEnc_qs7dmbcmqkgbo6666jibzn77ta ReEncodeFont " <[xch_qs7dmb.enc <XCharter-BoldItalic.pfb
@@ -18567,15 +18572,15 @@ XCharter-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc_aegaiust5jvuyf74wgreek
XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ot1 XCharter-BoldItalic " AutoEnc_gkuln73auq7qfnbajjeh66tiyg ReEncodeFont " <[xch_gkuln7.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t2asrb XCharter-BoldItalic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ot1 XCharter-BoldItalic " AutoEnc_lfc2esxm2njp63bgoww5uifspg ReEncodeFont " <[xch_lfc2es.enc <XCharter-BoldItalic.pfb
@@ -18583,20 +18588,20 @@ XCharter-BoldItalic-tlf-ot2 XCharter-BoldItalic " xcharterOT2enc ReEncodeFont "
XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jffewfvsu3e3ihebccixpovvra ReEncodeFont " <[xch_jffewf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t2asrb XCharter-BoldItalic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter-BoldSlanted-dnom-ly1--base XCharter-BoldSlanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldSlanted.pfb
@@ -18610,10 +18615,10 @@ XCharter-BoldSlanted-lf-ot1 XCharter-BoldSlanted " AutoEnc_aoa5sqhsbxws2dsjkwdeq
XCharter-BoldSlanted-lf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t1--base XCharter-BoldSlanted " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t1--base XCharter-BoldSlanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t2asrb XCharter-BoldSlanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ly1--base XCharter-BoldSlanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ot1 XCharter-BoldSlanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-BoldSlanted.pfb
@@ -18623,15 +18628,15 @@ XCharter-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc_g2zr6i3czinzql75wmpz
XCharter-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ly1--base XCharter-BoldSlanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ot1 XCharter-BoldSlanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t1--base XCharter-BoldSlanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t2asrb XCharter-BoldSlanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ly1--base XCharter-BoldSlanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ot1 XCharter-BoldSlanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-BoldSlanted.pfb
@@ -18639,20 +18644,20 @@ XCharter-BoldSlanted-tlf-ot2 XCharter-BoldSlanted " xcharterOT2enc ReEncodeFont
XCharter-BoldSlanted-tlf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t1--base XCharter-BoldSlanted " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t1--base XCharter-BoldSlanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t2asrb XCharter-BoldSlanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter-Ita-alph XCharter-Italic " chalphEncoding ReEncodeFont " <[chalph.enc <XCharter-Italic.pfb
@@ -18667,10 +18672,10 @@ XCharter-Italic-lf-ot1 XCharter-Italic " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEn
XCharter-Italic-lf-sc-ly1--base XCharter-Italic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-ot1--base XCharter-Italic " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t1--base XCharter-Italic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t2asrb--base XCharter-Italic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t1--base XCharter-Italic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t2asrb XCharter-Italic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ly1--base XCharter-Italic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ot1 XCharter-Italic " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Italic.pfb
@@ -18680,15 +18685,15 @@ XCharter-Italic-osf-ot1 XCharter-Italic " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReE
XCharter-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t1--base XCharter-Italic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t2asrb XCharter-Italic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ly1--base XCharter-Italic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ot1 XCharter-Italic " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t1--base XCharter-Italic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Italic.pfb
+XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t2asrb XCharter-Italic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ly1--base XCharter-Italic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ot1 XCharter-Italic " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Italic.pfb
@@ -18696,20 +18701,20 @@ XCharter-Italic-tlf-ot2 XCharter-Italic " xcharterOT2enc ReEncodeFont " <[xchart
XCharter-Italic-tlf-sc-ly1--base XCharter-Italic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-ot1--base XCharter-Italic " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t1--base XCharter-Italic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t2asrb--base XCharter-Italic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t1--base XCharter-Italic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t2asrb XCharter-Italic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ly1--base XCharter-Italic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ot1 XCharter-Italic " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t1--base XCharter-Italic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t2asrb XCharter-Italic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-Italic.pfb
XCharter-Italic-ts1--base XCharter-Italic " AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch_pqp4df.enc <XCharter-Italic.pfb
XCharter-Roman-dnom-ly1--base XCharter-Roman " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Roman.pfb
@@ -18723,12 +18728,12 @@ XCharter-Roman-lf-ot1 XCharter-Roman " AutoEnc_bbupxqigkbffslxhtvjmz5qdhb ReEnco
XCharter-Roman-lf-sc-ly1--base XCharter-Roman " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-ot1--base XCharter-Roman " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t1--base XCharter-Roman " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t2asrb--base XCharter-Roman " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t1--base XCharter-Roman " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_6ckksab4xgup3cfdzppakccfch ReEncodeFont " <[xch_6ckksa.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_ajf4qeyyzlwr22lxwfvdvytw4h ReEncodeFont " <[xch_ajf4qe.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t2asrb XCharter-Roman " AutoEnc_2ne5ras2ihnhgxt43rxslgjvce ReEncodeFont " <[xch_2ne5ra.enc <XCharter-Roman.pfb
-XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Roman.pfb
+XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_du7eesfjv53g5kmcdg53pxaz6g ReEncodeFont " <[xch_du7ees.enc <XCharter-Roman.pfb
XCharter-Roman-numr-ot1 XCharter-Roman " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Roman.pfb
XCharter-Roman-numr-t1--base XCharter-Roman " AutoEnc_aw3womsecdumtuxvl6hik6fs3a ReEncodeFont " <[xch_aw3wom.enc <XCharter-Roman.pfb
XCharter-Roman-osf-ly1--base XCharter-Roman " AutoEnc_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch_5xvt3q.enc <XCharter-Roman.pfb
@@ -18736,15 +18741,15 @@ XCharter-Roman-osf-ot1 XCharter-Roman " AutoEnc_ylqpprchpltakubnfx2ql7fllf ReEnc
XCharter-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t1--base XCharter-Roman " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch_cjimfy.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch_5b6tid.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t2asrb XCharter-Roman " AutoEnc_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch_2itbay.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ly1--base XCharter-Roman " AutoEnc_ukw3hq7h3prn34ryh2qktyrkse ReEncodeFont " <[xch_ukw3hq.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ot1 XCharter-Roman " AutoEnc_dhwwz5gerbpejovfe253unwxde ReEncodeFont " <[xch_dhwwz5.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t1--base XCharter-Roman " AutoEnc_6hzluovfqgqjqwjosfm7uze3oh ReEncodeFont " <[xch_6hzluo.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_pz3lxgt2tnxz7p6istzozn734g ReEncodeFont " <[xch_pz3lxg.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_7rlj4vy6adeoxbzopcxh2vadqb ReEncodeFont " <[xch_7rlj4v.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t2asrb XCharter-Roman " AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf ReEncodeFont " <[xch_vyhv3k.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ly1--base XCharter-Roman " AutoEnc_worivip5whk4cqev33dw4cszae ReEncodeFont " <[xch_worivi.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ot1 XCharter-Roman " AutoEnc_3glltskulaq25sg7bdv2b6v7sb ReEncodeFont " <[xch_3gllts.enc <XCharter-Roman.pfb
@@ -18752,20 +18757,20 @@ XCharter-Roman-tlf-ot2 XCharter-Roman " xcharterOT2enc ReEncodeFont " <[xcharter
XCharter-Roman-tlf-sc-ly1--base XCharter-Roman " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-ot1--base XCharter-Roman " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t1--base XCharter-Roman " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t2asrb--base XCharter-Roman " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t1--base XCharter-Roman " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_m2vrds6ohoduinigqjp2pulx6b ReEncodeFont " <[xch_m2vrds.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_4difzdpgpp73nhcpkiia7rn64h ReEncodeFont " <[xch_4difzd.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t2asrb XCharter-Roman " AutoEnc_fiqldzomfw67cfhl2p3wqrxjna ReEncodeFont " <[xch_fiqldz.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ly1--base XCharter-Roman " AutoEnc_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch_crvcmi.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ot1 XCharter-Roman " AutoEnc_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch_45bsgy.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t1--base XCharter-Roman " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch_tohekq.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch_lhsfh5.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t2asrb XCharter-Roman " AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch_dynzsr.enc <XCharter-Roman.pfb
XCharter-Roman-ts1--base XCharter-Roman " AutoEnc_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch_co4ru4.enc <XCharter-Roman.pfb
XCharter-Slanted-dnom-ly1--base XCharter-Slanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Slanted.pfb
@@ -18779,10 +18784,10 @@ XCharter-Slanted-lf-ot1 XCharter-Slanted " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb Re
XCharter-Slanted-lf-sc-ly1--base XCharter-Slanted " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-ot1--base XCharter-Slanted " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t1--base XCharter-Slanted " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t2asrb--base XCharter-Slanted " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t1--base XCharter-Slanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t2asrb XCharter-Slanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ly1--base XCharter-Slanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ot1 XCharter-Slanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Slanted.pfb
@@ -18792,15 +18797,15 @@ XCharter-Slanted-osf-ot1 XCharter-Slanted " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb R
XCharter-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t1--base XCharter-Slanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ly1--base XCharter-Slanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ot1 XCharter-Slanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t1--base XCharter-Slanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Slanted.pfb
-XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Slanted.pfb
+XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t2asrb XCharter-Slanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ly1--base XCharter-Slanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ot1 XCharter-Slanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Slanted.pfb
@@ -18808,20 +18813,20 @@ XCharter-Slanted-tlf-ot2 XCharter-Slanted " xcharterOT2enc ReEncodeFont " <[xcha
XCharter-Slanted-tlf-sc-ly1--base XCharter-Slanted " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-ot1--base XCharter-Slanted " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t1--base XCharter-Slanted " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t2asrb--base XCharter-Slanted " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t1--base XCharter-Slanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t2asrb XCharter-Slanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Slanted.pfb
XCharter-Slanted-ts1--base XCharter-Slanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-Slanted.pfb
XCharter-osf XCharter-Roman " chtabOsFEncoding ReEncodeFont " <[chtabosf.enc <XCharter-Roman.pfb
@@ -18830,20 +18835,20 @@ XCharter1-Bold-osf-ot1 XCharter-Bold " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb ReEnc
XCharter1-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t1--base XCharter-Bold " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t2asrb XCharter-Bold " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ly1--base XCharter-Bold " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ot1 XCharter-Bold " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t1--base XCharter-Bold " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t2asrb XCharter-Bold " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Bold.pfb
XCharter1-Bold-ts1--base XCharter-Bold " AutoEnc1_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch1_z3wvjz.enc <XCharter-Bold.pfb
XCharter1-BoldItalic-osf-ly1--base XCharter-BoldItalic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldItalic.pfb
@@ -18851,20 +18856,20 @@ XCharter1-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc1_aegaiust5jvuyf74wgre
XCharter1-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch1_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc1_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch1_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch1_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc1_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch1_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter1-BoldSlanted-osf-ly1--base XCharter-BoldSlanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldSlanted.pfb
@@ -18872,20 +18877,20 @@ XCharter1-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc1_g2zr6i3czinzql75wm
XCharter1-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter1-Italic-osf-ly1--base XCharter-Italic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Italic.pfb
@@ -18893,20 +18898,20 @@ XCharter1-Italic-osf-ot1 XCharter-Italic " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb R
XCharter1-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t1--base XCharter-Italic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t2asrb XCharter-Italic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ly1--base XCharter-Italic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ot1 XCharter-Italic " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t1--base XCharter-Italic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t2asrb XCharter-Italic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-Italic.pfb
XCharter1-Italic-ts1--base XCharter-Italic " AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch1_pqp4df.enc <XCharter-Italic.pfb
XCharter1-Roman-osf-ly1--base XCharter-Roman " AutoEnc1_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch1_5xvt3q.enc <XCharter-Roman.pfb
@@ -18914,20 +18919,20 @@ XCharter1-Roman-osf-ot1 XCharter-Roman " AutoEnc1_ylqpprchpltakubnfx2ql7fllf ReE
XCharter1-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t1--base XCharter-Roman " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch1_cjimfy.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch1_5b6tid.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t2asrb XCharter-Roman " AutoEnc1_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch1_2itbay.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ly1--base XCharter-Roman " AutoEnc1_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch1_crvcmi.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ot1 XCharter-Roman " AutoEnc1_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch1_45bsgy.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t1--base XCharter-Roman " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch1_tohekq.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch1_lhsfh5.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t2asrb XCharter-Roman " AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch1_dynzsr.enc <XCharter-Roman.pfb
XCharter1-Roman-ts1--base XCharter-Roman " AutoEnc1_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch1_co4ru4.enc <XCharter-Roman.pfb
XCharter1-Slanted-osf-ly1--base XCharter-Slanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Slanted.pfb
@@ -18935,20 +18940,20 @@ XCharter1-Slanted-osf-ot1 XCharter-Slanted " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb
XCharter1-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t1--base XCharter-Slanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Slanted.pfb
XCharter1-Slanted-ts1--base XCharter-Slanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-Slanted.pfb
XCharter1TH-BoldItalic-osf-ly1 XCharter-BoldItalic " xch1TH-osf-ly1Enc ReEncodeFont " <xch1TH_osf-ly1.enc <XCharter-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
index 58e8b2595d2..0091f23bbc7 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
@@ -10680,6 +10680,11 @@ GaramondLibre-Regular-sup-t1--base GaramondLibre-Regular " AutoEnc_wkdlc77kkm5gx
GaramondLibre-Regular-sup-t2a GaramondLibre-Regular " AutoEnc_y75trcdjmjxcjj4wfzzyxacoye ReEncodeFont " <[grmlbr_y75trc.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2b GaramondLibre-Regular " AutoEnc_af3fmk7furqbz6algofaeeeujh ReEncodeFont " <[grmlbr_af3fmk.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2c GaramondLibre-Regular " AutoEnc_6l5pxogsiubowbnn4oh47tlyuf ReEncodeFont " <[grmlbr_6l5pxo.enc <GaramondLibre-Regular.pfb
+% GelasioMath.map
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
% GotIn.map
GotIn GotischeInitialen <GotIn.pfb
% GoudyIn.map
@@ -11583,21 +11588,21 @@ Junicode-Bold-inf-ot1 Junicode-Bold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Bold-inf-t1--base Junicode-Bold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-lf-lgr Junicode-Bold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ly1 Junicode-Bold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-lgr Junicode-Bold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ly1--base Junicode-Bold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ot1--base Junicode-Bold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-t1--base Junicode-Bold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-osf-lgr Junicode-Bold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ly1--base Junicode-Bold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ot1--base Junicode-Bold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-t1--base Junicode-Bold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-sup-lgr Junicode-Bold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-sup-ly1 Junicode-Bold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Bold.pfb
@@ -11605,65 +11610,65 @@ Junicode-Bold-sup-ot1 Junicode-Bold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Bold-sup-t1--base Junicode-Bold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-lgr Junicode-Bold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ly1 Junicode-Bold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ot1--base Junicode-Bold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-t1--base Junicode-Bold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-lgr Junicode-Bold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-lgr Junicode-Bold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ly1--base Junicode-Bold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ot1--base Junicode-Bold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-t1--base Junicode-Bold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ly1 Junicode-BoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ot1 Junicode-BoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-t1--base Junicode-BoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-lgr Junicode-BoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1--base Junicode-BoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ly1--base Junicode-BoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ot1--base Junicode-BoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-t1--base Junicode-BoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-lgr Junicode-BoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ot1--base Junicode-BoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ot1 Junicode-BoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-lgr Junicode-BoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ly1 Junicode-BoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ot1 Junicode-BoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-t1--base Junicode-BoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-lgr Junicode-BoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ot1--base Junicode-BoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ot1 Junicode-BoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ot1--base Junicode-BoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-lgr Junicode-BoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ot1--base Junicode-BoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-lgr Junicode-BoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ly1--base Junicode-BoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-t1--base Junicode-BoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-Cond-inf-lgr Junicode-Cond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Cond.pfb
@@ -11671,21 +11676,21 @@ Junicode-Cond-inf-ot1 Junicode-Cond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Cond-inf-t1--base Junicode-Cond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-lf-lgr Junicode-Cond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ly1 Junicode-Cond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-lgr Junicode-Cond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ly1--base Junicode-Cond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ot1--base Junicode-Cond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-t1--base Junicode-Cond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-osf-lgr Junicode-Cond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ly1--base Junicode-Cond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ot1--base Junicode-Cond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-t1--base Junicode-Cond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-sup-lgr Junicode-Cond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-sup-ly1 Junicode-Cond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Cond.pfb
@@ -11693,65 +11698,65 @@ Junicode-Cond-sup-ot1 Junicode-Cond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Cond-sup-t1--base Junicode-Cond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-lgr Junicode-Cond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ly1 Junicode-Cond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ot1--base Junicode-Cond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-t1--base Junicode-Cond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-lgr Junicode-Cond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-lgr Junicode-Cond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ly1--base Junicode-Cond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ot1--base Junicode-Cond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-t1--base Junicode-Cond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ly1 Junicode-CondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ot1 Junicode-CondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-t1--base Junicode-CondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-lgr Junicode-CondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1--base Junicode-CondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ly1--base Junicode-CondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ot1--base Junicode-CondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-t1--base Junicode-CondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-lgr Junicode-CondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ot1--base Junicode-CondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ot1 Junicode-CondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ot1--base Junicode-CondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-lgr Junicode-CondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ly1 Junicode-CondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ot1 Junicode-CondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-t1--base Junicode-CondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-lgr Junicode-CondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ot1--base Junicode-CondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ot1 Junicode-CondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ot1--base Junicode-CondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-lgr Junicode-CondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ot1--base Junicode-CondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ot1 Junicode-CondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-lgr Junicode-CondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ly1--base Junicode-CondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ot1--base Junicode-CondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-t1--base Junicode-CondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondLight.pfb
@@ -11759,21 +11764,21 @@ Junicode-CondLight-inf-ot1 Junicode-CondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-CondLight-inf-t1--base Junicode-CondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-lgr Junicode-CondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ly1 Junicode-CondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-lgr Junicode-CondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ly1--base Junicode-CondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ot1--base Junicode-CondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-t1--base Junicode-CondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-lgr Junicode-CondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ot1--base Junicode-CondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-t1--base Junicode-CondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-lgr Junicode-CondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-ly1 Junicode-CondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondLight.pfb
@@ -11781,65 +11786,65 @@ Junicode-CondLight-sup-ot1 Junicode-CondLight " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-CondLight-sup-t1--base Junicode-CondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-lgr Junicode-CondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ly1 Junicode-CondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ot1--base Junicode-CondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-lgr Junicode-CondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-lgr Junicode-CondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ly1--base Junicode-CondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ot1--base Junicode-CondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-t1--base Junicode-CondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ly1 Junicode-CondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ot1 Junicode-CondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-t1--base Junicode-CondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1--base Junicode-CondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-t1--base Junicode-CondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-lgr Junicode-CondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ot1--base Junicode-CondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ly1 Junicode-CondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ot1 Junicode-CondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-t1--base Junicode-CondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-lgr Junicode-CondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ot1--base Junicode-CondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ot1 Junicode-CondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-lgr Junicode-CondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ot1--base Junicode-CondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-lgr Junicode-CondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-t1--base Junicode-CondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondMedium.pfb
@@ -11847,21 +11852,21 @@ Junicode-CondMedium-inf-ot1 Junicode-CondMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3p
Junicode-CondMedium-inf-t1--base Junicode-CondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-lgr Junicode-CondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ly1 Junicode-CondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ly1--base Junicode-CondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ot1--base Junicode-CondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-t1--base Junicode-CondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-lgr Junicode-CondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ot1--base Junicode-CondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-lgr Junicode-CondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-ly1 Junicode-CondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondMedium.pfb
@@ -11869,65 +11874,65 @@ Junicode-CondMedium-sup-ot1 Junicode-CondMedium " AutoEnc_ilb24pr2hmz3ktady5tx53
Junicode-CondMedium-sup-t1--base Junicode-CondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-lgr Junicode-CondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ly1 Junicode-CondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ot1--base Junicode-CondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-lgr Junicode-CondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-lgr Junicode-CondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ly1--base Junicode-CondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ot1--base Junicode-CondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-t1--base Junicode-CondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ly1 Junicode-CondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ot1 Junicode-CondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-t1--base Junicode-CondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1--base Junicode-CondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-lgr Junicode-CondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ot1--base Junicode-CondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ly1 Junicode-CondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ot1 Junicode-CondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-t1--base Junicode-CondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-lgr Junicode-CondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ot1--base Junicode-CondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ot1 Junicode-CondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-lgr Junicode-CondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ot1--base Junicode-CondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-lgr Junicode-CondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-Exp-inf-lgr Junicode-Exp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Exp.pfb
@@ -11935,21 +11940,21 @@ Junicode-Exp-inf-ot1 Junicode-Exp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeF
Junicode-Exp-inf-t1--base Junicode-Exp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-lf-lgr Junicode-Exp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ly1 Junicode-Exp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-lgr Junicode-Exp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ly1--base Junicode-Exp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ot1--base Junicode-Exp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-t1--base Junicode-Exp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-osf-lgr Junicode-Exp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ly1--base Junicode-Exp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ot1--base Junicode-Exp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-t1--base Junicode-Exp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-sup-lgr Junicode-Exp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-sup-ly1 Junicode-Exp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Exp.pfb
@@ -11957,21 +11962,21 @@ Junicode-Exp-sup-ot1 Junicode-Exp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeF
Junicode-Exp-sup-t1--base Junicode-Exp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-lgr Junicode-Exp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ly1 Junicode-Exp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ot1--base Junicode-Exp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-t1--base Junicode-Exp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-lgr Junicode-Exp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-lgr Junicode-Exp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ly1--base Junicode-Exp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ot1--base Junicode-Exp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-t1--base Junicode-Exp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpBold.pfb
@@ -11979,21 +11984,21 @@ Junicode-ExpBold-inf-ot1 Junicode-ExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-ExpBold-inf-t1--base Junicode-ExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-lgr Junicode-ExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ly1 Junicode-ExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ly1--base Junicode-ExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ot1--base Junicode-ExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-t1--base Junicode-ExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-lgr Junicode-ExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ot1--base Junicode-ExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-lgr Junicode-ExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-ly1 Junicode-ExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpBold.pfb
@@ -12001,109 +12006,109 @@ Junicode-ExpBold-sup-ot1 Junicode-ExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-ExpBold-sup-t1--base Junicode-ExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-lgr Junicode-ExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ly1 Junicode-ExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ot1--base Junicode-ExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-lgr Junicode-ExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-lgr Junicode-ExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ly1--base Junicode-ExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ot1--base Junicode-ExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-t1--base Junicode-ExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ly1 Junicode-ExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ot1 Junicode-ExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-t1--base Junicode-ExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1--base Junicode-ExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-lgr Junicode-ExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ot1--base Junicode-ExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ly1 Junicode-ExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ot1 Junicode-ExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-t1--base Junicode-ExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-lgr Junicode-ExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ot1--base Junicode-ExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ot1 Junicode-ExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-lgr Junicode-ExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ot1--base Junicode-ExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ly1 Junicode-ExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ot1 Junicode-ExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-t1--base Junicode-ExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-lgr Junicode-ExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1--base Junicode-ExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ly1--base Junicode-ExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ot1--base Junicode-ExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-t1--base Junicode-ExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-lgr Junicode-ExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ot1--base Junicode-ExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-lgr Junicode-ExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ly1 Junicode-ExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ot1 Junicode-ExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-t1--base Junicode-ExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-lgr Junicode-ExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ot1--base Junicode-ExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ot1 Junicode-ExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ot1--base Junicode-ExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-lgr Junicode-ExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ot1--base Junicode-ExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-lgr Junicode-ExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ly1--base Junicode-ExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-t1--base Junicode-ExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
@@ -12111,21 +12116,21 @@ Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-lgr Junicode-ExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ly1--base Junicode-ExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ot1--base Junicode-ExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-t1--base Junicode-ExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-lgr Junicode-ExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-lgr Junicode-ExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
@@ -12133,65 +12138,65 @@ Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-lgr Junicode-ExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ly1 Junicode-ExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ot1--base Junicode-ExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-lgr Junicode-ExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-lgr Junicode-ExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ly1--base Junicode-ExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-t1--base Junicode-ExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ly1 Junicode-ExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ot1 Junicode-ExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-t1--base Junicode-ExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1--base Junicode-ExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-lgr Junicode-ExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ot1--base Junicode-ExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ly1 Junicode-ExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ot1 Junicode-ExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-t1--base Junicode-ExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-lgr Junicode-ExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ot1--base Junicode-ExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ot1 Junicode-ExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-lgr Junicode-ExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ot1--base Junicode-ExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
@@ -12199,21 +12204,21 @@ Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-t1--base Junicode-ExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-lgr Junicode-ExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
@@ -12221,109 +12226,109 @@ Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-lgr Junicode-ExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ly1 Junicode-ExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-lgr Junicode-ExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-lgr Junicode-ExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-t1--base Junicode-ExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-lgr Junicode-ExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ly1 Junicode-ExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ot1 Junicode-ExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-lgr Junicode-ExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-lgr Junicode-ExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-Italic-inf-lgr Junicode-Italic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ly1 Junicode-Italic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ot1 Junicode-Italic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-Italic.pfb
Junicode-Italic-inf-t1--base Junicode-Italic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-Italic.pfb
Junicode-Italic-lf-lgr Junicode-Italic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1--base Junicode-Italic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-lgr Junicode-Italic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ly1--base Junicode-Italic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ot1--base Junicode-Italic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-t1--base Junicode-Italic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-Italic.pfb
Junicode-Italic-lf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-osf-lgr Junicode-Italic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ot1--base Junicode-Italic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ot1 Junicode-Italic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ly1--base Junicode-Italic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ot1--base Junicode-Italic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-t1--base Junicode-Italic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-sup-lgr Junicode-Italic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ly1 Junicode-Italic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ot1 Junicode-Italic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-Italic.pfb
Junicode-Italic-sup-t1--base Junicode-Italic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-lgr Junicode-Italic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ot1--base Junicode-Italic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ot1 Junicode-Italic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ot1--base Junicode-Italic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-t1--base Junicode-Italic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-lgr Junicode-Italic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ot1--base Junicode-Italic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ot1 Junicode-Italic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-lgr Junicode-Italic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ly1--base Junicode-Italic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ot1--base Junicode-Italic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-t1--base Junicode-Italic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Light-inf-lgr Junicode-Light " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Light.pfb
@@ -12331,21 +12336,21 @@ Junicode-Light-inf-ot1 Junicode-Light " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-Light-inf-t1--base Junicode-Light " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-lf-lgr Junicode-Light " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Light.pfb
Junicode-Light-lf-ly1 Junicode-Light " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-lgr Junicode-Light " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ly1--base Junicode-Light " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ot1--base Junicode-Light " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-t1--base Junicode-Light " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Light.pfb
Junicode-Light-lf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-osf-lgr Junicode-Light " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Light.pfb
-Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Light.pfb
+Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ly1--base Junicode-Light " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ot1--base Junicode-Light " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-t1--base Junicode-Light " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Light.pfb
-Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Light.pfb
+Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-sup-lgr Junicode-Light " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-sup-ly1 Junicode-Light " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Light.pfb
@@ -12353,65 +12358,65 @@ Junicode-Light-sup-ot1 Junicode-Light " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-Light-sup-t1--base Junicode-Light " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Light.pfb
Junicode-Light-tlf-lgr Junicode-Light " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Light.pfb
Junicode-Light-tlf-ly1 Junicode-Light " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Light.pfb
-Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Light.pfb
+Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ly1--base Junicode-Light " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ot1--base Junicode-Light " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-t1--base Junicode-Light " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Light.pfb
-Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Light.pfb
+Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-Light-tosf-lgr Junicode-Light " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Light.pfb
-Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Light.pfb
+Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-lgr Junicode-Light " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ly1--base Junicode-Light " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ot1--base Junicode-Light " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-t1--base Junicode-Light " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Light.pfb
-Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Light.pfb
+Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ly1 Junicode-LightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ot1 Junicode-LightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-t1--base Junicode-LightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-lgr Junicode-LightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1--base Junicode-LightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ly1--base Junicode-LightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ot1--base Junicode-LightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-t1--base Junicode-LightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-lgr Junicode-LightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ot1--base Junicode-LightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ot1 Junicode-LightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ot1--base Junicode-LightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-lgr Junicode-LightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ly1 Junicode-LightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ot1 Junicode-LightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-t1--base Junicode-LightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-lgr Junicode-LightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ot1--base Junicode-LightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ot1 Junicode-LightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ot1--base Junicode-LightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-lgr Junicode-LightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ot1--base Junicode-LightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ot1 Junicode-LightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-lgr Junicode-LightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ly1--base Junicode-LightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ot1--base Junicode-LightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-t1--base Junicode-LightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-Medium-inf-lgr Junicode-Medium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Medium.pfb
@@ -12419,21 +12424,21 @@ Junicode-Medium-inf-ot1 Junicode-Medium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-Medium-inf-t1--base Junicode-Medium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-lf-lgr Junicode-Medium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ly1 Junicode-Medium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-lgr Junicode-Medium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ly1--base Junicode-Medium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ot1--base Junicode-Medium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-t1--base Junicode-Medium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-osf-lgr Junicode-Medium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ly1--base Junicode-Medium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ot1--base Junicode-Medium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-t1--base Junicode-Medium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-sup-lgr Junicode-Medium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-sup-ly1 Junicode-Medium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Medium.pfb
@@ -12441,65 +12446,65 @@ Junicode-Medium-sup-ot1 Junicode-Medium " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-Medium-sup-t1--base Junicode-Medium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-lgr Junicode-Medium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ly1 Junicode-Medium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ot1--base Junicode-Medium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-t1--base Junicode-Medium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-lgr Junicode-Medium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-lgr Junicode-Medium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ly1--base Junicode-Medium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ot1--base Junicode-Medium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-t1--base Junicode-Medium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ly1 Junicode-MediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ot1 Junicode-MediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-t1--base Junicode-MediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-lgr Junicode-MediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1--base Junicode-MediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ly1--base Junicode-MediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ot1--base Junicode-MediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-t1--base Junicode-MediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-lgr Junicode-MediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ot1--base Junicode-MediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-lgr Junicode-MediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ly1 Junicode-MediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ot1 Junicode-MediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-t1--base Junicode-MediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-lgr Junicode-MediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ot1--base Junicode-MediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ot1 Junicode-MediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ot1--base Junicode-MediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-lgr Junicode-MediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ot1--base Junicode-MediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-lgr Junicode-MediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ly1--base Junicode-MediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-t1--base Junicode-MediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-Regular-inf-lgr Junicode-Regular " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Regular.pfb
@@ -12507,21 +12512,21 @@ Junicode-Regular-inf-ot1 Junicode-Regular " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-Regular-inf-t1--base Junicode-Regular " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-lf-lgr Junicode-Regular " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ly1 Junicode-Regular " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-lgr Junicode-Regular " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ly1--base Junicode-Regular " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ot1--base Junicode-Regular " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-t1--base Junicode-Regular " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-osf-lgr Junicode-Regular " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ly1--base Junicode-Regular " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ot1--base Junicode-Regular " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-t1--base Junicode-Regular " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-sup-lgr Junicode-Regular " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-sup-ly1 Junicode-Regular " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Regular.pfb
@@ -12529,21 +12534,21 @@ Junicode-Regular-sup-ot1 Junicode-Regular " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-Regular-sup-t1--base Junicode-Regular " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-lgr Junicode-Regular " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ly1 Junicode-Regular " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ot1--base Junicode-Regular " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-t1--base Junicode-Regular " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-lgr Junicode-Regular " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-lgr Junicode-Regular " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ly1--base Junicode-Regular " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ot1--base Junicode-Regular " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-t1--base Junicode-Regular " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmBold.pfb
@@ -12551,21 +12556,21 @@ Junicode-SmBold-inf-ot1 Junicode-SmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmBold-inf-t1--base Junicode-SmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-lgr Junicode-SmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ly1 Junicode-SmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-lgr Junicode-SmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ly1--base Junicode-SmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ot1--base Junicode-SmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-t1--base Junicode-SmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-lgr Junicode-SmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ot1--base Junicode-SmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-t1--base Junicode-SmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-lgr Junicode-SmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-ly1 Junicode-SmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmBold.pfb
@@ -12573,65 +12578,65 @@ Junicode-SmBold-sup-ot1 Junicode-SmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmBold-sup-t1--base Junicode-SmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-lgr Junicode-SmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ly1 Junicode-SmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ot1--base Junicode-SmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-lgr Junicode-SmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-lgr Junicode-SmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ly1--base Junicode-SmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ot1--base Junicode-SmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-t1--base Junicode-SmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ly1 Junicode-SmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ot1 Junicode-SmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-t1--base Junicode-SmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1--base Junicode-SmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-lgr Junicode-SmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ot1--base Junicode-SmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ly1 Junicode-SmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ot1 Junicode-SmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-t1--base Junicode-SmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-lgr Junicode-SmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ot1--base Junicode-SmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ot1 Junicode-SmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-lgr Junicode-SmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ot1--base Junicode-SmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-lgr Junicode-SmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCond.pfb
@@ -12639,21 +12644,21 @@ Junicode-SmCond-inf-ot1 Junicode-SmCond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmCond-inf-t1--base Junicode-SmCond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-lgr Junicode-SmCond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ly1 Junicode-SmCond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-lgr Junicode-SmCond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ly1--base Junicode-SmCond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ot1--base Junicode-SmCond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-t1--base Junicode-SmCond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-lgr Junicode-SmCond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ot1--base Junicode-SmCond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-t1--base Junicode-SmCond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-lgr Junicode-SmCond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-ly1 Junicode-SmCond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCond.pfb
@@ -12661,65 +12666,65 @@ Junicode-SmCond-sup-ot1 Junicode-SmCond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmCond-sup-t1--base Junicode-SmCond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-lgr Junicode-SmCond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ly1 Junicode-SmCond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ot1--base Junicode-SmCond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-lgr Junicode-SmCond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-lgr Junicode-SmCond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ly1--base Junicode-SmCond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ot1--base Junicode-SmCond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-t1--base Junicode-SmCond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ly1 Junicode-SmCondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ot1 Junicode-SmCondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-t1--base Junicode-SmCondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1--base Junicode-SmCondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-t1--base Junicode-SmCondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-lgr Junicode-SmCondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ot1--base Junicode-SmCondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ly1 Junicode-SmCondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ot1 Junicode-SmCondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-t1--base Junicode-SmCondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-lgr Junicode-SmCondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ot1--base Junicode-SmCondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ot1 Junicode-SmCondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-lgr Junicode-SmCondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ot1--base Junicode-SmCondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-lgr Junicode-SmCondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-t1--base Junicode-SmCondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
@@ -12727,21 +12732,21 @@ Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-lgr Junicode-SmCondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ly1--base Junicode-SmCondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ot1--base Junicode-SmCondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-t1--base Junicode-SmCondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-lgr Junicode-SmCondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-lgr Junicode-SmCondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
@@ -12749,65 +12754,65 @@ Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-lgr Junicode-SmCondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ly1 Junicode-SmCondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ot1--base Junicode-SmCondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-lgr Junicode-SmCondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-lgr Junicode-SmCondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ly1--base Junicode-SmCondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-t1--base Junicode-SmCondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ly1 Junicode-SmCondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ot1 Junicode-SmCondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-t1--base Junicode-SmCondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1--base Junicode-SmCondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-lgr Junicode-SmCondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ot1--base Junicode-SmCondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ly1 Junicode-SmCondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ot1 Junicode-SmCondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-t1--base Junicode-SmCondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-lgr Junicode-SmCondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ot1--base Junicode-SmCondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ot1 Junicode-SmCondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-lgr Junicode-SmCondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ot1--base Junicode-SmCondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
@@ -12815,21 +12820,21 @@ Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium " AutoEnc_ldcvmrfllg5ebu6xfr
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-t1--base Junicode-SmCondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-lgr Junicode-SmCondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
@@ -12837,65 +12842,65 @@ Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium " AutoEnc_ilb24pr2hmz3ktady5
Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-lgr Junicode-SmCondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ly1 Junicode-SmCondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-lgr Junicode-SmCondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-lgr Junicode-SmCondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-t1--base Junicode-SmCondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ly1 Junicode-SmCondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ot1 Junicode-SmCondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-t1--base Junicode-SmCondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-lgr Junicode-SmCondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ly1 Junicode-SmCondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ot1 Junicode-SmCondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-t1--base Junicode-SmCondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-lgr Junicode-SmCondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ot1 Junicode-SmCondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-lgr Junicode-SmCondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmExp-inf-lgr Junicode-SmExp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
Junicode-SmExp-inf-ly1 Junicode-SmExp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExp.pfb
@@ -12903,21 +12908,21 @@ Junicode-SmExp-inf-ot1 Junicode-SmExp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-SmExp-inf-t1--base Junicode-SmExp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-lgr Junicode-SmExp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ly1 Junicode-SmExp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-lgr Junicode-SmExp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ly1--base Junicode-SmExp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ot1--base Junicode-SmExp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-t1--base Junicode-SmExp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-lgr Junicode-SmExp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ot1--base Junicode-SmExp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-t1--base Junicode-SmExp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-lgr Junicode-SmExp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-ly1 Junicode-SmExp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExp.pfb
@@ -12925,21 +12930,21 @@ Junicode-SmExp-sup-ot1 Junicode-SmExp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-SmExp-sup-t1--base Junicode-SmExp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-lgr Junicode-SmExp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ot1--base Junicode-SmExp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-lgr Junicode-SmExp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ot1--base Junicode-SmExp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
@@ -12947,21 +12952,21 @@ Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-lgr Junicode-SmExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ly1--base Junicode-SmExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ot1--base Junicode-SmExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-t1--base Junicode-SmExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-lgr Junicode-SmExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-lgr Junicode-SmExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
@@ -12969,109 +12974,109 @@ Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-lgr Junicode-SmExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ly1 Junicode-SmExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ot1--base Junicode-SmExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-lgr Junicode-SmExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-lgr Junicode-SmExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ly1--base Junicode-SmExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-t1--base Junicode-SmExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ly1 Junicode-SmExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ot1 Junicode-SmExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-t1--base Junicode-SmExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-lgr Junicode-SmExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ly1 Junicode-SmExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ot1 Junicode-SmExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-t1--base Junicode-SmExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-lgr Junicode-SmExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ot1 Junicode-SmExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-lgr Junicode-SmExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ly1 Junicode-SmExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ot1 Junicode-SmExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-t1--base Junicode-SmExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1--base Junicode-SmExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-t1--base Junicode-SmExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-lgr Junicode-SmExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ot1--base Junicode-SmExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ly1 Junicode-SmExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ot1 Junicode-SmExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-t1--base Junicode-SmExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-lgr Junicode-SmExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ot1--base Junicode-SmExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ot1 Junicode-SmExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-lgr Junicode-SmExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ot1--base Junicode-SmExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-lgr Junicode-SmExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-t1--base Junicode-SmExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
@@ -13079,21 +13084,21 @@ Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-t1--base Junicode-SmExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-lgr Junicode-SmExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
@@ -13101,65 +13106,65 @@ Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-lgr Junicode-SmExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-lgr Junicode-SmExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ly1 Junicode-SmExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ot1 Junicode-SmExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-t1--base Junicode-SmExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-lgr Junicode-SmExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ly1 Junicode-SmExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ot1 Junicode-SmExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-t1--base Junicode-SmExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-lgr Junicode-SmExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-lgr Junicode-SmExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
@@ -13167,21 +13172,21 @@ Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-lgr Junicode-SmExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
@@ -13189,65 +13194,65 @@ Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-lgr Junicode-SmExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-lgr Junicode-SmExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
% Kinigcap.map
Kinigcap KinigsteinCaps <Kinigcap.pfb
@@ -18498,10 +18503,10 @@ XCharter-Bold-lf-ot1 XCharter-Bold " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEncode
XCharter-Bold-lf-sc-ly1--base XCharter-Bold " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-ot1--base XCharter-Bold " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t1--base XCharter-Bold " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t2asrb--base XCharter-Bold " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t1--base XCharter-Bold " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t2asrb XCharter-Bold " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ly1--base XCharter-Bold " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ot1 XCharter-Bold " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Bold.pfb
@@ -18511,15 +18516,15 @@ XCharter-Bold-osf-ot1 XCharter-Bold " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReEncod
XCharter-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t1--base XCharter-Bold " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t2asrb XCharter-Bold " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ly1--base XCharter-Bold " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ot1 XCharter-Bold " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t1--base XCharter-Bold " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Bold.pfb
+XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t2asrb XCharter-Bold " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ly1--base XCharter-Bold " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ot1 XCharter-Bold " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Bold.pfb
@@ -18527,20 +18532,20 @@ XCharter-Bold-tlf-ot2 XCharter-Bold " xcharterOT2enc ReEncodeFont " <[xcharter-o
XCharter-Bold-tlf-sc-ly1--base XCharter-Bold " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-ot1--base XCharter-Bold " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t1--base XCharter-Bold " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t2asrb--base XCharter-Bold " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t1--base XCharter-Bold " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t2asrb XCharter-Bold " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ly1--base XCharter-Bold " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ot1 XCharter-Bold " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t1--base XCharter-Bold " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t2asrb XCharter-Bold " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Bold.pfb
XCharter-Bold-ts1--base XCharter-Bold " AutoEnc_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch_z3wvjz.enc <XCharter-Bold.pfb
XCharter-BoldItalic-dnom-ly1--base XCharter-BoldItalic " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldItalic.pfb
@@ -18554,10 +18559,10 @@ XCharter-BoldItalic-lf-ot1 XCharter-BoldItalic " AutoEnc_ru4hosnl6h5ukcp2w3tt2ie
XCharter-BoldItalic-lf-sc-ly1--base XCharter-BoldItalic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-ot1--base XCharter-BoldItalic " AutoEnc_7qcosniepdkkhq2lidq32xyajh ReEncodeFont " <[xch_7qcosn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t1--base XCharter-BoldItalic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t1--base XCharter-BoldItalic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t2asrb XCharter-BoldItalic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ly1--base XCharter-BoldItalic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ot1 XCharter-BoldItalic " AutoEnc_qs7dmbcmqkgbo6666jibzn77ta ReEncodeFont " <[xch_qs7dmb.enc <XCharter-BoldItalic.pfb
@@ -18567,15 +18572,15 @@ XCharter-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc_aegaiust5jvuyf74wgreek
XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ot1 XCharter-BoldItalic " AutoEnc_gkuln73auq7qfnbajjeh66tiyg ReEncodeFont " <[xch_gkuln7.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t2asrb XCharter-BoldItalic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ot1 XCharter-BoldItalic " AutoEnc_lfc2esxm2njp63bgoww5uifspg ReEncodeFont " <[xch_lfc2es.enc <XCharter-BoldItalic.pfb
@@ -18583,20 +18588,20 @@ XCharter-BoldItalic-tlf-ot2 XCharter-BoldItalic " xcharterOT2enc ReEncodeFont "
XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jffewfvsu3e3ihebccixpovvra ReEncodeFont " <[xch_jffewf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t2asrb XCharter-BoldItalic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter-BoldSlanted-dnom-ly1--base XCharter-BoldSlanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldSlanted.pfb
@@ -18610,10 +18615,10 @@ XCharter-BoldSlanted-lf-ot1 XCharter-BoldSlanted " AutoEnc_aoa5sqhsbxws2dsjkwdeq
XCharter-BoldSlanted-lf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t1--base XCharter-BoldSlanted " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t1--base XCharter-BoldSlanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t2asrb XCharter-BoldSlanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ly1--base XCharter-BoldSlanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ot1 XCharter-BoldSlanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-BoldSlanted.pfb
@@ -18623,15 +18628,15 @@ XCharter-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc_g2zr6i3czinzql75wmpz
XCharter-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ly1--base XCharter-BoldSlanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ot1 XCharter-BoldSlanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t1--base XCharter-BoldSlanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t2asrb XCharter-BoldSlanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ly1--base XCharter-BoldSlanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ot1 XCharter-BoldSlanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-BoldSlanted.pfb
@@ -18639,20 +18644,20 @@ XCharter-BoldSlanted-tlf-ot2 XCharter-BoldSlanted " xcharterOT2enc ReEncodeFont
XCharter-BoldSlanted-tlf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t1--base XCharter-BoldSlanted " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t1--base XCharter-BoldSlanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t2asrb XCharter-BoldSlanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter-Ita-alph XCharter-Italic " chalphEncoding ReEncodeFont " <[chalph.enc <XCharter-Italic.pfb
@@ -18667,10 +18672,10 @@ XCharter-Italic-lf-ot1 XCharter-Italic " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEn
XCharter-Italic-lf-sc-ly1--base XCharter-Italic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-ot1--base XCharter-Italic " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t1--base XCharter-Italic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t2asrb--base XCharter-Italic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t1--base XCharter-Italic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t2asrb XCharter-Italic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ly1--base XCharter-Italic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ot1 XCharter-Italic " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Italic.pfb
@@ -18680,15 +18685,15 @@ XCharter-Italic-osf-ot1 XCharter-Italic " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReE
XCharter-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t1--base XCharter-Italic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t2asrb XCharter-Italic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ly1--base XCharter-Italic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ot1 XCharter-Italic " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t1--base XCharter-Italic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Italic.pfb
+XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t2asrb XCharter-Italic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ly1--base XCharter-Italic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ot1 XCharter-Italic " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Italic.pfb
@@ -18696,20 +18701,20 @@ XCharter-Italic-tlf-ot2 XCharter-Italic " xcharterOT2enc ReEncodeFont " <[xchart
XCharter-Italic-tlf-sc-ly1--base XCharter-Italic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-ot1--base XCharter-Italic " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t1--base XCharter-Italic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t2asrb--base XCharter-Italic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t1--base XCharter-Italic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t2asrb XCharter-Italic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ly1--base XCharter-Italic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ot1 XCharter-Italic " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t1--base XCharter-Italic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t2asrb XCharter-Italic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-Italic.pfb
XCharter-Italic-ts1--base XCharter-Italic " AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch_pqp4df.enc <XCharter-Italic.pfb
XCharter-Roman-dnom-ly1--base XCharter-Roman " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Roman.pfb
@@ -18723,12 +18728,12 @@ XCharter-Roman-lf-ot1 XCharter-Roman " AutoEnc_bbupxqigkbffslxhtvjmz5qdhb ReEnco
XCharter-Roman-lf-sc-ly1--base XCharter-Roman " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-ot1--base XCharter-Roman " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t1--base XCharter-Roman " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t2asrb--base XCharter-Roman " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t1--base XCharter-Roman " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_6ckksab4xgup3cfdzppakccfch ReEncodeFont " <[xch_6ckksa.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_ajf4qeyyzlwr22lxwfvdvytw4h ReEncodeFont " <[xch_ajf4qe.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t2asrb XCharter-Roman " AutoEnc_2ne5ras2ihnhgxt43rxslgjvce ReEncodeFont " <[xch_2ne5ra.enc <XCharter-Roman.pfb
-XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Roman.pfb
+XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_du7eesfjv53g5kmcdg53pxaz6g ReEncodeFont " <[xch_du7ees.enc <XCharter-Roman.pfb
XCharter-Roman-numr-ot1 XCharter-Roman " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Roman.pfb
XCharter-Roman-numr-t1--base XCharter-Roman " AutoEnc_aw3womsecdumtuxvl6hik6fs3a ReEncodeFont " <[xch_aw3wom.enc <XCharter-Roman.pfb
XCharter-Roman-osf-ly1--base XCharter-Roman " AutoEnc_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch_5xvt3q.enc <XCharter-Roman.pfb
@@ -18736,15 +18741,15 @@ XCharter-Roman-osf-ot1 XCharter-Roman " AutoEnc_ylqpprchpltakubnfx2ql7fllf ReEnc
XCharter-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t1--base XCharter-Roman " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch_cjimfy.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch_5b6tid.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t2asrb XCharter-Roman " AutoEnc_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch_2itbay.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ly1--base XCharter-Roman " AutoEnc_ukw3hq7h3prn34ryh2qktyrkse ReEncodeFont " <[xch_ukw3hq.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ot1 XCharter-Roman " AutoEnc_dhwwz5gerbpejovfe253unwxde ReEncodeFont " <[xch_dhwwz5.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t1--base XCharter-Roman " AutoEnc_6hzluovfqgqjqwjosfm7uze3oh ReEncodeFont " <[xch_6hzluo.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_pz3lxgt2tnxz7p6istzozn734g ReEncodeFont " <[xch_pz3lxg.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_7rlj4vy6adeoxbzopcxh2vadqb ReEncodeFont " <[xch_7rlj4v.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t2asrb XCharter-Roman " AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf ReEncodeFont " <[xch_vyhv3k.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ly1--base XCharter-Roman " AutoEnc_worivip5whk4cqev33dw4cszae ReEncodeFont " <[xch_worivi.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ot1 XCharter-Roman " AutoEnc_3glltskulaq25sg7bdv2b6v7sb ReEncodeFont " <[xch_3gllts.enc <XCharter-Roman.pfb
@@ -18752,20 +18757,20 @@ XCharter-Roman-tlf-ot2 XCharter-Roman " xcharterOT2enc ReEncodeFont " <[xcharter
XCharter-Roman-tlf-sc-ly1--base XCharter-Roman " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-ot1--base XCharter-Roman " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t1--base XCharter-Roman " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t2asrb--base XCharter-Roman " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t1--base XCharter-Roman " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_m2vrds6ohoduinigqjp2pulx6b ReEncodeFont " <[xch_m2vrds.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_4difzdpgpp73nhcpkiia7rn64h ReEncodeFont " <[xch_4difzd.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t2asrb XCharter-Roman " AutoEnc_fiqldzomfw67cfhl2p3wqrxjna ReEncodeFont " <[xch_fiqldz.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ly1--base XCharter-Roman " AutoEnc_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch_crvcmi.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ot1 XCharter-Roman " AutoEnc_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch_45bsgy.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t1--base XCharter-Roman " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch_tohekq.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch_lhsfh5.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t2asrb XCharter-Roman " AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch_dynzsr.enc <XCharter-Roman.pfb
XCharter-Roman-ts1--base XCharter-Roman " AutoEnc_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch_co4ru4.enc <XCharter-Roman.pfb
XCharter-Slanted-dnom-ly1--base XCharter-Slanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Slanted.pfb
@@ -18779,10 +18784,10 @@ XCharter-Slanted-lf-ot1 XCharter-Slanted " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb Re
XCharter-Slanted-lf-sc-ly1--base XCharter-Slanted " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-ot1--base XCharter-Slanted " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t1--base XCharter-Slanted " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t2asrb--base XCharter-Slanted " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t1--base XCharter-Slanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t2asrb XCharter-Slanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ly1--base XCharter-Slanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ot1 XCharter-Slanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Slanted.pfb
@@ -18792,15 +18797,15 @@ XCharter-Slanted-osf-ot1 XCharter-Slanted " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb R
XCharter-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t1--base XCharter-Slanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ly1--base XCharter-Slanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ot1 XCharter-Slanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t1--base XCharter-Slanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Slanted.pfb
-XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Slanted.pfb
+XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t2asrb XCharter-Slanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ly1--base XCharter-Slanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ot1 XCharter-Slanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Slanted.pfb
@@ -18808,20 +18813,20 @@ XCharter-Slanted-tlf-ot2 XCharter-Slanted " xcharterOT2enc ReEncodeFont " <[xcha
XCharter-Slanted-tlf-sc-ly1--base XCharter-Slanted " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-ot1--base XCharter-Slanted " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t1--base XCharter-Slanted " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t2asrb--base XCharter-Slanted " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t1--base XCharter-Slanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t2asrb XCharter-Slanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Slanted.pfb
XCharter-Slanted-ts1--base XCharter-Slanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-Slanted.pfb
XCharter-osf XCharter-Roman " chtabOsFEncoding ReEncodeFont " <[chtabosf.enc <XCharter-Roman.pfb
@@ -18830,20 +18835,20 @@ XCharter1-Bold-osf-ot1 XCharter-Bold " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb ReEnc
XCharter1-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t1--base XCharter-Bold " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t2asrb XCharter-Bold " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ly1--base XCharter-Bold " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ot1 XCharter-Bold " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t1--base XCharter-Bold " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t2asrb XCharter-Bold " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Bold.pfb
XCharter1-Bold-ts1--base XCharter-Bold " AutoEnc1_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch1_z3wvjz.enc <XCharter-Bold.pfb
XCharter1-BoldItalic-osf-ly1--base XCharter-BoldItalic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldItalic.pfb
@@ -18851,20 +18856,20 @@ XCharter1-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc1_aegaiust5jvuyf74wgre
XCharter1-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch1_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc1_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch1_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch1_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc1_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch1_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter1-BoldSlanted-osf-ly1--base XCharter-BoldSlanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldSlanted.pfb
@@ -18872,20 +18877,20 @@ XCharter1-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc1_g2zr6i3czinzql75wm
XCharter1-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter1-Italic-osf-ly1--base XCharter-Italic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Italic.pfb
@@ -18893,20 +18898,20 @@ XCharter1-Italic-osf-ot1 XCharter-Italic " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb R
XCharter1-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t1--base XCharter-Italic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t2asrb XCharter-Italic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ly1--base XCharter-Italic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ot1 XCharter-Italic " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t1--base XCharter-Italic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t2asrb XCharter-Italic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-Italic.pfb
XCharter1-Italic-ts1--base XCharter-Italic " AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch1_pqp4df.enc <XCharter-Italic.pfb
XCharter1-Roman-osf-ly1--base XCharter-Roman " AutoEnc1_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch1_5xvt3q.enc <XCharter-Roman.pfb
@@ -18914,20 +18919,20 @@ XCharter1-Roman-osf-ot1 XCharter-Roman " AutoEnc1_ylqpprchpltakubnfx2ql7fllf ReE
XCharter1-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t1--base XCharter-Roman " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch1_cjimfy.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch1_5b6tid.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t2asrb XCharter-Roman " AutoEnc1_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch1_2itbay.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ly1--base XCharter-Roman " AutoEnc1_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch1_crvcmi.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ot1 XCharter-Roman " AutoEnc1_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch1_45bsgy.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t1--base XCharter-Roman " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch1_tohekq.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch1_lhsfh5.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t2asrb XCharter-Roman " AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch1_dynzsr.enc <XCharter-Roman.pfb
XCharter1-Roman-ts1--base XCharter-Roman " AutoEnc1_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch1_co4ru4.enc <XCharter-Roman.pfb
XCharter1-Slanted-osf-ly1--base XCharter-Slanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Slanted.pfb
@@ -18935,20 +18940,20 @@ XCharter1-Slanted-osf-ot1 XCharter-Slanted " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb
XCharter1-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t1--base XCharter-Slanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Slanted.pfb
XCharter1-Slanted-ts1--base XCharter-Slanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-Slanted.pfb
XCharter1TH-BoldItalic-osf-ly1 XCharter-BoldItalic " xch1TH-osf-ly1Enc ReEncodeFont " <xch1TH_osf-ly1.enc <XCharter-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
index 11f4b478632..827ffd57e3c 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
@@ -6135,6 +6135,11 @@ GaramondLibre-Regular-sup-t1--base GaramondLibre-Regular " AutoEnc_wkdlc77kkm5gx
GaramondLibre-Regular-sup-t2a GaramondLibre-Regular " AutoEnc_y75trcdjmjxcjj4wfzzyxacoye ReEncodeFont " <[grmlbr_y75trc.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2b GaramondLibre-Regular " AutoEnc_af3fmk7furqbz6algofaeeeujh ReEncodeFont " <[grmlbr_af3fmk.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2c GaramondLibre-Regular " AutoEnc_6l5pxogsiubowbnn4oh47tlyuf ReEncodeFont " <[grmlbr_6l5pxo.enc <GaramondLibre-Regular.pfb
+% GelasioMath.map
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
% GotIn.map
GotIn GotischeInitialen <GotIn.pfb
% GoudyIn.map
@@ -7038,21 +7043,21 @@ Junicode-Bold-inf-ot1 Junicode-Bold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Bold-inf-t1--base Junicode-Bold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-lf-lgr Junicode-Bold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ly1 Junicode-Bold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-lgr Junicode-Bold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ly1--base Junicode-Bold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ot1--base Junicode-Bold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-t1--base Junicode-Bold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-osf-lgr Junicode-Bold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ly1--base Junicode-Bold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ot1--base Junicode-Bold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-t1--base Junicode-Bold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-sup-lgr Junicode-Bold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-sup-ly1 Junicode-Bold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Bold.pfb
@@ -7060,65 +7065,65 @@ Junicode-Bold-sup-ot1 Junicode-Bold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Bold-sup-t1--base Junicode-Bold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-lgr Junicode-Bold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ly1 Junicode-Bold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ot1--base Junicode-Bold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-t1--base Junicode-Bold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-lgr Junicode-Bold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-lgr Junicode-Bold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ly1--base Junicode-Bold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ot1--base Junicode-Bold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-t1--base Junicode-Bold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ly1 Junicode-BoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ot1 Junicode-BoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-t1--base Junicode-BoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-lgr Junicode-BoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1--base Junicode-BoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ly1--base Junicode-BoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ot1--base Junicode-BoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-t1--base Junicode-BoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-lgr Junicode-BoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ot1--base Junicode-BoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ot1 Junicode-BoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-lgr Junicode-BoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ly1 Junicode-BoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ot1 Junicode-BoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-t1--base Junicode-BoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-lgr Junicode-BoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ot1--base Junicode-BoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ot1 Junicode-BoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ot1--base Junicode-BoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-lgr Junicode-BoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ot1--base Junicode-BoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-lgr Junicode-BoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ly1--base Junicode-BoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-t1--base Junicode-BoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-Cond-inf-lgr Junicode-Cond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Cond.pfb
@@ -7126,21 +7131,21 @@ Junicode-Cond-inf-ot1 Junicode-Cond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Cond-inf-t1--base Junicode-Cond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-lf-lgr Junicode-Cond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ly1 Junicode-Cond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-lgr Junicode-Cond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ly1--base Junicode-Cond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ot1--base Junicode-Cond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-t1--base Junicode-Cond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-osf-lgr Junicode-Cond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ly1--base Junicode-Cond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ot1--base Junicode-Cond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-t1--base Junicode-Cond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-sup-lgr Junicode-Cond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-sup-ly1 Junicode-Cond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Cond.pfb
@@ -7148,65 +7153,65 @@ Junicode-Cond-sup-ot1 Junicode-Cond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Cond-sup-t1--base Junicode-Cond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-lgr Junicode-Cond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ly1 Junicode-Cond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ot1--base Junicode-Cond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-t1--base Junicode-Cond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-lgr Junicode-Cond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-lgr Junicode-Cond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ly1--base Junicode-Cond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ot1--base Junicode-Cond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-t1--base Junicode-Cond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ly1 Junicode-CondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ot1 Junicode-CondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-t1--base Junicode-CondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-lgr Junicode-CondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1--base Junicode-CondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ly1--base Junicode-CondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ot1--base Junicode-CondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-t1--base Junicode-CondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-lgr Junicode-CondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ot1--base Junicode-CondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ot1 Junicode-CondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ot1--base Junicode-CondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-lgr Junicode-CondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ly1 Junicode-CondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ot1 Junicode-CondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-t1--base Junicode-CondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-lgr Junicode-CondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ot1--base Junicode-CondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ot1 Junicode-CondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ot1--base Junicode-CondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-lgr Junicode-CondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ot1--base Junicode-CondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ot1 Junicode-CondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-lgr Junicode-CondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ly1--base Junicode-CondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ot1--base Junicode-CondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-t1--base Junicode-CondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondLight.pfb
@@ -7214,21 +7219,21 @@ Junicode-CondLight-inf-ot1 Junicode-CondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-CondLight-inf-t1--base Junicode-CondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-lgr Junicode-CondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ly1 Junicode-CondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-lgr Junicode-CondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ly1--base Junicode-CondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ot1--base Junicode-CondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-t1--base Junicode-CondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-lgr Junicode-CondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ot1--base Junicode-CondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-t1--base Junicode-CondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-lgr Junicode-CondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-ly1 Junicode-CondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondLight.pfb
@@ -7236,65 +7241,65 @@ Junicode-CondLight-sup-ot1 Junicode-CondLight " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-CondLight-sup-t1--base Junicode-CondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-lgr Junicode-CondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ly1 Junicode-CondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ot1--base Junicode-CondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-lgr Junicode-CondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-lgr Junicode-CondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ly1--base Junicode-CondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ot1--base Junicode-CondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-t1--base Junicode-CondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ly1 Junicode-CondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ot1 Junicode-CondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-t1--base Junicode-CondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1--base Junicode-CondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-t1--base Junicode-CondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-lgr Junicode-CondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ot1--base Junicode-CondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ly1 Junicode-CondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ot1 Junicode-CondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-t1--base Junicode-CondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-lgr Junicode-CondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ot1--base Junicode-CondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ot1 Junicode-CondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-lgr Junicode-CondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ot1--base Junicode-CondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-lgr Junicode-CondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-t1--base Junicode-CondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondMedium.pfb
@@ -7302,21 +7307,21 @@ Junicode-CondMedium-inf-ot1 Junicode-CondMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3p
Junicode-CondMedium-inf-t1--base Junicode-CondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-lgr Junicode-CondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ly1 Junicode-CondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ly1--base Junicode-CondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ot1--base Junicode-CondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-t1--base Junicode-CondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-lgr Junicode-CondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ot1--base Junicode-CondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-lgr Junicode-CondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-ly1 Junicode-CondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondMedium.pfb
@@ -7324,65 +7329,65 @@ Junicode-CondMedium-sup-ot1 Junicode-CondMedium " AutoEnc_ilb24pr2hmz3ktady5tx53
Junicode-CondMedium-sup-t1--base Junicode-CondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-lgr Junicode-CondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ly1 Junicode-CondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ot1--base Junicode-CondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-lgr Junicode-CondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-lgr Junicode-CondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ly1--base Junicode-CondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ot1--base Junicode-CondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-t1--base Junicode-CondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ly1 Junicode-CondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ot1 Junicode-CondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-t1--base Junicode-CondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1--base Junicode-CondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-lgr Junicode-CondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ot1--base Junicode-CondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ly1 Junicode-CondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ot1 Junicode-CondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-t1--base Junicode-CondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-lgr Junicode-CondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ot1--base Junicode-CondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ot1 Junicode-CondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-lgr Junicode-CondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ot1--base Junicode-CondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-lgr Junicode-CondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-Exp-inf-lgr Junicode-Exp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Exp.pfb
@@ -7390,21 +7395,21 @@ Junicode-Exp-inf-ot1 Junicode-Exp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeF
Junicode-Exp-inf-t1--base Junicode-Exp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-lf-lgr Junicode-Exp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ly1 Junicode-Exp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-lgr Junicode-Exp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ly1--base Junicode-Exp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ot1--base Junicode-Exp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-t1--base Junicode-Exp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-osf-lgr Junicode-Exp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ly1--base Junicode-Exp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ot1--base Junicode-Exp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-t1--base Junicode-Exp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-sup-lgr Junicode-Exp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-sup-ly1 Junicode-Exp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Exp.pfb
@@ -7412,21 +7417,21 @@ Junicode-Exp-sup-ot1 Junicode-Exp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeF
Junicode-Exp-sup-t1--base Junicode-Exp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-lgr Junicode-Exp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ly1 Junicode-Exp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ot1--base Junicode-Exp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-t1--base Junicode-Exp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-lgr Junicode-Exp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-lgr Junicode-Exp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ly1--base Junicode-Exp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ot1--base Junicode-Exp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-t1--base Junicode-Exp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpBold.pfb
@@ -7434,21 +7439,21 @@ Junicode-ExpBold-inf-ot1 Junicode-ExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-ExpBold-inf-t1--base Junicode-ExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-lgr Junicode-ExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ly1 Junicode-ExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ly1--base Junicode-ExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ot1--base Junicode-ExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-t1--base Junicode-ExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-lgr Junicode-ExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ot1--base Junicode-ExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-lgr Junicode-ExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-ly1 Junicode-ExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpBold.pfb
@@ -7456,109 +7461,109 @@ Junicode-ExpBold-sup-ot1 Junicode-ExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-ExpBold-sup-t1--base Junicode-ExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-lgr Junicode-ExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ly1 Junicode-ExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ot1--base Junicode-ExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-lgr Junicode-ExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-lgr Junicode-ExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ly1--base Junicode-ExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ot1--base Junicode-ExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-t1--base Junicode-ExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ly1 Junicode-ExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ot1 Junicode-ExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-t1--base Junicode-ExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1--base Junicode-ExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-lgr Junicode-ExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ot1--base Junicode-ExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ly1 Junicode-ExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ot1 Junicode-ExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-t1--base Junicode-ExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-lgr Junicode-ExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ot1--base Junicode-ExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ot1 Junicode-ExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-lgr Junicode-ExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ot1--base Junicode-ExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ly1 Junicode-ExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ot1 Junicode-ExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-t1--base Junicode-ExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-lgr Junicode-ExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1--base Junicode-ExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ly1--base Junicode-ExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ot1--base Junicode-ExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-t1--base Junicode-ExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-lgr Junicode-ExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ot1--base Junicode-ExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-lgr Junicode-ExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ly1 Junicode-ExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ot1 Junicode-ExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-t1--base Junicode-ExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-lgr Junicode-ExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ot1--base Junicode-ExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ot1 Junicode-ExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ot1--base Junicode-ExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-lgr Junicode-ExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ot1--base Junicode-ExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-lgr Junicode-ExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ly1--base Junicode-ExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-t1--base Junicode-ExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
@@ -7566,21 +7571,21 @@ Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-lgr Junicode-ExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ly1--base Junicode-ExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ot1--base Junicode-ExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-t1--base Junicode-ExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-lgr Junicode-ExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-lgr Junicode-ExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
@@ -7588,65 +7593,65 @@ Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-lgr Junicode-ExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ly1 Junicode-ExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ot1--base Junicode-ExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-lgr Junicode-ExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-lgr Junicode-ExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ly1--base Junicode-ExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-t1--base Junicode-ExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ly1 Junicode-ExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ot1 Junicode-ExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-t1--base Junicode-ExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1--base Junicode-ExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-lgr Junicode-ExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ot1--base Junicode-ExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ly1 Junicode-ExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ot1 Junicode-ExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-t1--base Junicode-ExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-lgr Junicode-ExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ot1--base Junicode-ExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ot1 Junicode-ExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-lgr Junicode-ExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ot1--base Junicode-ExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
@@ -7654,21 +7659,21 @@ Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-t1--base Junicode-ExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-lgr Junicode-ExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
@@ -7676,109 +7681,109 @@ Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-lgr Junicode-ExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ly1 Junicode-ExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-lgr Junicode-ExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-lgr Junicode-ExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-t1--base Junicode-ExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-lgr Junicode-ExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ly1 Junicode-ExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ot1 Junicode-ExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-lgr Junicode-ExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-lgr Junicode-ExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-Italic-inf-lgr Junicode-Italic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ly1 Junicode-Italic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ot1 Junicode-Italic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-Italic.pfb
Junicode-Italic-inf-t1--base Junicode-Italic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-Italic.pfb
Junicode-Italic-lf-lgr Junicode-Italic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1--base Junicode-Italic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-lgr Junicode-Italic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ly1--base Junicode-Italic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ot1--base Junicode-Italic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-t1--base Junicode-Italic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-Italic.pfb
Junicode-Italic-lf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-osf-lgr Junicode-Italic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ot1--base Junicode-Italic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ot1 Junicode-Italic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ly1--base Junicode-Italic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ot1--base Junicode-Italic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-t1--base Junicode-Italic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-sup-lgr Junicode-Italic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ly1 Junicode-Italic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ot1 Junicode-Italic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-Italic.pfb
Junicode-Italic-sup-t1--base Junicode-Italic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-lgr Junicode-Italic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ot1--base Junicode-Italic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ot1 Junicode-Italic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ot1--base Junicode-Italic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-t1--base Junicode-Italic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-lgr Junicode-Italic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ot1--base Junicode-Italic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ot1 Junicode-Italic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-lgr Junicode-Italic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ly1--base Junicode-Italic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ot1--base Junicode-Italic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-t1--base Junicode-Italic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Light-inf-lgr Junicode-Light " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Light.pfb
@@ -7786,21 +7791,21 @@ Junicode-Light-inf-ot1 Junicode-Light " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-Light-inf-t1--base Junicode-Light " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-lf-lgr Junicode-Light " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Light.pfb
Junicode-Light-lf-ly1 Junicode-Light " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-lgr Junicode-Light " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ly1--base Junicode-Light " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ot1--base Junicode-Light " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-t1--base Junicode-Light " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Light.pfb
Junicode-Light-lf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-osf-lgr Junicode-Light " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Light.pfb
-Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Light.pfb
+Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ly1--base Junicode-Light " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ot1--base Junicode-Light " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-t1--base Junicode-Light " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Light.pfb
-Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Light.pfb
+Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-sup-lgr Junicode-Light " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-sup-ly1 Junicode-Light " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Light.pfb
@@ -7808,65 +7813,65 @@ Junicode-Light-sup-ot1 Junicode-Light " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-Light-sup-t1--base Junicode-Light " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Light.pfb
Junicode-Light-tlf-lgr Junicode-Light " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Light.pfb
Junicode-Light-tlf-ly1 Junicode-Light " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Light.pfb
-Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Light.pfb
+Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ly1--base Junicode-Light " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ot1--base Junicode-Light " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-t1--base Junicode-Light " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Light.pfb
-Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Light.pfb
+Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-Light-tosf-lgr Junicode-Light " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Light.pfb
-Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Light.pfb
+Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-lgr Junicode-Light " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ly1--base Junicode-Light " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ot1--base Junicode-Light " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-t1--base Junicode-Light " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Light.pfb
-Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Light.pfb
+Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ly1 Junicode-LightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ot1 Junicode-LightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-t1--base Junicode-LightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-lgr Junicode-LightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1--base Junicode-LightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ly1--base Junicode-LightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ot1--base Junicode-LightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-t1--base Junicode-LightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-lgr Junicode-LightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ot1--base Junicode-LightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ot1 Junicode-LightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ot1--base Junicode-LightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-lgr Junicode-LightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ly1 Junicode-LightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ot1 Junicode-LightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-t1--base Junicode-LightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-lgr Junicode-LightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ot1--base Junicode-LightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ot1 Junicode-LightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ot1--base Junicode-LightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-lgr Junicode-LightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ot1--base Junicode-LightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ot1 Junicode-LightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-lgr Junicode-LightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ly1--base Junicode-LightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ot1--base Junicode-LightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-t1--base Junicode-LightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-Medium-inf-lgr Junicode-Medium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Medium.pfb
@@ -7874,21 +7879,21 @@ Junicode-Medium-inf-ot1 Junicode-Medium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-Medium-inf-t1--base Junicode-Medium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-lf-lgr Junicode-Medium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ly1 Junicode-Medium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-lgr Junicode-Medium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ly1--base Junicode-Medium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ot1--base Junicode-Medium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-t1--base Junicode-Medium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-osf-lgr Junicode-Medium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ly1--base Junicode-Medium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ot1--base Junicode-Medium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-t1--base Junicode-Medium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-sup-lgr Junicode-Medium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-sup-ly1 Junicode-Medium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Medium.pfb
@@ -7896,65 +7901,65 @@ Junicode-Medium-sup-ot1 Junicode-Medium " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-Medium-sup-t1--base Junicode-Medium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-lgr Junicode-Medium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ly1 Junicode-Medium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ot1--base Junicode-Medium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-t1--base Junicode-Medium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-lgr Junicode-Medium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-lgr Junicode-Medium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ly1--base Junicode-Medium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ot1--base Junicode-Medium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-t1--base Junicode-Medium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ly1 Junicode-MediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ot1 Junicode-MediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-t1--base Junicode-MediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-lgr Junicode-MediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1--base Junicode-MediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ly1--base Junicode-MediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ot1--base Junicode-MediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-t1--base Junicode-MediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-lgr Junicode-MediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ot1--base Junicode-MediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-lgr Junicode-MediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ly1 Junicode-MediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ot1 Junicode-MediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-t1--base Junicode-MediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-lgr Junicode-MediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ot1--base Junicode-MediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ot1 Junicode-MediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ot1--base Junicode-MediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-lgr Junicode-MediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ot1--base Junicode-MediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-lgr Junicode-MediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ly1--base Junicode-MediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-t1--base Junicode-MediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-Regular-inf-lgr Junicode-Regular " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Regular.pfb
@@ -7962,21 +7967,21 @@ Junicode-Regular-inf-ot1 Junicode-Regular " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-Regular-inf-t1--base Junicode-Regular " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-lf-lgr Junicode-Regular " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ly1 Junicode-Regular " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-lgr Junicode-Regular " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ly1--base Junicode-Regular " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ot1--base Junicode-Regular " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-t1--base Junicode-Regular " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-osf-lgr Junicode-Regular " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ly1--base Junicode-Regular " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ot1--base Junicode-Regular " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-t1--base Junicode-Regular " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-sup-lgr Junicode-Regular " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-sup-ly1 Junicode-Regular " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Regular.pfb
@@ -7984,21 +7989,21 @@ Junicode-Regular-sup-ot1 Junicode-Regular " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-Regular-sup-t1--base Junicode-Regular " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-lgr Junicode-Regular " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ly1 Junicode-Regular " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ot1--base Junicode-Regular " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-t1--base Junicode-Regular " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-lgr Junicode-Regular " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-lgr Junicode-Regular " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ly1--base Junicode-Regular " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ot1--base Junicode-Regular " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-t1--base Junicode-Regular " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmBold.pfb
@@ -8006,21 +8011,21 @@ Junicode-SmBold-inf-ot1 Junicode-SmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmBold-inf-t1--base Junicode-SmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-lgr Junicode-SmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ly1 Junicode-SmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-lgr Junicode-SmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ly1--base Junicode-SmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ot1--base Junicode-SmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-t1--base Junicode-SmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-lgr Junicode-SmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ot1--base Junicode-SmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-t1--base Junicode-SmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-lgr Junicode-SmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-ly1 Junicode-SmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmBold.pfb
@@ -8028,65 +8033,65 @@ Junicode-SmBold-sup-ot1 Junicode-SmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmBold-sup-t1--base Junicode-SmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-lgr Junicode-SmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ly1 Junicode-SmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ot1--base Junicode-SmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-lgr Junicode-SmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-lgr Junicode-SmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ly1--base Junicode-SmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ot1--base Junicode-SmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-t1--base Junicode-SmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ly1 Junicode-SmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ot1 Junicode-SmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-t1--base Junicode-SmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1--base Junicode-SmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-lgr Junicode-SmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ot1--base Junicode-SmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ly1 Junicode-SmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ot1 Junicode-SmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-t1--base Junicode-SmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-lgr Junicode-SmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ot1--base Junicode-SmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ot1 Junicode-SmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-lgr Junicode-SmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ot1--base Junicode-SmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-lgr Junicode-SmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCond.pfb
@@ -8094,21 +8099,21 @@ Junicode-SmCond-inf-ot1 Junicode-SmCond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmCond-inf-t1--base Junicode-SmCond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-lgr Junicode-SmCond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ly1 Junicode-SmCond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-lgr Junicode-SmCond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ly1--base Junicode-SmCond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ot1--base Junicode-SmCond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-t1--base Junicode-SmCond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-lgr Junicode-SmCond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ot1--base Junicode-SmCond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-t1--base Junicode-SmCond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-lgr Junicode-SmCond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-ly1 Junicode-SmCond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCond.pfb
@@ -8116,65 +8121,65 @@ Junicode-SmCond-sup-ot1 Junicode-SmCond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmCond-sup-t1--base Junicode-SmCond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-lgr Junicode-SmCond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ly1 Junicode-SmCond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ot1--base Junicode-SmCond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-lgr Junicode-SmCond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-lgr Junicode-SmCond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ly1--base Junicode-SmCond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ot1--base Junicode-SmCond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-t1--base Junicode-SmCond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ly1 Junicode-SmCondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ot1 Junicode-SmCondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-t1--base Junicode-SmCondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1--base Junicode-SmCondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-t1--base Junicode-SmCondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-lgr Junicode-SmCondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ot1--base Junicode-SmCondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ly1 Junicode-SmCondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ot1 Junicode-SmCondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-t1--base Junicode-SmCondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-lgr Junicode-SmCondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ot1--base Junicode-SmCondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ot1 Junicode-SmCondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-lgr Junicode-SmCondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ot1--base Junicode-SmCondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-lgr Junicode-SmCondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-t1--base Junicode-SmCondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
@@ -8182,21 +8187,21 @@ Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-lgr Junicode-SmCondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ly1--base Junicode-SmCondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ot1--base Junicode-SmCondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-t1--base Junicode-SmCondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-lgr Junicode-SmCondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-lgr Junicode-SmCondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
@@ -8204,65 +8209,65 @@ Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-lgr Junicode-SmCondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ly1 Junicode-SmCondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ot1--base Junicode-SmCondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-lgr Junicode-SmCondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-lgr Junicode-SmCondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ly1--base Junicode-SmCondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-t1--base Junicode-SmCondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ly1 Junicode-SmCondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ot1 Junicode-SmCondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-t1--base Junicode-SmCondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1--base Junicode-SmCondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-lgr Junicode-SmCondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ot1--base Junicode-SmCondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ly1 Junicode-SmCondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ot1 Junicode-SmCondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-t1--base Junicode-SmCondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-lgr Junicode-SmCondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ot1--base Junicode-SmCondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ot1 Junicode-SmCondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-lgr Junicode-SmCondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ot1--base Junicode-SmCondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
@@ -8270,21 +8275,21 @@ Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium " AutoEnc_ldcvmrfllg5ebu6xfr
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-t1--base Junicode-SmCondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-lgr Junicode-SmCondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
@@ -8292,65 +8297,65 @@ Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium " AutoEnc_ilb24pr2hmz3ktady5
Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-lgr Junicode-SmCondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ly1 Junicode-SmCondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-lgr Junicode-SmCondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-lgr Junicode-SmCondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-t1--base Junicode-SmCondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ly1 Junicode-SmCondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ot1 Junicode-SmCondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-t1--base Junicode-SmCondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-lgr Junicode-SmCondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ly1 Junicode-SmCondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ot1 Junicode-SmCondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-t1--base Junicode-SmCondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-lgr Junicode-SmCondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ot1 Junicode-SmCondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-lgr Junicode-SmCondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmExp-inf-lgr Junicode-SmExp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
Junicode-SmExp-inf-ly1 Junicode-SmExp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExp.pfb
@@ -8358,21 +8363,21 @@ Junicode-SmExp-inf-ot1 Junicode-SmExp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-SmExp-inf-t1--base Junicode-SmExp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-lgr Junicode-SmExp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ly1 Junicode-SmExp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-lgr Junicode-SmExp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ly1--base Junicode-SmExp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ot1--base Junicode-SmExp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-t1--base Junicode-SmExp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-lgr Junicode-SmExp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ot1--base Junicode-SmExp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-t1--base Junicode-SmExp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-lgr Junicode-SmExp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-ly1 Junicode-SmExp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExp.pfb
@@ -8380,21 +8385,21 @@ Junicode-SmExp-sup-ot1 Junicode-SmExp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-SmExp-sup-t1--base Junicode-SmExp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-lgr Junicode-SmExp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ot1--base Junicode-SmExp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-lgr Junicode-SmExp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ot1--base Junicode-SmExp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
@@ -8402,21 +8407,21 @@ Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-lgr Junicode-SmExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ly1--base Junicode-SmExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ot1--base Junicode-SmExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-t1--base Junicode-SmExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-lgr Junicode-SmExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-lgr Junicode-SmExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
@@ -8424,109 +8429,109 @@ Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-lgr Junicode-SmExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ly1 Junicode-SmExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ot1--base Junicode-SmExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-lgr Junicode-SmExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-lgr Junicode-SmExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ly1--base Junicode-SmExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-t1--base Junicode-SmExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ly1 Junicode-SmExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ot1 Junicode-SmExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-t1--base Junicode-SmExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-lgr Junicode-SmExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ly1 Junicode-SmExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ot1 Junicode-SmExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-t1--base Junicode-SmExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-lgr Junicode-SmExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ot1 Junicode-SmExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-lgr Junicode-SmExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ly1 Junicode-SmExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ot1 Junicode-SmExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-t1--base Junicode-SmExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1--base Junicode-SmExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-t1--base Junicode-SmExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-lgr Junicode-SmExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ot1--base Junicode-SmExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ly1 Junicode-SmExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ot1 Junicode-SmExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-t1--base Junicode-SmExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-lgr Junicode-SmExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ot1--base Junicode-SmExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ot1 Junicode-SmExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-lgr Junicode-SmExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ot1--base Junicode-SmExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-lgr Junicode-SmExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-t1--base Junicode-SmExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
@@ -8534,21 +8539,21 @@ Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-t1--base Junicode-SmExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-lgr Junicode-SmExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
@@ -8556,65 +8561,65 @@ Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-lgr Junicode-SmExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-lgr Junicode-SmExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ly1 Junicode-SmExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ot1 Junicode-SmExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-t1--base Junicode-SmExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-lgr Junicode-SmExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ly1 Junicode-SmExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ot1 Junicode-SmExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-t1--base Junicode-SmExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-lgr Junicode-SmExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-lgr Junicode-SmExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
@@ -8622,21 +8627,21 @@ Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-lgr Junicode-SmExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
@@ -8644,65 +8649,65 @@ Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-lgr Junicode-SmExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-lgr Junicode-SmExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
% Kinigcap.map
Kinigcap KinigsteinCaps <Kinigcap.pfb
@@ -13953,10 +13958,10 @@ XCharter-Bold-lf-ot1 XCharter-Bold " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEncode
XCharter-Bold-lf-sc-ly1--base XCharter-Bold " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-ot1--base XCharter-Bold " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t1--base XCharter-Bold " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t2asrb--base XCharter-Bold " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t1--base XCharter-Bold " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t2asrb XCharter-Bold " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ly1--base XCharter-Bold " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ot1 XCharter-Bold " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Bold.pfb
@@ -13966,15 +13971,15 @@ XCharter-Bold-osf-ot1 XCharter-Bold " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReEncod
XCharter-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t1--base XCharter-Bold " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t2asrb XCharter-Bold " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ly1--base XCharter-Bold " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ot1 XCharter-Bold " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t1--base XCharter-Bold " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Bold.pfb
+XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t2asrb XCharter-Bold " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ly1--base XCharter-Bold " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ot1 XCharter-Bold " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Bold.pfb
@@ -13982,20 +13987,20 @@ XCharter-Bold-tlf-ot2 XCharter-Bold " xcharterOT2enc ReEncodeFont " <[xcharter-o
XCharter-Bold-tlf-sc-ly1--base XCharter-Bold " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-ot1--base XCharter-Bold " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t1--base XCharter-Bold " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t2asrb--base XCharter-Bold " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t1--base XCharter-Bold " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t2asrb XCharter-Bold " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ly1--base XCharter-Bold " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ot1 XCharter-Bold " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t1--base XCharter-Bold " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t2asrb XCharter-Bold " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Bold.pfb
XCharter-Bold-ts1--base XCharter-Bold " AutoEnc_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch_z3wvjz.enc <XCharter-Bold.pfb
XCharter-BoldItalic-dnom-ly1--base XCharter-BoldItalic " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldItalic.pfb
@@ -14009,10 +14014,10 @@ XCharter-BoldItalic-lf-ot1 XCharter-BoldItalic " AutoEnc_ru4hosnl6h5ukcp2w3tt2ie
XCharter-BoldItalic-lf-sc-ly1--base XCharter-BoldItalic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-ot1--base XCharter-BoldItalic " AutoEnc_7qcosniepdkkhq2lidq32xyajh ReEncodeFont " <[xch_7qcosn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t1--base XCharter-BoldItalic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t1--base XCharter-BoldItalic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t2asrb XCharter-BoldItalic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ly1--base XCharter-BoldItalic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ot1 XCharter-BoldItalic " AutoEnc_qs7dmbcmqkgbo6666jibzn77ta ReEncodeFont " <[xch_qs7dmb.enc <XCharter-BoldItalic.pfb
@@ -14022,15 +14027,15 @@ XCharter-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc_aegaiust5jvuyf74wgreek
XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ot1 XCharter-BoldItalic " AutoEnc_gkuln73auq7qfnbajjeh66tiyg ReEncodeFont " <[xch_gkuln7.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t2asrb XCharter-BoldItalic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ot1 XCharter-BoldItalic " AutoEnc_lfc2esxm2njp63bgoww5uifspg ReEncodeFont " <[xch_lfc2es.enc <XCharter-BoldItalic.pfb
@@ -14038,20 +14043,20 @@ XCharter-BoldItalic-tlf-ot2 XCharter-BoldItalic " xcharterOT2enc ReEncodeFont "
XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jffewfvsu3e3ihebccixpovvra ReEncodeFont " <[xch_jffewf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t2asrb XCharter-BoldItalic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter-BoldSlanted-dnom-ly1--base XCharter-BoldSlanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldSlanted.pfb
@@ -14065,10 +14070,10 @@ XCharter-BoldSlanted-lf-ot1 XCharter-BoldSlanted " AutoEnc_aoa5sqhsbxws2dsjkwdeq
XCharter-BoldSlanted-lf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t1--base XCharter-BoldSlanted " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t1--base XCharter-BoldSlanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t2asrb XCharter-BoldSlanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ly1--base XCharter-BoldSlanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ot1 XCharter-BoldSlanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-BoldSlanted.pfb
@@ -14078,15 +14083,15 @@ XCharter-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc_g2zr6i3czinzql75wmpz
XCharter-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ly1--base XCharter-BoldSlanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ot1 XCharter-BoldSlanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t1--base XCharter-BoldSlanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t2asrb XCharter-BoldSlanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ly1--base XCharter-BoldSlanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ot1 XCharter-BoldSlanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-BoldSlanted.pfb
@@ -14094,20 +14099,20 @@ XCharter-BoldSlanted-tlf-ot2 XCharter-BoldSlanted " xcharterOT2enc ReEncodeFont
XCharter-BoldSlanted-tlf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t1--base XCharter-BoldSlanted " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t1--base XCharter-BoldSlanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t2asrb XCharter-BoldSlanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter-Ita-alph XCharter-Italic " chalphEncoding ReEncodeFont " <[chalph.enc <XCharter-Italic.pfb
@@ -14122,10 +14127,10 @@ XCharter-Italic-lf-ot1 XCharter-Italic " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEn
XCharter-Italic-lf-sc-ly1--base XCharter-Italic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-ot1--base XCharter-Italic " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t1--base XCharter-Italic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t2asrb--base XCharter-Italic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t1--base XCharter-Italic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t2asrb XCharter-Italic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ly1--base XCharter-Italic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ot1 XCharter-Italic " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Italic.pfb
@@ -14135,15 +14140,15 @@ XCharter-Italic-osf-ot1 XCharter-Italic " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReE
XCharter-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t1--base XCharter-Italic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t2asrb XCharter-Italic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ly1--base XCharter-Italic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ot1 XCharter-Italic " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t1--base XCharter-Italic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Italic.pfb
+XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t2asrb XCharter-Italic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ly1--base XCharter-Italic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ot1 XCharter-Italic " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Italic.pfb
@@ -14151,20 +14156,20 @@ XCharter-Italic-tlf-ot2 XCharter-Italic " xcharterOT2enc ReEncodeFont " <[xchart
XCharter-Italic-tlf-sc-ly1--base XCharter-Italic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-ot1--base XCharter-Italic " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t1--base XCharter-Italic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t2asrb--base XCharter-Italic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t1--base XCharter-Italic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t2asrb XCharter-Italic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ly1--base XCharter-Italic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ot1 XCharter-Italic " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t1--base XCharter-Italic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t2asrb XCharter-Italic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-Italic.pfb
XCharter-Italic-ts1--base XCharter-Italic " AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch_pqp4df.enc <XCharter-Italic.pfb
XCharter-Roman-dnom-ly1--base XCharter-Roman " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Roman.pfb
@@ -14178,12 +14183,12 @@ XCharter-Roman-lf-ot1 XCharter-Roman " AutoEnc_bbupxqigkbffslxhtvjmz5qdhb ReEnco
XCharter-Roman-lf-sc-ly1--base XCharter-Roman " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-ot1--base XCharter-Roman " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t1--base XCharter-Roman " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t2asrb--base XCharter-Roman " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t1--base XCharter-Roman " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_6ckksab4xgup3cfdzppakccfch ReEncodeFont " <[xch_6ckksa.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_ajf4qeyyzlwr22lxwfvdvytw4h ReEncodeFont " <[xch_ajf4qe.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t2asrb XCharter-Roman " AutoEnc_2ne5ras2ihnhgxt43rxslgjvce ReEncodeFont " <[xch_2ne5ra.enc <XCharter-Roman.pfb
-XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Roman.pfb
+XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_du7eesfjv53g5kmcdg53pxaz6g ReEncodeFont " <[xch_du7ees.enc <XCharter-Roman.pfb
XCharter-Roman-numr-ot1 XCharter-Roman " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Roman.pfb
XCharter-Roman-numr-t1--base XCharter-Roman " AutoEnc_aw3womsecdumtuxvl6hik6fs3a ReEncodeFont " <[xch_aw3wom.enc <XCharter-Roman.pfb
XCharter-Roman-osf-ly1--base XCharter-Roman " AutoEnc_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch_5xvt3q.enc <XCharter-Roman.pfb
@@ -14191,15 +14196,15 @@ XCharter-Roman-osf-ot1 XCharter-Roman " AutoEnc_ylqpprchpltakubnfx2ql7fllf ReEnc
XCharter-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t1--base XCharter-Roman " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch_cjimfy.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch_5b6tid.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t2asrb XCharter-Roman " AutoEnc_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch_2itbay.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ly1--base XCharter-Roman " AutoEnc_ukw3hq7h3prn34ryh2qktyrkse ReEncodeFont " <[xch_ukw3hq.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ot1 XCharter-Roman " AutoEnc_dhwwz5gerbpejovfe253unwxde ReEncodeFont " <[xch_dhwwz5.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t1--base XCharter-Roman " AutoEnc_6hzluovfqgqjqwjosfm7uze3oh ReEncodeFont " <[xch_6hzluo.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_pz3lxgt2tnxz7p6istzozn734g ReEncodeFont " <[xch_pz3lxg.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_7rlj4vy6adeoxbzopcxh2vadqb ReEncodeFont " <[xch_7rlj4v.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t2asrb XCharter-Roman " AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf ReEncodeFont " <[xch_vyhv3k.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ly1--base XCharter-Roman " AutoEnc_worivip5whk4cqev33dw4cszae ReEncodeFont " <[xch_worivi.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ot1 XCharter-Roman " AutoEnc_3glltskulaq25sg7bdv2b6v7sb ReEncodeFont " <[xch_3gllts.enc <XCharter-Roman.pfb
@@ -14207,20 +14212,20 @@ XCharter-Roman-tlf-ot2 XCharter-Roman " xcharterOT2enc ReEncodeFont " <[xcharter
XCharter-Roman-tlf-sc-ly1--base XCharter-Roman " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-ot1--base XCharter-Roman " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t1--base XCharter-Roman " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t2asrb--base XCharter-Roman " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t1--base XCharter-Roman " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_m2vrds6ohoduinigqjp2pulx6b ReEncodeFont " <[xch_m2vrds.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_4difzdpgpp73nhcpkiia7rn64h ReEncodeFont " <[xch_4difzd.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t2asrb XCharter-Roman " AutoEnc_fiqldzomfw67cfhl2p3wqrxjna ReEncodeFont " <[xch_fiqldz.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ly1--base XCharter-Roman " AutoEnc_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch_crvcmi.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ot1 XCharter-Roman " AutoEnc_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch_45bsgy.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t1--base XCharter-Roman " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch_tohekq.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch_lhsfh5.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t2asrb XCharter-Roman " AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch_dynzsr.enc <XCharter-Roman.pfb
XCharter-Roman-ts1--base XCharter-Roman " AutoEnc_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch_co4ru4.enc <XCharter-Roman.pfb
XCharter-Slanted-dnom-ly1--base XCharter-Slanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Slanted.pfb
@@ -14234,10 +14239,10 @@ XCharter-Slanted-lf-ot1 XCharter-Slanted " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb Re
XCharter-Slanted-lf-sc-ly1--base XCharter-Slanted " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-ot1--base XCharter-Slanted " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t1--base XCharter-Slanted " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t2asrb--base XCharter-Slanted " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t1--base XCharter-Slanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t2asrb XCharter-Slanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ly1--base XCharter-Slanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ot1 XCharter-Slanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Slanted.pfb
@@ -14247,15 +14252,15 @@ XCharter-Slanted-osf-ot1 XCharter-Slanted " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb R
XCharter-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t1--base XCharter-Slanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ly1--base XCharter-Slanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ot1 XCharter-Slanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t1--base XCharter-Slanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Slanted.pfb
-XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Slanted.pfb
+XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t2asrb XCharter-Slanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ly1--base XCharter-Slanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ot1 XCharter-Slanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Slanted.pfb
@@ -14263,20 +14268,20 @@ XCharter-Slanted-tlf-ot2 XCharter-Slanted " xcharterOT2enc ReEncodeFont " <[xcha
XCharter-Slanted-tlf-sc-ly1--base XCharter-Slanted " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-ot1--base XCharter-Slanted " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t1--base XCharter-Slanted " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t2asrb--base XCharter-Slanted " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t1--base XCharter-Slanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t2asrb XCharter-Slanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Slanted.pfb
XCharter-Slanted-ts1--base XCharter-Slanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-Slanted.pfb
XCharter-osf XCharter-Roman " chtabOsFEncoding ReEncodeFont " <[chtabosf.enc <XCharter-Roman.pfb
@@ -14285,20 +14290,20 @@ XCharter1-Bold-osf-ot1 XCharter-Bold " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb ReEnc
XCharter1-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t1--base XCharter-Bold " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t2asrb XCharter-Bold " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ly1--base XCharter-Bold " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ot1 XCharter-Bold " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t1--base XCharter-Bold " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t2asrb XCharter-Bold " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Bold.pfb
XCharter1-Bold-ts1--base XCharter-Bold " AutoEnc1_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch1_z3wvjz.enc <XCharter-Bold.pfb
XCharter1-BoldItalic-osf-ly1--base XCharter-BoldItalic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldItalic.pfb
@@ -14306,20 +14311,20 @@ XCharter1-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc1_aegaiust5jvuyf74wgre
XCharter1-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch1_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc1_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch1_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch1_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc1_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch1_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter1-BoldSlanted-osf-ly1--base XCharter-BoldSlanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldSlanted.pfb
@@ -14327,20 +14332,20 @@ XCharter1-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc1_g2zr6i3czinzql75wm
XCharter1-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter1-Italic-osf-ly1--base XCharter-Italic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Italic.pfb
@@ -14348,20 +14353,20 @@ XCharter1-Italic-osf-ot1 XCharter-Italic " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb R
XCharter1-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t1--base XCharter-Italic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t2asrb XCharter-Italic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ly1--base XCharter-Italic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ot1 XCharter-Italic " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t1--base XCharter-Italic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t2asrb XCharter-Italic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-Italic.pfb
XCharter1-Italic-ts1--base XCharter-Italic " AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch1_pqp4df.enc <XCharter-Italic.pfb
XCharter1-Roman-osf-ly1--base XCharter-Roman " AutoEnc1_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch1_5xvt3q.enc <XCharter-Roman.pfb
@@ -14369,20 +14374,20 @@ XCharter1-Roman-osf-ot1 XCharter-Roman " AutoEnc1_ylqpprchpltakubnfx2ql7fllf ReE
XCharter1-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t1--base XCharter-Roman " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch1_cjimfy.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch1_5b6tid.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t2asrb XCharter-Roman " AutoEnc1_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch1_2itbay.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ly1--base XCharter-Roman " AutoEnc1_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch1_crvcmi.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ot1 XCharter-Roman " AutoEnc1_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch1_45bsgy.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t1--base XCharter-Roman " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch1_tohekq.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch1_lhsfh5.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t2asrb XCharter-Roman " AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch1_dynzsr.enc <XCharter-Roman.pfb
XCharter1-Roman-ts1--base XCharter-Roman " AutoEnc1_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch1_co4ru4.enc <XCharter-Roman.pfb
XCharter1-Slanted-osf-ly1--base XCharter-Slanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Slanted.pfb
@@ -14390,20 +14395,20 @@ XCharter1-Slanted-osf-ot1 XCharter-Slanted " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb
XCharter1-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t1--base XCharter-Slanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Slanted.pfb
XCharter1-Slanted-ts1--base XCharter-Slanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-Slanted.pfb
XCharter1TH-BoldItalic-osf-ly1 XCharter-BoldItalic " xch1TH-osf-ly1Enc ReEncodeFont " <xch1TH_osf-ly1.enc <XCharter-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
index 58e8b2595d2..0091f23bbc7 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
@@ -10680,6 +10680,11 @@ GaramondLibre-Regular-sup-t1--base GaramondLibre-Regular " AutoEnc_wkdlc77kkm5gx
GaramondLibre-Regular-sup-t2a GaramondLibre-Regular " AutoEnc_y75trcdjmjxcjj4wfzzyxacoye ReEncodeFont " <[grmlbr_y75trc.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2b GaramondLibre-Regular " AutoEnc_af3fmk7furqbz6algofaeeeujh ReEncodeFont " <[grmlbr_af3fmk.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2c GaramondLibre-Regular " AutoEnc_6l5pxogsiubowbnn4oh47tlyuf ReEncodeFont " <[grmlbr_6l5pxo.enc <GaramondLibre-Regular.pfb
+% GelasioMath.map
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
% GotIn.map
GotIn GotischeInitialen <GotIn.pfb
% GoudyIn.map
@@ -11583,21 +11588,21 @@ Junicode-Bold-inf-ot1 Junicode-Bold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Bold-inf-t1--base Junicode-Bold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-lf-lgr Junicode-Bold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ly1 Junicode-Bold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-lgr Junicode-Bold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ly1--base Junicode-Bold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ot1--base Junicode-Bold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-t1--base Junicode-Bold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-osf-lgr Junicode-Bold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ly1--base Junicode-Bold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ot1--base Junicode-Bold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-t1--base Junicode-Bold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-sup-lgr Junicode-Bold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-sup-ly1 Junicode-Bold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Bold.pfb
@@ -11605,65 +11610,65 @@ Junicode-Bold-sup-ot1 Junicode-Bold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Bold-sup-t1--base Junicode-Bold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-lgr Junicode-Bold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ly1 Junicode-Bold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ot1--base Junicode-Bold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-t1--base Junicode-Bold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-lgr Junicode-Bold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-lgr Junicode-Bold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ly1--base Junicode-Bold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ot1--base Junicode-Bold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-t1--base Junicode-Bold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ly1 Junicode-BoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ot1 Junicode-BoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-t1--base Junicode-BoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-lgr Junicode-BoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1--base Junicode-BoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ly1--base Junicode-BoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ot1--base Junicode-BoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-t1--base Junicode-BoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-lgr Junicode-BoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ot1--base Junicode-BoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ot1 Junicode-BoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-lgr Junicode-BoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ly1 Junicode-BoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ot1 Junicode-BoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-t1--base Junicode-BoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-lgr Junicode-BoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ot1--base Junicode-BoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ot1 Junicode-BoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ot1--base Junicode-BoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-lgr Junicode-BoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ot1--base Junicode-BoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-lgr Junicode-BoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ly1--base Junicode-BoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-t1--base Junicode-BoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-Cond-inf-lgr Junicode-Cond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Cond.pfb
@@ -11671,21 +11676,21 @@ Junicode-Cond-inf-ot1 Junicode-Cond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Cond-inf-t1--base Junicode-Cond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-lf-lgr Junicode-Cond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ly1 Junicode-Cond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-lgr Junicode-Cond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ly1--base Junicode-Cond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ot1--base Junicode-Cond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-t1--base Junicode-Cond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-osf-lgr Junicode-Cond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ly1--base Junicode-Cond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ot1--base Junicode-Cond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-t1--base Junicode-Cond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-sup-lgr Junicode-Cond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-sup-ly1 Junicode-Cond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Cond.pfb
@@ -11693,65 +11698,65 @@ Junicode-Cond-sup-ot1 Junicode-Cond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Cond-sup-t1--base Junicode-Cond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-lgr Junicode-Cond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ly1 Junicode-Cond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ot1--base Junicode-Cond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-t1--base Junicode-Cond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-lgr Junicode-Cond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-lgr Junicode-Cond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ly1--base Junicode-Cond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ot1--base Junicode-Cond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-t1--base Junicode-Cond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ly1 Junicode-CondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ot1 Junicode-CondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-t1--base Junicode-CondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-lgr Junicode-CondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1--base Junicode-CondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ly1--base Junicode-CondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ot1--base Junicode-CondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-t1--base Junicode-CondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-lgr Junicode-CondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ot1--base Junicode-CondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ot1 Junicode-CondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ot1--base Junicode-CondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-lgr Junicode-CondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ly1 Junicode-CondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ot1 Junicode-CondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-t1--base Junicode-CondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-lgr Junicode-CondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ot1--base Junicode-CondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ot1 Junicode-CondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ot1--base Junicode-CondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-lgr Junicode-CondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ot1--base Junicode-CondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ot1 Junicode-CondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-lgr Junicode-CondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ly1--base Junicode-CondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ot1--base Junicode-CondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-t1--base Junicode-CondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondLight.pfb
@@ -11759,21 +11764,21 @@ Junicode-CondLight-inf-ot1 Junicode-CondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-CondLight-inf-t1--base Junicode-CondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-lgr Junicode-CondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ly1 Junicode-CondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-lgr Junicode-CondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ly1--base Junicode-CondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ot1--base Junicode-CondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-t1--base Junicode-CondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-lgr Junicode-CondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ot1--base Junicode-CondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-t1--base Junicode-CondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-lgr Junicode-CondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-ly1 Junicode-CondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondLight.pfb
@@ -11781,65 +11786,65 @@ Junicode-CondLight-sup-ot1 Junicode-CondLight " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-CondLight-sup-t1--base Junicode-CondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-lgr Junicode-CondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ly1 Junicode-CondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ot1--base Junicode-CondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-lgr Junicode-CondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-lgr Junicode-CondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ly1--base Junicode-CondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ot1--base Junicode-CondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-t1--base Junicode-CondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ly1 Junicode-CondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ot1 Junicode-CondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-t1--base Junicode-CondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1--base Junicode-CondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-t1--base Junicode-CondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-lgr Junicode-CondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ot1--base Junicode-CondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ly1 Junicode-CondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ot1 Junicode-CondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-t1--base Junicode-CondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-lgr Junicode-CondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ot1--base Junicode-CondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ot1 Junicode-CondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-lgr Junicode-CondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ot1--base Junicode-CondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-lgr Junicode-CondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-t1--base Junicode-CondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondMedium.pfb
@@ -11847,21 +11852,21 @@ Junicode-CondMedium-inf-ot1 Junicode-CondMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3p
Junicode-CondMedium-inf-t1--base Junicode-CondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-lgr Junicode-CondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ly1 Junicode-CondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ly1--base Junicode-CondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ot1--base Junicode-CondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-t1--base Junicode-CondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-lgr Junicode-CondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ot1--base Junicode-CondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-lgr Junicode-CondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-ly1 Junicode-CondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondMedium.pfb
@@ -11869,65 +11874,65 @@ Junicode-CondMedium-sup-ot1 Junicode-CondMedium " AutoEnc_ilb24pr2hmz3ktady5tx53
Junicode-CondMedium-sup-t1--base Junicode-CondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-lgr Junicode-CondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ly1 Junicode-CondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ot1--base Junicode-CondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-lgr Junicode-CondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-lgr Junicode-CondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ly1--base Junicode-CondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ot1--base Junicode-CondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-t1--base Junicode-CondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ly1 Junicode-CondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ot1 Junicode-CondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-t1--base Junicode-CondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1--base Junicode-CondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-lgr Junicode-CondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ot1--base Junicode-CondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ly1 Junicode-CondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ot1 Junicode-CondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-t1--base Junicode-CondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-lgr Junicode-CondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ot1--base Junicode-CondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ot1 Junicode-CondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-lgr Junicode-CondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ot1--base Junicode-CondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-lgr Junicode-CondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-Exp-inf-lgr Junicode-Exp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Exp.pfb
@@ -11935,21 +11940,21 @@ Junicode-Exp-inf-ot1 Junicode-Exp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeF
Junicode-Exp-inf-t1--base Junicode-Exp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-lf-lgr Junicode-Exp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ly1 Junicode-Exp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-lgr Junicode-Exp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ly1--base Junicode-Exp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ot1--base Junicode-Exp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-t1--base Junicode-Exp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-osf-lgr Junicode-Exp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ly1--base Junicode-Exp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ot1--base Junicode-Exp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-t1--base Junicode-Exp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-sup-lgr Junicode-Exp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-sup-ly1 Junicode-Exp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Exp.pfb
@@ -11957,21 +11962,21 @@ Junicode-Exp-sup-ot1 Junicode-Exp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeF
Junicode-Exp-sup-t1--base Junicode-Exp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-lgr Junicode-Exp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ly1 Junicode-Exp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ot1--base Junicode-Exp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-t1--base Junicode-Exp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-lgr Junicode-Exp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-lgr Junicode-Exp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ly1--base Junicode-Exp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ot1--base Junicode-Exp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-t1--base Junicode-Exp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpBold.pfb
@@ -11979,21 +11984,21 @@ Junicode-ExpBold-inf-ot1 Junicode-ExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-ExpBold-inf-t1--base Junicode-ExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-lgr Junicode-ExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ly1 Junicode-ExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ly1--base Junicode-ExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ot1--base Junicode-ExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-t1--base Junicode-ExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-lgr Junicode-ExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ot1--base Junicode-ExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-lgr Junicode-ExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-ly1 Junicode-ExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpBold.pfb
@@ -12001,109 +12006,109 @@ Junicode-ExpBold-sup-ot1 Junicode-ExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-ExpBold-sup-t1--base Junicode-ExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-lgr Junicode-ExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ly1 Junicode-ExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ot1--base Junicode-ExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-lgr Junicode-ExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-lgr Junicode-ExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ly1--base Junicode-ExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ot1--base Junicode-ExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-t1--base Junicode-ExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ly1 Junicode-ExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ot1 Junicode-ExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-t1--base Junicode-ExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1--base Junicode-ExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-lgr Junicode-ExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ot1--base Junicode-ExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ly1 Junicode-ExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ot1 Junicode-ExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-t1--base Junicode-ExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-lgr Junicode-ExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ot1--base Junicode-ExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ot1 Junicode-ExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-lgr Junicode-ExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ot1--base Junicode-ExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ly1 Junicode-ExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ot1 Junicode-ExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-t1--base Junicode-ExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-lgr Junicode-ExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1--base Junicode-ExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ly1--base Junicode-ExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ot1--base Junicode-ExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-t1--base Junicode-ExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-lgr Junicode-ExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ot1--base Junicode-ExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-lgr Junicode-ExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ly1 Junicode-ExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ot1 Junicode-ExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-t1--base Junicode-ExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-lgr Junicode-ExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ot1--base Junicode-ExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ot1 Junicode-ExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ot1--base Junicode-ExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-lgr Junicode-ExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ot1--base Junicode-ExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-lgr Junicode-ExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ly1--base Junicode-ExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-t1--base Junicode-ExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
@@ -12111,21 +12116,21 @@ Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-lgr Junicode-ExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ly1--base Junicode-ExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ot1--base Junicode-ExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-t1--base Junicode-ExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-lgr Junicode-ExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-lgr Junicode-ExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
@@ -12133,65 +12138,65 @@ Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-lgr Junicode-ExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ly1 Junicode-ExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ot1--base Junicode-ExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-lgr Junicode-ExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-lgr Junicode-ExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ly1--base Junicode-ExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-t1--base Junicode-ExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ly1 Junicode-ExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ot1 Junicode-ExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-t1--base Junicode-ExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1--base Junicode-ExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-lgr Junicode-ExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ot1--base Junicode-ExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ly1 Junicode-ExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ot1 Junicode-ExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-t1--base Junicode-ExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-lgr Junicode-ExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ot1--base Junicode-ExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ot1 Junicode-ExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-lgr Junicode-ExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ot1--base Junicode-ExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
@@ -12199,21 +12204,21 @@ Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-t1--base Junicode-ExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-lgr Junicode-ExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
@@ -12221,109 +12226,109 @@ Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-lgr Junicode-ExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ly1 Junicode-ExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-lgr Junicode-ExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-lgr Junicode-ExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-t1--base Junicode-ExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-lgr Junicode-ExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ly1 Junicode-ExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ot1 Junicode-ExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-lgr Junicode-ExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-lgr Junicode-ExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-Italic-inf-lgr Junicode-Italic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ly1 Junicode-Italic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ot1 Junicode-Italic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-Italic.pfb
Junicode-Italic-inf-t1--base Junicode-Italic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-Italic.pfb
Junicode-Italic-lf-lgr Junicode-Italic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1--base Junicode-Italic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-lgr Junicode-Italic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ly1--base Junicode-Italic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ot1--base Junicode-Italic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-t1--base Junicode-Italic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-Italic.pfb
Junicode-Italic-lf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-osf-lgr Junicode-Italic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ot1--base Junicode-Italic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ot1 Junicode-Italic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ly1--base Junicode-Italic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ot1--base Junicode-Italic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-t1--base Junicode-Italic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-sup-lgr Junicode-Italic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ly1 Junicode-Italic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ot1 Junicode-Italic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-Italic.pfb
Junicode-Italic-sup-t1--base Junicode-Italic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-lgr Junicode-Italic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ot1--base Junicode-Italic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ot1 Junicode-Italic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ot1--base Junicode-Italic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-t1--base Junicode-Italic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-lgr Junicode-Italic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ot1--base Junicode-Italic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ot1 Junicode-Italic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-lgr Junicode-Italic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ly1--base Junicode-Italic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ot1--base Junicode-Italic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-t1--base Junicode-Italic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Light-inf-lgr Junicode-Light " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Light.pfb
@@ -12331,21 +12336,21 @@ Junicode-Light-inf-ot1 Junicode-Light " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-Light-inf-t1--base Junicode-Light " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-lf-lgr Junicode-Light " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Light.pfb
Junicode-Light-lf-ly1 Junicode-Light " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-lgr Junicode-Light " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ly1--base Junicode-Light " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ot1--base Junicode-Light " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-t1--base Junicode-Light " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Light.pfb
Junicode-Light-lf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-osf-lgr Junicode-Light " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Light.pfb
-Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Light.pfb
+Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ly1--base Junicode-Light " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ot1--base Junicode-Light " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-t1--base Junicode-Light " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Light.pfb
-Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Light.pfb
+Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-sup-lgr Junicode-Light " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-sup-ly1 Junicode-Light " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Light.pfb
@@ -12353,65 +12358,65 @@ Junicode-Light-sup-ot1 Junicode-Light " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-Light-sup-t1--base Junicode-Light " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Light.pfb
Junicode-Light-tlf-lgr Junicode-Light " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Light.pfb
Junicode-Light-tlf-ly1 Junicode-Light " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Light.pfb
-Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Light.pfb
+Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ly1--base Junicode-Light " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ot1--base Junicode-Light " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-t1--base Junicode-Light " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Light.pfb
-Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Light.pfb
+Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-Light-tosf-lgr Junicode-Light " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Light.pfb
-Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Light.pfb
+Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-lgr Junicode-Light " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ly1--base Junicode-Light " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ot1--base Junicode-Light " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-t1--base Junicode-Light " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Light.pfb
-Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Light.pfb
+Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ly1 Junicode-LightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ot1 Junicode-LightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-t1--base Junicode-LightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-lgr Junicode-LightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1--base Junicode-LightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ly1--base Junicode-LightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ot1--base Junicode-LightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-t1--base Junicode-LightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-lgr Junicode-LightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ot1--base Junicode-LightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ot1 Junicode-LightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ot1--base Junicode-LightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-lgr Junicode-LightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ly1 Junicode-LightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ot1 Junicode-LightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-t1--base Junicode-LightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-lgr Junicode-LightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ot1--base Junicode-LightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ot1 Junicode-LightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ot1--base Junicode-LightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-lgr Junicode-LightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ot1--base Junicode-LightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ot1 Junicode-LightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-lgr Junicode-LightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ly1--base Junicode-LightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ot1--base Junicode-LightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-t1--base Junicode-LightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-Medium-inf-lgr Junicode-Medium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Medium.pfb
@@ -12419,21 +12424,21 @@ Junicode-Medium-inf-ot1 Junicode-Medium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-Medium-inf-t1--base Junicode-Medium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-lf-lgr Junicode-Medium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ly1 Junicode-Medium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-lgr Junicode-Medium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ly1--base Junicode-Medium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ot1--base Junicode-Medium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-t1--base Junicode-Medium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-osf-lgr Junicode-Medium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ly1--base Junicode-Medium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ot1--base Junicode-Medium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-t1--base Junicode-Medium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-sup-lgr Junicode-Medium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-sup-ly1 Junicode-Medium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Medium.pfb
@@ -12441,65 +12446,65 @@ Junicode-Medium-sup-ot1 Junicode-Medium " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-Medium-sup-t1--base Junicode-Medium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-lgr Junicode-Medium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ly1 Junicode-Medium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ot1--base Junicode-Medium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-t1--base Junicode-Medium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-lgr Junicode-Medium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-lgr Junicode-Medium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ly1--base Junicode-Medium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ot1--base Junicode-Medium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-t1--base Junicode-Medium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ly1 Junicode-MediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ot1 Junicode-MediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-t1--base Junicode-MediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-lgr Junicode-MediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1--base Junicode-MediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ly1--base Junicode-MediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ot1--base Junicode-MediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-t1--base Junicode-MediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-lgr Junicode-MediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ot1--base Junicode-MediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-lgr Junicode-MediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ly1 Junicode-MediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ot1 Junicode-MediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-t1--base Junicode-MediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-lgr Junicode-MediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ot1--base Junicode-MediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ot1 Junicode-MediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ot1--base Junicode-MediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-lgr Junicode-MediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ot1--base Junicode-MediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-lgr Junicode-MediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ly1--base Junicode-MediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-t1--base Junicode-MediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-Regular-inf-lgr Junicode-Regular " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Regular.pfb
@@ -12507,21 +12512,21 @@ Junicode-Regular-inf-ot1 Junicode-Regular " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-Regular-inf-t1--base Junicode-Regular " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-lf-lgr Junicode-Regular " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ly1 Junicode-Regular " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-lgr Junicode-Regular " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ly1--base Junicode-Regular " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ot1--base Junicode-Regular " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-t1--base Junicode-Regular " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-osf-lgr Junicode-Regular " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ly1--base Junicode-Regular " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ot1--base Junicode-Regular " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-t1--base Junicode-Regular " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-sup-lgr Junicode-Regular " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-sup-ly1 Junicode-Regular " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Regular.pfb
@@ -12529,21 +12534,21 @@ Junicode-Regular-sup-ot1 Junicode-Regular " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-Regular-sup-t1--base Junicode-Regular " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-lgr Junicode-Regular " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ly1 Junicode-Regular " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ot1--base Junicode-Regular " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-t1--base Junicode-Regular " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-lgr Junicode-Regular " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-lgr Junicode-Regular " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ly1--base Junicode-Regular " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ot1--base Junicode-Regular " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-t1--base Junicode-Regular " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmBold.pfb
@@ -12551,21 +12556,21 @@ Junicode-SmBold-inf-ot1 Junicode-SmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmBold-inf-t1--base Junicode-SmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-lgr Junicode-SmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ly1 Junicode-SmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-lgr Junicode-SmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ly1--base Junicode-SmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ot1--base Junicode-SmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-t1--base Junicode-SmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-lgr Junicode-SmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ot1--base Junicode-SmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-t1--base Junicode-SmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-lgr Junicode-SmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-ly1 Junicode-SmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmBold.pfb
@@ -12573,65 +12578,65 @@ Junicode-SmBold-sup-ot1 Junicode-SmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmBold-sup-t1--base Junicode-SmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-lgr Junicode-SmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ly1 Junicode-SmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ot1--base Junicode-SmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-lgr Junicode-SmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-lgr Junicode-SmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ly1--base Junicode-SmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ot1--base Junicode-SmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-t1--base Junicode-SmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ly1 Junicode-SmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ot1 Junicode-SmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-t1--base Junicode-SmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1--base Junicode-SmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-lgr Junicode-SmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ot1--base Junicode-SmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ly1 Junicode-SmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ot1 Junicode-SmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-t1--base Junicode-SmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-lgr Junicode-SmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ot1--base Junicode-SmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ot1 Junicode-SmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-lgr Junicode-SmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ot1--base Junicode-SmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-lgr Junicode-SmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCond.pfb
@@ -12639,21 +12644,21 @@ Junicode-SmCond-inf-ot1 Junicode-SmCond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmCond-inf-t1--base Junicode-SmCond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-lgr Junicode-SmCond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ly1 Junicode-SmCond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-lgr Junicode-SmCond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ly1--base Junicode-SmCond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ot1--base Junicode-SmCond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-t1--base Junicode-SmCond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-lgr Junicode-SmCond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ot1--base Junicode-SmCond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-t1--base Junicode-SmCond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-lgr Junicode-SmCond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-ly1 Junicode-SmCond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCond.pfb
@@ -12661,65 +12666,65 @@ Junicode-SmCond-sup-ot1 Junicode-SmCond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmCond-sup-t1--base Junicode-SmCond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-lgr Junicode-SmCond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ly1 Junicode-SmCond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ot1--base Junicode-SmCond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-lgr Junicode-SmCond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-lgr Junicode-SmCond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ly1--base Junicode-SmCond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ot1--base Junicode-SmCond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-t1--base Junicode-SmCond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ly1 Junicode-SmCondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ot1 Junicode-SmCondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-t1--base Junicode-SmCondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1--base Junicode-SmCondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-t1--base Junicode-SmCondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-lgr Junicode-SmCondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ot1--base Junicode-SmCondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ly1 Junicode-SmCondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ot1 Junicode-SmCondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-t1--base Junicode-SmCondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-lgr Junicode-SmCondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ot1--base Junicode-SmCondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ot1 Junicode-SmCondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-lgr Junicode-SmCondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ot1--base Junicode-SmCondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-lgr Junicode-SmCondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-t1--base Junicode-SmCondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
@@ -12727,21 +12732,21 @@ Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-lgr Junicode-SmCondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ly1--base Junicode-SmCondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ot1--base Junicode-SmCondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-t1--base Junicode-SmCondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-lgr Junicode-SmCondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-lgr Junicode-SmCondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
@@ -12749,65 +12754,65 @@ Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-lgr Junicode-SmCondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ly1 Junicode-SmCondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ot1--base Junicode-SmCondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-lgr Junicode-SmCondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-lgr Junicode-SmCondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ly1--base Junicode-SmCondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-t1--base Junicode-SmCondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ly1 Junicode-SmCondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ot1 Junicode-SmCondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-t1--base Junicode-SmCondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1--base Junicode-SmCondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-lgr Junicode-SmCondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ot1--base Junicode-SmCondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ly1 Junicode-SmCondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ot1 Junicode-SmCondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-t1--base Junicode-SmCondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-lgr Junicode-SmCondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ot1--base Junicode-SmCondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ot1 Junicode-SmCondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-lgr Junicode-SmCondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ot1--base Junicode-SmCondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
@@ -12815,21 +12820,21 @@ Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium " AutoEnc_ldcvmrfllg5ebu6xfr
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-t1--base Junicode-SmCondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-lgr Junicode-SmCondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
@@ -12837,65 +12842,65 @@ Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium " AutoEnc_ilb24pr2hmz3ktady5
Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-lgr Junicode-SmCondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ly1 Junicode-SmCondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-lgr Junicode-SmCondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-lgr Junicode-SmCondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-t1--base Junicode-SmCondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ly1 Junicode-SmCondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ot1 Junicode-SmCondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-t1--base Junicode-SmCondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-lgr Junicode-SmCondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ly1 Junicode-SmCondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ot1 Junicode-SmCondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-t1--base Junicode-SmCondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-lgr Junicode-SmCondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ot1 Junicode-SmCondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-lgr Junicode-SmCondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmExp-inf-lgr Junicode-SmExp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
Junicode-SmExp-inf-ly1 Junicode-SmExp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExp.pfb
@@ -12903,21 +12908,21 @@ Junicode-SmExp-inf-ot1 Junicode-SmExp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-SmExp-inf-t1--base Junicode-SmExp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-lgr Junicode-SmExp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ly1 Junicode-SmExp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-lgr Junicode-SmExp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ly1--base Junicode-SmExp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ot1--base Junicode-SmExp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-t1--base Junicode-SmExp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-lgr Junicode-SmExp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ot1--base Junicode-SmExp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-t1--base Junicode-SmExp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-lgr Junicode-SmExp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-ly1 Junicode-SmExp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExp.pfb
@@ -12925,21 +12930,21 @@ Junicode-SmExp-sup-ot1 Junicode-SmExp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-SmExp-sup-t1--base Junicode-SmExp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-lgr Junicode-SmExp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ot1--base Junicode-SmExp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-lgr Junicode-SmExp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ot1--base Junicode-SmExp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
@@ -12947,21 +12952,21 @@ Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-lgr Junicode-SmExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ly1--base Junicode-SmExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ot1--base Junicode-SmExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-t1--base Junicode-SmExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-lgr Junicode-SmExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-lgr Junicode-SmExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
@@ -12969,109 +12974,109 @@ Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-lgr Junicode-SmExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ly1 Junicode-SmExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ot1--base Junicode-SmExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-lgr Junicode-SmExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-lgr Junicode-SmExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ly1--base Junicode-SmExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-t1--base Junicode-SmExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ly1 Junicode-SmExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ot1 Junicode-SmExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-t1--base Junicode-SmExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-lgr Junicode-SmExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ly1 Junicode-SmExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ot1 Junicode-SmExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-t1--base Junicode-SmExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-lgr Junicode-SmExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ot1 Junicode-SmExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-lgr Junicode-SmExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ly1 Junicode-SmExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ot1 Junicode-SmExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-t1--base Junicode-SmExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1--base Junicode-SmExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-t1--base Junicode-SmExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-lgr Junicode-SmExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ot1--base Junicode-SmExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ly1 Junicode-SmExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ot1 Junicode-SmExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-t1--base Junicode-SmExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-lgr Junicode-SmExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ot1--base Junicode-SmExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ot1 Junicode-SmExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-lgr Junicode-SmExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ot1--base Junicode-SmExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-lgr Junicode-SmExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-t1--base Junicode-SmExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
@@ -13079,21 +13084,21 @@ Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-t1--base Junicode-SmExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-lgr Junicode-SmExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
@@ -13101,65 +13106,65 @@ Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-lgr Junicode-SmExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-lgr Junicode-SmExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ly1 Junicode-SmExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ot1 Junicode-SmExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-t1--base Junicode-SmExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-lgr Junicode-SmExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ly1 Junicode-SmExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ot1 Junicode-SmExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-t1--base Junicode-SmExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-lgr Junicode-SmExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-lgr Junicode-SmExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
@@ -13167,21 +13172,21 @@ Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-lgr Junicode-SmExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
@@ -13189,65 +13194,65 @@ Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-lgr Junicode-SmExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-lgr Junicode-SmExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
% Kinigcap.map
Kinigcap KinigsteinCaps <Kinigcap.pfb
@@ -18498,10 +18503,10 @@ XCharter-Bold-lf-ot1 XCharter-Bold " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEncode
XCharter-Bold-lf-sc-ly1--base XCharter-Bold " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-ot1--base XCharter-Bold " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t1--base XCharter-Bold " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t2asrb--base XCharter-Bold " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t1--base XCharter-Bold " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t2asrb XCharter-Bold " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ly1--base XCharter-Bold " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ot1 XCharter-Bold " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Bold.pfb
@@ -18511,15 +18516,15 @@ XCharter-Bold-osf-ot1 XCharter-Bold " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReEncod
XCharter-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t1--base XCharter-Bold " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t2asrb XCharter-Bold " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ly1--base XCharter-Bold " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ot1 XCharter-Bold " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t1--base XCharter-Bold " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Bold.pfb
+XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t2asrb XCharter-Bold " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ly1--base XCharter-Bold " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ot1 XCharter-Bold " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Bold.pfb
@@ -18527,20 +18532,20 @@ XCharter-Bold-tlf-ot2 XCharter-Bold " xcharterOT2enc ReEncodeFont " <[xcharter-o
XCharter-Bold-tlf-sc-ly1--base XCharter-Bold " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-ot1--base XCharter-Bold " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t1--base XCharter-Bold " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t2asrb--base XCharter-Bold " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t1--base XCharter-Bold " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t2asrb XCharter-Bold " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ly1--base XCharter-Bold " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ot1 XCharter-Bold " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t1--base XCharter-Bold " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t2asrb XCharter-Bold " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Bold.pfb
XCharter-Bold-ts1--base XCharter-Bold " AutoEnc_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch_z3wvjz.enc <XCharter-Bold.pfb
XCharter-BoldItalic-dnom-ly1--base XCharter-BoldItalic " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldItalic.pfb
@@ -18554,10 +18559,10 @@ XCharter-BoldItalic-lf-ot1 XCharter-BoldItalic " AutoEnc_ru4hosnl6h5ukcp2w3tt2ie
XCharter-BoldItalic-lf-sc-ly1--base XCharter-BoldItalic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-ot1--base XCharter-BoldItalic " AutoEnc_7qcosniepdkkhq2lidq32xyajh ReEncodeFont " <[xch_7qcosn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t1--base XCharter-BoldItalic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t1--base XCharter-BoldItalic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t2asrb XCharter-BoldItalic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ly1--base XCharter-BoldItalic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ot1 XCharter-BoldItalic " AutoEnc_qs7dmbcmqkgbo6666jibzn77ta ReEncodeFont " <[xch_qs7dmb.enc <XCharter-BoldItalic.pfb
@@ -18567,15 +18572,15 @@ XCharter-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc_aegaiust5jvuyf74wgreek
XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ot1 XCharter-BoldItalic " AutoEnc_gkuln73auq7qfnbajjeh66tiyg ReEncodeFont " <[xch_gkuln7.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t2asrb XCharter-BoldItalic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ot1 XCharter-BoldItalic " AutoEnc_lfc2esxm2njp63bgoww5uifspg ReEncodeFont " <[xch_lfc2es.enc <XCharter-BoldItalic.pfb
@@ -18583,20 +18588,20 @@ XCharter-BoldItalic-tlf-ot2 XCharter-BoldItalic " xcharterOT2enc ReEncodeFont "
XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jffewfvsu3e3ihebccixpovvra ReEncodeFont " <[xch_jffewf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t2asrb XCharter-BoldItalic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter-BoldSlanted-dnom-ly1--base XCharter-BoldSlanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldSlanted.pfb
@@ -18610,10 +18615,10 @@ XCharter-BoldSlanted-lf-ot1 XCharter-BoldSlanted " AutoEnc_aoa5sqhsbxws2dsjkwdeq
XCharter-BoldSlanted-lf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t1--base XCharter-BoldSlanted " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t1--base XCharter-BoldSlanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t2asrb XCharter-BoldSlanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ly1--base XCharter-BoldSlanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ot1 XCharter-BoldSlanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-BoldSlanted.pfb
@@ -18623,15 +18628,15 @@ XCharter-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc_g2zr6i3czinzql75wmpz
XCharter-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ly1--base XCharter-BoldSlanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ot1 XCharter-BoldSlanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t1--base XCharter-BoldSlanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t2asrb XCharter-BoldSlanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ly1--base XCharter-BoldSlanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ot1 XCharter-BoldSlanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-BoldSlanted.pfb
@@ -18639,20 +18644,20 @@ XCharter-BoldSlanted-tlf-ot2 XCharter-BoldSlanted " xcharterOT2enc ReEncodeFont
XCharter-BoldSlanted-tlf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t1--base XCharter-BoldSlanted " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t1--base XCharter-BoldSlanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t2asrb XCharter-BoldSlanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter-Ita-alph XCharter-Italic " chalphEncoding ReEncodeFont " <[chalph.enc <XCharter-Italic.pfb
@@ -18667,10 +18672,10 @@ XCharter-Italic-lf-ot1 XCharter-Italic " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEn
XCharter-Italic-lf-sc-ly1--base XCharter-Italic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-ot1--base XCharter-Italic " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t1--base XCharter-Italic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t2asrb--base XCharter-Italic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t1--base XCharter-Italic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t2asrb XCharter-Italic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ly1--base XCharter-Italic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ot1 XCharter-Italic " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Italic.pfb
@@ -18680,15 +18685,15 @@ XCharter-Italic-osf-ot1 XCharter-Italic " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReE
XCharter-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t1--base XCharter-Italic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t2asrb XCharter-Italic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ly1--base XCharter-Italic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ot1 XCharter-Italic " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t1--base XCharter-Italic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Italic.pfb
+XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t2asrb XCharter-Italic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ly1--base XCharter-Italic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ot1 XCharter-Italic " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Italic.pfb
@@ -18696,20 +18701,20 @@ XCharter-Italic-tlf-ot2 XCharter-Italic " xcharterOT2enc ReEncodeFont " <[xchart
XCharter-Italic-tlf-sc-ly1--base XCharter-Italic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-ot1--base XCharter-Italic " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t1--base XCharter-Italic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t2asrb--base XCharter-Italic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t1--base XCharter-Italic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t2asrb XCharter-Italic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ly1--base XCharter-Italic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ot1 XCharter-Italic " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t1--base XCharter-Italic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t2asrb XCharter-Italic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-Italic.pfb
XCharter-Italic-ts1--base XCharter-Italic " AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch_pqp4df.enc <XCharter-Italic.pfb
XCharter-Roman-dnom-ly1--base XCharter-Roman " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Roman.pfb
@@ -18723,12 +18728,12 @@ XCharter-Roman-lf-ot1 XCharter-Roman " AutoEnc_bbupxqigkbffslxhtvjmz5qdhb ReEnco
XCharter-Roman-lf-sc-ly1--base XCharter-Roman " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-ot1--base XCharter-Roman " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t1--base XCharter-Roman " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t2asrb--base XCharter-Roman " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t1--base XCharter-Roman " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_6ckksab4xgup3cfdzppakccfch ReEncodeFont " <[xch_6ckksa.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_ajf4qeyyzlwr22lxwfvdvytw4h ReEncodeFont " <[xch_ajf4qe.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t2asrb XCharter-Roman " AutoEnc_2ne5ras2ihnhgxt43rxslgjvce ReEncodeFont " <[xch_2ne5ra.enc <XCharter-Roman.pfb
-XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Roman.pfb
+XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_du7eesfjv53g5kmcdg53pxaz6g ReEncodeFont " <[xch_du7ees.enc <XCharter-Roman.pfb
XCharter-Roman-numr-ot1 XCharter-Roman " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Roman.pfb
XCharter-Roman-numr-t1--base XCharter-Roman " AutoEnc_aw3womsecdumtuxvl6hik6fs3a ReEncodeFont " <[xch_aw3wom.enc <XCharter-Roman.pfb
XCharter-Roman-osf-ly1--base XCharter-Roman " AutoEnc_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch_5xvt3q.enc <XCharter-Roman.pfb
@@ -18736,15 +18741,15 @@ XCharter-Roman-osf-ot1 XCharter-Roman " AutoEnc_ylqpprchpltakubnfx2ql7fllf ReEnc
XCharter-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t1--base XCharter-Roman " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch_cjimfy.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch_5b6tid.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t2asrb XCharter-Roman " AutoEnc_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch_2itbay.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ly1--base XCharter-Roman " AutoEnc_ukw3hq7h3prn34ryh2qktyrkse ReEncodeFont " <[xch_ukw3hq.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ot1 XCharter-Roman " AutoEnc_dhwwz5gerbpejovfe253unwxde ReEncodeFont " <[xch_dhwwz5.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t1--base XCharter-Roman " AutoEnc_6hzluovfqgqjqwjosfm7uze3oh ReEncodeFont " <[xch_6hzluo.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_pz3lxgt2tnxz7p6istzozn734g ReEncodeFont " <[xch_pz3lxg.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_7rlj4vy6adeoxbzopcxh2vadqb ReEncodeFont " <[xch_7rlj4v.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t2asrb XCharter-Roman " AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf ReEncodeFont " <[xch_vyhv3k.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ly1--base XCharter-Roman " AutoEnc_worivip5whk4cqev33dw4cszae ReEncodeFont " <[xch_worivi.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ot1 XCharter-Roman " AutoEnc_3glltskulaq25sg7bdv2b6v7sb ReEncodeFont " <[xch_3gllts.enc <XCharter-Roman.pfb
@@ -18752,20 +18757,20 @@ XCharter-Roman-tlf-ot2 XCharter-Roman " xcharterOT2enc ReEncodeFont " <[xcharter
XCharter-Roman-tlf-sc-ly1--base XCharter-Roman " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-ot1--base XCharter-Roman " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t1--base XCharter-Roman " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t2asrb--base XCharter-Roman " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t1--base XCharter-Roman " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_m2vrds6ohoduinigqjp2pulx6b ReEncodeFont " <[xch_m2vrds.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_4difzdpgpp73nhcpkiia7rn64h ReEncodeFont " <[xch_4difzd.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t2asrb XCharter-Roman " AutoEnc_fiqldzomfw67cfhl2p3wqrxjna ReEncodeFont " <[xch_fiqldz.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ly1--base XCharter-Roman " AutoEnc_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch_crvcmi.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ot1 XCharter-Roman " AutoEnc_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch_45bsgy.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t1--base XCharter-Roman " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch_tohekq.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch_lhsfh5.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t2asrb XCharter-Roman " AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch_dynzsr.enc <XCharter-Roman.pfb
XCharter-Roman-ts1--base XCharter-Roman " AutoEnc_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch_co4ru4.enc <XCharter-Roman.pfb
XCharter-Slanted-dnom-ly1--base XCharter-Slanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Slanted.pfb
@@ -18779,10 +18784,10 @@ XCharter-Slanted-lf-ot1 XCharter-Slanted " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb Re
XCharter-Slanted-lf-sc-ly1--base XCharter-Slanted " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-ot1--base XCharter-Slanted " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t1--base XCharter-Slanted " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t2asrb--base XCharter-Slanted " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t1--base XCharter-Slanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t2asrb XCharter-Slanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ly1--base XCharter-Slanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ot1 XCharter-Slanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Slanted.pfb
@@ -18792,15 +18797,15 @@ XCharter-Slanted-osf-ot1 XCharter-Slanted " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb R
XCharter-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t1--base XCharter-Slanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ly1--base XCharter-Slanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ot1 XCharter-Slanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t1--base XCharter-Slanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Slanted.pfb
-XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Slanted.pfb
+XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t2asrb XCharter-Slanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ly1--base XCharter-Slanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ot1 XCharter-Slanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Slanted.pfb
@@ -18808,20 +18813,20 @@ XCharter-Slanted-tlf-ot2 XCharter-Slanted " xcharterOT2enc ReEncodeFont " <[xcha
XCharter-Slanted-tlf-sc-ly1--base XCharter-Slanted " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-ot1--base XCharter-Slanted " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t1--base XCharter-Slanted " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t2asrb--base XCharter-Slanted " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t1--base XCharter-Slanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t2asrb XCharter-Slanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Slanted.pfb
XCharter-Slanted-ts1--base XCharter-Slanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-Slanted.pfb
XCharter-osf XCharter-Roman " chtabOsFEncoding ReEncodeFont " <[chtabosf.enc <XCharter-Roman.pfb
@@ -18830,20 +18835,20 @@ XCharter1-Bold-osf-ot1 XCharter-Bold " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb ReEnc
XCharter1-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t1--base XCharter-Bold " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t2asrb XCharter-Bold " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ly1--base XCharter-Bold " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ot1 XCharter-Bold " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t1--base XCharter-Bold " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t2asrb XCharter-Bold " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Bold.pfb
XCharter1-Bold-ts1--base XCharter-Bold " AutoEnc1_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch1_z3wvjz.enc <XCharter-Bold.pfb
XCharter1-BoldItalic-osf-ly1--base XCharter-BoldItalic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldItalic.pfb
@@ -18851,20 +18856,20 @@ XCharter1-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc1_aegaiust5jvuyf74wgre
XCharter1-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch1_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc1_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch1_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch1_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc1_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch1_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter1-BoldSlanted-osf-ly1--base XCharter-BoldSlanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldSlanted.pfb
@@ -18872,20 +18877,20 @@ XCharter1-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc1_g2zr6i3czinzql75wm
XCharter1-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter1-Italic-osf-ly1--base XCharter-Italic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Italic.pfb
@@ -18893,20 +18898,20 @@ XCharter1-Italic-osf-ot1 XCharter-Italic " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb R
XCharter1-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t1--base XCharter-Italic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t2asrb XCharter-Italic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ly1--base XCharter-Italic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ot1 XCharter-Italic " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t1--base XCharter-Italic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t2asrb XCharter-Italic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-Italic.pfb
XCharter1-Italic-ts1--base XCharter-Italic " AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch1_pqp4df.enc <XCharter-Italic.pfb
XCharter1-Roman-osf-ly1--base XCharter-Roman " AutoEnc1_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch1_5xvt3q.enc <XCharter-Roman.pfb
@@ -18914,20 +18919,20 @@ XCharter1-Roman-osf-ot1 XCharter-Roman " AutoEnc1_ylqpprchpltakubnfx2ql7fllf ReE
XCharter1-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t1--base XCharter-Roman " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch1_cjimfy.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch1_5b6tid.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t2asrb XCharter-Roman " AutoEnc1_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch1_2itbay.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ly1--base XCharter-Roman " AutoEnc1_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch1_crvcmi.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ot1 XCharter-Roman " AutoEnc1_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch1_45bsgy.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t1--base XCharter-Roman " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch1_tohekq.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch1_lhsfh5.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t2asrb XCharter-Roman " AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch1_dynzsr.enc <XCharter-Roman.pfb
XCharter1-Roman-ts1--base XCharter-Roman " AutoEnc1_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch1_co4ru4.enc <XCharter-Roman.pfb
XCharter1-Slanted-osf-ly1--base XCharter-Slanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Slanted.pfb
@@ -18935,20 +18940,20 @@ XCharter1-Slanted-osf-ot1 XCharter-Slanted " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb
XCharter1-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t1--base XCharter-Slanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Slanted.pfb
XCharter1-Slanted-ts1--base XCharter-Slanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-Slanted.pfb
XCharter1TH-BoldItalic-osf-ly1 XCharter-BoldItalic " xch1TH-osf-ly1Enc ReEncodeFont " <xch1TH_osf-ly1.enc <XCharter-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
index 248910db023..f009582c8bc 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
@@ -10680,6 +10680,11 @@ GaramondLibre-Regular-sup-t1--base GaramondLibre-Regular " AutoEnc_wkdlc77kkm5gx
GaramondLibre-Regular-sup-t2a GaramondLibre-Regular " AutoEnc_y75trcdjmjxcjj4wfzzyxacoye ReEncodeFont " <[grmlbr_y75trc.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2b GaramondLibre-Regular " AutoEnc_af3fmk7furqbz6algofaeeeujh ReEncodeFont " <[grmlbr_af3fmk.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2c GaramondLibre-Regular " AutoEnc_6l5pxogsiubowbnn4oh47tlyuf ReEncodeFont " <[grmlbr_6l5pxo.enc <GaramondLibre-Regular.pfb
+% GelasioMath.map
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
% GotIn.map
GotIn GotischeInitialen <GotIn.pfb
% GoudyIn.map
@@ -11583,21 +11588,21 @@ Junicode-Bold-inf-ot1 Junicode-Bold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Bold-inf-t1--base Junicode-Bold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-lf-lgr Junicode-Bold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ly1 Junicode-Bold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-lgr Junicode-Bold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ly1--base Junicode-Bold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ot1--base Junicode-Bold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-t1--base Junicode-Bold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-osf-lgr Junicode-Bold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ly1--base Junicode-Bold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ot1--base Junicode-Bold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-t1--base Junicode-Bold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-sup-lgr Junicode-Bold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-sup-ly1 Junicode-Bold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Bold.pfb
@@ -11605,65 +11610,65 @@ Junicode-Bold-sup-ot1 Junicode-Bold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Bold-sup-t1--base Junicode-Bold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-lgr Junicode-Bold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ly1 Junicode-Bold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ot1--base Junicode-Bold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-t1--base Junicode-Bold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-lgr Junicode-Bold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-lgr Junicode-Bold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ly1--base Junicode-Bold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ot1--base Junicode-Bold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-t1--base Junicode-Bold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ly1 Junicode-BoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ot1 Junicode-BoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-t1--base Junicode-BoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-lgr Junicode-BoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1--base Junicode-BoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ly1--base Junicode-BoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ot1--base Junicode-BoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-t1--base Junicode-BoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-lgr Junicode-BoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ot1--base Junicode-BoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ot1 Junicode-BoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-lgr Junicode-BoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ly1 Junicode-BoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ot1 Junicode-BoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-t1--base Junicode-BoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-lgr Junicode-BoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ot1--base Junicode-BoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ot1 Junicode-BoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ot1--base Junicode-BoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-lgr Junicode-BoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ot1--base Junicode-BoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-lgr Junicode-BoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ly1--base Junicode-BoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-t1--base Junicode-BoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-Cond-inf-lgr Junicode-Cond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Cond.pfb
@@ -11671,21 +11676,21 @@ Junicode-Cond-inf-ot1 Junicode-Cond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Cond-inf-t1--base Junicode-Cond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-lf-lgr Junicode-Cond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ly1 Junicode-Cond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-lgr Junicode-Cond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ly1--base Junicode-Cond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ot1--base Junicode-Cond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-t1--base Junicode-Cond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-osf-lgr Junicode-Cond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ly1--base Junicode-Cond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ot1--base Junicode-Cond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-t1--base Junicode-Cond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-sup-lgr Junicode-Cond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-sup-ly1 Junicode-Cond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Cond.pfb
@@ -11693,65 +11698,65 @@ Junicode-Cond-sup-ot1 Junicode-Cond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Cond-sup-t1--base Junicode-Cond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-lgr Junicode-Cond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ly1 Junicode-Cond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ot1--base Junicode-Cond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-t1--base Junicode-Cond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-lgr Junicode-Cond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-lgr Junicode-Cond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ly1--base Junicode-Cond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ot1--base Junicode-Cond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-t1--base Junicode-Cond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ly1 Junicode-CondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ot1 Junicode-CondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-t1--base Junicode-CondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-lgr Junicode-CondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1--base Junicode-CondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ly1--base Junicode-CondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ot1--base Junicode-CondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-t1--base Junicode-CondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-lgr Junicode-CondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ot1--base Junicode-CondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ot1 Junicode-CondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ot1--base Junicode-CondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-lgr Junicode-CondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ly1 Junicode-CondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ot1 Junicode-CondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-t1--base Junicode-CondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-lgr Junicode-CondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ot1--base Junicode-CondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ot1 Junicode-CondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ot1--base Junicode-CondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-lgr Junicode-CondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ot1--base Junicode-CondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ot1 Junicode-CondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-lgr Junicode-CondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ly1--base Junicode-CondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ot1--base Junicode-CondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-t1--base Junicode-CondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondLight.pfb
@@ -11759,21 +11764,21 @@ Junicode-CondLight-inf-ot1 Junicode-CondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-CondLight-inf-t1--base Junicode-CondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-lgr Junicode-CondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ly1 Junicode-CondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-lgr Junicode-CondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ly1--base Junicode-CondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ot1--base Junicode-CondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-t1--base Junicode-CondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-lgr Junicode-CondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ot1--base Junicode-CondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-t1--base Junicode-CondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-lgr Junicode-CondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-ly1 Junicode-CondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondLight.pfb
@@ -11781,65 +11786,65 @@ Junicode-CondLight-sup-ot1 Junicode-CondLight " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-CondLight-sup-t1--base Junicode-CondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-lgr Junicode-CondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ly1 Junicode-CondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ot1--base Junicode-CondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-lgr Junicode-CondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-lgr Junicode-CondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ly1--base Junicode-CondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ot1--base Junicode-CondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-t1--base Junicode-CondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ly1 Junicode-CondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ot1 Junicode-CondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-t1--base Junicode-CondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1--base Junicode-CondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-t1--base Junicode-CondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-lgr Junicode-CondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ot1--base Junicode-CondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ly1 Junicode-CondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ot1 Junicode-CondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-t1--base Junicode-CondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-lgr Junicode-CondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ot1--base Junicode-CondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ot1 Junicode-CondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-lgr Junicode-CondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ot1--base Junicode-CondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-lgr Junicode-CondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-t1--base Junicode-CondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondMedium.pfb
@@ -11847,21 +11852,21 @@ Junicode-CondMedium-inf-ot1 Junicode-CondMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3p
Junicode-CondMedium-inf-t1--base Junicode-CondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-lgr Junicode-CondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ly1 Junicode-CondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ly1--base Junicode-CondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ot1--base Junicode-CondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-t1--base Junicode-CondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-lgr Junicode-CondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ot1--base Junicode-CondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-lgr Junicode-CondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-ly1 Junicode-CondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondMedium.pfb
@@ -11869,65 +11874,65 @@ Junicode-CondMedium-sup-ot1 Junicode-CondMedium " AutoEnc_ilb24pr2hmz3ktady5tx53
Junicode-CondMedium-sup-t1--base Junicode-CondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-lgr Junicode-CondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ly1 Junicode-CondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ot1--base Junicode-CondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-lgr Junicode-CondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-lgr Junicode-CondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ly1--base Junicode-CondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ot1--base Junicode-CondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-t1--base Junicode-CondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ly1 Junicode-CondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ot1 Junicode-CondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-t1--base Junicode-CondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1--base Junicode-CondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-lgr Junicode-CondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ot1--base Junicode-CondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ly1 Junicode-CondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ot1 Junicode-CondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-t1--base Junicode-CondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-lgr Junicode-CondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ot1--base Junicode-CondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ot1 Junicode-CondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-lgr Junicode-CondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ot1--base Junicode-CondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-lgr Junicode-CondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-Exp-inf-lgr Junicode-Exp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Exp.pfb
@@ -11935,21 +11940,21 @@ Junicode-Exp-inf-ot1 Junicode-Exp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeF
Junicode-Exp-inf-t1--base Junicode-Exp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-lf-lgr Junicode-Exp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ly1 Junicode-Exp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-lgr Junicode-Exp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ly1--base Junicode-Exp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ot1--base Junicode-Exp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-t1--base Junicode-Exp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-osf-lgr Junicode-Exp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ly1--base Junicode-Exp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ot1--base Junicode-Exp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-t1--base Junicode-Exp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-sup-lgr Junicode-Exp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-sup-ly1 Junicode-Exp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Exp.pfb
@@ -11957,21 +11962,21 @@ Junicode-Exp-sup-ot1 Junicode-Exp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeF
Junicode-Exp-sup-t1--base Junicode-Exp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-lgr Junicode-Exp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ly1 Junicode-Exp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ot1--base Junicode-Exp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-t1--base Junicode-Exp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-lgr Junicode-Exp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-lgr Junicode-Exp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ly1--base Junicode-Exp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ot1--base Junicode-Exp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-t1--base Junicode-Exp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpBold.pfb
@@ -11979,21 +11984,21 @@ Junicode-ExpBold-inf-ot1 Junicode-ExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-ExpBold-inf-t1--base Junicode-ExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-lgr Junicode-ExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ly1 Junicode-ExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ly1--base Junicode-ExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ot1--base Junicode-ExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-t1--base Junicode-ExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-lgr Junicode-ExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ot1--base Junicode-ExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-lgr Junicode-ExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-ly1 Junicode-ExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpBold.pfb
@@ -12001,109 +12006,109 @@ Junicode-ExpBold-sup-ot1 Junicode-ExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-ExpBold-sup-t1--base Junicode-ExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-lgr Junicode-ExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ly1 Junicode-ExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ot1--base Junicode-ExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-lgr Junicode-ExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-lgr Junicode-ExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ly1--base Junicode-ExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ot1--base Junicode-ExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-t1--base Junicode-ExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ly1 Junicode-ExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ot1 Junicode-ExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-t1--base Junicode-ExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1--base Junicode-ExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-lgr Junicode-ExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ot1--base Junicode-ExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ly1 Junicode-ExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ot1 Junicode-ExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-t1--base Junicode-ExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-lgr Junicode-ExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ot1--base Junicode-ExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ot1 Junicode-ExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-lgr Junicode-ExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ot1--base Junicode-ExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ly1 Junicode-ExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ot1 Junicode-ExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-t1--base Junicode-ExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-lgr Junicode-ExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1--base Junicode-ExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ly1--base Junicode-ExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ot1--base Junicode-ExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-t1--base Junicode-ExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-lgr Junicode-ExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ot1--base Junicode-ExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-lgr Junicode-ExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ly1 Junicode-ExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ot1 Junicode-ExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-t1--base Junicode-ExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-lgr Junicode-ExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ot1--base Junicode-ExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ot1 Junicode-ExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ot1--base Junicode-ExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-lgr Junicode-ExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ot1--base Junicode-ExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-lgr Junicode-ExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ly1--base Junicode-ExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-t1--base Junicode-ExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
@@ -12111,21 +12116,21 @@ Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-lgr Junicode-ExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ly1--base Junicode-ExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ot1--base Junicode-ExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-t1--base Junicode-ExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-lgr Junicode-ExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-lgr Junicode-ExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
@@ -12133,65 +12138,65 @@ Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-lgr Junicode-ExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ly1 Junicode-ExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ot1--base Junicode-ExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-lgr Junicode-ExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-lgr Junicode-ExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ly1--base Junicode-ExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-t1--base Junicode-ExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ly1 Junicode-ExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ot1 Junicode-ExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-t1--base Junicode-ExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1--base Junicode-ExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-lgr Junicode-ExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ot1--base Junicode-ExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ly1 Junicode-ExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ot1 Junicode-ExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-t1--base Junicode-ExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-lgr Junicode-ExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ot1--base Junicode-ExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ot1 Junicode-ExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-lgr Junicode-ExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ot1--base Junicode-ExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
@@ -12199,21 +12204,21 @@ Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-t1--base Junicode-ExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-lgr Junicode-ExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
@@ -12221,109 +12226,109 @@ Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-lgr Junicode-ExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ly1 Junicode-ExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-lgr Junicode-ExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-lgr Junicode-ExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-t1--base Junicode-ExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-lgr Junicode-ExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ly1 Junicode-ExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ot1 Junicode-ExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-lgr Junicode-ExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-lgr Junicode-ExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-Italic-inf-lgr Junicode-Italic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ly1 Junicode-Italic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ot1 Junicode-Italic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-Italic.pfb
Junicode-Italic-inf-t1--base Junicode-Italic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-Italic.pfb
Junicode-Italic-lf-lgr Junicode-Italic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1--base Junicode-Italic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-lgr Junicode-Italic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ly1--base Junicode-Italic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ot1--base Junicode-Italic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-t1--base Junicode-Italic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-Italic.pfb
Junicode-Italic-lf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-osf-lgr Junicode-Italic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ot1--base Junicode-Italic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ot1 Junicode-Italic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ly1--base Junicode-Italic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ot1--base Junicode-Italic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-t1--base Junicode-Italic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-sup-lgr Junicode-Italic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ly1 Junicode-Italic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ot1 Junicode-Italic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-Italic.pfb
Junicode-Italic-sup-t1--base Junicode-Italic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-lgr Junicode-Italic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ot1--base Junicode-Italic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ot1 Junicode-Italic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ot1--base Junicode-Italic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-t1--base Junicode-Italic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-lgr Junicode-Italic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ot1--base Junicode-Italic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ot1 Junicode-Italic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-lgr Junicode-Italic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ly1--base Junicode-Italic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ot1--base Junicode-Italic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-t1--base Junicode-Italic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Light-inf-lgr Junicode-Light " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Light.pfb
@@ -12331,21 +12336,21 @@ Junicode-Light-inf-ot1 Junicode-Light " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-Light-inf-t1--base Junicode-Light " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-lf-lgr Junicode-Light " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Light.pfb
Junicode-Light-lf-ly1 Junicode-Light " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-lgr Junicode-Light " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ly1--base Junicode-Light " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ot1--base Junicode-Light " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-t1--base Junicode-Light " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Light.pfb
Junicode-Light-lf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-osf-lgr Junicode-Light " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Light.pfb
-Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Light.pfb
+Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ly1--base Junicode-Light " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ot1--base Junicode-Light " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-t1--base Junicode-Light " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Light.pfb
-Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Light.pfb
+Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-sup-lgr Junicode-Light " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-sup-ly1 Junicode-Light " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Light.pfb
@@ -12353,65 +12358,65 @@ Junicode-Light-sup-ot1 Junicode-Light " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-Light-sup-t1--base Junicode-Light " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Light.pfb
Junicode-Light-tlf-lgr Junicode-Light " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Light.pfb
Junicode-Light-tlf-ly1 Junicode-Light " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Light.pfb
-Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Light.pfb
+Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ly1--base Junicode-Light " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ot1--base Junicode-Light " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-t1--base Junicode-Light " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Light.pfb
-Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Light.pfb
+Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-Light-tosf-lgr Junicode-Light " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Light.pfb
-Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Light.pfb
+Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-lgr Junicode-Light " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ly1--base Junicode-Light " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ot1--base Junicode-Light " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-t1--base Junicode-Light " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Light.pfb
-Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Light.pfb
+Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ly1 Junicode-LightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ot1 Junicode-LightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-t1--base Junicode-LightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-lgr Junicode-LightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1--base Junicode-LightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ly1--base Junicode-LightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ot1--base Junicode-LightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-t1--base Junicode-LightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-lgr Junicode-LightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ot1--base Junicode-LightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ot1 Junicode-LightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ot1--base Junicode-LightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-lgr Junicode-LightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ly1 Junicode-LightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ot1 Junicode-LightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-t1--base Junicode-LightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-lgr Junicode-LightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ot1--base Junicode-LightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ot1 Junicode-LightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ot1--base Junicode-LightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-lgr Junicode-LightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ot1--base Junicode-LightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ot1 Junicode-LightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-lgr Junicode-LightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ly1--base Junicode-LightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ot1--base Junicode-LightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-t1--base Junicode-LightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-Medium-inf-lgr Junicode-Medium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Medium.pfb
@@ -12419,21 +12424,21 @@ Junicode-Medium-inf-ot1 Junicode-Medium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-Medium-inf-t1--base Junicode-Medium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-lf-lgr Junicode-Medium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ly1 Junicode-Medium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-lgr Junicode-Medium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ly1--base Junicode-Medium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ot1--base Junicode-Medium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-t1--base Junicode-Medium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-osf-lgr Junicode-Medium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ly1--base Junicode-Medium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ot1--base Junicode-Medium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-t1--base Junicode-Medium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-sup-lgr Junicode-Medium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-sup-ly1 Junicode-Medium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Medium.pfb
@@ -12441,65 +12446,65 @@ Junicode-Medium-sup-ot1 Junicode-Medium " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-Medium-sup-t1--base Junicode-Medium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-lgr Junicode-Medium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ly1 Junicode-Medium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ot1--base Junicode-Medium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-t1--base Junicode-Medium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-lgr Junicode-Medium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-lgr Junicode-Medium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ly1--base Junicode-Medium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ot1--base Junicode-Medium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-t1--base Junicode-Medium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ly1 Junicode-MediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ot1 Junicode-MediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-t1--base Junicode-MediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-lgr Junicode-MediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1--base Junicode-MediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ly1--base Junicode-MediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ot1--base Junicode-MediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-t1--base Junicode-MediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-lgr Junicode-MediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ot1--base Junicode-MediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-lgr Junicode-MediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ly1 Junicode-MediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ot1 Junicode-MediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-t1--base Junicode-MediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-lgr Junicode-MediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ot1--base Junicode-MediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ot1 Junicode-MediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ot1--base Junicode-MediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-lgr Junicode-MediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ot1--base Junicode-MediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-lgr Junicode-MediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ly1--base Junicode-MediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-t1--base Junicode-MediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-Regular-inf-lgr Junicode-Regular " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Regular.pfb
@@ -12507,21 +12512,21 @@ Junicode-Regular-inf-ot1 Junicode-Regular " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-Regular-inf-t1--base Junicode-Regular " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-lf-lgr Junicode-Regular " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ly1 Junicode-Regular " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-lgr Junicode-Regular " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ly1--base Junicode-Regular " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ot1--base Junicode-Regular " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-t1--base Junicode-Regular " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-osf-lgr Junicode-Regular " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ly1--base Junicode-Regular " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ot1--base Junicode-Regular " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-t1--base Junicode-Regular " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-sup-lgr Junicode-Regular " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-sup-ly1 Junicode-Regular " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Regular.pfb
@@ -12529,21 +12534,21 @@ Junicode-Regular-sup-ot1 Junicode-Regular " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-Regular-sup-t1--base Junicode-Regular " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-lgr Junicode-Regular " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ly1 Junicode-Regular " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ot1--base Junicode-Regular " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-t1--base Junicode-Regular " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-lgr Junicode-Regular " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-lgr Junicode-Regular " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ly1--base Junicode-Regular " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ot1--base Junicode-Regular " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-t1--base Junicode-Regular " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmBold.pfb
@@ -12551,21 +12556,21 @@ Junicode-SmBold-inf-ot1 Junicode-SmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmBold-inf-t1--base Junicode-SmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-lgr Junicode-SmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ly1 Junicode-SmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-lgr Junicode-SmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ly1--base Junicode-SmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ot1--base Junicode-SmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-t1--base Junicode-SmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-lgr Junicode-SmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ot1--base Junicode-SmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-t1--base Junicode-SmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-lgr Junicode-SmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-ly1 Junicode-SmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmBold.pfb
@@ -12573,65 +12578,65 @@ Junicode-SmBold-sup-ot1 Junicode-SmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmBold-sup-t1--base Junicode-SmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-lgr Junicode-SmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ly1 Junicode-SmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ot1--base Junicode-SmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-lgr Junicode-SmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-lgr Junicode-SmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ly1--base Junicode-SmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ot1--base Junicode-SmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-t1--base Junicode-SmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ly1 Junicode-SmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ot1 Junicode-SmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-t1--base Junicode-SmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1--base Junicode-SmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-lgr Junicode-SmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ot1--base Junicode-SmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ly1 Junicode-SmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ot1 Junicode-SmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-t1--base Junicode-SmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-lgr Junicode-SmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ot1--base Junicode-SmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ot1 Junicode-SmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-lgr Junicode-SmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ot1--base Junicode-SmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-lgr Junicode-SmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCond.pfb
@@ -12639,21 +12644,21 @@ Junicode-SmCond-inf-ot1 Junicode-SmCond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmCond-inf-t1--base Junicode-SmCond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-lgr Junicode-SmCond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ly1 Junicode-SmCond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-lgr Junicode-SmCond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ly1--base Junicode-SmCond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ot1--base Junicode-SmCond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-t1--base Junicode-SmCond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-lgr Junicode-SmCond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ot1--base Junicode-SmCond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-t1--base Junicode-SmCond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-lgr Junicode-SmCond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-ly1 Junicode-SmCond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCond.pfb
@@ -12661,65 +12666,65 @@ Junicode-SmCond-sup-ot1 Junicode-SmCond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmCond-sup-t1--base Junicode-SmCond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-lgr Junicode-SmCond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ly1 Junicode-SmCond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ot1--base Junicode-SmCond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-lgr Junicode-SmCond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-lgr Junicode-SmCond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ly1--base Junicode-SmCond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ot1--base Junicode-SmCond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-t1--base Junicode-SmCond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ly1 Junicode-SmCondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ot1 Junicode-SmCondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-t1--base Junicode-SmCondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1--base Junicode-SmCondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-t1--base Junicode-SmCondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-lgr Junicode-SmCondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ot1--base Junicode-SmCondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ly1 Junicode-SmCondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ot1 Junicode-SmCondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-t1--base Junicode-SmCondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-lgr Junicode-SmCondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ot1--base Junicode-SmCondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ot1 Junicode-SmCondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-lgr Junicode-SmCondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ot1--base Junicode-SmCondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-lgr Junicode-SmCondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-t1--base Junicode-SmCondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
@@ -12727,21 +12732,21 @@ Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-lgr Junicode-SmCondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ly1--base Junicode-SmCondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ot1--base Junicode-SmCondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-t1--base Junicode-SmCondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-lgr Junicode-SmCondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-lgr Junicode-SmCondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
@@ -12749,65 +12754,65 @@ Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-lgr Junicode-SmCondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ly1 Junicode-SmCondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ot1--base Junicode-SmCondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-lgr Junicode-SmCondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-lgr Junicode-SmCondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ly1--base Junicode-SmCondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-t1--base Junicode-SmCondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ly1 Junicode-SmCondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ot1 Junicode-SmCondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-t1--base Junicode-SmCondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1--base Junicode-SmCondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-lgr Junicode-SmCondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ot1--base Junicode-SmCondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ly1 Junicode-SmCondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ot1 Junicode-SmCondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-t1--base Junicode-SmCondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-lgr Junicode-SmCondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ot1--base Junicode-SmCondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ot1 Junicode-SmCondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-lgr Junicode-SmCondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ot1--base Junicode-SmCondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
@@ -12815,21 +12820,21 @@ Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium " AutoEnc_ldcvmrfllg5ebu6xfr
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-t1--base Junicode-SmCondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-lgr Junicode-SmCondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
@@ -12837,65 +12842,65 @@ Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium " AutoEnc_ilb24pr2hmz3ktady5
Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-lgr Junicode-SmCondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ly1 Junicode-SmCondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-lgr Junicode-SmCondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-lgr Junicode-SmCondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-t1--base Junicode-SmCondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ly1 Junicode-SmCondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ot1 Junicode-SmCondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-t1--base Junicode-SmCondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-lgr Junicode-SmCondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ly1 Junicode-SmCondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ot1 Junicode-SmCondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-t1--base Junicode-SmCondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-lgr Junicode-SmCondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ot1 Junicode-SmCondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-lgr Junicode-SmCondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmExp-inf-lgr Junicode-SmExp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
Junicode-SmExp-inf-ly1 Junicode-SmExp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExp.pfb
@@ -12903,21 +12908,21 @@ Junicode-SmExp-inf-ot1 Junicode-SmExp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-SmExp-inf-t1--base Junicode-SmExp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-lgr Junicode-SmExp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ly1 Junicode-SmExp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-lgr Junicode-SmExp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ly1--base Junicode-SmExp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ot1--base Junicode-SmExp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-t1--base Junicode-SmExp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-lgr Junicode-SmExp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ot1--base Junicode-SmExp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-t1--base Junicode-SmExp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-lgr Junicode-SmExp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-ly1 Junicode-SmExp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExp.pfb
@@ -12925,21 +12930,21 @@ Junicode-SmExp-sup-ot1 Junicode-SmExp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-SmExp-sup-t1--base Junicode-SmExp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-lgr Junicode-SmExp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ot1--base Junicode-SmExp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-lgr Junicode-SmExp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ot1--base Junicode-SmExp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
@@ -12947,21 +12952,21 @@ Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-lgr Junicode-SmExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ly1--base Junicode-SmExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ot1--base Junicode-SmExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-t1--base Junicode-SmExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-lgr Junicode-SmExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-lgr Junicode-SmExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
@@ -12969,109 +12974,109 @@ Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-lgr Junicode-SmExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ly1 Junicode-SmExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ot1--base Junicode-SmExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-lgr Junicode-SmExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-lgr Junicode-SmExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ly1--base Junicode-SmExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-t1--base Junicode-SmExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ly1 Junicode-SmExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ot1 Junicode-SmExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-t1--base Junicode-SmExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-lgr Junicode-SmExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ly1 Junicode-SmExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ot1 Junicode-SmExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-t1--base Junicode-SmExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-lgr Junicode-SmExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ot1 Junicode-SmExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-lgr Junicode-SmExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ly1 Junicode-SmExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ot1 Junicode-SmExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-t1--base Junicode-SmExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1--base Junicode-SmExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-t1--base Junicode-SmExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-lgr Junicode-SmExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ot1--base Junicode-SmExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ly1 Junicode-SmExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ot1 Junicode-SmExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-t1--base Junicode-SmExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-lgr Junicode-SmExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ot1--base Junicode-SmExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ot1 Junicode-SmExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-lgr Junicode-SmExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ot1--base Junicode-SmExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-lgr Junicode-SmExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-t1--base Junicode-SmExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
@@ -13079,21 +13084,21 @@ Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-t1--base Junicode-SmExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-lgr Junicode-SmExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
@@ -13101,65 +13106,65 @@ Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-lgr Junicode-SmExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-lgr Junicode-SmExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ly1 Junicode-SmExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ot1 Junicode-SmExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-t1--base Junicode-SmExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-lgr Junicode-SmExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ly1 Junicode-SmExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ot1 Junicode-SmExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-t1--base Junicode-SmExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-lgr Junicode-SmExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-lgr Junicode-SmExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
@@ -13167,21 +13172,21 @@ Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-lgr Junicode-SmExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
@@ -13189,65 +13194,65 @@ Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-lgr Junicode-SmExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-lgr Junicode-SmExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
% Kinigcap.map
Kinigcap KinigsteinCaps <Kinigcap.pfb
@@ -18498,10 +18503,10 @@ XCharter-Bold-lf-ot1 XCharter-Bold " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEncode
XCharter-Bold-lf-sc-ly1--base XCharter-Bold " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-ot1--base XCharter-Bold " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t1--base XCharter-Bold " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t2asrb--base XCharter-Bold " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t1--base XCharter-Bold " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t2asrb XCharter-Bold " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ly1--base XCharter-Bold " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ot1 XCharter-Bold " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Bold.pfb
@@ -18511,15 +18516,15 @@ XCharter-Bold-osf-ot1 XCharter-Bold " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReEncod
XCharter-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t1--base XCharter-Bold " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t2asrb XCharter-Bold " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ly1--base XCharter-Bold " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ot1 XCharter-Bold " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t1--base XCharter-Bold " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Bold.pfb
+XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t2asrb XCharter-Bold " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ly1--base XCharter-Bold " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ot1 XCharter-Bold " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Bold.pfb
@@ -18527,20 +18532,20 @@ XCharter-Bold-tlf-ot2 XCharter-Bold " xcharterOT2enc ReEncodeFont " <[xcharter-o
XCharter-Bold-tlf-sc-ly1--base XCharter-Bold " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-ot1--base XCharter-Bold " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t1--base XCharter-Bold " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t2asrb--base XCharter-Bold " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t1--base XCharter-Bold " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t2asrb XCharter-Bold " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ly1--base XCharter-Bold " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ot1 XCharter-Bold " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t1--base XCharter-Bold " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t2asrb XCharter-Bold " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Bold.pfb
XCharter-Bold-ts1--base XCharter-Bold " AutoEnc_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch_z3wvjz.enc <XCharter-Bold.pfb
XCharter-BoldItalic-dnom-ly1--base XCharter-BoldItalic " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldItalic.pfb
@@ -18554,10 +18559,10 @@ XCharter-BoldItalic-lf-ot1 XCharter-BoldItalic " AutoEnc_ru4hosnl6h5ukcp2w3tt2ie
XCharter-BoldItalic-lf-sc-ly1--base XCharter-BoldItalic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-ot1--base XCharter-BoldItalic " AutoEnc_7qcosniepdkkhq2lidq32xyajh ReEncodeFont " <[xch_7qcosn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t1--base XCharter-BoldItalic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t1--base XCharter-BoldItalic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t2asrb XCharter-BoldItalic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ly1--base XCharter-BoldItalic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ot1 XCharter-BoldItalic " AutoEnc_qs7dmbcmqkgbo6666jibzn77ta ReEncodeFont " <[xch_qs7dmb.enc <XCharter-BoldItalic.pfb
@@ -18567,15 +18572,15 @@ XCharter-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc_aegaiust5jvuyf74wgreek
XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ot1 XCharter-BoldItalic " AutoEnc_gkuln73auq7qfnbajjeh66tiyg ReEncodeFont " <[xch_gkuln7.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t2asrb XCharter-BoldItalic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ot1 XCharter-BoldItalic " AutoEnc_lfc2esxm2njp63bgoww5uifspg ReEncodeFont " <[xch_lfc2es.enc <XCharter-BoldItalic.pfb
@@ -18583,20 +18588,20 @@ XCharter-BoldItalic-tlf-ot2 XCharter-BoldItalic " xcharterOT2enc ReEncodeFont "
XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jffewfvsu3e3ihebccixpovvra ReEncodeFont " <[xch_jffewf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t2asrb XCharter-BoldItalic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter-BoldSlanted-dnom-ly1--base XCharter-BoldSlanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldSlanted.pfb
@@ -18610,10 +18615,10 @@ XCharter-BoldSlanted-lf-ot1 XCharter-BoldSlanted " AutoEnc_aoa5sqhsbxws2dsjkwdeq
XCharter-BoldSlanted-lf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t1--base XCharter-BoldSlanted " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t1--base XCharter-BoldSlanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t2asrb XCharter-BoldSlanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ly1--base XCharter-BoldSlanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ot1 XCharter-BoldSlanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-BoldSlanted.pfb
@@ -18623,15 +18628,15 @@ XCharter-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc_g2zr6i3czinzql75wmpz
XCharter-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ly1--base XCharter-BoldSlanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ot1 XCharter-BoldSlanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t1--base XCharter-BoldSlanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t2asrb XCharter-BoldSlanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ly1--base XCharter-BoldSlanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ot1 XCharter-BoldSlanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-BoldSlanted.pfb
@@ -18639,20 +18644,20 @@ XCharter-BoldSlanted-tlf-ot2 XCharter-BoldSlanted " xcharterOT2enc ReEncodeFont
XCharter-BoldSlanted-tlf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t1--base XCharter-BoldSlanted " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t1--base XCharter-BoldSlanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t2asrb XCharter-BoldSlanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter-Ita-alph XCharter-Italic " chalphEncoding ReEncodeFont " <[chalph.enc <XCharter-Italic.pfb
@@ -18667,10 +18672,10 @@ XCharter-Italic-lf-ot1 XCharter-Italic " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEn
XCharter-Italic-lf-sc-ly1--base XCharter-Italic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-ot1--base XCharter-Italic " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t1--base XCharter-Italic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t2asrb--base XCharter-Italic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t1--base XCharter-Italic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t2asrb XCharter-Italic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ly1--base XCharter-Italic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ot1 XCharter-Italic " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Italic.pfb
@@ -18680,15 +18685,15 @@ XCharter-Italic-osf-ot1 XCharter-Italic " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReE
XCharter-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t1--base XCharter-Italic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t2asrb XCharter-Italic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ly1--base XCharter-Italic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ot1 XCharter-Italic " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t1--base XCharter-Italic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Italic.pfb
+XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t2asrb XCharter-Italic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ly1--base XCharter-Italic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ot1 XCharter-Italic " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Italic.pfb
@@ -18696,20 +18701,20 @@ XCharter-Italic-tlf-ot2 XCharter-Italic " xcharterOT2enc ReEncodeFont " <[xchart
XCharter-Italic-tlf-sc-ly1--base XCharter-Italic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-ot1--base XCharter-Italic " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t1--base XCharter-Italic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t2asrb--base XCharter-Italic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t1--base XCharter-Italic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t2asrb XCharter-Italic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ly1--base XCharter-Italic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ot1 XCharter-Italic " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t1--base XCharter-Italic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t2asrb XCharter-Italic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-Italic.pfb
XCharter-Italic-ts1--base XCharter-Italic " AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch_pqp4df.enc <XCharter-Italic.pfb
XCharter-Roman-dnom-ly1--base XCharter-Roman " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Roman.pfb
@@ -18723,12 +18728,12 @@ XCharter-Roman-lf-ot1 XCharter-Roman " AutoEnc_bbupxqigkbffslxhtvjmz5qdhb ReEnco
XCharter-Roman-lf-sc-ly1--base XCharter-Roman " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-ot1--base XCharter-Roman " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t1--base XCharter-Roman " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t2asrb--base XCharter-Roman " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t1--base XCharter-Roman " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_6ckksab4xgup3cfdzppakccfch ReEncodeFont " <[xch_6ckksa.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_ajf4qeyyzlwr22lxwfvdvytw4h ReEncodeFont " <[xch_ajf4qe.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t2asrb XCharter-Roman " AutoEnc_2ne5ras2ihnhgxt43rxslgjvce ReEncodeFont " <[xch_2ne5ra.enc <XCharter-Roman.pfb
-XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Roman.pfb
+XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_du7eesfjv53g5kmcdg53pxaz6g ReEncodeFont " <[xch_du7ees.enc <XCharter-Roman.pfb
XCharter-Roman-numr-ot1 XCharter-Roman " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Roman.pfb
XCharter-Roman-numr-t1--base XCharter-Roman " AutoEnc_aw3womsecdumtuxvl6hik6fs3a ReEncodeFont " <[xch_aw3wom.enc <XCharter-Roman.pfb
XCharter-Roman-osf-ly1--base XCharter-Roman " AutoEnc_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch_5xvt3q.enc <XCharter-Roman.pfb
@@ -18736,15 +18741,15 @@ XCharter-Roman-osf-ot1 XCharter-Roman " AutoEnc_ylqpprchpltakubnfx2ql7fllf ReEnc
XCharter-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t1--base XCharter-Roman " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch_cjimfy.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch_5b6tid.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t2asrb XCharter-Roman " AutoEnc_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch_2itbay.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ly1--base XCharter-Roman " AutoEnc_ukw3hq7h3prn34ryh2qktyrkse ReEncodeFont " <[xch_ukw3hq.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ot1 XCharter-Roman " AutoEnc_dhwwz5gerbpejovfe253unwxde ReEncodeFont " <[xch_dhwwz5.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t1--base XCharter-Roman " AutoEnc_6hzluovfqgqjqwjosfm7uze3oh ReEncodeFont " <[xch_6hzluo.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_pz3lxgt2tnxz7p6istzozn734g ReEncodeFont " <[xch_pz3lxg.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_7rlj4vy6adeoxbzopcxh2vadqb ReEncodeFont " <[xch_7rlj4v.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t2asrb XCharter-Roman " AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf ReEncodeFont " <[xch_vyhv3k.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ly1--base XCharter-Roman " AutoEnc_worivip5whk4cqev33dw4cszae ReEncodeFont " <[xch_worivi.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ot1 XCharter-Roman " AutoEnc_3glltskulaq25sg7bdv2b6v7sb ReEncodeFont " <[xch_3gllts.enc <XCharter-Roman.pfb
@@ -18752,20 +18757,20 @@ XCharter-Roman-tlf-ot2 XCharter-Roman " xcharterOT2enc ReEncodeFont " <[xcharter
XCharter-Roman-tlf-sc-ly1--base XCharter-Roman " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-ot1--base XCharter-Roman " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t1--base XCharter-Roman " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t2asrb--base XCharter-Roman " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t1--base XCharter-Roman " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_m2vrds6ohoduinigqjp2pulx6b ReEncodeFont " <[xch_m2vrds.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_4difzdpgpp73nhcpkiia7rn64h ReEncodeFont " <[xch_4difzd.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t2asrb XCharter-Roman " AutoEnc_fiqldzomfw67cfhl2p3wqrxjna ReEncodeFont " <[xch_fiqldz.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ly1--base XCharter-Roman " AutoEnc_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch_crvcmi.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ot1 XCharter-Roman " AutoEnc_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch_45bsgy.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t1--base XCharter-Roman " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch_tohekq.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch_lhsfh5.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t2asrb XCharter-Roman " AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch_dynzsr.enc <XCharter-Roman.pfb
XCharter-Roman-ts1--base XCharter-Roman " AutoEnc_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch_co4ru4.enc <XCharter-Roman.pfb
XCharter-Slanted-dnom-ly1--base XCharter-Slanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Slanted.pfb
@@ -18779,10 +18784,10 @@ XCharter-Slanted-lf-ot1 XCharter-Slanted " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb Re
XCharter-Slanted-lf-sc-ly1--base XCharter-Slanted " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-ot1--base XCharter-Slanted " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t1--base XCharter-Slanted " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t2asrb--base XCharter-Slanted " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t1--base XCharter-Slanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t2asrb XCharter-Slanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ly1--base XCharter-Slanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ot1 XCharter-Slanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Slanted.pfb
@@ -18792,15 +18797,15 @@ XCharter-Slanted-osf-ot1 XCharter-Slanted " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb R
XCharter-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t1--base XCharter-Slanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ly1--base XCharter-Slanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ot1 XCharter-Slanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t1--base XCharter-Slanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Slanted.pfb
-XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Slanted.pfb
+XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t2asrb XCharter-Slanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ly1--base XCharter-Slanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ot1 XCharter-Slanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Slanted.pfb
@@ -18808,20 +18813,20 @@ XCharter-Slanted-tlf-ot2 XCharter-Slanted " xcharterOT2enc ReEncodeFont " <[xcha
XCharter-Slanted-tlf-sc-ly1--base XCharter-Slanted " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-ot1--base XCharter-Slanted " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t1--base XCharter-Slanted " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t2asrb--base XCharter-Slanted " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t1--base XCharter-Slanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t2asrb XCharter-Slanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Slanted.pfb
XCharter-Slanted-ts1--base XCharter-Slanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-Slanted.pfb
XCharter-osf XCharter-Roman " chtabOsFEncoding ReEncodeFont " <[chtabosf.enc <XCharter-Roman.pfb
@@ -18830,20 +18835,20 @@ XCharter1-Bold-osf-ot1 XCharter-Bold " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb ReEnc
XCharter1-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t1--base XCharter-Bold " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t2asrb XCharter-Bold " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ly1--base XCharter-Bold " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ot1 XCharter-Bold " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t1--base XCharter-Bold " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t2asrb XCharter-Bold " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Bold.pfb
XCharter1-Bold-ts1--base XCharter-Bold " AutoEnc1_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch1_z3wvjz.enc <XCharter-Bold.pfb
XCharter1-BoldItalic-osf-ly1--base XCharter-BoldItalic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldItalic.pfb
@@ -18851,20 +18856,20 @@ XCharter1-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc1_aegaiust5jvuyf74wgre
XCharter1-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch1_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc1_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch1_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch1_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc1_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch1_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter1-BoldSlanted-osf-ly1--base XCharter-BoldSlanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldSlanted.pfb
@@ -18872,20 +18877,20 @@ XCharter1-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc1_g2zr6i3czinzql75wm
XCharter1-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter1-Italic-osf-ly1--base XCharter-Italic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Italic.pfb
@@ -18893,20 +18898,20 @@ XCharter1-Italic-osf-ot1 XCharter-Italic " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb R
XCharter1-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t1--base XCharter-Italic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t2asrb XCharter-Italic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ly1--base XCharter-Italic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ot1 XCharter-Italic " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t1--base XCharter-Italic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t2asrb XCharter-Italic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-Italic.pfb
XCharter1-Italic-ts1--base XCharter-Italic " AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch1_pqp4df.enc <XCharter-Italic.pfb
XCharter1-Roman-osf-ly1--base XCharter-Roman " AutoEnc1_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch1_5xvt3q.enc <XCharter-Roman.pfb
@@ -18914,20 +18919,20 @@ XCharter1-Roman-osf-ot1 XCharter-Roman " AutoEnc1_ylqpprchpltakubnfx2ql7fllf ReE
XCharter1-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t1--base XCharter-Roman " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch1_cjimfy.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch1_5b6tid.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t2asrb XCharter-Roman " AutoEnc1_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch1_2itbay.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ly1--base XCharter-Roman " AutoEnc1_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch1_crvcmi.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ot1 XCharter-Roman " AutoEnc1_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch1_45bsgy.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t1--base XCharter-Roman " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch1_tohekq.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch1_lhsfh5.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t2asrb XCharter-Roman " AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch1_dynzsr.enc <XCharter-Roman.pfb
XCharter1-Roman-ts1--base XCharter-Roman " AutoEnc1_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch1_co4ru4.enc <XCharter-Roman.pfb
XCharter1-Slanted-osf-ly1--base XCharter-Slanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Slanted.pfb
@@ -18935,20 +18940,20 @@ XCharter1-Slanted-osf-ot1 XCharter-Slanted " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb
XCharter1-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t1--base XCharter-Slanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Slanted.pfb
XCharter1-Slanted-ts1--base XCharter-Slanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-Slanted.pfb
XCharter1TH-BoldItalic-osf-ly1 XCharter-BoldItalic " xch1TH-osf-ly1Enc ReEncodeFont " <xch1TH_osf-ly1.enc <XCharter-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
index 248910db023..f009582c8bc 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
@@ -10680,6 +10680,11 @@ GaramondLibre-Regular-sup-t1--base GaramondLibre-Regular " AutoEnc_wkdlc77kkm5gx
GaramondLibre-Regular-sup-t2a GaramondLibre-Regular " AutoEnc_y75trcdjmjxcjj4wfzzyxacoye ReEncodeFont " <[grmlbr_y75trc.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2b GaramondLibre-Regular " AutoEnc_af3fmk7furqbz6algofaeeeujh ReEncodeFont " <[grmlbr_af3fmk.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2c GaramondLibre-Regular " AutoEnc_6l5pxogsiubowbnn4oh47tlyuf ReEncodeFont " <[grmlbr_6l5pxo.enc <GaramondLibre-Regular.pfb
+% GelasioMath.map
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
% GotIn.map
GotIn GotischeInitialen <GotIn.pfb
% GoudyIn.map
@@ -11583,21 +11588,21 @@ Junicode-Bold-inf-ot1 Junicode-Bold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Bold-inf-t1--base Junicode-Bold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-lf-lgr Junicode-Bold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ly1 Junicode-Bold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-lgr Junicode-Bold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ly1--base Junicode-Bold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ot1--base Junicode-Bold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-t1--base Junicode-Bold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-osf-lgr Junicode-Bold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ly1--base Junicode-Bold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ot1--base Junicode-Bold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-t1--base Junicode-Bold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-sup-lgr Junicode-Bold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-sup-ly1 Junicode-Bold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Bold.pfb
@@ -11605,65 +11610,65 @@ Junicode-Bold-sup-ot1 Junicode-Bold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Bold-sup-t1--base Junicode-Bold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-lgr Junicode-Bold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ly1 Junicode-Bold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ot1--base Junicode-Bold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-t1--base Junicode-Bold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-lgr Junicode-Bold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-lgr Junicode-Bold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ly1--base Junicode-Bold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ot1--base Junicode-Bold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-t1--base Junicode-Bold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ly1 Junicode-BoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ot1 Junicode-BoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-t1--base Junicode-BoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-lgr Junicode-BoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1--base Junicode-BoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ly1--base Junicode-BoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ot1--base Junicode-BoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-t1--base Junicode-BoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-lgr Junicode-BoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ot1--base Junicode-BoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ot1 Junicode-BoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-lgr Junicode-BoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ly1 Junicode-BoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ot1 Junicode-BoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-t1--base Junicode-BoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-lgr Junicode-BoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ot1--base Junicode-BoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ot1 Junicode-BoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ot1--base Junicode-BoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-lgr Junicode-BoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ot1--base Junicode-BoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-lgr Junicode-BoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ly1--base Junicode-BoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-t1--base Junicode-BoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-Cond-inf-lgr Junicode-Cond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Cond.pfb
@@ -11671,21 +11676,21 @@ Junicode-Cond-inf-ot1 Junicode-Cond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Cond-inf-t1--base Junicode-Cond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-lf-lgr Junicode-Cond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ly1 Junicode-Cond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-lgr Junicode-Cond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ly1--base Junicode-Cond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ot1--base Junicode-Cond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-t1--base Junicode-Cond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-osf-lgr Junicode-Cond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ly1--base Junicode-Cond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ot1--base Junicode-Cond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-t1--base Junicode-Cond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-sup-lgr Junicode-Cond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-sup-ly1 Junicode-Cond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Cond.pfb
@@ -11693,65 +11698,65 @@ Junicode-Cond-sup-ot1 Junicode-Cond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Cond-sup-t1--base Junicode-Cond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-lgr Junicode-Cond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ly1 Junicode-Cond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ot1--base Junicode-Cond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-t1--base Junicode-Cond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-lgr Junicode-Cond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-lgr Junicode-Cond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ly1--base Junicode-Cond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ot1--base Junicode-Cond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-t1--base Junicode-Cond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ly1 Junicode-CondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ot1 Junicode-CondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-t1--base Junicode-CondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-lgr Junicode-CondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1--base Junicode-CondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ly1--base Junicode-CondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ot1--base Junicode-CondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-t1--base Junicode-CondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-lgr Junicode-CondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ot1--base Junicode-CondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ot1 Junicode-CondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ot1--base Junicode-CondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-lgr Junicode-CondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ly1 Junicode-CondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ot1 Junicode-CondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-t1--base Junicode-CondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-lgr Junicode-CondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ot1--base Junicode-CondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ot1 Junicode-CondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ot1--base Junicode-CondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-lgr Junicode-CondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ot1--base Junicode-CondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ot1 Junicode-CondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-lgr Junicode-CondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ly1--base Junicode-CondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ot1--base Junicode-CondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-t1--base Junicode-CondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondLight.pfb
@@ -11759,21 +11764,21 @@ Junicode-CondLight-inf-ot1 Junicode-CondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-CondLight-inf-t1--base Junicode-CondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-lgr Junicode-CondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ly1 Junicode-CondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-lgr Junicode-CondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ly1--base Junicode-CondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ot1--base Junicode-CondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-t1--base Junicode-CondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-lgr Junicode-CondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ot1--base Junicode-CondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-t1--base Junicode-CondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-lgr Junicode-CondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-ly1 Junicode-CondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondLight.pfb
@@ -11781,65 +11786,65 @@ Junicode-CondLight-sup-ot1 Junicode-CondLight " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-CondLight-sup-t1--base Junicode-CondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-lgr Junicode-CondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ly1 Junicode-CondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ot1--base Junicode-CondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-lgr Junicode-CondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-lgr Junicode-CondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ly1--base Junicode-CondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ot1--base Junicode-CondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-t1--base Junicode-CondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ly1 Junicode-CondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ot1 Junicode-CondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-t1--base Junicode-CondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1--base Junicode-CondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-t1--base Junicode-CondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-lgr Junicode-CondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ot1--base Junicode-CondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ly1 Junicode-CondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ot1 Junicode-CondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-t1--base Junicode-CondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-lgr Junicode-CondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ot1--base Junicode-CondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ot1 Junicode-CondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-lgr Junicode-CondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ot1--base Junicode-CondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-lgr Junicode-CondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-t1--base Junicode-CondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondMedium.pfb
@@ -11847,21 +11852,21 @@ Junicode-CondMedium-inf-ot1 Junicode-CondMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3p
Junicode-CondMedium-inf-t1--base Junicode-CondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-lgr Junicode-CondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ly1 Junicode-CondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ly1--base Junicode-CondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ot1--base Junicode-CondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-t1--base Junicode-CondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-lgr Junicode-CondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ot1--base Junicode-CondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-lgr Junicode-CondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-ly1 Junicode-CondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondMedium.pfb
@@ -11869,65 +11874,65 @@ Junicode-CondMedium-sup-ot1 Junicode-CondMedium " AutoEnc_ilb24pr2hmz3ktady5tx53
Junicode-CondMedium-sup-t1--base Junicode-CondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-lgr Junicode-CondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ly1 Junicode-CondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ot1--base Junicode-CondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-lgr Junicode-CondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-lgr Junicode-CondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ly1--base Junicode-CondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ot1--base Junicode-CondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-t1--base Junicode-CondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ly1 Junicode-CondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ot1 Junicode-CondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-t1--base Junicode-CondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1--base Junicode-CondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-lgr Junicode-CondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ot1--base Junicode-CondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ly1 Junicode-CondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ot1 Junicode-CondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-t1--base Junicode-CondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-lgr Junicode-CondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ot1--base Junicode-CondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ot1 Junicode-CondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-lgr Junicode-CondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ot1--base Junicode-CondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-lgr Junicode-CondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-Exp-inf-lgr Junicode-Exp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Exp.pfb
@@ -11935,21 +11940,21 @@ Junicode-Exp-inf-ot1 Junicode-Exp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeF
Junicode-Exp-inf-t1--base Junicode-Exp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-lf-lgr Junicode-Exp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ly1 Junicode-Exp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-lgr Junicode-Exp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ly1--base Junicode-Exp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ot1--base Junicode-Exp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-t1--base Junicode-Exp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-osf-lgr Junicode-Exp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ly1--base Junicode-Exp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ot1--base Junicode-Exp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-t1--base Junicode-Exp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-sup-lgr Junicode-Exp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-sup-ly1 Junicode-Exp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Exp.pfb
@@ -11957,21 +11962,21 @@ Junicode-Exp-sup-ot1 Junicode-Exp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeF
Junicode-Exp-sup-t1--base Junicode-Exp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-lgr Junicode-Exp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ly1 Junicode-Exp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ot1--base Junicode-Exp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-t1--base Junicode-Exp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-lgr Junicode-Exp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-lgr Junicode-Exp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ly1--base Junicode-Exp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ot1--base Junicode-Exp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-t1--base Junicode-Exp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpBold.pfb
@@ -11979,21 +11984,21 @@ Junicode-ExpBold-inf-ot1 Junicode-ExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-ExpBold-inf-t1--base Junicode-ExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-lgr Junicode-ExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ly1 Junicode-ExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ly1--base Junicode-ExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ot1--base Junicode-ExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-t1--base Junicode-ExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-lgr Junicode-ExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ot1--base Junicode-ExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-lgr Junicode-ExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-ly1 Junicode-ExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpBold.pfb
@@ -12001,109 +12006,109 @@ Junicode-ExpBold-sup-ot1 Junicode-ExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-ExpBold-sup-t1--base Junicode-ExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-lgr Junicode-ExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ly1 Junicode-ExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ot1--base Junicode-ExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-lgr Junicode-ExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-lgr Junicode-ExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ly1--base Junicode-ExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ot1--base Junicode-ExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-t1--base Junicode-ExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ly1 Junicode-ExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ot1 Junicode-ExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-t1--base Junicode-ExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1--base Junicode-ExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-lgr Junicode-ExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ot1--base Junicode-ExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ly1 Junicode-ExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ot1 Junicode-ExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-t1--base Junicode-ExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-lgr Junicode-ExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ot1--base Junicode-ExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ot1 Junicode-ExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-lgr Junicode-ExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ot1--base Junicode-ExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ly1 Junicode-ExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ot1 Junicode-ExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-t1--base Junicode-ExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-lgr Junicode-ExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1--base Junicode-ExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ly1--base Junicode-ExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ot1--base Junicode-ExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-t1--base Junicode-ExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-lgr Junicode-ExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ot1--base Junicode-ExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-lgr Junicode-ExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ly1 Junicode-ExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ot1 Junicode-ExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-t1--base Junicode-ExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-lgr Junicode-ExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ot1--base Junicode-ExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ot1 Junicode-ExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ot1--base Junicode-ExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-lgr Junicode-ExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ot1--base Junicode-ExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-lgr Junicode-ExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ly1--base Junicode-ExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-t1--base Junicode-ExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
@@ -12111,21 +12116,21 @@ Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-lgr Junicode-ExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ly1--base Junicode-ExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ot1--base Junicode-ExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-t1--base Junicode-ExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-lgr Junicode-ExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-lgr Junicode-ExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
@@ -12133,65 +12138,65 @@ Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-lgr Junicode-ExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ly1 Junicode-ExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ot1--base Junicode-ExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-lgr Junicode-ExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-lgr Junicode-ExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ly1--base Junicode-ExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-t1--base Junicode-ExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ly1 Junicode-ExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ot1 Junicode-ExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-t1--base Junicode-ExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1--base Junicode-ExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-lgr Junicode-ExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ot1--base Junicode-ExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ly1 Junicode-ExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ot1 Junicode-ExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-t1--base Junicode-ExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-lgr Junicode-ExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ot1--base Junicode-ExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ot1 Junicode-ExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-lgr Junicode-ExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ot1--base Junicode-ExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
@@ -12199,21 +12204,21 @@ Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-t1--base Junicode-ExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-lgr Junicode-ExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
@@ -12221,109 +12226,109 @@ Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-lgr Junicode-ExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ly1 Junicode-ExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-lgr Junicode-ExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-lgr Junicode-ExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-t1--base Junicode-ExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-lgr Junicode-ExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ly1 Junicode-ExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ot1 Junicode-ExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-lgr Junicode-ExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-lgr Junicode-ExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-Italic-inf-lgr Junicode-Italic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ly1 Junicode-Italic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ot1 Junicode-Italic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-Italic.pfb
Junicode-Italic-inf-t1--base Junicode-Italic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-Italic.pfb
Junicode-Italic-lf-lgr Junicode-Italic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1--base Junicode-Italic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-lgr Junicode-Italic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ly1--base Junicode-Italic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ot1--base Junicode-Italic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-t1--base Junicode-Italic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-Italic.pfb
Junicode-Italic-lf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-osf-lgr Junicode-Italic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ot1--base Junicode-Italic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ot1 Junicode-Italic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ly1--base Junicode-Italic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ot1--base Junicode-Italic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-t1--base Junicode-Italic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-sup-lgr Junicode-Italic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ly1 Junicode-Italic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ot1 Junicode-Italic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-Italic.pfb
Junicode-Italic-sup-t1--base Junicode-Italic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-lgr Junicode-Italic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ot1--base Junicode-Italic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ot1 Junicode-Italic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ot1--base Junicode-Italic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-t1--base Junicode-Italic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-lgr Junicode-Italic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ot1--base Junicode-Italic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ot1 Junicode-Italic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-lgr Junicode-Italic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ly1--base Junicode-Italic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ot1--base Junicode-Italic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-t1--base Junicode-Italic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Light-inf-lgr Junicode-Light " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Light.pfb
@@ -12331,21 +12336,21 @@ Junicode-Light-inf-ot1 Junicode-Light " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-Light-inf-t1--base Junicode-Light " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-lf-lgr Junicode-Light " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Light.pfb
Junicode-Light-lf-ly1 Junicode-Light " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-lgr Junicode-Light " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ly1--base Junicode-Light " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ot1--base Junicode-Light " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-t1--base Junicode-Light " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Light.pfb
Junicode-Light-lf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-osf-lgr Junicode-Light " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Light.pfb
-Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Light.pfb
+Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ly1--base Junicode-Light " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ot1--base Junicode-Light " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-t1--base Junicode-Light " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Light.pfb
-Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Light.pfb
+Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-sup-lgr Junicode-Light " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-sup-ly1 Junicode-Light " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Light.pfb
@@ -12353,65 +12358,65 @@ Junicode-Light-sup-ot1 Junicode-Light " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-Light-sup-t1--base Junicode-Light " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Light.pfb
Junicode-Light-tlf-lgr Junicode-Light " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Light.pfb
Junicode-Light-tlf-ly1 Junicode-Light " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Light.pfb
-Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Light.pfb
+Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ly1--base Junicode-Light " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ot1--base Junicode-Light " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-t1--base Junicode-Light " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Light.pfb
-Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Light.pfb
+Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-Light-tosf-lgr Junicode-Light " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Light.pfb
-Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Light.pfb
+Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-lgr Junicode-Light " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ly1--base Junicode-Light " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ot1--base Junicode-Light " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-t1--base Junicode-Light " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Light.pfb
-Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Light.pfb
+Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ly1 Junicode-LightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ot1 Junicode-LightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-t1--base Junicode-LightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-lgr Junicode-LightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1--base Junicode-LightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ly1--base Junicode-LightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ot1--base Junicode-LightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-t1--base Junicode-LightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-lgr Junicode-LightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ot1--base Junicode-LightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ot1 Junicode-LightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ot1--base Junicode-LightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-lgr Junicode-LightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ly1 Junicode-LightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ot1 Junicode-LightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-t1--base Junicode-LightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-lgr Junicode-LightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ot1--base Junicode-LightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ot1 Junicode-LightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ot1--base Junicode-LightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-lgr Junicode-LightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ot1--base Junicode-LightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ot1 Junicode-LightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-lgr Junicode-LightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ly1--base Junicode-LightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ot1--base Junicode-LightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-t1--base Junicode-LightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-Medium-inf-lgr Junicode-Medium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Medium.pfb
@@ -12419,21 +12424,21 @@ Junicode-Medium-inf-ot1 Junicode-Medium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-Medium-inf-t1--base Junicode-Medium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-lf-lgr Junicode-Medium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ly1 Junicode-Medium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-lgr Junicode-Medium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ly1--base Junicode-Medium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ot1--base Junicode-Medium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-t1--base Junicode-Medium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-osf-lgr Junicode-Medium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ly1--base Junicode-Medium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ot1--base Junicode-Medium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-t1--base Junicode-Medium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-sup-lgr Junicode-Medium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-sup-ly1 Junicode-Medium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Medium.pfb
@@ -12441,65 +12446,65 @@ Junicode-Medium-sup-ot1 Junicode-Medium " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-Medium-sup-t1--base Junicode-Medium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-lgr Junicode-Medium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ly1 Junicode-Medium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ot1--base Junicode-Medium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-t1--base Junicode-Medium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-lgr Junicode-Medium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-lgr Junicode-Medium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ly1--base Junicode-Medium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ot1--base Junicode-Medium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-t1--base Junicode-Medium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ly1 Junicode-MediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ot1 Junicode-MediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-t1--base Junicode-MediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-lgr Junicode-MediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1--base Junicode-MediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ly1--base Junicode-MediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ot1--base Junicode-MediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-t1--base Junicode-MediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-lgr Junicode-MediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ot1--base Junicode-MediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-lgr Junicode-MediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ly1 Junicode-MediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ot1 Junicode-MediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-t1--base Junicode-MediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-lgr Junicode-MediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ot1--base Junicode-MediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ot1 Junicode-MediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ot1--base Junicode-MediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-lgr Junicode-MediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ot1--base Junicode-MediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-lgr Junicode-MediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ly1--base Junicode-MediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-t1--base Junicode-MediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-Regular-inf-lgr Junicode-Regular " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Regular.pfb
@@ -12507,21 +12512,21 @@ Junicode-Regular-inf-ot1 Junicode-Regular " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-Regular-inf-t1--base Junicode-Regular " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-lf-lgr Junicode-Regular " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ly1 Junicode-Regular " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-lgr Junicode-Regular " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ly1--base Junicode-Regular " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ot1--base Junicode-Regular " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-t1--base Junicode-Regular " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-osf-lgr Junicode-Regular " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ly1--base Junicode-Regular " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ot1--base Junicode-Regular " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-t1--base Junicode-Regular " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-sup-lgr Junicode-Regular " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-sup-ly1 Junicode-Regular " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Regular.pfb
@@ -12529,21 +12534,21 @@ Junicode-Regular-sup-ot1 Junicode-Regular " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-Regular-sup-t1--base Junicode-Regular " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-lgr Junicode-Regular " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ly1 Junicode-Regular " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ot1--base Junicode-Regular " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-t1--base Junicode-Regular " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-lgr Junicode-Regular " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-lgr Junicode-Regular " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ly1--base Junicode-Regular " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ot1--base Junicode-Regular " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-t1--base Junicode-Regular " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmBold.pfb
@@ -12551,21 +12556,21 @@ Junicode-SmBold-inf-ot1 Junicode-SmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmBold-inf-t1--base Junicode-SmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-lgr Junicode-SmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ly1 Junicode-SmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-lgr Junicode-SmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ly1--base Junicode-SmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ot1--base Junicode-SmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-t1--base Junicode-SmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-lgr Junicode-SmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ot1--base Junicode-SmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-t1--base Junicode-SmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-lgr Junicode-SmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-ly1 Junicode-SmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmBold.pfb
@@ -12573,65 +12578,65 @@ Junicode-SmBold-sup-ot1 Junicode-SmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmBold-sup-t1--base Junicode-SmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-lgr Junicode-SmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ly1 Junicode-SmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ot1--base Junicode-SmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-lgr Junicode-SmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-lgr Junicode-SmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ly1--base Junicode-SmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ot1--base Junicode-SmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-t1--base Junicode-SmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ly1 Junicode-SmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ot1 Junicode-SmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-t1--base Junicode-SmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1--base Junicode-SmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-lgr Junicode-SmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ot1--base Junicode-SmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ly1 Junicode-SmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ot1 Junicode-SmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-t1--base Junicode-SmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-lgr Junicode-SmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ot1--base Junicode-SmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ot1 Junicode-SmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-lgr Junicode-SmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ot1--base Junicode-SmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-lgr Junicode-SmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCond.pfb
@@ -12639,21 +12644,21 @@ Junicode-SmCond-inf-ot1 Junicode-SmCond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmCond-inf-t1--base Junicode-SmCond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-lgr Junicode-SmCond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ly1 Junicode-SmCond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-lgr Junicode-SmCond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ly1--base Junicode-SmCond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ot1--base Junicode-SmCond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-t1--base Junicode-SmCond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-lgr Junicode-SmCond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ot1--base Junicode-SmCond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-t1--base Junicode-SmCond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-lgr Junicode-SmCond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-ly1 Junicode-SmCond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCond.pfb
@@ -12661,65 +12666,65 @@ Junicode-SmCond-sup-ot1 Junicode-SmCond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmCond-sup-t1--base Junicode-SmCond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-lgr Junicode-SmCond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ly1 Junicode-SmCond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ot1--base Junicode-SmCond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-lgr Junicode-SmCond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-lgr Junicode-SmCond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ly1--base Junicode-SmCond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ot1--base Junicode-SmCond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-t1--base Junicode-SmCond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ly1 Junicode-SmCondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ot1 Junicode-SmCondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-t1--base Junicode-SmCondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1--base Junicode-SmCondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-t1--base Junicode-SmCondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-lgr Junicode-SmCondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ot1--base Junicode-SmCondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ly1 Junicode-SmCondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ot1 Junicode-SmCondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-t1--base Junicode-SmCondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-lgr Junicode-SmCondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ot1--base Junicode-SmCondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ot1 Junicode-SmCondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-lgr Junicode-SmCondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ot1--base Junicode-SmCondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-lgr Junicode-SmCondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-t1--base Junicode-SmCondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
@@ -12727,21 +12732,21 @@ Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-lgr Junicode-SmCondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ly1--base Junicode-SmCondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ot1--base Junicode-SmCondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-t1--base Junicode-SmCondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-lgr Junicode-SmCondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-lgr Junicode-SmCondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
@@ -12749,65 +12754,65 @@ Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-lgr Junicode-SmCondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ly1 Junicode-SmCondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ot1--base Junicode-SmCondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-lgr Junicode-SmCondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-lgr Junicode-SmCondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ly1--base Junicode-SmCondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-t1--base Junicode-SmCondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ly1 Junicode-SmCondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ot1 Junicode-SmCondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-t1--base Junicode-SmCondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1--base Junicode-SmCondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-lgr Junicode-SmCondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ot1--base Junicode-SmCondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ly1 Junicode-SmCondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ot1 Junicode-SmCondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-t1--base Junicode-SmCondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-lgr Junicode-SmCondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ot1--base Junicode-SmCondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ot1 Junicode-SmCondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-lgr Junicode-SmCondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ot1--base Junicode-SmCondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
@@ -12815,21 +12820,21 @@ Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium " AutoEnc_ldcvmrfllg5ebu6xfr
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-t1--base Junicode-SmCondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-lgr Junicode-SmCondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
@@ -12837,65 +12842,65 @@ Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium " AutoEnc_ilb24pr2hmz3ktady5
Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-lgr Junicode-SmCondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ly1 Junicode-SmCondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-lgr Junicode-SmCondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-lgr Junicode-SmCondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-t1--base Junicode-SmCondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ly1 Junicode-SmCondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ot1 Junicode-SmCondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-t1--base Junicode-SmCondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-lgr Junicode-SmCondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ly1 Junicode-SmCondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ot1 Junicode-SmCondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-t1--base Junicode-SmCondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-lgr Junicode-SmCondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ot1 Junicode-SmCondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-lgr Junicode-SmCondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmExp-inf-lgr Junicode-SmExp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
Junicode-SmExp-inf-ly1 Junicode-SmExp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExp.pfb
@@ -12903,21 +12908,21 @@ Junicode-SmExp-inf-ot1 Junicode-SmExp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-SmExp-inf-t1--base Junicode-SmExp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-lgr Junicode-SmExp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ly1 Junicode-SmExp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-lgr Junicode-SmExp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ly1--base Junicode-SmExp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ot1--base Junicode-SmExp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-t1--base Junicode-SmExp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-lgr Junicode-SmExp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ot1--base Junicode-SmExp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-t1--base Junicode-SmExp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-lgr Junicode-SmExp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-ly1 Junicode-SmExp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExp.pfb
@@ -12925,21 +12930,21 @@ Junicode-SmExp-sup-ot1 Junicode-SmExp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-SmExp-sup-t1--base Junicode-SmExp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-lgr Junicode-SmExp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ot1--base Junicode-SmExp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-lgr Junicode-SmExp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ot1--base Junicode-SmExp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
@@ -12947,21 +12952,21 @@ Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-lgr Junicode-SmExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ly1--base Junicode-SmExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ot1--base Junicode-SmExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-t1--base Junicode-SmExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-lgr Junicode-SmExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-lgr Junicode-SmExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
@@ -12969,109 +12974,109 @@ Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-lgr Junicode-SmExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ly1 Junicode-SmExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ot1--base Junicode-SmExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-lgr Junicode-SmExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-lgr Junicode-SmExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ly1--base Junicode-SmExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-t1--base Junicode-SmExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ly1 Junicode-SmExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ot1 Junicode-SmExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-t1--base Junicode-SmExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-lgr Junicode-SmExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ly1 Junicode-SmExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ot1 Junicode-SmExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-t1--base Junicode-SmExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-lgr Junicode-SmExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ot1 Junicode-SmExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-lgr Junicode-SmExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ly1 Junicode-SmExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ot1 Junicode-SmExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-t1--base Junicode-SmExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1--base Junicode-SmExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-t1--base Junicode-SmExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-lgr Junicode-SmExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ot1--base Junicode-SmExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ly1 Junicode-SmExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ot1 Junicode-SmExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-t1--base Junicode-SmExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-lgr Junicode-SmExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ot1--base Junicode-SmExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ot1 Junicode-SmExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-lgr Junicode-SmExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ot1--base Junicode-SmExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-lgr Junicode-SmExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-t1--base Junicode-SmExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
@@ -13079,21 +13084,21 @@ Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-t1--base Junicode-SmExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-lgr Junicode-SmExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
@@ -13101,65 +13106,65 @@ Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-lgr Junicode-SmExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-lgr Junicode-SmExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ly1 Junicode-SmExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ot1 Junicode-SmExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-t1--base Junicode-SmExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-lgr Junicode-SmExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ly1 Junicode-SmExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ot1 Junicode-SmExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-t1--base Junicode-SmExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-lgr Junicode-SmExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-lgr Junicode-SmExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
@@ -13167,21 +13172,21 @@ Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-lgr Junicode-SmExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
@@ -13189,65 +13194,65 @@ Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-lgr Junicode-SmExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-lgr Junicode-SmExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
% Kinigcap.map
Kinigcap KinigsteinCaps <Kinigcap.pfb
@@ -18498,10 +18503,10 @@ XCharter-Bold-lf-ot1 XCharter-Bold " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEncode
XCharter-Bold-lf-sc-ly1--base XCharter-Bold " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-ot1--base XCharter-Bold " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t1--base XCharter-Bold " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t2asrb--base XCharter-Bold " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t1--base XCharter-Bold " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t2asrb XCharter-Bold " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ly1--base XCharter-Bold " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ot1 XCharter-Bold " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Bold.pfb
@@ -18511,15 +18516,15 @@ XCharter-Bold-osf-ot1 XCharter-Bold " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReEncod
XCharter-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t1--base XCharter-Bold " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t2asrb XCharter-Bold " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ly1--base XCharter-Bold " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ot1 XCharter-Bold " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t1--base XCharter-Bold " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Bold.pfb
+XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t2asrb XCharter-Bold " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ly1--base XCharter-Bold " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ot1 XCharter-Bold " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Bold.pfb
@@ -18527,20 +18532,20 @@ XCharter-Bold-tlf-ot2 XCharter-Bold " xcharterOT2enc ReEncodeFont " <[xcharter-o
XCharter-Bold-tlf-sc-ly1--base XCharter-Bold " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-ot1--base XCharter-Bold " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t1--base XCharter-Bold " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t2asrb--base XCharter-Bold " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t1--base XCharter-Bold " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t2asrb XCharter-Bold " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ly1--base XCharter-Bold " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ot1 XCharter-Bold " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t1--base XCharter-Bold " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t2asrb XCharter-Bold " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Bold.pfb
XCharter-Bold-ts1--base XCharter-Bold " AutoEnc_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch_z3wvjz.enc <XCharter-Bold.pfb
XCharter-BoldItalic-dnom-ly1--base XCharter-BoldItalic " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldItalic.pfb
@@ -18554,10 +18559,10 @@ XCharter-BoldItalic-lf-ot1 XCharter-BoldItalic " AutoEnc_ru4hosnl6h5ukcp2w3tt2ie
XCharter-BoldItalic-lf-sc-ly1--base XCharter-BoldItalic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-ot1--base XCharter-BoldItalic " AutoEnc_7qcosniepdkkhq2lidq32xyajh ReEncodeFont " <[xch_7qcosn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t1--base XCharter-BoldItalic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t1--base XCharter-BoldItalic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t2asrb XCharter-BoldItalic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ly1--base XCharter-BoldItalic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ot1 XCharter-BoldItalic " AutoEnc_qs7dmbcmqkgbo6666jibzn77ta ReEncodeFont " <[xch_qs7dmb.enc <XCharter-BoldItalic.pfb
@@ -18567,15 +18572,15 @@ XCharter-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc_aegaiust5jvuyf74wgreek
XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ot1 XCharter-BoldItalic " AutoEnc_gkuln73auq7qfnbajjeh66tiyg ReEncodeFont " <[xch_gkuln7.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t2asrb XCharter-BoldItalic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ot1 XCharter-BoldItalic " AutoEnc_lfc2esxm2njp63bgoww5uifspg ReEncodeFont " <[xch_lfc2es.enc <XCharter-BoldItalic.pfb
@@ -18583,20 +18588,20 @@ XCharter-BoldItalic-tlf-ot2 XCharter-BoldItalic " xcharterOT2enc ReEncodeFont "
XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jffewfvsu3e3ihebccixpovvra ReEncodeFont " <[xch_jffewf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t2asrb XCharter-BoldItalic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter-BoldSlanted-dnom-ly1--base XCharter-BoldSlanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldSlanted.pfb
@@ -18610,10 +18615,10 @@ XCharter-BoldSlanted-lf-ot1 XCharter-BoldSlanted " AutoEnc_aoa5sqhsbxws2dsjkwdeq
XCharter-BoldSlanted-lf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t1--base XCharter-BoldSlanted " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t1--base XCharter-BoldSlanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t2asrb XCharter-BoldSlanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ly1--base XCharter-BoldSlanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ot1 XCharter-BoldSlanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-BoldSlanted.pfb
@@ -18623,15 +18628,15 @@ XCharter-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc_g2zr6i3czinzql75wmpz
XCharter-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ly1--base XCharter-BoldSlanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ot1 XCharter-BoldSlanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t1--base XCharter-BoldSlanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t2asrb XCharter-BoldSlanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ly1--base XCharter-BoldSlanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ot1 XCharter-BoldSlanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-BoldSlanted.pfb
@@ -18639,20 +18644,20 @@ XCharter-BoldSlanted-tlf-ot2 XCharter-BoldSlanted " xcharterOT2enc ReEncodeFont
XCharter-BoldSlanted-tlf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t1--base XCharter-BoldSlanted " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t1--base XCharter-BoldSlanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t2asrb XCharter-BoldSlanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter-Ita-alph XCharter-Italic " chalphEncoding ReEncodeFont " <[chalph.enc <XCharter-Italic.pfb
@@ -18667,10 +18672,10 @@ XCharter-Italic-lf-ot1 XCharter-Italic " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEn
XCharter-Italic-lf-sc-ly1--base XCharter-Italic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-ot1--base XCharter-Italic " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t1--base XCharter-Italic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t2asrb--base XCharter-Italic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t1--base XCharter-Italic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t2asrb XCharter-Italic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ly1--base XCharter-Italic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ot1 XCharter-Italic " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Italic.pfb
@@ -18680,15 +18685,15 @@ XCharter-Italic-osf-ot1 XCharter-Italic " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReE
XCharter-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t1--base XCharter-Italic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t2asrb XCharter-Italic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ly1--base XCharter-Italic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ot1 XCharter-Italic " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t1--base XCharter-Italic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Italic.pfb
+XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t2asrb XCharter-Italic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ly1--base XCharter-Italic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ot1 XCharter-Italic " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Italic.pfb
@@ -18696,20 +18701,20 @@ XCharter-Italic-tlf-ot2 XCharter-Italic " xcharterOT2enc ReEncodeFont " <[xchart
XCharter-Italic-tlf-sc-ly1--base XCharter-Italic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-ot1--base XCharter-Italic " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t1--base XCharter-Italic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t2asrb--base XCharter-Italic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t1--base XCharter-Italic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t2asrb XCharter-Italic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ly1--base XCharter-Italic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ot1 XCharter-Italic " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t1--base XCharter-Italic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t2asrb XCharter-Italic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-Italic.pfb
XCharter-Italic-ts1--base XCharter-Italic " AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch_pqp4df.enc <XCharter-Italic.pfb
XCharter-Roman-dnom-ly1--base XCharter-Roman " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Roman.pfb
@@ -18723,12 +18728,12 @@ XCharter-Roman-lf-ot1 XCharter-Roman " AutoEnc_bbupxqigkbffslxhtvjmz5qdhb ReEnco
XCharter-Roman-lf-sc-ly1--base XCharter-Roman " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-ot1--base XCharter-Roman " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t1--base XCharter-Roman " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t2asrb--base XCharter-Roman " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t1--base XCharter-Roman " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_6ckksab4xgup3cfdzppakccfch ReEncodeFont " <[xch_6ckksa.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_ajf4qeyyzlwr22lxwfvdvytw4h ReEncodeFont " <[xch_ajf4qe.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t2asrb XCharter-Roman " AutoEnc_2ne5ras2ihnhgxt43rxslgjvce ReEncodeFont " <[xch_2ne5ra.enc <XCharter-Roman.pfb
-XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Roman.pfb
+XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_du7eesfjv53g5kmcdg53pxaz6g ReEncodeFont " <[xch_du7ees.enc <XCharter-Roman.pfb
XCharter-Roman-numr-ot1 XCharter-Roman " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Roman.pfb
XCharter-Roman-numr-t1--base XCharter-Roman " AutoEnc_aw3womsecdumtuxvl6hik6fs3a ReEncodeFont " <[xch_aw3wom.enc <XCharter-Roman.pfb
XCharter-Roman-osf-ly1--base XCharter-Roman " AutoEnc_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch_5xvt3q.enc <XCharter-Roman.pfb
@@ -18736,15 +18741,15 @@ XCharter-Roman-osf-ot1 XCharter-Roman " AutoEnc_ylqpprchpltakubnfx2ql7fllf ReEnc
XCharter-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t1--base XCharter-Roman " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch_cjimfy.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch_5b6tid.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t2asrb XCharter-Roman " AutoEnc_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch_2itbay.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ly1--base XCharter-Roman " AutoEnc_ukw3hq7h3prn34ryh2qktyrkse ReEncodeFont " <[xch_ukw3hq.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ot1 XCharter-Roman " AutoEnc_dhwwz5gerbpejovfe253unwxde ReEncodeFont " <[xch_dhwwz5.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t1--base XCharter-Roman " AutoEnc_6hzluovfqgqjqwjosfm7uze3oh ReEncodeFont " <[xch_6hzluo.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_pz3lxgt2tnxz7p6istzozn734g ReEncodeFont " <[xch_pz3lxg.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_7rlj4vy6adeoxbzopcxh2vadqb ReEncodeFont " <[xch_7rlj4v.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t2asrb XCharter-Roman " AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf ReEncodeFont " <[xch_vyhv3k.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ly1--base XCharter-Roman " AutoEnc_worivip5whk4cqev33dw4cszae ReEncodeFont " <[xch_worivi.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ot1 XCharter-Roman " AutoEnc_3glltskulaq25sg7bdv2b6v7sb ReEncodeFont " <[xch_3gllts.enc <XCharter-Roman.pfb
@@ -18752,20 +18757,20 @@ XCharter-Roman-tlf-ot2 XCharter-Roman " xcharterOT2enc ReEncodeFont " <[xcharter
XCharter-Roman-tlf-sc-ly1--base XCharter-Roman " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-ot1--base XCharter-Roman " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t1--base XCharter-Roman " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t2asrb--base XCharter-Roman " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t1--base XCharter-Roman " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_m2vrds6ohoduinigqjp2pulx6b ReEncodeFont " <[xch_m2vrds.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_4difzdpgpp73nhcpkiia7rn64h ReEncodeFont " <[xch_4difzd.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t2asrb XCharter-Roman " AutoEnc_fiqldzomfw67cfhl2p3wqrxjna ReEncodeFont " <[xch_fiqldz.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ly1--base XCharter-Roman " AutoEnc_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch_crvcmi.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ot1 XCharter-Roman " AutoEnc_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch_45bsgy.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t1--base XCharter-Roman " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch_tohekq.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch_lhsfh5.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t2asrb XCharter-Roman " AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch_dynzsr.enc <XCharter-Roman.pfb
XCharter-Roman-ts1--base XCharter-Roman " AutoEnc_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch_co4ru4.enc <XCharter-Roman.pfb
XCharter-Slanted-dnom-ly1--base XCharter-Slanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Slanted.pfb
@@ -18779,10 +18784,10 @@ XCharter-Slanted-lf-ot1 XCharter-Slanted " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb Re
XCharter-Slanted-lf-sc-ly1--base XCharter-Slanted " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-ot1--base XCharter-Slanted " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t1--base XCharter-Slanted " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t2asrb--base XCharter-Slanted " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t1--base XCharter-Slanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t2asrb XCharter-Slanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ly1--base XCharter-Slanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ot1 XCharter-Slanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Slanted.pfb
@@ -18792,15 +18797,15 @@ XCharter-Slanted-osf-ot1 XCharter-Slanted " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb R
XCharter-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t1--base XCharter-Slanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ly1--base XCharter-Slanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ot1 XCharter-Slanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t1--base XCharter-Slanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Slanted.pfb
-XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Slanted.pfb
+XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t2asrb XCharter-Slanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ly1--base XCharter-Slanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ot1 XCharter-Slanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Slanted.pfb
@@ -18808,20 +18813,20 @@ XCharter-Slanted-tlf-ot2 XCharter-Slanted " xcharterOT2enc ReEncodeFont " <[xcha
XCharter-Slanted-tlf-sc-ly1--base XCharter-Slanted " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-ot1--base XCharter-Slanted " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t1--base XCharter-Slanted " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t2asrb--base XCharter-Slanted " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t1--base XCharter-Slanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t2asrb XCharter-Slanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Slanted.pfb
XCharter-Slanted-ts1--base XCharter-Slanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-Slanted.pfb
XCharter-osf XCharter-Roman " chtabOsFEncoding ReEncodeFont " <[chtabosf.enc <XCharter-Roman.pfb
@@ -18830,20 +18835,20 @@ XCharter1-Bold-osf-ot1 XCharter-Bold " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb ReEnc
XCharter1-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t1--base XCharter-Bold " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t2asrb XCharter-Bold " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ly1--base XCharter-Bold " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ot1 XCharter-Bold " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t1--base XCharter-Bold " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t2asrb XCharter-Bold " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Bold.pfb
XCharter1-Bold-ts1--base XCharter-Bold " AutoEnc1_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch1_z3wvjz.enc <XCharter-Bold.pfb
XCharter1-BoldItalic-osf-ly1--base XCharter-BoldItalic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldItalic.pfb
@@ -18851,20 +18856,20 @@ XCharter1-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc1_aegaiust5jvuyf74wgre
XCharter1-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch1_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc1_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch1_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch1_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc1_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch1_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter1-BoldSlanted-osf-ly1--base XCharter-BoldSlanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldSlanted.pfb
@@ -18872,20 +18877,20 @@ XCharter1-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc1_g2zr6i3czinzql75wm
XCharter1-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter1-Italic-osf-ly1--base XCharter-Italic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Italic.pfb
@@ -18893,20 +18898,20 @@ XCharter1-Italic-osf-ot1 XCharter-Italic " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb R
XCharter1-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t1--base XCharter-Italic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t2asrb XCharter-Italic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ly1--base XCharter-Italic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ot1 XCharter-Italic " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t1--base XCharter-Italic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t2asrb XCharter-Italic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-Italic.pfb
XCharter1-Italic-ts1--base XCharter-Italic " AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch1_pqp4df.enc <XCharter-Italic.pfb
XCharter1-Roman-osf-ly1--base XCharter-Roman " AutoEnc1_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch1_5xvt3q.enc <XCharter-Roman.pfb
@@ -18914,20 +18919,20 @@ XCharter1-Roman-osf-ot1 XCharter-Roman " AutoEnc1_ylqpprchpltakubnfx2ql7fllf ReE
XCharter1-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t1--base XCharter-Roman " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch1_cjimfy.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch1_5b6tid.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t2asrb XCharter-Roman " AutoEnc1_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch1_2itbay.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ly1--base XCharter-Roman " AutoEnc1_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch1_crvcmi.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ot1 XCharter-Roman " AutoEnc1_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch1_45bsgy.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t1--base XCharter-Roman " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch1_tohekq.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch1_lhsfh5.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t2asrb XCharter-Roman " AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch1_dynzsr.enc <XCharter-Roman.pfb
XCharter1-Roman-ts1--base XCharter-Roman " AutoEnc1_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch1_co4ru4.enc <XCharter-Roman.pfb
XCharter1-Slanted-osf-ly1--base XCharter-Slanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Slanted.pfb
@@ -18935,20 +18940,20 @@ XCharter1-Slanted-osf-ot1 XCharter-Slanted " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb
XCharter1-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t1--base XCharter-Slanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Slanted.pfb
XCharter1-Slanted-ts1--base XCharter-Slanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-Slanted.pfb
XCharter1TH-BoldItalic-osf-ly1 XCharter-BoldItalic " xch1TH-osf-ly1Enc ReEncodeFont " <xch1TH_osf-ly1.enc <XCharter-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
index 18a3c392e8f..440afc98f65 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -10680,6 +10680,11 @@ GaramondLibre-Regular-sup-t1--base GaramondLibre-Regular " AutoEnc_wkdlc77kkm5gx
GaramondLibre-Regular-sup-t2a GaramondLibre-Regular " AutoEnc_y75trcdjmjxcjj4wfzzyxacoye ReEncodeFont " <[grmlbr_y75trc.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2b GaramondLibre-Regular " AutoEnc_af3fmk7furqbz6algofaeeeujh ReEncodeFont " <[grmlbr_af3fmk.enc <GaramondLibre-Regular.pfb
GaramondLibre-Regular-sup-t2c GaramondLibre-Regular " AutoEnc_6l5pxogsiubowbnn4oh47tlyuf ReEncodeFont " <[grmlbr_6l5pxo.enc <GaramondLibre-Regular.pfb
+% GelasioMath.map
+GelasioMathBMI GelasioMathBMI <GelasioMathBMI.pfb
+GelasioMathBRM GelasioMathBRM <GelasioMathBRM.pfb
+GelasioMathMI GelasioMathMI <GelasioMathMI.pfb
+GelasioMathRM GelasioMathRM <GelasioMathRM.pfb
% GotIn.map
GotIn GotischeInitialen <GotIn.pfb
% GoudyIn.map
@@ -11583,21 +11588,21 @@ Junicode-Bold-inf-ot1 Junicode-Bold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Bold-inf-t1--base Junicode-Bold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-lf-lgr Junicode-Bold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ly1 Junicode-Bold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-lgr Junicode-Bold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ly1--base Junicode-Bold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-ot1--base Junicode-Bold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Bold.pfb
Junicode-Bold-lf-sc-t1--base Junicode-Bold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Bold.pfb
Junicode-Bold-lf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-osf-lgr Junicode-Bold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-ot1 Junicode-Bold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ly1--base Junicode-Bold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-ot1--base Junicode-Bold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-t1--base Junicode-Bold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Bold.pfb
-Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Bold.pfb
+Junicode-Bold-osf-t1--base Junicode-Bold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-Bold-sup-lgr Junicode-Bold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-sup-ly1 Junicode-Bold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Bold.pfb
@@ -11605,65 +11610,65 @@ Junicode-Bold-sup-ot1 Junicode-Bold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Bold-sup-t1--base Junicode-Bold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-lgr Junicode-Bold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ly1 Junicode-Bold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-ot1 Junicode-Bold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-ot1--base Junicode-Bold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-t1--base Junicode-Bold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Bold.pfb
-Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Bold.pfb
+Junicode-Bold-tlf-t1--base Junicode-Bold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-lgr Junicode-Bold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-ot1 Junicode-Bold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-lgr Junicode-Bold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ly1--base Junicode-Bold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-ot1--base Junicode-Bold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-sc-t1--base Junicode-Bold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Bold.pfb
-Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Bold.pfb
+Junicode-Bold-tosf-t1--base Junicode-Bold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ts1--base Junicode-Bold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Bold.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ly1 Junicode-BoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-ot1 Junicode-BoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-t1--base Junicode-BoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-lgr Junicode-BoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1--base Junicode-BoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ly1--base Junicode-BoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-ot1--base Junicode-BoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-sc-t1--base Junicode-BoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-lgr Junicode-BoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-ot1--base Junicode-BoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ly1 Junicode-BoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-ot1 Junicode-BoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-osf-t1--base Junicode-BoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-lgr Junicode-BoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ly1 Junicode-BoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-ot1 Junicode-BoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-sup-t1--base Junicode-BoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-lgr Junicode-BoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-ot1--base Junicode-BoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ly1 Junicode-BoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-ot1 Junicode-BoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-ot1--base Junicode-BoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tlf-t1--base Junicode-BoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-lgr Junicode-BoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-ot1--base Junicode-BoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-lgr Junicode-BoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ly1--base Junicode-BoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-ot1--base Junicode-BoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-sc-t1--base Junicode-BoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ts1--base Junicode-BoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
Junicode-Cond-inf-lgr Junicode-Cond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Cond.pfb
@@ -11671,21 +11676,21 @@ Junicode-Cond-inf-ot1 Junicode-Cond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncod
Junicode-Cond-inf-t1--base Junicode-Cond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-lf-lgr Junicode-Cond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ly1 Junicode-Cond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-lgr Junicode-Cond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ly1--base Junicode-Cond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-ot1--base Junicode-Cond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Cond.pfb
Junicode-Cond-lf-sc-t1--base Junicode-Cond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Cond.pfb
Junicode-Cond-lf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-osf-lgr Junicode-Cond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-ot1 Junicode-Cond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ly1--base Junicode-Cond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-ot1--base Junicode-Cond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-t1--base Junicode-Cond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Cond.pfb
-Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Cond.pfb
+Junicode-Cond-osf-t1--base Junicode-Cond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-Cond-sup-lgr Junicode-Cond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-sup-ly1 Junicode-Cond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Cond.pfb
@@ -11693,65 +11698,65 @@ Junicode-Cond-sup-ot1 Junicode-Cond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncod
Junicode-Cond-sup-t1--base Junicode-Cond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-lgr Junicode-Cond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ly1 Junicode-Cond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-ot1 Junicode-Cond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-ot1--base Junicode-Cond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-t1--base Junicode-Cond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Cond.pfb
-Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Cond.pfb
+Junicode-Cond-tlf-t1--base Junicode-Cond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-lgr Junicode-Cond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-ot1 Junicode-Cond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-lgr Junicode-Cond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ly1--base Junicode-Cond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-ot1--base Junicode-Cond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-sc-t1--base Junicode-Cond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Cond.pfb
-Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Cond.pfb
+Junicode-Cond-tosf-t1--base Junicode-Cond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ts1--base Junicode-Cond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Cond.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ly1 Junicode-CondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-ot1 Junicode-CondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-t1--base Junicode-CondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-lgr Junicode-CondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1--base Junicode-CondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ly1--base Junicode-CondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-ot1--base Junicode-CondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-sc-t1--base Junicode-CondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-lf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-lgr Junicode-CondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-ot1--base Junicode-CondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ly1 Junicode-CondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-ot1 Junicode-CondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-ot1--base Junicode-CondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-osf-t1--base Junicode-CondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-lgr Junicode-CondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ly1 Junicode-CondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-ot1 Junicode-CondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-sup-t1--base Junicode-CondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-lgr Junicode-CondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-ot1--base Junicode-CondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ly1 Junicode-CondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-ot1 Junicode-CondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-ot1--base Junicode-CondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tlf-t1--base Junicode-CondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-lgr Junicode-CondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-ot1--base Junicode-CondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ly1 Junicode-CondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-ot1 Junicode-CondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-lgr Junicode-CondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ly1--base Junicode-CondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-ot1--base Junicode-CondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-sc-t1--base Junicode-CondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-tosf-t1--base Junicode-CondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ts1--base Junicode-CondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondItalic.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondLight.pfb
@@ -11759,21 +11764,21 @@ Junicode-CondLight-inf-ot1 Junicode-CondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-CondLight-inf-t1--base Junicode-CondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-lgr Junicode-CondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ly1 Junicode-CondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-lgr Junicode-CondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ly1--base Junicode-CondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-ot1--base Junicode-CondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-sc-t1--base Junicode-CondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondLight.pfb
Junicode-CondLight-lf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-lgr Junicode-CondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-ot1 Junicode-CondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-ot1--base Junicode-CondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-t1--base Junicode-CondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLight.pfb
-Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondLight.pfb
+Junicode-CondLight-osf-t1--base Junicode-CondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-lgr Junicode-CondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-sup-ly1 Junicode-CondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondLight.pfb
@@ -11781,65 +11786,65 @@ Junicode-CondLight-sup-ot1 Junicode-CondLight " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-CondLight-sup-t1--base Junicode-CondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-lgr Junicode-CondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ly1 Junicode-CondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-ot1 Junicode-CondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-ot1--base Junicode-CondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tlf-t1--base Junicode-CondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-lgr Junicode-CondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-ot1 Junicode-CondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-lgr Junicode-CondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ly1--base Junicode-CondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-ot1--base Junicode-CondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-sc-t1--base Junicode-CondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLight.pfb
-Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondLight.pfb
+Junicode-CondLight-tosf-t1--base Junicode-CondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ts1--base Junicode-CondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLight.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ly1 Junicode-CondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-ot1 Junicode-CondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-t1--base Junicode-CondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1--base Junicode-CondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-sc-t1--base Junicode-CondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-lgr Junicode-CondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-ot1--base Junicode-CondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ly1 Junicode-CondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-ot1 Junicode-CondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-sup-t1--base Junicode-CondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-lgr Junicode-CondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-ot1--base Junicode-CondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ly1 Junicode-CondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-ot1 Junicode-CondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tlf-t1--base Junicode-CondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-lgr Junicode-CondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-ot1--base Junicode-CondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-lgr Junicode-CondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ly1--base Junicode-CondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-ot1--base Junicode-CondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-sc-t1--base Junicode-CondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ts1--base Junicode-CondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-CondMedium.pfb
@@ -11847,21 +11852,21 @@ Junicode-CondMedium-inf-ot1 Junicode-CondMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3p
Junicode-CondMedium-inf-t1--base Junicode-CondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-lgr Junicode-CondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ly1 Junicode-CondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ly1--base Junicode-CondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-ot1--base Junicode-CondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-sc-t1--base Junicode-CondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-lf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-lgr Junicode-CondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-ot1 Junicode-CondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-ot1--base Junicode-CondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-osf-t1--base Junicode-CondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-lgr Junicode-CondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-sup-ly1 Junicode-CondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-CondMedium.pfb
@@ -11869,65 +11874,65 @@ Junicode-CondMedium-sup-ot1 Junicode-CondMedium " AutoEnc_ilb24pr2hmz3ktady5tx53
Junicode-CondMedium-sup-t1--base Junicode-CondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-lgr Junicode-CondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ly1 Junicode-CondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-ot1 Junicode-CondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-ot1--base Junicode-CondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tlf-t1--base Junicode-CondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-lgr Junicode-CondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-ot1 Junicode-CondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-lgr Junicode-CondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ly1--base Junicode-CondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-ot1--base Junicode-CondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-sc-t1--base Junicode-CondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-tosf-t1--base Junicode-CondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ts1--base Junicode-CondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMedium.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ly1 Junicode-CondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-ot1 Junicode-CondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-t1--base Junicode-CondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1--base Junicode-CondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-lgr Junicode-CondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-ot1--base Junicode-CondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ly1 Junicode-CondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-ot1 Junicode-CondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-sup-t1--base Junicode-CondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-lgr Junicode-CondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-ot1--base Junicode-CondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ly1 Junicode-CondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-ot1 Junicode-CondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tlf-t1--base Junicode-CondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-lgr Junicode-CondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-ot1--base Junicode-CondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-lgr Junicode-CondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ly1--base Junicode-CondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-ot1--base Junicode-CondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-sc-t1--base Junicode-CondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ts1--base Junicode-CondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
Junicode-Exp-inf-lgr Junicode-Exp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Exp.pfb
@@ -11935,21 +11940,21 @@ Junicode-Exp-inf-ot1 Junicode-Exp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeF
Junicode-Exp-inf-t1--base Junicode-Exp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-lf-lgr Junicode-Exp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ly1 Junicode-Exp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-lgr Junicode-Exp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ly1--base Junicode-Exp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-ot1--base Junicode-Exp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Exp.pfb
Junicode-Exp-lf-sc-t1--base Junicode-Exp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Exp.pfb
Junicode-Exp-lf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-osf-lgr Junicode-Exp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-ot1 Junicode-Exp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ly1--base Junicode-Exp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-ot1--base Junicode-Exp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-t1--base Junicode-Exp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Exp.pfb
-Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Exp.pfb
+Junicode-Exp-osf-t1--base Junicode-Exp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-Exp-sup-lgr Junicode-Exp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-sup-ly1 Junicode-Exp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Exp.pfb
@@ -11957,21 +11962,21 @@ Junicode-Exp-sup-ot1 Junicode-Exp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeF
Junicode-Exp-sup-t1--base Junicode-Exp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-lgr Junicode-Exp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ly1 Junicode-Exp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-ot1 Junicode-Exp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-ot1--base Junicode-Exp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-t1--base Junicode-Exp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Exp.pfb
-Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Exp.pfb
+Junicode-Exp-tlf-t1--base Junicode-Exp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-lgr Junicode-Exp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-ot1 Junicode-Exp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-lgr Junicode-Exp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ly1--base Junicode-Exp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-ot1--base Junicode-Exp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-sc-t1--base Junicode-Exp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Exp.pfb
-Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Exp.pfb
+Junicode-Exp-tosf-t1--base Junicode-Exp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ts1--base Junicode-Exp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Exp.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpBold.pfb
@@ -11979,21 +11984,21 @@ Junicode-ExpBold-inf-ot1 Junicode-ExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-ExpBold-inf-t1--base Junicode-ExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-lgr Junicode-ExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ly1 Junicode-ExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ly1--base Junicode-ExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-ot1--base Junicode-ExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-sc-t1--base Junicode-ExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-lf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-lgr Junicode-ExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-ot1 Junicode-ExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-ot1--base Junicode-ExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-osf-t1--base Junicode-ExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-lgr Junicode-ExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-sup-ly1 Junicode-ExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpBold.pfb
@@ -12001,109 +12006,109 @@ Junicode-ExpBold-sup-ot1 Junicode-ExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-ExpBold-sup-t1--base Junicode-ExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-lgr Junicode-ExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ly1 Junicode-ExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-ot1 Junicode-ExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-ot1--base Junicode-ExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tlf-t1--base Junicode-ExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-lgr Junicode-ExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-ot1 Junicode-ExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-lgr Junicode-ExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ly1--base Junicode-ExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-ot1--base Junicode-ExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-sc-t1--base Junicode-ExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-tosf-t1--base Junicode-ExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ts1--base Junicode-ExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBold.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ly1 Junicode-ExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-ot1 Junicode-ExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-t1--base Junicode-ExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1--base Junicode-ExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-lgr Junicode-ExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-ot1--base Junicode-ExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ly1 Junicode-ExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-ot1 Junicode-ExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-sup-t1--base Junicode-ExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-lgr Junicode-ExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-ot1--base Junicode-ExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ly1 Junicode-ExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-ot1 Junicode-ExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tlf-t1--base Junicode-ExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-lgr Junicode-ExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-ot1--base Junicode-ExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-lgr Junicode-ExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ly1--base Junicode-ExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-ot1--base Junicode-ExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-sc-t1--base Junicode-ExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ts1--base Junicode-ExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ly1 Junicode-ExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-ot1 Junicode-ExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-t1--base Junicode-ExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-lgr Junicode-ExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1--base Junicode-ExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ly1--base Junicode-ExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-ot1--base Junicode-ExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-sc-t1--base Junicode-ExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-lgr Junicode-ExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-ot1--base Junicode-ExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-lgr Junicode-ExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ly1 Junicode-ExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-ot1 Junicode-ExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-sup-t1--base Junicode-ExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-lgr Junicode-ExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-ot1--base Junicode-ExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ly1 Junicode-ExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-ot1 Junicode-ExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-ot1--base Junicode-ExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tlf-t1--base Junicode-ExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-lgr Junicode-ExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-ot1--base Junicode-ExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-lgr Junicode-ExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ly1--base Junicode-ExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-ot1--base Junicode-ExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-sc-t1--base Junicode-ExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ts1--base Junicode-ExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
@@ -12111,21 +12116,21 @@ Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-lgr Junicode-ExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ly1--base Junicode-ExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-ot1--base Junicode-ExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-sc-t1--base Junicode-ExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-lgr Junicode-ExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-lgr Junicode-ExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
@@ -12133,65 +12138,65 @@ Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-lgr Junicode-ExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ly1 Junicode-ExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-ot1 Junicode-ExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-ot1--base Junicode-ExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tlf-t1--base Junicode-ExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-lgr Junicode-ExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-lgr Junicode-ExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ly1--base Junicode-ExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-ot1--base Junicode-ExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-sc-t1--base Junicode-ExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ts1--base Junicode-ExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ly1 Junicode-ExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-ot1 Junicode-ExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-t1--base Junicode-ExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1--base Junicode-ExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-lgr Junicode-ExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-ot1--base Junicode-ExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ly1 Junicode-ExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-ot1 Junicode-ExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-sup-t1--base Junicode-ExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-lgr Junicode-ExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-ot1--base Junicode-ExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ly1 Junicode-ExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-ot1 Junicode-ExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tlf-t1--base Junicode-ExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-lgr Junicode-ExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-ot1--base Junicode-ExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-lgr Junicode-ExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ly1--base Junicode-ExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-ot1--base Junicode-ExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-sc-t1--base Junicode-ExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ts1--base Junicode-ExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
@@ -12199,21 +12204,21 @@ Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-sc-t1--base Junicode-ExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-lgr Junicode-ExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
@@ -12221,109 +12226,109 @@ Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-lgr Junicode-ExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ly1 Junicode-ExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-ot1 Junicode-ExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tlf-t1--base Junicode-ExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-lgr Junicode-ExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-lgr Junicode-ExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ly1--base Junicode-ExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-ot1--base Junicode-ExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-sc-t1--base Junicode-ExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ts1--base Junicode-ExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-lgr Junicode-ExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ly1 Junicode-ExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-ot1 Junicode-ExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-sup-t1--base Junicode-ExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-lgr Junicode-ExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tlf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-lgr Junicode-ExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-lgr Junicode-ExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ly1--base Junicode-ExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-ot1--base Junicode-ExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-sc-t1--base Junicode-ExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ts1--base Junicode-ExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-Italic-inf-lgr Junicode-Italic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ly1 Junicode-Italic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-ot1 Junicode-Italic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-Italic.pfb
Junicode-Italic-inf-t1--base Junicode-Italic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-Italic.pfb
Junicode-Italic-lf-lgr Junicode-Italic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1--base Junicode-Italic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-lgr Junicode-Italic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ly1--base Junicode-Italic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-ot1--base Junicode-Italic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Italic.pfb
Junicode-Italic-lf-sc-t1--base Junicode-Italic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-Italic.pfb
Junicode-Italic-lf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-osf-lgr Junicode-Italic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-ot1--base Junicode-Italic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ly1 Junicode-Italic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-ot1 Junicode-Italic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ly1--base Junicode-Italic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-ot1--base Junicode-Italic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-t1--base Junicode-Italic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Italic.pfb
-Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-Italic.pfb
+Junicode-Italic-osf-t1--base Junicode-Italic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-Italic-sup-lgr Junicode-Italic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ly1 Junicode-Italic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-Italic.pfb
Junicode-Italic-sup-ot1 Junicode-Italic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-Italic.pfb
Junicode-Italic-sup-t1--base Junicode-Italic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-lgr Junicode-Italic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-ot1--base Junicode-Italic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ly1 Junicode-Italic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-ot1 Junicode-Italic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-ot1--base Junicode-Italic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-t1--base Junicode-Italic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-Italic.pfb
-Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-Italic.pfb
+Junicode-Italic-tlf-t1--base Junicode-Italic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-lgr Junicode-Italic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-ot1--base Junicode-Italic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ly1 Junicode-Italic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-ot1 Junicode-Italic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-lgr Junicode-Italic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ly1--base Junicode-Italic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-ot1--base Junicode-Italic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-sc-t1--base Junicode-Italic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Italic.pfb
-Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-Italic.pfb
+Junicode-Italic-tosf-t1--base Junicode-Italic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ts1--base Junicode-Italic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Italic.pfb
Junicode-Light-inf-lgr Junicode-Light " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Light.pfb
@@ -12331,21 +12336,21 @@ Junicode-Light-inf-ot1 Junicode-Light " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-Light-inf-t1--base Junicode-Light " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-lf-lgr Junicode-Light " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Light.pfb
Junicode-Light-lf-ly1 Junicode-Light " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-lgr Junicode-Light " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ly1--base Junicode-Light " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-ot1--base Junicode-Light " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Light.pfb
Junicode-Light-lf-sc-t1--base Junicode-Light " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Light.pfb
Junicode-Light-lf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-osf-lgr Junicode-Light " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Light.pfb
-Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Light.pfb
+Junicode-Light-osf-ot1 Junicode-Light " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ly1--base Junicode-Light " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-ot1--base Junicode-Light " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-t1--base Junicode-Light " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Light.pfb
-Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Light.pfb
+Junicode-Light-osf-t1--base Junicode-Light " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-Light-sup-lgr Junicode-Light " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-sup-ly1 Junicode-Light " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Light.pfb
@@ -12353,65 +12358,65 @@ Junicode-Light-sup-ot1 Junicode-Light " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-Light-sup-t1--base Junicode-Light " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Light.pfb
Junicode-Light-tlf-lgr Junicode-Light " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Light.pfb
Junicode-Light-tlf-ly1 Junicode-Light " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Light.pfb
-Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Light.pfb
+Junicode-Light-tlf-ot1 Junicode-Light " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ly1--base Junicode-Light " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-ot1--base Junicode-Light " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-t1--base Junicode-Light " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Light.pfb
-Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Light.pfb
+Junicode-Light-tlf-t1--base Junicode-Light " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-Light-tosf-lgr Junicode-Light " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Light.pfb
-Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Light.pfb
+Junicode-Light-tosf-ot1 Junicode-Light " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-lgr Junicode-Light " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ly1--base Junicode-Light " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-ot1--base Junicode-Light " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Light.pfb
Junicode-Light-tosf-sc-t1--base Junicode-Light " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Light.pfb
-Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Light.pfb
+Junicode-Light-tosf-t1--base Junicode-Light " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ts1--base Junicode-Light " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Light.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ly1 Junicode-LightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-ot1 Junicode-LightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-t1--base Junicode-LightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-lgr Junicode-LightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1--base Junicode-LightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ly1--base Junicode-LightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-ot1--base Junicode-LightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-sc-t1--base Junicode-LightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-lf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-lgr Junicode-LightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-ot1--base Junicode-LightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ly1 Junicode-LightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-ot1 Junicode-LightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-ot1--base Junicode-LightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-osf-t1--base Junicode-LightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-lgr Junicode-LightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ly1 Junicode-LightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-ot1 Junicode-LightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-sup-t1--base Junicode-LightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-lgr Junicode-LightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-ot1--base Junicode-LightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ly1 Junicode-LightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-ot1 Junicode-LightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-ot1--base Junicode-LightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tlf-t1--base Junicode-LightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-lgr Junicode-LightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-ot1--base Junicode-LightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ly1 Junicode-LightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-ot1 Junicode-LightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-lgr Junicode-LightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ly1--base Junicode-LightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-ot1--base Junicode-LightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-sc-t1--base Junicode-LightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-tosf-t1--base Junicode-LightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ts1--base Junicode-LightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-LightItalic.pfb
Junicode-Medium-inf-lgr Junicode-Medium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Medium.pfb
@@ -12419,21 +12424,21 @@ Junicode-Medium-inf-ot1 Junicode-Medium " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-Medium-inf-t1--base Junicode-Medium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-lf-lgr Junicode-Medium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ly1 Junicode-Medium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-lgr Junicode-Medium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ly1--base Junicode-Medium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-ot1--base Junicode-Medium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Medium.pfb
Junicode-Medium-lf-sc-t1--base Junicode-Medium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Medium.pfb
Junicode-Medium-lf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-osf-lgr Junicode-Medium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-ot1 Junicode-Medium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ly1--base Junicode-Medium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-ot1--base Junicode-Medium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-t1--base Junicode-Medium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Medium.pfb
-Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Medium.pfb
+Junicode-Medium-osf-t1--base Junicode-Medium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Medium-sup-lgr Junicode-Medium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-sup-ly1 Junicode-Medium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Medium.pfb
@@ -12441,65 +12446,65 @@ Junicode-Medium-sup-ot1 Junicode-Medium " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-Medium-sup-t1--base Junicode-Medium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-lgr Junicode-Medium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ly1 Junicode-Medium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-ot1 Junicode-Medium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-ot1--base Junicode-Medium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-t1--base Junicode-Medium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Medium.pfb
-Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Medium.pfb
+Junicode-Medium-tlf-t1--base Junicode-Medium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-lgr Junicode-Medium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-ot1 Junicode-Medium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-lgr Junicode-Medium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ly1--base Junicode-Medium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-ot1--base Junicode-Medium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-sc-t1--base Junicode-Medium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Medium.pfb
-Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Medium.pfb
+Junicode-Medium-tosf-t1--base Junicode-Medium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ts1--base Junicode-Medium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Medium.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ly1 Junicode-MediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-ot1 Junicode-MediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-t1--base Junicode-MediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-lgr Junicode-MediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1--base Junicode-MediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ly1--base Junicode-MediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-ot1--base Junicode-MediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-sc-t1--base Junicode-MediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-lgr Junicode-MediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-ot1--base Junicode-MediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-lgr Junicode-MediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ly1 Junicode-MediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-ot1 Junicode-MediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-sup-t1--base Junicode-MediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-lgr Junicode-MediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-ot1--base Junicode-MediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ly1 Junicode-MediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-ot1 Junicode-MediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-ot1--base Junicode-MediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tlf-t1--base Junicode-MediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-lgr Junicode-MediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-ot1--base Junicode-MediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-lgr Junicode-MediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ly1--base Junicode-MediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-ot1--base Junicode-MediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-sc-t1--base Junicode-MediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ts1--base Junicode-MediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
Junicode-Regular-inf-lgr Junicode-Regular " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-Regular.pfb
@@ -12507,21 +12512,21 @@ Junicode-Regular-inf-ot1 Junicode-Regular " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg R
Junicode-Regular-inf-t1--base Junicode-Regular " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-lf-lgr Junicode-Regular " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ly1 Junicode-Regular " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-lgr Junicode-Regular " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ly1--base Junicode-Regular " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-ot1--base Junicode-Regular " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-Regular.pfb
Junicode-Regular-lf-sc-t1--base Junicode-Regular " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-Regular.pfb
Junicode-Regular-lf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-osf-lgr Junicode-Regular " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-ot1 Junicode-Regular " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ly1--base Junicode-Regular " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-ot1--base Junicode-Regular " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-t1--base Junicode-Regular " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-Regular.pfb
-Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-Regular.pfb
+Junicode-Regular-osf-t1--base Junicode-Regular " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-Regular-sup-lgr Junicode-Regular " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-sup-ly1 Junicode-Regular " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-Regular.pfb
@@ -12529,21 +12534,21 @@ Junicode-Regular-sup-ot1 Junicode-Regular " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc R
Junicode-Regular-sup-t1--base Junicode-Regular " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-lgr Junicode-Regular " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ly1 Junicode-Regular " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-ot1 Junicode-Regular " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-ot1--base Junicode-Regular " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-t1--base Junicode-Regular " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-Regular.pfb
-Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-Regular.pfb
+Junicode-Regular-tlf-t1--base Junicode-Regular " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-lgr Junicode-Regular " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-ot1 Junicode-Regular " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-lgr Junicode-Regular " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ly1--base Junicode-Regular " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-ot1--base Junicode-Regular " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-sc-t1--base Junicode-Regular " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-Regular.pfb
-Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-Regular.pfb
+Junicode-Regular-tosf-t1--base Junicode-Regular " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ts1--base Junicode-Regular " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-Regular.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmBold.pfb
@@ -12551,21 +12556,21 @@ Junicode-SmBold-inf-ot1 Junicode-SmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmBold-inf-t1--base Junicode-SmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-lgr Junicode-SmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ly1 Junicode-SmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-lgr Junicode-SmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ly1--base Junicode-SmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-ot1--base Junicode-SmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-sc-t1--base Junicode-SmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmBold.pfb
Junicode-SmBold-lf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-lgr Junicode-SmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-ot1 Junicode-SmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-ot1--base Junicode-SmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-t1--base Junicode-SmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBold.pfb
-Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmBold.pfb
+Junicode-SmBold-osf-t1--base Junicode-SmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-lgr Junicode-SmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-sup-ly1 Junicode-SmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmBold.pfb
@@ -12573,65 +12578,65 @@ Junicode-SmBold-sup-ot1 Junicode-SmBold " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmBold-sup-t1--base Junicode-SmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-lgr Junicode-SmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ly1 Junicode-SmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-ot1 Junicode-SmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-ot1--base Junicode-SmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tlf-t1--base Junicode-SmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-lgr Junicode-SmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-ot1 Junicode-SmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-lgr Junicode-SmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ly1--base Junicode-SmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-ot1--base Junicode-SmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-sc-t1--base Junicode-SmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBold.pfb
-Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmBold.pfb
+Junicode-SmBold-tosf-t1--base Junicode-SmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ts1--base Junicode-SmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBold.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ly1 Junicode-SmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-ot1 Junicode-SmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-t1--base Junicode-SmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1--base Junicode-SmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-lgr Junicode-SmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-ot1--base Junicode-SmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ly1 Junicode-SmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-ot1 Junicode-SmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-sup-t1--base Junicode-SmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-lgr Junicode-SmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-ot1--base Junicode-SmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ly1 Junicode-SmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-ot1 Junicode-SmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tlf-t1--base Junicode-SmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-lgr Junicode-SmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-ot1--base Junicode-SmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-lgr Junicode-SmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ly1--base Junicode-SmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-ot1--base Junicode-SmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-sc-t1--base Junicode-SmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ts1--base Junicode-SmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCond.pfb
@@ -12639,21 +12644,21 @@ Junicode-SmCond-inf-ot1 Junicode-SmCond " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReE
Junicode-SmCond-inf-t1--base Junicode-SmCond " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-lgr Junicode-SmCond " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ly1 Junicode-SmCond " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-lgr Junicode-SmCond " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ly1--base Junicode-SmCond " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-ot1--base Junicode-SmCond " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-sc-t1--base Junicode-SmCond " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCond.pfb
Junicode-SmCond-lf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-lgr Junicode-SmCond " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-ot1 Junicode-SmCond " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-ot1--base Junicode-SmCond " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-t1--base Junicode-SmCond " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCond.pfb
-Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCond.pfb
+Junicode-SmCond-osf-t1--base Junicode-SmCond " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-lgr Junicode-SmCond " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-sup-ly1 Junicode-SmCond " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCond.pfb
@@ -12661,65 +12666,65 @@ Junicode-SmCond-sup-ot1 Junicode-SmCond " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReE
Junicode-SmCond-sup-t1--base Junicode-SmCond " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-lgr Junicode-SmCond " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ly1 Junicode-SmCond " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-ot1 Junicode-SmCond " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-ot1--base Junicode-SmCond " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tlf-t1--base Junicode-SmCond " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-lgr Junicode-SmCond " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-ot1 Junicode-SmCond " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-lgr Junicode-SmCond " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ly1--base Junicode-SmCond " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-ot1--base Junicode-SmCond " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-sc-t1--base Junicode-SmCond " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCond.pfb
-Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCond.pfb
+Junicode-SmCond-tosf-t1--base Junicode-SmCond " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ts1--base Junicode-SmCond " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCond.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ly1 Junicode-SmCondItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-ot1 Junicode-SmCondItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-t1--base Junicode-SmCondItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1--base Junicode-SmCondItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-sc-t1--base Junicode-SmCondItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-lgr Junicode-SmCondItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-ot1--base Junicode-SmCondItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ly1 Junicode-SmCondItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-ot1 Junicode-SmCondItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-sup-t1--base Junicode-SmCondItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-lgr Junicode-SmCondItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-ot1--base Junicode-SmCondItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ly1 Junicode-SmCondItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-ot1 Junicode-SmCondItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tlf-t1--base Junicode-SmCondItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-lgr Junicode-SmCondItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-ot1--base Junicode-SmCondItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-lgr Junicode-SmCondItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ly1--base Junicode-SmCondItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-ot1--base Junicode-SmCondItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-sc-t1--base Junicode-SmCondItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ts1--base Junicode-SmCondItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
@@ -12727,21 +12732,21 @@ Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-lgr Junicode-SmCondLight " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ly1--base Junicode-SmCondLight " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-ot1--base Junicode-SmCondLight " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-sc-t1--base Junicode-SmCondLight " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-lgr Junicode-SmCondLight " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-lgr Junicode-SmCondLight " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
@@ -12749,65 +12754,65 @@ Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-lgr Junicode-SmCondLight " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ly1 Junicode-SmCondLight " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-ot1 Junicode-SmCondLight " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-ot1--base Junicode-SmCondLight " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tlf-t1--base Junicode-SmCondLight " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-lgr Junicode-SmCondLight " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-lgr Junicode-SmCondLight " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ly1--base Junicode-SmCondLight " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-ot1--base Junicode-SmCondLight " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-sc-t1--base Junicode-SmCondLight " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ts1--base Junicode-SmCondLight " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ly1 Junicode-SmCondLightItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-ot1 Junicode-SmCondLightItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-t1--base Junicode-SmCondLightItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1--base Junicode-SmCondLightItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-lgr Junicode-SmCondLightItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-ot1--base Junicode-SmCondLightItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ly1 Junicode-SmCondLightItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-ot1 Junicode-SmCondLightItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-sup-t1--base Junicode-SmCondLightItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-lgr Junicode-SmCondLightItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-ot1--base Junicode-SmCondLightItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ly1 Junicode-SmCondLightItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-ot1 Junicode-SmCondLightItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tlf-t1--base Junicode-SmCondLightItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-lgr Junicode-SmCondLightItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-ot1--base Junicode-SmCondLightItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-lgr Junicode-SmCondLightItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ly1--base Junicode-SmCondLightItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-ot1--base Junicode-SmCondLightItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-sc-t1--base Junicode-SmCondLightItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ts1--base Junicode-SmCondLightItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
@@ -12815,21 +12820,21 @@ Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium " AutoEnc_ldcvmrfllg5ebu6xfr
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-sc-t1--base Junicode-SmCondMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-lgr Junicode-SmCondMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
@@ -12837,65 +12842,65 @@ Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium " AutoEnc_ilb24pr2hmz3ktady5
Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-lgr Junicode-SmCondMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ly1 Junicode-SmCondMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-ot1 Junicode-SmCondMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tlf-t1--base Junicode-SmCondMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-lgr Junicode-SmCondMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-lgr Junicode-SmCondMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ly1--base Junicode-SmCondMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-ot1--base Junicode-SmCondMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-sc-t1--base Junicode-SmCondMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ts1--base Junicode-SmCondMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ly1 Junicode-SmCondMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-ot1 Junicode-SmCondMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-t1--base Junicode-SmCondMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-lgr Junicode-SmCondMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ly1 Junicode-SmCondMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-ot1 Junicode-SmCondMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-sup-t1--base Junicode-SmCondMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-lgr Junicode-SmCondMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ly1 Junicode-SmCondMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-ot1 Junicode-SmCondMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tlf-t1--base Junicode-SmCondMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-lgr Junicode-SmCondMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-ot1--base Junicode-SmCondMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-lgr Junicode-SmCondMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ly1--base Junicode-SmCondMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-ot1--base Junicode-SmCondMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-sc-t1--base Junicode-SmCondMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ts1--base Junicode-SmCondMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmExp-inf-lgr Junicode-SmExp " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
Junicode-SmExp-inf-ly1 Junicode-SmExp " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExp.pfb
@@ -12903,21 +12908,21 @@ Junicode-SmExp-inf-ot1 Junicode-SmExp " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEnc
Junicode-SmExp-inf-t1--base Junicode-SmExp " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-lgr Junicode-SmExp " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ly1 Junicode-SmExp " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-lgr Junicode-SmExp " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ly1--base Junicode-SmExp " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-ot1--base Junicode-SmExp " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-sc-t1--base Junicode-SmExp " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExp.pfb
Junicode-SmExp-lf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-lgr Junicode-SmExp " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-ot1 Junicode-SmExp " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-ot1--base Junicode-SmExp " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-t1--base Junicode-SmExp " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExp.pfb
-Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExp.pfb
+Junicode-SmExp-osf-t1--base Junicode-SmExp " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-lgr Junicode-SmExp " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-sup-ly1 Junicode-SmExp " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExp.pfb
@@ -12925,21 +12930,21 @@ Junicode-SmExp-sup-ot1 Junicode-SmExp " AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEnc
Junicode-SmExp-sup-t1--base Junicode-SmExp " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-lgr Junicode-SmExp " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-ot1 Junicode-SmExp " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-ot1--base Junicode-SmExp " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tlf-t1--base Junicode-SmExp " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-lgr Junicode-SmExp " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-ot1 Junicode-SmExp " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-ot1--base Junicode-SmExp " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExp.pfb
-Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExp.pfb
+Junicode-SmExp-tosf-t1--base Junicode-SmExp " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExp.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
@@ -12947,21 +12952,21 @@ Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold " AutoEnc_ldcvmrfllg5ebu6xfrdp3ppf
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-lgr Junicode-SmExpBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ly1--base Junicode-SmExpBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-ot1--base Junicode-SmExpBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-sc-t1--base Junicode-SmExpBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-lgr Junicode-SmExpBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-lgr Junicode-SmExpBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
@@ -12969,109 +12974,109 @@ Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold " AutoEnc_ilb24pr2hmz3ktady5tx53tv
Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-lgr Junicode-SmExpBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ly1 Junicode-SmExpBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-ot1 Junicode-SmExpBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-ot1--base Junicode-SmExpBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tlf-t1--base Junicode-SmExpBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-lgr Junicode-SmExpBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-lgr Junicode-SmExpBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ly1--base Junicode-SmExpBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-ot1--base Junicode-SmExpBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-sc-t1--base Junicode-SmExpBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ts1--base Junicode-SmExpBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ly1 Junicode-SmExpBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-ot1 Junicode-SmExpBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-t1--base Junicode-SmExpBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-lgr Junicode-SmExpBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ly1 Junicode-SmExpBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-ot1 Junicode-SmExpBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-sup-t1--base Junicode-SmExpBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-lgr Junicode-SmExpBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ly1 Junicode-SmExpBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-ot1 Junicode-SmExpBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tlf-t1--base Junicode-SmExpBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-lgr Junicode-SmExpBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-ot1--base Junicode-SmExpBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-lgr Junicode-SmExpBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ly1--base Junicode-SmExpBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-ot1--base Junicode-SmExpBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-sc-t1--base Junicode-SmExpBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ts1--base Junicode-SmExpBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ly1 Junicode-SmExpItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-ot1 Junicode-SmExpItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-t1--base Junicode-SmExpItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1--base Junicode-SmExpItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-sc-t1--base Junicode-SmExpItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-lgr Junicode-SmExpItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-ot1--base Junicode-SmExpItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ly1 Junicode-SmExpItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-ot1 Junicode-SmExpItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-sup-t1--base Junicode-SmExpItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-lgr Junicode-SmExpItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-ot1--base Junicode-SmExpItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ly1 Junicode-SmExpItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-ot1 Junicode-SmExpItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tlf-t1--base Junicode-SmExpItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-lgr Junicode-SmExpItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-ot1--base Junicode-SmExpItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-lgr Junicode-SmExpItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ly1--base Junicode-SmExpItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-ot1--base Junicode-SmExpItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-sc-t1--base Junicode-SmExpItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ts1--base Junicode-SmExpItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
@@ -13079,21 +13084,21 @@ Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-sc-t1--base Junicode-SmExpMedium " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-lgr Junicode-SmExpMedium " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
@@ -13101,65 +13106,65 @@ Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-lgr Junicode-SmExpMedium " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-lgr Junicode-SmExpMedium " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-ot1--base Junicode-SmExpMedium " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ly1 Junicode-SmExpMediumItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-ot1 Junicode-SmExpMediumItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-inf-t1--base Junicode-SmExpMediumItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-lgr Junicode-SmExpMediumItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ly1 Junicode-SmExpMediumItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-ot1 Junicode-SmExpMediumItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-sup-t1--base Junicode-SmExpMediumItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-lgr Junicode-SmExpMediumItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-lgr Junicode-SmExpMediumItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-ot1--base Junicode-SmExpMediumItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-ot1--base Junicode-SmExpMediumItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold " AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont " <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold " AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont " <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
@@ -13167,21 +13172,21 @@ Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold " AutoEnc_ldcvmrfllg5ebu6xfrdp
Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold " AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont " <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold " AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont " <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_ax2xt6eotmte2fwmhktne6ajef ReEncodeFont " <[jncd_ax2xt6.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold " AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont " <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold " AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont " <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont " <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_3erjzexoluefphd3t3glzewwbc ReEncodeFont " <[jncd_3erjze.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_yzxamtmskosvsgygnddyo5ro4f ReEncodeFont " <[jncd_yzxamt.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold " AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont " <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-lgr Junicode-SmExpSmBold " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold " AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont " <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_r2ngzvnb4amujmyn3g3lexx6cd ReEncodeFont " <[jncd_r2ngzv.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold " AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont " <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold " AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont " <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_2jqefycljlk2spovbldp4suglh ReEncodeFont " <[jncd_2jqefy.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold " AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont " <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold " AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont " <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold " AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont " <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
@@ -13189,65 +13194,65 @@ Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold " AutoEnc_ilb24pr2hmz3ktady5tx
Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold " AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont " <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-lgr Junicode-SmExpSmBold " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold " AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont " <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_i2fv4supxo6e3hm2ifcem6soba ReEncodeFont " <[jncd_i2fv4s.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold " AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont " <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold " AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont " <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont " <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc ReEncodeFont " <[jncd_jp6lmu.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_wfh7iuliook7mbpur6ueu6tukf ReEncodeFont " <[jncd_wfh7iu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold " AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont " <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-lgr Junicode-SmExpSmBold " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold " AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont " <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_uqbu3a63c7euatzlucjmoqlsia ReEncodeFont " <[jncd_uqbu3a.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold " AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont " <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold " AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont " <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-ot1--base Junicode-SmExpSmBold " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_rsbn53rjjb632msbg5yczpvkkb ReEncodeFont " <[jncd_rsbn53.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold " AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont " <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont " <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont " <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_e2angygmuvvocd7xfckmfysctc ReEncodeFont " <[jncd_e2angy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-inf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rvrggqrpyoajvnhcmba77jodeb ReEncodeFont " <[jncd_rvrggq.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont " <[jncd_eb524t.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_jb7ci7b3ypkvbibxxiar5wsrkg ReEncodeFont " <[jncd_jb7ci7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_gk2rxdsteuzri3rewo5socuiod ReEncodeFont " <[jncd_gk2rxd.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont " <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont " <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont " <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont " <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_7sifzs3povdhgbdceidql4wixf ReEncodeFont " <[jncd_7sifzs.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_zbxsafbvfbbegsrut4auxxhfuf ReEncodeFont " <[jncd_zbxsaf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_ia5u2zqkogtjjuponmom657qpa ReEncodeFont " <[jncd_ia5u2z.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont " <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_pm4uzfahvu7dsrii4trlz2xrag ReEncodeFont " <[jncd_pm4uzf.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_zdphhkrtq7hny7bfe7r5kyv5fb ReEncodeFont " <[jncd_zdphhk.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_fry5nkzryn5c4cbdp2jrhwliec ReEncodeFont " <[jncd_fry5nk.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont " <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont " <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont " <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont " <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4nafnjraacunhork56emqsz24g ReEncodeFont " <[jncd_4nafnj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_nghkwvud4qcjbasji7abq43ang ReEncodeFont " <[jncd_nghkwv.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_u2clibyj3zuccm3zhxnj74uy2e ReEncodeFont " <[jncd_u2clib.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont " <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont " <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic " AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont " <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont " <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf ReEncodeFont " <[jncd_p7ome7.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-sup-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_rhm4ae5n65jzxhmuodotowe3ie ReEncodeFont " <[jncd_rhm4ae.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_7wd7jeaent3sj525defnqmlc3a ReEncodeFont " <[jncd_7wd7je.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_vp376kgsfgeciu7y5sednyi7vf ReEncodeFont " <[jncd_vp376k.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_jxijtoxataialybg2pqwn2gzlb ReEncodeFont " <[jncd_jxijto.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont " <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont " <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont " <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont " <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb ReEncodeFont " <[jncd_6kirfz.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_z4lkq6f2v5epiwbfloel6jbuia ReEncodeFont " <[jncd_z4lkq6.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_qkrvq7xx4vm5fxwz6odvnyxu3d ReEncodeFont " <[jncd_qkrvq7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont " <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-lgr Junicode-SmExpSmBoldItalic " AutoEnc_5eobdximarbz54xttb4sm2kdud ReEncodeFont " <[jncd_5eobdx.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_s5wjrzrzvquchd6jukc43jctqc ReEncodeFont " <[jncd_s5wjrz.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_yodvjefaqbymcntactdoyoefgb ReEncodeFont " <[jncd_yodvje.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic " AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont " <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic " AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont " <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic " AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont " <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic " AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont " <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-ot1--base Junicode-SmExpSmBoldItalic " AutoEnc_4er2oufhothrvoalsnupyw2d3f ReEncodeFont " <[jncd_4er2ou.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_gktvs32iienhfw5kxnfiasu5eb ReEncodeFont " <[jncd_gktvs3.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_6kaogffvqczthee7al7euqnwvb ReEncodeFont " <[jncd_6kaogf.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic " AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont " <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic " AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont " <[jncd_vv455d.enc <Junicode-SmExpSmBoldItalic.pfb
% Kinigcap.map
Kinigcap KinigsteinCaps <Kinigcap.pfb
@@ -18498,10 +18503,10 @@ XCharter-Bold-lf-ot1 XCharter-Bold " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEncode
XCharter-Bold-lf-sc-ly1--base XCharter-Bold " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-ot1--base XCharter-Bold " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t1--base XCharter-Bold " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-sc-t2a--base XCharter-Bold " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-Bold.pfb
XCharter-Bold-lf-sc-t2asrb--base XCharter-Bold " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t1--base XCharter-Bold " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Bold.pfb
-XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Bold.pfb
+XCharter-Bold-lf-t2a XCharter-Bold " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Bold.pfb
XCharter-Bold-lf-t2asrb XCharter-Bold " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ly1--base XCharter-Bold " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Bold.pfb
XCharter-Bold-numr-ot1 XCharter-Bold " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Bold.pfb
@@ -18511,15 +18516,15 @@ XCharter-Bold-osf-ot1 XCharter-Bold " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReEncod
XCharter-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-Bold.pfb
XCharter-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t1--base XCharter-Bold " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Bold.pfb
-XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Bold.pfb
+XCharter-Bold-osf-t2a XCharter-Bold " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Bold.pfb
XCharter-Bold-osf-t2asrb XCharter-Bold " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ly1--base XCharter-Bold " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Bold.pfb
XCharter-Bold-sup-ot1 XCharter-Bold " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t1--base XCharter-Bold " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Bold.pfb
-XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Bold.pfb
+XCharter-Bold-sup-t2a XCharter-Bold " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Bold.pfb
XCharter-Bold-sup-t2asrb XCharter-Bold " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ly1--base XCharter-Bold " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-ot1 XCharter-Bold " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Bold.pfb
@@ -18527,20 +18532,20 @@ XCharter-Bold-tlf-ot2 XCharter-Bold " xcharterOT2enc ReEncodeFont " <[xcharter-o
XCharter-Bold-tlf-sc-ly1--base XCharter-Bold " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-ot1--base XCharter-Bold " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t1--base XCharter-Bold " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-sc-t2a--base XCharter-Bold " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-sc-t2asrb--base XCharter-Bold " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t1--base XCharter-Bold " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Bold.pfb
-XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Bold.pfb
+XCharter-Bold-tlf-t2a XCharter-Bold " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Bold.pfb
XCharter-Bold-tlf-t2asrb XCharter-Bold " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ly1--base XCharter-Bold " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-ot1 XCharter-Bold " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t1--base XCharter-Bold " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Bold.pfb
-XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Bold.pfb
+XCharter-Bold-tosf-t2a XCharter-Bold " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Bold.pfb
XCharter-Bold-tosf-t2asrb XCharter-Bold " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Bold.pfb
XCharter-Bold-ts1--base XCharter-Bold " AutoEnc_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch_z3wvjz.enc <XCharter-Bold.pfb
XCharter-BoldItalic-dnom-ly1--base XCharter-BoldItalic " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldItalic.pfb
@@ -18554,10 +18559,10 @@ XCharter-BoldItalic-lf-ot1 XCharter-BoldItalic " AutoEnc_ru4hosnl6h5ukcp2w3tt2ie
XCharter-BoldItalic-lf-sc-ly1--base XCharter-BoldItalic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-ot1--base XCharter-BoldItalic " AutoEnc_7qcosniepdkkhq2lidq32xyajh ReEncodeFont " <[xch_7qcosn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t1--base XCharter-BoldItalic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-sc-t2a--base XCharter-BoldItalic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t1--base XCharter-BoldItalic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-lf-t2a XCharter-BoldItalic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-lf-t2asrb XCharter-BoldItalic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ly1--base XCharter-BoldItalic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-numr-ot1 XCharter-BoldItalic " AutoEnc_qs7dmbcmqkgbo6666jibzn77ta ReEncodeFont " <[xch_qs7dmb.enc <XCharter-BoldItalic.pfb
@@ -18567,15 +18572,15 @@ XCharter-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc_aegaiust5jvuyf74wgreek
XCharter-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ly1--base XCharter-BoldItalic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-ot1 XCharter-BoldItalic " AutoEnc_gkuln73auq7qfnbajjeh66tiyg ReEncodeFont " <[xch_gkuln7.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t1--base XCharter-BoldItalic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-sup-t2a XCharter-BoldItalic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-sup-t2asrb XCharter-BoldItalic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ly1--base XCharter-BoldItalic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-ot1 XCharter-BoldItalic " AutoEnc_lfc2esxm2njp63bgoww5uifspg ReEncodeFont " <[xch_lfc2es.enc <XCharter-BoldItalic.pfb
@@ -18583,20 +18588,20 @@ XCharter-BoldItalic-tlf-ot2 XCharter-BoldItalic " xcharterOT2enc ReEncodeFont "
XCharter-BoldItalic-tlf-sc-ly1--base XCharter-BoldItalic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jffewfvsu3e3ihebccixpovvra ReEncodeFont " <[xch_jffewf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t1--base XCharter-BoldItalic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-sc-t2a--base XCharter-BoldItalic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t1--base XCharter-BoldItalic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tlf-t2a XCharter-BoldItalic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tlf-t2asrb XCharter-BoldItalic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter-BoldSlanted-dnom-ly1--base XCharter-BoldSlanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-BoldSlanted.pfb
@@ -18610,10 +18615,10 @@ XCharter-BoldSlanted-lf-ot1 XCharter-BoldSlanted " AutoEnc_aoa5sqhsbxws2dsjkwdeq
XCharter-BoldSlanted-lf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t1--base XCharter-BoldSlanted " AutoEnc_x36pxls7tusl4n2jk2ctibxz5h ReEncodeFont " <[xch_x36pxl.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_dqjasssuetpohv5a3ljixdqrrg ReEncodeFont " <[xch_dqjass.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_mlyjgqilzju2zwlknggfyj52jb ReEncodeFont " <[xch_mlyjgq.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ijhcpwmyoxml75krl4rjpeewld ReEncodeFont " <[xch_ijhcpw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t1--base XCharter-BoldSlanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-lf-t2a XCharter-BoldSlanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-lf-t2asrb XCharter-BoldSlanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ly1--base XCharter-BoldSlanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-numr-ot1 XCharter-BoldSlanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-BoldSlanted.pfb
@@ -18623,15 +18628,15 @@ XCharter-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc_g2zr6i3czinzql75wmpz
XCharter-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ly1--base XCharter-BoldSlanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-ot1 XCharter-BoldSlanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t1--base XCharter-BoldSlanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-sup-t2a XCharter-BoldSlanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-sup-t2asrb XCharter-BoldSlanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ly1--base XCharter-BoldSlanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-ot1 XCharter-BoldSlanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-BoldSlanted.pfb
@@ -18639,20 +18644,20 @@ XCharter-BoldSlanted-tlf-ot2 XCharter-BoldSlanted " xcharterOT2enc ReEncodeFont
XCharter-BoldSlanted-tlf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t1--base XCharter-BoldSlanted " AutoEnc_4j4sw5j5quwsuwjp3ac4ukjyga ReEncodeFont " <[xch_4j4sw5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_rvzpfm3ccplq2qqf2b5h6p6mrd ReEncodeFont " <[xch_rvzpfm.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_zr4od3jyzsjgybfmkapyzkqbdd ReEncodeFont " <[xch_zr4od3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_tcksd3vkgfqcsyjvz6hhheyr4g ReEncodeFont " <[xch_tcksd3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t1--base XCharter-BoldSlanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tlf-t2a XCharter-BoldSlanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tlf-t2asrb XCharter-BoldSlanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter-Ita-alph XCharter-Italic " chalphEncoding ReEncodeFont " <[chalph.enc <XCharter-Italic.pfb
@@ -18667,10 +18672,10 @@ XCharter-Italic-lf-ot1 XCharter-Italic " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb ReEn
XCharter-Italic-lf-sc-ly1--base XCharter-Italic " AutoEnc_cos7tu7hy4jsu43uhfrn22x5vg ReEncodeFont " <[xch_cos7tu.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-ot1--base XCharter-Italic " AutoEnc_ccijucbcj6u5cdtubzampj3ddg ReEncodeFont " <[xch_ccijuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t1--base XCharter-Italic " AutoEnc_cy5fc2euj5t4xrng2zvnyb4bqg ReEncodeFont " <[xch_cy5fc2.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_y642vacq5wk2t7fdon4fcauezg ReEncodeFont " <[xch_y642va.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-sc-t2a--base XCharter-Italic " AutoEnc_ngyxqhy2wfgqreekbqupzpcinb ReEncodeFont " <[xch_ngyxqh.enc <XCharter-Italic.pfb
XCharter-Italic-lf-sc-t2asrb--base XCharter-Italic " AutoEnc_4nycucgn33u6rajgwlou4lz6vf ReEncodeFont " <[xch_4nycuc.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t1--base XCharter-Italic " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Italic.pfb
-XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Italic.pfb
+XCharter-Italic-lf-t2a XCharter-Italic " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Italic.pfb
XCharter-Italic-lf-t2asrb XCharter-Italic " AutoEnc_6mgzuzg3pb5qf3ldvnda2wsybb ReEncodeFont " <[xch_6mgzuz.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ly1--base XCharter-Italic " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Italic.pfb
XCharter-Italic-numr-ot1 XCharter-Italic " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Italic.pfb
@@ -18680,15 +18685,15 @@ XCharter-Italic-osf-ot1 XCharter-Italic " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb ReE
XCharter-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch_7aohvb.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch_dterbk.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch_wd2dbe.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch_zqx27h.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch_nh3bfv.enc <XCharter-Italic.pfb
XCharter-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch_sczepj.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t1--base XCharter-Italic " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Italic.pfb
-XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Italic.pfb
+XCharter-Italic-osf-t2a XCharter-Italic " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Italic.pfb
XCharter-Italic-osf-t2asrb XCharter-Italic " AutoEnc_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch_s4eoyd.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ly1--base XCharter-Italic " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Italic.pfb
XCharter-Italic-sup-ot1 XCharter-Italic " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t1--base XCharter-Italic " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Italic.pfb
-XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Italic.pfb
+XCharter-Italic-sup-t2a XCharter-Italic " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Italic.pfb
XCharter-Italic-sup-t2asrb XCharter-Italic " AutoEnc_en7yt2uld2mo3sfpmbkuptjxub ReEncodeFont " <[xch_en7yt2.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ly1--base XCharter-Italic " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-ot1 XCharter-Italic " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Italic.pfb
@@ -18696,20 +18701,20 @@ XCharter-Italic-tlf-ot2 XCharter-Italic " xcharterOT2enc ReEncodeFont " <[xchart
XCharter-Italic-tlf-sc-ly1--base XCharter-Italic " AutoEnc_qdw4m6pd2ohzfiltqvezylzubb ReEncodeFont " <[xch_qdw4m6.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-ot1--base XCharter-Italic " AutoEnc_y3xd77zr6c5xjfvbgsk2kzzcve ReEncodeFont " <[xch_y3xd77.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t1--base XCharter-Italic " AutoEnc_t5vgvkjgfem2ydqu3vt4dvxgsc ReEncodeFont " <[xch_t5vgvk.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_blmpt7r443ymavkauxboyp4quh ReEncodeFont " <[xch_blmpt7.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-sc-t2a--base XCharter-Italic " AutoEnc_qfxvo4ab6wiwvib65pamntdleb ReEncodeFont " <[xch_qfxvo4.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-sc-t2asrb--base XCharter-Italic " AutoEnc_bjnaxalddn62bxc6gu6eiaxsaa ReEncodeFont " <[xch_bjnaxa.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t1--base XCharter-Italic " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Italic.pfb
-XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Italic.pfb
+XCharter-Italic-tlf-t2a XCharter-Italic " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Italic.pfb
XCharter-Italic-tlf-t2asrb XCharter-Italic " AutoEnc_qibaxbcjnlrejjdickc5oq67xa ReEncodeFont " <[xch_qibaxb.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ly1--base XCharter-Italic " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-ot1 XCharter-Italic " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch_4sqimf.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch_s4nkqe.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch_tipddl.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch_wf67wi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch_56742i.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch_wqjgnt.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t1--base XCharter-Italic " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Italic.pfb
-XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Italic.pfb
+XCharter-Italic-tosf-t2a XCharter-Italic " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Italic.pfb
XCharter-Italic-tosf-t2asrb XCharter-Italic " AutoEnc_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch_mpbiom.enc <XCharter-Italic.pfb
XCharter-Italic-ts1--base XCharter-Italic " AutoEnc_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch_pqp4df.enc <XCharter-Italic.pfb
XCharter-Roman-dnom-ly1--base XCharter-Roman " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Roman.pfb
@@ -18723,12 +18728,12 @@ XCharter-Roman-lf-ot1 XCharter-Roman " AutoEnc_bbupxqigkbffslxhtvjmz5qdhb ReEnco
XCharter-Roman-lf-sc-ly1--base XCharter-Roman " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-ot1--base XCharter-Roman " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t1--base XCharter-Roman " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-sc-t2a--base XCharter-Roman " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Roman.pfb
XCharter-Roman-lf-sc-t2asrb--base XCharter-Roman " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t1--base XCharter-Roman " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Roman.pfb
-XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_6ckksab4xgup3cfdzppakccfch ReEncodeFont " <[xch_6ckksa.enc <XCharter-Roman.pfb
+XCharter-Roman-lf-t2a XCharter-Roman " AutoEnc_ajf4qeyyzlwr22lxwfvdvytw4h ReEncodeFont " <[xch_ajf4qe.enc <XCharter-Roman.pfb
XCharter-Roman-lf-t2asrb XCharter-Roman " AutoEnc_2ne5ras2ihnhgxt43rxslgjvce ReEncodeFont " <[xch_2ne5ra.enc <XCharter-Roman.pfb
-XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Roman.pfb
+XCharter-Roman-numr-ly1--base XCharter-Roman " AutoEnc_du7eesfjv53g5kmcdg53pxaz6g ReEncodeFont " <[xch_du7ees.enc <XCharter-Roman.pfb
XCharter-Roman-numr-ot1 XCharter-Roman " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Roman.pfb
XCharter-Roman-numr-t1--base XCharter-Roman " AutoEnc_aw3womsecdumtuxvl6hik6fs3a ReEncodeFont " <[xch_aw3wom.enc <XCharter-Roman.pfb
XCharter-Roman-osf-ly1--base XCharter-Roman " AutoEnc_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch_5xvt3q.enc <XCharter-Roman.pfb
@@ -18736,15 +18741,15 @@ XCharter-Roman-osf-ot1 XCharter-Roman " AutoEnc_ylqpprchpltakubnfx2ql7fllf ReEnc
XCharter-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Roman.pfb
XCharter-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t1--base XCharter-Roman " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Roman.pfb
-XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch_cjimfy.enc <XCharter-Roman.pfb
+XCharter-Roman-osf-t2a XCharter-Roman " AutoEnc_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch_5b6tid.enc <XCharter-Roman.pfb
XCharter-Roman-osf-t2asrb XCharter-Roman " AutoEnc_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch_2itbay.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ly1--base XCharter-Roman " AutoEnc_ukw3hq7h3prn34ryh2qktyrkse ReEncodeFont " <[xch_ukw3hq.enc <XCharter-Roman.pfb
XCharter-Roman-sup-ot1 XCharter-Roman " AutoEnc_dhwwz5gerbpejovfe253unwxde ReEncodeFont " <[xch_dhwwz5.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t1--base XCharter-Roman " AutoEnc_6hzluovfqgqjqwjosfm7uze3oh ReEncodeFont " <[xch_6hzluo.enc <XCharter-Roman.pfb
-XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_pz3lxgt2tnxz7p6istzozn734g ReEncodeFont " <[xch_pz3lxg.enc <XCharter-Roman.pfb
+XCharter-Roman-sup-t2a XCharter-Roman " AutoEnc_7rlj4vy6adeoxbzopcxh2vadqb ReEncodeFont " <[xch_7rlj4v.enc <XCharter-Roman.pfb
XCharter-Roman-sup-t2asrb XCharter-Roman " AutoEnc_vyhv3kfxmzrqwwcf6pkp3vdfqf ReEncodeFont " <[xch_vyhv3k.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ly1--base XCharter-Roman " AutoEnc_worivip5whk4cqev33dw4cszae ReEncodeFont " <[xch_worivi.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-ot1 XCharter-Roman " AutoEnc_3glltskulaq25sg7bdv2b6v7sb ReEncodeFont " <[xch_3gllts.enc <XCharter-Roman.pfb
@@ -18752,20 +18757,20 @@ XCharter-Roman-tlf-ot2 XCharter-Roman " xcharterOT2enc ReEncodeFont " <[xcharter
XCharter-Roman-tlf-sc-ly1--base XCharter-Roman " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-ot1--base XCharter-Roman " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t1--base XCharter-Roman " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-sc-t2a--base XCharter-Roman " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-sc-t2asrb--base XCharter-Roman " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t1--base XCharter-Roman " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Roman.pfb
-XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_m2vrds6ohoduinigqjp2pulx6b ReEncodeFont " <[xch_m2vrds.enc <XCharter-Roman.pfb
+XCharter-Roman-tlf-t2a XCharter-Roman " AutoEnc_4difzdpgpp73nhcpkiia7rn64h ReEncodeFont " <[xch_4difzd.enc <XCharter-Roman.pfb
XCharter-Roman-tlf-t2asrb XCharter-Roman " AutoEnc_fiqldzomfw67cfhl2p3wqrxjna ReEncodeFont " <[xch_fiqldz.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ly1--base XCharter-Roman " AutoEnc_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch_crvcmi.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-ot1 XCharter-Roman " AutoEnc_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch_45bsgy.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t1--base XCharter-Roman " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Roman.pfb
-XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch_tohekq.enc <XCharter-Roman.pfb
+XCharter-Roman-tosf-t2a XCharter-Roman " AutoEnc_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch_lhsfh5.enc <XCharter-Roman.pfb
XCharter-Roman-tosf-t2asrb XCharter-Roman " AutoEnc_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch_dynzsr.enc <XCharter-Roman.pfb
XCharter-Roman-ts1--base XCharter-Roman " AutoEnc_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch_co4ru4.enc <XCharter-Roman.pfb
XCharter-Slanted-dnom-ly1--base XCharter-Slanted " AutoEnc_v6llfbkbg2aolz7gvvtz2n2dza ReEncodeFont " <[xch_v6llfb.enc <XCharter-Slanted.pfb
@@ -18779,10 +18784,10 @@ XCharter-Slanted-lf-ot1 XCharter-Slanted " AutoEnc_aoa5sqhsbxws2dsjkwdeqjwevb Re
XCharter-Slanted-lf-sc-ly1--base XCharter-Slanted " AutoEnc_u5ytlbxa4ot3n4iwlw22qfrvhh ReEncodeFont " <[xch_u5ytlb.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-ot1--base XCharter-Slanted " AutoEnc_qp5ku5ynziaow2qnylsqgzdj4h ReEncodeFont " <[xch_qp5ku5.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t1--base XCharter-Slanted " AutoEnc_hiviygp7byoou5mxdiefpzfebe ReEncodeFont " <[xch_hiviyg.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_usfr4utzybskw556u2nlvg4jqd ReEncodeFont " <[xch_usfr4u.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-sc-t2a--base XCharter-Slanted " AutoEnc_gq3xajk77amien2wk5ugbn5t4h ReEncodeFont " <[xch_gq3xaj.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-sc-t2asrb--base XCharter-Slanted " AutoEnc_a6eos74zdc3rz44li6qottufnc ReEncodeFont " <[xch_a6eos7.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t1--base XCharter-Slanted " AutoEnc_wbcur76q4dbzd4ywyghgzedq6b ReEncodeFont " <[xch_wbcur7.enc <XCharter-Slanted.pfb
-XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_nii5islrejiuxdowrmow774atg ReEncodeFont " <[xch_nii5is.enc <XCharter-Slanted.pfb
+XCharter-Slanted-lf-t2a XCharter-Slanted " AutoEnc_ocih55xsw3jw7dqmepzor6634e ReEncodeFont " <[xch_ocih55.enc <XCharter-Slanted.pfb
XCharter-Slanted-lf-t2asrb XCharter-Slanted " AutoEnc_62bu45iinhmai2wncojqwud3he ReEncodeFont " <[xch_62bu45.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ly1--base XCharter-Slanted " AutoEnc_62z5otp5uxbu4kardxkb52z6sa ReEncodeFont " <[xch_62z5ot.enc <XCharter-Slanted.pfb
XCharter-Slanted-numr-ot1 XCharter-Slanted " AutoEnc_ev5sn4u4dzvsaukk5m7v43722h ReEncodeFont " <[xch_ev5sn4.enc <XCharter-Slanted.pfb
@@ -18792,15 +18797,15 @@ XCharter-Slanted-osf-ot1 XCharter-Slanted " AutoEnc_g2zr6i3czinzql75wmpzcx7rgb R
XCharter-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch_4zysyq.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch_saki7p.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch_geqmur.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch_626iem.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch_nhow2o.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t1--base XCharter-Slanted " AutoEnc_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch_x6jczy.enc <XCharter-Slanted.pfb
-XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter-Slanted-osf-t2a XCharter-Slanted " AutoEnc_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch_nmcnhp.enc <XCharter-Slanted.pfb
XCharter-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch_wuciy4.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ly1--base XCharter-Slanted " AutoEnc_7cmdv6duwtbf2d76hbqk4ei7qf ReEncodeFont " <[xch_7cmdv6.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-ot1 XCharter-Slanted " AutoEnc_bbkh3cq2kpegiztxjmkw4txaze ReEncodeFont " <[xch_bbkh3c.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t1--base XCharter-Slanted " AutoEnc_6w7ajii3h3mjf6sxfymvltrnxd ReEncodeFont " <[xch_6w7aji.enc <XCharter-Slanted.pfb
-XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_glnwaoq2otchakcfayz2fzbx3a ReEncodeFont " <[xch_glnwao.enc <XCharter-Slanted.pfb
+XCharter-Slanted-sup-t2a XCharter-Slanted " AutoEnc_bb5vvoh7hmx6segl2pabbqn4ee ReEncodeFont " <[xch_bb5vvo.enc <XCharter-Slanted.pfb
XCharter-Slanted-sup-t2asrb XCharter-Slanted " AutoEnc_o2mz2zv4w4wt7uyh5ivjpwoemb ReEncodeFont " <[xch_o2mz2z.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ly1--base XCharter-Slanted " AutoEnc_npknaku3iczifjpm2zzd23solg ReEncodeFont " <[xch_npknak.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-ot1 XCharter-Slanted " AutoEnc_uaipw45tqyj2afpalpar3twk7a ReEncodeFont " <[xch_uaipw4.enc <XCharter-Slanted.pfb
@@ -18808,20 +18813,20 @@ XCharter-Slanted-tlf-ot2 XCharter-Slanted " xcharterOT2enc ReEncodeFont " <[xcha
XCharter-Slanted-tlf-sc-ly1--base XCharter-Slanted " AutoEnc_ocop3wizmwjqyo3dmyn3xet5jd ReEncodeFont " <[xch_ocop3w.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-ot1--base XCharter-Slanted " AutoEnc_rt3iiqnxbjtiw4274gpvhcxysa ReEncodeFont " <[xch_rt3iiq.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t1--base XCharter-Slanted " AutoEnc_yelf2i7w3oin4jmm7bnvmi3zcc ReEncodeFont " <[xch_yelf2i.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_u7hnxssnf6z6zno4hmwm3wgalf ReEncodeFont " <[xch_u7hnxs.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-sc-t2a--base XCharter-Slanted " AutoEnc_5d4nztdcuhq5u4hljyhgvkdmvd ReEncodeFont " <[xch_5d4nzt.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-sc-t2asrb--base XCharter-Slanted " AutoEnc_6335sgc6bnvgrgjg7fbhsgy2wb ReEncodeFont " <[xch_6335sg.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t1--base XCharter-Slanted " AutoEnc_rydp4lirfokm2yleqgpye6uk6c ReEncodeFont " <[xch_rydp4l.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_mgb5xgsg7q6oo3plt4r3wmcfog ReEncodeFont " <[xch_mgb5xg.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tlf-t2a XCharter-Slanted " AutoEnc_fz6tqllhazkrlafutcd46357cf ReEncodeFont " <[xch_fz6tql.enc <XCharter-Slanted.pfb
XCharter-Slanted-tlf-t2asrb XCharter-Slanted " AutoEnc_hnm6t3k2slbl2ftyy5cswrhnch ReEncodeFont " <[xch_hnm6t3.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch_kbmyqk.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch_e3svsw.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch_ksktz7.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch_gpeupc.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch_ocj6e4.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch_i2cund.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch_plaupi.enc <XCharter-Slanted.pfb
+XCharter-Slanted-tosf-t2a XCharter-Slanted " AutoEnc_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch_qqwc2g.enc <XCharter-Slanted.pfb
XCharter-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch_hgvfee.enc <XCharter-Slanted.pfb
XCharter-Slanted-ts1--base XCharter-Slanted " AutoEnc_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch_ph46id.enc <XCharter-Slanted.pfb
XCharter-osf XCharter-Roman " chtabOsFEncoding ReEncodeFont " <[chtabosf.enc <XCharter-Roman.pfb
@@ -18830,20 +18835,20 @@ XCharter1-Bold-osf-ot1 XCharter-Bold " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb ReEnc
XCharter1-Bold-osf-sc-ly1--base XCharter-Bold " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-ot1--base XCharter-Bold " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t1--base XCharter-Bold " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-sc-t2a--base XCharter-Bold " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-sc-t2asrb--base XCharter-Bold " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t1--base XCharter-Bold " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Bold.pfb
-XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Bold.pfb
+XCharter1-Bold-osf-t2a XCharter-Bold " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Bold.pfb
XCharter1-Bold-osf-t2asrb XCharter-Bold " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ly1--base XCharter-Bold " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-ot1 XCharter-Bold " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ly1--base XCharter-Bold " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-ot1--base XCharter-Bold " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t1--base XCharter-Bold " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-sc-t2a--base XCharter-Bold " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-sc-t2asrb--base XCharter-Bold " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t1--base XCharter-Bold " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Bold.pfb
-XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Bold.pfb
+XCharter1-Bold-tosf-t2a XCharter-Bold " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Bold.pfb
XCharter1-Bold-tosf-t2asrb XCharter-Bold " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Bold.pfb
XCharter1-Bold-ts1--base XCharter-Bold " AutoEnc1_z3wvjzrihuxhpixor2gglzqccg ReEncodeFont " <[xch1_z3wvjz.enc <XCharter-Bold.pfb
XCharter1-BoldItalic-osf-ly1--base XCharter-BoldItalic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldItalic.pfb
@@ -18851,20 +18856,20 @@ XCharter1-BoldItalic-osf-ot1 XCharter-BoldItalic " AutoEnc1_aegaiust5jvuyf74wgre
XCharter1-BoldItalic-osf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_tdvtoatoqphrkorhqqqdxvo3za ReEncodeFont " <[xch1_tdvtoa.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t1--base XCharter-BoldItalic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t1--base XCharter-BoldItalic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-osf-t2a XCharter-BoldItalic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-osf-t2asrb XCharter-BoldItalic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ly1--base XCharter-BoldItalic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-ot1 XCharter-BoldItalic " AutoEnc1_v3qzikz26voyearrqvpx5ki3df ReEncodeFont " <[xch1_v3qzik.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ly1--base XCharter-BoldItalic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-ot1--base XCharter-BoldItalic " AutoEnc1_jeuyxn2rp42enwhghxb7mezkgg ReEncodeFont " <[xch1_jeuyxn.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t1--base XCharter-BoldItalic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-sc-t2a--base XCharter-BoldItalic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-sc-t2asrb--base XCharter-BoldItalic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t1--base XCharter-BoldItalic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldItalic.pfb
-XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldItalic.pfb
+XCharter1-BoldItalic-tosf-t2a XCharter-BoldItalic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-tosf-t2asrb XCharter-BoldItalic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-BoldItalic.pfb
XCharter1-BoldItalic-ts1--base XCharter-BoldItalic " AutoEnc1_xqcxendti4xfjtesusecvwojab ReEncodeFont " <[xch1_xqcxen.enc <XCharter-BoldItalic.pfb
XCharter1-BoldSlanted-osf-ly1--base XCharter-BoldSlanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-BoldSlanted.pfb
@@ -18872,20 +18877,20 @@ XCharter1-BoldSlanted-osf-ot1 XCharter-BoldSlanted " AutoEnc1_g2zr6i3czinzql75wm
XCharter1-BoldSlanted-osf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_q7fabpknswrkabbcspsxnge7se ReEncodeFont " <[xch1_q7fabp.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_icytdughipwu4ylecsn2jfsdbc ReEncodeFont " <[xch1_icytdu.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_ri2bbyntg42jvija35hdhjpovh ReEncodeFont " <[xch1_ri2bby.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_2jcsfajbj7ywbs34dlqgcw3xwb ReEncodeFont " <[xch1_2jcsfa.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t1--base XCharter-BoldSlanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-osf-t2a XCharter-BoldSlanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-osf-t2asrb XCharter-BoldSlanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ly1--base XCharter-BoldSlanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-ot1 XCharter-BoldSlanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ly1--base XCharter-BoldSlanted " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-ot1--base XCharter-BoldSlanted " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t1--base XCharter-BoldSlanted " AutoEnc1_ng7me5mjnlk3d4x26fckblue2f ReEncodeFont " <[xch1_ng7me5.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_c3yyfog2eypvvushmfwwi6yc5d ReEncodeFont " <[xch1_c3yyfo.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-sc-t2a--base XCharter-BoldSlanted " AutoEnc1_genhdortk4g5tbgxnt5apyrqpa ReEncodeFont " <[xch1_genhdo.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-sc-t2asrb--base XCharter-BoldSlanted " AutoEnc1_ccfumixdc336kzewpgzadb4gra ReEncodeFont " <[xch1_ccfumi.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t1--base XCharter-BoldSlanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-BoldSlanted.pfb
-XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-BoldSlanted.pfb
+XCharter1-BoldSlanted-tosf-t2a XCharter-BoldSlanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-tosf-t2asrb XCharter-BoldSlanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-BoldSlanted.pfb
XCharter1-BoldSlanted-ts1--base XCharter-BoldSlanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-BoldSlanted.pfb
XCharter1-Italic-osf-ly1--base XCharter-Italic " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Italic.pfb
@@ -18893,20 +18898,20 @@ XCharter1-Italic-osf-ot1 XCharter-Italic " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb R
XCharter1-Italic-osf-sc-ly1--base XCharter-Italic " AutoEnc1_7aohvb3j4cllo2ny34ugeabofe ReEncodeFont " <[xch1_7aohvb.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-ot1--base XCharter-Italic " AutoEnc1_dterbkxnf2ujkdf2x3bgwhboda ReEncodeFont " <[xch1_dterbk.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t1--base XCharter-Italic " AutoEnc1_wd2dbe34sf7rkkaeon64og5a3c ReEncodeFont " <[xch1_wd2dbe.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_zqx27h6iquwnh4mli45z2uykrb ReEncodeFont " <[xch1_zqx27h.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-sc-t2a--base XCharter-Italic " AutoEnc1_nh3bfvrihdycovz3zzfboxixke ReEncodeFont " <[xch1_nh3bfv.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-sc-t2asrb--base XCharter-Italic " AutoEnc1_sczepjndlpzhjzrv7huzzcgcmg ReEncodeFont " <[xch1_sczepj.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t1--base XCharter-Italic " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Italic.pfb
-XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Italic.pfb
+XCharter1-Italic-osf-t2a XCharter-Italic " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Italic.pfb
XCharter1-Italic-osf-t2asrb XCharter-Italic " AutoEnc1_s4eoyduxwz7j6pqfbocqab7gug ReEncodeFont " <[xch1_s4eoyd.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ly1--base XCharter-Italic " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-ot1 XCharter-Italic " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ly1--base XCharter-Italic " AutoEnc1_4sqimfdumbp34jdzocpuw555xe ReEncodeFont " <[xch1_4sqimf.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-ot1--base XCharter-Italic " AutoEnc1_s4nkqes5n4uumho7k3ja66wazf ReEncodeFont " <[xch1_s4nkqe.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t1--base XCharter-Italic " AutoEnc1_tipddl6hla4uyfdfli25e6uedb ReEncodeFont " <[xch1_tipddl.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_wf67wi5apar2djse5bcegu5l5a ReEncodeFont " <[xch1_wf67wi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-sc-t2a--base XCharter-Italic " AutoEnc1_56742izjbwunxdxzch5ysljgcb ReEncodeFont " <[xch1_56742i.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-sc-t2asrb--base XCharter-Italic " AutoEnc1_wqjgntyg3synkg5qzgjlx6cclh ReEncodeFont " <[xch1_wqjgnt.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t1--base XCharter-Italic " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Italic.pfb
-XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Italic.pfb
+XCharter1-Italic-tosf-t2a XCharter-Italic " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Italic.pfb
XCharter1-Italic-tosf-t2asrb XCharter-Italic " AutoEnc1_mpbiommipfp7afy3jn6kkjs23g ReEncodeFont " <[xch1_mpbiom.enc <XCharter-Italic.pfb
XCharter1-Italic-ts1--base XCharter-Italic " AutoEnc1_pqp4dfh24qktfeuqit5ll3ua4f ReEncodeFont " <[xch1_pqp4df.enc <XCharter-Italic.pfb
XCharter1-Roman-osf-ly1--base XCharter-Roman " AutoEnc1_5xvt3q4ldenwxbzpab36r55w3a ReEncodeFont " <[xch1_5xvt3q.enc <XCharter-Roman.pfb
@@ -18914,20 +18919,20 @@ XCharter1-Roman-osf-ot1 XCharter-Roman " AutoEnc1_ylqpprchpltakubnfx2ql7fllf ReE
XCharter1-Roman-osf-sc-ly1--base XCharter-Roman " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-ot1--base XCharter-Roman " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t1--base XCharter-Roman " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-sc-t2a--base XCharter-Roman " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-sc-t2asrb--base XCharter-Roman " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t1--base XCharter-Roman " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Roman.pfb
-XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_cjimfyni74ccxjsnsycgpfdr7a ReEncodeFont " <[xch1_cjimfy.enc <XCharter-Roman.pfb
+XCharter1-Roman-osf-t2a XCharter-Roman " AutoEnc1_5b6tidzhc4uk6xfc7lzirdc5se ReEncodeFont " <[xch1_5b6tid.enc <XCharter-Roman.pfb
XCharter1-Roman-osf-t2asrb XCharter-Roman " AutoEnc1_2itbaymenzrb5xthj47dlmqvzc ReEncodeFont " <[xch1_2itbay.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ly1--base XCharter-Roman " AutoEnc1_crvcmiq6azayiyuntiohyqw5bc ReEncodeFont " <[xch1_crvcmi.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-ot1 XCharter-Roman " AutoEnc1_45bsgy4a4z4f4qk5jmev47jsca ReEncodeFont " <[xch1_45bsgy.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ly1--base XCharter-Roman " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-ot1--base XCharter-Roman " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t1--base XCharter-Roman " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-sc-t2a--base XCharter-Roman " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-sc-t2asrb--base XCharter-Roman " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t1--base XCharter-Roman " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Roman.pfb
-XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_tohekqb7m7y2fvorjyknq54efb ReEncodeFont " <[xch1_tohekq.enc <XCharter-Roman.pfb
+XCharter1-Roman-tosf-t2a XCharter-Roman " AutoEnc1_lhsfh5m45a6hm3piaqzh7cdh2g ReEncodeFont " <[xch1_lhsfh5.enc <XCharter-Roman.pfb
XCharter1-Roman-tosf-t2asrb XCharter-Roman " AutoEnc1_dynzsr4sb3ldnecwjr4njmd2tf ReEncodeFont " <[xch1_dynzsr.enc <XCharter-Roman.pfb
XCharter1-Roman-ts1--base XCharter-Roman " AutoEnc1_co4ru464vsgph3ezqa72efxcnh ReEncodeFont " <[xch1_co4ru4.enc <XCharter-Roman.pfb
XCharter1-Slanted-osf-ly1--base XCharter-Slanted " AutoEnc1_wkfmwgakhsdwbfqnlw5cd6dwae ReEncodeFont " <[xch1_wkfmwg.enc <XCharter-Slanted.pfb
@@ -18935,20 +18940,20 @@ XCharter1-Slanted-osf-ot1 XCharter-Slanted " AutoEnc1_g2zr6i3czinzql75wmpzcx7rgb
XCharter1-Slanted-osf-sc-ly1--base XCharter-Slanted " AutoEnc1_4zysyqekhrh377ld64a5gt3bcc ReEncodeFont " <[xch1_4zysyq.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-ot1--base XCharter-Slanted " AutoEnc1_saki7pzwmgdbjdfn7g5ccrwdkg ReEncodeFont " <[xch1_saki7p.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t1--base XCharter-Slanted " AutoEnc1_6xwfqvqcbt3oxaqtca6iubb6oe ReEncodeFont " <[xch1_6xwfqv.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_geqmurehyr5wcbyrbl2mdxcdpf ReEncodeFont " <[xch1_geqmur.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-sc-t2a--base XCharter-Slanted " AutoEnc1_626iemnzpycvxefkhwyx7jg73h ReEncodeFont " <[xch1_626iem.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_nhow2oriavhyxfh6euosdomsje ReEncodeFont " <[xch1_nhow2o.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t1--base XCharter-Slanted " AutoEnc1_x6jczyaykpt55mhfvxdxwokyih ReEncodeFont " <[xch1_x6jczy.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_3qy4mai7utp4xgoxpc25ikvocg ReEncodeFont " <[xch1_3qy4ma.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-osf-t2a XCharter-Slanted " AutoEnc1_nmcnhpz5mm32fpzsix4oxjcfsb ReEncodeFont " <[xch1_nmcnhp.enc <XCharter-Slanted.pfb
XCharter1-Slanted-osf-t2asrb XCharter-Slanted " AutoEnc1_wuciy4n2roolzf5f34qqbzzhxe ReEncodeFont " <[xch1_wuciy4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ly1--base XCharter-Slanted " AutoEnc1_kbmyqkwvvoe3r2jyst56ielfpd ReEncodeFont " <[xch1_kbmyqk.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-ot1 XCharter-Slanted " AutoEnc1_e3svswxwaptmk4csglooy5qdyd ReEncodeFont " <[xch1_e3svsw.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ly1--base XCharter-Slanted " AutoEnc1_ksktz7tjppfhb42xvb6yxczkqd ReEncodeFont " <[xch1_ksktz7.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-ot1--base XCharter-Slanted " AutoEnc1_gpeupciafir6dxwlhhqztxa4sf ReEncodeFont " <[xch1_gpeupc.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t1--base XCharter-Slanted " AutoEnc1_yr3lccoclcllj4jacxiujymtwh ReEncodeFont " <[xch1_yr3lcc.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_m6qb7yhbmjeqkmf6zffpitl3nd ReEncodeFont " <[xch1_m6qb7y.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-sc-t2a--base XCharter-Slanted " AutoEnc1_ocj6e4kjunq73haye725x4w4vd ReEncodeFont " <[xch1_ocj6e4.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-sc-t2asrb--base XCharter-Slanted " AutoEnc1_i2cundlmhxhdttwik6tmbaoeta ReEncodeFont " <[xch1_i2cund.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t1--base XCharter-Slanted " AutoEnc1_dp2hrqpbuwssgnmmgoxc3qriid ReEncodeFont " <[xch1_dp2hrq.enc <XCharter-Slanted.pfb
-XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_plaupi652dl6la5yzojc7c7tma ReEncodeFont " <[xch1_plaupi.enc <XCharter-Slanted.pfb
+XCharter1-Slanted-tosf-t2a XCharter-Slanted " AutoEnc1_qqwc2ghandguvt3vzcutcbgttd ReEncodeFont " <[xch1_qqwc2g.enc <XCharter-Slanted.pfb
XCharter1-Slanted-tosf-t2asrb XCharter-Slanted " AutoEnc1_hgvfeeswhiyhbsm3pazgcpkm5g ReEncodeFont " <[xch1_hgvfee.enc <XCharter-Slanted.pfb
XCharter1-Slanted-ts1--base XCharter-Slanted " AutoEnc1_ph46idfft7to53v2kspy6xejya ReEncodeFont " <[xch1_ph46id.enc <XCharter-Slanted.pfb
XCharter1TH-BoldItalic-osf-ly1 XCharter-BoldItalic " xch1TH-osf-ly1Enc ReEncodeFont " <xch1TH_osf-ly1.enc <XCharter-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath-Bold.otf b/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath-Bold.otf
index 399833fedd7..9ce7fa31284 100644
--- a/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath-Bold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath.otf b/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath.otf
index d2a19d80373..296bbb907fe 100644
--- a/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath.otf
+++ b/Master/texmf-dist/fonts/opentype/public/lete-sans-math/LeteSansMath.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/simpleicons/SimpleIcons.otf b/Master/texmf-dist/fonts/opentype/public/simpleicons/SimpleIcons.otf
index e446b78adbf..e72d49b1f77 100644
--- a/Master/texmf-dist/fonts/opentype/public/simpleicons/SimpleIcons.otf
+++ b/Master/texmf-dist/fonts/opentype/public/simpleicons/SimpleIcons.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math-Bold.otf b/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math-Bold.otf
index 3cceb40e325..8c44cef0585 100644
--- a/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math-Bold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math.otf b/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math.otf
index ae56abadf9e..36818253ded 100644
--- a/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math.otf
+++ b/Master/texmf-dist/fonts/opentype/public/xcharter-math/XCharter-Math.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Bold-tlf-ot1G.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Bold-tlf-ot1G.tfm
new file mode 100644
index 00000000000..307dc6c9621
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Bold-tlf-ot1G.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.tfm
new file mode 100644
index 00000000000..83b15fa3baa
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Italic-tlf-ot1G.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Italic-tlf-ot1G.tfm
new file mode 100644
index 00000000000..ea08cbf453b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Italic-tlf-ot1G.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Regular-tlf-ot1G.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Regular-tlf-ot1G.tfm
new file mode 100644
index 00000000000..6997ce6e48c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/Gelasio-Regular-tlf-ot1G.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBMI.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBMI.tfm
new file mode 100644
index 00000000000..872dfb4e4f5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBMI.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBRM.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBRM.tfm
new file mode 100644
index 00000000000..79aae84ebc2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathBRM.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathMI.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathMI.tfm
new file mode 100644
index 00000000000..266d6dde713
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathMI.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathRM.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathRM.tfm
new file mode 100644
index 00000000000..81b485c8642
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/GelasioMathRM.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmi.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmi.tfm
new file mode 100644
index 00000000000..e93d0205ab2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmi.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmia.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmia.tfm
new file mode 100644
index 00000000000..02b99ac9481
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelbmia.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmi.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmi.tfm
new file mode 100644
index 00000000000..16321e720f7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmi.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmia.tfm b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmia.tfm
new file mode 100644
index 00000000000..8d623290d86
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/gelasiomath/zgelmia.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconseight.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconseight.tfm
index 3a4e513b127..b4235e1383d 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconseight.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconseight.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfive.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfive.tfm
index 1d2c4c88254..64d30d85da8 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfive.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfive.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfour.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfour.tfm
index f3a4eff1df9..9f3b25dc66e 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfour.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsfour.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsnine.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsnine.tfm
index 0486a6a3d4b..3e064bfe80e 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsnine.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsnine.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsoneone.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsoneone.tfm
index 8f12ca7252b..d6ef6cd797d 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsoneone.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsoneone.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonethree.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonethree.tfm
index af3885206db..f4d014c1652 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonethree.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonethree.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonetwo.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonetwo.tfm
index b29480482b3..92869b87a55 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonetwo.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonetwo.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonezero.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonezero.tfm
index 6886c6292ff..82ed66afe8b 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonezero.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsonezero.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsseven.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsseven.tfm
index ed089689137..132d34cd11e 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsseven.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsseven.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconssix.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconssix.tfm
index e97a6f52367..6a64b552290 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconssix.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconssix.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsthree.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsthree.tfm
index 7a0435a8570..6ba3d7b9af2 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsthree.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsthree.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconstwo.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconstwo.tfm
index ec38660a69c..45b4619408d 100644
--- a/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconstwo.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconstwo.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/luwiantype/LuwianFont.ttf b/Master/texmf-dist/fonts/truetype/public/luwiantype/LuwianFont.ttf
new file mode 100644
index 00000000000..3d89f8aa9ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/luwiantype/LuwianFont.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBMI.pfb b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBMI.pfb
new file mode 100644
index 00000000000..20b7f4033fb
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBMI.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBRM.pfb b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBRM.pfb
new file mode 100644
index 00000000000..8a7b8ae4771
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathBRM.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathMI.pfb b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathMI.pfb
new file mode 100644
index 00000000000..6ae7403070a
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathMI.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathRM.pfb b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathRM.pfb
new file mode 100644
index 00000000000..2a2f7e12f19
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/gelasiomath/GelasioMathRM.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/simpleicons/SimpleIcons.pfb b/Master/texmf-dist/fonts/type1/public/simpleicons/SimpleIcons.pfb
index 5169ae4e5bf..f5f6978feec 100644
--- a/Master/texmf-dist/fonts/type1/public/simpleicons/SimpleIcons.pfb
+++ b/Master/texmf-dist/fonts/type1/public/simpleicons/SimpleIcons.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Bold-tlf-ot1G.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Bold-tlf-ot1G.vf
new file mode 100644
index 00000000000..2a679ce69cb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Bold-tlf-ot1G.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.vf
new file mode 100644
index 00000000000..a146628af7f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-BoldItalic-tlf-ot1G.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Italic-tlf-ot1G.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Italic-tlf-ot1G.vf
new file mode 100644
index 00000000000..8e262c86e2f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Italic-tlf-ot1G.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Regular-tlf-ot1G.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Regular-tlf-ot1G.vf
new file mode 100644
index 00000000000..40f3bd9f5ff
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/Gelasio-Regular-tlf-ot1G.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmi.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmi.vf
new file mode 100644
index 00000000000..e67b53ecae7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmi.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmia.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmia.vf
new file mode 100644
index 00000000000..63fed788eef
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelbmia.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmi.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmi.vf
new file mode 100644
index 00000000000..0443f250f8d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmi.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmia.vf b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmia.vf
new file mode 100644
index 00000000000..d9ca49afa22
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/gelasiomath/zgelmia.vf
Binary files differ
diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index 7dc37e0fa0a..4f57c0cf25c 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -4924,6 +4924,7 @@ frimurer
garamond-libre
garamond-math
gelasio
+gelasiomath
genealogy
gentium-tug
gfsartemisia
@@ -5007,6 +5008,7 @@ lm
lm-math
lobster2
logix
+luwiantype
lxfonts
magra
marcellus
@@ -6996,6 +6998,12 @@ README
gelasio-samples.pdf
gelasio-samples.tex
+./doc/fonts/gelasiomath:
+README
+gelasiomath-doc.pdf
+gelasiomath-doc.tex
+newtx-gel-subs.tex
+
./doc/fonts/genealogy:
README
licence.txt
@@ -8043,6 +8051,14 @@ logix.tex
logix.vfc
logixMono.vfc
+./doc/fonts/luwiantype:
+OFL.txt
+README.md
+U14400.pdf
+lppl1-3c.txt
+luwiantype-doc.pdf
+luwiantype-doc.tex
+
./doc/fonts/lxfonts:
LXfonts-demo.pdf
LXfonts-demo.tex
@@ -10568,6 +10584,7 @@ index.html
index.pdf
mf
mfware
+mp
other
pdftex
tex
@@ -10638,6 +10655,10 @@ gftype.hnt
mft-changes.hnt
mft.hnt
+./doc/generic/knuth-hint/mp:
+mp.hnt
+mpost.hnt
+
./doc/generic/knuth-hint/other:
dvicopy-changes.hnt
dvicopy.hnt
@@ -10696,6 +10717,7 @@ index.html
index.pdf
mf
mfware
+mp
other
pdftex
tex
@@ -10766,6 +10788,10 @@ gftype.pdf
mft-changes.pdf
mft.pdf
+./doc/generic/knuth-pdf/mp:
+mp.pdf
+mpost.pdf
+
./doc/generic/knuth-pdf/other:
dvicopy-changes.pdf
dvicopy.pdf
@@ -10930,6 +10956,7 @@ lpform-doc.pdf
lpform-doc.tex
./doc/generic/lt3luabridge:
+CHANGES.md
LICENSE
README.md
docstrip.cfg
@@ -12253,6 +12280,9 @@ psGlassPattern.tex
./doc/generic/pst-node:
Changes
README
+psmatrix-docDE.bib
+psmatrix-docDE.pdf
+psmatrix-docDE.tex
pst-node-doc.bib
pst-node-doc.pdf
pst-node-doc.tex
@@ -15669,6 +15699,7 @@ moodle
moreenum
morefloats
morehype
+moremath
moresize
moreverb
morewrites
@@ -15872,6 +15903,7 @@ pas-crosswords
pas-cv
pas-tableur
pascaltriangle
+passopt
patchcmd
pauldoc
pawpict
@@ -16832,6 +16864,7 @@ worldflags
wrapfig
wrapfig2
wrapstuff
+wrapstuff-doc-en
writeongrid
wsemclassic
wtref
@@ -19237,12 +19270,17 @@ beautybook-en.tex
inner_pics
./doc/latex/beautybook/inner_pics:
+beautybook-logo.png
coverimage.jpg
+hummingbird-8013214.jpg
ivy-ge998908f8_1280.jpg
-logo.png
+mystery-1599527.jpg
titleimages
./doc/latex/beautybook/inner_pics/titleimages:
+c10.pdf
+c11.pdf
+c9.pdf
even1.png
even2.png
even3.png
@@ -23108,14 +23146,7 @@ setpunct-main.tex
./doc/latex/cjs-rcs-article:
README.md
cjs-rcs-article-fr.pdf
-cjs-rcs-article-fr.tex
cjs-rcs-article.pdf
-cjs-rcs-bst-en.dbj
-cjs-rcs-bst-fr.dbj
-cjs-rcs-class.dbj
-cjs-rcs-english.mbs
-cjs-rcs-french.mbs
-cjs-rcs-merlin.mbs
cjs-rcs-merlin.pdf
cjs-template.tex
rcs-gabarit.tex
@@ -26827,10 +26858,6 @@ problem2-tabella.tex
problem2.tex
problem3-matching.tex
problem4-fillin.tex
-qftest5-fillinqiie1.parametri.tex
-qftest5-fillinqiie2.parametri.tex
-qftest5-fillinqiie3.parametri.tex
-qftest5-fillinqiie4.parametri.tex
test1.tex
test11.tex
test12.tex
@@ -26850,6 +26877,7 @@ testA-pdflatex-sol.tex
testA-pdflatex.pdf
testA-pdflatex.tex
testA-xetex-sol.pdf
+testA-xetex-sol.sol.tex
testA-xetex-sol.tex
testA-xetex.pdf
testA-xetex.tex
@@ -37288,6 +37316,7 @@ One_author_one_degree.pdf
One_author_two_degrees.pdf
One_author_two_degrees_from_one_department.pdf
Two_authors_one_degree.pdf
+Two_authors_one_degree_two_departments.pdf
Two_authors_two_degrees.pdf
latex_sources
@@ -37297,7 +37326,9 @@ One_author_one_degree.tex
One_author_two_degrees.tex
One_author_two_degrees_from_one_department.tex
Two_authors_one_degree.tex
+Two_authors_one_degree_two_departments.tex
Two_authors_two_degrees.tex
+cover_compile.sh
./doc/latex/mitthesis/examples/font_samples:
Defaultfonts.pdf
@@ -37324,6 +37355,7 @@ README_font_sample_sources.txt
Stix2.tex
Termes-stix2.tex
Termes.tex
+compile-font-samples.sh
./doc/latex/mitthesis/mitthesis-doc:
mitthesis-doc.pdf
@@ -37417,6 +37449,7 @@ manual
picture.eps
picture.jpg
publications.bib
+signature.png
template.tex
./doc/latex/moderncv/manual:
@@ -37741,6 +37774,11 @@ makehtml.tex
schreibt.tex
writings.fdf
+./doc/latex/moremath:
+MANIFEST.md
+README.md
+moremath-doc.pdf
+
./doc/latex/moresize:
moresize.pdf
moresize.upl
@@ -39409,6 +39447,11 @@ build.sh
pascaltriangle.pdf
pascaltriangle.tex
+./doc/latex/passopt:
+README.md
+passopt.pdf
+passopt.tex
+
./doc/latex/patchcmd:
README
patchcmd.pdf
@@ -39706,7 +39749,6 @@ latin2-example.tex
manifest.txt
math-assign5.png
pdfx.pdf
-pdfx.xmpdata
sample.tex
small2e-pdfx.tex
usage-meta.png
@@ -39781,6 +39823,7 @@ pgf-PeriodicTableManual_DarkMode.tex
pgf-PeriodicTableManual_DesignCS.tex
pgf-PeriodicTableManual_DiscY.tex
pgf-PeriodicTableManual_Examples.tex
+pgf-PeriodicTableManual_O.tex
pgf-PeriodicTableManual_OtherCont.tex
pgf-PeriodicTableManual_TitleLegend.tex
pgf-PeriodicTableManual_Z.tex
@@ -40446,21 +40489,18 @@ sample-rysunek1.mps
README.md
example-arabic.pdf
example-arabic.tex
-example-chinese.pdf
example-chinese.tex
-example-japanese.pdf
example-japanese.tex
example-korean.pdf
example-korean.tex
-example-odia.pdf
example-odia.tex
example-thai.pdf
example-thai.tex
+example-uyghur.tex
examples.pdf
examples.tex
polyglossia.pdf
polyglossia.tex
-test-welsh.pdf
test-welsh.tex
./doc/latex/polyhedra:
@@ -40717,8 +40757,8 @@ productbox.pdf
./doc/latex/profcollege:
PfCLogoNumberHive.png
-ProfCollege-doc.pdf
README
+profcollege-doc.pdf
profcollege-doc.zip
./doc/latex/proflabo:
@@ -40932,8 +40972,8 @@ protest.tex
protocol.pdf
./doc/latex/prtec:
-PRTEC19-template.pdf
-PRTEC19-template.tex
+PRTEC24-template.pdf
+PRTEC24-template.tex
README.md
prtec-sample.bib
sample-figure.pdf
@@ -45163,12 +45203,12 @@ syntaxdi.tex
./doc/latex/synthslant:
LICENSE
README.md
-RELEASE-HOWTO.md
compare-with-the-gimp.png.base64
-index.md
shear-transform.mp
synthslant-gauge.pdf
synthslant-gauge.tex
+synthslant-minimal-test.tex
+synthslant.gst
synthslant.ist
synthslant.pdf
title.mp
@@ -50338,10 +50378,9 @@ typoaid.pdf
typoaid.tex
./doc/latex/typog:
+LICENSE
README.md
-RELEASE-HOWTO.md
crooked-paragraphs.mp
-index.md
slant-angle.mp
smooth-parshapes.mp
teximan2latex.sed
@@ -50349,8 +50388,12 @@ title.mp
typog-example.pdf
typog-example.tex
typog-grep.1.pdf
+typog-grep.pl.in
typog-grep.pod
-typog-nomt.tex
+typog-grep.version.sed
+typog-minimal-test.tex
+typog-without-microtype-test.tex
+typog.gst
typog.ist
typog.pdf
@@ -52042,6 +52085,11 @@ wrapfig2.pdf
README.md
wrapstuff.pdf
+./doc/latex/wrapstuff-doc-en:
+README.md
+wrapstuff-doc-en.pdf
+wrapstuff-doc-en.tex
+
./doc/latex/writeongrid:
README.md
WriteOnGrid-5x5-A5.pdf
@@ -53439,6 +53487,7 @@ simurgh
spacekern
stricttex
sympycalc
+tango
truthtable
typewriter
uninormalize
@@ -54188,6 +54237,28 @@ README.md
SympyCalc-doc.pdf
SympyCalc-doc.tex
+./doc/lualatex/tango:
+README
+examples
+tango-en.pdf
+tango-en.tex
+tango-fr.pdf
+tango-fr.tex
+
+./doc/lualatex/tango/examples:
+Ch-1-15.tex
+Ch-16-30.tex
+book-mathematics.tex
+candide.tex
+euler.tex
+handout-euler.tex
+handout-polynomes-deg2.tex
+polynome-deg2.tex
+puissance-cercle.tex
+recurrence.tex
+rel-bin.tex
+schoolwork.tex
+
./doc/lualatex/truthtable:
README.md
res
@@ -73961,6 +74032,7 @@ frcursive
garamond-libre
garuda-c90
gelasio
+gelasiomath
gentium-tug
gfsartemisia
gfsbaskerville
@@ -74608,6 +74680,9 @@ garuda-c90.map
./fonts/map/dvips/gelasio:
gelasio.map
+./fonts/map/dvips/gelasiomath:
+GelasioMath.map
+
./fonts/map/dvips/gentium-tug:
gentium-type1.map
gentiumbook-type1.map
@@ -110291,6 +110366,7 @@ frcursive
frimurer
garamond-libre
garuda-c90
+gelasiomath
genealogy
gentium-tug
gfsartemisia
@@ -124970,6 +125046,20 @@ fgdbo8z.tfm
fgdo8z.tfm
fgdr8z.tfm
+./fonts/tfm/public/gelasiomath:
+Gelasio-Bold-tlf-ot1G.tfm
+Gelasio-BoldItalic-tlf-ot1G.tfm
+Gelasio-Italic-tlf-ot1G.tfm
+Gelasio-Regular-tlf-ot1G.tfm
+GelasioMathBMI.tfm
+GelasioMathBRM.tfm
+GelasioMathMI.tfm
+GelasioMathRM.tfm
+zgelbmi.tfm
+zgelbmia.tfm
+zgelmi.tfm
+zgelmia.tfm
+
./fonts/tfm/public/genealogy:
drgen10.tfm
@@ -166579,6 +166669,7 @@ junicodevf
khatalmaqala
lexend
logix
+luwiantype
marcellus
marvosym
mpchess
@@ -166892,6 +166983,9 @@ LexendZetta-Regular.ttf
logix.ttf
logixMono.ttf
+./fonts/truetype/public/luwiantype:
+LuwianFont.ttf
+
./fonts/truetype/public/marcellus:
Marcellus-Regular.ttf
MarcellusSC-Regular.ttf
@@ -168780,6 +168874,7 @@ fpl
frcursive
frimurer
garamond-libre
+gelasiomath
gentium-tug
gfsartemisia
gfsbaskerville
@@ -172540,6 +172635,12 @@ GaramondLibre-BoldItalic.pfb
GaramondLibre-Italic.pfb
GaramondLibre-Regular.pfb
+./fonts/type1/public/gelasiomath:
+GelasioMathBMI.pfb
+GelasioMathBRM.pfb
+GelasioMathMI.pfb
+GelasioMathRM.pfb
+
./fonts/type1/public/gentium-tug:
GentiumBookPlus-Bold.pfb
GentiumBookPlus-BoldItalic.pfb
@@ -186079,6 +186180,7 @@ forum
fourier
fouriernc
garamond-libre
+gelasiomath
gfsartemisia
gfsbaskerville
gfsbodoni
@@ -191255,6 +191357,16 @@ GaramondLibre-Regular-osf-t1.vf
GaramondLibre-Regular-osf-ts1.vf
GaramondLibre-Regular-sup-t1.vf
+./fonts/vf/public/gelasiomath:
+Gelasio-Bold-tlf-ot1G.vf
+Gelasio-BoldItalic-tlf-ot1G.vf
+Gelasio-Italic-tlf-ot1G.vf
+Gelasio-Regular-tlf-ot1G.vf
+zgelbmi.vf
+zgelbmia.vf
+zgelmi.vf
+zgelmia.vf
+
./fonts/vf/public/gfsartemisia:
artemisiab8a.vf
artemisiab9a.vf
@@ -212475,6 +212587,7 @@ monofill
moodle
morefloats
morehype
+moremath
moresize
moreverb
morewrites
@@ -214377,6 +214490,12 @@ CJKpunct.ins
./source/latex/cjs-rcs-article:
cjs-rcs-article.dtx
cjs-rcs-article.ins
+cjs-rcs-bst-en.dbj
+cjs-rcs-bst-fr.dbj
+cjs-rcs-class.dbj
+cjs-rcs-english.mbs
+cjs-rcs-french.mbs
+cjs-rcs-merlin.mbs
./source/latex/clefval:
clefval.dtx
@@ -218115,6 +218234,10 @@ markblog.tex
srcfiles.tex
texlinks.tex
+./source/latex/moremath:
+moremath.dtx
+moremath.ins
+
./source/latex/moresize:
moresize.dtx
moresize.ins
@@ -220312,6 +220435,7 @@ textualicomma.dtx
textualicomma.ins
./source/latex/texvc:
+Makefile
texvc.dtx
texvc.ins
@@ -233910,6 +234034,7 @@ gchords
gcite
gckanbun
gelasio
+gelasiomath
gender
gene-logic
genealogy-profiles
@@ -234430,6 +234555,7 @@ ltxmisc
ltxnew
ltxtools
luacolor
+luwiantype
lwarp
lxfonts
ly1
@@ -234586,6 +234712,7 @@ moodle
moreenum
morefloats
morehype
+moremath
moresize
moreverb
morewrites
@@ -234813,6 +234940,7 @@ pas-crosswords
pas-cv
pas-tableur
pascaltriangle
+passopt
patchcmd
pauldoc
pawpict
@@ -237983,8 +238111,7 @@ bearwear.sty
beaulivre.cls
./tex/latex/beautybook:
-beautybook-CN.cls
-beautybook-EN.cls
+beautybook.cls
stys
./tex/latex/beautybook/stys:
@@ -239352,10 +239479,28 @@ phys.cbx
phys.dbx
./tex/latex/biblatex-publist:
+lbx
publist.bbx
publist.cbx
publist.dbx
+./tex/latex/biblatex-publist/lbx:
+UKenglish-publist.lbx
+USenglish-publist.lbx
+american-publist.lbx
+australian-publist.lbx
+austrian-publist.lbx
+british-publist.lbx
+canadian-publist.lbx
+english-publist.lbx
+french-publist.lbx
+german-publist.lbx
+naustrian-publist.lbx
+newzealand-publist.lbx
+ngerman-publist.lbx
+nswissgerman-publist.lbx
+swissgerman-publist.lbx
+
./tex/latex/biblatex-readbbl:
biblatex-readbbl.sty
@@ -245255,6 +245400,14 @@ TS1Gelasio-TLF.fd
TS1Gelasio-TOsF.fd
gelasio.sty
+./tex/latex/gelasiomath:
+gelasiomath.sty
+ly1mingelasio.fd
+omlzgelmi.fd
+ot1mingelasio.fd
+t1mingelasio.fd
+untxmia.fd
+
./tex/latex/gender:
gender.sty
@@ -249899,6 +250052,9 @@ ltxtools.sty
luacolor.lua
luacolor.sty
+./tex/latex/luwiantype:
+luwiantype.sty
+
./tex/latex/lwarp:
lwarp-2in1.sty
lwarp-2up.sty
@@ -251666,15 +251822,18 @@ moderncvbodyii.sty
moderncvbodyiii.sty
moderncvbodyiv.sty
moderncvbodyv.sty
+moderncvbodyvi.sty
moderncvcollection.sty
moderncvcolorblack.sty
moderncvcolorblue.sty
moderncvcolorburgundy.sty
+moderncvcolorcerulean.sty
moderncvcolorgreen.sty
moderncvcolorgrey.sty
moderncvcolororange.sty
moderncvcolorpurple.sty
moderncvcolorred.sty
+moderncvcolors.tex
moderncvcompatibility.sty
moderncvdebugtools.sty
moderncvfooti.sty
@@ -251684,6 +251843,7 @@ moderncvheadiii.sty
moderncvheadiv.sty
moderncvheadv.sty
moderncvheadvi.sty
+moderncvheadvii.sty
moderncviconsacademic.sty
moderncviconsawesome.sty
moderncviconsletters.sty
@@ -251694,9 +251854,11 @@ moderncvskillmatrix.sty
moderncvstylebanking.sty
moderncvstylecasual.sty
moderncvstyleclassic.sty
+moderncvstylecontemporary.sty
moderncvstyleempty.sty
moderncvstylefancy.sty
moderncvstyleoldstyle.sty
+moderncvverticaltimeline.sty
tweaklist.sty
./tex/latex/modernposter:
@@ -251868,6 +252030,9 @@ morehype.RLS
texblog.fdf
texlinks.sty
+./tex/latex/moremath:
+moremath.sty
+
./tex/latex/moresize:
moresize.sty
@@ -253655,6 +253820,9 @@ pas-tableur.sty
./tex/latex/pascaltriangle:
pascaltriangle.sty
+./tex/latex/passopt:
+passopt.sty
+
./tex/latex/patchcmd:
patchcmd.sty
@@ -254605,7 +254773,7 @@ bengalidigits.sty
cal-util.def
devanagaridigits.sty
farsical.sty
-gloss-acadien.ldf
+gloss-acadian.ldf
gloss-aeb.ldf
gloss-af.ldf
gloss-afb.ldf
@@ -254659,6 +254827,7 @@ gloss-chinese.ldf
gloss-ckb-Arab.ldf
gloss-ckb-Latn.ldf
gloss-ckb.ldf
+gloss-classiclatin.ldf
gloss-cop.ldf
gloss-coptic.ldf
gloss-croatian.ldf
@@ -254691,6 +254860,7 @@ gloss-divehi.ldf
gloss-dsb.ldf
gloss-dutch.ldf
gloss-dv.ldf
+gloss-ecclesiasticlatin.ldf
gloss-el-monoton.ldf
gloss-el-polyton.ldf
gloss-el.ldf
@@ -254773,9 +254943,6 @@ gloss-la.ldf
gloss-lao.ldf
gloss-latex.ldf
gloss-latin.ldf
-gloss-latinclassic.ldf
-gloss-latinecclesiastic.ldf
-gloss-latinmedieval.ldf
gloss-latvian.ldf
gloss-lithuanian.ldf
gloss-lo.ldf
@@ -254788,6 +254955,7 @@ gloss-magyar.ldf
gloss-malay.ldf
gloss-malayalam.ldf
gloss-marathi.ldf
+gloss-medievallatin.ldf
gloss-mk.ldf
gloss-ml.ldf
gloss-mn.ldf
@@ -254852,8 +255020,8 @@ hebrewcal.sty
hijrical.sty
nkonumbers.sty
odiadigits.sty
+polyglossia-cjk-spacing.lua
polyglossia-french.lua
-polyglossia-korean.lua
polyglossia-latin.lua
polyglossia-punct.lua
polyglossia-sanskrit.lua
@@ -255020,6 +255188,7 @@ productbox.sty
./tex/latex/profcollege:
PfCAllumettes.tex
+PfCArbreCalcul.tex
PfCArbreChiffre.tex
PfCAssemblagesSolides.tex
PfCAutomatismes.tex
@@ -255085,6 +255254,7 @@ PfCGrades.tex
PfCGrimuku.tex
PfCHiddenMessage.tex
PfCHorloge.tex
+PfCInfixRPN.sty
PfCJeton.tex
PfCJeuRangement.tex
PfCKakurasu.tex
@@ -255117,6 +255287,7 @@ PfCPavage.tex
PfCPavageAvecMotifImage.tex
PfCPixelArt.tex
PfCPourcentage.tex
+PfCProbaFrequence.tex
PfCProbabilites.tex
PfCProgrammeCalcul.tex
PfCPropor.tex
@@ -255160,6 +255331,7 @@ PfCTortueBase.tex
PfCTrigonometrie.tex
PfCTrio.tex
PfCTriominos.tex
+PfCUrneProba.tex
PfCVisualisationMulDeci.tex
PfCVueCubes.tex
PfCYohaku.tex
@@ -264570,6 +264742,7 @@ simurgh
spacekern
stricttex
sympycalc
+tango
truthtable
typewriter
uninormalize
@@ -265102,6 +265275,9 @@ stricttex.sty
./tex/lualatex/sympycalc:
SympyCalc.sty
+./tex/lualatex/tango:
+tango.cls
+
./tex/lualatex/truthtable:
truthtable.sty
@@ -265602,6 +265778,7 @@ luavlna.tex
./tex/luatex/luaxml:
luaxml-cssquery.lua
luaxml-domobject.lua
+luaxml-encodings.lua
luaxml-entities.lua
luaxml-mod-handler.lua
luaxml-mod-html.lua
diff --git a/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp b/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp
index 3ef56f9ab99..e5cbc9474f1 100644
--- a/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp
+++ b/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp
@@ -10,7 +10,7 @@
%%%% ==================================================================== %%%%
%%%% mf2pt1 %%%%
-%%%% Copyright (C) 2005-2020 Scott Pakin %%%%
+%%%% Copyright (C) 2005-2024 Scott Pakin %%%%
%%%% %%%%
%%%% This program may be distributed and/or modified under the conditions %%%%
%%%% of the LaTeX Project Public License, either version 1.3c of this %%%%
diff --git a/Master/texmf-dist/metapost/profcollege/PfCMonde.mp b/Master/texmf-dist/metapost/profcollege/PfCMonde.mp
index fb3064cefdf..6cc7f15e45e 100644
--- a/Master/texmf-dist/metapost/profcollege/PfCMonde.mp
+++ b/Master/texmf-dist/metapost/profcollege/PfCMonde.mp
@@ -151,6 +151,15 @@ enddef;
vardef FZ(expr t,v)=rayon*sind(c*t)
enddef;
+vardef FXx(expr t,v)=rayon*cosd(t)*cosd(v)
+enddef;
+
+vardef FYy(expr t,v)=rayon*cosd(t)*sind(v)
+enddef;
+
+vardef FZz(expr t,v)=rayon*sind(t)
+enddef;
+
%Paramtres et macros de reprsentation
vardef Initialisation(expr r,t,p,d)=
Rho:=r;
@@ -227,6 +236,25 @@ vardef MaillageSphere=
MaillageS;
enddef;
+vardef MaillageSphereCoord=
+% InitialiseMaillage(((phim div 10)+1)*pi/12,((phip div 10)-1)*pi/12,pi/12,-pi,pi,pi/12);
+ InitialiseMaillage(-pi/2,pi/2,pi/18,-pi,pi,pi/12);
+ %MaillageS;
+ path Maillage[];
+ nbmor:=0;
+ for k=-90 step 10 until 90:
+ for l=-180 step 10 until 180:
+ nbl:=nbl+1;
+ if ProduitScalaire(1/2[(FXx(k,l),FYy(k,l),FZz(k,l)),(FXx(k+10,l+10),FYy(k+10,l+10),FZz(k+10,l+10))]-pte3,Oeil-pte3)>0:
+ nbmor:=nbmor+1;
+ Maillage[nbmor]=Projgeo((FXx(k,l),FYy(k,l),FZz(k,l)))..Projgeo((FXx(k,l+10),FYy(k,l+10),FZz(k,l+10)));
+ draw Maillage[nbmor] if k=0: withpen pencircle scaled 1 withcolor Crimson fi;
+ draw Projgeo((FXx(k,l),FYy(k,l),FZz(k,l)))..Projgeo((FXx(k+10,l),FYy(k+10,l),FZz(k+10,l))) if l=0:withpen pencircle scaled 1 withcolor LightSteelBlue fi;
+ fi;
+ endfor;
+ endfor;
+enddef;
+
boolean maille;
maille=false;
@@ -276,9 +304,19 @@ vardef lecture(expr nomfichier,fond)=
numeric ll;
ll:=0;
nbpts:=scantokens readfrom nomfichier;
- for k=1 upto (nbpts div 3):
+% for k=1 upto (nbpts div 3):
+% pair latlon;
+% latlon=((scantokens readfrom nomfichier)+(scantokens readfrom nomfichier)+(scantokens readfrom nomfichier))/3;
+ if nbpts<Allegee:
+ Alleg:=1;
+ else:
+ Alleg:=Allegee;
+ fi;
+ for k=1 upto (nbpts div Alleg):
pair latlon;
- latlon=((scantokens readfrom nomfichier)+(scantokens readfrom nomfichier)+(scantokens readfrom nomfichier))/3;
+ latlon=((scantokens readfrom nomfichier) for l=2 upto Alleg:
+ +(scantokens readfrom nomfichier)
+ endfor)/Alleg;
Coord[k]=rayon*(cosd(xpart(latlon/60))*cosd(ypart(latlon/60)),cosd(xpart(latlon/60))*sind(ypart(latlon/60)),sind(xpart(latlon/60)));
if ((xpart(latlon/60)>phim) and (xpart(latlon/60)<phip)):
if ProduitScalaire(Coord[k]-pte3,Oeil-pte3)>0:
@@ -295,7 +333,7 @@ vardef lecture(expr nomfichier,fond)=
path pays;
if ll>0:
pays=Projgeo(Pays[1])
- for l=2 upto (nbpts div 3):
+ for l=2 upto (nbpts div Alleg):%(nbpts div 3):
--Projgeo(Pays[l])
endfor;
if noncolore=true:
@@ -303,7 +341,7 @@ vardef lecture(expr nomfichier,fond)=
else:
fill pays--cycle withcolor fond;
fi;
- draw pays;
+ draw pays withpen pencircle scaled 0.25;
clip currentpicture to cercles(pte3,pte1,pte3,pte1,pte4);
fi;
enddef;
@@ -319,9 +357,19 @@ vardef Lectureiles=
ll:=0;
nbpts:=scantokens readfrom nomfichiermul;
fond=scantokens readfrom nomfichiermul;
- for k=1 upto nbpts:
+ %if nbpts<Allegee:
+ Alleg:=1;
+ %else:
+ % Alleg:=2;%pas Allegee car sinon des artefacts apparaissent
+ %fi;
+ for k=1 upto (nbpts div Alleg):
pair latlon;
- latlon=scantokens readfrom nomfichiermul;
+ latlon=((scantokens readfrom nomfichiermul) for l=2 upto Alleg:
+ +(scantokens readfrom nomfichiermul)
+ endfor)/Alleg;
+% for k=1 upto nbpts:
+% pair latlon;
+% latlon=scantokens readfrom nomfichiermul;
Coord[k]=rayon*(cosd(xpart(latlon/60))*cosd(ypart(latlon/60)),cosd(xpart(latlon/60))*sind(ypart(latlon/60)),sind(xpart(latlon/60)));
if ((xpart(latlon/60)>phim) and (xpart(latlon/60)<phip)):
if ProduitScalaire(Coord[k]-pte3,Oeil-pte3)>0:
@@ -337,7 +385,7 @@ vardef Lectureiles=
path pays;
if ll>0:
pays=Projgeo(Pays[1])
- for l=2 upto nbpts:
+ for l=2 upto (nbpts div Alleg):%nbpts:
--Projgeo(Pays[l])
endfor;
if noncolore=true:
@@ -345,9 +393,15 @@ vardef Lectureiles=
else:
fill pays--cycle withcolor fond;
fi;
- draw pays;
+ draw pays withpen pencircle scaled 0.25;
clip currentpicture to cercles(pte3,pte1,pte3,pte1,pte4);
fi;
+ % rustine pour tout lire chaque partie de Ile.dat
+ if Alleg>1:
+ for po=1 upto (nbpts mod Alleg):
+ poubelle:=scantokens readfrom nomfichiermul;
+ endfor;
+ fi;
endfor;
closefrom nomfichiermul;
enddef;
@@ -1641,6 +1695,11 @@ vardef mappemonde(expr longobs,latobs)=
MaillageSphere;
drawoptions();
fi;
+ if maillagecoord=true:
+ drawoptions(withpen pencircle scaled 0.25 withcolor couleurmaillage);
+ MaillageSphereCoord;
+ drawoptions();
+ fi;
if maille=true:
Maille;
fi;
diff --git a/Master/texmf-dist/metapost/profcollege/PfCObjets.mp b/Master/texmf-dist/metapost/profcollege/PfCObjets.mp
index fd2fbe0f2dd..5dac3c967d6 100644
--- a/Master/texmf-dist/metapost/profcollege/PfCObjets.mp
+++ b/Master/texmf-dist/metapost/profcollege/PfCObjets.mp
@@ -661,6 +661,55 @@ vardef DessineFusion=
endfor;
enddef;
+vardef DessineFusionCoul=
+ save _fusion;
+ picture _fusion;
+ tapj:=0;
+ color Fc[][];color cou[];
+ for l=1 upto nbobj:
+ for k=0 upto apj[l]:
+ cpt[tapj]:=tapj;
+ cou[tapj]:=Outcolor[l];
+ Fc[tapj].nb:=OTFc[l][k].nb;
+ for p=1 upto Fc[tapj].nb:
+ Fc[tapj][p]:=OTFc[l][k][p];
+ endfor;
+ Fc[tapj].iso:=OTFc[l][k].iso;
+ ALT[tapj]:=ALT[l][k];
+ Vue[tapj]:=Vue[l][k];
+ if Ferme[l]:
+ if Vue[tapj]=false:
+ tapj:=tapj-1;
+ fi;
+ fi;
+ tapj:=tapj+1;
+ endfor;
+ endfor;
+ tapj:=tapj-1;
+ QS(0,tapj);
+ for k=0 upto tapj:
+ fill for l=1 upto Fc[cpt[k]].nb:
+ Projette(Fc[cpt[k]][l])--
+ endfor
+ cycle withcolor if Vue[cpt[k]]:
+ abs(lumin(cpt[k]))*cou[cpt[k]] fi;
+ if traits:
+ draw for l=1 upto Fc[cpt[k]].nb:
+ Projette(Fc[cpt[k]][l])--
+ endfor
+ cycle withpen pencircle scaled0.25bp;
+ %add by cp 22/08/2011
+ else:
+ draw for l=1 upto Fc[cpt[k]].nb:
+ Projette(Fc[cpt[k]][l])--
+ endfor
+ cycle withcolor if Vue[cpt[k]]:
+ abs(lumin(cpt[k]))*cou[cpt[k]] fi;
+ %fin add
+ fi;
+ endfor;
+enddef;
+
vardef Objettore[](expr Rn,rn)=
Outcolor.@:=outcolor;
Incolor.@:=incolor;
@@ -1727,8 +1776,8 @@ vardef Objettetraedre[](expr ar)=
tcpt.@[0]:=0;
OTFc.@[0].nb:=3;
OTFc.@[0][1]:=Image(Sommet0);
- OTFc.@[0][2]:=Image(Sommet2);
- OTFc.@[0][3]:=Image(Sommet1);
+ OTFc.@[0][2]:=Image(Sommet1);
+ OTFc.@[0][3]:=Image(Sommet2);
OTFc.@[0].iso:=(OTFc.@[0][1]+OTFc.@[0][2]+OTFc.@[0][3])/3;
tcpt.@[1]:=1;
OTFc.@[1].nb:=3;
diff --git a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
index 1a599650177..4fa1a590012 100755
--- a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
+++ b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
use warnings;
-# $Id: epstopdf.pl 71584 2024-06-21 22:40:28Z karl $
+# $Id: epstopdf.pl 71777 2024-07-11 21:24:57Z karl $
# (Copyright lines below.)
#
# Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,9 @@ use warnings;
#
# emacs-page
#
-my $ver = "2.35";
+my $ver = "2.36";
+# 2024/07/11 2.36 (Karl Berry)
+# * regexp syntax for OS/2 test, found by John Collins.
# 2024/06/21 2.35 (Karl Berry)
# * path_sep for OS/2 is also ";".
# 2024/04/29 2.34 (Karl Berry)
@@ -228,7 +230,7 @@ my $ver = "2.35";
### emacs-page
### program identification
my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 71584 2024-06-21 22:40:28Z karl $)' . " $ver";
+my $ident = '($Id: epstopdf.pl 71777 2024-07-11 21:24:57Z karl $)' . " $ver";
my $copyright = <<END_COPYRIGHT ;
Copyright 2009-2024 Karl Berry et al.
Copyright 2002-2009 Gerben Wierda et al.
@@ -260,7 +262,7 @@ debug " on_cygwin=$on_cygwin, on_msys=$on_msys";
# Split PATH and use / as directory separator.
#
-my $path_sep = ($^O =~ /^(OS2|MSWin)i/) ? ';' : ':'; # not msys
+my $path_sep = ($^O =~ /^(OS2|MSWin)/i) ? ';' : ':'; # not msys
my @pdirs = split($path_sep, $ENV{"PATH"});
# Normalize directory separators to /. Always valid on Windows.
if ($on_windows_or_cygwin) {
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm
index 6365e0fd93b..cbea5437c6d 100644
--- a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm
+++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm
@@ -749,6 +749,9 @@ sub yaml_read_settings {
my $parent = $keysValues[0];
my $child = $keysValues[1];
my $grandchild = $keysValues[2];
+
+ delete $mainSettings{$parent}{$child} if (defined $mainSettings{$parent}{$child} and ref $mainSettings{$parent}{$child} ne "HASH" );
+
$logger->info("Updating mainSettings with $parent: $child: $grandchild: $value");
$mainSettings{$parent}{$child}{$grandchild} = $value;
}
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
index 5232967fb9c..a2483231fdc 100644
--- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
+++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
@@ -20,6 +20,6 @@ use warnings;
use Exporter qw/import/;
our @EXPORT_OK = qw/$versionNumber $versionDate/;
-our $versionNumber = '3.24.2';
-our $versionDate = '2024-06-15';
+our $versionNumber = '3.24.3';
+our $versionDate = '2024-07-14';
1
diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
index 15073c2f982..e16617db147 100755
--- a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
+++ b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
@@ -1,5 +1,5 @@
#
-# latexindent.pl, version 3.24.2, 2024-06-15
+# latexindent.pl, version 3.24.3, 2024-07-14
#
# defaultSettings.yaml, the default settings for latexindent.pl
#
diff --git a/Master/texmf-dist/scripts/latexindent/latexindent.pl b/Master/texmf-dist/scripts/latexindent/latexindent.pl
index c85bdf2047d..2b9791e5c8c 100755
--- a/Master/texmf-dist/scripts/latexindent/latexindent.pl
+++ b/Master/texmf-dist/scripts/latexindent/latexindent.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
#
-# latexindent.pl, version 3.24.2, 2024-06-15
+# latexindent.pl, version 3.24.3, 2024-07-14
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/scripts/markdown/markdown-cli.lua b/Master/texmf-dist/scripts/markdown/markdown-cli.lua
index 0f8d7ac9575..9ed5f113d2b 100644
--- a/Master/texmf-dist/scripts/markdown/markdown-cli.lua
+++ b/Master/texmf-dist/scripts/markdown/markdown-cli.lua
@@ -20,7 +20,7 @@
-- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--
--- Copyright (C) 2016-2024 Vít Starý Novotný
+-- Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
--
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -58,11 +58,11 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "3.6.1-0-g5a45a922",
+ version = "3.6.2-0-g6c30af7e",
comment = "A module for the conversion from markdown to plain TeX",
- author = "John MacFarlane, Hans Hagen, Vít Starý Novotný",
+ author = "John MacFarlane, Hans Hagen, Vít Starý Novotný, Andrej Genčur",
copyright = {"2009-2016 John MacFarlane, Hans Hagen",
- "2016-2023 Vít Starý Novotný"},
+ "2016-2024 Vít Starý Novotný, Andrej Genčur"},
license = "LPPL 1.3c"
}
diff --git a/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl b/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl
index a9ee8b74fc4..982f8c98bec 100755
--- a/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl
+++ b/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl
@@ -7,7 +7,7 @@
########################################################################
# mf2pt1 #
-# Copyright (C) 2005-2021 Scott Pakin #
+# Copyright (C) 2005-2024 Scott Pakin #
# #
# This program may be distributed and/or modified under the conditions #
# of the LaTeX Project Public License, either version 1.3c of this #
@@ -21,7 +21,7 @@
# version 2006/05/20 or later. #
########################################################################
-our $VERSION = "2.7"; # mf2pt1 version number
+our $VERSION = "2.8"; # mf2pt1 version number
require 5.6.1; # I haven't tested mf2pt1 with older Perl versions
use Cwd;
@@ -161,7 +161,7 @@ my $filedir;
my $filenoext;
my $versionmsg = "mf2pt1 version $VERSION
-Copyright (C) 2005-2021 Scott Pakin
+Copyright (C) 2005-2024 Scott Pakin
This program may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.3c of this
@@ -1006,9 +1006,9 @@ else {
Open($1);
SelectAll();
RemoveOverlap();
-AddExtrema();
Simplify(0, 2);
CorrectDirection();
+AddExtrema(1);
Simplify(0, 2);
RoundToInt();
AutoHint();
diff --git a/Master/texmf-dist/scripts/texlive-extra/texconfig.sh b/Master/texmf-dist/scripts/texlive-extra/texconfig.sh
index 94ec3fffced..07c7ac05c4c 100755
--- a/Master/texmf-dist/scripts/texlive-extra/texconfig.sh
+++ b/Master/texmf-dist/scripts/texlive-extra/texconfig.sh
@@ -392,52 +392,6 @@ fmgrConfigReplace()
}
###############################################################################
-# setupDvipsPaper(paper)
-# rearranges config.ps to make paper the first paper definition
-#
-setupDvipsPaper()
-{
- setupDvipsPaperChanged=false
- setupDvipsPaperFile=config.ps
- setupDvipsPaperDftPaper=$1
-
- setupTmpDir
- co=`tcfmgr --tmp $tmpdir --cmd co --file $setupDvipsPaperFile`
- if test $? != 0; then
- echo "$progname: setupDvipsPaper co failed for \`$setupDvipsPaperFile'" >&2
- (exit 1); return 1
- fi
- set x $co; shift
- setupDvipsPaperID=$1; setupDvipsPaperCfgFile=$3; setupDvipsPaperOrigFile=$4
-
- ed "$setupDvipsPaperCfgFile" > /dev/null 2>&1 <<-eof
- /@ /ka
- \$a
- @
- .
- /@ $setupDvipsPaperDftPaper /;/@ /-1m'a-1
- \$d
- w
- q
-eof
-
- ci=`tcfmgr --tmp $tmpdir --cmd ci --id "$setupDvipsPaperID"`
- if test $? != 0; then
- echo "$progname: setupDvipsPaper ci failed for \`$setupDvipsPaperFile'" >&2
- (exit 1); return 1
- fi
- case $ci in
- "") :;;
- $lastUpdatedFile)
- setupDvipsPaperChanged=true;;
- *) echo "$progname: updated configuration saved as file \`$ci'" >&2
- setupDvipsPaperChanged=true
- lastUpdatedFile=$ci;;
- esac
- (exit 0); return 0
-}
-
-###############################################################################
# setupModesMfFile(void) - find modes.mf file (with caching)
#
setupModesMfFile()
@@ -571,7 +525,6 @@ tcBatch()
the TeX installation.
Usage: $progname conf (show configuration information)
- $progname dvipdfmx paper PAPER (dvipdfmx paper size)
$progname dvips [OPTION...] (dvips options)
$progname faq (show pointer to TeX Live docs)
$progname findprog PROG... (show locations of PROGs, a la which)
@@ -584,11 +537,9 @@ Usage: $progname conf (show configuration information)
$progname init [FORMAT]... (rebuild FORMATs, or all formats
plus run texlinks and updmap)
$progname mode MODE (set Metafont MODE)
- $progname paper PAPER (set default paper size to PAPER)
$progname pdftex [OPTION]... (pdftex options)
$progname rehash (rebuild ls-R files with mktexlsr)
$progname version (or --version; show version info)
- $progname xdvi paper PAPER (xdvi paper size)
Get more help with:
$progname dvipdfmx
@@ -596,7 +547,6 @@ Get more help with:
$progname font
$progname hyphen
$progname mode
- $progname paper
$progname pdftex
$progname xdvi
@@ -634,37 +584,8 @@ TeX Live home page: <http://tug.org/texlive/>
# texconfig dvipdfmx
dvipdfmx)
- help="Usage: $progname dvipdfmx paper PAPER
-
-Valid PAPER settings:
- letter legal ledger tabloid a4 a3"
- case $2 in
- # texconfig dvipdfmx paper
- paper-list)
- for p in letter legal ledger tabloid a4 a3; do echo $p; done
- ;;
- paper)
- case $3 in
- letter|legal|ledger|tabloid|a4|a3)
- tlmgr dvipdfmx paper $3
- ;;
- # fmgrConfigReplace dvipdfmx.cfg '^p' "p $3";;
- "") echo "$help" >&2; rc=1;;
- *)
- echo "$progname: unknown PAPER \`$3' given as argument for \`$progname dvipdfmx paper'" >&2
- echo "$progname: try \`$progname dvipdfmx paper' for help" >&2
- rc=1 ;;
- esac ;;
- # texconfig dvipdfmx ""
- "")
- echo "$help" >&2; rc=1 ;;
- # texconfig dvipdfmx <unknown>
- *)
- echo "$progname: unknown option \`$2' given as argument for \`$progname dvipdfmx'" >&2
- echo "$progname: try \`$progname dvipdfmx' for help" >&2
- rc=1
- ;;
- esac
+ abort "Use tlmgr paper dvipdfmx"
+ rc=1
;;
# texconfig dvips
@@ -672,7 +593,6 @@ Valid PAPER settings:
shift
help="Usage: $progname dvips add PRINTER
$progname dvips del PRINTER
- $progname dvips paper PAPER
$progname dvips [-P PRINTER] mode MODE
$progname dvips [-P PRINTER] offset OFFSET
$progname dvips [-P PRINTER] printcmd CMD"
@@ -779,32 +699,7 @@ Valid PAPER settings:
listDvipsPapers
;;
paper)
- case $2 in
- "")
- echo "Usage: $progname dvips paper PAPER" >&2
- echo >&2; echo "Valid PAPER settings:" >&2
- locateConfigPsFile
- listDvipsPapers | sed 's@ .*@@; s@^@ @' | myFmt
- rc=1
- ;;
- *)
- tcBatchDvipsPaper=$2
- locateConfigPsFile
- case "$configPsFile" in
- "")
- echo "$progname: file config.ps not found" >&2; rc=1
- ;;
- *)
- if grep "@ $tcBatchDvipsPaper " $configPsFile >/dev/null 2>&1; then
- tlmgr dvips paper $tcBatchDvipsPaper
- # setupDvipsPaper "$tcBatchDvipsPaper"
- else
- echo "$progname: paper \`$tcBatchDvipsPaper' not found in file \`$configPsFile'" >&2; rc=1
- fi
- ;;
- esac
- ;;
- esac
+ abort "Use tlmgr paper dvips"
;;
mode)
case $2 in
@@ -876,14 +771,6 @@ Valid MODE settings:"
echo "Please see https://tug.org/texlive/doc/ for the documentation"
echo "available in TeX Live."
;;
- # setupTexmfmain
- # if test -f $MT_TEXMFMAIN/doc/tetex/teTeX-FAQ; then
- # <$MT_TEXMFMAIN/doc/tetex/teTeX-FAQ eval ${PAGER-more}
- # else
- # echo "$progname: faq not found (usually in \$TEXMFMAIN/doc/tetex/teTeX-FAQ)" >&2
- # rc=1
- # fi
- # ;;
findprog)
shift
@@ -1200,104 +1087,11 @@ Valid MODE settings:"
;;
paper)
- help="Usage: $progname paper PAPER
-
-Valid PAPER settings:
- letter a4"
-
- p=$2; pDvips=$2
- case $2 in
- letter|a4) ;;
- "") echo "$help" >&2; rc=1; return;;
- *)
- echo "$progname: unknown PAPER \`$2' given as argument for \`$progname paper'" >&2
- echo "$progname: try \`$progname paper' for help" >&2
- rc=1
- return;;
- esac
- if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then
- tcBatch dvips paper $pDvips
- fi
- if checkForBinary dvipdfmx >/dev/null && tcfmgr --cmd find --file dvipdfmx.cfg >/dev/null 2>&1; then
- tcBatch dvipdfmx paper $p
- fi
- if checkForBinary xdvi >/dev/null && tcfmgr --cmd find --file XDvi >/dev/null 2>&1; then
- tcBatch xdvi paper $p
- fi
- if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
- tcBatch pdftex paper $p
- fi
+ abort "Use tlmgr paper"
;;
pdftex)
- help="Usage: $progname pdftex paper PAPER
-
-Valid PAPER settings:
- a4 letter"
- case $2 in
-
- mode)
- case $3 in
- "")
- echo "Usage: $progname pdftex mode MODE"
- rc=1
- ;;
- *)
- tcBatchPdftexMode=$3
- setupTmpDir
- setupModesMfFile
- if checkElemInList "$tcBatchPdftexMode" `listMfModes | sed 's@ .*@@'`; then
- set x `getRes "$tcBatchPdftexMode"`; shift
- fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1"
- if $fmgrConfigReplaceChanged; then
- fmtutil --refresh
- fi
- else
- echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2
- rc=1
- fi
- ;;
- esac
- ;;
-
- paper)
- case $3 in
- letter|a4)
- tlmgr pdftex paper $3
- ;;
- #letter)
- # w="8.5 true in"; h="11 true in"
- # setupTmpDir
- # fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
- # wChanged=$fmgrConfigReplaceChanged
- # fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
- # if $wChanged || $fmgrConfigReplaceChanged; then
- # fmtutil --refresh
- # fi
- # ;;
- #a4)
- # w="210 true mm"; h="297 true mm"
- # fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
- # wChanged=$fmgrConfigReplaceChanged
- # fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
- # if $wChanged || $fmgrConfigReplaceChanged; then
- # fmtutil --refresh
- # fi
- # ;;
- "") echo "$help" >&2; rc=1;;
- *)
- echo "$progname: unknown PAPER \`$3' given as argument for \`$progname pdftex paper'" >&2
- echo "$progname: try \`$progname pdftex paper' for help" >&2
- rc=1 ;;
- esac ;;
- "")
- echo "$help" >&2; rc=1;;
- *)
- echo "$progname: unknown option \`$2' given as argument for \`$progname pdftex'" >&2
- echo "$progname: try \`$progname pdftex' for help" >&2
- rc=1
- ;;
- esac
+ abort "Use tlmgr paper pdftex"
;;
rehash)
@@ -1314,112 +1108,7 @@ Valid PAPER settings:
# handle "xdvi paper PAPER"
xdvi)
- tcBatchXdviPapers='us "8.5x11"
-letter "8.5x11"
-ledger "17x11"
-tabloid "11x17"
-usr "11x8.5"
-legal "8.5x14"
-legalr "14x8.5"
-foolscap "13.5x17.0"
-foolscapr "17.0x13.5"
-a0 "84.1x118.9cm"
-a1 "59.4x84.1cm"
-a2 "42.0x59.4cm"
-a3 "29.7x42.0cm"
-a4 "21.0x29.7cm"
-a5 "14.8x21.0cm"
-a6 "10.5x14.8cm"
-a7 "7.4x10.5cm"
-a8 "5.2x7.4cm"
-a9 "3.7x5.2cm"
-a10 "2.6x3.7cm"
-a0r "118.9x84.1cm"
-a1r "84.1x59.4cm"
-a2r "59.4x42.0cm"
-a3r "42.0x29.7cm"
-a4r "29.7x21.0cm"
-a5r "21.0x14.8cm"
-a6r "14.8x10.5cm"
-a7r "10.5x7.4cm"
-a8r "7.4x5.2cm"
-a9r "5.2x3.7cm"
-a10r "3.7x2.6cm"
-b0 "100.0x141.4cm"
-b1 "70.7x100.0cm"
-b2 "50.0x70.7cm"
-b3 "35.3x50.0cm"
-b4 "25.0x35.3cm"
-b5 "17.6x25.0cm"
-b6 "12.5x17.6cm"
-b7 "8.8x12.5cm"
-b8 "6.2x8.8cm"
-b9 "4.4x6.2cm"
-b10 "3.1x4.4cm"
-b0r "141.4x100.0cm"
-b1r "100.0x70.7cm"
-b2r "70.7x50.0cm"
-b3r "50.0x35.3cm"
-b4r "35.3x25.0cm"
-b5r "25.0x17.6cm"
-b6r "17.6x12.5cm"
-b7r "12.5x8.8cm"
-b8r "8.8x6.2cm"
-b9r "6.2x4.4cm"
-b10r "4.4x3.1cm"
-c0 "91.7x129.7cm"
-c1 "64.8x91.7cm"
-c2 "45.8x64.8cm"
-c3 "32.4x45.8cm"
-c4 "22.9x32.4cm"
-c5 "16.2x22.9cm"
-c6 "11.4x16.2cm"
-c7 "8.1x11.4cm"
-c8 "5.7x8.1cm"
-c9 "4.0x5.7cm"
-c10 "2.8x4.0cm"
-c0r "129.7x91.7cm"
-c1r "91.7x64.8cm"
-c2r "64.8x45.8cm"
-c3r "45.8x32.4cm"
-c4r "32.4x22.9cm"
-c5r "22.9x16.2cm"
-c6r "16.2x11.4cm"
-c7r "11.4x8.1cm"
-c8r "8.1x5.7cm"
-c9r "5.7x4.0cm"
-c10r "4.0x2.8cm"'
- help="Usage: $progname xdvi paper PAPER
-
-Valid PAPER settings:
- a0 a0r a1 a1r a2 a2r a3 a3r a4 a4r a5 a5r a6 a6r a7 a7r a8 a8r a9 a9r a10 a10r
- b0 b0r b1 b1r b2 b2r b3 b3r b4 b4r b5 b5r b6 b6r b7 b7r b8 b8r b9 b9r b10 b10r
- c0 c0r c1 c1r c2 c2r c3 c3r c4 c4r c5 c5r c6 c6r c7 c7r c8 c8r c9 c9r c10 c10r
- us letter ledger tabloid usr legal legalr foolscap foolscapr"
- case $2 in
- paper-list)
- echo "$tcBatchXdviPapers"
- ;;
- paper)
- case $3 in
- [abc][0-9]|[abc]10|[abc][0-9]r|[abc]10r|us|letter|ledger|tabloid|usr|legal|legalr|foolscap|foolscapr)
- tlmgr xdvi paper $3
- # fmgrConfigReplace XDvi paper: "*paper: $3"
- ;;
- "") echo "$help" >&2; rc=1;;
- *)
- echo "$progname: unknown PAPER \`$3' given as argument for \`$progname xdvi paper'" >&2
- echo "$progname: try \`$progname xdvi paper' for help" >&2
- rc=1 ;;
- esac ;;
- "")
- echo "$help" >&2; rc=1;;
- *)
- echo "$progname: unknown option \`$2' given as argument for \`$progname xdvi'" >&2
- echo "$progname: try \`$progname xdvi' for help" >&2
- rc=1
- ;;
- esac
+ abort "Use tlmgr paper xdvi"
;;
*)
echo "$progname: unknown option \`$1' given as argument for \`$progname'" >&2
diff --git a/Master/texmf-dist/scripts/texlive/extractbb.lua b/Master/texmf-dist/scripts/texlive/extractbb.lua
index 7584814ee80..a1bccf55b54 100755
--- a/Master/texmf-dist/scripts/texlive/extractbb.lua
+++ b/Master/texmf-dist/scripts/texlive/extractbb.lua
@@ -4,11 +4,11 @@
-- SPDX-FileCopyrightText: 2024 Max Chernoff
--
-- A generic wrapper to make commands safe to run with restricted shell escape.
---
+--
-- Originally created for extractbb, which is listed in shell_escape_commands,
-- but can be run as dvipdfm(x), which in turn can run arbitrary commands
-- using its -D option.
---
+--
-- The idea is to exec "ebb --ebb <other args>", since only argv[1] is
-- used by dvipdfmx to determine its behavior.
--
@@ -21,7 +21,7 @@
--[=[
arg[0] = arg[0]:gsub("extractbb", "ebb")
table.insert(arg, 1, "ebb")
-table.insert(arg, 2, "--ebb")
+table.insert(arg, 2, "--extractbb")
os.exec(arg)
os.exit(1)
--]=]
@@ -33,10 +33,6 @@ os.exit(1)
-- The base name of this script. (Example: ``extractbb'')
local SCRIPT_NAME = "extractbb"
--- The extension of the script. Extensionless-names are also permitted.
--- (Example: ``lua'')
-local SCRIPT_EXT = "lua"
-
-- The base name of the path to the target program. (Example: ``xdvipdfmx'')
local TARGET_PATH_NAME = "xdvipdfmx"
@@ -47,7 +43,7 @@ local TARGET_EXEC_NAME = "ebb"
-- Any extra arguments to be prepended to the target program, before any
-- user-supplied arguments. Equivalent to ``argv[1], ...'' in C.
-- (Example: ``--extractbb'')
-local TARGET_PREPEND_ARGS = { "--ebb" }
+local TARGET_PREPEND_ARGS = { "--extractbb" }
-- Any extra arguments to be appended to the target program, after any
-- user-supplied arguments. Equivalent to ``..., argv[argc]'' in C.
@@ -88,9 +84,24 @@ local script_args = arg
----------------------------
-- Error messages
-local function error(message)
- io.stderr:write("! ERROR (extractbb.lua): " .. message, "\n")
+local function error(title, details)
+ -- Header
+ io.stderr:write("! extractbb ERROR: ")
+ io.stderr:write(title)
+ io.stderr:write(".\n\nTechnical Details:\n")
+
+ -- Messages
+ for key, value in pairs(details) do
+ io.stderr:write(tostring(key), ": ")
+ io.stderr:write("(", type(value), ") ")
+ io.stderr:write(tostring(value), "\n")
+ end
+
+ -- Traceback
+ io.stderr:write("\n")
io.stderr:write(debug.traceback(nil, 2), "\n")
+
+ -- Flush and exit
io.stderr:flush()
os.exit(1)
end
@@ -146,11 +157,15 @@ end
-- Make sure that we're running unrestricted.
if status.shell_escape ~= 1 then
- error("Shell escape has been disabled.")
+ error("Shell escape has been disabled", {
+ shell_escape = status.shell_escape,
+ })
end
if status.safer_option ~= 0 then
- error("The ``safer'' option has been enabled.")
+ error("The ``safer'' option has been enabled", {
+ safer_option = status.safer_option,
+ })
end
-- Set the file permissions.
@@ -162,56 +177,33 @@ if WRITE_PERMS then
os.setenv("openout_any", WRITE_PERMS)
end
--- Get the directory of the script and interpreter
-local script_path = debug.getinfo(1, "S").source:sub(2)
-local script_dir, script_name, script_ext = split_path(script_path)
-
-local interpreter_dir = kpse.var_value("SELFAUTOLOC")
+-- Get the location of the interpreter
+local interpreter_dir = os.selfdir or kpse.var_value("SELFAUTOLOC")
local _, interpreter_name, interpreter_ext = split_path(script_args[-1])
-if os.type == 'windows' then
- interpreter_ext = INTERPRETER_EXT
-end
--- Look up the script again with kpathsea
-local resolved_script_path = kpse.find_file(
- script_name .. "." .. (script_ext or SCRIPT_EXT), "texmfscripts", true
-)
-
--- Make sure that our paths are correct
-if not script_dir then
- error("Empty script dir")
-end
-if not resolved_script_path then
- error("Empty resolved script path")
-end
-
-if (script_dir ~= interpreter_dir) and (script_path ~= resolved_script_path) then
- error("The script is in an incorrect location: " .. script_dir)
-end
-
-if script_name ~= SCRIPT_NAME then
- error("Incorrect script name: " .. script_name)
-end
-
-if interpreter_name ~= INTERPRETER_NAME then
- error("Incorrect interpreter name: " .. interpreter_name)
-end
-
-if (script_ext ~= SCRIPT_EXT) and (script_ext ~= nil) then
- error("Incorrect script extension: " .. script_ext)
+if os.type == "windows" then
+ interpreter_ext = INTERPRETER_EXT
end
-if (interpreter_ext ~= INTERPRETER_EXT) and (interpreter_ext ~= nil) then
- error("Incorrect interpreter extension: " .. interpreter_ext)
-end
+-- Error details
+local error_details = {
+ interpreter_dir = interpreter_dir or "<nil>",
+ interpreter_name = interpreter_name or "<nil>",
+ interpreter_ext = interpreter_ext or "<nil>",
+ os_type = os.type or "<nil>",
+ os_name = os.name or "<nil>",
+}
-- Get the path to the target program
local target_ext = interpreter_ext and ("." .. interpreter_ext) or ""
local target_path = interpreter_dir .. "/" .. TARGET_PATH_NAME .. target_ext
+error_details.target_path = target_path or "<nil>"
+error_details.target_ext = target_ext or "<nil>"
+
-- Make sure that the target program exists
if not file_exists(target_path) then
- error("The target program does not exist: " .. target_path)
+ error("The target program does not exist", error_details)
end
@@ -232,7 +224,13 @@ end
for i = 1, #script_args do
-- We use a numeric iterator here to avoid ``arg[-1]'' and ``arg[0]''.
- insert(target_args, script_args[i])
+ local this_arg = script_args[i]
+ insert(target_args, this_arg)
+
+ -- Show version information
+ if this_arg:match("%-version") then
+ print("(Wrapped by extractbb.lua $Revision$.)")
+ end
end
for _, arg in ipairs(TARGET_APPEND_ARGS) do
@@ -242,6 +240,10 @@ end
-- Run the target program, replacing the current process
local _, err = os.exec(target_args)
-if err then
- error("The target program failed to run.")
+-- Unreachable except in the case of a failed exec
+for key, value in ipairs(target_args) do
+ error_details["target_args[" .. key .. "]"] = value
end
+
+error_details.exec_message = err or "<nil>"
+error("The target program failed to run", error_details)
diff --git a/Master/texmf-dist/scripts/typog/typog-grep.pl b/Master/texmf-dist/scripts/typog/typog-grep.pl
index bc7f0e98fbd..a3c7bd1aecb 100755
--- a/Master/texmf-dist/scripts/typog/typog-grep.pl
+++ b/Master/texmf-dist/scripts/typog/typog-grep.pl
@@ -5,6 +5,7 @@ use strict;
use warnings;
use Data::Dumper ();
+use Encode ();
use English;
use File::Basename ();
use Getopt::Long;
@@ -48,32 +49,32 @@ sub limit_string_length {
## We set all colors to `undef' and fill them later with the values
## of the actual configuration.
my $highlight_patterns = {
- PARTIAL_LINE => {
- FONT_SPEC => [qr#
- \\
- (?: OMS | OMX | OT1 | T1 | TS1 | U )
- (?: /[^/]+ ){5} / \S+ \s
- (?: \([+-]\d+\) )?
- #x, undef],
- MATH => [qr#
- \$
- \\
- (?: LMS | OML )
- (?: /[^/]+ ){5} / \S+ \s
- (?: \([+-]\d+\) )?
- .*?
- \$
- #x, undef]
- },
- WHOLE_LINE => {
- FILL_STATE => [qr#^(?:Under|Over)full \\hbox .*$#, undef],
- FIRST_VBOX => [qr#^%%#, undef],
- HORIZONTAL_BREAKPOINT => [qr#^@@\d+:.*$#, undef],
- HORIZONTAL_BREAK_CANDIDATE => [qr#^@[\\ ].*$#, undef],
- LINE_BREAK_PASS => [qr#^@[a-z]+?pass#, undef],
- TIGHTNESS => [qr#^(?:Loose|Tight) \\hbox .*$#, undef],
- VERTICAL_BREAKPOINT => [qr#^% t=\d+.*$#, undef]
- }
+ PARTIAL_LINE => {
+ FONT_SPEC => [qr#
+ \\
+ (?: OMS | OMX | OT1 | T1 | TS1 | U )
+ (?: /[^/]+ ){5} / \S+ \s
+ (?: \([+-]\d+\) )?
+ #x, undef],
+ MATH => [qr#
+ \$
+ \\
+ (?: LMS | OML )
+ (?: /[^/]+ ){5} / \S+ \s
+ (?: \([+-]\d+\) )?
+ .*?
+ \$
+ #x, undef]
+ },
+ WHOLE_LINE => {
+ FILL_STATE => [qr#^(?:Under|Over)full \\hbox .*$#, undef],
+ FIRST_VBOX => [qr#^%%#, undef],
+ HORIZONTAL_BREAKPOINT => [qr#^@@\d+:.*$#, undef],
+ HORIZONTAL_BREAK_CANDIDATE => [qr#^@[\\ ].*$#, undef],
+ LINE_BREAK_PASS => [qr#^@[a-z]+?pass#, undef],
+ TIGHTNESS => [qr#^(?:Loose|Tight) \\hbox .*$#, undef],
+ VERTICAL_BREAKPOINT => [qr#^% t=\d+.*$#, undef]
+ }
};
sub colorize_line {
@@ -84,7 +85,7 @@ sub colorize_line {
return Term::ANSIColor::colored($line, $pattern_color_pair->[1])
if $line =~ $pattern_color_pair->[0];
}
- return $line if $line =~ m#^\.#; # we do not paint box contents yet
+ return $line if $line =~ m#^\.#; # we do not paint box contents yet
$line =~ s#$highlight_patterns->{PARTIAL_LINE}->{MATH}->[0]
#Term::ANSIColor::colored($MATCH, $highlight_patterns->{PARTIAL_LINE}->{MATH}->[1])
@@ -108,13 +109,29 @@ my $open_tag_regexp =
page="(?<page_match> .*?)"
>#x;
+sub find_encoder {
+ my $encoding = shift;
+
+ my $encoder;
+
+ if ($encoding) {
+ $encoder = Encode::find_encoding($encoding);
+ if (!$encoder) {
+ issue_warning("encoding @{[quote_literal($encoding)]} unknown; proceeding without decoder");
+ }
+ }
+
+ return $encoder;
+}
+
sub grep_log_file {
my ($options, $configuration, $file, $filename, $id_regexp) = @_;
+ my $encoder = find_encoder($options->{ENCODING});
my $job_name;
- my $line_number = 0; # line number in the log file we are inspecting, i.e., $filename
+ my $line_number = 0; # line number in the log file we are inspecting, i.e., $filename
my $match_count = 0;
- my $source_line_number; # line number in TeX file the log refers to, i.e., "$job_name.tex"
+ my $source_line_number; # line number in TeX file the log refers to, i.e., "$job_name.tex"
my $page_number;
my $regexp_modifier = $options->{IGNORE_CASE} ? 'i' : '';
my $id_value;
@@ -128,6 +145,8 @@ sub grep_log_file {
chomp $line;
$line_number++;
+ $line = Encode::encode_utf8($encoder->decode($line, Encode::FB_CROAK)) if $encoder;
+
if ($line =~ $close_tag_regexp) {
fail_with_error("$filename: $line_number: mismatched open/close tags") unless @nesting_levels;
pop @nesting_levels;
@@ -209,18 +228,24 @@ sub grep_log_file {
}
}
}
+
+ return $match_count;
}
sub show_ids_in_file {
my ($options, $configuration, $file, $filename, $id_regexp) = @_;
+ my $encoder = find_encoder($options->{ENCODING});
my $line_number = 0;
+ my $match_count = 0;
my @nesting_levels;
while (my $line = readline $file) {
chomp $line;
$line_number++;
+ $line = Encode::encode_utf8($encoder->decode($line, Encode::FB_CROAK)) if $encoder;
+
if ($line =~ $close_tag_regexp) {
fail_with_error("$filename: $line_number: mismatched open/close tags") unless @nesting_levels;
pop @nesting_levels;
@@ -233,6 +258,7 @@ sub show_ids_in_file {
my $page_number = $+{page_match};
++$MATCH_COUNT;
+ ++$match_count;
push @nesting_levels, 1;
if ($options->{LOG_LINE_NUMBER}) {
@@ -272,6 +298,8 @@ sub show_ids_in_file {
print ' ' x $indent, $id_value, "\n";
}
}
+
+ return $match_count;
}
sub open_file_for_reading {
@@ -288,7 +316,7 @@ sub open_file_for_reading {
fail_with_error("cannot open @{[quote_filesystem($filename)]}: $OS_ERROR");
}
- $file;
+ return $file;
}
sub close_file {
@@ -302,15 +330,17 @@ sub grep_or_show {
my ($options, $configuration, $file, $filename, $id_regexp) = @_;
if ($options->{SHOW_ALL_IDS}) {
- show_ids_in_file($options, $configuration, $file, $filename, $id_regexp);
+ return show_ids_in_file($options, $configuration, $file, $filename, $id_regexp);
} else {
- grep_log_file($options, $configuration, $file, $filename, $id_regexp);
+ return grep_log_file($options, $configuration, $file, $filename, $id_regexp);
}
}
sub scan_files {
my ($options, $configuration, $id_regexp, $log_filenames) = @_;
+ my $match_count = 0;
+
if (@$log_filenames) {
foreach my $log_filename (@$log_filenames) {
$log_filename = 'stdin' if $log_filename eq '-';
@@ -323,15 +353,17 @@ sub scan_files {
print $filename_header;
}
my $file = open_file_for_reading($log_filename);
- grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
+ $match_count += grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
close_file($file, $log_filename);
}
} else {
my $log_filename = 'stdin';
my $file = open_file_for_reading($log_filename);
- grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
+ $match_count = grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
close_file($file, $log_filename);
}
+
+ return $match_count;
}
sub redirect_and_scan_files {
@@ -347,10 +379,12 @@ sub redirect_and_scan_files {
my $stdout = select $pager;
$pager->autoflush;
- scan_files($options, $configuration, $id_regexp, $log_filenames);
+ my $match_count = scan_files($options, $configuration, $id_regexp, $log_filenames);
close $pager or issue_warning "error occurred while closing the pager (pid: $pid) pipe: $OS_ERROR";
select $stdout;
+
+ return $match_count;
}
########################################################################
@@ -452,6 +486,7 @@ sub setup_configuation {
my $default_options = {
COLORIZE_MODE => 'auto',
DEBUG => 0,
+ ENCODING => undef,
ID => 0,
IGNORE_CASE => 0,
JOB_NAME => 0,
@@ -472,6 +507,7 @@ Options
--colour [WHEN] use color to highlight specific log contents
WHEN is 'always', 'never', or 'auto'
-C, --config KEY=VALUE set configuration KEY to VALUE
+ -E, --encoding ENCODING set character ENCODING of LOG-FILE
-i, --[no-]id print matching id with output lines
-y, --[no-]ignore-case ignore case distinctions in patterns and data
-j, --[no-]job-name print \\jobname with output lines
@@ -481,10 +517,12 @@ Options
-P, --[no-]pager redirect output to pager
-w, --[no-]word-regexp match only whole words
- -a, --all, --any show all IDs in LOG-FILE
+ -a, --all, --any discover all IDs in LOG-FILE
+
--debug turn on debug output
-h, --help display this help and exit
--show-config show default configuration and exit
+ --show-encodings show all known encodings and exit
-V, --version show version information and exit
HELP_TEXT
@@ -492,6 +530,16 @@ HELP_TEXT
exit 0;
}
+sub show_encodings {
+ my @all_encodings = Encode->encodings(':all');
+
+ foreach my $encoding (@all_encodings) {
+ print "$encoding\n";
+ }
+
+ exit 0;
+}
+
sub show_configuration {
my $format_string_value = sub {quote_literal($default_configuration->{$_[0]})};
@@ -526,10 +574,10 @@ FIXED_CONFIGURATION_TEXT
sub show_version {
print <<VERSION_TEXT;
-typog-grep 0.1
+typog-grep 0.4
Copyright (C) 2024 by Ch. L. Spiel
-License LPPL: LaTeX Project Public License version 1.3 or later
+License LPPL: LaTeX Project Public License version 1.3c or later
VERSION_TEXT
exit 0;
@@ -544,6 +592,7 @@ sub get_options {
'color|colour=s' => \$options->{COLORIZE_MODE},
'C|configuration=s' => sub{setup_configuation($_[1], $configuration)},
'debug+' => \$DEBUG,
+ 'E|encoding=s' => \$options->{ENCODING},
'h|help' => \&show_help,
'i|id!' => \$options->{ID},
'y|ignore-case!' => \$options->{IGNORE_CASE},
@@ -552,13 +601,18 @@ sub get_options {
'N|log-line-number!' => \$options->{LOG_LINE_NUMBER},
'p|page-number!' => \$options->{PAGE_NUMBER},
'P|pager!' => \$options->{REQUEST_PAGER},
+ 'show-encodings' => \&show_encodings,
'show-config' => \&show_configuration,
'V|version' => \&show_version,
'w|word-regexp!' => \$options->{WORD_REGEXP}) or
- fail_with_error('problems while parsing options');
+ fail_with_error('problems while parsing options');
- fail_with_error("unknown colorize mode @{[quote_literal($options->{COLORIZE_MODE})]}")
- unless $options->{COLORIZE_MODE} =~ m/^(?:always|auto|never)$/i
+ if ($options->{COLORIZE_MODE}) {
+ fail_with_error("unknown colorize mode @{[quote_literal($options->{COLORIZE_MODE})]}")
+ unless $options->{COLORIZE_MODE} =~ m/^(?:always|auto|never)$/i;
+ } else {
+ $options->{COLORIZE_MODE} = 'auto';
+ }
}
sub do_colorize {
@@ -579,14 +633,27 @@ sub do_colorize {
sub main {
$OUTPUT_IS_REDIRECTED = -t STDOUT ? 0 : 1;
- my $options = {%$default_options};
my $configuration = {%$default_configuration};
+ my $options = {%$default_options};
+ debug_print(Data::Dumper::Dumper(['Default Configuration', $configuration]));
+ debug_print(Data::Dumper::Dumper(['Default Options', $options]));
+
+ my $user_options = {};
+ my $user_configuration = {};
+ get_options($user_options, $user_configuration);
+ debug_print(Data::Dumper::Dumper(['User Configuration', $user_configuration]));
+ debug_print(Data::Dumper::Dumper(['User Options', $user_options]));
+ while (my ($key, $value) = each %$user_options) {
+ $options->{$key} = $value if $value;
+ }
+ while (my ($key, $value) = each %$user_configuration) {
+ $configuration->{$key} = $value if $value;
+ }
+ debug_print(Data::Dumper::Dumper(['Final Configuration', $configuration]));
+ debug_print(Data::Dumper::Dumper(['Final Options', $options]));
- get_options($options, $configuration);
$options->{COLORIZE_OUTPUT} = do_colorize($options->{COLORIZE_MODE});
initialize_highlighting_from_configuration($configuration);
- debug_print(Data::Dumper::Dumper($configuration));
- debug_print(Data::Dumper::Dumper($options));
my $id_regexp;
if ($options->{SHOW_ALL_IDS}) {
@@ -598,17 +665,18 @@ sub main {
$id_regexp = shift @ARGV;
}
- if ($options->{REQUEST_PAGER} && $OUTPUT_IS_REDIRECTED) {
+ if ($user_options->{REQUEST_PAGER} && $OUTPUT_IS_REDIRECTED) {
issue_warning("option @{[quote_literal('--pager')]} ignored because output is redirected");
}
my $use_pager = $options->{REQUEST_PAGER} && !$OUTPUT_IS_REDIRECTED;
+ my $match_count;
if ($use_pager) {
- redirect_and_scan_files($options, $configuration, $id_regexp, \@ARGV);
+ $match_count = redirect_and_scan_files($options, $configuration, $id_regexp, \@ARGV);
} else {
- scan_files($options, $configuration, $id_regexp, \@ARGV);
+ $match_count = scan_files($options, $configuration, $id_regexp, \@ARGV);
}
- exit ($MATCH_COUNT == 0);
+ exit ($match_count == 0);
}
main();
diff --git a/Master/texmf-dist/source/generic/lt3luabridge/lt3luabridge.dtx b/Master/texmf-dist/source/generic/lt3luabridge/lt3luabridge.dtx
index 67cc73c7387..d8bb7a3beec 100644
--- a/Master/texmf-dist/source/generic/lt3luabridge/lt3luabridge.dtx
+++ b/Master/texmf-dist/source/generic/lt3luabridge/lt3luabridge.dtx
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Released 2024-02-14}
+% \date{Released 2024-07-03}
%
% \maketitle
%
@@ -151,7 +151,7 @@
% \texttt{-output-directory} parameter of the \TeX{} engine.
% \end{variable}
%
-% \begin{variable}[added = 2022-06-26]{\c_luabridge_default_output_dirname_str}
+% \begin{variable}[added = 2022-06-26, updated = 2024-07-03]{\c_luabridge_default_output_dirname_str}
% This constant is the default value of \cs{g_luabridge_output_dirname_str}.
% \end{variable}
%
@@ -261,9 +261,42 @@
=
{ \c_luabridge_method_shell_int }
{
- \str_const:Nn
- \c_luabridge_default_output_dirname_str
- { . }
+% \end{macrocode}
+%
+% Instead of assuming the current working directory as the output directory,
+% try to determine the output directory from the environmental variable
+% \texttt{TEXMF_OUTPUT_DIRECTORY}, which is automatically defined by \TeX{}
+% engines and accessible from child processes.
+%
+% \begin{macrocode}
+ \sys_if_platform_unix:TF
+ {
+ \str_const:Nn
+ \c_luabridge_default_output_dirname_str
+ { $TEXMF_OUTPUT_DIRECTORY }
+ }
+ {
+ \sys_if_platform_windows:TF
+ {
+ \str_set:Nn
+ \l_tmpa_str
+ { TEXMF_OUTPUT_DIRECTORY }
+ \str_put_left:NV
+ \l_tmpa_str
+ \c_percent_str
+ \str_put_right:NV
+ \l_tmpa_str
+ \c_percent_str
+ \str_const:NV
+ \c_luabridge_default_output_dirname_str
+ \l_tmpa_str
+ }
+ {
+ \str_const:Nn
+ \c_luabridge_default_output_dirname_str
+ { . }
+ }
+ }
\str_const:Nx
\c_luabridge_default_helper_script_filename_str
{ \jobname.luabridge.lua }
@@ -358,9 +391,43 @@
\g_luabridge_helper_script_filename_str
\sys_get_shell:xnNTF
{
- texlua~
- \g_luabridge_output_dirname_str /
- \g_luabridge_helper_script_filename_str
+% \end{macrocode}
+%
+% If the environmental variable \texttt{TEXMF_OUTPUT_DIRECTORY} is undefined,
+% use the current working directory (\texttt{.}) instead.
+%
+% \begin{macrocode}
+ \str_if_eq:NNTF
+ \g_luabridge_output_dirname_str
+ \c_luabridge_default_output_dirname_str
+ {
+ \sys_if_platform_windows:TF
+ {
+ if~not~defined~TEXMF_OUTPUT_DIRECTORY~(
+ texlua~
+ \g_luabridge_helper_script_filename_str
+ )~else~(
+ texlua~
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_helper_script_filename_str
+ )
+ }
+ {
+ \sys_if_platform_unix:T
+ {
+ TEXMF_OUTPUT_DIRECTORY =
+ ${TEXMF_OUTPUT_DIRECTORY:-.} \iow_newline:
+ }
+ texlua~
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_helper_script_filename_str
+ }
+ }
+ {
+ texlua~
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_helper_script_filename_str
+ }
}
{ }
#1
@@ -492,8 +559,8 @@
\RequirePackage{expl3}
\ProvidesExplPackage
{lt3luabridge}%
- {2024-02-14}%
- {2.1.0}%
+ {2024-07-03}%
+ {2.2.0}%
{An expl3 package that allows you to execute Lua code in LuaTeX or any other
TeX engine that exposes the shell}
\input lt3luabridge\relax
diff --git a/Master/texmf-dist/source/generic/markdown/docstrip.cfg b/Master/texmf-dist/source/generic/markdown/docstrip.cfg
index 9dc5f652309..959a3a21c3b 100644
--- a/Master/texmf-dist/source/generic/markdown/docstrip.cfg
+++ b/Master/texmf-dist/source/generic/markdown/docstrip.cfg
@@ -22,7 +22,7 @@
-- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE^^J%
-- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.^^J%
--^^J%
--- Copyright (C) 2016-2024 Vít Starý Novotný^^J%
+-- Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur^^J%
--^^J%
-- This work may be distributed and/or modified under the^^J%
-- conditions of the LaTeX Project Public License, either version 1.3^^J%
@@ -62,7 +62,7 @@
\let\luapostamble\empty
\declarepreamble\texpreamble
-Copyright (C) 2016-2024 Vít Starý Novotný
+Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/source/generic/markdown/markdown.dtx b/Master/texmf-dist/source/generic/markdown/markdown.dtx
index 4685ed3ee66..97fa8d6b56f 100644
--- a/Master/texmf-dist/source/generic/markdown/markdown.dtx
+++ b/Master/texmf-dist/source/generic/markdown/markdown.dtx
@@ -122,7 +122,7 @@
---
title: A Markdown Interpreter for \TeX
url: https://github.com/witiko/markdown
-authors: [Vít Starý Novotný]
+authors: [Vít Starý Novotný, Andrej Genčur]
email: witiko@mail.muni.cz
revision: \markdownVersion
date: \markdownLastModified
@@ -796,6 +796,7 @@ abbr {
%<*themes-witiko-markdown-techdoc>
\ProvidesPackage{markdownthemewitiko_markdown_techdoc}[2022/12/13]
\RequirePackage{etoolbox}
+\gdef\ltd@title@author{\@gobble}%
\markdownSetup{
renderers = {
head*Four = {\paragraph{#1}\leavevmode},
@@ -804,6 +805,7 @@ abbr {
codeSpan = {\inline{#1}},
jekyllData(End) = {%
\AfterEndPreamble{%
+ \hypersetup{pdfauthor=\ltd@title@author}%
\printtitlepage
\tableofcontents
{\def\addcontentsline##1##2##3{}\listoffigures}%
@@ -812,8 +814,7 @@ abbr {
},
jekyllDataRenderers = {
/authors/* = {%
- \gdef\ltd@title@author{#1}%
- \hypersetup{pdfauthor={#1}}%
+ \expandafter\gdef\expandafter\ltd@title@author\expandafter{\ltd@title@author, #1}%
},
title = {%
\gdef\ltd@title@title{#1}%
@@ -875,7 +876,7 @@ abbr {
---
title: Markdown Package User Manual
-author: Vít Starý Novotný
+author: Vít Starý Novotný, Andrej Genčur
date: \markdownVersion{} \markdownLastModified{}
---
@@ -890,7 +891,7 @@ Introduction
The [Markdown package][pkg] converts [CommonMark][] markup to \TeX{} commands. The
functionality is provided both as a Lua module and as plain \TeX{}, \LaTeX{}, and
\Hologo{ConTeXt} macro packages that can be used to directly typeset \TeX{} documents
-containing markdown markup. Unlike other convertors, the Markdown package
+containing markdown markup. Unlike other converters, the Markdown package
does not require any external programs, and makes it easy to redefine how each
and every markdown element is rendered. Creative abuse of the markdown
syntax is encouraged. 😉
@@ -928,9 +929,9 @@ documentation][techdoc].
local metadata = {
version = "(((VERSION)))",
comment = "A module for the conversion from markdown to plain TeX",
- author = "John MacFarlane, Hans Hagen, Vít Starý Novotný",
+ author = "John MacFarlane, Hans Hagen, Vít Starý Novotný, Andrej Genčur",
copyright = {"2009-2016 John MacFarlane, Hans Hagen",
- "2016-2023 Vít Starý Novotný"},
+ "2016-2024 Vít Starý Novotný, Andrej Genčur"},
license = "LPPL 1.3c"
}
@@ -1148,6 +1149,17 @@ end)()
%: A package that implements Unicode case-folding in \TeX{} Live${}\geq{}2020$.
%
% \end{markdown}
+% \iffalse
+%</lua>
+%<*depends>
+% \fi
+% \begin{macrocode}
+hard lua-uni-algos
+% \end{macrocode}
+% \iffalse
+%</depends>
+%<*lua>
+% \fi
% \begin{macrocode}
local uni_algos = require("lua-uni-algos")
% \end{macrocode}
@@ -1166,6 +1178,13 @@ local uni_algos = require("lua-uni-algos")
% \end{markdown}
% \iffalse
%</lua>
+%<*depends>
+% \fi
+% \begin{macrocode}
+# hard lua-tinyyaml # TODO: Uncomment after TeX Live 2022 has been deprecated.
+% \end{macrocode}
+% \iffalse
+%</depends>
%<*tex>
% \fi
% \par
@@ -1185,18 +1204,33 @@ local uni_algos = require("lua-uni-algos")
% such as options, renderers, and renderer prototypes.
%
% \end{markdown}
-% \begin{macrocode}
+% \iffalse
%</tex>
+%<*depends>
+% \fi
+% \begin{macrocode}
+hard l3kernel
+% \end{macrocode}
+% \iffalse
+%</depends>
%<*context>
+% \fi
+% \begin{macrocode}
\unprotect
+% \end{macrocode}
+% \iffalse
%</context>
%<*context,tex>
+% \fi
+% \begin{macrocode}
\ifx\ExplSyntaxOn\undefined
\input expl3-generic
\fi
+% \end{macrocode}
+% \iffalse
%</context,tex>
%<*tex>
-% \end{macrocode}
+% \fi
% \begin{markdown}
%
% \pkg{lt3luabridge}
@@ -1205,6 +1239,20 @@ local uni_algos = require("lua-uni-algos")
% with other TeX engines that provide the *shell escape* capability,
% which allows them to execute code with the system's shell.
%
+% \end{markdown}
+% \iffalse
+%</tex>
+%<*depends>
+% \fi
+% \begin{macrocode}
+hard lt3luabridge
+% \end{macrocode}
+% \iffalse
+%</depends>
+%<*tex>
+% \fi
+% \begin{markdown}
+%
% The plain \TeX{} part of the package also requires the following Lua module:
%
% \pkg{Lua File System}
@@ -1249,10 +1297,13 @@ local uni_algos = require("lua-uni-algos")
%<*themes-witiko-dot,latex-themes-witiko-graphicx-http>
% \fi
% \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}%
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{expl3}
% \end{macrocode}
% \iffalse
%</themes-witiko-dot,latex-themes-witiko-graphicx-http>
+%</latex>
+%<*depends>
% \fi
% \begin{markdown}
% a \TeX{} engine that extends \Hologo{eTeX}, and all the plain \TeX{}
@@ -1269,10 +1320,23 @@ local uni_algos = require("lua-uni-algos")
%
%: A package that provides the `\url` macro for the typesetting of links.
%
+% \end{markdown}
+% \begin{macrocode}
+soft url
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{graphicx}
%
%: A package that provides the `\includegraphics` macro for the typesetting
-% of images.
+% of images.Furthermore, it also provides a key-value interface that is
+% used in the default renderer prototypes for image attribute contexts.
+%
+% \end{markdown}
+% \begin{macrocode}
+soft graphics
+% \end{macrocode}
+% \begin{markdown}
%
% \pkg{paralist}
%
@@ -1281,45 +1345,85 @@ local uni_algos = require("lua-uni-algos")
% ordered lists, and definition lists as well as the rendering of
% fancy lists.
%
+% \end{markdown}
+% \begin{macrocode}
+soft paralist
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{ifthen}
%
%: A package that provides a concise syntax for the inspection of macro
% values. It is used in the `witiko/dot` \LaTeX{} theme (see Section
% <#sec:latexthemes>).
%
+% \end{markdown}
+% \begin{macrocode}
+soft latex
+soft epstopdf-pkg # required by `latex`
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{fancyvrb}
%
%: A package that provides the `\VerbatimInput` macros for the verbatim
% inclusion of files containing code.
%
+% \end{markdown}
+% \begin{macrocode}
+soft fancyvrb
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{csvsimple}
%
%: A package that provides the `\csvautotabular` macro for typesetting
% \acro{csv} files in the default renderer prototypes for iA\\,Writer
% content blocks.
%
+% \end{markdown}
+% \begin{macrocode}
+soft csvsimple
+soft pgf # required by `csvsimple`, which loads `pgfkeys.sty`
+soft tools # required by `csvsimple`, which loads `shellesc.sty`
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{gobble}
%
%: A package that provides the `\@gobblethree` \TeX{} command that
% is used in the default renderer prototype for citations. The package
% is included in \TeX Live${}\geq{}2016$.
%
+% \end{markdown}
+% \begin{macrocode}
+soft gobble
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{amsmath} and \pkg{amssymb}
%
%: Packages that provide symbols used for drawing ticked and unticked
% boxes.
%
+% \end{markdown}
+% \begin{macrocode}
+soft amsmath
+soft amsfonts
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{catchfile}
%
%: A package that catches the contents of a file and puts it in a macro. It
% is used in the `witiko/graphicx/http` \LaTeX{} theme, see Section
% <#sec:latexthemes>.
%
-% \pkg{graphicx}
-%
-%: A package that builds upon the \pkg{graphics} package, which is part of
-% the \LaTeXe{} kernel. It provides a key-value interface that is used in
-% the default renderer prototypes for image attribute contexts.
+% \end{markdown}
+% \begin{macrocode}
+soft catchfile
+% \end{macrocode}
+% \begin{markdown}
%
% \pkg{grffile}
%
@@ -1330,6 +1434,12 @@ local uni_algos = require("lua-uni-algos")
% the `witiko/dot` and `witiko/graphicx/http` \LaTeX{} themes, see Section
% <#sec:latexthemes>.
%
+% \end{markdown}
+% \begin{macrocode}
+soft grffile
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{etoolbox}
%
%: A package that is used to polyfill the general hook management system in
@@ -1337,10 +1447,23 @@ local uni_algos = require("lua-uni-algos")
% <#sec:latex-yaml-metadata>, and also in the default renderer prototype
% for identifier attributes.
%
+% \end{markdown}
+% \begin{macrocode}
+soft etoolbox
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{soulutf8}
%
%: A package that is used in the default renderer prototype for
% strike-throughs and marked text.
+% <!-- TODO: 1,$s/soulutf8/soul/g in TeX Live 2023. -->
+%
+% \end{markdown}
+% \begin{macrocode}
+soft soul
+% \end{macrocode}
+% \begin{markdown}
%
% \pkg{ltxcmds}
%
@@ -1348,6 +1471,12 @@ local uni_algos = require("lua-uni-algos")
% \pkg{listings} packages are loaded in the default renderer prototype
% for fenced code blocks.
%
+% \end{markdown}
+% \begin{macrocode}
+soft ltxcmds
+% \end{macrocode}
+% \begin{markdown}
+%
% \pkg{verse}
%
%: A package that is used in the default renderer prototypes for
@@ -1355,10 +1484,13 @@ local uni_algos = require("lua-uni-algos")
%
% \end{markdown}
% \begin{macrocode}
-\RequirePackage{expl3}
+soft verse
% \end{macrocode}
+% \begin{markdown}
+%
+% \end{markdown}
% \iffalse
-%</latex>
+%</depends>
%<*context>
% \fi
% \par
@@ -7237,7 +7369,7 @@ defaultOptions.html = true
: false
: Enable the escaping of special plain \TeX{} characters outside verbatim
- environments, so that they are not interpretted by \TeX{}. This is
+ environments, so that they are not interpreted by \TeX{}. This is
encouraged when typesetting automatically generated content or
markdown documents that were not prepared with this package in mind.
@@ -11322,7 +11454,7 @@ for i = 1, #arg do
end
% \end{macrocode}
% \begin{markdown}
-% The first argument that matches none of the above patters is assumed to be
+% The first argument that matches none of the above patterns is assumed to be
% the input filename. The input filename should correspond to the Markdown
% document that is going to be converted to a \TeX{} document.
% \end{markdown}
@@ -11331,7 +11463,7 @@ for i = 1, #arg do
input_filename = arg[i]
% \end{macrocode}
% \begin{markdown}
-% The first argument that matches none of the above patters is assumed to be
+% The first argument that matches none of the above patterns is assumed to be
% the output filename. The output filename should correspond to the \TeX{}
% document that will result from the conversion.
% \end{markdown}
@@ -11856,47 +11988,10 @@ For more information, see the examples for the \Opt{finalizeCache} option.
%
% \end{markdown}
% \begin{macrocode}
-\cs_generate_variant:Nn
- \@@_add_plain_tex_option:nnn
- { nnV }
-% \end{macrocode}
-% \begin{markdown}
-%
-% Use the \pkg{lt3luabridge} library to determine the default value of the
-% \mref{markdownOptionOutputDir} macro by using the environmental variable
-% `TEXMF_OUTPUT_DIRECTORY` that is available since TeX~Live 2024.
-%
-% \end{markdown}
-% \begin{macrocode}
-\ExplSyntaxOff
-\input lt3luabridge.tex
-\ExplSyntaxOn
-\bool_if:nTF
- {
- \cs_if_exist_p:N
- \luabridge_tl_set:Nn &&
- (
- \int_compare_p:nNn
- { \g_luabridge_method_int }
- =
- { \c_luabridge_method_directlua_int } ||
- \sys_if_shell_unrestricted_p:
- )
- }
- {
- \luabridge_tl_set:Nn
- \l_tmpa_tl
- { print(os.getenv("TEXMF_OUTPUT_DIRECTORY") or ".") }
- }
- {
- \tl_set:Nn
- \l_tmpa_tl
- { . }
- }
-\@@_add_plain_tex_option:nnV
+\@@_add_plain_tex_option:nnn
{ outputDir }
{ path }
- \l_tmpa_tl
+ { . }
% \end{macrocode}
% \iffalse
%</tex>
@@ -12172,22 +12267,73 @@ A PDF document named `document.pdf` should be produced and contain the text
% \end{macrocode}
% \begin{markdown}
%
-% Do not override options defined before loading the package.
+% Use the \pkg{lt3luabridge} library to determine the default value of the
+% \mref{markdownOptionOutputDir} macro by using the environmental variable
+% `TEXMF_OUTPUT_DIRECTORY` that is available since TeX~Live 2024.
%
% \end{markdown}
% \begin{macrocode}
- \@@_option_tl_to_csname:nN
+ \str_if_eq:nnTF
{ #1 }
- \l_tmpa_tl
- \cs_if_exist:cF
- { \l_tmpa_tl }
+ { outputDir }
+ { \@@_define_option_command_output_dir: }
{
- \@@_get_default_option_value:nN
- { #1 }
- \l_tmpa_tl
- \@@_set_option_value:nV
+% \end{macrocode}
+% \begin{markdown}
+%
+% Do not override options defined before loading the package.
+%
+% \end{markdown}
+% \begin{macrocode}
+ \@@_option_tl_to_csname:nN
{ #1 }
\l_tmpa_tl
+ \cs_if_exist:cF
+ { \l_tmpa_tl }
+ {
+ \@@_get_default_option_value:nN
+ { #1 }
+ \l_tmpa_tl
+ \@@_set_option_value:nV
+ { #1 }
+ \l_tmpa_tl
+ }
+ }
+ }
+\ExplSyntaxOff
+\input lt3luabridge.tex
+\ExplSyntaxOn
+\cs_new:Nn
+ \@@_define_option_command_output_dir:
+ {
+ \cs_if_free:NT
+ \markdownOptionOutputDir
+ {
+ \bool_if:nTF
+ {
+ \cs_if_exist_p:N
+ \luabridge_tl_set:Nn &&
+ (
+ \int_compare_p:nNn
+ { \g_luabridge_method_int }
+ =
+ { \c_luabridge_method_directlua_int } ||
+ \sys_if_shell_unrestricted_p:
+ )
+ }
+ {
+ \luabridge_tl_set:Nn
+ \l_tmpa_tl
+ { print(os.getenv("TEXMF_OUTPUT_DIRECTORY") or ".") }
+ \tl_gset:NV
+ \markdownOptionOutputDir
+ \l_tmpa_tl
+ }
+ {
+ \tl_gset:Nn
+ \markdownOptionOutputDir
+ { . }
+ }
}
}
\cs_new:Nn
@@ -14039,7 +14185,7 @@ following text:
#### Code Block Renderers
The \mdef{markdownRendererInputVerbatim} macro represents a code
block. The macro receives a single argument that corresponds to the
-filename of a file contaning the code block contents.
+filename of a file containing the code block contents.
% \end{markdown}
%
@@ -14073,7 +14219,7 @@ filename of a file contaning the code block contents.
The \mdef{markdownRendererInputFencedCode} macro represents a fenced code
block. This macro will only be produced, when the \Opt{fencedCode} option is
enabled. The macro receives three arguments that correspond to the filename of
-a file contaning the code block contents, the fully escaped code fence infostring
+a file containing the code block contents, the fully escaped code fence infostring
that can be directly typeset, and the raw code fence infostring that can be used
outside typesetting.
@@ -15289,7 +15435,7 @@ following text:
% \begin{markdown}
#### Ellipsis Renderer
-The \mdef{markdownRendererEllipsis} macro replaces any occurance of ASCII
+The \mdef{markdownRendererEllipsis} macro replaces any occurrence of ASCII
ellipses in the input text. This macro will only be produced, when the
\Opt{smartEllipses} option is enabled. The macro receives no arguments.
@@ -18435,7 +18581,7 @@ following text:
#### Raw Content Renderers
The \mdef{markdownRendererInputRawInline} macro represents an inline raw span.
-The macro receives two arguments: the filename of a file contaning the inline
+The macro receives two arguments: the filename of a file containing the inline
raw span contents and the raw attribute that designates the format of the
inline raw span. This macro will only be produced, when the \Opt{rawAttribute}
option is enabled.
@@ -18470,7 +18616,7 @@ option is enabled.
% \begin{markdown}
The \mdef{markdownRendererInputRawBlock} macro represents a raw block. The
-macro receives two arguments: the filename of a file contaning the raw block
+macro receives two arguments: the filename of a file containing the raw block
and the raw attribute that designates the format of the raw block. This macro
will only be produced, when the \Opt{rawAttribute} and \Opt{fencedCode} options
are enabled.
@@ -19368,7 +19514,7 @@ following content:
\markdownSetup{
renderers = {
table = {%
- This is a table with caption \emph{#1} that is #3 colums wide
+ This is a table with caption \emph{#1} that is #3 columns wide
and #2 rows long.
\rowCounter=0%
\def\rowTotal{#2}%
@@ -19397,7 +19543,7 @@ A PDF document named `document.pdf` should be produced and contain the
following text:
> This is a table with caption *Demonstration of pipe table syntax* that is 4
-> colums wide and 4 rows long. As for the alignment, column number 1 is
+> columns wide and 4 rows long. As for the alignment, column number 1 is
> right-aligned, column number 2 is left-aligned, column number 3 has default
> alignment, and column number 4 is centered. In row 1, column number 1 says
> *Right*, column number 2 says *Left*, column number 3 says *Default*, and
@@ -20256,7 +20402,7 @@ following text:
%#### Generating Plain \TeX{} Token Renderer Macros and Key-Values {#plain-tex-renderers}
%
% We define the command \mdef{@@_define_renderers:} that defines plain \TeX{}
-% macros for token renderers. Futhermore, the `\markdownSetup` macro also accepts
+% macros for token renderers. Furthermore, the `\markdownSetup` macro also accepts
% the `renderers` key, whose value must be a list of key-values, where the keys
% correspond to the markdown token renderer macros and the values are new
% definitions of these token renderers.
@@ -20974,7 +21120,7 @@ following text:
%#### Generating Plain \TeX{} Token Renderer Prototype Macros and Key-Values {#plain-tex-renderer-prototypes}
%
% We define the command \mdef{@@_define_renderer_prototypes:} that defines plain \TeX{}
-% macros for token renderer prototypes. Futhermore, the `\markdownSetup` macro also accepts
+% macros for token renderer prototypes. Furthermore, the `\markdownSetup` macro also accepts
% the `rendererPrototype` key, whose value must be a list of key-values, where the keys
% correspond to the markdown token renderer prototype macros and the values are new
% definitions of these token renderer prototypes.
@@ -21600,7 +21746,7 @@ following code in our \LaTeX{} document:
We can also set all plain \TeX{} options directly from \LaTeX{}. For example,
to set the `\markdownOptionInputTempFileName` plain \TeX{} option to
-`helper-script.lua`, we would inclde the following code in our \LaTeX{}
+`helper-script.lua`, we would include the following code in our \LaTeX{}
document:
``` tex
@@ -22559,7 +22705,7 @@ end
% Given a table `char_escapes` mapping escapable characters to escaped
% strings and optionally a table `string_escapes` mapping escapable strings
% to escaped strings, the \luamdef{util.escaper} method returns an escaper
-% function that escapes all occurances of escapable strings and characters (in
+% function that escapes all occurrences of escapable strings and characters (in
% this order).
%
% The method uses \pkg{LPeg}, which is faster than the Lua `string.gsub`
@@ -22588,7 +22734,7 @@ function util.escaper(char_escapes, string_escapes)
% \begin{markdown}
% If `string_escapes` is provided, turn `escapable` into the
% $$\sum^^B{(`k`, `v`)\in`string_escapes`}`P(k) / v` + `escapable`$$
-% capture that replaces any occurance of the string `k` with the string
+% capture that replaces any occurrence of the string `k` with the string
% `v` for each $(`k`, `v`)\in`string_escapes`$. Note that the pattern
% summation is not commutative and its operands are inspected in the
% summation order during the matching. As a corrolary, the strings always
@@ -28687,7 +28833,7 @@ function M.reader.new(writer, options)
+ #parsers.link_text
* Cg(Cc("link_text"), "link_type")
- parsers.note_opening = #(parsers.circumflex * parsers.shortcut_link)
+ parsers.note_opening = #(parsers.circumflex * parsers.link_text)
* Cg(Cc("note_inline"), "link_type")
parsers.raw_note_opening = #( parsers.lbracket
@@ -29137,9 +29283,10 @@ function M.reader.new(writer, options)
end
for i,value in ipairs(t) do
- if not value.is_closing or
- value.type ~= "delimiter" or
- not (value.element == "link" or value.element == "image" or value.element == "note") then
+ if not value.is_closing
+ or value.type ~= "delimiter"
+ or not (value.element == "link" or value.element == "image" or value.element == "note")
+ or value.removed then
goto continue
end
@@ -30446,7 +30593,7 @@ M.extensions.citations = function(citation_nbsps)
)
* citation_name
* (parsers.internal_punctuation - parsers.semicolon)^-1
- * ( parsers.spnlc
+ * ( parsers.spnlc / function(_) return end
* citation_body_postnote
+ Cc("")
* parsers.spnlc
@@ -33217,7 +33364,7 @@ end
%### Themes {#themes-implementation}
%
% This section implements the theme-loading mechanism and the built-in themes
-% provided with the Markdown package. Futhermore, this section also implements
+% provided with the Markdown package. Furthermore, this section also implements
% the built-in plain \TeX{} themes provided with the Markdown package.
%
% \end{markdown}
@@ -34161,6 +34308,9 @@ end
}
}
}
+ \str_gset:NV
+ \g_luabridge_output_dirname_str
+ \markdownOptionOutputDir
\luabridge_now:e
{ #1 }
}
@@ -34456,7 +34606,7 @@ end
% \LaTeX{} Implementation {#lateximplementation}
%-------------------------
%
-% The \LaTeX{} implemenation makes use of the fact that, apart from some subtle
+% The \LaTeX{} implementation makes use of the fact that, apart from some subtle
% differences, \LaTeX{} implements the majority of the plain \TeX{}
% format~[@latex17, Section 9]. As a consequence, we can directly reuse the
% existing plain \TeX{} implementation.
@@ -34685,7 +34835,7 @@ end
%### Themes {#latex-themes-implementation}
%
% This section overrides the plain \TeX{} implementation of the theme-loading
-% mechanism from Section <#sec:themes-implementation>. Futhermore, this section
+% mechanism from Section <#sec:themes-implementation>. Furthermore, this section
% also implements the built-in \LaTeX{} themes provided with the Markdown package.
%
% \end{markdown}
@@ -36412,7 +36562,7 @@ end
%### Themes {#context-themes-implementation}
%
% This section overrides the plain \TeX{} implementation of the theme-loading
-% mechanism from Section <#sec:themes-implementation>. Futhermore, this section
+% mechanism from Section <#sec:themes-implementation>. Furthermore, this section
% also implements the built-in \Hologo{ConTeXt} themes provided with the
% Markdown package.
%
diff --git a/Master/texmf-dist/source/generic/markdown/markdown.ins b/Master/texmf-dist/source/generic/markdown/markdown.ins
index 8e777f4217c..4261ddfdd44 100644
--- a/Master/texmf-dist/source/generic/markdown/markdown.ins
+++ b/Master/texmf-dist/source/generic/markdown/markdown.ins
@@ -25,5 +25,6 @@
\file{markdown.css}{\from{markdown.dtx}{manual-css}}
\file{markdown-figure-block-diagram.tex}{\from{markdown.dtx}{techdoc-block-diagram}}
\file{markdown.bib}{\from{markdown.dtx}{techdoc-bibliography}}
+ \file{DEPENDS.txt}{\from{markdown.dtx}{depends}}
}
\endbatchfile
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 958b14b4794..6bf8ba7fcef 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,13 @@
+2024-07-06 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-html4.tex (html4.4ht): added itemize+ option. It will keep
+ original characters for itemize bullets.
+ https://tex.stackexchange.com/a/722062/2891
+
+2024-07-03 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (fontawesome5.4ht): use icon name as the alt text.
+
2024-06-21 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (arydshln.4ht): fixed clash between Colortbl and
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 16387851fd8..f3617f37572 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1535 2024-06-23 20:28:31Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1536 2024-07-03 12:08:13Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2024 TeX Users Group
@@ -4265,18 +4265,19 @@ icons to pictures by TeX4ht conversion.
\<fontawesome5.4ht\><<<
% fontawesome5.4ht (|version), generated from |jobname.tex
-% Copyright 2021 TeX Users Group
+% Copyright 2021-2024 TeX Users Group
|<TeX4ht license text|>
\NewConfigure{fontawesome}{2}
\ExplSyntaxOn
\cs_new_protected:Nn\temp:nn{%
+\def\:fontawesomeicon{#2}% to be used in the alt text
\a:fontawesome%
\o:fontawesome_use_icon:nn:{#1}{#2}
\b:fontawesome}
\HLet\fontawesome_use_icon:nn\temp:nn
\ExplSyntaxOff
-\Configure{fontawesome}{\Picture+{}}{\EndPicture}
+\Configure{fontawesome}{\Picture+[icon: \:fontawesomeicon]{}}{\EndPicture}
\Hinput{fontawesome5}
\endinput
>>> \AddFile{9}{fontawesome5}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex
index 35276909217..c15155fcc57 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-cpright.tex
@@ -4,14 +4,14 @@
% conditions of the LaTeX Project Public License, either
% version 1.3c of this license or (at your option) any
% later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
+% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions
% of LaTeX version 2005/12/01 or later.
%
% This work has the LPPL maintenance status "maintained".
%
% The Current Maintainer of this work
-% is the TeX4ht Project <http://tug.org/tex4ht>.
+% is the TeX4ht Project <https://tug.org/tex4ht>.
%
% If you modify this program, changing the
% version identification would be appreciated.>>>
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index eb45f6f2ac9..13bf280c884 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1533 2024-06-21 13:38:57Z michal_h21 $
+% $Id: tex4ht-html4.tex 1537 2024-07-06 19:48:42Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -2950,6 +2950,22 @@ such a case, we don't have proper nestings of environments.
\EndP\HCode{</li></ul>}\ShowPar}
{\end:itm \global\def\end:itm{\EndP\Tg</li>}\DeleteMark}
{\HCode{<li class="\getClass{li}itemize">}\afterGetClass{li}|<list par|>}
+
+\:CheckOption{itemize+}\if:Option
+\ConfigureList{itemize}%
+ {\EndP\HCode{<ul \a:LRdir
+ class="\getClass{itemize}itemize\expandafter\the
+ \csname @itemdepth\endcsname">}%
+ \afterGetClass{itemize}%
+ |<save end:itm|>\global\let\end:itm=\empty}
+ {|<recall end:itm|>\ifvmode \IgnorePar\fi
+ \EndP\HCode{</li></ul>}\ShowPar}
+ {\end:itm \global\def\end:itm{\EndP\Tg</li>}\HCode{<li class="\getClass{li}itemize"><span class="itemizeHead" aria-hidden="true">}\afterGetClass{li}}
+ {\HCode{</span>}|<list par|>}
+\Css{.itemizeHead{float: left; margin-left: -1em; width: 1em;}}
+\Css{li.itemize{list-style: none;}}
+\fi
+
\NewConfigure{itemizeClass}{2}
\Configure{itemizeClass}{}{}
\NewConfigure{liClass}{2}
diff --git a/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-article.dtx b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-article.dtx
index 9376ddbbf3e..cab40dfb504 100644
--- a/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-article.dtx
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-article.dtx
@@ -3,7 +3,7 @@
% Article class for The Canadian Journal of Statistics | La revue
% canadienne de statistique
%
-% Copyright (C) Statistical Society of Canada | Société
+% Copyright (C) 2023-2024 Statistical Society of Canada | Société
% canadienne de statistique
%
% The class file and templates derived from this file are licenced
@@ -25,10 +25,10 @@
%<*driver>
\ProvidesFile{cjs-rcs-article.dtx}
%</driver>
-%<class>\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+%<class>\NeedsTeXFormat{LaTeX2e}[2021/06/01]
%<class>\ProvidesClass{cjs-rcs-article}%
%<*class>
- [2023/11/29 v1.0 Article class for The Canadian Journal of
+[2024/07/14 v1.1 Article class for The Canadian Journal of
Statistics | La revue canadienne de statistique]
%</class>
%<*driver>
@@ -122,6 +122,10 @@
\OnlyDescription
\fi
+ %% Additional colors
+ \colorlet{codebg}{LightYellow1} % code background
+ \colorlet{prompt}{Orchid4} % command prompt
+
%% New \DescribeMacro type environments for class options and lengths
\NewDocElement[envlike,notoplevel,printtype=\emph{option}]{Option}{option}
\NewDocElement[macrolike,notoplevel,printtype=$\ell$]{Length}{length}
@@ -139,9 +143,12 @@
\newcommand*\CJSbstfr{\code{cjs-rcs-fr}}
\makeatother
+ %% URL of the project repository
+ \newcommand*\reposurl{https://gitlab.com/cjs-rcs/cjs-rcs-article}
+
%% Redefine \year using information from \filedate instead of using
%% compilation time
- \def\parsedate#1/#2/#3\relax{\def\year{#1}}
+ \def\parsedate#1/#2/#3\relax{\def\year{#1}\def\isodate{#1-#2-#3}}
%% Definition of a shorthand to either hyphenate a word or insert a
%% regular dash. Use in the long names of Creative Commons licences.
@@ -149,6 +156,26 @@
\useshorthands*{"}
\defineshorthand{"-}{\discretionary{-}{}{-}}
+ %% Source code
+ \usepackage{listings}
+ \lstset{%
+ basicstyle=\ttfamily\NoAutoSpacing,
+ moredelim=[is][\color{prompt}]{---}{-},
+ escapeinside=`',
+ showstringspaces=false,
+ backgroundcolor=\color{codebg},
+ frame=leftline,
+ framerule=2pt,
+ framesep=5pt,
+ xleftmargin=7.4pt
+ }
+
+ %% The \meta command from memoir needs an additionnel \normalfont to
+ %% use the document font in listings.
+ \makeatletter
+ \def\meta@font@select{\normalfont\itshape}
+ \makeatother
+
\begin{document}
\DocInput{cjs-rcs-article.dtx}
\end{document}
@@ -257,6 +284,18 @@
% CTAN.}
% \changes{1.0}{2023-11-29}{Fix various typos and cosmetic issues in
% the documentation.}
+% \changes{1.1}{2024-06-26}{Provide support to acknowledge usage of
+% data from the Alzheimer’s Disease Neuroimaging Initiative (ADNI) and
+% the Alzheimer’s Disease Neuroimaging Metabolomics Consortium
+% (ADMC).}
+% \changes{1.1}{2024-06-26}{Introduce new commands \cs{specialack} and
+% \cs{specialackmark} for the editors.}
+% \changes{1.1}{2024-06-23}{Improve the documentation, in particular
+% the installation instructions and access to the templates.}
+% \changes{1.1}{2024-07-02}{Add the References section to the table of
+% contents of the PDF.}
+% \changes{1.1}{2024-07-13}{Add the command \cs{matit} to typeset bold
+% italic in math in a portable way.}
%
% \ifenglish%
% \title[Guide to the class {\CJSclass}]{%
@@ -353,11 +392,9 @@
% {\CJSclass} requiert une distribution {\TeX} récente et
% à jour. Nous recommandons les distributions %
% \fi
-% \href{https://tug.org/texlive}{{\TeX}~Live} %
-% --- %
+% \href{https://tug.org/texlive}{{\TeX}~Live}\ifenglish---\else~--- \fi%
% \ifenglish or its variant for macOS \else ou sa variante pour macOS \fi%
-% \href{https://tug.org/mactex}{Mac{\TeX}} %
-% --- %
+% \href{https://tug.org/mactex}{Mac{\TeX}}\ifenglish---\else~--- \fi%
% \ifenglish and \else et \fi%
% \href{https://miktex.org}{MiK{\TeX}}. %
% \ifenglish%
@@ -425,17 +462,28 @@
% \section{Démarrage rapide}
% \fi
% \label{sec:quick-start}
+% \changes{1.1}{2024-06-05}{Documentation: add a link to obtain the
+% templates in the \emph{Quick start} section.}
%
% \ifenglish%
% The class ships with templates for articles in English and in
% French. In {\TeX}~Live, these are located with the
-% documentation of the class. To quickly start writing your article,
-% copy the appropriate template to your working directory and follow
-% the brief instructions therein. %
+% documentation of the class. You may also obtain the templates from
+% the %
% \else%
% La classe est livrée avec des gabarits pour des articles en français
% et en anglais. Dans la distribution {\TeX}~Live, ceux-ci sont
-% classés avec la documentation. Pour débuter rapidement la rédaction
+% classés avec la documentation. Vous pouvez aussi les récupérer
+% depuis le %
+% \fi%
+% \href{\reposurl/-/releases/\fileversion}{%
+% \ifenglish project repository\else dépôt du projet\fi}. %
+% \ifenglish%
+% To quickly start writing your article, copy the appropriate template
+% to your working directory and follow the brief instructions
+% therein. %
+% \else%
+% Pour débuter rapidement la rédaction
% de votre article, copiez le gabarit approprié dans votre dossier de
% travail et suivez les directives succinctes qui s'y trouvent. %
% \fi
@@ -490,6 +538,9 @@
% \changes{0.91}{2023-10-16}{Change the name of the archive containing
% a ``local'' installation of the class from
% \texttt{-no-local-tex.zip} to \texttt{-project-install.zip}.}
+% \changes{1.1}{2024-06-05}{Documentation: provide a direct link to
+% the release corresponding to the version of the documentation in the
+% \emph{Installation} section.}
%
% \ifenglish%
% The class {\CJSclass} is distributed as the package %
@@ -507,21 +558,33 @@
% the command line: %
% \else%
% via le réseau de sites \emph{Comprehensive {\TeX} Archive Network}
-% (CTAN). Elle fait partie des distributions {\TeX} standards telles
-% que {TeX}~Live, Mac{\TeX} et MiK{\TeX}. Nous recommandons fortement
-% d'installer ou de mettre à jour le paquetage à l'aide du
+% (CTAN). Celui-ci fait partie des distributions {\TeX} standards
+% telles que {TeX}~Live, Mac{\TeX} et MiK{\TeX}. Nous recommandons
+% fortement d'installer ou de mettre à jour le paquetage à l'aide du
% gestionnaire de paquetages de votre distribution {\TeX}. Par
-% exemple, avec {\TeX}~Live, vous pouvez effectuer ces opérations dans
-% l'assistant graphique, ou encore avec l'une ou l'autre des commandes
-% ci-dessous: %
+% exemple, avec {\TeX}~Live, vous pouvez effectuer ces opérations
+% dans l'assistant graphique, ou encore avec l'une ou l'autre des
+% commandes ci-dessous: %
+% \fi
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+---$- tlmgr install cjs-rcs-article
+\end{lstlisting}
+% \iffalse
+%</example>
% \fi
-% \begin{quote}
-% \code{tlmgr install cjs-rcs-article}
-% \end{quote}
% \ifenglish or\else ou\fi
-% \begin{quote}
-% \code{tlmgr update cjs-rcs-article}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+---$- tlmgr update cjs-rcs-article
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
%
% \ifenglish%
% If you are not in position to install packages or update the {\TeX}
@@ -530,23 +593,23 @@
% limited in scope to your project. Download the archive %
% \else%
% S'il vous est impossible d'installer des paquetages ou de mettre à
-% jour la distribution {\TeX} --- notamment si vous utilisez une
-% plateforme de rédaction en ligne --- vous pouvez procéder à une
+% jour la distribution {\TeX}~--- notamment si vous utilisez une
+% plateforme de rédaction en ligne~--- vous pouvez procéder à une
% installation simplifiée de la classe, mais dont la portée sera
% limitée à votre projet. Pour ce faire, téléchargez l'archive %
% \fi%
% \code{cjs-rcs-article-project-install.zip} %
% \ifenglish from the \else depuis le \fi%
-% \href{https://gitlab.com/cjs-rcs/cjs-rcs-article/-/releases}{%
-% \ifenglish project repository\else dépôt du projet\fi} %
+% \href{\reposurl/-/releases/\fileversion}{%
+% \ifenglish project repository\else dépôt du projet\fi}, %
% \ifenglish%
-% and uncompress it in the directory of your project. You will then
-% have access to all the essential files of the class within this
-% project. %
+% uncompress it and place its contents in the directory of your
+% project. You will then have access to all the essential files of the
+% class within this project. %
% \else%
-% et décompressez celle-ci dans le répertoire de votre projet. Vous
-% disposerez alors de tous les fichiers essentiels de la classe à
-% l'intérieur de ce projet. %
+% décompressez celle-ci et placez son contenu dans le répertoire de
+% votre projet. Vous disposerez alorsà l'intérieur de ce projet de
+% tous les fichiers essentiels de la classe. %
% \fi
%
% \ifenglish%
@@ -631,7 +694,7 @@
% {pdf\LaTeX} utilise les versions Type~1 des polices STIX~Two et
% Fira. Or, la technologie Type~1 PostScript étant aujourd'hui
% obsolète, ces polices ne sont plus mises à jour. Le moteur
-% {\XeLaTeX} utilise les plus modernes --- et complètes --- versions
+% {\XeLaTeX} utilise les plus modernes~--- et complètes~--- versions
% OpenType des polices.}, %
% nous recommandons de compiler votre manuscript avec le plus moderne
% moteur {\XeLaTeX}. %
@@ -643,24 +706,34 @@
% \subsection{Gabarits}
% \fi
% \label{sec:usage:templates}
+% \changes{1.1}{2024-06-05}{Documentation: add a link to the templates
+% in the \emph{Templates} sub-section.}
%
% \ifenglish%
% The class is distributed with templates for articles in English
% and in French. If you are using the version of the class included
% with your {\TeX} distribution, the templates may be located with the
-% documentation (this is the case in {\TeX}~Live). If you installed
-% the class manually by following the instructions in
-% \autoref{sec:installation}, the templates reside in your working
-% directory. %
+% documentation (this is the case in {\TeX}~Live). You may also obtain
+% them from the %
% \else
% La classe est distribuée avec des gabarits pour des articles en français
% et en anglais. Si vous utilisez la version de la classe fournie avec
% votre distribution {\TeX}, les gabarits peuvent être classés avec
-% la documentation (c'est le cas dans {\TeX}~Live). Si vous avez
+% la documentation (c'est le cas dans {\TeX}~Live). Vous pouvez aussi
+% les récupérer depuis le %
+% \fi
+% \href{\reposurl/-/releases/\fileversion}{%
+% \ifenglish project repository\else dépôt du projet\fi}. %%
+% \ifenglish
+% If you installed the class manually by following the instructions in
+% \autoref{sec:installation}, the templates reside in your working
+% directory. %
+% \else%
+% Si vous avez
% plutôt installé la classe manuellement en suivant les instructions
% de la \autoref{sec:installation}, les gabarits se trouvent dans
% votre dossier de travail. %
-% \fi
+% \fi%
%
% \ifenglish%
% We strongly encourage to start from a template to write your
@@ -705,13 +778,19 @@
% \label{sec:usage:options}
%
% \ifenglish%
-% The class is loaded with the command %
+% The class is loaded with the command: %
% \else%
-% On charge la classe avec la commande %
+% On charge la classe avec la commande: %
+% \fi
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\documentclass`\oarg{options}\marg{cjs-rcs-article}'
+\end{lstlisting}
+% \iffalse
+%</example>
% \fi
-% \begin{quote}
-% \cmdprint{\documentclass}\oarg{options}\code{\{cjs-rcs-article\}}
-% \end{quote}
% \ifenglish%
% Some \meta{options} of the class are intended for the authors,
% whereas others are instead intended for the editors of {\TheCJS*}.
@@ -931,22 +1010,28 @@
% du titre qui sera utilisée dans les entêtes. La syntaxe de la
% commande est donc: %
% \fi
-% \begin{quote}
-% \def\OPT{\ifenglish Short title\else Titre court\fi}
-% \def\ARG{\ifenglish Full title\else Titre complet\fi}
-% \cmdprint{\title}\oarg{\OPT}\marg{\ARG}
-% \end{quote}
-% \ifenglish%
-% Write the title in sentence style, that is, with only an initial
-% capital. In English, also capitalize the first word after a colon.
-% Break a long title needing more than one line using \code{\bs\bs}
-% or \cmdprint{\newline}. %
-% \else%
-% Entrez le titre en minuscules (sauf pour la majuscule initiale).
-% En anglais, utilisez toutefois une majuscule initiale après un
-% deux-points. Vous devez couper manuellement avec \code{\bs\bs} ou
-% \cmdprint{\newline} un titre qui nécessite plus d'une ligne.
-% \fi
+% \iffalse
+%<*example>
+% \fi
+\def\OPT{\ifenglish Short title\else Titre court\fi}
+\def\ARG{\ifenglish Full title\else Titre complet\fi}
+\begin{lstlisting}
+\title`\oarg{\OPT}\marg{\ARG}'
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
+% \ifenglish%
+% Write the title in sentence style, that is, with only an initial
+% capital. In English, also capitalize the first word after a colon.
+% Break a long title needing more than one line using \code{\bs\bs}
+% or \cmdprint{\newline}. %
+% \else%
+% Entrez le titre en minuscules (sauf pour la majuscule initiale).
+% En anglais, utilisez toutefois une majuscule initiale après un
+% deux-points. Vous devez couper manuellement avec \code{\bs\bs} ou
+% \cmdprint{\newline} un titre qui nécessite plus d'une ligne.
+% \fi
% \end{DescribeMacro}
%
% \ifenglish%
@@ -994,11 +1079,17 @@
% informations relatives à un auteur de l'article. Sa syntaxe
% générale est la suivante: %
% \fi
-% \begin{quote}
-% \def\FORENAME{\ifenglish Forename\else Prénom\fi}
-% \def\SURNAME{\ifenglish Surname\else Nom\fi}
-% \cmdprint{\author}\oarg{options}\code{\{}\meta{\FORENAME}\code{ }\cmdprint{\surname}\marg{\SURNAME}\code{\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\def\FORENAME{\ifenglish Forename\else Prénom\fi}
+\def\SURNAME{\ifenglish Surname\else Nom\fi}
+\begin{lstlisting}
+\author`\oarg{options}'{`\meta{\FORENAME}' \surname`\marg{\SURNAME}'}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \ifenglish%
% The \meta{Surname} must be entered using the command
% \cmd{\surname}. Write the \meta{Forename} and \meta{Surname} in
@@ -1113,15 +1204,27 @@
% \def\FORENAME{\ifenglish Forename\else Prénom\fi}
% \def\SURNAME{\ifenglish Surname\else Nom\fi}
% \item \ifenglish For the corresponding author\else Pour l'auteur correspondant\fi:
-% \begin{quote}
-% \cmdprint{\author}\code{[orcid=}\meta{id}\code{, email=}\meta{\EMAIL}\code{, corresponding]} \\
-% \verb+ +\code{\{}\meta{\FORENAME}\code{ }\cmdprint{\surname}\marg{\SURNAME}\code{\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\author[orcid=`\meta{id}', email=`\meta{\EMAIL}', corresponding]
+ {`\meta{\FORENAME}' \surname`\marg{\SURNAME}'}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \item \ifenglish For all other authors\else Pour tous les autres auteurs\fi:
-% \begin{quote}
-% \cmdprint{\author}\code{[orcid=}\meta{id}\code{, email=}\meta{\EMAIL}\code{]} \\
-% \verb+ +\code{\{}\meta{\FORENAME}\code{ }\cmdprint{\surname}\marg{\SURNAME}\code{\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\author[orcid=`\meta{id}', email=`\meta{\EMAIL}']
+ {`\meta{\FORENAME}' \surname`\marg{\SURNAME}'}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \end{itemize}
% \end{DescribeMacro}
% \end{DescribeMacro}
@@ -1136,11 +1239,17 @@
% mentionné dans la commande \cmd{\author} qui la précède. La forme
% générale de l'affiliation est: %
% \fi
-% \begin{quote}
-% \def\AFFIL{\ifenglish Department, University, City, Country\else%
-% Département, Université, Ville, Pays\fi}
-% \cmd{\affil}\marg{\AFFIL}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\def\AFFIL{\ifenglish Department, University, City, Country\else%
+ Département, Université, Ville, Pays\fi}
+\begin{lstlisting}
+\affil`\marg{\AFFIL}'
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \ifenglish%
% Give the country name in the main language of the article. %
% \else%
@@ -1164,13 +1273,19 @@
% premier auteur suivi de la locution «et collab.» (en français) ou
% «et al.» (en anglais): %
% \fi
-% \begin{quote}
-% \def\SURNAME{\ifenglish Surname\else Nom\fi}
-% \def\ETAL{\ifenglish et al.\else et collab.\fi}
-% \def\ETCOLLAB{\ifenglish et collab.\else et al.\fi}
-% \cmdprint{\runningauthor}\code{\{}\meta{\SURNAME}\code{ \ETAL\}} \\
-% \cmdprint{\runningauthor}\code{\{}\meta{\SURNAME}\code{ \ETCOLLAB\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\def\SURNAME{\ifenglish Surname\else Nom\fi}
+\def\ETAL{\ifenglish et al.\else et collab.\fi}
+\def\ETCOLLAB{\ifenglish et collab.\else et al.\fi}
+\begin{lstlisting}
+\runningauthor{`\meta{\SURNAME} \ETAL'}
+\runningauthor{`\meta{\SURNAME} \ETCOLLAB'}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \end{DescribeMacro}
%
% \ifenglish%
@@ -1224,16 +1339,22 @@
% mots-clés de l'article. Il s'utilise comme une liste
% \code{itemize} ou \code{enumerate}: %
% \fi
-% \begin{quote}
-% \def\KEYWORDC{\ifenglish Key word\else Mot-clé\fi}
-% \def\KEYWORD{\ifenglish key word\else mot-clé\fi}
-% \cmdprint{\begin}\code{\{keywords\}} \\
-% \cmdprint{\item} \emph{{\KEYWORDC} 1} \\
-% \cmdprint{\item} \emph{{\KEYWORD} 2} \\
-% \cmdprint{\item} \emph{{\KEYWORD} 3} \\
-% \code{...} \\
-% \cmdprint{\end}\code{\{keywords\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\def\KEYWORDC{\ifenglish Key word\else Mot-clé\fi}
+\def\KEYWORD{\ifenglish key word\else mot-clé\fi}
+\begin{lstlisting}
+\begin{keywords}
+\item `\normalfont\itshape{\KEYWORDC} 1'
+\item `\normalfont\itshape{\KEYWORD} 2'
+\item `\normalfont\itshape{\KEYWORD} 3'
+...
+\end{keywords}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \ifenglish%
% As shown above, use an initial capital for the first key word
% only. Punctuation will be added automatically. %
@@ -1261,15 +1382,21 @@
% classification mathématique par matières de l'article. Son
% interface est la suivante: %
% \fi
-% \begin{quote}
-% \def\LEVEL{\ifenglish level\else niveau\fi}
-% \def\CODE{\ifenglish code\else rubrique\fi}
-% \cmdprint{\begin}\code{\{classification\}}\oarg{type} \\
-% \cmdprint{\item}\oarg{\LEVEL} \emph{{\CODE} 1}, \emph{{\CODE} 2}, \dots \\
-% \cmdprint{\item}\oarg{\LEVEL} \emph{{\CODE} 1}, \emph{{\CODE} 2}, \dots \\
-% \code{...} \\
-% \cmdprint{\end}\code{\{classification\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\def\LEVEL{\ifenglish level\else niveau\fi}
+\def\CODE{\ifenglish code\else rubrique\fi}
+\begin{lstlisting}
+\begin{classification}`\oarg{type}'
+\item`\oarg{\LEVEL} \normalfont\itshape{\CODE} 1, {\CODE} 2, \dots'
+\item`\oarg{\LEVEL} \normalfont\itshape{\CODE} 1, {\CODE} 2, \dots'
+...
+\end{classification}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \ifenglish%
% The classification system used is %
% \else%
@@ -1331,7 +1458,53 @@
% les options \code{review}, \code{supplement} et \code{nocjs},
% l'espace est remplacé par un pied de page contenant le numéro de
% page. %
-% \fi%
+% \fi
+%
+% \ifenglish%
+% \subsubsection{ADNI data use agreement}
+% \else%
+% \subsubsection{Contrat d'utilisation des données de l'ADNI}
+% \fi
+% \label{sec:usage:titling:adni}
+%
+% \ifenglish%
+% The Alzheimer’s Disease Neuroimaging Initiative (ADNI) %
+% \else%
+% Le %
+% \fi
+% \href{https://adni.loni.usc.edu/wp-content/uploads/how_to_apply/ADNI_DSP_Policy.pdf}{\ifenglish Data Sharing and Publication Policy\else contrat d'utilisation des données\fi} %
+% \ifenglish%
+% requires authors using their data to acknowledge ADNI in the list of
+% authors and give a specific statement on the title page. %
+% \else%
+% de l'Alzheimer’s Disease Neuroimaging Initiative (ADNI) stipule que
+% les auteurs qui ont recours à leurs données doivent reconnaitre la
+% contribution de l'ADNI parmi les auteurs et inclure une déclaration
+% spécifique sur la page de titre de l'article. %
+% \fi
+%
+% \begin{DescribeMacro}{\ADNIacknowledgement}
+% \ifenglish%
+% The command \cmd{\ADNIacknowledgement} adds these two
+% requirements. The command has no arguments; simply insert it after
+% the declarations of the authors. %
+% \else%
+% La commande \cmd{\ADNIacknowledgement} ajoute ces deux exigences.
+% La commande n'a aucun argument; insérez simplement celle-ci après
+% toutes les autres définitions des auteurs. %
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\ADMCacknowledgement}
+% \ifenglish%
+% Similarly, the command \cmd{\ADMCacknowledgement} acknowledges the
+% Alzheimer’s Disease Meta\-bo\-lomics Consortium (ADMC). %
+% \else%
+% De manière analogue, la commande \cmd{\ADMCacknowledgement}
+% reconnait la contribution du
+% Alzheimer’s Disease Metabolomics Consortium (ADMC). %
+% \fi
+% \end{DescribeMacro}
%
% \ifenglish%
% \subsection{Back matter information}
@@ -1342,17 +1515,19 @@
%
% \ifenglish%
% Articles in {\TheCJS} end with elements forming the so-called back
-% matter: supplementary material available online, acknowledgements,
-% etc. The class {\CJSclass} provides specialized environments to
-% enter this information. See \autoref{tab:titling} for a summary; the
-% detailed descriptions follow. %
+% matter: supplementary material available online, data sharing
+% statement, acknowledgements, etc. The class {\CJSclass} provides
+% specialized environments to enter this information. See
+% \autoref{tab:titling} for a summary; the detailed descriptions
+% follow. %
% \else%
% Un article de {\LaRevue} se termine par la présentation d'un
% ensemble d'informations dans des parties annexes: matériel
-% additionnel disponible en ligne, remerciements, etc. La classe
-% {\CJSclass} définit des environnements pour entrer ce type
-% d'information de manière uniforme. Le \autoref{tab:backmatter} en
-% présente un sommaire; les descriptions détaillées suivent. \fi
+% additionnel disponible en ligne, conditions de partage des données,
+% remerciements, etc. La classe {\CJSclass} définit des environnements
+% pour entrer ce type d'information de manière uniforme. Le
+% \autoref{tab:backmatter} en présente un sommaire; les descriptions
+% détaillées suivent. \fi
%
% \begin{table}[t]
% \centering
@@ -1428,18 +1603,34 @@
% \fi
% \end{DescribeEnv}
%
+% \changes{1.1}{2024-01-23}{Documentation: revise the description of
+% the \texttt{sharing} environment now that the CJS adhered to the
+% Expects Data Sharing editorial policy of Wiley.}
% \begin{DescribeEnv}{sharing}
+% \def\POLICYNAME{\ifenglish Expects Data Sharing\else \emph{Expects Data Sharing}\fi}
+% \ifenglish%
+% {\TheCJS} adheres to the %
+% \else%
+% {\LaRevue} respecte la politique éditoriale %
+% \fi%
+% \href{https://authorservices.wiley.com/author-resources/Journal-Authors/open-access/data-sharing-citation/data-sharing-policy.html}{\POLICYNAME} %
% \ifenglish%
-% If you wish to share data or the code, use the environment
-% \code{sharing} to describe how to access this material, providing
-% a persistent identifier, such as a digital object identifier (DOI)
-% or a URL. %
+% editorial policy of Wiley. Therefore, you must use the environment
+% \code{sharing} to make a statement about the availability or
+% absence of shared data. In case of ethical or legal concerns, we
+% encourage you to provide synthetic data instead if possible.
+% Provide a persistent identifier to access the data, such as a
+% digital object identifier (DOI) or a URL. You may also use the
+% environment to describe how to access shared computer code. %
% \else%
-% Si vous mettez les données ou le code de votre article à
-% disposition, utilisez l'environnement \code{sharing} pour
-% expliquer comment accéder à ce matériel et pour indiquer un lien
-% permanent, comme un identificateur d'objets numériques (DOI) ou
-% une adresse URL. %
+% de Wiley. Par conséquent, vous devez utiliser l'environnement
+% \code{sharing} pour préciser les conditions de partage des données
+% de recherche, ou encore leur absence, le cas échéant. En cas
+% d'enjeux éthiques ou légaux, veuillez utiliser si possible des
+% données de synthèse. Indiquez un lien permanent pour accéder aux
+% données, comme un identificateur d'objets numériques (DOI) ou une
+% adresse URL. Vous pouvez aussi utiliser l'environnement pour
+% indiquer comment accéder à du code informatique partagé. %
% \fi
% \end{DescribeEnv}
%
@@ -1644,10 +1835,16 @@
% la page de titre du présent document a été composée avec la commande
% suivante: %
% \fi
-% \begin{quote}
-% \cmd{\licence}\code{\{\{}\cmdprint{\ccbysa*}\code{\} {\year}, Statistical Society of Canada \{}\cmdprint{\textbar}\code{\}} \\
-% \verb+ +\code{Société canadienne de statistique\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\licence{{\ccbysa*} `\year', Statistical Society of Canada {\textbar}
+ Société canadienne de statistique}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
%
% \ifenglish%
% \subsection{Mathematics}
@@ -1655,6 +1852,8 @@
% \subsection{Mathématiques}
% \fi
% \label{sec:usage:mathematics}
+% \changes{1.1}{2024-01-23}{Documentation: specify that the class is
+% not compatible with the package \textbf{amssymb}.}
%
% \ifenglish%
% The class automatically loads the packages %
@@ -1666,16 +1865,18 @@
% \ifenglish%
% and, when the document is compiled with {\XeLaTeX}, %
% \else%
-% et, lorsque le document est compilé avec {\XeLaTeX},
+% et, lorsque le document est compilé avec {\XeLaTeX}, %
% \fi%
% \href{https://ctan.org/pkg/unicode-math}{\pkg{unicode-math}}. %
% \ifenglish%
-% The class also defines a number of commands and environments to
-% standardize the typesetting of mathematical content in {\TheCJS}.
+% Note that it is not compatible with the package \pkg{amssymb}. The
+% class also defines a number of commands and environments to
+% standardize the typesetting of mathematical content in {\TheCJS}. %
% \else%
-% Elle définit également des commandes et des environnements pour
-% assurer une mise en forme standardisée des mathématiques dans
-% {\LaRevue}.
+% En revanche, elle n'est pas compatible avec le paquetage
+% \pkg{amssymb}. La classe définit également des commandes et des
+% environnements pour assurer une mise en forme standardisée des
+% mathématiques dans {\LaRevue}. %
% \fi
%
% \ifenglish%
@@ -1724,6 +1925,9 @@
% \cmd{\mat} &
% \ifenglish matrix or vector \else matrice ou vecteur \fi &
% \cmdprint{\mat}\code{\{A\}} & $\mat{A}$ \\
+% \cmd{\matit} &
+% \ifenglish matrix or vector (italic) \else matrice ou vecteur (italique) \fi &
+% \cmdprint{\matit}\code{\{x\}} & $\matit{x}$ \\
% \cmd{\trsp} &
% \ifenglish transposition \else transposée \fi &
% \cmdprint{\mat}\code{\{A\}}\cmdprint{\trsp} & $\mat{A}\trsp$ \\
@@ -1800,7 +2004,7 @@
% \begin{tabbing}
% \hspace*{2.5em}\=\cmd{\prdist}\code{\{E\}(\cmd{\lambda})}%
% \quad\=$\rightarrow$ \quad\=$\prdist{N}(0, 1)$ \quad\=\kill
-% \>\cmd{\prdist}\code{\{N\}(0, 1)}%
+% \>\cmd{\prdist}\code{\{N\}(0, 1)} %
% \>$\rightarrow$ %
% \>$\prdist{N}(0, 1)$ %
% \>(\ifenglish Normal\else normale\fi) \\
@@ -1816,26 +2020,36 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\mat}
-% \begin{DescribeMacro}{\trsp}
-% \begin{DescribeMacro}{\tr}
-% \begin{DescribeMacro}{\diag}
+% \begin{DescribeMacro}{\matit}
% \ifenglish%
% The command \cmd{\mat} typesets a variable in roman bold, a style
% often used for matrices and vectors (hence the name of the
-% command). To indicate matrix transposition, use only the command
-% \cmd{\trsp}. The commands \cmd{\tr} and \cmd{\diag} define two
-% other common linear algebra operators, the trace and the
-% diagonal. %
+% command). The command \cmd{\matit} is similar, but for a variable
+% in bold italic.
% \else%
% La commande \cmd{\mat} compose une variable en romain gras, ce qui
% est souvent utilisé pour les matrices et les vecteurs (d'où le nom
-% de la commande). Pour indiquer la transposée d'une matrice,
-% utilisez uniquement la commande \cmd{\trsp}. Les commandes
-% \cmd{\tr} et \cmd{\diag} définissent deux autres opérateurs
-% courants en algèbre linéaire, la trace et la diagonale. %
+% de la commande). La commande \cmd{\matit} produit plutôt une
+% variable en gras italique.
% \fi
% \end{DescribeMacro}
% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\trsp}
+% \begin{DescribeMacro}{\tr}
+% \begin{DescribeMacro}{\diag}
+% \ifenglish%
+% To indicate matrix transposition, use only the command
+% \cmd{\trsp}. The commands \cmd{\tr} and \cmd{\diag} define
+% two other common linear algebra operators, the trace and the
+% diagonal. %
+% \else%
+% Pour indiquer la transposée d'une matrice, utilisez uniquement la
+% commande \cmd{\trsp}. Les commandes \cmd{\tr} et \cmd{\diag}
+% définissent deux autres opérateurs courants en algèbre linéaire,
+% la trace et la diagonale. %
+% \fi
+% \end{DescribeMacro}
% \end{DescribeMacro}
% \end{DescribeMacro}
%
@@ -1999,6 +2213,23 @@
% Évitez si possible les indices doubles et n'utilisez jamais
% d'indices triples. %
% \fi
+% \changes{1.1}{2024-03-06}{Documentation: add an advice on the
+% typesetting of bold symbols in mathematics.}
+% \item %
+% \ifenglish%
+% Bold in mathematics is a tricky issue. Use the aforementioned
+% class commands \cmdprint{\mat} and \cmdprint{\matit} to generate
+% bold symbols reliably across {\TeX} engines. With {\XeLaTeX},
+% \cmdprint{\mat} also works with Greek letters (that will be
+% typeset in italic). %
+% \else%
+% La composition en gras en mathématiques est une opération
+% délicate. Utilisez les commandes de la classe \cmdprint{\mat} et
+% \cmdprint{\matit} mentionnées précédemment pour composer
+% automatiquement des symboles en gras quelque soit le moteur
+% {\TeX}. Avec {\XeLaTeX}, \cmdprint{\mat} fonctionne aussi avec les
+% lettres grecques (qui sont alors composées en italique). %
+% \fi
% \item %
% \ifenglish%
% Always use the command \cmdprint{\ell} to obtain the symbol
@@ -2094,13 +2325,19 @@
% («équation», «inégalité», «relation», etc.), ainsi que par une
% espace insécable: %
% \fi
-% \begin{quote}
-% \def\LABEL{\ifenglish label\else étiquette\fi}
-% \def\EQN{\ifenglish equation\else équation\fi}
-% \def\INEQ{\ifenglish inequalities\else inégalités\fi}
-% \code{\EQN~}\cmdprint{\eqref}\marg{\LABEL} \\
-% \code{\INEQ~}\cmdprint{\eqref}\marg{\LABEL}\code{{-}{-}}\cmdprint{\eqref}\marg{\LABEL}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+ \def\LABEL{\ifenglish label\else étiquette\fi}
+ \def\EQN{\ifenglish equation\else équation\fi}
+ \def\INEQ{\ifenglish inequalities\else inégalités\fi}
+\begin{lstlisting}
+`\EQN'~\eqref`\marg{\LABEL}'
+`\INEQ'~\eqref`\marg{\LABEL}'--\eqref`\marg{\LABEL}'
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \end{itemize}
%
% \ifenglish%
@@ -2533,72 +2770,137 @@
% description pour un nouvel environnement \meta{env}, insérez la
% commande suivante dans le préambule de votre document: %
% \fi
-% \begin{quote}
-% \cmdprint{\addto}\cmdprint{\extras}\code{\languagename}\code{\{}\cmdprint{\def}\code{\bs}\meta{env}\code{autorefname}\marg{description}\code{\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\addto\extras`\languagename'{\def\`\meta{env}'autorefname`\marg{description}'}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \ifenglish%
% (If the main language of the article is French, replace
% \cmdprint{\extras}\code{\languagename} by
-% \cmdprint{\extrasfrench}.)\footnote{%
+% \cmdprint{\extrasfrench}.\footnote{%
% For further details, see Section~6 of the documentation of
-% \pkg{hyperref}.} %
+% \pkg{hyperref}.}) %
% \else%
% (Si la langue principale de l'article est l'anglais, remplacez
% \cmdprint{\extras}\code{\languagename} par
-% \cmdprint{\extrasenglish}.)\footnote{%
+% \cmdprint{\extrasenglish}.\footnote{%
% Consultez au besoin la section~6 de la documentation de
-% \pkg{hyperref}.} %
+% \pkg{hyperref}.}) %
% \fi
%
% \begin{DescribeMacro}{\texorpdfstring}
% \changes{0.93}{2023-11-07}{Fix the name of a command from
% \cs{textorpdfstring} to the correct \cs{texorpdfstring} in the
-% documentation.}
+% documentation.}%
+% \changes{1.1}{2024-03-12}{Documentation: mention to also use
+% \cs{texorpdfstring} to fix \texttt{Token not allowed in a PDF
+% string} warnings.}
% \ifenglish%
-% The compilation of your manuscript may halt with the error message
+% The package \pkg{hyperref} builds the table of contents of the
+% PDF. If you use mathematical notation or symbols in a section
+% title, compilation of your manuscript may either result in
+% warnings of the form %
+% \else%
+% Le paquetage \pkg{hyperref} se charge de produire la table des
+% matières du fichier PDF. Si vous utilisez de la notation ou des
+% symboles mathématiques dans un titre de section, la compilation de
+% votre article pourrait soit résulter en des avertissements de la
+% forme %
+% \fi%
% \begin{quote}
-% \code{Improper alphabetic constant}
+% Token not allowed in a PDF string
% \end{quote}
-% The reason is most likely that you use a mathematical symbol in a
-% section title that \pkg{hyperref} is not able to properly
-% translate for the table of contents of the PDF. If you need
-% the symbol, try wrapping it in \cmd{\texorpdfstring}. This
-% command takes two arguments: the symbol that should appear in the
-% document, and the replacement text for the table of contents. For
-% example, you would replace %
+% \ifenglish%
+% or halt with the error message %
% \else%
-% Il se pourrait que la compilation de votre article échoue avec le
-% message d'erreur
+% ou échouer avec le message d'erreur %
+% \fi%
% \begin{quote}
% \code{Improper alphabetic constant}
% \end{quote}
-% La cause en est probablement un symbole mathématique placé dans un
-% titre de section que \pkg{hyperref} n'arrive pas à traduire pour
-% la table des matières du fichier PDF. Si vous ne pouvez vous
-% passer du symbole dans le titre, essayez d'utiliser la commande
-% \cmd{\texorpdfstring} dans celui-ci. Cette commande requiert deux
-% arguments: le texte qui doit apparaitre dans le document et celui
-% qui peut figurer dans la table des matières. Par exemple, vous
-% devriez remplacer %
+% \ifenglish%
+% If you need the notation or symbol in the title, wrap it in
+% \cmd{\texorpdfstring}. This command takes two arguments: the
+% notation or symbol that should appear in the document, and the
+% replacement text for the table of contents. For example, you would
+% replace %
+% \else%
+% Si vous ne pouvez vous passer de la notation ou du symbole dans le
+% titre, utilisez la commande \cmd{\texorpdfstring} dans celui-ci.
+% Cette commande requiert deux arguments: le texte qui doit
+% apparaitre dans le document et celui qui peut figurer dans la
+% table des matières. Par exemple, vous devriez remplacer %
% \fi%
-% \def\TEXT{Contribution \ifenglish of \else de \fi}
-% \begin{quote}
-% \cmdprint{\subsection}\code{\{\TEXT $}\cmdprint{\beta}\code{$\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\def\TEXT{\ifenglish Algorithm for\else Algorithme pour\fi}
+\begin{lstlisting}
+\section{`\TEXT' $U_n$}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
+% \ifenglish%
+% by something along the lines of %
+% \else%
+% par quelque chose comme %
+% \fi%
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\section{`\TEXT' \texorpdfstring{$U_n$}{U[n]}}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
+% \ifenglish%
+% You would also replace %
+% \else
+% De même, vous devriez remplacer %
+% \fi%
+% \iffalse
+%<*example>
+% \fi
+\def\TEXT{Contribution \ifenglish of\else de\fi}
+\begin{lstlisting}
+\subsection{`\TEXT' $\beta$}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \ifenglish by\else par\fi
-% \begin{quote}
-% \cmdprint{\subsection}\code{\{\TEXT}\cmdprint{\texorpdfstring}\code{\{$}\cmdprint{\beta}\code{$\}\{beta\}\}}
-% \end{quote}
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\subsection{`\TEXT' \texorpdfstring{$\beta$}{beta}}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
+% \ifenglish or even\else ou encore\fi
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\subsection{`\TEXT' \texorpdfstring{$\beta$}{`β'}}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
% \ifenglish%
-% or, even better if you can enter Unicode characters on the
-% keyboard, by %
+% if you can enter Unicode characters on the keyboard. %
% \else%
-% ou même, si vous pouvez entrer des caractères Unicode au clavier,
-% par %
+% si vous êtes en mesure d'entrer des caractères Unicode au
+% clavier. %
% \fi
-% \begin{quote}
-% \cmdprint{\subsection}\code{\{\TEXT}\cmdprint{\texorpdfstring}\code{\{$}\cmdprint{\beta}\code{$\}\{β\}\}}
-% \end{quote}
% \end{DescribeMacro}
%
% \warningbox{%
@@ -2782,12 +3084,12 @@
% \fi
% \item %
% \ifenglish%
-% (Optional) Appendices --- sections numbered A, B, \dots\ after the
-% command \cmd{\appendix} --- for proofs and longer mathematical
+% (Optional) Appendices---sections numbered A, B, \dots\ after the
+% command \cmd{\appendix}---for proofs and longer mathematical
% arguments. Each appendix must be cited in the main article. %
% \else%
-% (Optionnel) Les annexes --- des sections numérotées A, B, \dots\
-% suite à la commande \cmd{\appendix} ---- pour les démontrations de
+% (Optionnel) Les annexes~--- des sections numérotées A, B, \dots\
+% suite à la commande \cmd{\appendix}~--- pour les démontrations de
% théorèmes ou autres longs développements mathématiques. Chaque
% annexe doit être citée dans l'article. %
% \fi
@@ -2871,10 +3173,11 @@
% \end{itemize}
% Les informations de la page de titre et des parties annexes peuvent
% toujours figurer dans le code source. Autrement dit, vous pouvez
-% créer le matérial additionnel directement à partir du même préambule
-% --- ou gabarit --- que votre article principal; il suffit d'ajouter
+% créer le matérial additionnel directement à partir du même
+% préambule que votre article principal; il suffit d'ajouter
% \code{supplement} aux options de la classe. %
-% \fi \endgroup
+% \fi
+% \endgroup
%
% \ifenglish%
% The option \code{supplement} is compatible with the option
@@ -2955,7 +3258,7 @@
% at the bottom of the first page. The option has no other effect on
% the rendering of the article. %
% \else%
-% L'option \code{final} --- qui a préséance sur \code{review} ---
+% L'option \code{final}~--- qui a préséance sur \code{review}~---
% active la vérification que les informations de publication et que
% l'historique de révision sont fournis. De plus, si les
% informations d'octroi de licence sont fournies à l'aide des
@@ -3006,10 +3309,79 @@
% \else%
% AAAA-MM-JJ. Par exemple: %
% \fi
+% \iffalse
+%<*example>
+% \fi
+\begin{lstlisting}
+\received{`\isodate'}
+\end{lstlisting}
+% \iffalse
+%</example>
+% \fi
+% \end{DescribeMacro}
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\specialack}
+% \ifenglish%
+% The command \cmd{\specialack} provides a generic interface to
+% give special acknowledgement on the title page, such as the one
+% required by ADNI (\autoref{sec:usage:titling:adni}). The
+% command takes two arguments: %
+% \else%
+% La commande \cmd{\specialack} permet de reconnaitre une
+% contribution spéciale sur la page de titre, telle que celle exigée
+% par l'ADNI (\autoref{sec:usage:titling:adni}). La commande requiert
+% deux arguments: %
+% \fi%
% \begin{quote}
-% \cmdprint{\received}\code{\{2023-06-20\}}
+% \cmdprint{\specialack}\marg{\ifenglish by-line\else signature\fi}\marg{\ifenglish statement\else déclaration\fi}
% \end{quote}
+% \ifenglish%
+% The \meta{by-line} is inserted in the list of authors, whereas the
+% \meta{statement} is typeset at the bottom of the title page, with
+% the licensing information. Each argument may be empty, in which
+% case the corresponding information is not printed. For example,
+% the command \cmd{\ADNIacknowledgement} is effectively defined
+% as: %
+% \else%
+% La \meta{signature} est ajoutée à la liste des auteurs, alors que
+% la \meta{déclaration} est affichée au bas de la page de titre,
+% avec la déclaration de licence. Chaque argument peut être vide,
+% auquel cas l'information correspondante n'est pas affichée. À
+% titre d'exemple, la commande \cmd{\ADNIacknowledgement} est
+% définie ainsi: %
+% \fi%
+% \begin{quote}
+% \cmdprint{\specialack}\code{\{}\cmdprint{\CJS@adnibyline}\code{\}\{}\cmdprint{\CJS@adnistatement}\code{\}}
+% \end{quote}
+% \ifenglish%
+% (The internal commands \cmd{\CJS@adnibyline} and
+% \cmd{\CJS@adnistatement} typeset the official ADNI by-line and
+% statement. The analogous commands \cmd{\CJS@admcbyline} and
+% \cmd{\CJS@admcstatement} serve the same purpose for the
+% Alzheimer’s Disease Metabolomics Consortium.) %
+% \else%
+% (Les commandes internes \cmd{\CJS@adnibyline} et
+% \cmd{\CJS@adnistatement} contiennent le texte officiel de la
+% signature et de la déclaration de l'ADNI. Les commandes analogues
+% \cmd{\CJS@admcbyline} et \cmd{\CJS@admcstatement} pour
+% l'Alzheimer’s Disease Metabolomics Consortium sont également
+% définies dans la classe.) %
+% \fi%
% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\specialackmark}
+% \ifenglish%
+% The command \cmd{\specialackmark} sets the footnote marker used by
+% \cmd{\specialack}. The default definition of the marker is: %
+% \else%
+% La commande \cmd{\specialackmark} permet de modifier l'appel de
+% note de bas de page utilisé par \cmd{\specialack}. La définition
+% par défaut de l'appel de note est: %
+% \fi%
+% \begin{quote}
+% \cmdprint{\textsuperscript}\code{\{}\cmdprint{\ensuremath}\code{\{*\}\}}
+% \end{quote}
% \end{DescribeMacro}
%
% \ifenglish%
@@ -3118,6 +3490,7 @@
\newif\ifCJS@final \CJS@finalfalse % final version?
\newif\ifCJS@titlingfooter \CJS@titlingfooterfalse % footer on title page?
\newif\ifCJS@journalinfo \CJS@journalinfotrue % display journal info?
+\newif\ifCJS@specialack \CJS@specialackfalse % special acknowledgement?
\newif\ifCJS@fancybreak \CJS@fancybreaktrue % display fancy break?
\newif\ifCJS@history \CJS@historyfalse % history present?
\newif\ifCJS@corrauth \CJS@corrauthfalse % corresponding author?
@@ -3198,13 +3571,6 @@
% Useful packages like \pkg{iftex} and \pkg{etoolbox} are already
% loaded by \class{memoir}.
%
-% The package \pkg{iflang} provides expandable checks for the current
-% language based on the macro \cmdprint{\languagename} or hyphenation
-% patterns.
-% \begin{macrocode}
-\RequirePackage{iflang}
-% \end{macrocode}
-%
% We rely on \pkg{natbib} for author-year citations. This package must
% be loaded before \pkg{babel}. The option \code{sectionbib} ensures
% that the bibliography (or list of references) is typeset as a
@@ -3369,6 +3735,9 @@
% {\LuaTeX}, commands from \pkg{fontspec} and \pkg{unicode-math} load
% the OpenType variants of the fonts. The encoding is UTF-8 by default
% for these engines.
+% \changes{1.1}{2024-03-06}{Implementation: explicitly set the option
+% \texttt{bold-style!=TeX} when loading the math font with the modern
+% engines.}
% \begin{macrocode}
\iftutex
\RequirePackage[babel=true]{microtype}
@@ -3388,7 +3757,7 @@
[
Extension = .otf,
Scale = 1,
- Ligatures = TeX
+ bold-style = TeX
]
\setmathfont{FiraMath-Regular}
[
@@ -3436,7 +3805,8 @@
% \label{sec:implementation:layout:colours}
%
% We define some colours used by the class. First, the three main
-% colours of {\TheCJS} logo: %
+% colours of {\TheCJS} logo, hand-picked from the SVG code of the
+% latter: %
% \textcolor{CJSpink}{\rule{1.5em}{1.2ex}} %
% \textcolor{CJSred}{\rule{1.5em}{1.2ex}} %
% \textcolor{CJSyellow}{\rule{1.5em}{1.2ex}}\,.
@@ -3455,8 +3825,8 @@
\definecolor{CJSurl}{rgb}{0.6,0,0} % external links
\definecolor{CJScitation}{rgb}{0,0.5,0} % citations
% \end{macrocode}
-% Finally, the colour of the ORCID icon\footnote{%
-% See \url{https://info.orcid.org/brand-guidelines}.}: %
+% Finally, the colour of the %
+% \href{https://info.orcid.org/brand-guidelines}{ORCID icon}: %
% \textcolor{CJSorcid}{\rule{1.5em}{1.2ex}}\,.
% \begin{macrocode}
\definecolor{CJSorcid}{HTML}{A6CE39}
@@ -3535,7 +3905,7 @@
%
% First, a command to set the font.
% \begin{macrocode}
-\newcommand*\CJS@setheadfootfont{%
+\def\CJS@setheadfootfont{%
\firalining\fontsize{9}{13}\selectfont}
% \end{macrocode}
%
@@ -3545,7 +3915,7 @@
\newlength\CJS@headdivheight
\settoheight\CJS@headdivheight{\CJS@setheadfootfont 1}
\setlength\CJS@headdivheight{0.9\CJS@headdivheight}
-\newcommand*\CJS@headdivrule{%
+\def\CJS@headdivrule{%
\rule[0.05\CJS@headdivheight]{0.75\normalrulethickness}{\CJS@headdivheight}}
% \end{macrocode}
%
@@ -3614,7 +3984,7 @@
% \label{sec:implementation:layout:titles}
%
% The \class{memoir} class assumes that sectioning starts at the
-% chapter level --- even with the \code{article} option. To get around
+% chapter level---even with the \code{article} option. To get around
% this requirement, we disable the effect of \cmdprint{\chapter}. A
% desirable side effect is to make \cmd{\autoref} work correctly for
% appendices.
@@ -4160,6 +4530,11 @@
\fancybreak{\pfbreakdisplay}
\fi
% \end{macrocode}
+% \changes{1.1}{2024-06-19}{Implementation: fix the positioning of the
+% licensing information at the bottom of the title page.}
+% \changes{1.1}{2024-06-26}{Implementation: include the special
+% acknowledgement statement in the licensing information, if
+% required.}
% Finally, unless overridden by a class option, allocate space
% for the licence statement at the bottom of the title page. By
% default, a notice indicates that the licence will appear
@@ -4173,11 +4548,12 @@
\iflanguage{french}{Futur emplacement de la déclaration de licence.}%
{Licence statement to appear here.}}
\begin{figure}[!b]
- \raisebox{0pt}[0pt][\footskip]{%
+ \raisebox{0pt}[0pt][\dimexpr\CJS@licenceht-\footskip\relax]{%
\vbox{%
\CJS@setlicencefont
\rule{\textwidth}{\normalrulethickness}
\parbox[t][\CJS@licenceht][t]{\textwidth}{%
+ \ifCJS@specialack\CJS@specialackstatement\fi
\ifCJS@final\CJS@licence \else\textit\CJS@notice \fi}}}
\end{figure}
\fi
@@ -4185,6 +4561,45 @@
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{ADNI data use agreement}
+% \label{sec:implementation:titling:adni}
+%
+% \changes{1.1}{2024-06-26}{Implementation: define the new commands
+% \cs{ADNIacknowledgement} and \cs{ADMCacknowledgement}.}
+% \begin{macro}{\ADNIacknowledgement}
+% \begin{macro}{\ADMCacknowledgement}
+% The commands \cmd{\ADNIacknowledgement} and
+% \cmd{\ADMCacknowledgement} automatically create special
+% acknowledgements for the Alzheimer’s Disease Neuroimaging
+% Initiative (ADNI) and the Alzheimer’s Disease Metabolomics
+% Consortium (ADMC), respectively.
+% \begin{macrocode}
+\newcommand*\CJS@adnibyline{for the Alzheimer’s Disease Neuroimaging Initiative}
+\newcommand*\CJS@adnistatement{%
+ Data used in preparation of this article were obtained
+ from the \href{https://adni.loni.usc.edu}{Alzheimer’s Disease Neuroimaging Initiative}
+ (ADNI) database. As such, the investigators within the ADNI
+ contributed to the design and implementation of ADNI and/or provided
+ data but did not participate in the analysis or writing of this
+ report. A complete listing of ADNI investigators can be found at:
+ \url{https://adni.loni.usc.edu/wp-content/uploads/how_to_apply/ADNI_Acknowledgement_List.pdf}.}
+\newcommand*\CJS@admcbyline{for the Alzheimer’s Disease Metabolomics Consortium}
+\newcommand*\CJS@admcstatement{%
+ Data used in preparation of this article were generated by the
+ Alzheimer’s Disease Metabolomics Consortium (ADMC). As such, the
+ investigators within the ADMC provided data but did not participate
+ in analysis or writing of this report. A complete listing of ADMC
+ investigators can be found at:
+ \url{https://sites.duke.edu/adnimetab/team/}.}
+\newcommand*\ADNIacknowledgement{%
+ \specialack{\CJS@adnibyline}{\CJS@adnistatement}}
+\newcommand*\ADMCacknowledgement{%
+ \renewcommand*\CJS@specialackmark{\textsuperscript{\ensuremath{**}}}
+ \specialack{\CJS@admcbyline}{\CJS@admcstatement}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \subsection{Back matter}
% \label{sec:implementation:backmatter}
%
@@ -4292,20 +4707,20 @@
%
% First, set the font for the licence statement.
% \begin{macrocode}
-\newcommand*\CJS@setlicencefont{%
+\def\CJS@setlicencefont{%
\firalining\fontsize{8pt}{9pt}\selectfont}
% \end{macrocode}
%
% \begin{macro}{\CJS@measurelicence}
-% We need to compute the required space for a licence statement. The
-% internal command \cmd{\CJS@measurelicence} measures the total
-% height of either the licence statement provided with
-% \cmd{\licence}, or the seemingly longest version of the license
-% statement used by the publisher. The command is used inside
-% \cmd{\maketitle}.
+% We need to compute the required space for a licence statement and,
+% possibly, the ADNI statement. The internal command
+% \cmd{\CJS@measurelicence} measures the total height required using
+% either the licence statement provided with \cmd{\licence}, or the
+% seemingly longest version of the license statement used by the
+% publisher. The command is used inside \cmd{\maketitle}.
% \begin{macrocode}
\newlength\CJS@licenceht
-\newcommand\CJS@licencesample{%
+\def\CJS@licencesample{%
{\ccbyncnd*} 2023 The Authors. The Canadian Journal of
Statistics~{\textbar}~La revue canadienne de statistique published
by Wiley Periodicals LLC on behalf of Statistical Society of
@@ -4319,6 +4734,7 @@
\newcommand\CJS@measurelicence{%
\setbox\CJS@licencebox=\vbox{%
\CJS@setlicencefont
+ \ifCJS@specialack\CJS@specialackstatement\fi
\ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}
\setlength\CJS@licenceht{\dimexpr\ht\CJS@licencebox+\dp\CJS@licencebox}}
% \end{macrocode}
@@ -4348,7 +4764,7 @@
% licence: {\ccby}.
% \begin{macrocode}
\newcommand*\ccby{\ccby@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccby@{\mbox{%
+\def\ccby@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em}}
% \end{macrocode}
@@ -4359,7 +4775,7 @@
% Attribution"-ShareAlike licence: {\ccbysa}.
% \begin{macrocode}
\newcommand*\ccbysa{\ccbysa@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbysa@{\mbox{%
+\def\ccbysa@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsSa}}
@@ -4371,7 +4787,7 @@
% Attribution"-NonCommercial licence: {\ccbync}.
% \begin{macrocode}
\newcommand*\ccbync{\ccbync@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbync@{\mbox{%
+\def\ccbync@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNc}}
@@ -4384,7 +4800,7 @@
% {\ccbyncsa}.
% \begin{macrocode}
\newcommand*\ccbyncsa{\ccbyncsa@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbyncsa@{\mbox{%
+\def\ccbyncsa@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNc\kern0.1em%
@@ -4397,7 +4813,7 @@
% Attribution"-NoDerivatives licence: {\ccbynd}.
% \begin{macrocode}
\newcommand*\ccbynd{\ccbynd@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbynd@{\mbox{%
+\def\ccbynd@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNd}}
@@ -4409,7 +4825,7 @@
% Attribution"-NonCommercial"-NoDerivatives licence: {\ccbyncnd}.
% \begin{macrocode}
\newcommand*\ccbyncnd{\ccbyncnd@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbyncnd@{\mbox{%
+\def\ccbyncnd@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNc\kern0.1em%
@@ -4447,16 +4863,20 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\mat,\trsp,\tr,\diag}
+% \changes{1.1}{2024-07-13}{Implementation: simpler definition of
+% \cs{mat} and \cs{matit} using \cs{let} instead of \cs{newcommand*}.}
+% \begin{macro}{\mat,\matit,\trsp,\tr,\diag}
% The class provides special commands to typeset matrix and vector
% names, a carefully designed transpose symbol, and the most common
% linear algebra operators.
% \begin{macrocode}
\iftutex
- \newcommand*\mat[1]{\symbf{#1}}
+ \let\mat\symbf
+ \let\matit\symbfit
\newcommand*\trsp{^{\mkern-1.5mu\symsfup{T}}}
\else
- \newcommand*\mat[1]{\mathbf{#1}}
+ \let\mat\mathbf
+ \let\matit\mathbfit
\newcommand*\trsp{^{\mkern-1.5mu\mathsf{T}}}
\fi
\DeclareMathOperator{\tr}{tr}
@@ -4545,13 +4965,13 @@
\newcommand*\Pylang{\proglang{Python}}
\newcommand*\Julialang{\proglang{Julia}}
\newcommand*\Clang{\proglang{C}}
-\newcommand*\CJS@plus{%
+\newcommand*\Cpplang{\proglang{C\CJS@plus\CJS@plus}}
+\def\CJS@plus{%
\ifx\f@family\sfdefault%
\protect\hspace{-.04em}\protect\raisebox{-.125ex}{\larger+}%
\else%
\protect\hspace{-.03em}\protect\raisebox{.25ex}{\smaller+}%
\fi}
-\newcommand*\Cpplang{\proglang{C\CJS@plus\CJS@plus}}
% \end{macrocode}
% \end{macro}
%
@@ -4595,10 +5015,18 @@
% is handled by \pkg{natbib}. We loaded the package with the option
% \code{sectionbib} to obtain the list of references as a section, but
% \class{memoir} will use \cmd{\section} in such instances. We want an
-% unnumbered section. To achieve this efficiently, we redefine
-% the internal command of \class{memoir}.
+% unnumbered section (yet showing in the virtual table of contents of
+% the PDF). To achieve this efficiently, we redefine the internal
+% command of \class{memoir}.
+% \changes{1.1}{2024-07-02}{Implementation: add a
+% \cs{addtocontentsline} command to the redefinition of
+% \cs{@memb@bsec} to include the References section in the virtual
+% table of contents of the PDF.}
% \begin{macrocode}
-\renewcommand{\@memb@bsec}{\section*{\bibname}\prebibhook}
+\renewcommand{\@memb@bsec}{%
+ \section*{\bibname}%
+ \addcontentsline{toc}{section}{\bibname}%
+ \prebibhook}
% \end{macrocode}
%
% Furthermore, we need to redefine the title of the section, because
@@ -4706,14 +5134,14 @@
% \end{macro}
%
% \begin{macro}{\received,\accepted}
-% The article history --- dates when the article was received and
-% accepted --- is printed at the very end of the article when present.
+% The article history---dates when the article was received and
+% accepted---is printed at the very end of the article when present.
% Its treatment involves a number of steps.
%
% First, the dates themselves are input in ISO format YYYY-MM-DD and
% converted in language dependent strings using the package
% \pkg{datetime2}. In English, we want to use the British format
-% without the ordinal for the day: ``1 January 1970''. In French, we
+% without the ordinal for the day: 1 January 1970. In French, we
% can simply rely on the default format.
% \begin{macrocode}
\DTMlangsetup[en-GB]{ord=omit}
@@ -4767,19 +5195,54 @@
% Finally, the history information, when present, is printed at the
% end of the article.
% \begin{macrocode}
-\newcommand*\CJS@historybox{
+\def\CJS@historybox{
\par\addvspace{2\baselineskip}\noindent%
\smash{\box\CJS@historyornament \CJS@history}\par%
\vspace*{40pt}}
\AtEndDocument{\ifCJS@journalinfo\ifCJS@history\CJS@historybox\fi\fi}
% \end{macrocode}
% \end{macro}
+%
+% \changes{1.1}{2024-06-26}{Implementation: define the new command
+% \cs{specialack}.}
+% \begin{macro}{\specialack}
+% The command \cmd{\specialack} is the generic interface to give
+% special acknowledgement on the title page. The command inserts its
+% first argument in the list of authors, and its second argument at
+% the bottom of the title page, with the licensing information. Each
+% argument may be empty, in which case the corresponding information
+% is not displayed.
+% \begin{macrocode}
+\def\CJS@specialackstatement{}
+\newcommand*\specialack[2]{%
+ \ifstrempty{#1}{}{%
+ \author{#1\CJS@specialackmark}}
+ \ifstrempty{#2}{}{%
+ \CJS@specialacktrue
+ \renewcommand*\CJS@specialackstatement{\CJS@specialackmark\,#2\medskip\newline}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \changes{1.1}{2024-06-26}{Implementation: define the new command
+% \cs{specialackmark}.}
+% \begin{macro}{\specialackmark}
+% The command \cmd{\specialackmark} changes the footnote marker used
+% by \cmd{\specialack} from its default definition.
+% \begin{macrocode}
+\def\CJS@specialackmark{\textsuperscript{\ensuremath{*}}}
+\newcommand*\specialackmark[1]{%
+ \renewcommand*\CJS@specialackmark{#1}}
+% \end{macrocode}
+% \end{macro}
+%
%</class>
% ^^A <<<<< End of the code of the class
%
% ^^A Change notes for the templates must appear before \Finale
% \changes{0.93}{2023-11-07}{Templates: fix a missing closing brace in
% \cs{author} commands.}
+% \changes{1.1}{2024-01-23}{Templates: revise the description of the
+% \texttt{sharing} environment.}
% \Finale
%
% \iffalse
@@ -4893,18 +5356,18 @@
%<fr> %% la page de titre automatiquement.
\begin{englishabstract}
<Insert your English abstract here. The abstract should be concise
- --- up to 10 lines long --- and descriptive. Avoid symbols as much
- as possible. Formulas are strongly discouraged, and citations
- should be avoided.>
+ (up to 10 lines long) and descriptive. Avoid symbols as much as
+ possible. Formulas are strongly discouraged, and citations should
+ be avoided.>
%<fr> [Un résumé en anglais sera fourni pour les auteurs qui ne peuvent
%<fr> le préparer eux-mêmes.]
\end{englishabstract}
\begin{frenchabstract}
<Insérer le texte du résumé en français ici. Le résumé doit être
- concis --- une dizaine de lignes --- et descriptif. Éviter autant
- que possible les symboles. Les équations mathématiques sont
- fortement découragées et les citations sont à éviter.>
+ concis (une dizaine de lignes) et descriptif. Éviter autant que
+ possible les symboles. Les équations mathématiques sont fortement
+ déconseillées et les citations sont à éviter.>
%<en> [We will supply a French abstract for those authors who
%<en> can't prepare it themselves.]
\end{frenchabstract}
@@ -4958,13 +5421,15 @@
%<fr> <Texte libre>
\end{supplement}
-%<en> %% DATA SHARING (optional - comment out if unused). Describe how to
-%<en> %% access data that you wish to share. Provide a permanent link such
-%<en> %% as a Document Object Identifier (DOI) or an URL.
-%<fr> %% PARTAGE DES DONNÉES (optionnel - commenter si inutilisé).
-%<fr> %% Expliquer comment accéder à des données de l'article mises à
-%<fr> %% disposition. Fournir un lien permanent, comme un identificateur
-%<fr> %% d'objets numériques (DOI) ou une adresse URL.
+%<en> %% DATA SHARING (mandatory). In accordance with the Expect Data
+%<en> %% Sharing editorial policy of Wiley, make a statement about the
+%<en> %% availability or absence of shared data. Provide a permanent link
+%<en> %% such as a Document Object Identifier (DOI) or an URL.
+%<fr> %% PARTAGE DES DONNÉES (obligatoire). Conformément à la politique
+%<fr> %% éditoriale «Expect Data Sharing» de Wiley, vous devez indiquer
+%<fr> %% les conditions de partage des données de recherche, ou l'absence
+%<fr> %% de celles-ci, le cas échéant. Fournir un lien permanent, comme un
+%<fr> %% identificateur d'objets numériques (DOI) ou une adresse URL.
\begin{sharing}
%<en> <Free form text>
%<fr> <Texte libre>
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-bst-en.dbj b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-bst-en.dbj
index 38907626da6..98372dceb78 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-bst-en.dbj
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-bst-en.dbj
@@ -6,7 +6,7 @@
\preamble
-Copyright (C) 2023 Statistical Society of Canada | Société
+Copyright (C) 2023-2024 Statistical Society of Canada | Société
canadienne de statistique
This file may be distributed and/or modified under the conditions
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-bst-fr.dbj b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-bst-fr.dbj
index 3ae793cf2bf..13be31421c3 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-bst-fr.dbj
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-bst-fr.dbj
@@ -6,7 +6,7 @@
\preamble
-Copyright (C) 2023 Statistical Society of Canada | Société
+Copyright (C) 2023-2024 Statistical Society of Canada | Société
canadienne de statistique
This file may be distributed and/or modified under the conditions
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-class.dbj b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-class.dbj
index c987b1e6a7d..3ef16366bdf 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-class.dbj
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-class.dbj
@@ -6,7 +6,7 @@
This is a generated file.
-Copyright (C) 2023 Statistical Society of Canada | Société
+Copyright (C) 2023-2024 Statistical Society of Canada | Société
canadienne de statistique
This file may be distributed and/or modified under the conditions
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-english.mbs b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs
index e786d500bde..b23be11c434 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-english.mbs
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs
@@ -4,7 +4,7 @@
% for The Canadian Journal of Statistics | La revue canadienne de
% statistique
%
-% Copyright (C) 2023 Statistical Society of Canada | Société
+% Copyright (C) 2023-2024 Statistical Society of Canada | Société
% canadienne de statistique
%
% This file may be distributed and/or modified under the conditions
@@ -31,7 +31,7 @@
%-------------------------------------------------------------------
% Begin module:
%\fi
- % \ProvidesFile{cjs-rcs-english.mbs}[2023/11/29 v1.0 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-english.mbs}[2024/07/14 v1.1 (VG, PWD)]
%\iffalse
%<*a&!a>
% The following ensures that the driver part is not seen by makebst
@@ -125,6 +125,8 @@
% the main file.}
% \changes{1.0}{2023-11-29}{First official release distributed through
% CTAN.}
+% \changes{1.1}{2024-07-14}{No changes to the English language
+% definition file.}
%
% \title[English language definition file \filename]{%
% English language definition file \\
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-french.mbs b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-french.mbs
index eb60ab8a202..748d449383b 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-french.mbs
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-french.mbs
@@ -4,7 +4,7 @@
% The Canadian Journal of Statistics | La revue canadienne de
% statistique
%
-% Copyright (C) 2023 Statistical Society of Canada | Société
+% Copyright (C) 2023-2024 Statistical Society of Canada | Société
% canadienne de statistique
%
% This file may be distributed and/or modified under the conditions
@@ -31,7 +31,7 @@
%-------------------------------------------------------------------
% Begin module:
%\fi
- % \ProvidesFile{cjs-rcs-french.mbs}[2023/11/29 v1.0 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-french.mbs}[2024/07/14 v1.1 (VG, PWD)]
%\iffalse
%<*a&!a>
% The following ensures that the driver part is not seen by makebst
@@ -125,6 +125,8 @@
% the main file.}
% \changes{1.0}{2023-11-29}{First official release distributed through
% CTAN.}
+% \changes{1.1}{2024-07-14}{No changes to the French language
+% definition file.}
%
% \title[French language definition file \filename]{%
% French language definition file \\
diff --git a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.mbs b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs
index 10c84b1ff69..75ca76a256f 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.mbs
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs
@@ -3,7 +3,7 @@
% Master bibliography style for The Canadian Journal of Statistics |
% La revue canadienne de statistique
%
-% Copyright (C) 2023 Statistical Society of Canada | Société
+% Copyright (C) 2023-2024 Statistical Society of Canada | Société
% canadienne de statistique
%
% This file may be distributed and/or modified under the conditions
@@ -133,6 +133,7 @@
% the main file.}
% \changes{1.0}{2023-11-29}{First official release distributed through
% CTAN.}
+% \changes{1.1}{2024-07-14}{No changes to the master bibliographic style.}
%
% \title[Master bibliographic style file \filename]{%
% Master bibliographic style file \\
diff --git a/Master/texmf-dist/source/latex/colortbl/colortbl.dtx b/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
index 076c69643a1..8e5f1e8be18 100644
--- a/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
+++ b/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
@@ -15,7 +15,7 @@
%<driver>\ProvidesFile{colortbl.drv}
% \fi
% \ProvidesFile{colortbl.dtx}
- [2024/05/26 v1.0h Color table columns (DPC)]
+ [2024/07/06 v1.0i Color table columns (DPC)]
%
% \iffalse
%<*driver>
@@ -1505,9 +1505,21 @@
%
%
% longtable support.
+% \changes{v1.0i}{2024/07/06}{tagging code adjusments for longtable hline}
+% \begin{macrocode}
+\ExplSyntaxOn
+% \end{macrocode}
+%
+% Stub tag support if tagging has not been enabled.
+% \begin{macrocode}
+\cs_if_exist:NF\tag_mc_begin:n{
+ \cs_new:Npn\tag_mc_begin:n#1{}
+ \cs_new:Npn\tag_mc_end:{}
+}
+% \end{macrocode}
+%
% \begin{macrocode}
\AtBeginDocument{
- \ifx\longtable\@undefined\else
\def\LT@@hline{%
\ifx\LT@next\hline
\global\let\LT@next\@gobble
@@ -1517,7 +1529,10 @@
\else
\gdef\CT@LT@sep{%
\multispan\LT@cols{%
- \CT@drsc@\leaders\hrule\@height\doublerulesep\hfill}\cr}%
+ \tag_mc_begin:n{artifact}
+ \CT@drsc@\leaders\hrule\@height\doublerulesep\hfill
+ \tag_mc_end: \int_gdecr:N \g__tbl_row_int
+ }\cr}%
\fi
\else
\global\let\LT@next\empty
@@ -1526,13 +1541,20 @@
\fi
\ifnum0=`{\fi}%
\multispan\LT@cols
- {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr
+ {\tag_mc_begin:n{artifact}
+ \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill
+ \tag_mc_end: \int_gdecr:N \g__tbl_row_int
+ }\cr
\CT@LT@sep
\multispan\LT@cols
- {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr
+ {\tag_mc_begin:n{artifact}
+ \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill
+ \tag_mc_end: \int_gdecr:N \g__tbl_row_int
+ }\cr
\noalign{\penalty\@M}%
\LT@next}
- \fi}
+ }
+\ExplSyntaxOff
% \end{macrocode}
%
%
diff --git a/Master/texmf-dist/source/latex/delimset/delimset.dtx b/Master/texmf-dist/source/latex/delimset/delimset.dtx
index 9bd070b5ea1..337f1a4271e 100644
--- a/Master/texmf-dist/source/latex/delimset/delimset.dtx
+++ b/Master/texmf-dist/source/latex/delimset/delimset.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-% delimset.dtx Copyright (C) 2016-2018 Niklas Beisert
+% delimset.dtx Copyright (C) 2016-2024 Niklas Beisert
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,15 +18,15 @@
% and the derived files delimset.sty and dlmssamp.tex
%
%<package|sample>\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-%<package>\ProvidesPackage{delimset}[2018/12/30 v1.1 convenient size control for delimiter sets]
-%<sample>\ProvidesFile{dlmssamp.tex}[2018/12/30 v1.1 sample for delimset]
+%<package>\ProvidesPackage{delimset}[2024/07/17 v2.0 convenient size control for delimiter sets]
+%<sample>\ProvidesFile{dlmssamp.tex}[2024/07/17 v2.0 sample for delimset]
%<*driver>
-%\ProvidesFile{delimset.drv}[2018/12/30 v1.1 delimset Reference Manual file]
+%\ProvidesFile{delimset.drv}[2024/07/17 v2.0 delimset Reference Manual file]
\PassOptionsToClass{10pt,a4paper}{article}
\documentclass{ltxdoc}
\usepackage[margin=35mm]{geometry}
-\usepackage{hyperref}
+\usepackage[hyperindex=false]{hyperref}
\usepackage{hyperxmp}
\usepackage[usenames]{color}
\usepackage{amsmath,amsfonts}
@@ -36,7 +36,7 @@
\hypersetup{pdfpagemode=UseNone}
\hypersetup{pdfsource={}}
\hypersetup{pdflang={en-UK}}
-\hypersetup{pdfcopyright={Copyright 2016-2018 Niklas Beisert.
+\hypersetup{pdfcopyright={Copyright 2016-2024 Niklas Beisert.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
of this license or (at your option) any later version.}}
@@ -50,6 +50,8 @@
\newcommand{\secref}[1]{\hyperref[#1]{section \ref*{#1}}}
+\def\textvert{\texttt{\char"7C}}
+
\parskip1ex
\parindent0pt
\let\olditemize\itemize
@@ -67,7 +69,7 @@
{\texttt{nbeisert@itp.phys.ethz.ch}}}
\hypersetup{pdfauthor={Niklas Beisert}}
\hypersetup{pdfsubject={Manual for the LaTeX2e Package delimset}}
-\date{30 December 2018, \textsf{v1.1}}
+\date{17 July 2024, \textsf{v2.0}}
\maketitle
\begin{abstract}\noindent
@@ -99,9 +101,10 @@ For example:
\\
|(v,w)| &\to (v,w)
\\
-|\langle\psi\vert M\vert\psi\rangle| &\to \langle\psi\vert M\vert\psi\rangle
+|\langle\psi|\textvert|M|\textvert|\psi\rangle|
+&\to \langle\psi\vert M\vert\psi\rangle
\\
-|(x^2+px+q)\vert_{-p/2}| &\to (x^2+px+q)\vert_{-p/2}
+|(x^2+px+q)|\textvert|_{-p/2}| &\to (x^2+px+q)\vert_{-p/2}
\\&\ldots
\end{aligned}
\]
@@ -109,8 +112,9 @@ For example:
In order to adjust the size of delimiters, the modifiers
|\big|, |\Big|, |\bigg|, |\Bigg| are used.
More importantly the construct
-{|\left*| \ldots [|\middle*|] \ldots |\right*|}
+{|\left*| \ldots [|\middle*|] \ldots |\right*|}
adjusts the size of delimiters to the contents:
+%
\[
\Bigg[\bigg[\Big[\big[[*]\big]\Big]\bigg]\Bigg],
\qquad
@@ -150,16 +154,17 @@ the size |\big(...\big)|:
\]
The package \textsf{delimset} provides mechanisms to declare sets of delimiters
-whose size can be adjusted conveniently by simple optional parameters.
+whose size can be adjusted conveniently by adding simple flag parameters.
For example, it provides a general purpose bracket |\brk|
which can be used as follows:
+%
\[
\begin{aligned}
|\brk{A\hat{X}+B}|&\to(A\hat{X}+B)
\\
|\brk*{A\hat{X}+B}|&\to\mathopen{}\mathclose{\left(A\hat{X}+B\right)}
\\
-|\brk2{A\hat{X}+B}|&\to\Bigl(A\hat{X}+B\Bigr)
+|\brk^2{A\hat{X}+B}|&\to\Bigl(A\hat{X}+B\Bigr)
\\
|\brk!{A\hat{X}+B}|&\to\bigl(A\hat{X}+B\bigr)
\end{aligned}
@@ -198,16 +203,18 @@ the more difficult it will be to adjust them
to obtain a visually acceptable result.
The main functionality of the package is based on a
-versatile mechanism to specify sets of delimiters, e.g.:
+versatile mechanism to specify sets of delimiters,
+e.g.:
+%
\[
\begin{aligned}
|\delim<>{ax+b}|
&\to\langle ax+b\rangle
\\
-|\delimpair{[}{[.],}{[}!{a}{b}|
+|\delimpair[{*,}[!{a}{b}|
&\to \bigl[a, b\bigr[
\\
-|\delimtriple<\vert\vert>*{\psi}{A^\dagger}{\psi}|
+|\delimtriple<|\textvert\textvert|>*{\psi}{A^\dagger}{\psi}|
&\to\left\langle\psi\middle\vert A^\dagger\middle\vert \psi\right\rangle
\end{aligned}
\]
@@ -216,14 +223,14 @@ The command |\delim| can be used on the fly, but also
in definitions of custom delimiter sets such as:
%
\[
-|\newcommand{\comm}{\delimpair{[}{[.],}{]}}|
+|\newcommand{\comm}{\delimpair{[}{*,}{]}}|
\]
%
Note that the definition of |\comm| does not specify any arguments.
They are nevertheless read by the incomplete definition of |\delimpair|
-from the what follows |\comm|.
+from what follows |\comm|.
In particular, this incomplete definition
-enables the correct parsing of the optional size specifier,
+enables the correct parsing of the optional size specifier flag,
e.g.:
%
\[
@@ -238,7 +245,7 @@ The above definition could be written as follows:
\begin{aligned}
&|\DeclareMathDelimiterSet{\comm}[2]|
\\
-&\qquad |{\selectdelim[l]{[}{#1},{#2}\selectdelim[r]{]}}|
+&\qquad |{\selectdeliml{[}{#1},{#2}\selectdelimr{]}}|
\end{aligned}
\]
@@ -260,9 +267,9 @@ of the currently selected math font
Unfortunately, it does not account for
the currently selected math style.
Therefore, the size of delimiters in sub/superscripts
-cannot be adjusted appropriately,
-\unskip\footnote{Arguably, it is bad typesetting practice
-to have too complicated expressions in sub/superscripts.}
+cannot be adjusted appropriately
+(an arguably better typesetting practice is
+to avoid complicated expressions in sub/superscripts in the first place),
they come out way too big:
%
\[
@@ -272,7 +279,7 @@ they come out way too big:
This package modifies the definitions of
the size modifiers (of \textsf{amsmath})
to automatically adjust to sub/superscripts
-(subject to availability):
+(subject to availability in the font):
%
\[
\makeatletter
@@ -282,6 +289,7 @@ to automatically adjust to sub/superscripts
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Spacing and Math Classes}
+\label{sec:spacing}
Another shortcoming of the variable-size delimiters is that
the spacing is noticeably different from their fixed-size counterparts:
@@ -291,12 +299,12 @@ the spacing is noticeably different from their fixed-size counterparts:
|\square(ax+b)\square|
&\to \square(ax+b)\square
\\
-|\square\left(ax+b\right)\square|
-&\to \square\left(ax+b\right)\square
-\\
|\square\bigl(ax+b\bigr)\square|
&\to \square\bigl(ax+b\bigr)\square
\\
+|\square\left(ax+b\right)\square|
+&\to \square\left(ax+b\right)\square
+\\
|\square\left(ax+\big.b\right)\square|
&\to \square\left(ax+\big.b\right)\square
\end{aligned}
@@ -328,8 +336,9 @@ For practical purposes, consistent spacing can only be achieved
by a more convenient mechanism.
On a related note, it is important to correctly specify
-the math class (|\mathopen|\hspace{0pt}/\hspace{0pt}|\mathclose|)
+the math class (such as |\mathopen| or |\mathclose|)
for the delimiters, for example:
+%
\[
\begin{aligned}
|\big(-1\big)| &\to \big(-1\big)
@@ -340,19 +349,23 @@ for the delimiters, for example:
%
The math class can also make a major difference for intermediate delimiters,
e.g.:
+%
\[
\begin{aligned}
-|\bigl\langle\psi\big\vert\psi\bigr\rangle|
-&\to \bigl\langle\psi\big\vert\psi\bigr\rangle
+|\bigl<\psi\big|\textvert|\psi\bigr>|
+&\to \bigl<\psi\big\vert\psi\bigr>
\\
-|\bigl\langle\psi\bigm\vert\psi\bigr\rangle|
-&\to \bigl\langle\psi\bigm\vert\psi\bigr\rangle
+|\bigl<\psi\mathpunct\big|\textvert|\psi\bigr>|
+&\to \bigl\langle\psi\mathpunct\big\vert\psi\bigr>
\\
-|\bigl\langle\psi\mathbin\big\vert\psi\bigr\rangle|
-&\to \bigl\langle\psi\mathbin\big\vert\psi\bigr\rangle
+|\bigl<\psi\mathinner\big|\textvert|\psi\bigr>|
+&\to \bigl\langle\psi\mathinner\big\vert\psi\bigr>
\\
-|\bigl\langle\psi\mathpunct\big\vert\psi\bigr\rangle|
-&\to \bigl\langle\psi\mathpunct\big\vert\psi\bigr\rangle
+|\bigl<\psi\mathbin\big|\textvert|\psi\bigr>|
+&\to \bigl\langle\psi\mathbin\big\vert\psi\bigr>
+\\
+|\bigl<\psi\bigm|\textvert|\psi\bigr>|
+&\to \bigl\langle\psi\bigm\vert\psi\bigr>
\end{aligned}
\]
%
@@ -364,6 +377,67 @@ of the left and right delimiters. It also offers several choices for
intermediate delimiters to take the context into account.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Compounds and Broken Lines}
+
+The mechanism provided by the package requires the delimited expression
+to appear as an uninterrupted compound. In particular, the expression cannot
+span several lines in a multi-line equation or several columns in a matrix.
+The same restriction applies to the elementary |\left| and |\right| construct.
+In cases where delimited expressions are torn apart across several blocks,
+the delimiters have to be typeset individually.
+The package offers a mechanism to display individual delimiters
+of a given delimiter set. It also assists in maintaining
+the same type and size across blocks.
+Being able to display individual delimiters of defined delimiter sets
+offers a broad range of (ab)use.
+
+Individual delimiters of a set can be selected and displayed
+by specifying appropriate flags,
+for example:
+%
+\[
+|\brk(|\to{(},\qquad
+|\brk)|\to{)}
+\]
+%
+These flags can be combined with the size specifier
+or other bracket modifiers,
+e.g.:
+%
+\[
+|\brk^3(|\to{\biggl(},\qquad
+|\brk[s]^2)|\to{\Bigr]}
+\]
+%
+This enables to conveniently split delimited expressions over blocks of code,
+e.g.:
+%
+\[
+|\brk[s]^3(\frac{A}{B}|\ldots\Big/\mkern-9mu\Big/\ldots|\frac{C}{D}\brk[s]^3)|
+\to
+\biggl[\frac{A}{B}\cdots\bigg/\mkern-12mu\bigg/\cdots\frac{C}{D}\biggr]
+\]
+%
+Here, the type and modifiers specifying the delimiter set
+are repeated for all individual delimiters.
+To simplify such expressions and their maintenance,
+the package provides global registers which store
+the type and size of delimiters.
+With those, the above expression can be abbreviated as:
+%
+\[
+|\brk[s]^3[|\ldots\big/\mkern-6mu\big/\ldots|\usedelim]|
+\quad\text{or}\quad
+|\brk[s]^3[|\ldots\big/\mkern-6mu\big/\ldots|\brk]|
+\]
+%
+Here, |\usedelim]|, alternatively |\brk]|,
+closes the delimiter set with
+the type and options previously specified by |\brk...[|.
+For nesting purposes, there also exists a more elaborate
+solution using registers, see below.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Philosophy}
Semantic typesetting is one of the philosophies behind \LaTeX{}:
@@ -435,17 +509,17 @@ Modifier letters can be prepended and appended to adjust their size.
%
A functionality of the present package
not offered by any of the above packages is
-to typeset delimiters on the fly, e.g.:
+to typeset delimiters on the fly,
+e.g.:
%
\[
-|\delim<\vert>!{\psi}{\psi}|
-\to\bigl\langle\psi\big\vert\psi\bigr\rangle
+|\delim<|\textvert|>!{\psi}{\psi}|
+\to\bigl<\psi\big\vert\psi\bigr>
\]
%
The mechanism to specify the size is leaner in the sense that it uses
only a single character and a single command.
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Usage}
@@ -457,139 +531,377 @@ If not yet present,
the package \textsf{amsmath} will be loaded automatically.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Inline Usage}
-\label{sec:delimcommands}
+\subsection{Delimiter Sets and Presentation Flags}
+\label{sec:flags}
+
+The package provides commands to represent various delimiter sets,
+see \secref{sec:inline} and \secref{sec:declare} below.
+Their display can be modified systematically by specifying flags.
+A delimiter set |\|\emph{name}, e.g.\ |\brk|, is typically invoked by
+a sequence like:
+%
+\[
+|\|\emph{name}\ \emph{flags}\ |{|\emph{expr1}|}||{|\emph{expr2}|}|\ldots
+\]
+%
+where \emph{expr(n)} are the terms to be enclosed by the delimiters
+and the optional \emph{flags} adjust the presentation of delimiters.
+The \emph{flags} are described as follows:
+
+First, a size modifier flag controls the size of the delimiters
+to be displayed. It can take one of the following values:
+%
+\[
+\begin{aligned}
+|0|&\qquad \text{default size}
+\text{ (0.96 times default line height)}
+\\
+|!|, |+|, |^1|&\qquad \text{size }|\big|
+\text{ (1.2 times default line height)}
+\\
+|^2|&\qquad \text{size }|\Big|
+\text{ (1.8 times default line height)}
+\\
+|^3|&\qquad \text{size }|\bigg|
+\text{ (2.4 times default line height)}
+\\
+|^4|&\qquad \text{size }|\Bigg|
+\text{ (3.0 times default line height)}
+\\
+|^|\emph{n}, |^{|\emph{x}|}|&\qquad \text{flexible size adjustment
+(\emph{n}=|0|\ldots|9|; \emph{x}: decimal number)}
+\\
+|_{|\emph{h}|}|&\qquad \text{adjustment to absolute height \emph{h} (centred)}
+\\
+|*|&\qquad \text{variable size }|\left...\right|
+\end{aligned}
+\]
+%
+The intended delimiter size is stored as the dimension register:
+%
+\[
+|\delimsize|
+\]
+%
+It may be used to adjust spacing within the delimiter set
+proportional to the size of the delimiters.
+Note that the actual size of delimiters may deviate
+depending on availability within the given font.
+Note further that the size cannot be determined for variable-size delimiters
+(`|*|') and thus size |\Big| is assumed for this case.
+Note finally that the sub/superscript styles are not taken into
+account and |\delimsize| applies to the default case |\textstyle|.
+The package also supplies a macro to add horizontal glue
+proportional to the intended delimiter size:
+%
+\[
+|\kerndelim{|\emph{width}|}|
+\]
+%
+Here, \emph{width} is the amount of horizontal glue
+in units of mu scaled by the ratio of |\delimsize|
+and the current math font height.
+The macro does adjust for the selected script style.
+
+Second, a delimiter selection flag is used to pick out
+and display just one individual delimiter within the set.
+It can take one of the following values:
+%
+\[
+\begin{aligned}
+|(|&\qquad \text{left delimiter}
+\\
+\textvert, |,|&\qquad \text{first intermediate delimiter}
+\\
+|)|&\qquad \text{right delimiter}
+\\
+|?|\emph{n}&\qquad \text{\emph{n}-th delimiter (starting with |0|: left)}
+\end{aligned}
+\]
+
+Third, register flags store are retrieve delimiter
+for splitting the across blocks or lines:
+%
+\[
+\begin{aligned}
+|[|&\qquad \text{store delimiter type to register `|.|',
+display left delimiter (same as `|>.(|')}
+\\
+|]|&\qquad \text{display right delimiter stored in default register `|.|'
+(same as `|<.)|')}
+\\
+|>|\emph{r}, |>{|\emph{reg}|}|&\qquad \text{store delimiter type
+in register \emph{r} or \emph{reg}}
+\\
+|<|\emph{r}, |<{|\emph{reg}|}|&\qquad \text{retrieve delimiter type
+from register \emph{r} or \emph{reg}}
+\end{aligned}
+\]
+%
+A register stores the type of delimiter set (|\|\emph{name}),
+the desired size (except for variable size `|*|')
+as well as the math class of the compound (`|'|' vs. `|"|', see below).
+A stored register can be retrieved and displayed by the macro:
+%
+\[
+|\usedelim|\,\emph{r}\ \emph{sel}
+\quad\text{or}\quad
+|\usedelim|\{\emph{reg}\}\emph{sel}
+\]
+%
+Here, \emph{sel} is a flag to select an individual delimiter, see above.
+
+In addition, there are some general purpose flags:
+%
+\[
+\begin{aligned}
+|.|&\qquad \text{terminates flag processing}
+\\
+|:|&\qquad \text{enclose delimiter set in block
+(for using total box dimensions)}
+\\
+|'|&\qquad \text{render delimiter set as }|\mathopen|\text{ and }|\mathclose|
+\\
+|"|&\qquad \text{render delimiter set as }|\mathinner|
+\\
+|-|&\qquad \text{display phantom delimiters (for individual delimiters)}
+\end{aligned}
+\]
+
+Please note the following:
+%
+\begin{itemize}
+\item
+A delimiter selector (including the combined flags `|[|' and `|]|')
+terminates flag processing,
+therefore all relevant flags must be specified before it.
+\item
+Parsing also stops with the opening of the first term argument
+by means of the opening brace `|{|'.
+\item
+Parsing can also be terminated manually by specifying the flag `|.|'
+(in case the opening brace `|{|' for arguments is missing for whatever reason).
+\item
+Any other letter or token at the location of \emph{flags}
+is interpreted as an unrecognised flag and triggers a compiler error.
+For instance, |\brk{x}| must not be abbreviated as |\brk x|
+because `|x|' would be interpreted as a flag
+(it might be abbreviated as |\brk.x|).
+\item
+The legacy size modifier flags `|1|' \ldots `|4|'
+provided for backward compatibility have the same effect as `|^1|'\ldots`|^4|'.
+\item
+The phantom delimiter flag `|-|' does not work for variable size.
+It is intended for reserving space for individual delimiters
+when they are composed manually into sets (e.g.\ across lines).
+\item
+Technically, individual delimiters can be produced in the variable size version
+(even though it may defeat the purpose of the delimiter selection mechanism).
+One has to pay attention when using
+only the opening or only the closing delimiters from the package
+and counterbalancing it by direct code for the opposite side.
+This is because `|*(|' and `|*)|' do not directly translate to
+|\left|\emph{delim} and |\right|\emph{delim}
+due to proper spacing, see \secref{sec:spacing}.
+Instead, they translate to:
+%
+\[
+\begin{aligned}
+|*(|&\to|\mathopen{}\mathclose\bgroup\left|\emph{delim}
+\\
+|*)|&\to|\right|\emph{delim}|\egroup|
+\end{aligned}
+\]
+%
+One should use analogous code to complete the manual variable size block.
+
+Note that similar restrictions apply to using the flag `|:|'
+for block enclosure which uses |\bgroup| and |\egroup| as well.
+
+As it does not make much sense to use variable-size (`|*|')
+and block (`|:|') compounds for individual delimiter selection,
+the state of these flags is not stored in the global registers.
+\end{itemize}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Inline Declarations}
+\label{sec:inline}
The package provides three general purpose commands
to compose delimiter sets with one, two or three encapsulated expressions:
%
\[
\begin{aligned}
-&|\delim{|\emph{l}|}{|\emph{r}|}|\emph{size}|{|\emph{expr}|}|
+&|\delim{|\emph{l}|}{|\emph{r}|}|\emph{flags}|{|\emph{expr}|}|
\\
&|\delimpair{|\emph{l}|}{|\emph{m}|}{|\emph{r}|}|
-\emph{size}|{|\emph{expr1}|}{|\emph{expr2}|}|
+\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}|
\\
-&|\delimtriple{|\emph{l}|}{|\emph{m1}|}{|\emph{m2}|}{|\emph{r}|}|
-\emph{size}|{|\emph{expr1}|}{|\emph{expr2}|}{|\emph{expr3}|}|
+&|\delimtriple{|\emph{l}|}{|\emph{m}|}{|\emph{n}|}{|\emph{r}|}|
+\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}{|\emph{expr3}|}|
\end{aligned}
\]
%
The expression(s) \emph{expr(n)} will be surrounded by the
delimiters \emph{l} and \emph{r}
and, in the case of more than one expression,
-they will be separated by the delimiters \emph{m(n)}:
+they will be separated by the delimiters \emph{m}, \emph{n}:
+%
\[
\emph{l}\ \emph{expr}\ \emph{r},
\qquad
\emph{l}\ \emph{expr1}\ \emph{m}\ \emph{expr2}\ \emph{r},
\qquad
-\emph{l}\ \emph{expr1}\ \emph{m1}\ \emph{expr2}\
-\emph{m2}\ \emph{expr3}\ \emph{r}
+\emph{l}\ \emph{expr1}\ \emph{m}\ \emph{expr2}\
+\emph{n}\ \emph{expr3}\ \emph{r}
\]
-Here, \emph{l} and \emph{r} have to be
-math delimiters (symbols which can be used for |\left| and |\right|) or
-the dot `.' for the null delimiter.
-The separators \emph{m(n)} can be plain math delimiters as well, but they can
-also be compound expression of the form |[|\emph{class}|]|\emph{delim}
-where \emph{class} specifies
-the intended math class of the delimiter \emph{delim}:
+Here, \emph{l}, \emph{r}, \emph{m}, \emph{n}
+should be math delimiters \emph{delim}
+(elementary symbols which can be used for |\left| and |\right|)
+or the dot `|.|' for the null delimiter.
+The delimiter set expression can be adjusted in two ways:
+
+First, size adjustment
+for the delimiters \emph{l}, \emph{r}, \emph{m}, \emph{n}
+can be suppressed by a starred variant:
+%
+\[
+|{*|\emph{token}|}|
+\qquad\text{or}\qquad
+|{*{|\emph{expr}|}}|
+\]
+%
+This allows to use an arbitrary \emph{token}
+or a compound expression \emph{expr} in place of a delimiter \emph{delim}.
+This is useful when a delimiter character should not adjust in size
+(e.g.\ commas), or if a flexible-size version of the character
+is not available. One might also use a compound expression
+to create a null delimiter with non-zero width
+(the width may be specified by |\kerndelim|
+to make it proportional to the delimiter size).
+
+Second, the intended math class
+of the intermediate delimiters \emph{m}, \emph{n}
+may be adjusted in order to achieve a more appropriate automatic spacing
+by using |{[|\emph{class}|]|\emph{delim}|}|.
+Here, \emph{class} specifies
+the intended math class of the delimiter \emph{delim}
+according to:
%
\[
-\begin{aligned}{}
+\begin{aligned}
\left.\begin{array}{r}
-\emph{delim}\\|{|\emph{delim}|}|\\|{[]|\emph{delim}|}|
+\emph{delim}\\|{|\emph{delim}|}|
\end{array}\right\}
-&\qquad\text{class }|\mathord|\text{ (similar to }|\big|)
-\\
-|{[l]|\emph{delim}|}|&\qquad
-\text{class }|\mathopen|\text{ (similar to }|\bigl|
-\text{, not for use in }|\delim...|)
-\\
-|{[r]|\emph{delim}|}|&\qquad
-\text{class }|\mathclose|\text{ (similar to }|\bigr|
-\text{, not for use in }|\delim...|)
+&\qquad
+\left\{\begin{array}{l}
+\text{no glue for size-adjusted delimiters (same as }|[o]|\text{)}
\\
-|{[o]|\emph{delim}|}|&\qquad
-\text{class }|\mathopen|\text{ (similar to }|\bigl|)
+\text{determined by expression for unadjusted size (}|*|\text{ variant)}
+\end{array}\right.
\\
-|{[c]|\emph{delim}|}|&\qquad
-\text{class }|\mathclose|\text{ (similar to }|\bigr|)
-\\
-|{[m]|\emph{delim}|}|&\qquad
-\text{class }|\mathrel|\text{ (similar to }|\bigm|)
+|{[o]|\emph{delim}|}|
+&\qquad
+\text{no glue, similar to }|\big|, |\mathord|, |\mathopen|, |\mathclose|
\\
|{[p]|\emph{delim}|}|&\qquad
-\text{class }|\mathpunct|\text{ (similar to }|\bigp|)
+\text{followed by }|\thinmuskip|\text{, similar to }|\bigp|, |\mathpunct|
+\\
+|{[i]|\emph{delim}|}|&\qquad
+\text{surrounded by }|\thinmuskip|\text{, similar to }|\bigi|, |\mathinner|
\\
|{[b]|\emph{delim}|}|&\qquad
-\text{class }|\mathbin|\text{ (similar to }|\bigb|)
+\text{surrounded by }|\medmuskip|\text{, similar to }|\bigb|, |\mathbin|
\\
-|{[.]|\emph{expr}|}|&\qquad
-\text{no size adjustment, \emph{expr} can be any expression}
+|{[m]|\emph{delim}|}|&\qquad
+\text{surrounded by }|\thickmuskip|\text{, similar to }|\bigm|, |\mathrel|
\end{aligned}
\]
-%
-Note that the left and right delimiters \emph{l} and \emph{r} effectively
-have |[l]| and |[r]| prepended, respectively,
-and therefore they must be a plain math delimiter.
-Conversely, the immediate delimiters \emph{m(n)} must not
-have the |[l]| and |[r]| classes
-because the latter must appear precisely once
-and they are already taken by \emph{l} and \emph{r};
-use classes |[o]| and |[c]| instead.
-The optional size modifier \emph{size} should take one of the following values:
+Please note the following:
+%
+\begin{itemize}
+\item
+The left and right delimiters \emph{l} and \emph{r}
+are assigned to special classes:
+They leave no initial and final glue on the enclosed expressions
+(same as |\mathopen| and |\mathclose|).
+From the outside, the delimiter set appears
+either as a combination of |\mathopen|+|\mathclose| (flag `|'|')
+or as |\mathinner| (flag `|"|').
+\item
+The legacy class |[.]| provided for backward compatibility
+specifies delimiters with unadjusted size:
+the compound |{[.]|\emph{expr}|}| has the same effect as |{*{|\emph{expr}|}}|.
+\item
+The legacy class |[c]| provided for backward compatibility
+has the same effect as |[o]|.
+\item
+Unadjusted-size delimiters can be combined with math classes as:
+%
\[
-\begin{aligned}{}
-\emph{empty}, \emph{anything else}, |0|&\qquad \text{default size}
-\\
-|!|, |+|, |1|&\qquad \text{size }|\big|\text{ (|!| is preferred)}
-\\
-|2|&\qquad \text{size }|\Big|
-\\
-|3|&\qquad \text{size }|\bigg|
-\\
-|4|&\qquad \text{size }|\Bigg|
-\\
-|*|&\qquad \text{variable size }|\left...\right|
-\end{aligned}
+|{[|\emph{class}|]*|\emph{token}|}|
+\qquad\text{or}\qquad
+|{[|\emph{class}|]*{|\emph{expr}|}}|
\]
+%
+\item
+The opening square bracket `|[|'
+takes the dual role of indicating the optional |[|\emph{class}|]| argument.
+To avoid conflicts on intermediate delimiters,
+opening square bracket delimiters should be encoded as
+`|{{[}}|' (for |\delim...|) or `|{[}|' (for |\selectdelim|)
+rather than `|[|'.
+\end{itemize}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Declarations}
+\label{sec:declare}
The above constructs can be used to define new delimiter commands via:
%
\[
-|\newcommand{\|\emph{name}|}{\delim...{|\emph{l}|}...{|\emph{r}|}}|
+\begin{aligned}
+&|\newcommand{\|\emph{name}|}{\delim{|\emph{l}|}{|\emph{r}|}|
+\emph{flags}|}|
+\\
+&|\newcommand{\|\emph{name}|}{\delimpair{|\emph{l}|}{|\emph{m}|}{|\emph{r}|}|
+\emph{flags}|}|
+\\
+&|\newcommand{\|\emph{name}|}{\delimtriple{|\emph{l}|}{|\emph{m}|}|
+|{|\emph{n}|}{|\emph{r}|}|\emph{flags}|}|
+\end{aligned}
\]
%
-Here it makes sense to drop all arguments starting
-with the size modifier \emph{size} from the definition.
+Here it makes sense to drop all arguments
+starting at the optional \emph{flags} argument from the definition.
The \TeX{} parsing mechanism will then automatically
use the tokens following |\|\emph{name} including the optional size modifier.
-If the encapsulated expression(s) are to be passed as explicit arguments
-to |\|\emph{name}, one will have to find an alternative way to pass the
-optional size argument.
+If any of the encapsulated expression(s) are to be passed as
+explicit arguments to |\|\emph{name},
+one will have to find an alternative way to pass \emph{flags}.
+However, it is possible to predefine \emph{flags}
+which can be overridden by further \emph{flags} specified by the user.
The above declarations via |\delim...|
-should be sufficient for almost all situations.
+should be sufficient for most situations.
However, there is an even more flexible way to declare delimiter sets:
+%
\[
-|\DeclareMathDelimiterSet{\|\emph{name}|}[|\emph{narg}|]{|\emph{expr}|}|
+|\DeclareMathDelimiterSet{\|\emph{name}|}[|\emph{narg}|]{|\emph{compositor}|}|
\]
%
The syntax of this command is equivalent to the one of |\newcommand|.
The difference is that the command |\|\emph{name} first looks
-for the optional size modifier \emph{size} as
-described above in \secref{sec:delimcommands}.
-It remembers the desired size for evaluating the macro \emph{expr}.
+for the \emph{flags} argument as
+described above in \secref{sec:inline}.
+It remembers the desired size for evaluating
+the macro expression \emph{compositor}.
Then it parses the arguments as if the command
was declared by |\newcommand|.
-As usual, the macro \emph{expr} contains the command arguments
+As usual, the macro expression \emph{compositor} contains the command arguments
specified by |#1|, |#2|, \ldots. Note that these should
be encapsulated in groups |{#1}|, |{#2}|, \ldots,
in order to prevent them from overwriting definitions
@@ -598,16 +910,108 @@ It should also contain the desired math delimiters
specified by:
%
\[
-|\selectdelim[|\emph{class}|]{|\emph{delim}|}|
+\begin{aligned}
+&|\selectdeliml|[|*|]|{|\emph{delim}|}|
+\\
+&|\selectdelim[|\emph{class}|]|[|*|]|{|\emph{delim}|}|
+\\
+&|\selectdelimr|[|*|]|{|\emph{delim}|}|
+\end{aligned}
\]
%
+The three commands must be in proper sequence
+starting with |\selectdeliml| followed by arbitrarily many
+|\selectdelim| and terminated by |\selectdelimr|.
+The math classes \emph{class} and starred variants
+are defined analogously to \secref{sec:inline}.
Here, the sizes are adjusted automatically
-according to the previously specified modifier \emph{size}.
-The math classes must be in proper sequence,
-i.e.\ the first and last ones must be |l| and |r|, respectively,
-while the intermediate ones can be anything by |l| and |r|,
-see \secref{sec:delimcommands}.
+according to the previously specified modifier.
+
+Picking out individual delimiters from a set
+declared by |\DeclareMathDelimiterSet|
+cannot be achieved automatically.
+Instead, a selector method may be specified manually (where needed) by:
+%
+\[
+\begin{aligned}
+&|\DeclareMathDelimiterSel{\|\emph{name}|}|
+\\
+&| {\selectdeliml{|\emph{l}|}|[|\||or\selectdelim{|\emph{m}|}|\ldots]|}|
+\\
+&| {\selectdelimr{|\emph{r}|}}|
+\end{aligned}
+\]
+%
+As many intermediate delimiters as needed can be specified
+at the end of the first argument; each one must start with `|\||or|'.
+
+\makeatletter
+For example, one might declare a set of double square brackets
+$[\kern-0.06\big@size[*]\kern-0.06\big@size]$ using:
+\makeatother
+%
+\[
+\begin{aligned}
+&|\DeclareMathDelimiterSet{\dsb}[1]|
+\\
+&| {\selectdeliml{[}\kerndelim{-1.75}\selectdelim[o]{[}{#1}|
+\\
+&| \selectdelim[o]{]}\kerndelim{-1.75}\selectdelimr{]}}|
+\end{aligned}
+\]
+%
+Here, the command |\kerndelim{-1.75}| reduces the spacing
+between the two square brackets by approximately 1.75\,mu in default size.
+This could be used for:
+%
+\[
+\makeatletter
+|\dsb^4{\dsb^3{\dsb^2{\dsb^1{\dsb{*}}}}}|
+\to
+\Biggl[\kern-0.20\big@size\Biggl[
+\biggl[\kern-0.16\big@size\biggl[
+\Bigl[\kern-0.12\big@size\Bigl[
+\bigl[\kern-0.08\big@size\bigl[
+[\kern-0.06\big@size[*
+]\kern-0.06\big@size]
+\bigr]\kern-0.08\big@size\bigr]
+\Bigr]\kern-0.12\big@size\Bigr]
+\biggr]\kern-0.16\big@size\biggr]
+\Biggr]\kern-0.20\big@size\Biggr],
+\quad
+|\dsb*|\ldots\to
+\left[\kern-0.12\big@size\middle[\frac{x}{y}
+\middle]\kern-0.12\big@size\right]
+\makeatother
+\]
+%
+An appropriate selector method for displaying individual
+delimiters reads:
+%
+\[
+\begin{aligned}
+&|\DeclareMathDelimiterSel{\dsb}|
+\\
+&| {\selectdeliml{[}\kerndelim{-1.75}\selectdelim[o]{[}}|
+\\
+&| {\selectdelim[o]]\kerndelim{-1.75}\selectdelimr{]}}|
+\end{aligned}
+\]
+Finally, towards a very flexible manual composition
+of delimiter sets, there is the macro:
+%
+\[
+|\parsedelimflags{|\emph{compositor}|}{|\emph{selector}|}|\emph{flags}
+\]
+%
+It parses the modifier flags as described in \secref{sec:flags}.
+The argument \emph{compositor} is code that displays the
+composited delimiter set whereas \emph{selector} is a macro
+that displays the delimiter number |\selecteddelim| of the set.
+The \emph{flags} follow immediately and should be terminated by
+an opening brace `|{|', the terminating flag `|.|'
+or a delimiter selection flag.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Default Declarations}
@@ -617,30 +1021,34 @@ The package predefines four commonly used sets of delimiters:
%
\begin{itemize}
\item
-|\brk[|\emph{type}|]|\emph{size}|{|\emph{expr}|}| represents
+|\brk[|\emph{type}|]|\emph{flags}|{|\emph{expr}|}| represents
a standard bracket around a single expression \emph{expr}.
The type of bracket can be specified by the optional
argument \emph{type}:
+%
\[
\text{\emph{empty} or |[r]|: round }(x),\quad
\text{|[s]|: square }[x],\quad
\text{|[c]|: curly }\{x\},\quad
\text{|[a]|: angle }\langle x\rangle
\]
+%
\item
-|\eval[|\emph{type}|]|\emph{size}|{|\emph{expr}|}| represents
+|\eval[|\emph{type}|]|\emph{flags}|{|\emph{expr}|}| represents
evaluation of a functional expression \emph{expr}.
The type of bracket can be specified by the optional
argument \emph{type}:
+%
\[
\text{\emph{empty} or |[v]|: }f(x)\vert_{a},\qquad
\text{|[s]|: }[f(x)]_{a}^{b}
\]
+%
\item
-|\abs|\emph{size}|{|\emph{expr}|}| represents
+|\abs|\emph{flags}|{|\emph{expr}|}| represents
the absolute value $\lvert\emph{expr}\rvert$.
\item
-|\norm|\emph{size}|{|\emph{expr}|}| represents
+|\norm|\emph{flags}|{|\emph{expr}|}| represents
the norm $\lVert\emph{expr}\rVert$.
\end{itemize}
%
@@ -651,19 +1059,20 @@ The package also defines some extended sets of delimiters as follows:
%
\begin{itemize}
\item
-|\pair|\emph{size}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
+|\pair|\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
a pair(ing) $(\emph{expr1},\emph{expr2})$.
\item
-|\set|\emph{size}|{|\emph{expr}|}| represents
+|\set|\emph{flags}|{|\emph{expr}|}| represents
the set $\{\emph{expr}\}$.
\item
-|\setcond|\emph{size}|{|\emph{expr}|}{|\emph{cond}|}| represents
+|\setcond|\emph{flags}|{|\emph{expr}|}{|\emph{cond}|}| represents
a set with condition $\{\emph{expr}\vert\emph{cond}\}$.
\item
-|\intv[|\emph{type}|]|\emph{size}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
+|\intv[|\emph{type}|]|\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
an interval from \emph{expr1} to \emph{expr2}.
The in/\hspace{0pt}exclusion of the bounds can be specified by the optional
argument \emph{type}:
+%
\[
\text{\emph{empty} or |[c]|: closed }[a,b],\qquad
\text{|[o]|: open }]a,b[,\qquad
@@ -673,28 +1082,35 @@ argument \emph{type}:
\text{|[r]|: right-open }[a,b[
\end{array}
\]
+%
\item
-|\avg|\emph{size}|{|\emph{expr}|}| represents
+|\avg|\emph{flags}|{|\emph{expr}|}| represents
some average $\langle\emph{expr}\rangle$.
\item
-|\corr|\emph{size}|{|\emph{expr}|}| represents
+|\corr|\emph{flags}|{|\emph{expr}|}| represents
some correlator $\langle\emph{expr}\rangle$.
\item
-|\comm|\emph{size}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
+|\comm|\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
the commutator $[\emph{expr1},\emph{expr2}]$.
\item
-|\acomm|\emph{size}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
+|\acomm|\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
the anti-commutator $\{\emph{expr1},\emph{expr2}\}$.
\item
-|\bra|\emph{size}|{|\emph{expr}|}| represents
+|\bra|\emph{flags}|{|\emph{expr}|}| represents
a bra-vector $\langle\emph{expr}\rvert$ in quantum mechanics.
\item
-|\ket|\emph{size}|{|\emph{expr}|}| represents
+|\ket|\emph{flags}|{|\emph{expr}|}| represents
a ket-vector $\lvert\emph{expr}\rangle$ in quantum mechanics.
\item
-|\setcond|\emph{size}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
+|\braket|\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}| represents
a bra-ket contraction $\langle\emph{expr1}\vert\emph{expr2}\rangle$.
+\item
+|\lfrac[|\emph{type}|]|\emph{flags}|{|\emph{expr1}|}{|\emph{expr2}|}| describes
+the linear representation $\emph{expr1}/\emph{expr2}$ of a fraction.
+An optional argument \emph{type} taking values |[r]|, |[s]|, |[c]|, |[a]| encloses the
+fraction in round, square, curly or angle brackets as for |\brk|.
\end{itemize}
+%
The extended definitions need to be activated by
the package option |extdef|, see \secref{sec:packageoptions}.
@@ -707,10 +1123,10 @@ or taste of the user, they can be redefined with |\renewcommand|.
In addition to the |\bigl|, |\bigr| and |\bigm| commands
(as well as their |\Big.|, |\bigg.| and |\Bigg.| counterparts),
-the package defines two additional sets |\bigp| and |\bigb|
+the package defines three additional sets |\bigp|, |\bigb| and |\bigi|
(and counterparts).
-Here |\bigp| implies the math class |\mathpunct|
-and |\bigb| the class |\mathbin|.
+Here |\bigp| implies the math class |\mathpunct|,
+|\bigb| the class |\mathbin| and |\bigi| the class |\mathinner|.
Furthermore, the package overloads the size calculation in the |\big...|
commands to properly account for the math styles in sub/superscripts
@@ -722,7 +1138,8 @@ the package option |scriptstyle|, see \secref{sec:packageoptions}.
\subsection{Package Options}
\label{sec:packageoptions}
-Options can be passed to the package by
+Options can be passed to the package by:
+%
\[
|\usepackage[|\emph{opts}|]{delimset}|
\qquad
@@ -735,17 +1152,17 @@ Here \emph{opts} is a comma-separated list of the available options:
%
\begin{itemize}
\item
-|stddef|[|=true|$\vert$|false|]
+|stddef|[|=true|\textbar|false|]
controls the activation of standard delimiter definitions specified in
\secref{sec:defaultcommands}.
If no value is given |true| is assumed; initially set to |true|.
\item
-|extdef|[|=true|$\vert$|false|]
+|extdef|[|=true|\textbar|false|]
controls the activation of extended delimiter definitions specified in
\secref{sec:defaultcommands}.
If no value is given |true| is assumed; initially set to |false|.
\item
-|scriptstyle|[|=true|$\vert$|false|]
+|scriptstyle|[|=true|\textbar|false|]
controls the overwriting of size modifiers explained
in \secref{sec:auxcommands}.
If no value is given |true| is assumed; initially set to |true|.
@@ -758,7 +1175,7 @@ If no value is given |true| is assumed; initially set to |true|.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Copyright}
-Copyright \copyright{} 2016--2018 Niklas Beisert
+Copyright \copyright{} 2016--2024 Niklas Beisert
This work may be distributed and/or modified under the
conditions of the \LaTeX{} Project Public License, either version 1.3
@@ -808,7 +1225,7 @@ distribution, e.g.\ \textit{texmf-root}|/tex/latex/delimset|.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Interaction with CTAN Packages}
-The package relies on other packages:
+The package is related to other packages available at CTAN:
\begin{itemize}
\item
This package relies on some functionality of the package \textsf{amsmath}
@@ -820,24 +1237,63 @@ This package uses the package \textsf{keyval} from the \textsf{graphics} bundle
to process optional arguments to the package options.
Compatibility with the \textsf{keyval} package
has been tested with v1.15 (2014/10/28).
+\item
+The package \textsf{icomma} modifies the spacing behaviour
+of the comma character in math mode
+which leads to inadequate spacing when it is used as a middle delimiter.
+To achieve proper spacing in sample code,
+use |{[p]*,}| rather than |{*,}|.
+The extended commands |\intv|, |\comm|, |\acomm| and |\pair|
+are compatible with the \textsf{icomma} package
+has been tested with v2.0 (2002/03/10).
\end{itemize}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%\subsection{Feature Suggestions}
-% specify width of null delimiter?
-% automatic nesting of bracket types?
% make optional arguments work for DeclareMathDelimiterSet?
-% add pfrac for fraction a/b in text mode
+% (must go before parsing, but how to process and react?)
+% make unadjusted size have right height
+% automatic nesting of bracket types? -> depth stack?
% handle cramped style properly (perhaps impossible)
-% outer decorations for delimiters e.g. _y<a,b>_x
-% freestyle delimiter with size adjustment replacement \size{\rangle}_x
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Revision History}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\paragraph{v2.0:} 2024/07/17
+
+\begin{itemize}
+\item
+option to display individual delimiters
+and to store them in global registers across blocks
+(columns, lines, etc.)
+\item
+more general handling of unadjusted-size delimiters
+\item
+more general size adjustments
+\item
+added inner math class for intermediate delimiters
+\item
+added flag to enclose by open/close and inner math class
+\item
+added flag to display phantom delimiters
+\item
+selected size accessible by |\delimsize|
+and add proportional kerning by |\kerndelim|.
+\item
+added extended definition |\lfrac| for plain inline fractions
+\item
+null delimiter now properly has zero width for variable size
+\item
+internal mechanisms revised
+\item
+compatibility with \textsf{icomma} package
+(thanks to Olivier Godin for pointing out the issue)
+\end{itemize}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\paragraph{v1.1:} 2018/12/30
\begin{itemize}
@@ -914,11 +1370,11 @@ standard definitions
sizes for default brackets:
% \begin{macrocode}
\[
-\brk0{x},\quad
-\brk1{x},\quad
-\brk2{x},\quad
-\brk3{x},\quad
-\brk4{x}
+\brk^0{x},\quad
+\brk^1{x},\quad
+\brk^2{x},\quad
+\brk^3{x},\quad
+\brk^4{x}
\]
% \end{macrocode}
@@ -935,7 +1391,7 @@ styles for default brackets:
nested brackets:
% \begin{macrocode}
\[
-\brk[c]2{\brk[s]!{\brk{ax+b}x+c}x+d}
+\brk[c]^2{\brk[s]!{\brk{ax+b}x+c}x+d}
\]
% \end{macrocode}
@@ -952,7 +1408,7 @@ default absolute value, norm and default evaluations:
outer delimiter spacing:
% \begin{macrocode}
\begin{align*}
-&\square\brk0{x}\square,&&\square\brk1{A^k}\square,
+&\square\brk^0{x}\square,&&\square\brk^1{A^k}\square,
\\
&\square\brk*{x}\square,&&\square\brk*{A^k}\square
\end{align*}
@@ -969,7 +1425,7 @@ e^{\brk!{ax+b}}
delimiter declaration:
% \begin{macrocode}
\DeclareMathDelimiterSet{\braket}[2]
- {\selectdelim[l]<#1\selectdelim|#2\selectdelim[r]>}
+ {\selectdeliml<#1\selectdelim|#2\selectdelimr>}
\[
\braket!{\psi}{\psi},
\quad
@@ -988,32 +1444,36 @@ conditional set, alternative layouts:
% \begin{macrocode}
\[
\delimpair\{{[m]|}\}!{2n}{n\in\mathbb{Z}},
-\qquad
+\quad
\delimpair\{{[b]|}\}!{2n}{n\in\mathbb{Z}},
-\qquad
+\quad
+\delimpair\{{[i]|}\}!{2n}{n\in\mathbb{Z}},
+\quad
\delimpair\{{[p]|}\}!{2n}{n\in\mathbb{Z}},
-\qquad
+\quad
\delimpair\{|\}!{2n}{n\in\mathbb{Z}},
-\qquad
-\delimpair\{{[.];}\}!{2n}{n\in\mathbb{Z}}
+\quad
+\delimpair\{{*;}\}!{2n}{n\in\mathbb{Z}}
\]
conditional set, alternative layouts with variable size:
\[
\delimpair\{{[m]|}\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
+\quad
\delimpair\{{[b]|}\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
+\quad
+\delimpair\{{[i]|}\}*{2n}{n\in\mathbb{Z}\big.},
+\quad
\delimpair\{{[p]|}\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
+\quad
\delimpair\{|\}*{2n}{n\in\mathbb{Z}\big.},
-\qquad
-\delimpair\{{[.];}\}*{2n}{n\in\mathbb{Z}\big.}
+\quad
+\delimpair\{{*;}\}*{2n}{n\in\mathbb{Z}\big.}
\]
% \end{macrocode}
delimiter definition:
% \begin{macrocode}
-\newcommand{\comm}{\delimpair[{[.],}]}
+\newcommand{\comm}{\delimpair[{*,}]}
\[
\comm!{\comm{A}{B}}{C}
+\comm!{\comm{B}{C}}{A}
@@ -1024,7 +1484,7 @@ delimiter definition:
alternative representation:
% \begin{macrocode}
-\renewcommand{\comm}{\delimpair[{[.];}]}
+\renewcommand{\comm}{\delimpair[{*;}]}
\[
\comm!{\comm{A}{B}}{C}
+\comm!{\comm{B}{C}}{A}
@@ -1033,6 +1493,31 @@ alternative representation:
\]
% \end{macrocode}
+display individual delimiters of a set:
+% \begin{macrocode}
+\renewcommand{\braket}{\delimpair<|>}
+\[
+\braket{A}{B}
+\to \braket( A \braket| B \braket),
+\quad
+\braket*( A\big. \braket*| B_{} \braket*),
+\quad
+\braket^1( A \braket^3| B \braket^2)
+\]
+% \end{macrocode}
+
+placing indices before a bracket
+(does not work in variable-size mode because
+the final size is not available for the enclosed expressions):
+% \begin{macrocode}
+\DeclareMathDelimiterSet{\quadindex}[5]
+ {\selectdeliml.^{#2}_{#3}\mathord{}\selectdelim[o][
+ {#1}\selectdelim[o]]^{#4}_{#5}\selectdelimr.}
+\[
+\quadindex^2{\frac{x}{y}}{1}{2}{3}{4}
+\]
+% \end{macrocode}
+
% end of document body:
% \begin{macrocode}
\end{document}
@@ -1057,6 +1542,7 @@ alternative representation:
% if not yet present.
% \textsf{amsmath} is used for basic delimiter size functionality.
% \textsf{keyval} is used for extended options processing.
+%
% \begin{macrocode}
\RequirePackage{amsmath}
\RequirePackage{keyval}
@@ -1067,6 +1553,7 @@ alternative representation:
%
% The package has some boolean \textsf{keyval} options
% which can be set to |true| or |false|.
+%
% \begin{macrocode}
\newif\ifdlm@std\dlm@stdtrue
\newif\ifdlm@ext\dlm@extfalse
@@ -1083,7 +1570,7 @@ alternative representation:
% \end{macrocode}
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \paragraph{Internal Definitions.}
+% \paragraph{Improved Size Adjustments.}
%
% Overwrite the \textsf{amsmath} command |\bBigg@|
% to select the size according to the present math style
@@ -1105,102 +1592,269 @@ alternative representation:
\fi
% \end{macrocode}
-% Define punctuation marks (|\bigp|, etc.)
-% and binary operators (|\bigb|, etc.).
+% Define punctuation marks (|\bigp|, etc.),
+% binary operators (|\bigb|, etc.)
+% and inner class (|\bigi|, etc.).
%
% \begin{macrocode}
-\newcommand{\bigp}{\mathpunct\big}
-\newcommand{\Bigp}{\mathpunct\Big}
-\newcommand{\biggp}{\mathpunct\bigg}
-\newcommand{\Biggp}{\mathpunct\Bigg}
-\newcommand{\bigb}{\mathbin\big}
-\newcommand{\Bigb}{\mathbin\Big}
-\newcommand{\biggb}{\mathbin\bigg}
-\newcommand{\Biggb}{\mathbin\Bigg}
+\providecommand{\bigp}{\mathpunct\big}
+\providecommand{\Bigp}{\mathpunct\Big}
+\providecommand{\biggp}{\mathpunct\bigg}
+\providecommand{\Biggp}{\mathpunct\Bigg}
+\providecommand{\bigb}{\mathbin\big}
+\providecommand{\Bigb}{\mathbin\Big}
+\providecommand{\biggb}{\mathbin\bigg}
+\providecommand{\Biggb}{\mathbin\Bigg}
+\providecommand{\bigi}{\mathinner\big}
+\providecommand{\Bigi}{\mathinner\Big}
+\providecommand{\biggi}{\mathinner\bigg}
+\providecommand{\Biggi}{\mathinner\Bigg}
% \end{macrocode}
-% Define size selectors for standard size (|dlm@norm|),
-% variable size (|dlm@var|).
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \paragraph{Size Adjustment Definitions.}
+%
+% The macro |\dlm@setvar| enables variable size,
+% the macro |\dlm@setsize| sets a fixed size.
+% Delimiter sizes are implented by |\dlm@big@|.
+% The macro |\kerndelim| adds some kerning proportional
+% to the chosen fixed size of the delimiters
+% (the spacing is merely an approximation,
+% and it does not actually scale for flexible size).
+%
+% \begin{macrocode}
+\newlength\delimsize
+\newcommand{\dlm@setvar}{\let\dlm@ifvar\@firstoftwo\delimsize1.5\big@size}
+\newcommand{\dlm@setsize}[1]{\let\dlm@ifvar\@secondoftwo%
+ \delimsize#1\big@size\advance\delimsize by\big@size\delimsize0.5\delimsize}
+\newcommand{\dlm@setabssize}[1]{\let\dlm@ifvar\@secondoftwo\delimsize#1\relax}
+\newcommand{\dlm@big@}[1]{{\mathchoice%
+ {\dlm@big@choice{\displaystyle}{1}{#1}}%
+ {\dlm@big@choice{\textstyle}{1}{#1}}%
+ {\dlm@big@choice{\scriptstyle}{0.7}{#1}}%
+ {\dlm@big@choice{\scriptscriptstyle}{0.5}{#1}}}}
+\newcommand{\dlm@big@choice}[3]{\@mathmeasure\z@{\nulldelimiterspace\z@}%
+ {#1\left#3\vcenter to#2\delimsize{}\right.}\box\z@}
+\newcommand{\kerndelim}[1]{{\delimsize#1\delimsize%
+ \mkern\muexpr1.2mu*\delimsize/\big@size\relax}}
+% \end{macrocode}
+
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \paragraph{Math Classes Processing.}
+%
+% Define class selectors for fixed and unadjusted sizes.
%
% \begin{macrocode}
+\newcommand{\dlm@big}[2]{\dlm@plain{#1}{\dlm@big@#2}}
+\newcommand{\dlm@plain}[2]{\dlm@class{#1}{\dlm@phantom{#2}}}
\newcommand{\dlm@class}[1]{\csname dlm@class@#1\endcsname}
-\newcommand{\dlm@class@}{}
-\newcommand{\dlm@class@l}{\mathopen}
-\newcommand{\dlm@class@r}{\mathclose}
-\newcommand{\dlm@class@o}{\mathopen}
-\newcommand{\dlm@class@c}{\mathclose}
-\newcommand{\dlm@class@m}{\mathrel}
-\newcommand{\dlm@class@p}{\mathpunct}
-\newcommand{\dlm@class@b}{\mathbin}
-\newcommand{\dlm@norm}[1]{\dlm@class{#1}\bBigg@{0.0}}
-\newcommand{\dlm@big}[1]{\dlm@class{#1}\big}
-\newcommand{\dlm@Big}[1]{\dlm@class{#1}\Big}
-\newcommand{\dlm@bigg}[1]{\dlm@class{#1}\bigg}
-\newcommand{\dlm@Bigg}[1]{\dlm@class{#1}\Bigg}
+\let\dlm@class@\@firstofone
+\let\dlm@class@o\mathord
+\let\dlm@class@c\mathord
+\let\dlm@class@p\mathpunct
+\let\dlm@class@i\mathinner
+\let\dlm@class@b\mathbin
+\let\dlm@class@m\mathrel
+% \end{macrocode}
+
+% Define class selector for variable size.
+% The macro |\dlm@var@null| removes the extra space from
+% variable-size null delimiters
+% (|\left.|, |\middle.| and |\right.| apply the value
+% of |\nulldelimiterspace| only at the end of math processing,
+% even across blocks).
+% The macro |\dlm@var@kern| applies kerning unless in the script styles.
+%
+% \begin{macrocode}
+\newcommand{\dlm@var@null}[1]{\if.#1\kern-\nulldelimiterspace\fi}
+\newcommand{\dlm@var@kern}[1]{\nonscript\mkern#1}
\newcommand{\dlm@var}[1]{\csname dlm@var@#1\endcsname}
-\newcommand{\dlm@var@}[1]{\middle#1}
-\newcommand{\dlm@var@l}[1]{\mathopen{}\mathclose\bgroup\left#1}
-\newcommand{\dlm@var@r}[1]{\right#1\egroup}
-\newcommand{\dlm@var@o}[1]{\mathopen{}\middle#1\mathopen{}}
-\newcommand{\dlm@var@c}[1]{\mathclose{}\middle#1\mathclose{}}
-\newcommand{\dlm@var@m}[1]{\mathrel{}\middle#1\mathrel{}}
-\newcommand{\dlm@var@p}[1]{\middle#1\mathpunct{}}
-\newcommand{\dlm@var@b}[1]{\mathbin{}{}\mkern-\medmuskip%
- \middle#1\mkern-\medmuskip{}\mathbin{}}
+\newcommand{\dlm@var@}[1]{\dlm@var@null#1\middle#1}
+\let\dlm@var@o\dlm@var@
+\let\dlm@var@c\dlm@var@
+\newcommand{\dlm@var@p}[1]{\dlm@var@#1\dlm@var@kern\thinmuskip}
+\newcommand{\dlm@var@i}[1]{\dlm@var@kern\thinmuskip%
+ \dlm@var@#1\dlm@var@kern\thinmuskip}
+\newcommand{\dlm@var@b}[1]{\dlm@var@kern\medmuskip%
+ \dlm@var@#1\dlm@var@kern\medmuskip}
+\newcommand{\dlm@var@m}[1]{\dlm@var@kern\thickmuskip%
+ \dlm@var@#1\dlm@var@kern\thickmuskip}
+% \end{macrocode}
+
+% Definitions for selecting outer math class
+% |\mathopen|+|\mathclose| vs. |\mathinner|.
+%
+% \begin{macrocode}
+\newcommand{\dlm@open@i}{\mathinner{}\mathclose{}\mathopen}
+\newcommand{\dlm@close@i}{\mathclose{}\mathopen{}\mathinner}
+\newcommand{\dlm@inner@oc}{\mathopen{}\mathclose}
+\newcommand{\dlm@enclose@openclose}{%
+ \let\dlm@open\mathopen\let\dlm@close\mathclose\let\dlm@inner\dlm@inner@oc}
+\newcommand{\dlm@enclose@inner}{%
+ \let\dlm@open\dlm@open@i\let\dlm@close\dlm@close@i\let\dlm@inner\mathinner}
+% \end{macrocode}
+
+% Definitions for selecting inline vs. block insertion.
+%
+% \begin{macrocode}
+\newcommand{\dlm@inline@l}[1]{\dlm@open{#1}}
+\newcommand{\dlm@inline@r}[1]{\dlm@close{#1}}
+\newcommand{\dlm@block@l}[1]{\dlm@inner\bgroup\mathopen{#1}}
+\newcommand{\dlm@block@r}[1]{\mathclose{#1}\egroup}
+\newcommand{\dlm@enclose@inline}{%
+ \let\dlm@class@l\dlm@inline@l\let\dlm@class@r\dlm@inline@r}
+\newcommand{\dlm@enclose@block}{%
+ \let\dlm@class@l\dlm@block@l\let\dlm@class@r\dlm@block@r}
+% \end{macrocode}
+
+% Opening and closing definitions.
+%
+% \begin{macrocode}
+\newcommand{\dlm@plain@l}[1]{\dlm@class@l{\dlm@phantom{#1}}}
+\newcommand{\dlm@plain@r}[1]{\dlm@class@r{\dlm@phantom{#1}}}
+\newcommand{\dlm@big@l}[1]{\dlm@plain@l{\dlm@big@#1}}
+\newcommand{\dlm@big@r}[1]{\dlm@plain@r{\dlm@big@#1}}
+\newcommand{\dlm@var@l}[1]{\dlm@inner\bgroup\dlm@var@null#1\left#1}
+\newcommand{\dlm@var@r}[1]{\right#1\dlm@var@null#1\egroup}
+\newcommand{\dlm@var@pl}[1]{\dlm@var@l.\mathopen{#1}}
+\newcommand{\dlm@var@pr}[1]{\mathclose{#1}\dlm@var@r.}
+% \end{macrocode}
+
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \paragraph{Delimiter Storage.}
+%
+% Macros for storing and retrieving delimiter types using global registers.
+%
+% \begin{macrocode}
+\newcommand{\dlm@reg@save@init}[1]{%
+ \xdef#1{\delimsize\the\delimsize}\ifx\dlm@inner\mathinner%
+ \expandafter\gdef\expandafter#1\expandafter{#1\dlm@enclose@inner}\fi}
+\newcommand{\dlm@reg@save}[2]{%
+ \expandafter\dlm@reg@save@init\csname dlm@reg@init@#1\endcsname%
+ \expandafter\gdef\csname dlm@reg@sel@#1\endcsname{#2}}
+\newcommand{\dlm@reg@init}[1]{\csname dlm@reg@init@#1\endcsname}
+\newcommand{\dlm@reg@sel}[1]{\csname dlm@reg@sel@#1\endcsname}
% \end{macrocode}
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \paragraph{Optional Size Argument Processing.}
+% \paragraph{Flags Processing.}
%
-% Parse the optional argument following |\delim|\ldots\
-% commands to specify the size of delimiters.
-% If the next character in line begins a group (`|{|') it is assumed that
-% there is no optional argument.
-% Otherwise the selected size is written to |\dlm@arg|.
-% Unspecified or unknown sizes default to normal size.
-% Finally, execute the code passed as an explicit argument to |\dlm@parsesize|.
+% The macro |\parsedelimflags| parses the optional argument(s)
+% following |\delim|\ldots\ commands to adjust the presentation.
+% Parsing is terminated if the next character in line begins a group (`|{|')
+% and the delimiter set is composed by executing argument |#1|.
+% A size flag is stored and parsing continues.
+% A delimiter selector flag immediately displays the desired delimiter
+% by executing argument |#2|.
+% Unknown flags produce an error message.
%
% \begin{macrocode}
-\newcommand{\dlm@parsesize}[1]{\@ifnextchar\bgroup%
- {\dlm@parsesize@{#1}{0}}{\dlm@parsesize@{#1}}}
-\newcommand{\dlm@parsesize@}[2]{\let\dlm@arg\dlm@norm%
- \if0#2\let\dlm@arg\dlm@norm\fi%
- \if1#2\let\dlm@arg\dlm@big\fi%
- \if+#2\let\dlm@arg\dlm@big\fi%
- \if!#2\let\dlm@arg\dlm@big\fi%
- \if2#2\let\dlm@arg\dlm@Big\fi%
- \if3#2\let\dlm@arg\dlm@bigg\fi%
- \if4#2\let\dlm@arg\dlm@Bigg\fi%
- \if*#2\let\dlm@arg\dlm@var\fi%
- #1}
+\newcommand{\parsedelimflags}{\dlm@setsize{0.6}\let\dlm@phantom\@firstofone%
+ \dlm@enclose@openclose\dlm@enclose@inline\dlm@parseflags}
+\newcommand{\dlm@parseflags}[2]{%
+ \@ifnextchar\bgroup{#1}{\dlm@parseflag{#1}{#2}}}
+\newcommand{\dlm@parseflag}[3]{\begingroup%
+ \ifcsname dlm@parseflag@\string#3\endcsname%
+ \def\dlm@do{\csname dlm@parseflag@\string#3\endcsname{#1}{#2}}\else%
+ \def\dlm@do{\PackageError{delimset}%
+ {unknown delimiter set flag `\string#3'}{}#1}%
+ \fi\expandafter\endgroup\dlm@do}
+\newcommand{\dlm@parsedef}[3]{%
+ \expandafter\def\csname dlm@parseflag@\string#1\endcsname ##1##2#2{#3}}
% \end{macrocode}
+%
% Note that the delimited expression should be contained within a group
% such that nested delimiters will not overwrite the outer size definition.
+% Flags to adjust size.
+% Note that sizes 0 and 1 amount to 0.96 and 1.2 times
+% the current empty math box height.
+%
+% \begin{macrocode}
+\dlm@parsedef{!}{}{\dlm@setsize{1}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{+}{}{\dlm@setsize{1}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{0}{}{\dlm@setsize{0.6}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{1}{}{\dlm@setsize{1}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{2}{}{\dlm@setsize{2}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{3}{}{\dlm@setsize{3}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{4}{}{\dlm@setsize{4}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{^}{#3}{\dlm@setsize{#3}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{_}{#3}{\dlm@setabssize{#3}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{*}{}{\dlm@setvar\dlm@parseflags{#1}{#2}}
+% \end{macrocode}
+
+% Flags to select individual delimiters.
+%
+% \begin{macrocode}
+\dlm@parsedef{(}{}{\def\selecteddelim{0}#2}
+\dlm@parsedef{|}{}{\def\selecteddelim{1}#2}
+\dlm@parsedef{,}{}{\def\selecteddelim{1}#2}
+\dlm@parsedef{)}{}{\def\selecteddelim{9}#2}
+\dlm@parsedef{?}{#3}{\def\selecteddelim{#3}#2}
+% \end{macrocode}
+
+% Flags to access registers.
+%
+% \begin{macrocode}
+\dlm@parsedef{[}{}{\dlm@reg@save{.}{#2}\def\selecteddelim{0}#2}
+\dlm@parsedef{]}{}{\dlm@reg@init{.}\def\selecteddelim{9}\dlm@reg@sel{.}}
+\dlm@parsedef{>}{#3}{\dlm@reg@save{#3}{#2}}
+\dlm@parsedef{<}{#3}{\dlm@reg@init{#3}\dlm@parseflags%
+ {\PackageError{delimset}{must select delimiter}{}}{\dlm@reg@sel{#3}}}
+% \end{macrocode}
+
+% Further flags.
+%
+% \begin{macrocode}
+\dlm@parsedef{.}{}{#1}
+\dlm@parsedef{:}{}{\dlm@enclose@block\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{'}{}{\dlm@enclose@openclose\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{"}{}{\dlm@enclose@inner\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{-}{}{\let\dlm@phantom\phantom\dlm@parseflags{#1}{#2}}
+% \end{macrocode}
+
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \paragraph{Size Selection.}
+% \paragraph{Delimiter Display.}
%
-% The command |\selectdelim| reproduces the delimiter in the second argument
-% using the math class given in the first argument
-% using the previously selected size stored in |\dlm@arg|.
-% It appends the class identifier to the command stored in |\dlm@arg|
-% and calls the latter with the delimiter as the argument.
+% The command |\selectdelim| reproduces the delimiter in argument |#2|
+% using the math class given in argument |#1| and the previously stored size.
% If the class identifier is `|.|', just return the delimiter argument as is.
+% The commands |\selectdeliml| and |\selectdelimr|
+% implement the left and right delimiter classes, respectively.
+%
% \begin{macrocode}
-\newcommand{\selectdelim}[2][]{\if.#1#2\else\dlm@arg{#1}#2\fi}
+\newcommand{\selectdelim}[1][]{\begingroup\def\dlm@do{\@ifstar{\dlm@plain{#1}}%
+ {\dlm@ifvar{\dlm@var{#1}}{\dlm@big{#1}}}}%
+ \if.#1\let\dlm@do\@empty\fi\expandafter\endgroup\dlm@do}
+\newcommand{\selectdeliml}{\@ifstar%
+ {\dlm@ifvar\dlm@var@pl\dlm@plain@l}{\dlm@ifvar\dlm@var@l\dlm@big@l}}
+\newcommand{\selectdelimr}{\@ifstar%
+ {\dlm@ifvar\dlm@var@pr\dlm@plain@r}{\dlm@ifvar\dlm@var@r\dlm@big@r}}
% \end{macrocode}
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \paragraph{Declaration of New Delimiter Commands.}
%
-% Declares a new set of delimiters as the macro `|\|\emph{name}'.
-% This macro checks for an optional size argument and stores it in |\dlm@arg|.
+% The macro |\DeclareMathDelimiterSet| declares a new set of delimiters
+% as the macro `|\|\emph{name}'.
+% This macro checks for optional flags and stores the desired size.
% It then passes on to a second macro `|\dlm@dcl@|\emph{name}',
% which takes the actual code.
+% If the flags select an individual delimiter,
+% the macro `|\dlm@sel@|\emph{name}' is called instead.
+% The latter macro should be defined via |\DeclareMathDelimiterSel|
+% such that it produces the desired delimiter number |\selecteddelim|.
+%
% \begin{macrocode}
\newcommand{\DeclareMathDelimiterSet}[1]{\expandafter\dlm@declare%
\csname dlm@dcl@\expandafter\@gobble\string#1\endcsname{#1}}
-\def\dlm@declare#1#2{\newcommand{#2}{\dlm@parsesize{#1}}\newcommand{#1}}
+\def\dlm@declare#1#2{\expandafter\dlm@declare@%
+ \csname dlm@sel@\expandafter\@gobble\string#2\endcsname{#1}{#2}}
+\def\dlm@declare@#1#2#3{\newcommand{#3}{\parsedelimflags{#2}{#1}}%
+ \providecommand{#1}{}\newcommand{#2}}
+\newcommand{\DeclareMathDelimiterSel}[3]{\expandafter\def%
+ \csname dlm@sel@\expandafter\@gobble\string#1\endcsname%
+ {\ifcase\selecteddelim#2\else#3\fi}}
% \end{macrocode}
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1212,29 +1866,51 @@ alternative representation:
% are processed \emph{before} the optional size modifier.
%
% |\delim| is used for a single delimited expression.
+%
% \begin{macrocode}
-\newcommand{\delim}[2]
- {\dlm@parsesize{\dlm@dcl@delim{#1}{#2}}}
-\newcommand{\dlm@dcl@delim}[3]
- {\selectdelim[l]#1{#3}\selectdelim[r]#2}
+\newcommand{\delim}[2]{%
+ \parsedelimflags{\dlm@dcl@delim{#1}{#2}}{\dlm@sel@delim{#1}{#2}}}
+\newcommand{\dlm@dcl@delim}[3]{%
+ \selectdeliml#1{#3}\selectdelimr#2}
+\newcommand{\dlm@sel@delim}[2]{\ifcase\selecteddelim\selectdeliml#1%
+ \else\selectdelimr#2\fi}
% \end{macrocode}
% |\delimpair| is used for two delimited expressions separated
% by an intermediate delimiter.
+%
% \begin{macrocode}
-\newcommand{\delimpair}[3]
- {\dlm@parsesize{\dlm@dcl@delimpair{#1}{#2}{#3}}}
-\newcommand{\dlm@dcl@delimpair}[5]
- {\selectdelim[l]#1{#4}\selectdelim#2{#5}\selectdelim[r]#3}
+\newcommand{\delimpair}[3]{%
+ \parsedelimflags{\dlm@dcl@delimpair{#1}{#2}{#3}}%
+ {\dlm@sel@delimpair{#1}{#2}{#3}}}
+\newcommand{\dlm@dcl@delimpair}[5]{%
+ \selectdeliml#1{#4}\selectdelim#2{#5}\selectdelimr#3}
+\newcommand{\dlm@sel@delimpair}[3]{\ifcase\selecteddelim\selectdeliml#1%
+ \or\selectdelim#2\else\selectdelimr#3\fi}
% \end{macrocode}
% |\delimtriple| is used for three delimited expressions separated
% by two intermediate delimiters.
+%
% \begin{macrocode}
-\newcommand{\delimtriple}[4]
- {\dlm@parsesize{\dlm@dcl@delimtriple{#1}{#2}{#3}{#4}}}
-\newcommand{\dlm@dcl@delimtriple}[7]
- {\selectdelim[l]#1{#5}\selectdelim#2{#6}\selectdelim#3{#7}\selectdelim[r]#4}
+\newcommand{\delimtriple}[4]{%
+ \parsedelimflags{\dlm@dcl@delimtriple{#1}{#2}{#3}{#4}}%
+ {\dlm@sel@delimtriple{#1}{#2}{#3}{#4}}}
+\newcommand{\dlm@dcl@delimtriple}[7]{%
+ \selectdeliml#1{#5}\selectdelim#2{#6}\selectdelim#3{#7}\selectdelimr#4}
+\newcommand{\dlm@sel@delimtriple}[4]{\ifcase\selecteddelim\selectdeliml#1%
+ \or\selectdelim#2\or\selectdelim#3\else\selectdelimr#4\fi}
+% \end{macrocode}
+
+% |\usedelim| retrieves a stored delimiter type.
+% The argument `|]|' immediately closes the delimiter set
+% using the default register.
+% Otherwise the desired register must be followed
+% by the delimiter selection flag.
+%
+% \begin{macrocode}
+\newcommand{\usedelim}{\@ifnextchar]{\parsedelimflags{}{}}{\parsedelimflags%
+ {\PackageError{delimset}{must select delimiter}{}}{}<}}
% \end{macrocode}
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1243,17 +1919,18 @@ alternative representation:
% Define some common delimiters (by |providecommand| so as not to
% overwrite previously existing commands).
% This code is activated only if the package option |stddef| is set to |true|.
+%
% \begin{macrocode}
\ifdlm@std
\providecommand{\brk}[1][r]{\begingroup\def\dlm@use{\delim()}%
- \if r#1 \def\dlm@use{\delim()}\fi%
- \if s#1 \def\dlm@use{\delim[]}\fi%
- \if c#1 \def\dlm@use{\delim\{\}}\fi%
- \if a#1 \def\dlm@use{\delim<>}\fi%
+ \if r#1\def\dlm@use{\delim()}\fi%
+ \if s#1\def\dlm@use{\delim[]}\fi%
+ \if c#1\def\dlm@use{\delim\{\}}\fi%
+ \if a#1\def\dlm@use{\delim<>}\fi%
\expandafter\endgroup\dlm@use}
\providecommand{\eval}[1][v]{\begingroup\def\dlm@use{\delim.\rvert}%
- \if v#1 \def\dlm@use{\delim.\rvert}\fi%
- \if s#1 \def\dlm@use{\delim[]}\fi%
+ \if v#1\def\dlm@use{\delim.\rvert}\fi%
+ \if s#1\def\dlm@use{\delim[]}\fi%
\expandafter\endgroup\dlm@use}
\providecommand{\abs}{\delim\lvert\rvert}
\providecommand{\norm}{\delim\lVert\rVert}
@@ -1265,24 +1942,33 @@ alternative representation:
%
% Define some extended delimiters.
% This code is activated only if the package option |extdef| is set to |true|.
+%
% \begin{macrocode}
\ifdlm@ext
-\providecommand{\pair}{\delimpair({[.],})}
+\providecommand{\pair}{\delimpair({[p]*,})}
\providecommand{\set}{\delim\{\}}
\providecommand{\setcond}{\delimpair\{|\}}
-\providecommand{\intv}[1][c]{\begingroup\def\dlm@use{\delimpair[{[.],}]}%
- \if c#1 \def\dlm@use{\delimpair[{[.],}]}\fi%
- \if l#1 \def\dlm@use{\delimpair]{[.],}]}\fi%
- \if r#1 \def\dlm@use{\delimpair[{[.],}[}\fi%
- \if o#1 \def\dlm@use{\delimpair]{[.],}[}\fi%
+\providecommand{\intv}[1][c]{\begingroup%
+ \def\dlm@use{\delimpair[{[p]*,}]}%
+ \if c#1\def\dlm@use{\delimpair[{[p]*,}]}\fi%
+ \if l#1\def\dlm@use{\delimpair]{[p]*,}]}\fi%
+ \if r#1\def\dlm@use{\delimpair[{[p]*,}[}\fi%
+ \if o#1\def\dlm@use{\delimpair]{[p]*,}[}\fi%
\expandafter\endgroup\dlm@use}
\providecommand{\avg}{\delim<>}
\providecommand{\corr}{\delim<>}
-\providecommand{\comm}{\delimpair[{[.],}]}
-\providecommand{\acomm}{\delimpair\{{[.],}\}}
+\providecommand{\comm}{\delimpair[{[p]*,}]}
+\providecommand{\acomm}{\delimpair\{{[p]*,}\}}
\providecommand{\bra}{\delim<|}
\providecommand{\ket}{\delim|>}
\providecommand{\braket}{\delimpair<|>}
+\providecommand{\lfrac}[1][]{\begingroup%
+ \def\dlm@use{\delimpair./.}%
+ \if r#1\def\dlm@use{\delimpair(/)}\fi%
+ \if s#1\def\dlm@use{\delimpair[/]}\fi%
+ \if c#1\def\dlm@use{\delimpair\{/\}}\fi%
+ \if a#1\def\dlm@use{\delimpair</>}\fi%
+ \expandafter\endgroup\dlm@use}
\fi
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/delimset/delimset.ins b/Master/texmf-dist/source/latex/delimset/delimset.ins
index daf870b5ff8..68e41a72428 100644
--- a/Master/texmf-dist/source/latex/delimset/delimset.ins
+++ b/Master/texmf-dist/source/latex/delimset/delimset.ins
@@ -2,7 +2,7 @@
\input docstrip.tex
\keepsilent
-% delimset.ins Copyright (C) 2016-2018 Niklas Beisert
+% delimset.ins Copyright (C) 2016-2024 Niklas Beisert
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,7 +14,7 @@
\preamble
-Copyright (C) 2016-2018 Niklas Beisert
+Copyright (C) 2016-2024 Niklas Beisert
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 62519599eb8..803ccc09afd 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -14,7 +14,7 @@
% This work has the LPPL maintenance status `maintained'.
%<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15]
%<*class>
-\ProvidesExplClass{easybook}{2024/06/24}{2024cm}
+\ProvidesExplClass{easybook}{2024/07/15}{2024cs}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -301,7 +301,7 @@
%</class>
%<*package>
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/06/24}{2024cm}
+\ProvidesExplPackage{easybase}{2024/07/15}{2024cs}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -372,7 +372,11 @@
\IfNoValueTF{#1}
{\IfFileExists{#2.sty}{\RequirePackage{#2}[#3]}{}}
{\IfFileExists{#2.sty}{\RequirePackage[#1]{#2}[#3]}{}}
+ \IfFileExists{#2.sty}{}
+ {\msg_warning:nnn { easybase } { package-not-found } {#2}}
}
+\msg_new:nnn { easybase } { package-not-found }
+ { The~macro~package~'#1'~can't~be~found. }
\cs_new_protected:Npn \ebloadpackage #1
{
\int_compare:nTF { \clist_count:n {#1} <= 1 }
@@ -802,7 +806,7 @@
\UseFntSymbsList{empty}
\cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList
\cs_set_eq:NN \setfntsymbol \UseFntSymbsList
-\cs_new:Npn \eb_int_format_trans:NN #1
+\cs_new:Npn \eb_int_type_trans:NN #1
{
\str_case:nn {#1}
{
@@ -837,23 +841,38 @@
}
\cs_set_eq:NN \thedownfootnote \thefootnote
}
+\cs_generate_variant:Nn \msg_warning:nnnn { nnnV }
\cs_new_protected:Npn \eb_fnmarktext_short_label_set:Nn #1#2
{
\tl_set:Nn \l__eb_fnmarktext_short_tokens_tl {#2}
\clist_map_inline:nn
{ A,a,1,I,i,c,s }
{
- \regex_match:nnT {##1} {#2}
+ \regex_match:nnTF {##1} {#2}
{
\regex_replace_once:nnN {##1}
- { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} }
+ { \c{eb_int_type_trans:NN} ##1 \c{c@footnote} }
\l__eb_fnmarktext_short_tokens_tl
- \seq_map_break:
+ \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl
+ \clist_map_break:
+ }
+ {
+ \str_if_eq:nnT {##1} { s }
+ {
+ \str_if_eq:nnTF {#1} { \thefootnote }
+ { \str_set:Nn \l_tmpa_str { \thedownfootnote } }
+ { \str_set:Nn \l_tmpa_str { \theupfootnote } }
+ \msg_warning:nnnV { easybase } { unknown-fnt-type } {#2} \l_tmpa_str
+ }
}
}
- \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl
\cs_set_eq:NN \thedownfootnote \thefootnote
}
+\msg_new:nnn { easybase } { unknown-fnt-type }
+ {
+ The~'#1'~includes~unknown~footnote~numbering~type \\
+ in~#2.
+ }
\cs_new_protected:Npn \eb_footnote_value_handle:n #1
{
\str_case:nnF {#1}
@@ -1316,7 +1335,7 @@
{
\IfBooleanTF{##1}
{
- \use:c {#1}*{\phantomsection ##3}
+ \use:c {#1}*{##3}
\CTEX@addtocline{#1}{##2}
\tl_if_empty:oF {##4} { \CTEX@addbitocline{#1}{##4} }
\use:c { #1mark }{##2}
@@ -1338,22 +1357,22 @@
\skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
{ \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
}
-\cs_new_protected:Npn \eb_title_base_set_eq:nn #1#2
- {
- \tl_set_eq:cc { CTEX@#2@beforeskip } { CTEX@#1@beforeskip }
- \tl_set_eq:cc { CTEX@#2@afterskip } { CTEX@#1@afterskip }
- \bool_set_eq:cc { CTEX@#2@numbering } { CTEX@#1@numbering }
- \bool_set_eq:cc { CTEX@#2@fixskip } { CTEX@#1@fixskip }
- \bool_set_eq:cc { CTEX@#2@hang } { CTEX@#1@hang }
- \bool_set_eq:cc { CTEX@#2@runin } { CTEX@#1@runin }
- \cs_set_eq:cc { CTEX@#2@tocline } { CTEX@#1@tocline }
- \tl_set_eq:cc { CTEX@#2@break } { CTEX@#1@break }
- \tl_set_eq:cc { CTEX@#2@format } { CTEX@#1@format }
- \tl_set_eq:cc { CTEX@#2@nameformat } { CTEX@#1@nameformat }
- \tl_set_eq:cc { CTEX@#2@numberformat } { CTEX@#1@numberformat }
- \tl_set_eq:cc { CTEX@#2@titleformat } { CTEX@#1@titleformat }
- \tl_set_eq:cc { CTEX@#2@aftername } { CTEX@#1@aftername }
- \tl_set_eq:cc { CTEX@#2@aftertitle } { CTEX@#1@aftertitle }
+\cs_new_protected:Npn \CopyTitleFormat #1#2
+ {
+ \tl_set_eq:cc { CTEX@#1@beforeskip } { CTEX@#2@beforeskip }
+ \tl_set_eq:cc { CTEX@#1@afterskip } { CTEX@#2@afterskip }
+ \bool_set_eq:cc { CTEX@#1@numbering } { CTEX@#2@numbering }
+ \bool_set_eq:cc { CTEX@#1@fixskip } { CTEX@#2@fixskip }
+ \bool_set_eq:cc { CTEX@#1@hang } { CTEX@#2@hang }
+ \bool_set_eq:cc { CTEX@#1@runin } { CTEX@#2@runin }
+ \cs_set_eq:cc { CTEX@#1@tocline } { CTEX@#2@tocline }
+ \tl_set_eq:cc { CTEX@#1@break } { CTEX@#2@break }
+ \tl_set_eq:cc { CTEX@#1@format } { CTEX@#2@format }
+ \tl_set_eq:cc { CTEX@#1@nameformat } { CTEX@#2@nameformat }
+ \tl_set_eq:cc { CTEX@#1@numberformat } { CTEX@#2@numberformat }
+ \tl_set_eq:cc { CTEX@#1@titleformat } { CTEX@#2@titleformat }
+ \tl_set_eq:cc { CTEX@#1@aftername } { CTEX@#2@aftername }
+ \tl_set_eq:cc { CTEX@#1@aftertitle } { CTEX@#2@aftertitle }
}
\NewDocumentCommand{\NewTitleCommand}{omm}
{
@@ -1375,7 +1394,7 @@
{ \CTEXnumberline{##1}##2 }
\exp_args:Nc \providecommand { ttll@#2 }{#3}
\exp_args:Nc \providecommand { toclevel@#2 }{#3}
- \IfValueT{#1}{\eb_title_base_set_eq:nn {#1} {#2}}
+ \IfValueT{#1}{\CopyTitleFormat{#2}{#1}}
}
\NewDocumentCommand{\NewTitleEntryCommand}{O{toc}m}
{
@@ -1384,6 +1403,7 @@
\bool_if:cTF { CTEX@#2@numbering }
{ \CTEX@ifnametrue }
{ \CTEX@ifnamefalse }
+ \CTEX@makeanchor{#2*}
\addcontentsline{#1}{#2}{\use:c { CTEX@#2@tocline }{#2}{##1}}
}
}
@@ -1422,47 +1442,73 @@
\bool_new:N \l__eb_toc_notitle_bool
\newbool{bitoc}
\cs_new:Npn \ebifbitoc { \ifbool{bitoc} }
+\seq_new:N \l__eb_level_tmpa_seq
+\tl_new:N \l__eb_level_tmpa_tl
+\cs_generate_variant:Nn \regex_extract_all:nnN { no }
+\cs_generate_variant:Nn \keys_define:nn { nx }
+\cs_generate_variant:Nn \ctex_set:nn { ox }
+\cs_new_protected:Npn \eb_toc_extract_level:
+ {
+ \regex_extract_all:noN { \cC. } { \eb@toc@title@level }
+ \l__eb_level_tmpa_seq
+ \seq_get_right:NN \l__eb_level_tmpa_seq \l__eb_level_tmpa_tl
+ \tl_set:Nx \l__eb_level_tmpa_tl
+ {
+ \exp_last_unbraced:No
+ \cs_to_str:N { \l__eb_level_tmpa_tl }
+ }
+ \regex_replace_case_once:nN
+ {
+ { ^bi(.*) } { \1 }
+ { .* } { \0 }
+ }
+ \l__eb_level_tmpa_tl
+ }
\keys_define:nn { eb/tocouter }
{
- level .tl_set:N = \eb@toc@title@level,
- level .initial:n =
+ level .code:n =
+ {
+ \tl_set:Nn \eb@toc@title@level {#1}
+ \eb_toc_extract_level:
+ },
+ level .initial:e =
{
\bool_if:NTF \l__eb_class_mode_book_bool
- { \bichapter* }
- { \bisection* }
+ { \exp_not:N \bichapter* }
+ { \exp_not:N \bisection* }
},
- section .meta:n = { level = \bisection* },
- chapter .meta:n = { level = \bichapter* },
- none .code:n =
+ section .meta:n = { level = \bisection* },
+ chapter .meta:n = { level = \bichapter* },
+ none .code:n =
{
\tl_set:Nn \eb@toc@title@level
{ \par\use_none:nn }
\bool_set_true:N \l__eb_toc_notitle_bool
},
- multoc .int_set:N = \l__eb_toc_columns_int,
- multoc .default:n = 2,
- multoc .initial:n = 1,
+ multoc .int_set:N = \l__eb_toc_columns_int,
+ multoc .default:n = 2,
+ multoc .initial:n = 1,
plan .choice:,
plan .value_required:n = true,
- plan/cn .code:n =
+ plan/cn .code:n =
{
\bool_set_true:N \l__eb_toc_plan_cn_bool
\bool_set_false:N \l__eb_toc_plan_bi_bool
},
- plan/bi .code:n =
+ plan/bi .code:n =
{
\bool_set_false:N \l__eb_toc_plan_cn_bool
\bool_set_true:N \l__eb_toc_plan_bi_bool
},
- plan/both .code:n =
+ plan/both .code:n =
{
\bool_set_true:N \l__eb_toc_plan_cn_bool
\bool_set_true:N \l__eb_toc_plan_bi_bool
},
- plan .initial:n = cn,
- columns .meta:n = { multoc = {#1} },
- title .code:n = \eb_assign_toc_title:n {#1},
- bilist .code:n =
+ plan .initial:n = cn,
+ columns .meta:n = { multoc = {#1} },
+ title .code:n = \eb_assign_toc_title:n {#1},
+ bilist .code:n =
{
\tl_gset:Nn \g__eb_bilist_permute_value_tl {#1}
\str_if_eq:nnTF {#1} { mix }
@@ -1480,12 +1526,16 @@
}
}
},
- name .tl_set:N = \l__eb_print_index_name_tl,
- name .initial:n = \imki@jobname
+ name .tl_set:N = \l__eb_print_index_name_tl,
+ name .initial:n = \imki@jobname,
+ unknown .code:n =
+ {
+ \ctex_set:ox { \l__eb_level_tmpa_tl }
+ { \eb_unknown_kv_handle: }
+ },
+ unknown .default:V = \c_novalue_tl
}
-\bool_if:NTF \l__eb_class_mode_book_bool
- { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/chapter } }
- { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/section } }
+
\NewDocumentCommand{\eb_assign_toc_title:n}
{>{\SplitArgument{1}{,}}m}
{\eb_toc_assign_title_judge:nn #1}
@@ -1658,7 +1708,7 @@
{
tocformat = \IfBooleanT{#1}{\contentsmargin{0pt}},
tocindent = 0pt,
- tocrule = \IfBooleanTF{#1}{,~\thecontentspage}{\tocrule{$\cdot$}},
+ tocrule = \IfBooleanTF{#1}{,~\thecontentspage}{\cdottocrule},
toclabel =
{
\bool_if:NTF \l__eb_toc_entry_hang_bool
@@ -1729,7 +1779,7 @@
\eb@register@every@toc@option
}
\RegisterEveryTocOption{tocafter,tocindent,tocrule}
-\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}}
+\NewDocumentCommand{\tocrule}{st-O{0.6pc}d()mO{}}
{
\normalsize\normalfont
\ttl@row@i[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6
@@ -1746,6 +1796,7 @@
}
}
}
+\cs_set:Npn \cdottocrule { \tocrule{\textperiodcentered} }
\ctex_define:nn { toc }
{
lolskip .skip_set:N = \eb@toc@lol@skip,
@@ -1859,7 +1910,7 @@
{
tocformat = \addvspace{1pc}\sffamily,
tocindent = 0pt,
- tocrule = \tocrule{$\cdot$}[\bfseries],
+ tocrule = \cdottocrule[\bfseries],
tocline = \CTEXnumberline{#1}#2
},
section =
@@ -1869,8 +1920,8 @@
tocrule =
{
\bool_if:NTF \l__eb_class_mode_book_bool
- { \tocrule{$\cdot$} }
- { \tocrule{$\cdot$}[\bfseries] }
+ { \cdottocrule }
+ { \cdottocrule[\bfseries] }
}
},
subsection =
@@ -2633,7 +2684,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/24}{2024cm}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/15}{2024cs}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx b/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
index 43c6631bba5..c75575ee616 100644
--- a/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
+++ b/Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx
@@ -26,7 +26,7 @@
%<fancyhdr>\ProvidesPackage{fancyhdr}%
%<fancyheadings>\ProvidesPackage{fancyheadings}
%<extramarks>\ProvidesPackage{extramarks}
-%<fancyhdr|extramarks> [2024/04/23 v4.2
+%<fancyhdr|extramarks> [2024/07/18 v4.3
%<fancyhdr> Extensive control of page headers and footers]%
%<fancyheadings> [2022/11/09 v4.1
%<fancyheadings> Legacy package to call fancyhdr]
@@ -59,8 +59,6 @@
\def\pAmS{{\the\textfont2
A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}
\def\amslatex/{\ams/-\latex/}
-\newcommand{\PSNFSS}{{\sf
- PSNFSS}}
\newcommand{\bs}{\symbol{'134}}
\newcommand{\env}[1]{\texttt{#1}}
\newcommand{\Package}[1]{\textsf{#1}}
@@ -206,7 +204,7 @@
% \DoNotIndex{\#,\$,\%,\&,\@,\\,\{,\},\^,\_,\~,\ }
% \DoNotIndex{\@ne}
% \DoNotIndex{\advance,\begingroup,\catcode,\closein}
-% \DoNotIndex{\closeout,\day,\def,\edef,\else,\empty,\endgroup}
+% \DoNotIndex{\closeout,\day,\def,\edef,\else,\empty,\@empty,\endgroup}
%
% \title{The \Package{fancyhdr} and \Package{extramarks}
% packages\\{\normalsize version \fileversion.}}
@@ -228,7 +226,7 @@
%
% This documentation describes version 4.0 or later of the
% \Package{fancyhdr} and \Package{extramarks} packages. The user
-% documentation is valid for the versions 3.8 or later of the
+% documentation is valid for the versions 4.0 or later of the
% \Package{fancyhdr} package (except for the changes mentioned in
% section~\ref{sec:version-4}), and version 2.1 or later of the
% \Package{extramarks} package.
@@ -253,11 +251,11 @@
%
% Part IV contains the annotated implementation.
%
-% This document describes version 4 of \Package{fancyhdr}. This version
-% is also described in the forthcoming edition 3 of \textit{The \latex/ Companion},
-% whereas the previous editions describe version 3 of \Package{fancyhdr}.
-% There are some significant differences between these versions. These
-% are summarized in section~\ref{sec:version-4} on page~\pageref{sec:version-4}.
+% This document describes version 4 of \Package{fancyhdr}, which is described in
+% the \emph{The \LaTeX{} Companion, Third Edition}.
+% The differences between this version and previous versions
+% are summarized in section~\ref{sec:version-4} on
+% page~\pageref{sec:version-4}.
% Throughout this documentation it is mentioned when a specific feature
% is only available in version 4, or when there are differences between
% version 3 and 4.
@@ -304,16 +302,14 @@
% \OPTindex{twoside}
% \OPTindex{headings}
% \OPTindex{myheadings}
-% \DescribeMacro{\fancyhead}
-% \DescribeMacro{\fancyfoot}
-% \DescribeMacro{\fancyhf}
-% \begin{verbatim}
-% \fancyhead[places]{field}
-% \fancyfoot[places]{field}
-% \fancyhf[places]{field}
-% \end{verbatim}
-% Here \texttt{places} is a comma-separated list of places where
-% \texttt{field} will be placed. There are 12 places defined: Left,
+%
+% \begin{flushleft}
+% \DescribeMacro{\fancyhead}\cmd{\fancyhead}\oarg{places}\marg{field} \\
+% \DescribeMacro{\fancyfoot}\cmd{\fancyfoot}\oarg{places}\marg{field} \\
+% \DescribeMacro{\fancyhf}\cmd{\fancyhf}\oarg{places}\marg{field}
+% \end{flushleft}
+% Here \meta{places} is a comma-separated list of places where
+% \meta{field} will be placed. There are 12 places defined: Left,
% Center and Right Headers and Footers, and both can be on Even or Odd
% pages. Each place therefore has 3 coordinates which are the inital
% letters of the above description: (1) \texttt{E} or \texttt{O}, (2) \texttt{L}, \texttt{C} or
@@ -321,14 +317,12 @@
% letters, like \texttt{EOH}. A missing coordinate means: all
% possibilities, except for \cs{fancyhead} where \texttt{H} is implied
% and \cs{fancyfoot} where \texttt{F} is implied.
-% \DescribeMacro{\fancyheadoffset}
-% \DescribeMacro{\fancyfootoffset}
-% \DescribeMacro{\fancyhfoffset}
-% \begin{verbatim}
-% \fancyheadoffset[places]{field}
-% \fancyfootoffset[places]{field}
-% \fancyhfoffset[places]{field}
-% \end{verbatim}
+%
+% \begin{flushleft}
+% \DescribeMacro{\fancyheadoffset}\cmd{\fancyheadoffset}\oarg{places}\marg{length} \\
+% \DescribeMacro{\fancyfootoffset}\cmd{\fancyfootoffset}\oarg{places}\marg{length} \\
+% \DescribeMacro{\fancyhfoffset}\cmd{\fancyhfoffset}\oarg{places}\marg{length}
+% \end{flushleft}
% These define offsets to let the headers stick into the margin (or to
% the inside if negative). Places cannot contain the \texttt{C}
% specifier. See section~\ref{sec:book-examples} for more details.
@@ -340,7 +334,6 @@
% \DescribeMacro{\headrule}
% \DescribeMacro{\footrule}
% \DescribeMacro{\headwidth}
-%
% \cs{headrulewidth} and \cs{footrulewidth} are macros to define the
% thickness of a line under the header and above the footer.
% \cs{headruleskip} and \cs{footruleskip} are macros that define the
@@ -353,7 +346,6 @@
% \DescribeMacro{\fancyheadinit}
% \DescribeMacro{\fancyfootinit}
% \DescribeMacro{\fancyhfinit}
-%
% \cs{fancyheadinit} and \cs{fancyfootinit} can be used to define
% initialisation code for the header and footer, respectively, and
% \cs{fancyhfinit} defines both of these. These commands are only
@@ -367,7 +359,6 @@
% \DescribeMacro{\ifbotfloat}
% \DescribeMacro{\iffloatpage}
% \DescribeMacro{\iffootnote}
-%
% The macros \cs{iftopfloat}, \cs{ifbotfloat}, \cs{iffloatpage} and
% \cs{iffootnote} are used to detect if there is a float on the top or
% the bottom of the page, or the page is a float page, or if there is
@@ -375,10 +366,10 @@
% different headers and/or footers if these conditions are met. See
% section~\ref{sec:float} for more details.
%
-% \begin{quote}
-% \DescribeMacro{\fancypagestyle}
-% \verb|\fancypagestyle|\marg{style-name}\oarg{base-style}\marg{definitions}
-% \end{quote}
+% \begin{flushleft}
+% \DescribeMacro{\fancypagestyle}
+% \cmd{\fancypagestyle}\marg{style-name}\oarg{base-style}\marg{definitions}
+% \end{flushleft}
% This command lets you (re)define page styles for use in special
% situations. See section~\ref{sec:fancypagestyle} for more details.
%
@@ -393,13 +384,6 @@
% \DescribeMacro{\lastrightmark}
% \DescribeMacro{\firstrightmark}
% \DescribeMacro{\lastleftmark}
-% \begin{verbatim}
-% \firstleftmark
-% \lastrightmark
-% \firstrightmark
-% \lastleftmark
-% \end{verbatim}
-%
% Standard \latex/ has two marks: a left and a right one. The standard
% command \cs{leftmark} gives you the last left mark on a page, and
% \cs{rightmark} gives you the first right one. These macros give you
@@ -486,7 +470,7 @@
%
% The page headers and footers in \LaTeX{} are defined by the
% \cs{pagestyle} and \cs{pagenumbering} commands. \cs{pagestyle}
-% defines the general contents of the headers and footers (e.g. where the
+% defines the general contents of the headers and footers (e.g.\ where the
% page number will be printed), while
% \cs{pagenumbering} defines the format of the page number.
% \LaTeX{} has four standard page styles:
@@ -527,7 +511,7 @@
%
% These are not user commands, but rather ``variables'' that are used by
% \latex/'s output routine.
-% As the command names contain the character '\texttt{@}', they should
+% As the command names contain the character `\texttt{@}', they should
% be defined in a package file, or otherwise be sandwiched between the commands
% \cs{makeatletter} and \cs{makeatother}.
%
@@ -605,6 +589,12 @@
% We define each of the six ``fields'' and the two decorative lines
% separately.
%
+% \begin{fblock}
+% \textbf{NOTE:} In \Package{fancyhdr} version 4.3 and later, paragraph
+% hooks will not work inside \Package{fancyhdr} headers and footers to
+% avoid unwanted interactions with the main text.
+% \end{fblock}
+%
% \section{A simple example}
% \label{sec:simple}
%
@@ -784,7 +774,7 @@
% for which pages and/or parts of the header/footer they apply. The first
% \cs{fancyhead} command above omits this parameter, and thus applies to all
% header fields. In general this is only useful to get rid of the defaults or
-% a previous definition, as is done here. Similar the \cs{fancyfoot} command
+% a previous definition, as is done here. Similarly the \cs{fancyfoot} command
% without square brackets clears all footer fields. In this particular
% example it could be omitted as all footer fields have a value specified.
% The selectors that can be used
@@ -846,7 +836,7 @@
% \cs{ps@plain} command, but \Package{fancyhdr} gives you an easier way
% with the \cs{fancypagestyle} command. This command can be used to
% redefine existing page styles (like \texttt{plain}) or to define new ones,
-% e.g. if part of your document needs a different page style. This command
+% e.g.\ if part of your document needs a different page style. This command
% has two mandatory parameters: the first one is the name of the page style to be defined, the
% second consists of commands that change the headers and/or footers, i.e.,
% \verb|\fancyhead| etc. Also allowed are changes to \cs{headrulewidth} and
@@ -1105,8 +1095,8 @@
% section and subsection information (section only for one-sided
% printing). \latex/ uses a marker mechanism to remember the chapter and
% section (section and subsection) information for a page; this is
-% discussed in detail in \textit{The \latex/ Companion}, Section 4.3.1, or
-% \textit{The \latex/ Companion, Second Edition}, Section 4.3.4.
+% discussed in detail in \emph{The \LaTeX{} Companion, Third Edition},
+% section 5.3.4 (Part I).
%
% There are two ways you can use and change the higher- and lower-level
% sectioning information available to you. The macros:
@@ -1263,7 +1253,7 @@
%
% As an example let's take a page layout where the leftmarks are generated by
% the sections and the rightmarks by the subsections (as is default in the
-% \texttt{article} class). Take a page with some short sections, e.g.
+% \texttt{article} class). Take a page with some short sections, e.g.,
%
% \begin{samepage}
% \noindent Section 1.\\
@@ -1294,7 +1284,7 @@
% \end{verbatim}
%
% Another problem with the marks in the standard \latex/ classes is that the
-% higher level sectioning commands (e.g. \cs{chapter}) call
+% higher level sectioning commands (e.g.\ \cs{chapter}) call
% \cs{markboth} with an empty right argument. This means that on the first
% page of a chapter (or a section in article style) the \cs{rightmark}
% will be empty. The underlying problem is that the \tex/ machinery has
@@ -1310,7 +1300,7 @@
% \cs{chapter} etc.\ commands do \emph{not} call the mark commands. So if
% you want your preface to set the header info but not be numbered nor be put in
% the table of contents, you must issue the \cs{markboth} command
-% yourself, e.g.
+% yourself, e.g.,
%
% \begin{verbatim}
% \chapter*{Preface}
@@ -1378,7 +1368,8 @@
% \footnote{If you use \texttt{11pt} or \texttt{12pt} you will probably also
% have to do this, because \LaTeX's defaults are quite small}. See the
% warning below.
-% See also Section 4.1 of the \latex/ \emph{Companion} for detail.
+% See also section 5.1 and 5.2 of the \LaTeX{} \emph{Companion, Third Edition}, (Part I)
+% for detail.
%
% For instance, the following code will place the section title and the
% subsection title of an article in two lines in the upper right hand
@@ -1626,7 +1617,7 @@
% in the neighborhood of your header/footer definitions, unless you
% already use such an \texttt{\ldots offset} command, of course.
% \vspace{\baselineskip}
-%
+%
% For the second example, we take the \amslatex/ book\footnote{George Gratzer,
% \textit{Math into LaTeX, An Introduction to \LaTeX{} and \amslatex/}, Birkhauser, Boston.}.
%
@@ -1661,18 +1652,19 @@
% \renewcommand{\footrulewidth}{0pt}
% \end{verbatim}
%
-% The font used in the headers is 9 pt bold Helvetica. The \PSNFSS\ system
-% by Sebastian Rahtz uses the short (Karl Berry) name \verb|phv| for
-% Helvetica, so this font is selected with the commands:
+% The font used in the headers is 9 pt bold Helvetica. The \textsf{PSNFSS} system
+% (originally by the late Sebastian Rahtz) uses the short (Karl Berry) name \texttt{phv} for
+% Helvetica. The more modern \LaTeX{} solution is to use the \TeX{} Gyre font
+% Heros, which uses the short name \texttt{qhv} so this font is selected with the commands^^A
+% \footnote{See \emph{The \LaTeX{} Companion, Third Edition}, Part I, section
+% 9.5.2, and Part II, section 10.8.16.}:
% \begin{verbatim}
-% \fontfamily{phv}\fontseries{b}\fontsize{9}{11}\selectfont
+% \fontfamily{qhv}\fontseries{b}\fontsize{9}{11}\selectfont
% \end{verbatim}
-% (See Sections 7.6.1 and 11.9.1 of the \latex/ \emph{Companion} or
-% Sections 7.6 and 7.9.1 of \emph{The \latex/ Companion, Second Edition}.)
% Let us define a shorthand for this:
% \begin{verbatim}
% \newcommand{\helv}{%
-% \fontfamily{phv}\fontseries{b}\fontsize{9}{11}\selectfont}
+% \fontfamily{qhv}\fontseries{b}\fontsize{9}{11}\selectfont}
% \end{verbatim}
%
% Now we are ready for the page layout:
@@ -1688,7 +1680,7 @@
% \renewcommand{\headrulewidth}{0.5pt}
% \renewcommand{\footrulewidth}{0pt}
% \newcommand{\helv}{%
-% \fontfamily{phv}\fontseries{b}\fontsize{9}{11}\selectfont}
+% \fontfamily{qhv}\fontseries{b}\fontsize{9}{11}\selectfont}
% \fancyhf{}
% \fancyhead[LE,RO]{\helv \thepage}
% \fancyhead[LO]{\helv \rightmark}
@@ -1719,6 +1711,21 @@
% \renewcommand{\headrulewidth}{\iffloatpage{0pt}{0.4pt}}
% \end{verbatim}
%
+% \textbf{NOTE:} There is also a package \TTindex{floatpag}%
+% \Package{floatpag}\footnote{\url{https://www.ctan.org/pkg/floatpag}} by Vytas
+% Statulevičius and Sigitas Tolušis that has a command
+% \cs{floatpagestyle}\marg{pagestyle}, that applies \meta{pagestyle} to
+% all float pages, where \meta{pagestyle} can be defined with
+% \cs{fancypagestyle} (or by any other means).
+%
+% \textbf{NOTE:} There is also a package \TTindex{floatpag}%
+% \Package{floatpag}\footnote{\url{https://www.ctan.org/pkg/floatpag}} by Vytas
+% Statulevičius and Sigitas Tolušis that has a command
+% \cs{floatpagestyle}\marg{pagestyle}, that applies \meta{pagestyle} to
+% all float pages, where \meta{pagestyle} can be defined with
+% \cs{fancypagestyle} (or by any other means). In some cases this might
+% be simpler than putting \cs{iffloatpage} in various headers or footers.
+%
% Sometimes you may want to change the layout also for pages that contain a
% float on the top of the page, a float on the bottom of the page or a footnote on the bottom of the page.
%
@@ -1848,12 +1855,16 @@
% \CmdIndex{pagenumbering}
%
% \begin{verbatim}
+% \clearpage
% \pagenumbering[\thesection]{bychapter}
% \end{verbatim}
%
% What the package also does is reset the page number to 1 at the beginning
% of each chapter.
%
+% In general it is advisable to give a \cs{clearpage} or
+% \cs{cleardoublepage} before changing the page numbering.
+%
% In the frontmatter of your document (for example the Table of
% Contents) there will be no chapter numbers. Therefore a simple page
% number will be used there. This may be confusing, so you might prefer to use roman pagenumbers
@@ -2601,7 +2612,7 @@
% \end{enumerate}
%
% In the first two cases you must first check if you have given the correct
-% ``placement'' parameter to you float, e.g. \Cmd{begin\{figure\}[htp]}
+% ``placement'' parameter to you float, e.g.\ \Cmd{begin\{figure\}[htp]}
% specifies that your figure may be placed either: Here (i.e., in the text
% position where the command is given), on the Top of a page (which may be
% the page where you put the command), or on a separate Page of floats. You
@@ -2660,7 +2671,7 @@
% than 50\% of the page height it will have to wait until some more floats
% are given before a float page can be filled to satisfy the
% \cs{floatpagefraction} parameter. If you have this kind of behaviour you
-% can easily adapt the parameters, e.g. with:
+% can easily adapt the parameters, e.g.\ with:
% \begin{verbatim}
% \renewcommand{\textfraction}{0.05}
% \renewcommand{\topfraction}{0.95}
@@ -2673,7 +2684,7 @@
%
% You can force \latex/ to ignore most of the parameters for one specific float
% occurrence by
-% including an exclamation mark (!) in the placement parameters, e.g.
+% including an exclamation mark (!) in the placement parameters, e.g.,
% \begin{verbatim}
% \begin{figure}[!htb]
% \end{verbatim}
@@ -2811,7 +2822,7 @@
% normal text rather than a \cs{caption}, so that it will not be entered in
% the list of figures. It may also be desirable to issue a \cs{clearpage}
% first, just like we did for the \texttt{longtable}, and to encapsulate this
-% in the \cs{afterpage} command. E.g.
+% in the \cs{afterpage} command. E.g.,
% \begin{verbatim}
% \afterpage{\clearpage\input{myfigure}}
% \end{verbatim}
@@ -2832,7 +2843,7 @@
%
% You have to make sure that the last part is big enough, otherwise \LaTeX{}
% could decide to postpone it until it has collected some more floats. This
-% can be done either by making the figure big enough (e.g. by adding some
+% can be done either by making the figure big enough (e.g.\ by adding some
% \cs{vspace}), or by tweaking the \cs{floatpagefraction}
% \CmdIndex{floatpagefraction} parameter.
%
@@ -3054,9 +3065,20 @@
% \cs{input} in headers/footers when \texttt{verbatim} is active.
% (Issue \# 8 \url{https://github.com/pietvo/fancyhdr/issues/8}.)
% \end{itemize}
+% \item Version 4.3, July 17, 2024
+% \begin{itemize}
+% \item Changed \cs{f@nch@everypar}. If the LaTeX kernel has
+% \texttt{expl3}, use \cs{tex\_everypar:D}, and reset \cs{par},
+% \cs{@@par} and \cs{endgraf} to their original \TeX{} definitions, so that
+% no paragraph hooks will intrude in \Package{fancyhdr} code\footnote
+% {See \url{https://tex.stackexchange.com/q/691262/113546}}.
+% Therefore paragraph hooks will not work inside \Package{fancyhdr} headers and
+% footers to avoid unwanted interactions with the main text.
+% \end{itemize}
% \end{itemize}
%
%
+%
% \StopEventually{%
% \PrintChanges
% \PrintIndex}
@@ -3648,26 +3670,8 @@
\ProcessOptions*
% \end{macrocode}
%
-% \begin{macro}{\f@nch@errmsg}
-% This macro generates an error message.
-% \changes{fancyhdr v3.10}{2019/01/25}{Use \cs{f@nch@ifundefined} instead of \cs{ifx}.}
-% \changes{fancyhdr v3.10}{2019/01/25}{Use \cs{newcommand} instead of \cs{def}.}
-% \begin{macrocode}
-\newcommand\f@nch@errmsg[1]{%
- \f@nch@ifundefined{PackageError}{\errmessage{#1}}{\PackageError{fancyhdr}{#1}{}}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\f@nch@warning}
-% This macro generates a warning.
-% \changes{fancyhdr v3.10}{2019/01/25}{Use \cs{f@nch@ifundefined} instead of \cs{ifx}.}
-% \changes{fancyhdr v3.10}{2019/01/25}{Use \cs{newcommand} instead of \cs{def}.}
-% \begin{macrocode}
-\newcommand\f@nch@warning[1]{%
- \f@nch@ifundefined{PackageWarning}{\errmessage{#1}}{\PackageWarning{fancyhdr}{#1}{}}}
-% \end{macrocode}
-% \end{macro}
-%
+% \changes{fancyhdr v4.3}{2024/05/08}{Removed \cs{f@nch@errmsg} and
+% \cs{f@nch@warning} and used \cs{PackageError} and \cs{PackageWarning} directly.}
% \begin{macro}{\f@nch@forc}
% Usage: \cs{f@nch@forc} \cs{var} \texttt{\{charstring\}\{body\}}.\\
% Execute the body for each character in \texttt{charstring} bound
@@ -3766,7 +3770,7 @@
\if@twoside\else
\iff@nch@twoside\else
\if\f@nch@@eo e%
- \f@nch@warning {\string#1's `E' option without twoside option is useless.\MessageBreak
+ \PackageWarning{fancyhdr} {\string#1's `E' option without twoside option is useless.\MessageBreak
Please consider using the `twoside' option}%
\fi\fi\fi
}
@@ -3791,8 +3795,8 @@
\f@nch@forc\tmpf@ra{#3}%
{\expandafter\f@nch@ifin\tmpf@ra{eolcrhf,EOLCRHF}%
{}{\edef\temp@c{\temp@c\tmpf@ra}}}%
- \ifx\@empty\temp@c\else \f@nch@errmsg{Illegal char `\temp@c' in
- \string#1 argument: [#3]}%
+ \ifx\@empty\temp@c\else \PackageError{fancyhdr}{Illegal char `\temp@c' in
+ \string#1 argument: [#3]}{}%
\fi \f@nch@for\temp@c{#3}%
{\f@nch@default\f@nch@@eo{eo}\temp@c
\f@nch@fancyhf@Echeck{#1}%
@@ -3827,8 +3831,8 @@
\f@nch@forc\tmpf@ra{#3}%
{\expandafter\f@nch@ifin\tmpf@ra{eolrhf,EOLRHF}%
{}{\edef\temp@c{\temp@c\tmpf@ra}}}%
- \ifx\@empty\temp@c\else \f@nch@errmsg{Illegal char `\temp@c' in
- \string#1 argument: [#3]}%
+ \ifx\@empty\temp@c\else \PackageError{fancyhdr}{Illegal char `\temp@c' in
+ \string#1 argument: [#3]}{}%
\fi \f@nch@for\temp@c{#3}%
{\f@nch@default\f@nch@@eo{eo}\temp@c
\f@nch@fancyhf@Echeck{#1}%
@@ -4000,6 +4004,10 @@
% \begin{macro}{\f@nch@raggedright}
% \begin{macro}{\f@nch@centering}
% \begin{macro}{\f@nch@everypar}
+% \changes{fancyhdr v4.3}{2024/07/17}{Changed \cs{f@nch@everypar}. If the
+% LaTeX kernel has expl3, use \cs{tex\_everypar:D}, and reset \cs{par},
+% \cs{@@par} and \cs{endgraf} to their original \TeX{} definitions, so that
+% no paragraph hooks will intrude in \Package{fancyhdr} code.}
% Save the standard definitions of \cs{raggedleft}, \cs{raggedright},
% \cs{centering} and \cs{everypar} so that we can reset them when we are
% typesetting the headers and footers. Some packages change these to
@@ -4008,7 +4016,22 @@
\let\f@nch@raggedleft\raggedleft
\let\f@nch@raggedright\raggedright
\let\f@nch@centering\centering
-\let\f@nch@everypar\everypar
+\ifdefined\ExplSyntaxOn
+ \ExplSyntaxOn
+ \let\f@nch@everypar\tex_everypar:D
+ \newcommand\f@nch@resetpar{%
+ \f@nch@everypar{}%
+ \cs_set_eq:NN \par \tex_par:D
+ \cs_set_eq:NN \@@par \tex_par:D
+ \cs_set_eq:NN \endgraf \tex_par:D
+ }
+ \ExplSyntaxOff
+\else
+ \let\f@nch@everypar\everypar
+ \newcommand\f@nch@resetpar{%
+ \f@nch@everypar{}%
+ }
+\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4044,8 +4067,10 @@
% \changes{fancyhdr v4.2}{2024/04/19}{Reset catcodes to their default
% values in order to facilitate \cs{input} in headers/footers when \texttt{verbatim}
% is active. (Issue \# 8 \url{https://github.com/pietvo/fancyhdr/issues/8}.)}
+% \changes{fancyhdr v4.3}{2024/05/08}{Remove pre-NFSS stuff}
+% \changes{fancyhdr v4.3}{2024/07/17}{Replace \cs{f@nch@everypar} by \cs{f@nch@resetpar}.}
% \begin{macrocode}
-\def\f@nch@reset{\f@nch@everypar{}\restorecr\endlinechar=13
+\def\f@nch@reset{\f@nch@resetpar\restorecr\endlinechar=13
\catcode`\\=0\catcode`\{=1\catcode`\}=2\catcode`\$=3\catcode`\&=4
\catcode`\#=6\catcode`\^=7\catcode`\_=8\catcode`\ =10\catcode`\@=11
\catcode`\:=11\catcode`\~=13\catcode`\%=14
@@ -4061,10 +4086,8 @@
\expandafter\def\csname MakeUppercase\space\space\space\endcsname
[####1]####2{####2}%
##1}}%
- \f@nch@ifundefined{@newbaseline} % NFSS not present; 2.09 or 2e
- {\f@nch@ifundefined{@normalsize} {\normalsize} % for ucthesis.cls
- {\@normalsize}}%
- {\@newbaseline}% NFSS (2.09) present
+ \f@nch@ifundefined{@normalsize} {\normalsize} % for ucthesis.cls
+ {\@normalsize}%
}
% \end{macrocode}
% \end{macro}
@@ -4213,7 +4236,7 @@
% \begin{macrocode}
\iff@nch@check
\dimen0=#1\advance\dimen0-\ht0
- \f@nch@warning{%
+ \PackageWarning{fancyhdr}{%
\string#1 is too small (\the#1): \MessageBreak
Make it at least \the\ht0, for example:\MessageBreak
\string\setlength{\string#1}{\the\ht0}%
@@ -4309,7 +4332,7 @@
% \cs{color} command. The \cs{ignorespaces} skips initial spaces in
% the parameter, as is usual in a \cs{parbox}, for backwards compatibility.}
% We put the \cs{footrule} in a \cs{vbox} to accommodate for flexible
-% footrules (e.g. using \cs{hrulefill}), so that the \cs{headwidth} will
+% footrules (e.g.\ using \cs{hrulefill}), so that the \cs{headwidth} will
% be used as the line width. But to preserve the vertical spacing we
% then \cs{unvbox} this box.
%
@@ -4348,7 +4371,7 @@
% \end{macro}
%
% \begin{macro}{\@chapapp}
-% Define \cs{@chapapp} for classes that don't have it, e.g. amsbook
+% Define \cs{@chapapp} for classes that don't have it, e.g.\ amsbook
% \begin{macrocode}
\f@nch@ifundefined{@chapapp}{\let\@chapapp\chaptername}{}%
% \end{macrocode}
@@ -4660,9 +4683,10 @@
% \begin{macro}{\iffootnote}
% These can be used in a header/footer field to make them conditional on
% the presence of floats and/or footnotes.
+% \changes{fancyhdr v4.3}{2024/05/08}{Replace \cs{empty} with \cs{@empty}}
% \begin{macrocode}
-\newcommand\iftopfloat[2]{\ifx\topfloat\empty #2\else #1\fi}%
-\newcommand\ifbotfloat[2]{\ifx\botfloat\empty #2\else #1\fi}%
+\newcommand\iftopfloat[2]{\ifx\topfloat\@empty #2\else #1\fi}%
+\newcommand\ifbotfloat[2]{\ifx\botfloat\@empty #2\else #1\fi}%
\newcommand\iffloatpage[2]{\if@fcolmade #1\else #2\fi}%
\newcommand\iffootnote[2]{\iff@nch@footnote #1\else #2\fi}%
% \end{macrocode}
@@ -4688,10 +4712,10 @@
% \begin{macrocode}
\long\def\f@nch@pagestyle#1[#2]#3{%
\f@nch@ifundefined{ps@#2}{%
- \f@nch@errmsg{\string\fancypagestyle: Unknown base page style `#2'}%
+ \PackageError{fancyhdr}{\string\fancypagestyle: Unknown base page style `#2'}{}%
}{%
\f@nch@ifundefined{f@nch@ps@#2-is-fancyhdr}{%
- \f@nch@errmsg{\string\fancypagestyle: Base page style `#2' is not fancyhdr-based}%
+ \PackageError{fancyhdr}{\string\fancypagestyle: Base page style `#2' is not fancyhdr-based}{}%
}%
{%
\@namedef{ps@#1}{\let\f@nch@gbl\relax\@nameuse{ps@#2}#3\relax}%
diff --git a/Master/texmf-dist/source/latex/heria/heria.dtx b/Master/texmf-dist/source/latex/heria/heria.dtx
index 5c6b5e96916..60cc0162f13 100644
--- a/Master/texmf-dist/source/latex/heria/heria.dtx
+++ b/Master/texmf-dist/source/latex/heria/heria.dtx
@@ -1,10 +1,10 @@
% \iffalse meta-comment
%
-% Copyright 2023 Tristan Miller
-% -----------------------------
+% Copyright 2023, 2024 Tristan Miller
+% -----------------------------------
%
% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
@@ -18,11 +18,11 @@
\ProvidesFile{heria.dtx}
%</driver>
%<*class>
-%% Copyright 2023 Tristan Miller
+%% Copyright 2023, 2024 Tristan Miller
%% Copyright 2016 John Kormylo
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
@@ -33,7 +33,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}
%<class>\ProvidesClass{heria}
%<*class>
-[2023-12-04 v3.2.1.0 Class for Horizon Europe (R)IA proposals]
+[2024-07-14 v3.4.1.0 Class for Horizon Europe (R)IA proposals]
%</class>
%
%<*driver>
@@ -50,7 +50,7 @@
%</driver>
% \fi
%
-% \CheckSum{1506}
+% \CheckSum{1520}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -80,8 +80,9 @@
% for an explanation of the versioning scheme.}}
%
% \author{Tristan Miller\\
-% Austrian Research Institute for Artificial Intelligence\\
-% \texttt{tristan.miller@ofai.at}}
+% Department of Computer Science\\
+% University of Manitoba\\
+% \texttt{Tristan.Miller@umanitoba.ca}}
%
% \maketitle
% \tableofcontents
@@ -104,14 +105,9 @@
% the user. The advantage of this becomes clear when one considers
% that much of the data is reused across multiple tables.
%
-% At the time of writing (2023-12-04), open calls to the RIA and IA
-% calls require proposals to be submitted according to either
-% Version~3.2 (2022-11-15) or Version~3.3 (2023-09-27) of the Part~B
-% template. The \textsf{heria} package was developed with reference
-% to the Version~3.2 template; however, according to the changelog for
-% the Version~3.3 template, the only difference from the previous
-% version is the addition of some instructions concerning the use of
-% generative AI tools for the preparation of the proposal.
+% The \textsf{heria} package can be used to write proposals using
+% either Version~3.2 (2022-11-15), 3.3 (2023-09-27), or 3.4
+% (2024-04-04) of the official Part~B template.
%
% \section{Usage}
%
@@ -140,8 +136,20 @@
%
% \medskip
%
-% \noindent Following \cs{documentclass} you should provide the
-% proposal metadata using the following macros:
+% \noindent Following \cs{documentclass} you should tell
+% \textsf{heria} which version of the official Part~B template you
+% want to use:
+%
+% \DescribeMacro{\templateversion} This macro sets the version of the
+% official Part~B template the proposal should use. It takes a single
+% argument; valid values are \verb|3.2|, \verb|3.3|, and \verb|3.4|.
+% If you omit this macro, \textsf{heria} will default to using the
+% latest version of the template.
+%
+% \medskip
+%
+% \noindent You should then provide the proposal metadata using the
+% following macros:
%
% \DescribeMacro{\title} This macro takes the title of the proposal as
% its sole argument. This title will be printed by the \cs{maketitle}
@@ -446,18 +454,6 @@
%
% \section{Limitations and caveats}
%
-% \paragraph{No backward compatibility.} This version of the
-% \textsf{heria} class implements a specific version of the official
-% Horizon Europe template as described in §\ref{sec:introduction}. It
-% is intended that \textsf{heria}, over the course of its development,
-% will track changes made to the official template. Since these
-% changes may be incompatible with previous versions, you are advised
-% to retain a copy of the version of \textsf{heria} you used to
-% produce a proposal; this way you will still be able to build the
-% proposal even if you later install a new version of \textsf{heria}.
-% See §\ref{sec:version} for further information on \textsf{heria}'s
-% versioning scheme and when to expect breaking changes.
-%
% \paragraph{Table 3.1h.} The instructions in the official template
% are ambiguous about the construction of the tables for purchase
% costs. In particular, it's not clear whether each individual cost
@@ -497,21 +493,26 @@
%
% Each release of the \textsf{heria} class carries a version number in
% the format \textit{omaj.\allowbreak omin.\allowbreak maj.\allowbreak
-% min}. Here \textit{omaj.omin} is the version number of the official
-% Horizon Europe RIA template that the class implements, and
+% min}. Here \textit{omaj.omin} is the highest version number of the
+% official Horizon Europe RIA template that the class implements, and
% \textit{maj} and \textit{min} represent, respectively, major and
% minor revisions to the class (including any ancillary files, such as
% the skeleton proposal and documentation). A major revision is one
-% that includes breaking changes or significant new features; minor
-% revisions are for all other changes. You should generally assume
-% that any change to \textit{omaj.omin} introduces breaking changes to
-% the class interface and\slash or significant changes to the official
-% proposal preparation instructions.
+% that includes potentially breaking changes or significant new
+% features; minor revisions are for all other changes. While efforts
+% will be made to preserve compatibility with earlier versions of the
+% official template (via the \cs{templateversion} macro), any change
+% to \textit{omaj.omin} could unavoidably introduce breaking changes
+% to the class interface. Any such changes will be noted in the
+% package documentation.
%
% \subsection{Version history}
%
% \begin{description}
-% \item[v3.2.1.0 (2023-12-04)] Initial release.
+% \item[v3.4.1.0 (2024-07-14)] Add support for version 3.4 of the
+% official Part~B template and the \cs{templateversion} macro for
+% backward compatibility with earlier versions.
+% \item[v3.2.1.0 (2023-12-04)] Initial release.
% \end{description}
%
% \section{Disclaimer}
@@ -599,6 +600,22 @@
\definecolor{summaryblue}{HTML}{00B0F0}
% \end{macrocode}
%
+% \subsection*{Set official Horizon Europe template version}
+%
+% \begin{macrocode}
+\gdef\@templateversion{3.4} % Default version
+\def\@supportedtemplateversions{3.2,3.3,3.4} % Supported versions
+\ExplSyntaxOn
+\NewDocumentCommand{\templateversion}{m}{%
+ \clist_if_in:NnTF {\@supportedtemplateversions} {#1}
+ {\gdef\@templateversion{#1}}
+ {\PackageError{heria}%
+ {unsupported~template~version}%
+ {Use~one~of~\@supportedtemplateversions}
+ }%
+}
+\ExplSyntaxOff
+% \end{macrocode}
% \subsection*{Basic proposal variables}
%
% \begin{macrocode}
@@ -1459,7 +1476,6 @@
% communication with Tristan Miller on 2023-12-02.
%
% \begin{macrocode}
-\RequirePackage{everypage}
\RequirePackage{environ}
\newcounter{abspage}% \thepage not reliab
\newcommand{\newSFPage}[1]% #1 = \theabspage
@@ -1474,15 +1490,17 @@
\rotatebox{90}{\parbox[c][\textwidth][c]{\textheight}{\BODY}}%
\fi
\end{figure}}
-\AddEverypageHook{% check if sideways figure on this page
- \ifdim\textwidth=\textheight
- \stepcounter{abspage}% already in landscape
- \else
- \@ifundefined{SFPage@\theabspage}{}{\global\pdfpageattr{/Rotate 0}}%
- \stepcounter{abspage}%
- \@ifundefined{SFPage@\theabspage}{}%
- {\global\pdfpageattr{/Rotate 90}}%
- \fi}
+\AddToHook{shipout/background}{% check if sideways figure on this page
+ \put(1in,-1in){%
+ \ifdim\textwidth=\textheight
+ \stepcounter{abspage}% already in landscape
+ \else
+ \@ifundefined{SFPage@\theabspage}{}{\global\pdfpageattr{/Rotate 0}}%
+ \stepcounter{abspage}%
+ \@ifundefined{SFPage@\theabspage}{}%
+ {\global\pdfpageattr{/Rotate 90}}%
+ \fi}%
+ }
% \end{macrocode}
%
% \subsection*{Font setup}
@@ -1987,7 +2005,7 @@ purchase costs for equipment).
environmental objectives of the EU Taxonomy Regulation.}
\item
\emph{If you plan to use, develop and/or deploy artificial
- intellingence (AI) based systems and/or techniques you must
+ intelligence (AI) based systems and/or techniques you must
demonstrate their technical robustness. AI-based systems or techniques
should be, or be developed to become:~}
@@ -2371,12 +2389,33 @@ Please provide the following:
\item
\emph{Give full details. Base your account on the logical structure of
the project and the stages in which it is to be carried out.}
+\makeatletter
+\ifdim\@templateversion pt<3.4pt
\emph{The number of work packages should be proportionate to the scale
and complexity of the project.}
\item
\emph{You should give enough detail in each work package to justify
the proposed resources to be allocated and also quantified information
so that progress can be monitored, including by the Commission}
+\else
+ \emph{Each work package should be a substantial part of the work
+ plan, and the number of work packages should be proportionate to
+ the scale and complexity of the project.}
+\item \emph{Structure each work package by breaking it down into
+ tasks. If tasks are not appropriate, work packages can be
+ organised according to other criteria (e.g., according to the type
+ of work or thematically). For each task or element of the work
+ package, describe all activities to be carried out and quantify
+ them (e.g., number of protocols, tests, measurements,
+ combinations, study subjects, conferences, publications,
+ etc.). Provide enough detail to clarify who will do this work and
+ why it is needed for the project, (e.g., the level of
+ qualification and number of person-months for personnel, as well
+ as the requested equipment, consumables, meetings, etc.), to
+ justify the proposed resources and so that progress can be
+ monitored, including by the Commission.}
+\fi
+\makeatother
\item
\emph{Resources assigned to work packages should be in line with their
objectives and deliverables. You are advised to include a distinct
@@ -2431,9 +2470,15 @@ Please provide the following:
\end{itemize}
%</hi-workplan>
%<*hi-wp-description>
+\makeatletter
+\ifdim\@templateversion pt<3.4pt
(where appropriate, broken down into tasks), lead partner and role of
participants. Deliverables linked to each WP are listed in table 3.1c
(no need to repeat the information here).
+\else
+(where appropriate, broken down into tasks), lead partner and role of participants. For each task, quantify the amount of work. Provide enough detail to justify the resources requested and clarify why the work is needed and who will do it. Deliverables linked to each WP are listed in table 3.1c (no need to repeat the information here).
+\fi
+\makeatother
%</hi-wp-description>
%<*hi-wp-objectives>
\twarn \emph{Participants involved in each WP and their efforts are
@@ -2441,10 +2486,10 @@ participants. Deliverables linked to each WP are listed in table 3.1c
each WP are shown in table 3.1a.)}
%</hi-wp-objectives>
%<*heria-proposal>
-%% Copyright 2023 Tristan Miller
+%% Copyright 2023, 2024 Tristan Miller
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
@@ -2453,6 +2498,8 @@ participants. Deliverables linked to each WP are listed in table 3.1c
%%
\documentclass[showinstructions]{heria}
+\templateversion{3.4}
+
\title{Skeleton Horizon Europe Proposal}
\callname{insert call name}
\callidentifier{HORIZON-XX0-0000-XXXXX-00-XXXXX}
diff --git a/Master/texmf-dist/source/latex/heria/heria.ins b/Master/texmf-dist/source/latex/heria/heria.ins
index 89b8b7f72c7..406573836d0 100644
--- a/Master/texmf-dist/source/latex/heria/heria.ins
+++ b/Master/texmf-dist/source/latex/heria/heria.ins
@@ -1,8 +1,8 @@
%%
-%% Copyright 2023 Tristan Miller
+%% Copyright 2023, 2024 Tristan Miller
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
diff --git a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx
index 8a90953abbc..20a2f3a4a32 100644
--- a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx
@@ -1,6 +1,6 @@
% \iffalse
% Source File: hluatex.dtx
-% 2024-05-23 v7.01i
+% 2024-07-10 v7.01j
%
% Copyright
% 2016-2019 Oberdiek Package Support Group
@@ -31,7 +31,7 @@
%
% \begin{macrocode}
%<*luatex>
-%% 2024-05-23 v7.01i
+%% 2024-07-10 v7.01j
%% force unicode encoding, see issue #101
%% code mostly copied from hxetex.def
\HyPsd@LoadUnicode
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx
index c35b68d1163..874a4927360 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 2024-05-23 v7.01i}
+% \date{Version 2024-07-10 v7.01j}
%
% \maketitle
% \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx
index c9ffbf15bc5..ac4bac4f8cf 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx
@@ -55,7 +55,7 @@
% }^^A
% }
%
-% \date{Version 2024-05-23 v7.01i}
+% \date{Version 2024-07-10 v7.01j}
%
% \maketitle
% \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 8f6096d77d5..80cef9b890d 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -51,7 +51,7 @@
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
%<psdextra>\ProvidesFile{psdextra.def}
-%<!none&!packageEnd> [2024-05-23 v7.01i %
+%<!none&!packageEnd> [2024-07-10 v7.01j %
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -9177,6 +9177,8 @@
\Hy@temp{calculate}
\Hy@temp{onfocus}
\Hy@temp{onblur}
+\Hy@temp{onmousedown}
+\Hy@temp{onmouseup}
\Hy@temp{onenter}
\Hy@temp{onexit}
% \end{macrocode}
@@ -9201,8 +9203,6 @@
}%
\fi
\Hy@temp{ondblclick}
-\Hy@temp{onmousedown}
-\Hy@temp{onmouseup}
\Hy@temp{onmouseover}
\Hy@temp{onmousemove}
\Hy@temp{onmouseout}
@@ -12103,7 +12103,10 @@
% the hyperref version of the counter print command
% \cs{theHcounter} is redefined in order to add the
% parent counter.
+% change 2024-07-10: define |\HyOrg@addtoreset| always for cleveref
+% compability with tagging code, see https://github.com/latex3/tagging-project/issues/2
% \begin{macrocode}
+\def\HyOrg@addtoreset#1#2{\expandafter\@cons\csname cl@#2\endcsname {{#1}}}
\@ifundefined{hyper@nopatch@counter}
{
\let\HyOrg@addtoreset\@addtoreset
diff --git a/Master/texmf-dist/source/latex/hyperref/xr-hyper.dtx b/Master/texmf-dist/source/latex/hyperref/xr-hyper.dtx
index aced2ac70b2..f7b39072f55 100644
--- a/Master/texmf-dist/source/latex/hyperref/xr-hyper.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/xr-hyper.dtx
@@ -26,7 +26,7 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{xr-hyper}
-%<package> [2024-05-23 v7.01i eXternal References (DPC)]
+%<package> [2024-07-10 v7.01j eXternal References (DPC)]
%
%<*driver>
\documentclass{l3doc}
diff --git a/Master/texmf-dist/source/latex/lastpage/lastpage.drv b/Master/texmf-dist/source/latex/lastpage/lastpage.drv
index 5125a755167..b58b4defae8 100644
--- a/Master/texmf-dist/source/latex/lastpage/lastpage.drv
+++ b/Master/texmf-dist/source/latex/lastpage/lastpage.drv
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -59,8 +58,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesFile{lastpage.drv}%
- [2024-04-27 v2.1a Refers to last page's name (HMM)]
-\documentclass{ltxdoc}[2023/03/28]% v2.1j Standard LaTeX documentation class
+ [2024-07-07 v2.1c Refers to last page's name (HMM)]
+\documentclass{ltxdoc}[2024/02/08]% v2.1j Standard LaTeX documentation class
\usepackage{holtxdoc}[2019/12/09]% v0.30 Private additional ltxdoc support (HO)
\hypersetup{%
pdfsubject={Refers to last page's name (HMM; JPG)},%
diff --git a/Master/texmf-dist/source/latex/lastpage/lastpage.dtx b/Master/texmf-dist/source/latex/lastpage/lastpage.dtx
index 104d6b84187..c447d39cc60 100644
--- a/Master/texmf-dist/source/latex/lastpage/lastpage.dtx
+++ b/Master/texmf-dist/source/latex/lastpage/lastpage.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% File: lastpage.dtx
-% Version: 2024-04-27 v2.1a
+% Version: 2024-07-07 v2.1c
% Info: Refers to last page's name
%
% Copyright © 2010 - 2024 by
@@ -65,7 +65,7 @@
\input docstrip.tex
\Msg{**********************************************************************}
\Msg{* Installation *}
-\Msg{* Package: lastpage 2024-04-27 v2.1a Refers to last page's name (HMM)*}
+\Msg{* Package: lastpage 2024-07-07 v2.1c Refers to last page's name (HMM)*}
\Msg{**********************************************************************}
\keepsilent
@@ -77,7 +77,7 @@
This is a generated file.
Project: lastpage
-Version: 2024-04-27 v2.1a
+Version: 2024-07-07 v2.1c
Info: Refers to last page's name
Copyright (C) 2010 - 2024 by
@@ -100,10 +100,9 @@ The Current Maintainer of this work is H.-Martin Muench.
This package was invented by Jeffrey P. Goldberg.
I thought that a replacement was needed and therefore created the pageslts package,
-https://ctan.org/pkg/pageslts
-. Nevertheless, for compatibility with existing documents/packages as well as for
-the low amount of resources needed by the lastpage package (no new counter!),
-I updated this package.
+https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+documents/packages as well as for the low amount of resources needed by the
+lastpage package (no new counter!), I updated this package.
Thanks go to Jeffrey P. Goldberg for allowing me to do this.
While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -185,8 +184,8 @@ In memoriam
%<*driver>
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesFile{lastpage.drv}%
- [2024-04-27 v2.1a Refers to last page's name (HMM)]
-\documentclass{ltxdoc}[2023/03/28]% v2.1j Standard LaTeX documentation class
+ [2024-07-07 v2.1c Refers to last page's name (HMM)]
+\documentclass{ltxdoc}[2024/02/08]% v2.1j Standard LaTeX documentation class
\usepackage{holtxdoc}[2019/12/09]% v0.30 Private additional ltxdoc support (HO)
\hypersetup{%
pdfsubject={Refers to last page's name (HMM; JPG)},%
@@ -234,23 +233,23 @@ In memoriam
% \DoNotIndex{\@auxout,\@evenfoot,\@firstofone,\@firstoftwo,\@ifl@t@r,\@ifpackagelater,\@ifpackageloaded}
% \DoNotIndex{\@ifundefined,\@kernel@reserved@label@data,\@mainaux,\@number,\@oddfoot}
% \DoNotIndex{\addtocounter,\AddToHook,\arabic,\begin}
-% \DoNotIndex{\bigskip,\clearpage,\csname,\documentclass,\EdefUnescapeString,\empty,\end,\endcsname}
-% \DoNotIndex{\enddocument,\ExplSyntaxOff,\ExplSyntaxOn,\fmtversion}
+% \DoNotIndex{\bigskip,\clearpage,\csname,\detokenize,\documentclass,\EdefUnescapeString,\empty,\end}
+% \DoNotIndex{\endcsname,\enddocument,\expanded,\ExplSyntaxOff,\ExplSyntaxOn,\fmtversion}
% \DoNotIndex{\g,\gdef,\here,\hfil,\Hy@temp,\Hy@unicodefalse}
-% \DoNotIndex{\hypersetup,\if@filesw,\if@nobreak,\ifHy@hypertexnames,\ifHy@pageanchor,\ifHy@plainpages}
+% \DoNotIndex{\hypersetup,\if,\if@filesw,\if@nobreak,\ifHy@hypertexnames,\ifHy@pageanchor,\ifHy@plainpages}
% \DoNotIndex{\ifdim,\ifnum,\IfPackageAtLeastTF,\IfPackageLoadedTF,\ifvmode,\ifx,\immediate,\input}
% \DoNotIndex{\label,\lastpage,\lastpage-example.tex,\lastpage.dtx,\lastpage.sty,\lastpagee.sty}
% \DoNotIndex{\lastpageclassic.sty,\lastpagemodern.sty,\LaTeX,\LaTeX-kernel,\listfiles}
-% \DoNotIndex{\makeatletter,\makeatother,\markboth,\mbox,\message,\MessageBreak}
+% \DoNotIndex{\makeatletter,\makeatother,\markboth,\meaning,\mbox,\message,\MessageBreak}
% \DoNotIndex{\NeedsTeXFormat,\newcommand,\newcounter,\newline,\newpage,\nobreak}
% \DoNotIndex{\noindent,\normalsize,\numexpr,\origenddocument,\PackageError,\PackageWarning}
% \DoNotIndex{\PackageWarningNoLine,\pagenumbering,\pageref,\pdfstringdef,\protect,\ProvidesPackage}
% \DoNotIndex{\qquad,\RequirePackage,\section,\ShowHook,\slshape,\smallskip,\space,\test,\textbf}
% \DoNotIndex{\textit,\textquotedblleft,\textquotedblright,\textsf,\texttt,\the,\thepage}
-% \DoNotIndex{\today,\upshape,\url,\usepackage,\value,\verb,\wd,\write}
+% \DoNotIndex{\today,\upshape,\url,\usepackage,\value,\verb,\wd,\write,\xlastpage@rmpage,\xxlastpage@rmpage}
%
% \title{The \xpackage{lastpage} package}
-% \date{2024-04-27 v2.1a}
+% \date{2024-07-07 v2.1c}
% \author{H.-Martin Münch\\\xemail{Martin.Muench at Uni-Bonn.de}\\
% invented by Jeffrey P. Goldberg\\\xemail{jeffrey+news at goldmark.org}}
%
@@ -559,6 +558,18 @@ In memoriam
% but |\lastpage@putlabel| was replaced by |\lastpage@putl@bel|.
% Because \linebreak |\lastpage@putlabel| is no longer called, now there should not be any
% double definitions of the \texttt{lastpage} label.
+%
+% \subsection{\texttt{\textbackslash pagenumbering\{fnsymbol\}}}
+% When using the foot-note-symbols as page numbers,
+% it can be necessary to declare in the document's preamble:
+% \begin{verbatim}
+% \DeclareTextCommand{\textasteriskcentered}{PD1}{*}
+% \DeclareTextCommand{\textdagger}{PD1}{†}
+% %\DeclareTextCommand{\textdaggerdbl}{PD1}{‡)% seems to neither work nor be necessary
+% \DeclareTextCommand{\textsection}{PD1}{§}
+% \DeclareTextCommand{\textparagraph}{PD1}{¶}
+% \DeclareTextCommand{\textbardbl}{PD1}{‖}
+% \end{verbatim}
% \newpage
%
% \section{Alternatives\label{sec:Alternatives}}
@@ -574,7 +585,7 @@ In memoriam
% \textbf{Note: The current version 2015/12/21 v1.2f of the \pkg{pageslts} package
% has not yet been updated to the new hook mechanism. In special cases (for example }%
% |\pagenumbering{fnsymbol}|\textbf{) the current version of that package combined
-% with a current \LaTeX-format fails. Together with about 80~other packages
+% with a current \LaTeX-format fails. Together with several other packages
% (small to large, public as well as private, some probably obsolete) it is
% in the update queue.}\newline
% The \xpackage{pageslts} package first started as a revision of this
@@ -723,17 +734,17 @@ In memoriam
%
% \begin{macrocode}
%<*example>
-\documentclass[british]{article}[2023/05/17]% v1.4n Standard LaTeX document class
+\documentclass[british]{article}[2024/02/08]% v1.4n Standard LaTeX document class
\makeatletter
\@ifl@t@r\fmtversion{2022/11/01}{%
\AddToHook{enddocument/afterlastpage}[lastpage]{%
\message{^^JLaTeX Info: Executing hook `enddocument/afterlastpage'.}}%
}{\AtEndDocument{\message{^^JLaTeX Info: Executing hook `AtEndDocument'.}}%
}
-\usepackage[draft]{showkeys}[2023/07/08]% v3.19 Show cite and label keys (DPC, MH)
+\usepackage[draft]{showkeys}[2024/05/23]% v3.21 Show cite and label keys (DPC, MH)
%% Use final instead of draft to hide the keys. %%
\usepackage[pdfpagelabels=true,hyperindex=false]{hyperref}[2024-01-20]% v7.01h
-%% Hypertext links for LaTeX
+\@ifpackageloaded{hyperref}{% Hypertext links for LaTeX
\hypersetup{extension=pdf,%
plainpages=false,%
pdflang={en},%
@@ -744,9 +755,8 @@ In memoriam
pdfview=Fit,%
pdfstartview=Fit,%
pdfpagelayout=SinglePage%
-}
-\@ifpackageloaded{hyperref}{}{\usepackage{url}[2013/09/16]}% v3.4
-\usepackage{lastpage}[2024/04/27]% v2.1a
+}}{\usepackage{url}[2013/09/16]}% v3.4
+\usepackage{lastpage}[2024/07/07]% v2.1c
\renewcommand{\@evenfoot}{%
\normalsize\slshape \today\hfil \upshape %
page \thepage{} of \pageref{LastPage}}
@@ -758,7 +768,7 @@ In memoriam
\section*{Example for lastpage}
\markboth{Example for lastpage}{Example for lastpage}
This example demonstrates the use of package\newline
-\textsf{lastpage}, v2.1a as of 2024-04-27 (HMM; JPG).\newline
+\textsf{lastpage}, v2.1c as of 2024-07-07 (HMM; JPG).\newline
The package takes no options.\newline
For more details please see the documentation!\newline
@@ -783,7 +793,7 @@ trademark owner. There is no intention of infringement; the
usage is to the benefit of the trademark owner.\newline
\textbf{Tip}: Use \textit{logical page numbers}
-for the display of the pdf (in Adobe Acrobat Reader 2024.002.20687:
+for the display of the pdf (in Adobe Acrobat Reader 2024.002.20895:
Edit $>$ Preferences $>$ Page Display $>$
Page Content and Information: Use logical page numbers)!\newline
@@ -837,8 +847,8 @@ The code does not generally work even without hyperref.
\end{verbatim}
\end{quote}
-\noindent does work, because \verb|\lastpage@lastpage| contains the name
-of the page, \mbox{example:}
+\noindent does work (two compilations needed), because \verb|\lastpage@lastpage|
+contains the name of the page, \mbox{example:}
\begin{verbatim}
Page \thepage{} is (not) page \makeatletter\lastpage@lastpage\makeatother.
\end{verbatim}
@@ -894,7 +904,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \DescribeMacro{lastpage.sty}
% We first need to determine whether we are on \TeX~2.09 or \LaTeX2e.\newline
% (That line, which is too long for the documentation, reads:\newline
-% |\def\loadlastpage{\ProvidesPackage{lastpage}[2024/04/27 v2.1a lastpage:|\linebreak
+% |\def\loadlastpage{\ProvidesPackage{lastpage}[2024/07/07 v2.1c lastpage:|\linebreak
% | 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}|.)
%
% \begin{macrocode}
@@ -902,7 +912,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
%% Part of the "lastpage" package
%% loads either lastpage2.09.sty for TeX 2.09 or lastpage2e.sty for LaTeX 2e
%% with code from https://groups.google.com/g/comp.text.tex/c/-Qmhj1ZI4xM
-\def\loadlastpage{\ProvidesPackage{lastpage}[2024/04/27 v2.1a lastpage: 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}
+\def\loadlastpage{\ProvidesPackage{lastpage}[2024/07/07 v2.1c lastpage: 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}
\begingroup \expandafter \ifx \csname documentclass\endcsname\relax
\endgroup \expandafter \input{lastpage209.sty}
\else \endgroup \expandafter \loadlastpage
@@ -942,7 +952,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
%<*lastpage2e>
%% Part of the "lastpage" package
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{lastpage2e}[2024/04/27 v2.1a %
+\ProvidesPackage{lastpage2e}[2024/07/07 v2.1c %
Decide which 2e lastpage version to use (HMM)]
\@ifl@t@r\fmtversion{2023/06/01}{\RequirePackage{lastpagemodern}}{%
\RequirePackage{lastpageclassic}}
@@ -957,7 +967,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
%<*lastpageclassic>
%% Part of the "lastpage" package
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{lastpageclassic}[2024/04/27 v2.1a %
+\ProvidesPackage{lastpageclassic}[2024/07/07 v2.1c %
Refers to last page's name (HMM; JPG)]
%% allows for things like "Page \thepage{} of \pageref{LastPage}"
%% to get "Page 7 of 9"
@@ -1375,7 +1385,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
%<*lastpagemodern>
%% Part of the "lastpage" package
\NeedsTeXFormat{LaTeX2e}[2023-06-01]
-\ProvidesPackage{lastpagemodern}[2024-04-27 v2.1a %
+\ProvidesPackage{lastpagemodern}[2024-07-07 v2.1c %
Refers to last page's name (HMM; JPG)]
%% allows for things like "Page \thepage{} of \pageref{LastPage}"
%% to get "Page 7 of 9" or "Page VII of IX";
@@ -1463,14 +1473,69 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\lastpage@makeHy}
+% Just once we need the page from |\@currentHpage| without any \mbox{\textquotedblleft |page.|\textquotedblright :}
+% \begin{macrocode}
+\newcommand{\lastpage@makeHy}{%
+ \gdef\lastpage@Hy{}%
+ \IfPackageLoadedTF{hyperref}{%
+ \ifHy@pageanchor%
+ \@ifundefined{@currentHpage}{%
+ \PackageError{lastpage}{%
+ Kernel command \string\@currentHpage\space is undefined}{%
+ Please contact the lastpage maintainer.}%
+% \end{macrocode}
+% |\gdef\lastpage@Hy{}|, but that was already done at the beginning of this command.
+% \begin{macrocode}
+ }{\xdef\lastpage@Hptest{Doc-Start}%
+ \ifx\lastpage@Hptest\@currentHpage\relax%
+ \gdef\lastpage@Hy{\@currentHpage}%
+ \else%
+ \edef\lastpage@Hptest{\@currentHpage}%
+ \ifx\lastpage@Hptest\empty\relax%
+% \end{macrocode}
+% |\gdef\lastpage@Hy{}|, but that was already done at the beginning of this command.
+% \begin{macrocode}
+ \else%
+% \end{macrocode}
+% |\@currentHpage| should be |page.<some number>|, |\lastpage@rmpage| removes the
+% \mbox{\textquotedblleft |page.|\textquotedblright .} Next compilation run,
+% |\lastpage@lastpageHy| gets defined via the \xfile{aux} file.
+% If we arrived at this place, but the definition is still empty,
+% then |\@currentHpage| has some unexpected content.
+% \begin{macrocode}
+ \gdef\lastpage@Hy{\lastpage@rmpage{\@currentHpage}}%
+ \ifx\lastpage@lastpageHy\empty\relax%
+ \PackageWarningNoLine{lastpage}{%
+ \string\@currentHpage\space is\MessageBreak%
+ \meaning\@currentHpage\MessageBreak%
+ not beginning with "page.",\MessageBreak%
+ \string\lastpage@lastpageHy\space is now let empty.}%
+ \fi%
+ \fi%
+ \fi%
+ }%
+ \fi%
+ }{}%
+ }%
+
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\lastpage@rmpage}
-% Just once we need |\@currentHpage| without the \mbox{\textquotedblleft |page.|\textquotedblright :}
+% |\lastpage@rmpage| removes the \mbox{\textquotedblleft |page.|\textquotedblright.}
+%
% \begin{macrocode}
-%% similar to https://tex.stackexchange.com/a/12811/6865
-\def\lastpage@rmpage#1{\expandafter\lastpage@currentH#1\relax}
-\def\lastpage@currentH#1.#2\relax{#2}
+%% Code provided by David Carlisle at https://tex.stackexchange.com/a/721877
+\def\lastpage@rmpage#1{%
+ \expandafter\xlastpage@rmpage\expanded{#1}\xlastpage@rmpage page.%
+ \xlastpage@rmpage\xxlastpage@rmpage{#1}}
+\def\xlastpage@rmpage #1page.#2\xlastpage@rmpage#3\xxlastpage@rmpage#4{%
+ \if$\detokenize{#1}$#2%\else#4
+ \fi}
% \end{macrocode}
+% |\else#4| means, that it did not start with |page.|, and whatever it is,
+% we cannot use this |#4| for |\lastpage@Hy|.
% \end{macro}
% \begin{macro}{\lastpage@putl@bel}
% \indent This command does the writing of the label.
@@ -1529,15 +1594,13 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
{\@kernel@reserved@label@data}}%
}%
% \end{macrocode}
-% \pagebreak
% \noindent We also save the values, so that we can later (next rerun) check,
% whether they have been saved in the \xfile{aux} file.
%
% \begin{macrocode}
\protected@iwrite\@auxout{}{%
\string\gdef\string\lastpage@lastpage{\thepage}}%
- \gdef\lastpage@Hy{\IfPackageLoadedTF{hyperref}{%
- \ifHy@pageanchor\lastpage@rmpage{\@currentHpage}\fi}{}}%
+ \lastpage@makeHy%
\protected@iwrite\@auxout{}{%
\string\gdef\string\lastpage@lastpageHy{\lastpage@Hy}}%
% \end{macrocode}
@@ -1553,7 +1616,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \end{macrocode}
% \end{macro}
-%
+%\pagebreak
% \begin{macro}{\lastpage@fileswtest}
% \indent \hspace*{2em}Later it will be determined whether it is allowed to write
% to the \xfile{aux} file. If it was \emph{not} allowed, it is checked
@@ -1679,7 +1742,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \begin{description}
% \item[-] \TeX Format \LaTeXe{}: \url{https://www.CTAN.org}
%
-% \item[-] document class \xclass{ltxdoc}, 2023/03/28, v2.1j,
+% \item[-] document class \xclass{ltxdoc}, 2024/02/08, v2.1j,
% \url{https://ctan.org/pkg/ltxdoc}
%
% \item[-] package \xpackage{holtxdoc}, 2019/12/09, v0.30,
@@ -1692,7 +1755,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \begin{description}
% \item[-] \TeX, \url{https://www.CTAN.org}
%
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-07, v2.1c,
% \url{https://ctan.org/pkg/lastpage}
% \end{description}
%
@@ -1702,7 +1765,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \begin{description}
% \item[-] \TeX-format \LaTeX{}, v2.09
%
-% \item[-] package \xpackage{lastpage209}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage209}, 2024-07-07, v2.1c,
% \url{https://ctan.org/pkg/lastpage}
% \end{description}
% and does not work with \xpackage{hyperref}, which needs \LaTeX2e{}.\smallskip
@@ -1714,7 +1777,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \item[-] \TeX-format \LaTeXe{} 1994/12/01 or newer,
% \url{https://www.CTAN.org}
%
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-07, v2.1c,
% \url{https://ctan.org/pkg/lastpage}
% \end{description}
%
@@ -1725,7 +1788,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \item[-] \TeX-format \LaTeXe{} between 1994/12/01 and 2023-05-31,\newline
% \url{https://www.CTAN.org}
%
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-07, v2.1c,
% \url{https://ctan.org/pkg/lastpage}
% \end{description}
% and can use
@@ -1742,13 +1805,13 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \item[-] \TeX-format \LaTeXe{} 2023-06-01 or newer,\newline
% \url{https://www.CTAN.org}
%
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-07, v2.1c,
% \url{https://ctan.org/pkg/lastpage}
% \end{description}
% and can use
% \begin{description}
% \item[-] package \xpackage{hyperref}, 2023-11-07 and newer
-% (tested with: 2024-01-20, v7.01h),
+% (tested with: 2024-05-23, v7.01i),
% \url{https://ctan.org/pkg/hyperref}
% \end{description}
% \pagebreak
@@ -1757,7 +1820,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% The |lastpage-example.tex| requires the same file as all
% documents using the \xpackage{lastpage} package, i.\,e.
% \begin{description}
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-07, v2.1c,
% \url{https://ctan.org/pkg/lastpage}\newline
% (Well, it is the example file for this package, and because you are reading the
% documentation for the \xpackage{lastpage} package, it can be assumed that you already
@@ -1765,13 +1828,13 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \end{description}
% and additionally:
% \begin{description}
-% \item[-] class \xpackage{article}, 2023-05-17, v1.4n, from \xpackage{classes}:
+% \item[-] class \xpackage{article}, 2024-02-08, v1.4n, from \xpackage{classes}:
% \url{https://ctan.org/pkg/classes}
%
-% \item[-] package \xpackage{showkeys}, 2023-07-08, v3.19,
+% \item[-] package \xpackage{showkeys}, 2024-05-23, v3.21,
% \url{https://ctan.org/pkg/showkeys}
%
-% \item[-] package \xpackage{hyperref}, 2024-01-20, v7.01h,
+% \item[-] package \xpackage{hyperref}, 2024-05-23, v7.01i,
% \url{https://ctan.org/pkg/hyperref}
% \end{description}
%
@@ -2038,7 +2101,8 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% to update it. Further I would like to thank \textsc{Heiko Oberdiek}
% for providing a~lot~(!) of useful packages (from which I also learned everything
% I know about creating a file in \xfile{dtx} format, OK, say it: copying).
-% Thanks for bug reports go to \textsc{Ulrike Fischer} (twice),
+% Thanks to \textsc{David Carlisle} for the new code for |\lastpage@rmpage|.
+% Thanks for bug reports go to \textsc{Ulrike Fischer} (several times),
% \textsc{Sebastian Bank}, \textsc{James Hedges}, \textsc{Mikhail Titov},
% \textsc{Micha\l{} Herman}, \textsc{Matteo Gamboz}, and \textsc{James Small}.
% Thanks to \textsc{Sven Siegmund} for pointing out a necessary further
@@ -2219,8 +2283,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \item Replaced |\immediate\write| by a form of (pseudo-code!) |\immediate\protected@write|.
% (Thanks to \textsc{Ulrike Fischer} for the error report and solution!)
% \item Update of the |\lastpage@putl@bel| code to \pkg{hyperref} 2023-07-08, v7.01b,
-% which now allows fnsymbol as page numbering scheme (while links to, for example,
-% a page named $\|$ still do not work).
+% which now allows fnsymbol as page numbering scheme.
% \end{Version}
% \begin{Version}{2023-10-06 v2.0d}
% \item For plain arabic page numbers only, \pkg{lastpage} again writes the page number
@@ -2237,6 +2300,16 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
% \item |\lastpage@IfNumericTF| is no longer needed, but has not been removed
% so as not to break older documents that use it in a different context.
% \end{Version}
+% \begin{Version}{2024-07-03 v2.1b}
+% \item The \xclass{beamer} class loads \xpackage{hyperref} partially,
+% so that \xpackage{hyperref} is incorrectly detected as having been loaded.
+% The defining operation for |\lastpage@Hy| has been changed to catch this
+% and other different cases.
+% \end{Version}
+% \begin{Version}{2024-07-07 v2.1c}
+% \item With help from \textsc{David Carlisle} |\lastpage@rmpage| no longer assumes
+% |\@currentHpage| to begin with |page.|.
+% \end{Version}
% \end{History}
% \bigskip
%
diff --git a/Master/texmf-dist/source/latex/lastpage/lastpage.ins b/Master/texmf-dist/source/latex/lastpage/lastpage.ins
index e39cb80cbef..120709843e4 100644
--- a/Master/texmf-dist/source/latex/lastpage/lastpage.ins
+++ b/Master/texmf-dist/source/latex/lastpage/lastpage.ins
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -60,7 +59,7 @@
\input docstrip.tex
\Msg{**********************************************************************}
\Msg{* Installation *}
-\Msg{* Package: lastpage 2024-04-27 v2.1a Refers to last page's name (HMM)*}
+\Msg{* Package: lastpage 2024-07-07 v2.1c Refers to last page's name (HMM)*}
\Msg{**********************************************************************}
\keepsilent
@@ -72,7 +71,7 @@
This is a generated file.
Project: lastpage
-Version: 2024-04-27 v2.1a
+Version: 2024-07-07 v2.1c
Info: Refers to last page's name
Copyright (C) 2010 - 2024 by
@@ -95,10 +94,9 @@ The Current Maintainer of this work is H.-Martin Muench.
This package was invented by Jeffrey P. Goldberg.
I thought that a replacement was needed and therefore created the pageslts package,
-https://ctan.org/pkg/pageslts
-. Nevertheless, for compatibility with existing documents/packages as well as for
-the low amount of resources needed by the lastpage package (no new counter!),
-I updated this package.
+https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+documents/packages as well as for the low amount of resources needed by the
+lastpage package (no new counter!), I updated this package.
Thanks go to Jeffrey P. Goldberg for allowing me to do this.
While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
diff --git a/Master/texmf-dist/source/latex/lni/lni.dtx b/Master/texmf-dist/source/latex/lni/lni.dtx
index 20261238d4e..257f0d4bb0d 100644
--- a/Master/texmf-dist/source/latex/lni/lni.dtx
+++ b/Master/texmf-dist/source/latex/lni/lni.dtx
@@ -134,7 +134,7 @@ This work consists of the file lni.dtx
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{lni}
%<*class>
- [2024/01/08 v1.8.1 Official class for submissions to the ``Lecture Notes
+ [2024/07/01 v1.9 Official class for submissions to the ``Lecture Notes
in Informatics'']
%</class>
%<*driver>
@@ -286,6 +286,7 @@ This work consists of the file lni.dtx
% \changes{v1.8}{2022/06/10}{Fix output error in bst files (#97)}
% \changes{v1.8}{2022/11/25}{Make class compatable with latest publisher requirements (#121)}
% \changes{v1.8}{2022/11/25}{Make usage of `hyperref` mandatory (#131)}
+% \changes{v1.9}{2024/07/01}{Support multiple affiliations (#158)}
%
% \GetFileInfo{\jobname.dtx}
% \DoNotIndex{\newcommand,\newenvironment}
@@ -489,12 +490,13 @@ This work consists of the file lni.dtx
% \cs{affil\oarg{number}\marg{information}} where you can use
% \texttt{\textbackslash\textbackslash} to split the address.
% \begin{examplecode}[label={lst:author}]
-% \author[1]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
+% \author[1,2]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
% \author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
-% \author[1]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
+% \author[3]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
% \author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
-% \affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
-% \affil[2]{University\\Department\\Address\\Country}
+% \affil[1]{Universität 1\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+% \affil[2]{University 2 \\Department\\Address\\Country}
+% \affil[3]{University 3\\Department\\Address\\Country}
% \end{examplecode}
%
% Leave the third and/or fourth argument empty if there is no email address and/or ORCID iD.
@@ -1149,53 +1151,71 @@ This work consists of the file lni.dtx
\renewcommand\Authsep{, }
\renewcommand\Authands{\iflanguage{ngerman}{ und }{, and }}
\renewcommand\Authand{\iflanguage{ngerman}{ und }{ and }}
-\renewcommand{\AB@authnote}[1]{$^{\text{\mbox{\normalfont\footnotesize #1}}}$}
+\NewDocumentCommand{\multiaffil}{ >{\SplitList{,}} m m m}{%
+ \gdef\@currEmail{#2}
+ \gdef\@currOrcid{#3}
+ \ProcessList{#1}{\@multiaffil}
+}
+
+\newcommand{\@multiaffil}[1]{%
+ \ifcsundef{@emailsandorcids#1}{\csgdef{@emailsandorcids#1}{}}{}%
+ \ifcsempty{@emailsandorcids#1}%
+ {\csgappto{@emailsandorcids#1}{%
+ \if\relax\@currEmail\relax\else\email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
+ {\csgappto{@emailsandorcids#1}{%
+ \if\relax\@currEmail\relax\else;\ \email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
+}
+
\renewcommand\author[4][]{%
\ifnewaffil\addtocounter{affil}{1}%
\edef\AB@thenote{\arabic{affil}}%
\fi%
\if\relax#1\relax\def\AB@note{\AB@thenote}\else\def\AB@note{#1}%
- \ifcsundef{@emailsandorcids\AB@note}{\csgdef{@emailsandorcids\AB@note}{}}{}%
\setcounter{Maxaffil}{0}\fi
\ifnum\value{authors}=0\def\@firstauthor{#2}\fi
\ifnum\value{authors}>1\relax
- \@namedef{@sep\number\c@authors}{\Authsep}\fi
+ \@namedef{@sep\number\c@authors}{\Authsep}\fi
\addtocounter{authors}{1}%
\begingroup
- \let\protect\@unexpandable@protect \let\and\AB@pand
- \def\thanks{\protect\thanks}\def\footnote{\protect\footnote}%
- \@temptokena=\expandafter{\AB@authors}%
- \@temptokenb=\expandafter{\AB@authors}%
- {\def\\{\protect\\[\@affilsep]\protect\Affilfont
- \protect\AB@resetsep}%
- \xdef\AB@author{\AB@blk@and#2}%
- \ifnewaffil\gdef\AB@las{}\gdef\AB@lasx{\protect\Authand}\gdef\AB@as{}%
- \xdef\AB@authors{\the\@temptokena\AB@blk@and}%
- \else
- \xdef\AB@authors{\the\@temptokena\AB@as\AB@au@str}%
- \global\let\AB@las\AB@lasx\gdef\AB@lasx{\protect\Authands}%
- \gdef\AB@as{\Authsep}%
- \fi
- \gdef\AB@au@str{#2}}%
- \@temptokena=\expandafter{\AB@authlist}%
- \@temptokenb=\expandafter{\@authlisthead}%
- \let\\=\authorcr
- \xdef\AB@authlist{\the\@temptokena
- \protect\@nameuse{@sep\number\c@authors}%
- \protect\Authfont#2\if\relax#4\relax\else\,\orcidlink{#4}\fi\AB@authnote{\AB@note}}%
- \xdef\@authlisthead{\the\@temptokenb
- \protect\@nameuse{@sep\number\c@authors}%
- \protect\Authfont#2}%
+ \let\protect\@unexpandable@protect \let\and\AB@pand
+ \def\thanks{\protect\thanks}\def\footnote{\protect\footnote}%
+ \@temptokena=\expandafter{\AB@authors}%
+ \@temptokenb=\expandafter{\AB@authors}%
+ {\def\\{\protect\\[\@affilsep]\protect\Affilfont
+ \protect\AB@resetsep}%
+ \xdef\AB@author{\AB@blk@and#2}%
+ \ifnewaffil\gdef\AB@las{}\gdef\AB@lasx{\protect\Authand}\gdef\AB@as{}%
+ \xdef\AB@authors{\the\@temptokena\AB@blk@and}%
+ \else
+ \xdef\AB@authors{\the\@temptokena\AB@as\AB@au@str}%
+ \global\let\AB@las\AB@lasx\gdef\AB@lasx{\protect\Authands}%
+ \gdef\AB@as{\Authsep}%
+ \fi
+ \gdef\AB@au@str{#2}}%
+ \@temptokena=\expandafter{\AB@authlist}%
+ \@temptokenb=\expandafter{\@authlisthead}%
+ \let\\=\authorcr
+ \xdef\AB@authlist{\the\@temptokena
+ \protect\@nameuse{@sep\number\c@authors}%
+ \protect\Authfont#2\if\relax#4\relax\else\,\orcidlink{#4}\fi\AB@authnote{\AB@note}}%
+ \xdef\@authlisthead{\the\@temptokenb
+ \protect\@nameuse{@sep\number\c@authors}%
+ \protect\Authfont#2}%
\endgroup
\ifnum\value{authors}>2\relax
\@namedef{@sep\number\c@authors}{\Authands}\fi
+ \ifcsundef{@emailsandorcids\AB@note}{\csgdef{@emailsandorcids\AB@note}{}}{}%
+ \sbox\z@{\@tempcnta=0#1\relax}%
+ \expandafter\ifdim\wd\z@>\z@\relax
+ \multiaffil{#1}{#3}{#4}
+ \else
+ \ifcsundef{@emailsandorcids\AB@note}{\csgdef{@emailsandorcids\AB@note}{}}{}%
\ifcsempty{@emailsandorcids\AB@note}%
{\csgappto{@emailsandorcids\AB@note}{%
- \if\relax#3\relax\else\email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}%
- }%
+ \if\relax#3\relax\else\email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}}%
{\csgappto{@emailsandorcids\AB@note}{%
\if\relax#3\relax\else;\ \email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}}%
-
+ \fi%
\newaffilfalse
}
\renewcommand\@author{%
@@ -3071,12 +3091,13 @@ EXECUTE {end.bib}
\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen
Worten und noch mehr Buchstaben}
%% \subtitle{Untertitel / Subtitle} % if needed
-\author[1]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
-\author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
-\author[1]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
-\author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
-\affil[1]{Universität\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
-\affil[2]{University\\Department\\Address\\Country}
+ \author[1,2]{Firstname1 Lastname1}{firstname1.lastname1@affiliation1.org}{0000-0000-0000-0000}
+ \author[2]{Firstname2 Lastname2}{firstname2.lastname2@affiliation2.org}{0000-0000-0000-0000}
+ \author[3]{Firstname3 Lastname3}{firstname3.lastname3@affiliation1.org}{0000-0000-0000-0000}
+ \author[1]{Firstname4 Lastname4}{firstname4.lastname4@affiliation1.org}{0000-0000-0000-0000}%
+ \affil[1]{Universität 1\\Abteilung\\Straße\\Postleitzahl Ort\\Land}
+ \affil[2]{University 2 \\Department\\Address\\Country}
+ \affil[3]{University 3\\Department\\Address\\Country}
\maketitle
\begin{abstract}
diff --git a/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx
index d6a14105cad..f0f644acbd8 100644
--- a/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx
+++ b/Master/texmf-dist/source/latex/moloch/beamercolorthememoloch.dtx
@@ -14,7 +14,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthememoloch}[2024-03-06 v0.3.0 Moloch color theme] % x-release-please-version
+\ProvidesPackage{beamercolorthememoloch}[2024-07-09 v0.4.0 Moloch color theme] % x-release-please-version
%</package>
% \fi
% \CheckSum{0}
diff --git a/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx
index 4748387c3cc..cc3396fe472 100644
--- a/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx
+++ b/Master/texmf-dist/source/latex/moloch/beamerfontthememoloch.dtx
@@ -14,7 +14,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthememoloch}[2024-03-06 v0.3.0 Moloch font theme] % x-release-please-version
+\ProvidesPackage{beamerfontthememoloch}[2024-07-09 v0.4.0 Moloch font theme] % x-release-please-version
%</package>
% \fi
% \CheckSum{0}
@@ -27,9 +27,12 @@
%
% A |beamer| font theme sets the style of the font used in the document.
%
+%
+%
% \subsubsection{Package dependencies}
%
% \begin{macrocode}
+\RequirePackage{etoolbox}
\RequirePackage{pgfopts}
% \end{macrocode}
%
@@ -51,6 +54,188 @@
\setbeamerfont{standout}{size=\Large, series=\bfseries}
% \end{macrocode}
%
+%
+%
+% \subsubsection{Title format options}
+%
+% \begin{macro}{titleformat title}
+% Controls the format of the title.
+% \begin{macrocode}
+\pgfkeys{
+ /moloch/font/titleformat title/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@titleformat\@empty%
+ \setbeamerfont{title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@titleformat\@empty%
+ \setbeamerfont{title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@titleformat\lowercase%
+ \setbeamerfont{title}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat title=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@titleformat\uppercase%
+ \setbeamerfont{title}{shape=\normalfont}
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat title=allcaps can lead to problems%
+ }
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{titleformat subtitle}
+% Control the format of the subtitle.
+% \begin{macrocode}
+\pgfkeys{
+ /moloch/font/titleformat subtitle/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@subtitleformat\MakeLowercase%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat subtitle=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@subtitleformat\MakeUppercase%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat subtitle=allcaps can lead to problems%
+ }
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{titleformat section}
+% Controls the format of the section title.
+% \begin{macrocode}
+\pgfkeys{
+ /moloch/font/titleformat section/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@sectiontitleformat\MakeLowercase%
+ \setbeamerfont{section title}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat section=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@sectiontitleformat\MakeUppercase%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat section=allcaps can lead to problems%
+ }
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{frametitleformat}
+% Control the format of the frame title.
+% \begin{macrocode}
+\pgfkeys{
+ /moloch/font/titleformat frame/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@frametitleformat\MakeLowercase%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat frame=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@frametitleformat\MakeUppercase%
+ \setbeamerfont{frametitle}{shape=\normalfont}
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat frame=allcaps can lead to problems%
+ }
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{titleformat aliases}
+% Allows |titleformat title| et al. to be used in the |\usetheme|
+% declaration, where \LaTeX{} automatically removes all spaces.
+% \begin{macrocode}
+\pgfkeys{
+ /moloch/font/.cd,
+ titleformattitle/.code=\pgfkeysalso{titleformat title=#1},
+ titleformatsubtitle/.code=\pgfkeysalso{titleformat subtitle=#1},
+ titleformatsection/.code=\pgfkeysalso{titleformat section=#1},
+ titleformatframe/.code=\pgfkeysalso{titleformat frame=#1},
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\moloch@font@setdefaults}
+% Sets default values for font theme options.
+% \begin{macrocode}
+\newcommand{\moloch@font@setdefaults}{
+ \pgfkeys{/moloch/font/.cd,
+ titleformat title=regular,
+ titleformat subtitle=regular,
+ titleformat section=regular,
+ titleformat frame=regular,
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% We first define hooks to change the case format of the titles.
+%
+% \begin{macrocode}
+\def\moloch@titleformat#1{#1}
+\def\moloch@subtitleformat#1{#1}
+\def\moloch@sectiontitleformat#1{#1}
+\def\moloch@frametitleformat#1{#1}
+% \end{macrocode}
+%
+% To make the uppercase and lowercase macros work in the title, subtitle, etc.,
+% we have to patch the appropriate |beamer| commands that set their values.
+% This solution was suggested by Enrico Gregorio in an answer to
+% \href{http://tex.stackexchange.com/questions/112526/}{this StackExchange
+% question}.
+%
+%
+% \subsubsection{Process package options}
+%
+% \begin{macrocode}
+\moloch@font@setdefaults
+\ProcessPgfPackageOptions{/moloch/font}
+% \end{macrocode}
% \iffalse
%</package>
% \fi
diff --git a/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx
index 2b626d526d4..9815a0995f5 100644
--- a/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx
+++ b/Master/texmf-dist/source/latex/moloch/beamerinnerthememoloch.dtx
@@ -14,7 +14,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthememoloch}[2024-03-06 v0.3.0 Moloch inner theme] % x-release-please-version
+\ProvidesPackage{beamerinnerthememoloch}[2024-07-09 v0.4.0 Moloch inner theme] % x-release-please-version
%</package>
% \fi
% \CheckSum{0}
@@ -173,7 +173,7 @@
% \begin{macrocode}
\setbeamertemplate{title}{
\raggedright%
- \inserttitle%
+ \moloch@titleformat{\inserttitle}%
\par%
\vspace*{0.2em}
}
@@ -184,8 +184,9 @@
% Set the subtitle on the title page.
% \begin{macrocode}
\setbeamertemplate{subtitle}{
+ \vspace*{0.1em}
\raggedright%
- \insertsubtitle%
+ \moloch@subtitleformat{\insertsubtitle}%
\par%
\vspace*{0.2em}
}
@@ -201,6 +202,7 @@
\setbeamertemplate{title separator}{
\tikzexternaldisable%
\begin{tikzpicture}
+ \mmzUnmemoizable%
\fill[fg] (0,0) rectangle (\textwidth, \moloch@titleseparator@linewidth);
\end{tikzpicture}%
\tikzexternalenable%
@@ -256,7 +258,7 @@
\begin{center}
\usebeamercolor[fg]{section title}
\usebeamerfont{section title}
- \insertsectionhead\par
+ \moloch@sectiontitleformat{\insertsectionhead}\par
\ifx\insertsubsectionhead\@empty\else
\usebeamercolor[fg]{subsection title}
\usebeamerfont{subsection title}
@@ -270,7 +272,7 @@
\raggedright
\usebeamercolor[fg]{section title}
\usebeamerfont{section title}
- \insertsectionhead\\[-1ex]
+ \moloch@sectiontitleformat{\insertsectionhead}\\[-1ex]
\usebeamertemplate*{progress bar in section page}
\par
\ifx\insertsubsectionhead\@empty\else%
@@ -338,9 +340,10 @@
\setbeamertemplate{progress bar in section page}{
\pgfmathsetlength{\moloch@progressonsectionpage}{
\textwidth * min(1,\insertframenumber/\inserttotalframenumber)
- }
- \tikzexternaldisable
+ }%
+ \tikzexternaldisable%
\begin{tikzpicture}
+ \mmzUnmemoizable%
\fill[bg]
(0,0)
rectangle
@@ -350,7 +353,7 @@
rectangle
(\moloch@progressonsectionpage, \moloch@progressonsectionpage@linewidth);
\end{tikzpicture}
- \tikzexternalenable
+ \tikzexternalenable%
}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx
index a5d59108319..a0ce0af5804 100644
--- a/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx
+++ b/Master/texmf-dist/source/latex/moloch/beamerouterthememoloch.dtx
@@ -14,7 +14,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthememoloch}[2024-03-06 v0.3.0 Moloch outer theme] % x-release-please-version
+\ProvidesPackage{beamerouterthememoloch}[2024-07-09 v0.4.0 Moloch outer theme] % x-release-please-version
%</package>
% \fi
% \CheckSum{0}
@@ -160,23 +160,42 @@
% Templates for the frame title, which is optionally underlined with a
% progress bar.
% \begin{macrocode}
+\newlength{\moloch@frametitle@padding}
+\setlength{\moloch@frametitle@padding}{2.2ex}
+\newcommand{\moloch@frametitlestrut@start}{%
+ \rule{0pt}{\moloch@frametitle@padding +%
+ \totalheightof{%
+ \ifcsdef{moloch@frametitleformat}{\moloch@frametitleformat X}{X}%
+ }%
+}%
+}
+
+\newcommand{\moloch@frametitlestrut@end}{%
+ \vphantom{\rule[-\moloch@frametitle@padding]{0pt}{\moloch@frametitle@padding}}
+}
\defbeamertemplate{frametitle}{plain}{%
\nointerlineskip%
\begin{beamercolorbox}[%
wd=\paperwidth,%
- sep=1.1ex,%
- leftskip=0.5ex,%
- rightskip=\the\glueexpr 0.5ex plus 1fill\relax,%
+ leftskip=1.6ex,%
+ rightskip=\the\glueexpr 1.6ex plus 1fill\relax,%
]{frametitle}%
\usebeamerfont{frametitle}%
- \vbox{}\vskip-0.4ex%
- \strut\insertframetitle\nolinebreak\strut\par%
+ \moloch@frametitlestrut@start%
+ \moloch@frametitleformat{\insertframetitle}%
{%
\ifx\insertframesubtitle\@empty%
\else%
- {\usebeamerfont{framesubtitle}\vspace{-0.8ex}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\strut\par}%
+ {%
+ \par%
+ \usebeamerfont{framesubtitle}%
+ \vspace{-0.8ex}%
+ \usebeamercolor[fg]{framesubtitle}%
+ \insertframesubtitle%
+ }%
\fi
}%
+ \moloch@frametitlestrut@end%
\end{beamercolorbox}%
}
\setbeamertemplate{frametitle continuation}{\romannumeral\insertcontinuationcount}
@@ -192,13 +211,14 @@
\newlength{\moloch@progressinheadfoot@linewidth}
\setlength{\moloch@progressinheadfoot@linewidth}{0.4pt}
\setbeamertemplate{progress bar in head/foot}{
- \nointerlineskip
+ \nointerlineskip%
\pgfmathsetlength{\moloch@progressinheadfoot}{%
\paperwidth * min(1,\insertframenumber/\inserttotalframenumber)%
- }
+ }%
\begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot}
- \tikzexternaldisable
+ \tikzexternaldisable%
\begin{tikzpicture}
+ \mmzUnmemoizable%
\fill[bg]
(0,0)
rectangle
@@ -208,7 +228,7 @@
rectangle
(\moloch@progressinheadfoot, \moloch@progressinheadfoot@linewidth);
\end{tikzpicture}
- \tikzexternalenable
+ \tikzexternalenable%
\end{beamercolorbox}
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx b/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx
index fcebef5a811..e6447ec7918 100644
--- a/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx
+++ b/Master/texmf-dist/source/latex/moloch/beamerthememoloch.dtx
@@ -12,7 +12,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthememoloch}[2024-03-06 v0.3.0 Moloch Beamer theme] % x-release-please-version
+\ProvidesPackage{beamerthememoloch}[2024-07-09 v0.4.0 Moloch Beamer theme] % x-release-please-version
%</package>
% \fi
% \CheckSum{0}
@@ -52,14 +52,69 @@
}
% \end{macrocode}
%
+% \begin{macro}{titleformat plain}
+% Controls the formatting of the text on standout ``plain'' frames.
+% \begin{macrocode}
+\pgfkeys{
+ /moloch/titleformat plain/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@plaintitleformat\MakeLowercase%
+ \setbeamerfont{standout}{shape=\scshape}%
+ },
+ allcaps/.code={%
+ \let\moloch@plaintitleformat\MakeUppercase%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{titleformat}
+% Sets a standard format for titles, subtitles, section titles, frame
+% titles, and the text on standout ``plain'' frames.
+% \begin{macrocode}
+\pgfkeys{
+ /moloch/titleformat/.code=\pgfkeysalso{
+ font/titleformat title=#1,
+ font/titleformat subtitle=#1,
+ font/titleformat section=#1,
+ font/titleformat frame=#1,
+ titleformat plain=#1,
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% Set default values for options.
+%
+% \begin{macrocode}
+\newcommand{\moloch@setdefaults}{
+ \pgfkeys{/moloch/.cd,
+ titleformat plain=regular,
+ }
+}
+% \end{macrocode}
+%
% To avoid generating externalized figures of the progressbar we have to disable
% them with ``tikzexternalenable'' and ``tikzexternaldisable''. However, if the
% ``external'' libray is not loaded we would get undefined control sequence
% problems, hence we define them as no-ops if they are not defined yet.
+% We do the same for the ``mmzUnmemoizable'' command from the memoize package, in
+% order to avoid memoization of the progress bars.
%
% \begin{macrocode}
\providecommand{\tikzexternalenable}{}
\providecommand{\tikzexternaldisable}{}
+\providecommand{\mmzUnmemoizable}{}
% \end{macrocode}
%
% \subsubsection{Component sub-packages}
@@ -98,6 +153,7 @@
% \subsubsection{Process package options}
%
% \begin{macrocode}
+\moloch@setdefaults
\ProcessPgfOptions{/moloch}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/moremath/moremath.dtx b/Master/texmf-dist/source/latex/moremath/moremath.dtx
new file mode 100644
index 00000000000..3b520f4ac21
--- /dev/null
+++ b/Master/texmf-dist/source/latex/moremath/moremath.dtx
@@ -0,0 +1,5515 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2024 Marcel Ilg
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%
+% https://www.latex-project.org/lppl.txt
+%
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status ‘maintained’.
+%
+% The Current Maintainer of this work is Marcel Ilg.
+%
+% This work consists of the files listed in MANIFEST.md.
+% \fi
+%
+% \iffalse
+%
+%<*driver>
+% Generated by ctanbib
+\begin{filecontents*}[overwrite]{\jobname.bib}
+@preamble{ "\providecommand\ctanbibpkgname[1]{\textsl{#1}}" }
+@manual{amsfonts,
+ title = {The \ctanbibpkgname{amsfonts} package},
+ subtitle = {TeX fonts from the American Mathematical Society},
+ author = {{The American Mathematical Society}},
+ url = {https://ctan.org/pkg/amsfonts},
+ urldate = {2024-07-04},
+ date = {},
+ version = {3.04},
+}
+
+@preamble{ "\providecommand\ctanbibpkgname[1]{\textsl{#1}}" }
+@manual{amsmath,
+ title = {The \ctanbibpkgname{amsmath} package},
+ subtitle = {AMS mathematical facilities for LaTeX},
+ author = {{The LaTeX Project Team}},
+ url = {https://ctan.org/pkg/amsmath},
+ urldate = {2024-07-04},
+ date = {2023-05-13},
+ version = {2.17o},
+}
+
+@preamble{ "\providecommand\ctanbibpkgname[1]{\textsl{#1}}" }
+@manual{bm,
+ title = {The \ctanbibpkgname{bm} package},
+ subtitle = {Access bold symbols in maths mode},
+ author = {Carlisle, David and Mittelbach, Frank and {The LaTeX Project Team}},
+ url = {https://ctan.org/pkg/bm},
+ urldate = {2024-07-04},
+ date = {2023-12-19},
+ version = {1.2f},
+}
+
+@preamble{ "\providecommand\ctanbibpkgname[1]{\textsl{#1}}" }
+@manual{mathtools,
+ title = {The \ctanbibpkgname{mathtools} package},
+ subtitle = {Mathematical tools to use with amsmath},
+ author = {Høgholm, Morten and Madsen, Lars and Robertson, Will and Wright, Joseph and {The LaTeX Project Team}},
+ url = {https://ctan.org/pkg/mathtools},
+ urldate = {2024-07-04},
+ date = {2024-03-11},
+ version = {1.30},
+}
+\end{filecontents*}
+\begin{filecontents*}[overwrite]{\jobname-ams-op-table.tex}
+\begin{tabular}{rlrlrlrl}
+ \cs[module=amsmath,replace=false]{arccos} &\(\arccos\) &\cs[module=amsmath,replace=false]{deg} &\( \deg \) &\cs[module=amsmath,replace=false]{lg} &\( \lg \) &\cs[module=amsmath,replace=false]{projlim} &\( \projlim \)\\
+ \cs[module=amsmath,replace=false]{arcsin} &\(\arcsin\) &\cs[module=amsmath,replace=false]{det} &\( \det \) &\cs[module=amsmath,replace=false]{lim} &\( \lim \) &\cs[module=amsmath,replace=false]{sec} &\( \sec \)\\
+ \cs[module=amsmath,replace=false]{arctan} &\(\arctan\) &\cs[module=amsmath,replace=false]{dim} &\( \dim \) &\cs[module=amsmath,replace=false]{liminf} &\( \liminf \) &\cs[module=amsmath,replace=false]{sin} &\( \sin \)\\
+ \cs[module=amsmath,replace=false]{arg} &\(\arg\) &\cs[module=amsmath,replace=false]{exp} &\( \exp \) &\cs[module=amsmath,replace=false]{limsup} &\( \limsup \) &\cs[module=amsmath,replace=false]{sinh} &\( \sinh \)\\
+ \cs[module=amsmath,replace=false]{cos} &\(\cos\) &\cs[module=amsmath,replace=false]{gcd} &\( \gcd \) &\cs[module=amsmath,replace=false]{ln} &\( \ln \) &\cs[module=amsmath,replace=false]{sup} &\( \sup \)\\
+ \cs[module=amsmath,replace=false]{cosh} &\(\cosh\) &\cs[module=amsmath,replace=false]{hom} &\( \hom \) &\cs[module=amsmath,replace=false]{log} &\( \log \) &\cs[module=amsmath,replace=false]{tan} &\( \tan \)\\
+ \cs[module=amsmath,replace=false]{cot} &\(\cot\) &\cs[module=amsmath,replace=false]{inf} &\( \inf \) &\cs[module=amsmath,replace=false]{max} &\( \max \) &\cs[module=amsmath,replace=false]{tanh} &\( \tanh \)\\
+ \cs[module=amsmath,replace=false]{coth} &\(\coth\) &\cs[module=amsmath,replace=false]{injlim} &\(\injlim\) &\cs[module=amsmath,replace=false]{min} &\( \min \) & &\\
+ \cs[module=amsmath,replace=false]{csc} &\(\csc\) &\cs[module=amsmath,replace=false]{ker} &\(\ker\) &\cs[module=amsmath,replace=false]{Pr} &\( \Pr \) & &\\
+\end{tabular}
+\begin{center}
+ \begin{tabular}{rlrl}
+ \cs[module=amsmath,replace=false]{varinjlim} &\(\varinjlim\) &\cs[module=amsmath,replace=false]{varliminf} &\(\varliminf\)\\
+ \cs[module=amsmath,replace=false]{varprojlim} &\(\varprojlim\) &\cs[module=amsmath,replace=false]{varlimsup} &\(\varlimsup\)\\
+ \end{tabular}
+\end{center}
+\end{filecontents*}
+
+
+% custom commands for use inside the documentation
+\ExplSyntaxOn
+% Property list storing version date information
+\prop_new:N \l__moremathdoc_version_date_prop
+
+\cs_new_protected:Nn \moremathdoc_add_version:nn
+{
+ \prop_put_if_new:Nnn \l__moremathdoc_version_date_prop {#1} {#2}
+}
+
+\cs_new_protected:Nn \moremathdoc_get_version:n
+{
+ \group_begin:
+ \prop_get:NnNT \l__moremathdoc_version_date_prop {#1} \l_tmpa_tl
+ {
+ \tl_use:N \l_tmpa_tl
+ }
+ \group_end:
+}
+
+\NewDocumentCommand \AddVersion { m m }
+{
+ \moremathdoc_add_version:nn {#1} {#2}
+}
+
+\NewDocumentCommand \GetVersionDate { m }
+{
+ \moremathdoc_get_version:n {#1}
+}
+\ExplSyntaxOff
+
+\documentclass[%
+%show-notes,%
+]{l3doc}
+
+\SetupDoc{reportchangedates=true}
+\RecordChanges
+
+\usepackage[american]{babel}
+\AddBabelHook[american]{nofrench}{afterextras}{\frenchspacing}
+
+\usepackage[style=alphabetic]{biblatex}
+\addbibresource{\jobname.bib}
+
+\usepackage{csquotes}
+\SetCiteCommand{\autocite}
+
+\usepackage{amssymb}
+\usepackage[bm]{moremath}
+
+% renew the ctanbibpkgname command
+\NewDocumentCommand\ctanbibpkgname{m}{\pkg{#1}}
+
+% Example operators and commands
+\DeclareMathOperator{\glorb}{glorb}
+\DeclarePairedDelimiter{\inparen}{\lparen}{\rparen}
+\DeclareDelimitedOperator{\pglorb}{\glorb}{\inparen}
+
+\begin{document}
+ \DocInput{moremath.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% ^^X Get the package version name etc.
+% \GetFileInfo{moremath.sty}
+%
+% ^^X Register changes here
+% \AddVersion{v0.1.0}{2024-06-28}
+% \AddVersion{v0.2.0}{2024-07-04}
+% \AddVersion{v0.3.0}{2024-07-08}
+% \AddVersion{v0.4.0}{2024-07-15}
+%
+% ^^X Placeholder for unreleased versions
+% \AddVersion{vUNRELEASED}{UNRELEASED}
+%
+% \begin{documentation}
+%
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{Initial development release}
+% \changes{v0.3.0}{\GetVersionDate{v0.3.0}}{
+% Split the documentation into several parts.
+% }
+% \changes{v0.4.0}{\GetVersionDate{v0.4.0}}{
+% \textbf{Breaking Change:} Rename the package
+% and the \meta{prefix} used for function names from
+% "conmath" to "moremath".
+% }
+%
+% \title{The \pkg{moremath} package\thanks{This document coresponds to
+% \textsf{moremath}~\fileversion, dated \filedate.}}
+%
+% \author{Marcel Ilg\thanks{\texttt{mister01x (at) web (dot) de}}}
+%
+% \date{Released \filedate}
+%
+% \maketitle
+%
+% \begin{abstract}
+% The \pkg{moremath} package provides several document level commands
+% to ease the typesetting
+% and \LaTeX{} code readability of certain mathematical constructs.
+% It provides complementary commands to all operators defined by \pkg{amsmath},
+% the commands typeset delimiters that may be automatically, manually or
+% not scaled at all.
+% The commands also accept optional sub- and superscripts to the operators.
+%
+% Furthermore it provides several commands to typeset gradient, divergence,
+% curl, and Laplace operators,
+% for which there are also versions with delimiters.
+% Those commands also accept an optional subscript
+% and their appearance can be modified using key-value options.
+%
+% Additionally commands are provided for producing row and column vectors,
+% as well as (anti-)diagonal matrices,
+% utilizing \pkg{mathtools} \env{matrix*} family of environments.
+%
+% Most of the document level commands defined by this package can also
+% be disabled using a package load-time option to avoid clashes with
+% commands defined by other packages.
+% \end{abstract}
+%
+% \section*{Note: This Package is Still in its Initial Development Phase}
+% Do not expect a stable interface until version 1.0.0 has been reached!
+% While I try to keep the interface stable and backwards compatible,
+% I am unable to promise this.
+%
+% \tableofcontents
+%
+% \part{Document Author Documentation}
+% \label{pt:doc-auth}
+%
+% \section{Introduction}
+% \label{sec:intro}
+%
+% When typesetting mathematics in \LaTeX{} it is very common to often encounter,
+% code patterns such as |\sin \left( \frac{x}{2} \right)|.
+% While this above code works as expected its not especially easy for human
+% readers of this code to immediately understand what that code is going to
+% do.
+%
+% This package tries to ease readability of such commonly used constructs
+% by providing commands that (hopefully) increase readability,
+% as well as speeding up writing math in \LaTeX{}.
+% Using \pkg{moremath} the above code can be simplified to |\psin*{\frac{x}{2}}|,
+% which is shorter and better \enquote{human readable}.
+% The package also provides the possibility for users to define such delimited operators,
+% on their own.
+%
+% There are also other things that can be improved when typesetting math.
+% One prominent example is the typsetting of row and column vectors,
+% which require the use of a \env{matrix} environment.
+% For this case \pkg{moremath} provides commands which accept a comma separated
+% list of vector entries,
+% obliterating the need for a \env{matrix} environment to typeset vectors.
+%
+% The same goes for (anti-)diagonal matrices,
+% only the elements of the diagonal are of importance here.
+% Therefore the production of those matrices may also be simplified into a single command,
+% which again improves readability of the code compared to a mostly empty \env{matrix} environment.
+%
+% Another feature of this package is the definition of several (delimited)
+% vector calculus operators such as gradient, divergence and curl operators,
+% this does not only improve the semantics of the math code
+% (|\mathop{\nabla} f| vs.\ |\grad f|),
+% but also tries to provide the correct spacing between the operator and its
+% arguments.
+%
+% The \pkg{moremath} package is written using \LaTeX{}3
+% and provides a small \LaTeX{}3 interface for class and package writers.
+%
+% The source code for \pkg{moremath} is hosted on GitHub at
+% \begin{center}
+% \url{https://github.com/Mister00X/moremath}
+% \end{center}
+% If you have any issues or found a bug, feel free to register an issue there.
+%
+% \section{Dependencies}
+% \label{sec:deps}
+%
+% The main dependency of this package is \pkg{mathtools}~\autocite{mathtools}.
+% Optionally the \pkg{bm}~\autocite{bm} may be loaded.
+%
+% If the option "no-vector" has \emph{not} been given as a package load time option,
+% this package also loads the \pkg{amssymb}~\autocite{amsfonts} package.
+%
+% \section{Package Options}
+% \label{sec:pack-opts}
+%
+% ^^X SUBSECTION: Package Load Time Options
+% \subsection{Package Load Time Options}
+% \label{sec:pkg-load-time-opts}
+% The options described in this section \emph{must} be given
+% at package load time i.e.\ as package options.
+% All options which are not described below will be passed to
+% \pkg{mathtools}~\autocite{mathtools},
+% see its documentation for more information.
+%
+% \DescribeOption{bm} The \verb|bm| option
+% loads the \pkg{bm}~\autocite{bm} package which provides a better version of
+% the \cs{boldsymbol} command.
+%
+%
+%
+%
+% The options
+% \DescribeOption{no-vector} "no-vector",
+% \DescribeOption{no-abs-shorthands} "no-abs-shorthands",
+% \DescribeOption{no-operators} "no-operators",
+% \DescribeOption{no-crvector} "no-crvector",
+% and \DescribeOption{no-matrix} "no-matrix"
+% disable the definition of the predefined commands described in sections~\ref{sec:vector-calculus},
+% \ref{sec:shorthands},
+% \ref{sec:delim-ops},
+% \ref{sec:rc-vectors},
+% and~\ref{sec:matrices}
+% respectively.
+%
+% \DescribeOption{nopredef}
+% The option |nopredef| achieves the same as the three
+% |no-|\meta{functionality} options above.
+% It accepts multiple values, valid option values are:
+% |vector|,
+% |abs|,
+% |operators|,
+% |crvector|,
+% |matrix|,
+% and |all|.
+% The values
+% |abs|,
+% |operators|,
+% and |vector|
+% disable the predefined
+% document level commands for
+% delimited operators,
+% vector calculus
+% and the shorthands for absolute value and norm respectively.
+% The values "crvector" and "matrix" disable the shorthand commands
+% for row and column vectors, and simple matrices respectively.
+% The special value |all| disables all of them.
+%
+% The option accepts multiple values which can be given as a comma separated
+% list, or as multiple key-value options, like in the examples below:
+% \begin{verbatim}
+% \usepackage[nopredef={vector,abs,operators}]{moremath}
+% \end{verbatim}
+% This is equivalent to
+% \begin{verbatim}
+% \usepackage[nopredef=all]{moremath}
+% \end{verbatim}
+% and to:
+% \begin{verbatim}
+% \usepackage[nopredef=vector,nopredef=abs,nopredef=operators]{moremath}
+% \end{verbatim}
+%
+% The command \cs{NewDelimitedOperator} is not affected by any of the above
+% settings.
+%
+% ^^X SUBSECTION: General Options
+% \subsection{General Options}
+% \label{sec:pkg-general-options}
+%
+% The options described in this section
+% \emph{must not} be given as package options,
+% instead they should be set using \cs{moremathsetup}
+% or given as optional argument to the commands described later.
+% \begin{function}[updated = 2024-07-15]{\moremathsetup}
+% \begin{syntax}
+% \cs{moremathsetup}\marg{kv~list}
+% \end{syntax}
+% Sets the options specified in the \meta{key-value list},
+% the assignment is local to the current group.
+% If a \meta{value} contains a comma it needs to be wrapped in braces.
+% This command may be used anywhere in the document after \pkg{moremath}
+% has been loaded.
+% \end{function}
+%
+% \subsubsection{Options Affecting Vector Calculus Operators}
+% \label{sec:options-vec-calc}
+%
+% \DescribeOption{nabla}
+% The option |nabla| sets the symbol to use by the document level commands
+% described in section~\ref{sec:vector-calculus} to use for the nabla.
+% It accepts a list of \meta{tokens}. Its default value is |\nabla|.
+%
+% \DescribeOption{arrownabla}
+% The option |arrownabla| puts a small arrow over the gradient operator symbol.
+% Its default value is |false|.
+%
+% \DescribeOption{boldnabla}
+% The option |boldnabla| makes the nabla symbol bold.
+% If the |bm| package option has been given the |\boldsymbol| command from
+% the \pkg{bm} package is used for the bold symbol,
+% otherwise the \pkg{amsmath}~\autocite{amsmath} version is used.
+%
+% \DescribeOption{grad-op}
+% The option |grad-op| may be used to overwrite,
+% the built in version of the gradient operator, it accepts a \meta{token list}.
+% Use at your own responsibility.
+%
+% \DescribeOption{laplacian-symb}
+% The option |laplacian-symb| sets the symbol to use by the document level
+% commands described in section~\ref{sec:vector-calculus} to use for the
+% Laplace operator. It accepts a list of \meta{tokens}.
+%
+% \DescribeOption{delta-laplace}
+% The option |delta-laplace| replaces the Laplace operator symbol
+% (by default \(\laplacian\)) with a uppercase delta
+% (\(\laplacian[delta-laplace=true]\)).
+% Its default value is |false|.
+%
+% \DescribeOption{arrowlaplace}
+% The option |arrowlaplace| if set to |true| makes the Laplace operator look
+% like this: \(\laplacian[arrowlaplace=true]\).
+%
+% \DescribeOption{laplacian}
+% Like the option |grad-op| above the option |laplacian| may be used to
+% overwrite the built-in version of the Laplace operator.
+% Use at your own responsibility.
+%
+% \DescribeOption{dalembert-symb}
+% Like the option "nabla" this sets the symbol to use by the document level
+% commands described in section~\ref{sec:dalembert-op-cmds} to use as symbol
+% for the \foreignlanguage{french}{d'Alembert} operator. It accepts a list of
+% \meta{tokens}. It's default value is \cs[module=amssymb,replace=false]{square}.
+%
+% \DescribeOption{vcenter}
+% The option "vcenter" controls if certain mathematical symbols
+% of the operators described in section~\ref{sec:vector-calculus} should be
+% vertically centered along the math-axis.
+% The default value of this option is "true".
+%
+%
+%
+% \subsubsection{Options Affecting Matrices and Vectors}
+% \label{sec:options-matrix}
+%
+% The options in this section only affect the commands described in sections~\ref{sec:rc-vectors}
+% and~\ref{sec:matrices}. To set them with \cs{moremathsetup} it is necessary
+% to add the prefix |matrix / | to these options,
+% so that the resulting command looks like \cs{moremathsetup}\texttt{\{matrix / \meta{option}\}}.
+% When using these options inside the optional argument of the commands described
+% in sections~\ref{sec:rc-vectors} and~\ref{sec:matrices}, the prefix "matrix /"
+% must be omitted.
+%
+% \DescribeOption{delimiter}
+% The option |delimiter| determines the delimiters used for the matrices,
+% valid values are "p" for parenthesis, "b" for brackets, "B" for braces,
+% "v" for single vertical lines (\enquote{\(\vert\)}),
+% "V" for double vertical lines (\enquote{\(\Vert\)}) or empty for no delimiters.
+% The default value is "{}" (empty).
+%
+% \DescribeOption{fill}
+% The fill option determines the values an (anti-)diagonal matrix is filled with,
+% outside the diagonal. The default is again empty.
+%
+% \DescribeOption{align}
+% This option determines the alignment of the numbers inside the matrix.
+% The value of this option gets passed to the optional argument of the \env{matrix*}
+% or \env{smallmatrix*} family of environments defined by \pkg{mathtools}~\autocite{mathtools}.
+% Valid values for both types of those environments are |l| for left alignment,
+% |r| for right alignment and |c| for centered alignment. The default is |c|.
+%
+% \begin{texnote}
+% The non-"small" versions of the commands described in the sections~\ref{sec:rc-vectors}
+% and~\ref{sec:matrices}, accept \textcquote{mathtools}{\textelp{}
+% any column type valid in the usual \env{array} environment.}
+% \end{texnote}
+%
+%
+% \section{Delimited Operators}
+% \label{sec:delim-ops}
+%
+% \subsection{Delimited Operators Predefined by \pkg{moremath}}
+% \label{sec:delim-op-predef}
+%
+% \DescribeOption{no-operators}
+% If the package load time option |no-operators| is not given this package defines several
+% delimited mathematical operators.
+%
+% \begin{table}
+% \caption{%
+% Operator commands defined by the \pkg{amsmath}~\autocite{amsmath}
+% package.}
+% \label{tab:amsmath-operators}
+% \vspace{.5\baselineskip}
+% \input{\jobname-ams-op-table.tex}
+% \end{table}
+%
+% \begin{function}{
+% \parccos, \barccos, \Barccos, \varccos, \Varccos,
+% }
+% \begin{syntax}
+% \cs{parccos} \oarg{size cmd} \marg{contents}
+
+% \cs{parccos} \oarg{size cmd} \textasciicircum\marg{superscript} \marg{contents}
+%
+% \cs{parccos} \oarg{size cmd} \_\marg{subscript} \marg{contents}
+%
+% \cs{parccos} \oarg{size cmd} \textasciicircum\marg{superscript} \_\marg{subscript} \marg{contents}
+%
+% \cs{parccos}* \marg{contents}
+%
+% \cs{parccos}* \textasciicircum\marg{superscript} \marg{contents}
+%
+% \cs{parccos}* \_\marg{subscript} \marg{contents}
+% \cs{parccos}* \textasciicircum\marg{superscript} \_\marg{subscript} \marg{contents}
+%
+%
+% \cs[no-index]{\meta{prefix}\meta{op name}} \oarg{size cmd} \marg{contents}
+% \cs[no-index]{\meta{prefix}\meta{op name}} \oarg{size cmd} \textasciicircum\marg{superscript} \marg{contents}
+% \cs[no-index]{\meta{prefix}\meta{op name}} \oarg{size cmd} \_\marg{subscript} \marg{contents}
+% \cs[no-index]{\meta{prefix}\meta{op name}} \oarg{size cmd} \textasciicircum\marg{superscript} \_\marg{subscript} \marg{contents}
+% \cs[no-index]{\meta{prefix}\meta{op name}}* \marg{contents}
+% \cs[no-index]{\meta{prefix}\meta{op name}}* \textasciicircum\marg{superscript} \marg{contents}
+% \cs[no-index]{\meta{prefix}\meta{op name}}* \_\marg{subscript} \marg{contents}
+% \cs[no-index]{\meta{prefix}\meta{op name}}* \textasciicircum\marg{superscript} \_\marg{subscript} \marg{contents}
+% \end{syntax}
+% For all of the operators predefined by \pkg{amsmath}~\autocite{amsmath},
+% which are shown in table~\ref{tab:amsmath-operators},
+% \pkg{moremath} declares delimited versions.
+% The name of those commands follows the scheme \cs[no-index]{\meta{prefix}\meta{op}},
+% where \meta{prefix} is one of |p|, |b|, |B|, |v|, or |V|
+% and \meta{op} is the name of one of the operators shown in table~\ref{tab:amsmath-operators}.
+%
+% The \meta{prefix}es |p|, |b|, |B|, |v|, and |V| stand for
+% parenthesis, brackets, braces, single vertical lines (\enquote{\(\vert\)}), and double vertical lines
+% (\enquote{\(\Vert\)}) respectively.
+%
+% The commands accept a \meta{size cmd} optional argument, which is usually one of
+% \cs{big}, \cs{Big}, \cs{bigg} and \cs{Bigg}.
+% These \meta{size cmd}s are used to change the size of the delimiters.
+%
+% The commands also accept sub- and superscripts,
+% which have to be issued \emph{after} the optional argument (if present),
+% but before the mandatory argument \meta{contents}.
+%
+% The starred variant uses automatic scaling for the delimiters depending on the height of its contents.
+% \end{function}
+%
+% \paragraph{Examples}
+%
+% The following examples showcase the use of those predefined delimited operators:
+% \begin{enumerate}
+% \item Different delimited operators without any scaling:
+%
+% \begin{verbatim}
+% \[
+% \pcos{x} \times \bcos{y}
+% \times \Bcos{z} \times \vcos{a}
+% \times \Vcos{b}
+% \]
+% \end{verbatim}
+% \[
+% \pcos{x} \times \bcos{y}
+% \times \Bcos{z} \times \vcos{a}
+% \times \Vcos{b}
+% \]
+%
+% \item Delimited operator with automatic scaling:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pcos*{\frac{x^{2}}{2}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pcos*{\frac{x^{2}}{2}}
+% \]
+% \end{minipage}
+%
+% \item Delimited operator with manual scaling:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pcos[\Big]{\frac{x^{2}}{2}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pcos[\Big]{\frac{x^{2}}{2}}
+% \]
+% \end{minipage}
+%
+% \item Delimited operator with subscript:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \plog_{10}{1+x}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% ^^X XXX: Using an underscore is broken here (because of l3doc???) therefore I
+% ^^X use "\sb" instead.
+% \[
+% \plog\sb{10}{1+x}
+% \]
+% \end{minipage}
+%
+% \item Delimited operator with superscript:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pcos^{2}{x}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pcos^{2}{x}
+% \]
+% \end{minipage}
+%
+% \item Delimited operator with both sub- and superscript and manual scaling:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pcos[\Big]^{2}_{x}{\frac{x}{2}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% ^^X XXX: Again use "\sb" instead of "_" because of l3doc
+% \[
+% \pcos[\Big]^{2}\sb{x}{\frac{x}{2}}
+% \]
+% \end{minipage}
+% \end{enumerate}
+%
+%
+% \subsection{Declaring New Delimited Operators}
+% \label{sec:delim-op-new}
+%
+% \begin{function}{\DeclareDelimitedOperator}
+% \begin{syntax}
+% \cs{DeclareDelimitedOperator}\marg{new op}\marg{op}\marg{delim}
+% \end{syntax}
+% Creates a new delimited operator,
+% the name of the new command will be \meta{new op}.
+% The \meta{op} is the command of the operator to use,
+% which is usually a command declared with
+% \cs[module=amsmath,replace=false]{DeclareMathOperator}.
+% \meta{delim} is the command to use as paired delimiter,
+% it is expected to behave like a paired delimiter declared by
+% \pkg{mathtools}~\autocite{mathtools}
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter}.
+% \end{function}
+%
+% \paragraph{Example: Creating a New Delimited Operator}
+% The following code creates a new operator and a paired delimiter
+% and uses it afterwards to declare a paired operator.
+% \begin{verbatim}
+% \documentclass{scrartcl}
+%
+% \DeclareMathOperator{\glorb}{glorb}
+% \DeclarePairedDelimiter{\inparen}{\lparen}{\rparen}
+% \DeclarePairedOperator{\pglorb}{\glorb}{\inparen}
+%
+% \begin{document}
+% \[
+% \pglorb{a}
+% \]
+% \end{document}
+% \end{verbatim}
+% The result then looks like this:
+% \[
+% \pglorb{a}
+% \]
+%
+%
+% \section{Vector Calculus Operators}
+% \label{sec:vector-calculus}
+%
+% \DescribeOption{no-vector}
+% The commands in this section are only declared if the option |no-vector|
+% has not been given to the package as a load time option.
+%
+% \DescribeOption{vcenter}
+% The option "vcenter" controls if the symbols for the operators described below
+% should be vertically centered along the math axis. Its default value is "true".
+%
+% This option only shows its effects if other options like "arrownabla",
+% "arrowlaplace", or "boldnabla" are set to "true".
+% Like in the example below:
+% \begin{quote}
+% \begin{verbatim}
+% \begin{gather*}
+% \grad f(x) \quad \grad[arrownabla,vcenter=false] f(x)
+% \quad \grad[arrownabla,vcenter=true] f(x)\\
+% \laplacian f(x) \quad \laplacian[arrowlaplace,vcenter=false] f(x)
+% \quad \laplacian[arrowlaplace,vcenter=true] f(x)
+% \end{gather*}
+% \end{verbatim}
+% \begin{gather*}
+% \grad f(x) \quad \grad[arrownabla,vcenter=false] f(x)
+% \quad \grad[arrownabla,vcenter=true] f(x)\\
+% \laplacian f(x) \quad \laplacian[arrowlaplace,vcenter=false] f(x)
+% \quad \laplacian[arrowlaplace,vcenter=true] f(x)
+% \end{gather*}
+% \end{quote}
+%
+% All of the commands described in this section take key-value options
+% as optional argument, which are described in section~\ref{sec:options-vec-calc}
+%
+% \subsection{Gradient Operator Commands}
+% \label{sec:grad-op-cmds}
+%
+% \subsubsection{Standalone Operator Command}
+% \label{sec:grad-op-standalone}
+%
+% \begin{function}[updated=2024-07-08]{
+% \grad,
+% }
+% \begin{syntax}
+% \cs{grad} \oarg{kv opts}
+% \cs{grad} \oarg{kv opts} \_\marg{subscript}
+% \end{syntax}
+% The \cs{grad} command produces a gradient operator
+% looking like this \enquote{\(\grad\)} by default.
+% The optional argument \meta{kv opts} accepts the key-value options
+% described in section~\ref{sec:options-vec-calc},
+% whitespace between the command name
+% and \oarg{kv~opts} is \emph{not allowed}.
+% An optional subscript using "_" may be given after the optional argument.
+% \end{function}
+%
+% \paragraph{Examples of Use}
+% \begin{enumerate}
+% \item Standalone gradient operator (with and without subscript):
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \grad f(x), \quad \grad_{x} f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \grad f(x), \quad \grad\sb{x} f(x)
+% \]
+% \end{minipage}
+%
+% \item Bold version of the gradient operator:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \grad[boldnabla] f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \grad[boldnabla] f(x)
+% \]
+% \end{minipage}
+%
+% \item Gradient operator with an arrow:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \grad[arrownabla] f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}
+% \begin{minipage}{.49\linewidth}
+% \[
+% \grad[arrownabla] f(x)
+% \]
+% \end{minipage}
+% \end{enumerate}
+%
+% \subsubsection{Operators with Delimiters}
+% \label{sec:grad-op-delim}
+%
+% \begin{function}{
+% \pgrad,
+% \bgrad,
+% \Bgrad,
+% \vgrad,
+% \Vgrad
+% }
+% \begin{syntax}
+% \cs[no-index]{\meta{delim}grad} \oarg{size cmd} \marg{content}
+% \cs[no-index]{\meta{delim}grad} \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}grad} \oarg{size cmd} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}grad} \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}grad}* \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}grad}* \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}grad} family of commands produces
+% gradient operator which is followed by \meta{contents} inside delimiters.
+% The delimiter is determined by the first letter of the command \meta{delim},
+% which may be "p" for parenthesis, "b" for brackets, "B" for braces,
+% "v" for a single vertical line (\enquote{\(\vert\)}), or "V" for a double
+% vertical line (\enquote{\(\Vert\)}).
+%
+% The commands accept either a \meta{size command} as optional argument,
+% which gets passed to \pkg{mathtools}~\autocite{mathtools} paired delimiter
+% or a list of \meta{key-value option}s,
+% the \meta{kv opts} \emph{must} be given using the complete syntax,
+% i.e.\ \meta{key}"="\meta{value},
+% shorthands for options with an implicit default value (|arrownabla|),
+% will not work here.
+% The \meta{size~command} is usually one of \cs{big}, \cs{Big}, \cs{bigg} and
+% \cs{Bigg}.
+% Valid \meta{kv opts} are all options described in section~\ref{sec:options-vec-calc}
+% and the key "scale" which accepts a \meta{size cmd}.
+%
+% \begin{quote}
+% \textbf{Note:}\\
+% Do not mix \meta{kv opts} and \meta{size cmd},
+% use either |\pgrad[\big]{f(x)}| or |\pgrad[arrownabla=true,scale=\big]{f(x)}|.
+% \end{quote}
+%
+% \medskip\noindent
+% An optional \meta{subscript} may be given between the optional argument,
+% and \meta{contents}. One use case for this subscript is to write formulae
+% using the so called Feynman-notation, where the gradient operator acts
+% only on one variable.
+%
+% The starred version of the commands automatically scale the delimiters
+% with its contents.
+% \end{function}
+%
+% \paragraph{Examples:}
+% \begin{enumerate}
+% \item Gradient operator with non-scaled delimiters:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pgrad{1+\vec{x}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pgrad{1+\vec{x}}
+% \]
+% \end{minipage}
+%
+% \item Bold version:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pgrad[boldnabla=true]{1+\vec{x}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pgrad[boldnabla=true]{1+\vec{x}}
+% \]
+% \end{minipage}
+%
+% \item Gradient operator with automatically scaled delimiters:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pgrad*{\frac{1}{x}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pgrad*{\frac{1}{x}}
+% \]
+% \end{minipage}
+%
+% \item Manually scaled version:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \begin{gather*}
+% \pgrad[\Big]{\frac{1}{x}}\\[.5ex]
+% \pgrad[scale=\Big]{\frac{1}{x}}
+% \end{gather*}
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \begin{gather*}
+% \pgrad[\Big]{\frac{1}{x}}\\[.5ex]
+% \pgrad[scale=\Big]{\frac{1}{x}}
+% \end{gather*}
+% \end{minipage}
+%
+% \item Feynman-Notation:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pgrad_{x}{x+y+z}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pgrad\sb{x}{x+y+z}
+% \]
+% \end{minipage}
+% \end{enumerate}
+%
+% \subsection{Divergence Operator Commands}
+% \label{sec:div-op-cmds}
+%
+% \subsubsection{Standalone Operator Command}
+% \label{sec:div-op-standalone}
+%
+% \begin{function}[updated=2024-07-08]{\divergence}
+% \begin{syntax}
+% \cs{divergence} \oarg{kv opts}
+% \cs{divergence} \oarg{kv opts} \_\marg{subscript}
+% \end{syntax}
+% The \cs{divergence} command produces the divergence operator
+% \enquote{\(\divergence\)},
+% its usage is analogous to the use of the \cs{grad} command,
+% which is described in section~\ref{sec:grad-op-standalone}.
+% \end{function}
+%
+% \paragraph{Examples}
+% \begin{enumerate}
+% \item Standalone divergence operator
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \divergence f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\divergence f\]
+% \end{minipage}
+%
+% \item Standalone divergence operator
+% with an arrow over the gradient operator
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \divergence[arrownabla] f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\divergence[arrownabla] f(x)\]
+% \end{minipage}
+%
+% \item Standalone divergence operator with subscript
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \divergence_{x} f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% ^^X We need to use \sb because of the subscript package
+% \begin{minipage}{.49\linewidth}
+% \[\divergence\sb{x} f(x)\]
+% \end{minipage}
+% \end{enumerate}
+% \subsubsection{Operators with Delimiters}
+% \label{sec:div-op-delim}
+%
+% \begin{function}{
+% \pdiv,
+% \bdiv,
+% \Bdiv,
+% \vdiv,
+% \Vdiv
+% }
+% \begin{syntax}
+% \cs[no-index]{\meta{delim}div} \oarg{size cmd} \marg{content}
+% \cs[no-index]{\meta{delim}div} \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}div} \oarg{size cmd} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}div} \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}div}* \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}div}* \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}div} family of commands produces the divergence
+% operator with its arguments placed inside delimiters.
+% The usage of these commands is analogous to the \cs[no-index]{\meta{delim}grad}
+% family of commands described in section~\ref{sec:grad-op-delim}.
+% \end{function}
+%
+% \paragraph{Examples}
+%
+% \begin{enumerate}
+% \item Divergence operator with parenthesis and no scaling
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pdiv{1+x}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\pdiv{1+x}\]
+% \end{minipage}
+% \item Bold version with manual scaling and subscript
+%
+% \begin{verbatim}
+% \[
+% \pdiv[boldnabla=true,scale=\Big]_{x}{1 + \frac{1}{x}}
+% \]
+% \end{verbatim}
+% \[\pdiv[boldnabla=true,scale=\Big]\sb{x}{1+\frac{1}{x}}\]
+%
+% \item Automatic scaling
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pdiv*{1 + \frac{1}{x}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\pdiv*{1 + \frac{1}{x}}\]
+% \end{minipage}
+% \end{enumerate}
+%
+% \subsection{Curl Operator Commands}
+% \label{sec:curl-op-cmds}
+%
+% \subsubsection{Standalone Operator Command}
+% \label{sec:curl-op-standalone}
+%
+% \begin{function}[updated=2024-07-08]{\curl}
+% \begin{syntax}
+% \cs{curl} \oarg{kv opts}
+% \cs{curl} \oarg{kv opts} \_\marg{subscript}
+% \end{syntax}
+% The \cs{curl} command produces the curl operator \enquote{\(\curl\)},
+% its usage is analogous to the use of the \cs{grad} command
+% described in section~\ref{sec:grad-op-standalone}.
+% \end{function}
+%
+% \paragraph{Examples}
+% \begin{enumerate}
+% \item Standalone curl operator
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \curl f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\curl f(x)\]
+% \end{minipage}
+%
+% \item Standalone curl operator with an arrow over the gradient operator
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \curl[arrownabla] f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\curl[arrownabla] f(x)\]
+% \end{minipage}
+%
+% \item Standalone curl operator with subscript
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \curl_{x} f(x,y)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\curl\sb{x} f(x,y)\]
+% \end{minipage}
+% \end{enumerate}
+%
+% \subsubsection{Operators with Delimiters}
+% \label{sec:curl-op-delim}
+%
+% \begin{function}{
+% \pcurl,
+% \bcurl,
+% \Bcurl,
+% \vcurl,
+% \Vcurl
+% }
+% \begin{syntax}
+% \cs[no-index]{\meta{delim}curl} \oarg{size cmd} \marg{content}
+% \cs[no-index]{\meta{delim}curl} \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}curl} \oarg{size cmd} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}curl} \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}curl}* \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}curl}* \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}curl} family of commands produce the curl operator
+% with its arguments placed inside delimiters.
+% The usage of these commands is analogous to the \cs[no-index]{\meta{delim}grad}
+% family of commmands described in section~\ref{sec:grad-op-delim}.
+% \end{function}
+%
+% \paragraph{Examples}
+% \begin{enumerate}
+% \item Curl operator with parenthesis without scaling
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pcurl{1+x}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\pcurl{1+x}\]
+% \end{minipage}
+%
+% \item Bold version with manual scaling and subscript
+%
+% \begin{verbatim}
+% \[
+% \pcurl[boldnabla=true,scale=\Big]_{x}{1 + \frac{1}{x}}
+% \]
+% \end{verbatim}
+% \[
+% \pcurl[boldnabla=true,scale=\Big]\sb{x}{1 + \frac{1}{x}}
+% \]
+%
+% \item Automatic scaling
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pcurl*{1 + \frac{1}{x}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\pcurl*{1 + \frac{1}{x}}\]
+% \end{minipage}
+% \end{enumerate}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Fixed example to match description.
+% }
+%
+%
+% \subsection{Laplace Operator Commands}
+% \label{sec:laplace-op-cmds}
+%
+% This section describes commands which can be used to typeset a Laplace
+% operator.
+%
+%
+% Like the commands described in sections~\ref{sec:grad-op-cmds},
+% \ref{sec:div-op-cmds}, and~\ref{sec:curl-op-cmds}
+% the commands in this section accept key-value options via an optional
+% argument.
+% There is some deviation from the options compared to the above commands:
+% The "arrownabla" option is ignored,
+% instead the "arrowlaplace" option produces an arrow over the operator.
+% The "boldnabla" option on the other hand is not ignored.
+% Finally the "delta-laplace" option replaces the symbol used
+% for the operator from \(\laplacian\) to \(\laplacian[delta-laplace]\)
+%
+% \subsubsection{Standalone Operator Command}
+% \label{sec:laplace-op-standalone}
+%
+%
+% \begin{function}[updated=2024-07-08]{\laplacian}
+% \begin{syntax}
+% \cs{laplacian} \oarg{kv opts}
+% \cs{laplacian} \oarg{kv opts} \_\marg{subscript}
+% \end{syntax}
+% The \cs{laplacian} command produces a Laplace operator,
+% which looks by default like this: \(\laplacian\).
+%
+% Its interface is analogous to the \cs{grad}, \cs{divergence},
+% and \cs{curl} commands described above,
+% with the difference in key-value options described at the start of this
+% subsection.
+% \end{function}
+%
+%
+% \subsubsection{Operators with Delimiters}
+% \label{sec:laplace-op-delim}
+%
+% \begin{function}{
+% \plaplacian,
+% \blaplacian,
+% \Blaplacian,
+% \vlaplacian,
+% \Vlaplacian
+% }
+% \begin{syntax}
+% \cs[no-index]{\meta{delim}laplacian} \oarg{size cmd} \marg{content}
+% \cs[no-index]{\meta{delim}laplacian} \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}laplacian} \oarg{size cmd} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}laplacian} \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \cs[no-index]{\meta{delim}laplacian}* \oarg{kv opts} \marg{content}
+% \cs[no-index]{\meta{delim}laplacian}* \oarg{kv opts} \_\marg{subscript} \marg{content}
+% \end{syntax}
+% \end{function}
+%
+% \paragraph{Examples}
+% \begin{enumerate}
+% \item Laplace operator delimited by parenthesis without scaling
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \plaplacian{1+x}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\plaplacian{1+x}\]
+% \end{minipage}
+%
+% \item Version with arrow, manual scaling and subscript
+%
+% \begin{verbatim}
+% \[
+% \plaplacian[arrowlaplace=true,scale=\Big]_{x}{1 + \frac{1}{x}}
+% \]
+% \end{verbatim}
+% \[
+% \plaplacian[arrowlaplace=true,scale=\Big]\sb{x}{1 + \frac{1}{x}}
+% \]
+%
+% \item Version with automatic scaling
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \plaplacian*{1 + \frac{1}{x}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\plaplacian*{1 + \frac{1}{x}}\]
+% \end{minipage}
+%
+% \item Using a delta as symbol for the Laplacian
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \plaplacian[delta-laplace=true]{1+x}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\plaplacian[delta-laplace=true]{1+x}\]
+% \end{minipage}
+% \end{enumerate}
+%
+%
+% \subsection{^^X
+% Commands Producing a \foreignlanguage{french}{d'Alembert} operator
+% }
+% \label{sec:dalembert-op-cmds}
+%
+% \subsubsection{Standalone Operator Command}
+% \label{sec:dalembert-op-standalone}
+%
+% \begin{function}[
+% added = 2024-07-04,
+% updated=2024-07-08,
+% ]{\quabla}
+% \begin{syntax}
+% \cs{quabla} \oarg{kv~opts}
+% \cs{quabla} \oarg{kv~opts} \_\marg{subscript}
+% \end{syntax}
+% The \cs{quabla} command produces
+% the \foreignlanguage{french}{d'Alembert} operator \enquote{\(\quabla\)}.
+% This command accepts an optional subscript.
+% \end{function}
+%
+% The command is called \cs{quabla} because thats shorter and easier to type than
+% \cs[no-index]{dalembertian}.
+% If you want to have a command called \cs[no-index]{dalembertian},
+% put the following in your documents preamble.
+% \begin{verbatim}
+% \NewCommandCopy\quabla\dalembertian
+% \end{verbatim}
+%
+% \paragraph{Example of Use:}
+% \begin{quote}
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \quabla f(x)
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\quabla f(x)\]
+% \end{minipage}
+% \end{quote}
+%
+%
+% \subsubsection{Operators with Delimiters}
+% \label{sec:dalembert-op-delim}
+%
+% \begin{function}[added = 2024-07-04]{
+% \pquabla,
+% \bquabla,
+% \Bquabla,
+% \vquabla,
+% \Vquabla,
+% }
+% \begin{syntax}
+% \cs[no-index]{\meta{delim}quabla} \oarg{size~cmd} \marg{contents}
+% \cs[no-index]{\meta{delim}quabla} \oarg{kv~opts} \marg{contents}
+% \cs[no-index]{\meta{delim}quabla} \oarg{size~cmd} \_\marg{subscript} \marg{contents}
+% \cs[no-index]{\meta{delim}quabla} \oarg{kv~opts} \_\marg{subscript} \marg{contents}
+% \cs[no-index]{\meta{delim}quabla}* \oarg{kv~opts} \marg{contents}
+% \cs[no-index]{\meta{delim}quabla}* \oarg{kv~opts} \_\marg{subscript} \marg{contents}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}quabla} family of commands produce a
+% \foreignlanguage{french}{d'Alembert} operator with <contents> placed inside
+% delimiters.
+% Their usage is analogous to the \cs[no-index]{\meta{delim}grad} family of
+% commands described in section~\ref{sec:grad-op-delim}.
+% \end{function}
+%
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Fixed syntax description of standalone operators not matching reality.
+% }
+%
+%
+% \section{Row- and Column Vectors}
+% \label{sec:rc-vectors}
+%
+% \DescribeOption{no-crvector}
+% The command in this section are only declared if the option |no-crvector|
+% has not been given as a package option.
+%
+% ^^X \DescribeOption{delimiter}
+% ^^X \DescribeOption{fill}
+% ^^X \DescribeOption{align}
+% ^^X The commands in this section all accept key-value options as optional argument.
+% Valid keys are "delimiter", "fill", and "align",
+% their usage is described in section~\ref{sec:options-matrix}.
+%
+% \begin{function}{
+% \cvector,
+% \rvector
+% }
+% \begin{syntax}
+% \cs{cvector} \oarg{kv opts} \marg{clist}
+% \cs{rvector} \oarg{kv opts} \marg{clist}
+% \end{syntax}
+% The commands \cs{cvector} and \cs{rvector} produce row and column vectors
+% respectively. Both of them accept key-value options as optional argument
+% \meta{kv opts}. Valid keys and values are described in section~\ref{sec:options-matrix}.
+%
+% The mandatory argument \meta{clist} is a comma-separated-list,
+% whose elements are the entries of the column/row vector.
+% If a comma has to appear inside an entry the entire entry has to be wrapped
+% in braces.
+%
+% The delimiter of the row or column vectors depends on the current value of
+% the option |delimiter|, by default empty. The option |fill| has no effect
+% on the commands and is simply ignored.
+%
+% \begin{texnote}
+% If you were to define your own \env{matrix*}-like environment
+% called \env{mymatrix*},
+% which has an interface compatible to \pkg{mathtools}'s \env{matrix*}
+% family of environments,
+% you could make use of it by setting the value of |delimiter| to |my|.
+% \end{texnote}
+% \end{function}
+%
+% \medbreak\noindent
+% \textbf{Examples:}
+% \begin{enumerate}
+% \item Column \enquote{vector} without delimiters:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \cvector{a_{1},a_{2},a_{3}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \cvector{a_{1},a_{2},a_{3}}
+% \]
+% \end{minipage}
+%
+% \item A column vectors delimited with parenthesis and different alignment:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \cvector[delimiter=p,align=c]{-1,2,3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \cvector[delimiter=p,align=c]{-1,2,3}
+% \]
+% \end{minipage}\\[1ex]
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \cvector[delimiter=p,align=r]{-1,2,3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \cvector[delimiter=p,align=r]{-1,2,3}
+% \]
+% \end{minipage}\\[1ex]
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \cvector[delimiter=p,align=l]{-1,2,3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \cvector[delimiter=p,align=l]{-1,2,3}
+% \]
+% \end{minipage}
+% \end{enumerate}
+%
+% \paragraph{Row- and Column Vectors with Predefined Delimiters}
+%
+% As vectors are commonly delimited by parenthesis, brackets, braces, etc.\
+% several shorthands producing delimited vectors are also available.
+% \begin{function}{
+% \pcvector,
+% \bcvector,
+% \Bcvector,
+% \vcvector,
+% \Vcvector,
+% \prvector,
+% \brvector,
+% \Brvector,
+% \vrvector,
+% \Vrvector,
+% \prvector,
+% \brvector,
+% \Brvector,
+% \vrvector,
+% \Vrvector
+% }
+% \begin{syntax}
+% \cs[no-index]{\meta{delim}cvector} \oarg{kv opts} \marg{clist}
+% \cs[no-index]{\meta{delim}rvector} \oarg{kv opts} \marg{clist}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}\meta{c or r}vector} family of commands,
+% accepts a list of key-value options as optional argument \meta{kv opts}.
+% Valid keys are described in section~\ref{sec:options-matrix}.
+%
+% The mandatory argument \meta{clist} is a comma-separated-list of
+% the entries of the vector.
+% If a comma needs to appear inside an entry of the vector,
+% that entry has to be wrapped in braces.
+%
+% \meta{delim} may have the value "p" for parenthesis,
+% "b" for brackets, "B" for braces, "v" for a single vertical line,
+% or "V" for a double vertical line.
+% \end{function}
+%
+% \subparagraph{Example}
+% \begin{quote}
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pcvector{a_{1},a_{2},a_{3}}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pcvector{a_{1},a_{2},a_{3}}
+% \]
+% \end{minipage}
+% \end{quote}
+%
+% \subsection{Small Versions for Inline Math}
+% \label{sec:rc-vectors-small}
+%
+% As the \env{matrix} and \env{matrix*} family of environments is unsuitable,
+% for inline math,
+% \pkg{mathtools}~\autocite{mathtools} provides the \env{smallmatrix}
+% and \env{smallmatrix*} family of environments.
+% This package provides analogous commands for row and column vectors
+% to be typeset in inline math mode.
+%
+% \begin{function}{
+% \smallcvector,
+% \smallrvector
+% }
+% \begin{syntax}
+% \cs{smallcvector} \oarg{kv opts} \marg{clist}
+% \cs{smallrvector} \oarg{kv opts} \marg{clist}
+% \end{syntax}
+% \cs{smallcvector} and \cs{smallrvector} produce column and row vectors
+% suitable for inline math.
+% Both commands accept the same optional key-value arguments as
+% \cs{cvector} and \cs{rvector}.
+% \end{function}
+%
+%
+% \medbreak\noindent
+% \textbf{Example:}
+% \begin{quote}
+% \begin{verbatim}
+% An inline version of \verb|\cvector| looks like this
+% \(\smallcvector{1,0}\).
+% \end{verbatim}
+% An inline version of \verb|\cvector| looks like this
+% \(\smallcvector{1,0}\).
+% \end{quote}
+%
+% \begin{function}{
+% \psmallcvector,
+% \bsmallcvector,
+% \Bsmallcvector,
+% \vsmallcvector,
+% \Vsmallcvector,
+% \psmallrvector,
+% \bsmallrvector,
+% \Bsmallrvector,
+% \vsmallrvector,
+% \Vsmallrvector,
+% }
+% \begin{syntax}
+% \cs{psmallcvector} \oarg{kv opts} \marg{clist}
+% \cs[no-index]{psmallrvector} \oarg{kv opts} \marg{clist}
+% \cs[no-index]{\meta{delim}small\meta{c or r}vector} \oarg{kv opts} \marg{clist}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}small\meta{c or r}vector} family of commands
+% like \cs{psmallcvector} produce small inline math version of row and column
+% vectors. Their interface is identical to the commands described above.
+% \end{function}
+%
+% \medbreak\noindent
+% \textbf{Example:}\nobreak
+% \begin{quote}
+% \begin{verbatim}
+% An inline version of \verb|\pcvector| looks like this
+% \(\psmallcvector{1,0}\).
+% \end{verbatim}
+% An inline version of \verb|\pcvector| looks like this
+% \(\psmallcvector{1,0}\).
+% \end{quote}
+%
+%
+% \section{Shorthands for Simple Matrices}
+% \label{sec:matrices}
+%
+% \DescribeOption{no-matrix}
+% The commands in this section are only defined if the option "no-matrix"
+% \emph{has not been given} to the package at load-time.
+%
+%
+% \subsection{(Anti-)diagonal Matrices}
+% \label{sec:diagonal-matrices}
+%
+% \begin{function}{
+% \diagmat,
+% \antidiagmat,
+% }
+% \begin{syntax}
+% \cs{diagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{antidiagmat} \oarg{kv opts} \marg{diagonal}
+% \end{syntax}
+% \cs{diagmat} and \cs{antidiagmat} produce a diagonal or anti-diagonal matrix
+% respectively.
+% The optional argument \meta{kv~opts} accepts the key value options
+% described in section~\ref{sec:options-matrix}.
+%
+% The key "fill" determines the contents of the matrix entries
+% which are not part of the (anti-)diagonal,
+% its default value is |{}| i.e.\ empty.
+% The key "align" determines the alignment of the entries inside the
+% matrix, valid values are usually "l", "c", and "r",
+% the default is "c".
+% The key "delimiter" determines the delimiter around the matrix,
+% its default value is |{}| (none).
+% Valid values for the delimiters are "p" for parenthesis,
+% "b" for brackets, "B" for braces, "v" for a single vertical line
+% (\enquote{\(\vert\)}), and "V" for a double vertical line (\enquote{\(\Vert\)}).
+% See the \pkg{mathtools} manual~\autocite{mathtools} for more information.
+%
+% \begin{texnote}
+% The value of "delimiter" gets inserted inside the |\begin{#1matrix*}|
+% and |\end{#1matrix*}| commands.
+% Therefore it would be possible to define your own \env{matrix*}
+% like environment,
+% called for example \env{mymatrix*} and set "delimiter=my"
+% to make use of it.
+% \end{texnote}
+%
+% The mandatory argument \meta{diagonal} has to be a comma separated list
+% of the entries of the (anti-)diagonal.
+% If an entry of the diagonal needs to contain a comma "," the entire entry
+% has to be wrapped in braces.
+% \end{function}
+%
+% \medskip\noindent
+% \textbf{Examples:}
+% \begin{enumerate}
+% \item A diagonal and an anti-diagonal matrix without delimiters:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \begin{gather*}
+% \diagmat{1,2,3}\\[.5ex]
+% \antidiagmat{1,2,3}
+% \end{gather*}
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \begin{gather*}
+% \diagmat{1,2,3}\\[.5ex]
+% \antidiagmat{1,2,3}
+% \end{gather*}
+% \end{minipage}
+% \item A diagonal matrix delimited by parenthesis filled with zeros:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \diagmat[delimiter=p,fill=0]{1,2,3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \diagmat[delimiter=p,fill=0]{1,2,3}
+% \]
+% \end{minipage}
+%
+% \item A diagonal matrix filled with a symbol:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \diagmat[fill=\square]{1,2,3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\diagmat[fill=\square]{1,2,3}\]
+% \end{minipage}
+%
+% \item Diagonal matrices with different alignment:
+%
+% \begin{verbatim}
+% \[
+% \diagmat[delimiter=p,align=c,fill=0]{-1,-2,-3} \qquad
+% \diagmat[delimiter=p,align=l,fill=0]{-1,-2,-3} \qquad
+% \diagmat[delimiter=p,align=r,fill=0]{-1,-2,-3}
+% \]
+% \end{verbatim}
+% \[
+% \diagmat[delimiter=p,align=c,fill=0]{-1,-2,-3} \qquad
+% \diagmat[delimiter=p,align=l,fill=0]{-1,-2,-3} \qquad
+% \diagmat[delimiter=p,align=r,fill=0]{-1,-2,-3}
+% \]
+% \end{enumerate}
+%
+%
+% \paragraph{Shorthands for (Anti-)diagonal Matrices with Delimiters}
+%
+% As matrices are more often than not written inside of delimiters,
+% \pkg{moremath} provides several shorthands for producing those matrices
+% without having to set the "delimiter" key explicitly.
+% \begin{function}{
+% \pdiagmat,
+% \bdiagmat,
+% \Bdiagmat,
+% \vdiagmat,
+% \Vdiagmat
+% }
+% \begin{syntax}
+% \cs{pdiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{bdiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Bdiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{vdiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Vdiagmat} \oarg{kv opts} \marg{diagonal}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}diagmat} family of commands provides
+% shorthands for producing a delimited (anti-)diagonal matrix
+% without having to set the "delimiter" key explicitly every time.
+% The pre-set "delimiter" may be overwritten by explicitly passing "delimiter"
+% as a key-value option.
+%
+% The optional argument \meta{kv~opts} accepts the same key-value arguments
+% as \cs{diagmat}.
+% \end{function}
+%
+% \medskip\noindent
+% \textbf{Example:}
+% \begin{quote}
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pdiagmat{1,2,3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pdiagmat{1,2,3}
+% \]
+% \end{minipage}
+% \end{quote}
+%
+% \begin{function}{
+% \pantidiagmat,
+% \bantidiagmat,
+% \Bantidiagmat,
+% \vantidiagmat,
+% \Vantidiagmat
+% }
+% \begin{syntax}
+% \cs{pantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{bantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Bantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{vantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Vantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \end{syntax}
+% The \cs[no-index]{\meta{delim}antidiagmat} family of commands behaves
+% like the \cs[no-index]{\meta{delim}diagmat} commands described above,
+% except they produce anti-diagonal matrices.
+% \end{function}
+%
+% \medskip\noindent
+% \textbf{Example:}
+% \begin{quote}
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pantidiagmat{1,2,3}
+% \]
+% \end{verbatim}
+% \end{minipage}
+% \begin{minipage}{.49\linewidth}
+% \[
+% \pantidiagmat{1,2,3}
+% \]
+% \end{minipage}
+% \end{quote}
+%
+%
+% \subsubsection{Small Versions for Inline Math}
+% \label{sec:matrices-small}
+%
+% \pkg{mathtools} defines special matrix environments for use in
+% inline math mode,
+% the \env{smallmatrix} and \env{smallmatrix*} family of environments.
+% \pkg{moremath} provides for the case of typesetting an (anti-)diagonal
+% matrix several commands which utilize these inline math versions.
+%
+% \begin{function}{
+% \smalldiagmat,
+% \smallantidiagmat,
+% }
+% \begin{syntax}
+% \cs{smalldiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{smallantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \end{syntax}
+% The \cs{smalldiagmat} and \cs{smallantidiagmat} commands behave like
+% their non-"small" counterpart described above,
+% see their description for more information.
+% \end{function}
+%
+% \medskip\noindent
+% \textbf{Example:}
+% \begin{quote}
+% \begin{verbatim}
+% An inline version of a diagonal matrix looks like this
+% \(\smalldiagmat{1,1}\).
+% \end{verbatim}
+% An inline version of a diagonal matrix looks like this
+% \(\smalldiagmat{1,1}\).
+% \end{quote}
+%
+% \begin{function}{
+% \psmalldiagmat,
+% \bsmalldiagmat,
+% \Bsmalldiagmat,
+% \vsmalldiagmat,
+% \Vsmalldiagmat,
+% }
+% \begin{syntax}
+% \cs{psmalldiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{bsmalldiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Bsmalldiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{vsmalldiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Vsmalldiagmat} \oarg{kv opts} \marg{diagonal}
+% \end{syntax}
+% Like the \cs[no-index]{\meta{delim}diagmat} commands described above
+% there are also shorthand commands for producing an inline math version
+% of a diagonal matrix with pre-set delimiters.
+% \end{function}
+%
+% \medbreak\noindent
+% \textbf{Example:}
+% \begin{quote}
+% \begin{verbatim}
+% An inline math delimited diagonal matrix looks like this
+% \(\psmalldiagmat{1,1}\).
+% \end{verbatim}
+% An inline math delimited diagonal matrix looks like this
+% \(\psmalldiagmat{1,1}\).
+% \end{quote}
+%
+% \begin{function}{
+% \psmallantidiagmat,
+% \bsmallantidiagmat,
+% \Bsmallantidiagmat,
+% \vsmallantidiagmat,
+% \Vsmallantidiagmat,
+% }
+% \begin{syntax}
+% \cs{psmallantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{bsmallantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Bsmallantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{vsmallantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \cs{Vsmallantidiagmat} \oarg{kv opts} \marg{diagonal}
+% \end{syntax}
+% Like the \cs[no-index]{\meta{delim}antidiagmat} commands described above
+% there are also shorthand commands for producing inline math versions
+% of anti-diagonal matrices inside of delimiters.
+% \end{function}
+%
+% \medbreak\noindent
+% \textbf{Example:}
+% \begin{quote}
+% \begin{verbatim}
+% A delimited version of an inline math anti-diagonal matrix
+% looks like this \(\psmallantidiagmat{1,1}\).
+% \end{verbatim}
+% A delimited version of an inline math anti-diagonal matrix
+% looks like this \(\psmallantidiagmat{1,1}\).
+% \end{quote}
+%
+% \subsection{Identity Matrices}
+% \label{sec:id-matrices}
+%
+% As identity matrices are always quadratic,
+% one can further simplify the typesetting of identity matrices to a command,
+% which constructs the identity matrix from the number of dimensions.
+% The commands in this subsection perform this.
+%
+% \begin{function}[added = 2024-07-04]{
+% \idmat,
+% \smallidmat,
+% }
+% \begin{syntax}
+% \cs{idmat} \oarg{kv~opts} \marg{dimension}
+% \cs{smallidmat} \oarg{kv~opts} \marg{dimension}
+% \end{syntax}
+% The \cs{idmat} command produces an identity matrix.
+% The optional argument <kv~opts> accepts any valid \emph{matrix} key-value
+% arguments,
+% which are described in section~\ref{sec:options-matrix}.
+% The mandatory argument <dimension> expects a \emph{positive} integer,
+% which specifies the dimensions of the identity matrix.
+%
+% The \cs{smallidmat} command behaves like the \cs{idmat} command,
+% except it produces a matrix suitable for inline math mode.
+%
+% \begin{texnote}
+% The maximum number of columns is determined by the \TeX{} counter
+% "MaxMatrixCols",
+% which has a default value of 10.
+% See \textcite{amsmath} for more information.
+% \end{texnote}
+% \end{function}
+%
+%
+% \begin{function}[added = 2024-07-04]{
+% \pidmat,
+% \bidmat,
+% \Bidmat,
+% \vidmat,
+% \Vidmat
+% }
+% \begin{syntax}
+% \cs{pidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{bidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{Bidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{vidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{Vidmat} \oarg{kv~opts} \marg{dimension}
+% \end{syntax}
+% Like the \cs[no-index]{\meta{delim}diagmat} commands,
+% the \cs[no-index]{\meta{delim}idmat} commands produce an identity matrix
+% with a pre-set delimiter around the matrix,
+% i.e.\ they behave like \cs{idmat}|[delimiter = |<delim>|]|\marg{dimension}.
+% <delim> can be "p" for parenthesis,
+% "b" for brackets,
+% "B" for braces,
+% "v" for a single vertical line (\enquote{\(\vert\)}),
+% or "V" for a double vertical line (\enquote{\(\Vert\)}).
+%
+% Furthermore these commands accept the same <kv~opts> as the \cs{idmat} command.
+% \end{function}
+%
+% \begin{function}[added = 2024-07-04]{
+% \psmallidmat,
+% \bsmallidmat,
+% \Bsmallidmat,
+% \vsmallidmat,
+% \Vsmallidmat
+% }
+% \begin{syntax}
+% \cs{psmallidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{bsmallidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{Bsmallidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{vsmallidmat} \oarg{kv~opts} \marg{dimension}
+% \cs{Vsmallidmat} \oarg{kv~opts} \marg{dimension}
+% \end{syntax}
+% These commands are provide inline math suitable versions of the
+% \cs[no-index]{\meta{delim}idmat} commands described above.
+% See their description for more information.
+%
+% The commands accept any of the key-value options described in section~\ref{sec:options-matrix}
+% as optional argument <kv~opts>.
+% \end{function}
+%
+% \paragraph{Examples of Use}
+% \begin{enumerate}
+% \item Identity matrix without delimiters:
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \idmat{3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\idmat{3}\]
+% \end{minipage}
+%
+% \item Identity matrices with different delimiters:
+%
+% \begin{verbatim}
+% \[
+% \pidmat{3}\text{,}\quad \bidmat{3}\text{,}\quad
+% \Bidmat{3}\text{,}\quad \vidmat{3}\text{,}\quad
+% \Vidmat{3}
+% \]
+% \end{verbatim}
+% \[
+% \pidmat{3}\text{,}\quad
+% \bidmat{3}\text{,}\quad
+% \Bidmat{3}\text{,}\quad
+% \vidmat{3}\text{,}\quad
+% \Vidmat{3}
+% \]
+%
+% \item Inline math versions of identity matrices with delimiters:
+%
+% \begin{verbatim}
+% Inline math mode matrices look like this:
+% \(\psmallidmat{2}\), \(\bsmallidmat{2}\), \(\Bsmallidmat{2}\),
+% \(\vsmallidmat{2}\), \(\Vsmallidmat{2}\).
+% \end{verbatim}
+% Inline math mode matrices look like this:
+% \(\psmallidmat{2}\), \(\bsmallidmat{2}\), \(\Bsmallidmat{2}\),
+% \(\vsmallidmat{2}\), \(\Vsmallidmat{2}\).
+%
+% \item Identity matrix using the "fill" option for the non-diagonal elements
+%
+% \begin{minipage}{.49\linewidth}
+% \begin{verbatim}
+% \[
+% \pidmat[fill=\star]{3}
+% \]
+% \end{verbatim}
+% \end{minipage}\hfill
+% \begin{minipage}{.49\linewidth}
+% \[\pidmat[fill=\star]{3}\]
+% \end{minipage}
+% \end{enumerate}
+%
+%
+% \section{Shorthands for Absolute Value and Norm}
+% \label{sec:shorthands}
+%
+% \DescribeOption{no-abs-shorthands}
+% The commands in this section are only declared if the option "no-abs-shorthands"
+% has not been given to the package as a load time option.
+%
+% \begin{function}{
+% \abs,
+% \norm
+% }
+% \begin{syntax}
+% \cs{abs} \oarg{size cmd} \marg{content}
+% \cs{abs}* \marg{content}
+% \cs{norm} \oarg{size cmd} \marg{content}
+% \cs{norm}* \marg{content}
+% \end{syntax}
+% The commands \cs{abs} and \cs{norm}, produce \(\abs{\cdot}\) and
+% \(\norm{\cdot}\) respectively.
+% These commands are simply paired delimiters defined using \pkg{mathtools}'
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter} command,
+% instruction on their usage can therefore be found in~\textcite{mathtools}.
+% \end{function}
+%
+%
+% \section{Vertically Centering Math Along the Math Axis}
+% \label{sec:vcenter}
+%
+% Sometimes it is useful to explicitly center a math symbol along the math axis.
+% A prominent example is the case of |\mathop{\boldsymbol\nabla}\nolimits|
+% vs.\ |\mathop{\nabla}\nolimits|,
+% as displayed below.
+% \[
+% \mathop{\boldsymbol\nabla}\nolimits f(x)
+% \quad \mathop{\nabla}\nolimits f(x)
+% \]
+% Here the bold nabla is slightly higher up than the non-bold version.
+%
+% \begin{function}[added=2024-07-08]{\VCenterMath}
+% \begin{syntax}
+% \cs{VCenterMath} \marg{contents}
+% \end{syntax}
+% \begin{danger}
+% The command \cs{VCenterMath} centers <contents> along the current math axis,
+% while adhering to the current math style.
+% This command is not in a \TeX{}-sense
+% \tn[no-index]{long}, i.e.\ it does not take \tn[no-index]{par} tokens.
+%
+% This command is somewhat dangerous as it utilizes the \tn{vcenter} primitive,
+% which leaves math mode and requires to reenter it.
+% \emph{Use at your own responsibility.}
+% \end{danger}
+% \begin{texnote}
+% This command is a wrapper around \tn{vcenter}, \cs{hbox:n}
+% and \tn{mathpalette}, it reenters math mode inside the hbox.
+% \end{texnote}
+% \end{function}
+%
+% With \cs{VCenterMath} it is possible to fix the above example to:
+% \begin{quote}
+% \begin{verbatim}
+% \[
+% \mathop{\VCenterMath{\boldsymbol\nabla}}\nolimits f(x)
+% \quad \mathop{\nabla}\nolimits f(x)
+% \]
+% \end{verbatim}
+% \[
+% \mathop{\VCenterMath{\boldsymbol\nabla}}\nolimits f(x)
+% \quad \mathop{\nabla}\nolimits f(x)
+% \]
+% \end{quote}
+%
+%
+% \part{Documentation for Class and Package Authors}
+% \label{sec:package-auth-doc}
+%
+% \section{Setting of Options}
+% \label{sec:authors-options}
+%
+% \begin{function}[updated = 2024-07-15]{
+% \moremath_setup:n
+% }
+% \begin{syntax}
+% \cs{moremath_setup:n} \marg{kv opts}
+% \end{syntax}
+% This functions sets the key-value options \meta{kv~opts} in the "moremath" namespace.
+% \end{function}
+%
+% \section{Delimited Operators}
+% \label{sec:authors-delim-op}
+%
+% \begin{function}[updated = 2024-07-15]{
+% \moremath_delim_op_noscale:NNnnn,
+% \moremath_delim_op_autoscale:NNnnn
+% }
+% \begin{syntax}
+% \cs{moremath_delim_op_noscale:NNnnn} \meta{math~op} \meta{delim}
+% \hspace*{2ex} \marg{sup~tl} \marg{sub~tl} \marg{tl}
+% \cs{moremath_delim_op_autoscale:NNnnn} \meta{math op} \meta{delim}
+% \hspace*{2ex} \marg{sup~tl} \marg{sub~tl} \marg{tl}
+% \end{syntax}
+% The two functions \cs{moremath_delim_op_noscale:NNnnn} and \cs{moremath_delim_op_autoscale:NNnnn}
+% provide a version of a delimited operator with no scaling or automatic scaling respectively.
+% The token list arguments \meta{sup~tl} and \meta{sub~tl} take the super- and subscript
+% of the operator respectively. Both of those token lists may be empty.
+%
+% The first argument to the function is a control sequence \meta{math~op},
+% which should be an operator declared with
+% \cs[module=amsmath,replace=false]{DeclareMathOperator}.
+% The second argument \meta{delim} has to be a control sequence of a paired delimiter,
+% as defined by \pkg{mathtools}'s
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter}.
+%
+% The final argument \meta{tl} is a list of arbitrary token to put inside the delimiters.
+% \end{function}
+%
+% \begin{function}[updated=2024-07-15]{
+% \moremath_delim_op_manuscale:NNnnnn,
+% \moremath_delim_op_manuscale:NNVnnn
+% }
+% \begin{syntax}
+% \cs{moremath_delim_op_manuscale:NNnnnn} \meta{math op} \meta{delim} \marg{scale cmd}
+% \hspace*{2ex} \marg{sup} \marg{sub} \marg{tl}
+% \end{syntax}
+% The function \cs{moremath_delim_op_manuscale:NNnnnn} typesets a math operator with
+% manual scaling of its delimiters.
+% Its arguments are identical to \cs{moremath_delim_op_noscale:NNnnn}
+% except for the argument \meta{scale~cmd} which has to be a token list containing
+% a \meta{size~cmd} that can be understood by \pkg{mathtools},
+% usually \cs{big}, \cs{Big}, \cs{bigg} and \cs{Bigg}.
+% \end{function}
+%
+% \begin{function}[updated=2024-07-15]{
+% \moremath_new_delim_op_command:NNN,
+% \moremath_new_delim_op_command:cNN,
+% }
+% \begin{syntax}
+% \cs{moremath_new_delim_op_command:NNN} \meta{new~csname} \meta{operator} \meta{delim}
+% \end{syntax}
+% The function \cs{moremath_new_delim_op_command:NNN} defines a new document level command
+% called \meta{new~csname}, utilizing the operator \meta{operator} and the delimiter \meta{delim}.
+%
+% \meta{operator} has to be a control sequence referring to an operator,
+% as declared by \cs{DeclareMathOperator}.
+%
+% \meta{delim} has to be a paired delimiter as defined by \pkg{mathtools}'
+% \cs{DeclarePairedDelimiter}.
+% \end{function}
+%
+% \section{Vector Calculus Typesetting}
+% \label{sec:authors-vec-calc}
+%
+% \subsection{Functions Producing Standalone Operators with Subscripts}
+% \label{sec:authors-vec-calc-operators}
+%
+% \begin{function}[updated=2024-07-15]{
+% \moremath_gradient_operator:n,
+% \moremath_divergence_operator:n,
+% \moremath_curl_operator:n,
+% \moremath_laplace_operator:n,
+% \moremath_dalembert_operator:n
+% }
+% \begin{syntax}
+% \cs{moremath_gradient_operator:n} \marg{subscript}
+% \cs{moremath_divergence_operator:n} \marg{subscript}
+% \cs{moremath_curl_operator:n} \marg{subscript}
+% \cs{moremath_laplace_operator:n} \marg{subscript}
+% \cs{moremath_dalembert_operator:n} \marg{subscript}
+% \end{syntax}
+% Each of these functions return a vector calculus operator,
+% with an (optional) subscript.
+% The argument \meta{subscript}, a token list, may be empty,
+% in which case no subscript is produced.
+%
+% The actual operator produced depends on the current settings
+% of the key-value options described in section~\ref{sec:pack-opts}
+% inside the current group.
+% \end{function}
+%
+% \subsection{Functions Producing Operators with Delimiters}
+% \label{sec:authors-vec-calc-delim-ops}
+%
+% \begin{function}[updated=2024-07-15]{
+% \moremath_delim_nabla_op_noscale:NNnn,
+% \moremath_delim_nabla_op_autoscale:NNnn,
+% }
+% \begin{syntax}
+% \cs{moremath_delim_nabla_op_noscale:NNnn} \meta{operator} \meta{delim}
+% \hspace*{2ex} \marg{sub} \marg{contents}
+%
+% \cs{moremath_delim_nabla_op_autoscale:NNnn} \meta{operator} \meta{delim}
+% \hspace*{2ex} \marg{sub} \marg{contents}
+% \end{syntax}
+% The usage of these functions is similar to the functions
+% \cs{moremath_delim_op_noscale:NNnnn} and \cs{moremath_delim_op_autoscale:NNnnn}
+% except for the missing superscript.
+%
+% The first argument \meta{operator} has to be a function which accepts one argument
+% (the subscript).
+% This is usually one of the \cs[no-index]{moremath_\meta{op}_operator:n} commands.
+%
+% The argument \meta{sub}, which may be empty,
+% is a token list to pass as the subscript to
+% \cs[no-index]{moremath_\meta{op}_operator:n}.
+%
+% The last argument \meta{contents} is a token list to put inside the delimiters.
+%
+% \end{function}
+%
+% \begin{function}[updated=2024-07-15]{
+% \moremath_delim_nabla_op_manuscale:NNnnn,
+% \moremath_delim_nabla_op_manuscale:NNVnn,
+% }
+% \begin{syntax}
+% \cs{moremath_delim_nabla_op_manuscale:NNnnn} \meta{operator} \meta{delim}
+% \hspace*{2ex} \marg{scale~cmd} \marg{sub} \marg{contents}
+% \end{syntax}
+% The usage of function is similar to the above functions
+% except for the additional argument \meta{scale~cmd} which is a token list
+% with a \meta{size~cmd} that should be understood by \pkg{mathtools}
+% (e.g.\ \cs{big}, \cs{Big}, etc.).
+% \end{function}
+%
+% \section{Formatting Matrices and Vectors}
+% \label{sec:authors-matrix}
+%
+% \begin{function}[updated=2024-07-15]{
+% \moremath_column_vector:nn,
+% \moremath_row_vector:nn,
+% \moremath_column_smallvector:nn,
+% \moremath_row_smallvector:nn
+% }
+% \begin{syntax}
+% \cs{moremath_column_vector:nn} \marg{delim spec tl} \marg{clist}
+% \cs{moremath_row_vector:nn} \marg{delim spec tl} \marg{clist}
+% \cs{moremath_column_smallvector:nn} \marg{delim spec tl} \marg{clist}
+% \cs{moremath_row_smallvector:nn} \marg{delim spec tl} \marg{clist}
+% \end{syntax}
+% These functions produce a column or row vector.
+% The "small"\meta{c~or~r}"vector" versions are intended for inline math mode.
+%
+% The first argument \meta{delim spec tl} should be the specification of
+% a delimiter, as used in the naming of the \env{matrix*} environments
+% by \pkg{mathtools}.
+%
+% The second argument \meta{clist}, is a comma-separated list of entries
+% of the vector.
+%
+% Of this commands the "c" versions produce column vectors, the "r" versions
+% produce row vectors.
+%
+% The alignment of the entries inside the vector depends on the current
+% value of the key "align".
+% \end{function}
+%
+% \begin{function}[
+% updated = 2024-07-04,
+% updated=2024-07-15,
+% ]{
+% \moremath_diagonal_matrix:nn,
+% \moremath_diagonal_matrix:nV,
+% \moremath_diagonal_matrix:Vn,
+% \moremath_diagonal_matrix:VV,
+% \moremath_antidiagonal_matrix:nn,
+% \moremath_antidiagonal_matrix:nV,
+% \moremath_antidiagonal_matrix:Vn,
+% \moremath_antidiagonal_matrix:VV,
+% \moremath_diagonal_smallmatrix:nn,
+% \moremath_diagonal_smallmatrix:nV,
+% \moremath_diagonal_smallmatrix:Vn,
+% \moremath_diagonal_smallmatrix:VV,
+% \moremath_antidiagonal_smallmatrix:nn,
+% \moremath_antidiagonal_smallmatrix:nV,
+% \moremath_antidiagonal_smallmatrix:Vn,
+% \moremath_antidiagonal_smallmatrix:VV,
+% }
+% \begin{syntax}
+% \cs{moremath_diagonal_matrix:nn} \marg{delim tl} \marg{clist}
+% \cs{moremath_antidiagonal_matrix:nn} \marg{delim tl} \marg{clist}
+% \cs{moremath_diagonal_smallmatrix:nn} \marg{delim tl} \marg{clist}
+% \cs{moremath_antidiagonal_smallmatrix:nn} \marg{delim tl} \marg{clist}
+% \end{syntax}
+% These functions produce (anti-)diagonal matrices.
+% The argument \meta{delim~tl} is a token list,
+% intended to specify the delimiter of the matrix or no delimiter if the
+% <tl> is empty no delimiters are produced.
+%
+% The argument <clist> is a list of comma separated values which specify the
+% entries of the diagonal.
+% Other properties of the matrix to produce like alignment ("align")
+% and the tokens to insert for non-diagonal entries ("fill")
+% depend on the current setting of the keys described in section~\ref{sec:options-matrix}.
+%
+% The "smallmatrix" versions are intended for use in inline math mode.
+% \end{function}
+%
+% \begin{function}[
+% added = 2024-07-04,
+% updated=2024-07-15,
+% ]{
+% \moremath_id_matrix:n,
+% \moremath_id_matrix:V,
+% \moremath_id_smallmatrix:n,
+% \moremath_id_smallmatrix:V,
+% }
+% \begin{syntax}
+% \cs{moremath_id_matrix:n} \marg{dimensions}
+% \cs{moremath_id_smallmatrix:n} \marg{dimensions}
+% \end{syntax}
+% These functions produce a identity matrix with <dimensions> rows and columns.
+% <dimensions> is expected to be a \emph{positive} integer.
+% The "smallmatrix" version utilizes \pkg{mathtools}' \env{smallmatrix*} environment,
+% which makes it suitable for inline math mode.
+%
+% The delimiter around the matrix is determined by the current value of the key
+% "matrix / delimiter" inside the current group.
+%
+% As these functions utilize \cs{moremath_diagonal_matrix:VV} or
+% \cs{moremath_diagonal_smallmatrix:VV} and make use of temporary variables
+% it is advised to put them into their own group,
+% i.e.\ surround them by \cs{group_begin:} and \cs{group_end:}.
+% \end{function}
+%
+% \section{Vertically Centering Math Along the Math Axis}
+% \label{sec:autors-vcenter}
+%
+% As already said in section~\ref{sec:vcenter} sometimes it is needed to
+% explicitly center some math code.
+%
+% \begin{function}[
+% added=2024-07-08,
+% updated=2024-07-15,
+% ]{
+% \moremath_vcenter:n,
+% }
+% \begin{syntax}
+% \cs{moremath_vcenter:n} \marg{contents}
+% \end{syntax}
+% The function \cs{moremath_vcenter:n} places <contents> inside a "hbox",
+% which is centered along the math axis by \tn{vcenter}.
+% The contents inside the "hbox" are set in math mode.
+% The function also applies the \enquote{outer} math style
+% to the contents of the "hbox".
+%
+% This function is not \tn[no-index]{long},
+% as it sets its contents inside a "hbox".
+%
+% \begin{texnote}
+% This function is a wrapper around \tn{vcenter}, \cs{hbox:n},
+% and \tn{mathpalette}.
+% Inside the "hbox" math mode is reentered.
+% \end{texnote}
+% \end{function}
+%
+% \end{documentation}
+%
+%
+%
+%
+%
+%
+%
+%
+%
+%
+% \begin{implementation}
+% \part{Implementation}
+% \label{pt:implementation}
+% Start the \pkg{DocStrip} guards.
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+%
+% Set the internal prefix for this package so that \pkg{DocStrip} knows what to
+% do.
+% \begin{macrocode}
+%<@@=moremath>
+% \end{macrocode}
+%
+% \section{Initial Setup}
+%
+% First set the required version of \LaTeX{},
+% we need at least
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[2022-11-01]
+% \end{macrocode}
+% for key-value option handling, \pkg{xparse}-like document commands
+% (especially for using the "=" option specification)
+% and hooks.
+%
+% Then identify this package as \pkg{moremath}.
+% \begin{macrocode}
+\ProvidesExplPackage{moremath}
+ {2024-07-15}{v0.4.0}{More Math Macros}
+% \end{macrocode}
+%
+% ^^X Debugging switch
+% \iffalse
+% \debug_on:n {all}
+% \fi
+% \section{Key-value interfaces}
+% \label{sec:key-val}
+% To make use of key-value interfaces we need to define a few keys.
+%
+% \subsection{Package load time options}
+% \label{sec:load-time-options}
+%
+% To allow for the conditional definition of macros at load time
+% we define a few keys.
+%
+% But before doing so we define a few messages to write the package options to
+% the log file.
+% One message to issue if the \texttt{bm} option has been given:
+% \begin{macrocode}
+\msg_new:nnn { moremath } {load / bm}
+{
+ Option~'bm'~given.\\
+ Loading~the~bm~package~\msg_line_context:.
+}
+% \end{macrocode}
+% And a more generic message to issue for the other options,
+% which all disable certain parts of the library.
+% \begin{macrocode}
+\msg_new:nnn {moremath} { load / disabling }
+{
+ Option~'#1'~given.\\
+ Disabling~#2~\msg_line_context:.
+}
+% \end{macrocode}
+%
+% \begin{variable}{
+% \l_@@_predef_vector_op_bool,
+% \l_@@_predef_operators_bool,
+% \l_@@_predef_crvector_bool,
+% \l_@@_predef_matrix_bool,
+% \l_@@_predef_abs_bool,
+% }
+% To store the values of several switch type key-value options
+% we declare several boolean variables.
+% \begin{macrocode}
+\bool_new:N \l_@@_predef_vector_op_bool
+\bool_new:N \l_@@_predef_operators_bool
+\bool_new:N \l_@@_predef_crvector_bool
+\bool_new:N \l_@@_predef_matrix_bool
+\bool_new:N \l_@@_predef_abs_bool
+% \end{macrocode}
+%
+% The variables \cs{l_@@_predef_vector_op_bool}, \cs{l_@@_predef_operators_bool}
+% \cs{l_@@_predef_abs_bool}, \cs{l_@@_predef_matrix_bool}
+% and \cs{l_@@_predef_crvector_bool}
+% control if the predefined macros
+% for vector calculus, delimited operators, the matrix shorthands,
+% the row and column vectors,
+% and the shorthands for absolute value
+% and norm shall be defined.
+%
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{
+% Explicitly declared boolean variables used to store key-value options.
+% }
+% \end{variable}
+%
+% \begin{optionenv}{
+% bm,
+% no-vector,
+% no-operators,
+% no-abs-shorthands,
+% no-matrix,
+% no-crvector,
+% nopredef,
+% }
+% Now we define package load time keys:
+% \begin{macrocode}
+\keys_define:nn { moremath / load }
+{
+% \end{macrocode}
+% We provide an option to conditionally load the \pkg{bm}-package~\autocite{bm}
+% to provide better looking bold symbols.
+% \begin{macrocode}
+ bm .code:n = {
+ \msg_info:nn {moremath} {load / bm}
+ \RequirePackage{bm}
+ },
+ bm .value_forbidden:n = true,
+ bm. usage:n = load,
+% \end{macrocode}
+% Then we define options for en-/disabling predefined macros of this package
+% to avoid name clashes.
+% \begin{macrocode}
+ no-vector .bool_set_inverse:N = \l_@@_predef_vector_op_bool,
+ no-vector .default:n = true,
+ no-vector .initial:n = false,
+ no-vector .usage:n = load,
+ no-operators .bool_set_inverse:N = \l_@@_predef_operators_bool,
+ no-operators .default:n = true,
+ no-operators .initial:n = false,
+ no-operators .usage:n = load,
+ no-abs-shorthands .bool_set_inverse:N = \l_@@_predef_abs_bool,
+ no-abs-shorthands .default:n = true,
+ no-abs-shorthands .initial:n = false,
+ no-abs-shorthands .usage:n = load,
+ no-matrix .bool_set_inverse:N = \l_@@_predef_matrix_bool,
+ no-matrix .initial:n = false,
+ no-matrix .default:n = true,
+ no-matrix .usage:n =load,
+ no-crvector .bool_set_inverse:N = \l_@@_predef_crvector_bool,
+ no-crvector .default:n = true,
+ no-crvector .initial:n = false,
+ no-crvector .usage:n = load,
+ nopredef .multichoice:,
+ nopredef / operators .meta:nn = { moremath / load }
+ {
+ no-operators = true
+ },
+ nopredef / vector .meta:nn = { moremath / load }
+ {
+ no-vector = true
+ },
+ nopredef / abs .meta:nn = { moremath / load }
+ {
+ no-abs-shorthands = true,
+ },
+ noperdef / matrix .meta:nn = { moremath / load }
+ {
+ no-matrix = true,
+ },
+ nopredef / crvector .meta:nn = {moremath / load}
+ {
+ no-crvector = true,
+ },
+ nopredef / all .meta:nn = { moremath / load }
+ {
+ no-operators = true,
+ no-vector = true,
+ no-abs-shorthands = true
+ },
+ nopredef .usage:n = load,
+% \end{macrocode}
+% Unknown package options get passed to \pkg{mathtools}.
+% \begin{macrocode}
+ unknown .code:n = {\PassOptionsToPackage{\CurrentOption}{mathtools}},
+ unknown .usage:n = load,
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added package load-time options.
+% }
+% \end{optionenv}
+%
+%
+% \subsection{Keys controlling appearance}
+% \label{sec:keys-appearance}
+%
+% \begin{variable}{
+% \l_@@_nabla_tl,
+% \l_@@_nabla_arrow_bool,
+% \l_@@_nabla_arrow_bold_bool,
+% \l_@@_grad_op_tl,
+% \l_@@_laplacian_symb_tl,
+% \l_@@_laplacian_delta_bool,
+% \l_@@_laplacian_arrow_bool,
+% \l_@@_laplacian_tl,
+% \l_@@_dalembert_symb_tl,
+% }
+% We declare several variables to store the values of the keys affecting
+% appearance.
+% \begin{macrocode}
+\tl_new:N \l_@@_nabla_tl
+\bool_new:N \l_@@_nabla_arrow_bool
+\bool_new:N \l_@@_nabla_arrow_bold_bool
+\tl_new:N \l_@@_grad_op_tl
+% \end{macrocode}
+%
+% The symbol to use as \enquote{nabla} is stored in \cs{l_@@_nabla_tl}.
+% The variables \cs{l_@@_nabla_arrow_bool} and \cs{l_@@_nabla_bold_bool}
+% determine if the nabla-symbol shall have an arrow over itself and/or be bold
+% respectively.
+%
+% The variable \cs{l_@@_grad_op_tl} contains a user provided token list to
+% overwrite the built-in gradient operator of the package.
+%
+% \begin{macrocode}
+\tl_new:N \l_@@_laplacian_symb_tl
+\bool_new:N \l_@@_laplacian_delta_bool
+\bool_new:N \l_@@_laplacian_arrow_bool
+\tl_new:N \l_@@_laplacian_tl
+% \end{macrocode}
+% The token list variable \cs{l_@@_laplacian_symb_tl} stores the tokens to be
+% used for the Laplace operator.
+% The boolean variable \cs{l_@@_laplacian_delta_bool}
+% determines if a delta should be used instead
+% of \(\laplacian\) for the laplacian symbol.
+% If the boolean variable \cs{l_@@_laplacian_arrow_bool} a small arrow will be
+% placed over the Laplace operator symbol.
+% If the user wants to overwrite the symbol used for the Laplacian,
+% the user provided list of tokens is stored in the variable
+% \cs{l_@@_laplacian_tl}.
+%
+% Finally we define a variable to hold the symbol to use for the
+% \foreignlanguage{french}{d'Alembert} operator.
+% \begin{macrocode}
+\tl_new:N \l_@@_dalembert_symb_tl
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Explicitly declared variables before using them to set keys.
+% }
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added: New variable \cs{l_@@_dalembert_symb_tl}
+% }
+% \end{variable}
+%
+% \begin{variable}{
+% \l_@@_vcenter_bool,
+% }
+% Additionally we declare a variable to decide if certain math symbols
+% shall be centered explicitly along the math axis.
+% \begin{macrocode}
+\bool_new:N \l_@@_vcenter_bool
+% \end{macrocode}
+% If \cs{l_@@_vcenter_bool} is true, the symbols of certain math operators,
+% should be centered explicitly.
+% \end{variable}
+%
+% \begin{optionenv}{
+% nabla,
+% arrownabla,
+% boldnabla,
+% grad-op,
+% laplacian-symb,
+% delta-laplace,
+% arrowlaplace,
+% laplacian,
+% dalembert-symb,
+% }
+% First define keys for the vector calculus macros.
+% \begin{macrocode}
+\keys_define:nn { moremath }
+{
+% \end{macrocode}
+% First we define keys for use with the gradient and gradient based operators.
+% \begin{macrocode}
+ % Symbol to use for the nabla
+ nabla .tl_set:N = \l_@@_nabla_tl,
+ nabla .initial:n = {\nabla},
+ nabla .value_required:n = true,
+ % shall the nabla have an arrow over it
+ arrownabla .bool_set:N = \l_@@_nabla_arrow_bool,
+ arrownabla .default:n = {true},
+ arrownabla .initial:n = {false},
+ % shall the nabla be bold
+ boldnabla .bool_set:N = \l_@@_nabla_bold_bool,
+ boldnabla .default:n = {true},
+ boldnabla .initial:n = {false},
+% \end{macrocode}
+% We also provide an override for the gradient operator
+% \begin{macrocode}
+ % Symbol to use for the gradient operator
+ grad-op .tl_set:N = \l_@@_grad_op_tl,
+ grad-op .value_required:n = true,
+% \end{macrocode}
+%
+% Then we define keys for the laplacian.
+% \begin{macrocode}
+ % Symbol to use for the laplacian
+ laplacian-symb .tl_set:N = \l_@@_laplacian_symb_tl,
+ laplacian-symb .initial:n = {\l_@@_nabla_tl},
+ % shall the Laplace operator be a delta
+ delta-laplace .bool_set:N = \l_@@_laplacian_delta_bool,
+ delta-laplace .initial:n = {false},
+ % shall the laplace operator have an arrow over itself
+ arrowlaplace .bool_set:N = \l_@@_laplacian_arrow_bool,
+ arrowlaplace .default:n = {true},
+ arrowlaplace .initial:n = {false},
+ % overwrite the laplace operator
+ laplacian .tl_set:N = \l_@@_laplacian_tl,
+ laplacian .value_required:n = true,
+% \end{macrocode}
+% And keys for the \foreignlanguage{french}{d'Alembert} operator.
+% \begin{macrocode}
+ dalembert-symb .tl_set:N = \l_@@_dalembert_symb_tl,
+ dalembert-symb .initial:n = {\square},
+% \end{macrocode}
+% \begin{optionenv}{
+% vcenter,
+% }
+% The "vcenter" option will control the manual centering of certain math
+% operators.
+% \begin{macrocode}
+ vcenter .bool_set:N = \l_@@_vcenter_bool,
+ vcenter .initial:n = true,
+ vcenter .value_required:n = true,
+}% \keys_define:nn
+% \end{macrocode}
+% \changes{v0.3.0}{\GetVersionDate{v0.3.0}}{
+% Added new option.
+% }
+% \end{optionenv} ^^X vcenter
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added options controlling appearance.
+% }
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added: New option "dalembert-symb".
+% }
+% \end{optionenv}
+%
+% \begin{optionenv}{
+% delimiter,
+% fill,
+% align
+% }
+% Then we define some keys for the matrix based environments:
+% \begin{macrocode}
+\keys_define:nn { moremath / matrix }
+{
+% \end{macrocode}
+% \begin{variable}{
+% \l_@@_matrix_delim_tl,
+% \l_@@_matrix_fill_tl,
+% \l_@@_matrix_align_tl,
+% }
+% Every one of the following keys stores its value inside a token list variable.
+% \begin{macrocode}
+ delimiter .tl_set:N = \l_@@_matrix_delim_tl,
+ delimiter .initial:n = {},
+ fill .tl_set:N = \l_@@_matrix_fill_tl,
+ fill .initial:n = {},
+ align .tl_set:N = \l_@@_matrix_align_tl,
+ align .initial:n = {c},
+ align .value_required:n = true,
+}
+% \end{macrocode}
+% The keys \verb|delimiter| and \verb|fill| set the variables
+% \cs{l_@@_matrix_delim_tl} and \cs{l_@@_matrix_fill_tl} respectively.
+% \cs{l_@@_matrix_delim_tl} determines the delimiter in use to surround
+% matrices and \cs{l_@@_matrix_fill_tl} determines the fill values of the
+% \cs{diag}, \cs{smalldiag}, \cs[no-index]{Xdiag} and \cs[no-index]{Xsmalldiag}
+% commands, which are used for non-diagonal matrix entries.
+% The variable \cs{l_@@_matrix_align_tl} contains the alignment specifier
+% for use with the \env{matrix*} environment.
+%
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added internal variables.
+% }
+% \end{variable}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added options for the matrix-based environments of \pkg{mathtools}.
+% }
+% \end{optionenv}
+%
+% \subsection{Functions for Setting Options}
+% \label{sec:option-setters}
+%
+%
+% Now we define a function for setting the options within the document
+% \begin{macro}{\moremath_setup:n}
+% \begin{macrocode}
+\cs_new_protected:Nn \moremath_setup:n
+{
+ \keys_set:nn {moremath} {#1}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added function for setting options.
+% }
+% \end{macro}
+%
+% Additionally we provide the user with a version of this command.
+% \begin{macro}{\moremathsetup}
+% \begin{macrocode}
+\NewDocumentCommand \moremathsetup {m}
+{
+ \moremath_setup:n {#1}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added document command for setting package options.
+% }
+% \end{macro}
+% We also need a function for setting the package load time options.
+% This function should set all given values for all key families
+% and pass unknown options to mathtools.
+% \begin{macro}{\@@_load_time_setup:}
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_load_time_setup:
+{
+ \ProcessKeyOptions[ moremath / load ]
+}
+% \end{macrocode}
+% \end{macro}
+%
+% ^^X SUBSECTION: Package Initialization
+% \section{Package Initialization}
+% \label{sec:init}
+%
+% We now \enquote{initialize} the package by processing the package options,
+% all unknown options are passed to \pkg{mathtools}~\autocite{mathtools},
+% which is loaded afterwards.
+% Because certain \pkg{mathtools}-features are needed by this package,
+% we need to require a version of at least 2004/06/05.
+% As explained in section~\ref{sec:load-time-options} this may also load \pkg{bm}
+% if the \verb|bm| package option has been given.
+% \begin{macrocode}
+\@@_load_time_setup:
+% \end{macrocode}
+% If the "no-vector" option has not been given during load time,
+% we also need the \pkg{amssymb} package~\autocite{amsfonts} for the
+% \cs[module=amssymb,replace=false]{square} command.
+% We first define a message to inform the user about this.
+% \begin{macrocode}
+\msg_new:nnn { moremath } { load / loading-amssymb }
+{
+ Vector~calculus~commands~enabled.\\
+ Loading~amssymb~package~\msg_line_context:.
+}
+% \end{macrocode}
+% Then we conditionally load the package.
+% \begin{macrocode}
+\bool_if:NT \l_@@_predef_vector_op_bool
+{
+ \msg_info:nn { moremath } { load / loading-amssymb }
+ \RequirePackage{amssymb}
+}
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{
+% New: Load \pkg{amssymb} if the "no-vector" option has \emph{not} been given.
+% }
+%
+% Finally we load our most important dependency \pkg{mathtools}.
+% \begin{macrocode}
+\RequirePackage{mathtools}[2004/06/05]
+% \end{macrocode}
+%
+%
+% \section{Centering Math Symbols Along the Math-Axis}
+% \label{sec:impl-vcenter}
+%
+% Certain math constructs such cause \TeX{}
+% to not center the operator along the math axis,
+% like case of |\mathop{\nabla}\nolimits| vs.\
+% |\mathop{\boldsymbol\nabla}\nolimits|,
+% as can be seen below.
+% \[
+% \mathop{\nabla}\nolimits f(x)
+% \quad \text{vs.} \quad
+% \mathop{\boldsymbol\nabla}\nolimits f(x)
+% \]
+% As can be seen the bold nabla symbol is slightly higher up than the non-bold
+% version.
+% Because of this it is sometimes useful to manually center some math symbols,
+% along the math axis.\footnote{%
+% The code in this section is inspired by
+% \url{http://www.tug.org/TUGboat/Articles/tb22-4/tb72perlS.pdf}
+% }
+%
+% \begin{macro}[added = 2024-07-08]{
+% \moremath_vcenter:n
+% }
+% The function \cs{moremath_vcenter:n} is a wrapper around the \tn{vcenter}
+% \TeX{} primitive.
+% It takes a single argument.
+% \begin{arguments}
+% \item A \meta{tl} containing math mode material to center along the math axis.
+%
+% This argument is typeset in math mode.
+% \end{arguments}
+% The function uses the \tn{mathpalette} primitive to switch to the right
+% math style.
+% The function is not in a \TeX{}-sense long,
+% i.e.\ it does not take \tn{par} tokens.
+%
+% As this function might be useful not only for internal use by \pkg{moremath},
+% we declare it as a public function here.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_vcenter:n
+{
+ \mathpalette \@@_vcenter:Nn {#1}
+}
+% \end{macrocode}
+% \changes{v0.3.0}{\GetVersionDate{v0.3.0}}{
+% Added new function.
+% }
+% \end{macro}
+%
+% \begin{macro}[added=2024-07-08]{
+% \@@_vcenter:Nn,
+% }
+% As \tn{mathpalette} needs as its first argument a macro which takes two
+% arguments
+% (the first is a math style switch and the second the contents).\footnote{%
+% See \TeX{}SE answer \url{https://tex.stackexchange.com/a/34412}
+% }
+% We define an internal helper function for \cs{moremath_vcenter:n} for
+% \cs{mathpalette} to call.
+%
+% The function \cs{@@_vcenter:Nn} takes two arguments:
+% \begin{arguments}
+% \item The math style macro, which is passed to this function by
+% \tn{mathpalette}.
+%
+% \item The \meta{tl} to typeset inside the \tn{vcenter}.
+% \end{arguments}
+%
+% Because of the properties of \tn{vcenter}, it switches to vertical mode,
+% we need to put the contents to typeset inside a horizontal box.
+% Because of this we also need to reenter math mode, and because of this
+% we need to remove the spacing inserted by entering math mode
+% by setting \tn{mathsurround} to zero.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \@@_vcenter:Nn
+{
+ \vcenter
+ {
+ \hbox:n
+ {
+ $
+ \mathsurround=0pt
+ #1 {#2}
+ $
+ }
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection*{Document Level Command}
+%
+% Although unlikely there might arise the need for a document author to center
+% some math along the math axis.
+% For this purpose we are going to define a new document level command.
+%
+% But first we are going to declare some messages to use by the command.
+% The first message informs the user that the command is not available,
+% because its \meta{csname} is already taken.
+% \begin{macrocode}
+\msg_new:nnn { moremath } { csname-already-defined }
+{
+ Control~sequence~' #1 '~is~already~ defined.\\
+ Skipping~definition~\msg_line_context:
+}
+% \end{macrocode}
+% The second message should be issued if a command that only works in math mode
+% was given outside of it.
+% \begin{macrocode}
+\msg_new:nnnn { moremath } { vcenter / only-in-math-mode }
+{
+ Command~#1~used~outside~math~mode~\msg_line_context:.
+}
+{
+ The~command~#1~may~only~be~used~inside~math~mode.
+}
+% \end{macrocode}
+% \begin{macro}{
+% \VCenterMath,
+% }
+% Now to the document level command for centering math along the math axis.
+% \begin{macrocode}
+\cs_if_free:NTF \VCenterMath
+{
+ \NewDocumentCommand \VCenterMath { m }
+ {
+ \mode_if_math:TF
+ {
+ \moremath_vcenter:n {#1}
+ }{% \mode_if_math:TF FALSE BRANCH
+ \msg_error:nnn { moremath } { vcenter / only-in-math-mode } {\VCenterMath}
+ }
+ }
+}{% \cs_if_free:NTF \VCenterMath FALSE BRANCH
+ \msg_warning:nnn { moremath } { csname-already-defined } {\VCenterMath}
+}
+% \end{macrocode}
+% \changes{v0.3.0}{\GetVersionDate{v0.3.0}}{
+% Added new document level command.
+% }
+% \end{macro}
+%
+%
+% ^^X SECTION: Paired Delimiters
+% \section{Declaring Paired Delimiters for Internal Use}
+% \label{sec:impl-paired-delim}
+%
+% \begin{macro}{
+% \@@_inparent:w,
+% \@@_inbrack:w,
+% \@@_inbrace:w,
+% \@@_in_vert:w,
+% \@@_in_Vert:w
+% }
+% As we are going to use \pkg{mathtools}' \emph{paired delimiters}
+% at several places throughout this package,
+% we define \emph{paired delimiters} for internal use, as functions with weird
+% syntax.
+% \begin{macrocode}
+\DeclarePairedDelimiter{\@@_inparent:w}{\lparen}{\rparen}
+\DeclarePairedDelimiter{\@@_inbrack:w}{\lbrack}{\rbrack}
+\DeclarePairedDelimiter{\@@_inbrace:w}{\lbrace}{\rbrace}
+\DeclarePairedDelimiter{\@@_in_vert:w}{\lvert}{\rvert}
+\DeclarePairedDelimiter{\@@_in_Vert:w}{\lVert}{\rVert}
+% \end{macrocode}
+% \end{macro}
+%
+% ^^X SECTION: Delimited Operators
+% \section{Delimited Operators}
+% \label{sec:impl-delim-op}
+%
+% We need three different functions for providing the delimited operators.
+% But as we share a lot of code between those, we define an additional
+% helper function beforehand.
+% \begin{macro}{
+% \@@_operator:Nnn
+% }
+% The function \cs{@@_operator:Nnn} takes care of the operator part
+% of the new delimiter.
+% It allows the operator to have super- and subscripts.
+% It takes three arugments.
+% \begin{arguments}
+% \item The \meta{csname} of the operator to use.
+% \item A \meta{token list}, which is used as the superscript operator.
+%
+% This argument may be empty
+% \item A \meta{tl}, which is used as the subscript operator.
+%
+% The \meta{tl} may be empty.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_operator:Nnn
+{
+ #1
+ % add superscript if present
+ \tl_if_empty:nF {#2} {^{#2}}
+ % add subscript if present
+ \tl_if_empty:nF {#3} { \c_math_subscript_token {#3} }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% We now define three version of the delimited operators.
+% \begin{macro}{
+% \moremath_delim_op_noscale:NNnnn,
+% \moremath_delim_op_autoscale:NNnnn,
+% }
+% \cs{moremath_delim_op_noscale:NNnnn} is provides a delimited operator without
+% any scaling of the delimiters
+% and \cs{moremath_delim_op_autoscale:NNnnn} provides a version with
+% automatic scaling of the delimiters.
+% Both of them take five arguments:
+% \begin{arguments}
+% \item The \meta{csname} of the operator to use.
+%
+% Any operator declared with \pkg{amsmath}'s \cs{operatorname}
+% and/or\linebreak[3]
+% \cs[module=amsmath,replace=false]{DeclareMathOperator}
+% is valid for this.
+%
+% \item The \meta{csname} of a paired delimiter declared by
+% \pkg{mathtools}'~\autocite{mathtools}
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter}.
+%
+% \item A \meta{tl} to use as the superscript of the operator.
+%
+% \item A \meta{tl} to use as the subscript of the operator.
+%
+% \item A \meta{tl} to insert inside the delimiters.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_delim_op_noscale:NNnnn
+{
+ \@@_operator:Nnn #1 {#3} {#4}
+ % #2 is the paired delimiter
+ #2 {#5}
+}
+
+\cs_new_protected_nopar:Nn \moremath_delim_op_autoscale:NNnnn
+{
+ \@@_operator:Nnn #1 {#3} {#4}
+ % #2 is the paired delimiter
+ #2 * {#5}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added "noscale" and "autoscale" versions.
+% }
+% \end{macro}
+% \begin{macro}{
+% \moremath_delim_op_manuscale:NNnnnn,
+% \moremath_delim_op_manuscale:NNVnnn
+% }
+% \cs{moremath_delim_op_manuscale:NNnnnn} provides a delimited operator with
+% manual scaling.
+% This version takes six arguments:
+% \begin{arguments}
+% \item The \meta{csname} of the operator to use.
+%
+% \item The \meta{csname} of the paired delimiter
+% declared by \pkg{mathtools}'~\autocite{mathtools}\linebreak[3]
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter}.
+%
+% \item A \meta{tl} containing the scaling macro i.e.\ \cs{big}, \cs{Big},
+% \cs{Bigg},\dots
+%
+% \item A \meta{tl} containing the superscript of the operator.
+%
+% The \meta{tl} may be empty
+%
+% \item A \meta{tl} containing the subscript of the operator
+%
+% The \meta{tl} may be empty.
+%
+% \item A \meta{tl} to insert inside the delimiters
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_delim_op_manuscale:NNnnnn
+{
+ \@@_operator:Nnn #1 {#4} {#5}
+ % #2 is the paired delimiter
+ #2 [ #3 ] {#6}
+}
+% \end{macrocode}
+% We also provide a variant for the scaling macro.
+% \begin{macrocode}
+\cs_generate_variant:Nn \moremath_delim_op_manuscale:NNnnnn {NNVnnn}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Function added.
+% }
+% \end{macro}
+%
+% For the creation of document level commands we also create a function,
+% so that the user is also able to declare new delimited operators.
+% But before we do so we create a message to inform the user if a
+% \meta{csname} was already taken.
+% \begin{macrocode}
+\msg_new:nnn { moremath } { delimop / already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~of~delimited~operator~'#1'~\msg_line_context:.
+}
+% \end{macrocode}
+%
+% We also create a message to inform the user about conflicting options
+% given to the command.
+% \begin{macrocode}
+\msg_new:nnn { moremath } { delimop / auto-manu-scale-conflict }
+{
+ Both~star~and~scale~cmd~given~to~'#1'.\\
+ Automatic~scaling~will~be~preferred,~the~size~command~will~be~
+ ignored~\msg_line_context:.
+}
+% \end{macrocode}
+% \begin{macro}{
+% \moremath_new_delim_op_command:NNN,
+% \moremath_new_delim_op_command:cNN,
+%}
+% \cs{moremath_new_delim_op_command:NNN} takes three arguments:
+% \begin{arguments}
+% \item The \meta{csname} to be defined.
+%
+% \item The \meta{csname} of the operator to use,
+% which should be an operator declared with
+% \cs[module=amsmath,replace=false]{DeclareMathOperator}.
+%
+% \item The \meta{csname} of the delimiter to use,
+% which should have been declared with
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter}.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \moremath_new_delim_op_command:NNN
+{
+ \cs_if_free:NTF #1
+ {
+ \exp_args:NNe \NewDocumentCommand #1
+ { s o E{ ^ \char_generate:nn {`_} {8} }{{}{}} m }
+ {
+ \tl_if_novalue:nTF {##2}
+ {
+ % second argument empty
+ \bool_if:nTF {##1}
+ {
+ % star given
+ \moremath_delim_op_autoscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }{
+ % star not given
+ \moremath_delim_op_noscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }
+ }{
+ % second argument present
+ % star given?
+ \bool_if:nTF {##1}
+ {
+ % Warn if both star and scaling factor are present
+ \msg_warning:nnn { moremath } { delimop / auto-manu-scale-conflict }
+ {#1}
+ \moremath_delim_op_autoscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }{ % FALSE BRANCH
+ \moremath_delim_op_manuscale:NNnnnn #2 #3 {##2} {##3} {##4} {##5}
+ }
+ }
+ }
+ }{ % \cs_if_free:nTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { delimop / already-defined-skip }
+ {#1}
+ }
+}
+
+\cs_generate_variant:Nn \moremath_new_delim_op_command:NNN {cNN}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added function and variant.
+% }
+% \end{macro}
+%
+% \subsection{Document Level Commands}
+% \label{sec:impl-delim-op-doc-cmds}
+%
+% \begin{macro}{\DeclareDelimitedOperator}
+% Finally provide the user with a command to declare an additional
+% delimited operator.
+% \begin{macrocode}
+\NewDocumentCommand\DeclareDelimitedOperator { m m m }
+{
+ \msg_redirect_name:nnn { moremath } { delimop / already-defined-skip } { error }
+ \moremath_new_delim_op_command:NNN #1 #2 #3
+ \msg_redirect_name:nnn { moremath } { delimop / already-defined-skip } {}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{Added document level command.}
+% \end{macro}
+%
+% As \pkg{amsmath}~\autocite{amsmath} pre-defines the following operators
+% it is only sensible to also define delimited versions of them:\\
+% \input{\jobname-ams-op-table.tex}
+%
+% \begin{macro}{\@@_new_delim_op_cmds:nN}
+% \cs{@@_new_delim_op_cmds:nN} creates document level macros of the form
+% \cs[no-index]{\meta{prefix}\meta{op name}}.
+% It declares fife versions \cs[no-index]{p\meta{op name}},
+% \cs[no-index]{b\meta{op name}}, \cs[no-index]{B\meta{op name}},
+% \cs[no-index]{v\meta{op name}} and \cs[no-index]{V\meta{op name}}.
+%
+% The function takes two arguments:
+% \begin{arguments}
+% \item A token list which contains \meta{op name}
+%
+% \item The \meta{csname} of the operator to use.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_new_delim_op_cmds:nN
+{
+ \moremath_new_delim_op_command:cNN {p #1} #2 \@@_inparent:w
+ \moremath_new_delim_op_command:cNN {b #1} #2 \@@_inbrack:w
+ \moremath_new_delim_op_command:cNN {B #1} #2 \@@_inbrace:w
+ \moremath_new_delim_op_command:cNN {v #1} #2 \@@_in_vert:w
+ \moremath_new_delim_op_command:cNN {V #1} #2 \@@_in_Vert:w
+}
+% \end{macrocode}
+% \end{macro}
+%
+% The decision if the following macros are defined depends on a package load
+% time option.
+% \begin{macrocode}
+\bool_if:NTF \l_@@_predef_operators_bool
+{
+% \end{macrocode}
+% We define the commands for the operators already declared by amsmath.
+% \begin{macro}[documented-as=\parccos]{
+% \parccos, \barccos, \Barccos, \varccos, \Varccos,
+% }
+% For \cs[module=amsmath,replace=false]{arccos},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {arccos} \arccos
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added delimited document commands for all \pkg{amsmath}-defined operators.
+% }
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \parcsin, \barcsin, \Barcsin, \varcsin, \Varcsin,
+% }
+% \cs[module=amsmath,replace=false]{arcsin},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {arcsin} \arcsin
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \parctan, \barctan, \Barctan, \varctan, \Varctan,
+% }
+% \cs[module=amsmath,replace=false]{arctan},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {arctan} \arctan
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \Parg, \barg, \Barg, \varg, \Varg,
+% }
+% \cs[module=amsmath,replace=false]{arg}
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {arg} \arg
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pcos, \bcos, \Bcos, \vcos, \Vcos,
+% }
+% \cs[module=amsmath,replace=false]{cos}
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {cos} \cos
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pcosh, \bcosh, \Bcosh, \vcosh, \Vcosh,
+% }
+% \cs[module=amsmath,replace=false]{cosh},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {cosh} \cosh
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pcot, \bcot, \Bcot, \vcot, \Vcot,
+% }
+% \cs[module=amsmath,replace=false]{cot},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {cot} \cot
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pcoth, \bcoth, \Bcoth, \vcoth, \Vcoth,
+% }
+% \cs[module=amsmath,replace=false]{coth},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {coth} \coth
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pcsc, \bcsc, \Bcsc, \vcsc, \Vcsc,
+% }
+% \cs[module=amsmath,replace=false]{csc},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {csc} \csc
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pdeg, \bdeg, \Bdeg, \vdeg, \Vdeg,
+% }
+% \cs[module=amsmath,replace=false]{deg},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {deg} \deg
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pdet, \bdet, \Bdet, \vdet, \Vdet,
+% }
+% \cs[module=amsmath,replace=false]{det},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {det} \det
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pdim, \bdim, \Bdim, \vdim, \Vdim,
+% }
+% \cs[module=amsmath,replace=false]{dim},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {dim} \dim
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pexp, \bexp, \Bexp, \vexp, \Vexp,
+% }
+% \cs[module=amsmath,replace=false]{exp},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {exp} \exp
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pgcd, \bgcd, \Bgcd, \vgcd, \Vgcd,
+% }
+% \cs[module=amsmath,replace=false]{gcd},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {gcd} \gcd
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \phom, \bhom, \Bhom, \vhom, \Vhom,
+% }
+% \cs[module=amsmath,replace=false]{hom},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {hom} \hom
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pinf, \binf, \Binf, \vinf, \Vinf,
+% }
+% \cs[module=amsmath,replace=false]{inf},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {inf} \inf
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pinjlim, \binjlim, \Binjlim, \vinjlim, \Vinjlim,
+% }
+% \cs[module=amsmath,replace=false]{injlim},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {injlim} \injlim
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pker, \bker, \Bker, \vker, \Vker,
+% }
+% \cs[module=amsmath,replace=false]{ker},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {ker} \ker
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \plg, \blg, \Blg, \vlg, \Vlg,
+% }
+% \cs[module=amsmath,replace=false]{lg},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {lg} \lg
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \plim, \blim, \Blim, \vlim, \Vlim,
+% }
+% \cs[module=amsmath,replace=false]{lim},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {lim} \lim
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pliminf, \bliminf, \Bliminf, \vliminf, \Vliminf,
+% }
+% \cs[module=amsmath,replace=false]{liminf},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {liminf} \liminf
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \plimsup, \blimsup, \Blimsup, \vlimsup, \Vlimsup,
+% }
+% \cs[module=amsmath,replace=false]{limsup},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {limsup} \limsup
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pln, \bln, \Bln, \vln, \Vln,
+% }
+% \cs[module=amsmath,replace=false]{ln}
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {ln} \ln
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \plog, \blog, \Blog, \vlog, \Vlog,
+% }
+% \cs[module=amsmath,replace=false]{log},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {log} \log
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pmax, \bmax, \Bmax, \vmax, \Vmax,
+% }
+% \cs[module=amsmath,replace=false]{max},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {max} \max
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pmin, \bmin, \Bmin, \vmin, \Vmin,
+% }
+% \cs[module=amsmath,replace=false]{min},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {min} \min
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pPr, \bPr, \BPr, \vPr, \VPr,
+% }
+% \cs[module=amsmath,replace=false]{Pr},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {Pr} \Pr
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pprojlim, \bprojlim, \Bprojlim, \vprojlim, \Vprojlim,
+% }
+% \cs[module=amsmath,replace=false]{projlim},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {projlim} \projlim
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \psec, \bsec, \Bsec, \vsec, \Vsec,
+% }
+% \cs[module=amsmath,replace=false]{sec},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {sec} \sec
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \psin, \bsin, \Bsin, \vsin, \Vsin,
+% }
+% \cs[module=amsmath,replace=false]{sin},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {sin} \sin
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \psinh, \bsinh, \Bsinh, \vsinh, \Vsinh,
+% }
+% \cs[module=amsmath,replace=false]{sinh},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {sinh} \sinh
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \psup, \bsup, \Bsup, \vsup, \Vsup,
+% }
+% \cs[module=amsmath,replace=false]{sup},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {sup} \sup
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \ptan, \btan, \Btan, \vtan, \Vtan,
+% }
+% \cs[module=amsmath,replace=false]{tan},
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {tan} \tan
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \ptanh, \btanh, \Btanh, \vtanh, \Vtanh
+% }
+% and \cs[module=amsmath,replace=false]{tanh}.
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {tanh} \tanh
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}[documented-as=\parccos]{
+% \pvarinjlim, \bvarinjlim, \Bvarinjlim, \vvarinjlim, \Vvarinjlim,
+% \pvarprojlim, \bvarprojlim, \Bvarprojlim, \vvarprojlim, \Vvarprojlim,
+% \pvarliminf, \bvarliminf, \Bvarliminf, \vvarliminf, \Vvarliminf,
+% \pvarlimsup, \bvarlimsup, \Bvarlimsup, \vvarlimsup, \Vvarlimsup,
+% }
+% We also provide delimited versions of \cs[module=amsmath,replace=false]{varinjlim},
+% \cs[module=amsmath,replace=false]{varprojlim},
+% \cs[module=amsmath,replace=false]{varliminf},
+% and \cs[module=amsmath,replace=false]{varlimsup}.
+% \begin{macrocode}
+\@@_new_delim_op_cmds:nN {varinjlim} \varinjlim
+\@@_new_delim_op_cmds:nN {varprojlim} \varprojlim
+\@@_new_delim_op_cmds:nN {varliminf} \varliminf
+\@@_new_delim_op_cmds:nN {varlimsup} \varlimsup
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+}{
+ \msg_info:nnnn {moremath} {load /disabling} {no-operators}
+ {
+ predefined~delimited~operator~macros
+ }
+} % End of the conditional
+% \end{macrocode}
+%
+% ^^X SECTION: Vector Calculus Macros
+% \section{Vector Calculus Macros}
+% \label{sec:vector-calc}
+%
+% For providing macros which help with vector differentials,
+% we first need some setup functions.
+%
+% \subsection{Macros Providing Symbols of Operators}
+% \label{sec:op-symbols}
+%
+% \begin{macro}{
+% \@@_maybe_vcenter:n,
+% }
+% Sometimes a symbol should be centered explicitly,
+% as this will depend on the current setting of "vcenter",
+% i.e.\ the current value of \cs{l_@@_vcenter_bool},
+% we provide a helper function which puts its argument
+% \begin{arguments}
+% \item A list of \meta{tokens}
+% \end{arguments}
+% inside a \tn{vcenter} by means of \cs{moremath_vcenter:n}
+% or not depending on the current value of \cs{l_@@_vcenter_bool}.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \@@_maybe_vcenter:n
+{
+ \bool_if:NTF \l_@@_vcenter_bool
+ {
+ \moremath_vcenter:n {#1}
+ }{
+ #1
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_gradient_operator_get:}
+% This function returns the gradient operator depending on the current setting
+% of the keys.
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_gradient_operator_get:
+{
+ \tl_if_empty:NTF \l_@@_grad_op_tl
+ {
+ \mathop
+ {
+% \end{macrocode}
+% Otherwise we first need to check if the operator shall have an arrow over it.
+% Afterwards if the nabla shall be bold.
+% \begin{macrocode}
+ \bool_if:NTF \l_@@_nabla_arrow_bool
+ {
+ \vec
+ {
+% \end{macrocode}
+% In case \cs{l_@@_nabla_arrow_bool} is true we should \emph{maybe}
+% center the symbol.
+% \begin{macrocode}
+ \@@_maybe_vcenter:n
+ {
+ \bool_if:NT \l_@@_nabla_bold_bool
+ {
+ \boldsymbol
+ }
+ \l_@@_nabla_tl
+ }
+ }
+ }{
+% \end{macrocode}
+% Like in the case above we should \emph{maybe} center the symbol
+% if \cs{l_@@_nabla_bold_bool} is true.
+% \begin{macrocode}
+ \bool_if:NTF \l_@@_nabla_bold_bool
+ {
+ \@@_maybe_vcenter:n
+ {
+ \boldsymbol
+ \l_@@_nabla_tl
+ }
+ }{
+ \l_@@_nabla_tl
+ }
+ }
+ }% \mathop
+ \nolimits
+ }{
+% \end{macrocode}
+% If the user provided its own implementation of the operator,
+% we simply return it.
+% \begin{macrocode}
+ \l_@@_grad_op_tl
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_laplace_operator_get:}
+% Then we define a function for returning the laplace operator symbol,
+% depending on the currently set keys.
+% The function wraps the symbol for the operator inside
+% \tn{mathop} to provide the right spacing.
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_laplace_operator_get:
+{
+ \tl_if_empty:NTF \l_@@_laplacian_tl
+ {
+ \mathop
+ {
+ \bool_if:NTF \l_@@_laplacian_delta_bool
+ {
+ \Delta
+ }{
+ \bool_if:NTF \l_@@_laplacian_arrow_bool
+ {
+ \vec{
+ \@@_maybe_vcenter:n
+ {
+ \bool_if:NT \l_@@_nabla_bold_bool {\boldsymbol}
+ \l_@@_laplacian_symb_tl
+ }
+ }
+ }{
+ \bool_if:NTF \l_@@_nabla_bold_bool
+ {
+ \@@_maybe_vcenter:n
+ {
+ \boldsymbol
+ \l_@@_laplacian_symb_tl
+ }
+ }{
+ \l_@@_laplacian_symb_tl
+ }
+ }
+ }
+ }\nolimits
+ \bool_if:NF \l_@@_laplacian_delta_bool
+ {
+ \c_math_superscript_token
+ {
+ 2
+ }
+ }
+ }{
+ \l_@@_laplacian_tl
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \@@_dalembert_operator_get:
+% }
+% This function returns the \foreignlanguage{french}{d'Alembert} operator
+% depending on the currently set keys. The symbol for the
+% \foreignlanguage{french}{d'Alembert} operator is wrapped inside \tn{mathop}
+% to provide proper spacing.
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_dalembert_operator_get:
+{
+ \mathop
+ {
+ \l_@@_dalembert_symb_tl
+ }% \mathop
+ \nolimits
+}
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added function: \cs{@@_dalembert_operator_get:}
+% }
+% \end{macro}
+%
+% \subsection{Macros Producing an Operator}
+% \label{sec:op-macros}
+%
+% After we have defined the symbols it is now time to provide a function which
+% produces the entire gradient operator
+% \begin{macro}{
+% \moremath_gradient_operator:n,
+% \moremath_laplace_operator:n
+% }
+% This function takes one arguments, the subscript to use with the operator.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_gradient_operator:n
+{
+ \@@_gradient_operator_get:
+ \tl_if_empty:nF {#1} {\c_math_subscript_token {#1}}
+}
+% \end{macrocode}
+%
+% Like for the gradient operator we do the same for the laplacian
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_laplace_operator:n
+{
+ \@@_laplace_operator_get:
+ \tl_if_empty:nF {#1} {\c_math_subscript_token {#1}}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added functions.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \moremath_divergence_operator:n,
+% \moremath_curl_operator:n
+% }
+% Using the already defined gradient operator it is possible to define a
+% function which acts as an operator suitable for representing the divergence
+% operator and the curl operator.
+% Like the gradient operator this functions take one argument
+% \begin{arguments}
+% \item the subscript of the gradient operator.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_divergence_operator:n
+{
+% \end{macrocode}
+% The braces around \cs{moremath_gradient_operator:n} are necessary to avoid
+% issues with the spacing between \tn{cdot} and the following \tn{mathopen}
+% from any braces.\footnote{%
+% See: \url{https://tex.stackexchange.com/a/223914}
+% }
+% Example:
+% \[
+% \text{With braces:}\quad \pdiv{f(x)} \text{,}
+% \qquad\text{without braces: }\quad \mathop{\nabla}\nolimits\cdot(f(x))
+% \]
+% \begin{macrocode}
+ {
+ \moremath_gradient_operator:n {#1}
+ }
+ \cdot
+}
+
+\cs_new_protected_nopar:Nn \moremath_curl_operator:n
+{
+ {
+ \moremath_gradient_operator:n {#1}
+ }
+ \times
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added functions.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \moremath_dalembert_operator:n
+% }
+% This function produces the \foreignlanguage{french}{d'Alembert} operator,
+% including an optional subscript.
+% The function takes one argument:
+% \begin{arguments}
+% \item A \meta{tl} with the contents of the subscript of the operator.
+%
+% This variable may be empty,
+% in this case no subscript (not even an empty one) is produced.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \moremath_dalembert_operator:n
+{
+ \@@_dalembert_operator_get:
+ \tl_if_empty:nF {#1}
+ {
+ \c_math_subscript_token {#1}
+ }
+}
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added new function \cs{moremath_dalembert_operator:n}.
+% }
+% \end{macro}
+%
+%
+% \subsection{Producing Delimited Vector Calculus Operators}
+% \label{sec:delim-vec-ops}
+%
+% \begin{macro}{
+% \moremath_delim_nabla_op_noscale:NNnn,
+% \moremath_delim_nabla_op_autoscale:NNnn
+% }
+% These functions produce a vector calculus operator with \meta{contents}
+% inside delimiters.
+% The "autoscale" variant scales the delimiters with the size of \meta{contents},
+% the "noscale" variant does no scaling at all.
+% \begin{arguments}
+% \item The \meta{csname} of the operator to use.
+%
+% This should have the same form as \cs{moremath_gradient_operator:n},
+% i.e.\ the function passed as \meta{csname} should accept one argument
+% to typeset as subscript.
+%
+% \item The \meta{csname} of the \emph{paired delimiter} to use.
+%
+% The paired delimiter has to be one declared using \pkg{mathtools}'
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter} command.
+%
+% \item A \meta{tl} with the subscript of the operator.
+%
+% \item A \meta{tl} with the contents to typeset inside the delimiters
+% \end{arguments}
+% We begin with the "noscale" version.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_noscale:NNnn
+{
+ #1 {#3} #2{#4}
+}
+% \end{macrocode}
+% Then we create the version with automatic scaling.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_autoscale:NNnn
+{
+ #1 {#3} #2 * {#4}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added "noscale" and "autoscale" functions.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \moremath_delim_nabla_op_manuscale:NNnnn
+% }
+% This function produces a vector calculus operator like
+% \cs{moremath_delim_nabla_op_noscale:NNnn}
+% and \cs{moremath_delim_nabla_op_autoscale:NNnn},
+% but with manual scaling.
+% It takes five arguments:
+% \begin{arguments}
+% \item The \meta{csname} of the operator to use.
+%
+% \item The \meta{csname} of the paired delimiter.
+%
+% \item A \meta{token~list} containing the \meta{scale~cmd} like
+% \cs{big}, \cs{Big}, \cs{bigg}, etc.
+%
+% \item A \meta{tl} with the subscript of the operator.
+%
+% \item A \meta{tl} with the contents to typeset inside the delimiters.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_manuscale:NNnnn
+{
+ #1 {#4} #2 [#3] {#5}
+}
+% \end{macrocode}
+% \begin{macro}{
+% \moremath_delim_nabla_op_manuscale:NNVnn
+% }
+% We also declare a variant for passing a variable with the \meta{scale~cmd}
+% instead of a \meta{token~list}.
+% \begin{macrocode}
+\cs_generate_variant:Nn \moremath_delim_nabla_op_manuscale:NNnnn {NNVnn}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Add variant.
+% }
+% \end{macro}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Add function.
+% }
+% \end{macro}
+%
+% To ease the definition of those macros we define a function for defining
+% the delimited versions.
+%
+% Of course we also need a way to declare a user interface for this functions.
+% For this purpose we first need some helpers for setting
+% necessary parameters.
+% \begin{macro}{\@@_parse_kv_args:nN}
+% This helper macro takes two arguments,
+% \begin{arguments}
+% \item A token list of the key-value arguments.
+% \item The \meta{csname} of a token list to put the scale value in.
+% \end{arguments}
+% The function sets the given keys but before it does so it searches for a
+% key named \verb|scale| and puts it into the second argument.
+% For this to work it is necessary that all values have \verb|=| in them.
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_parse_kv_args:nN
+{
+% \end{macrocode}
+% We first put the key-value arguments inside a property list.
+% Afterwards we check if the key \verb|scale| has been given.
+% If yes we pop it and assign it to the second argument.
+% Otherwise we do nothing.
+% \begin{macrocode}
+ \prop_set_from_keyval:Nn \l_tmpa_prop {#1}
+
+ \prop_pop:NnNT \l_tmpa_prop {scale} #2 {}
+
+ \keys_set:ne {moremath} {\prop_to_keyval:N \l_tmpa_prop}
+}
+% \end{macrocode}
+% \end{macro}
+%
+% We also need a warning message for conflicting arguments,
+% to inform the user that one of his options is going to be ignored.
+% \begin{macrocode}
+\msg_new:nnn { moremath } { vector-calc / scale-star-conflict }
+{
+ Both~star~and~scaling~factor~given~to~'#1'.\\
+ Automatic~scaling~will~be~preferred,~the~size~command~'#2'~will~be~
+ ignored~\msg_line_context:.
+}
+% \end{macrocode}
+%
+% \begin{macro}{
+% \@@_new_delim_nabla_doc_cmd:NNN,
+% \@@_new_delim_nabla_doc_cmd:cNN,
+% }
+% This function takes three arguments:
+% \begin{arguments}
+% \item The \meta{csname} of the to be defined command
+% \item The \meta{csname} of the operator to use.
+%
+% This should be a function like \cs{moremath_gradient_operator:n}.
+% \item The \meta{csname} of the delimiter function to use.
+%
+% This should be a macro/command created with \pkg{mathtools}
+% \cs[module=mathtools,replace=false]{DeclarePairedDelimiter} command.
+% \end{arguments}
+% Its purpose is to create a new document level command,
+% for the delimited vector calculus operators.
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_new_delim_nabla_doc_cmd:NNN
+{
+ \cs_if_free:NTF #1
+ {
+ \exp_args:NNe \NewDocumentCommand #1
+ {
+ s ={scale} o E{ \char_generate:nn {`_}{8} }{ {} } m
+ }
+ { % command code
+ \group_begin:
+ % optional arguments given?
+ \tl_if_novalue:nF {##2}
+ {
+ \@@_parse_kv_args:nN {##2} \l_tmpa_tl
+ }
+ % star given?
+ \bool_if:nTF {##1}
+ {
+ % scale factor given?
+ \tl_if_empty:NF \l_tmpa_tl
+ {
+ \msg_warning:nnnV { moremath } { vector-calc / scale-star-conflict }
+ {#1} \l_tmpa_tl
+ }
+ \moremath_delim_nabla_op_autoscale:NNnn #2 #3 {##3} {##4}
+ }{ % \bool_if:nTF {##1} FALSE BRANCH
+ % scale factor given?
+ \tl_if_empty:NTF \l_tmpa_tl
+ {
+ \moremath_delim_nabla_op_noscale:NNnn #2 #3 {##3} {##4}
+ }{ % FALSE BRANCH
+ \moremath_delim_nabla_op_manuscale:NNVnn #2 #3 \l_tmpa_tl {##3} {##4}
+ }
+ } % \bool_if:nTF {##1}
+ \group_end:
+ }
+ }{ % \cs_if_free:NTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { vector-calc / already-defined-skip } {#1}
+ } % \cs_if_free:NTF #1
+}
+%
+\cs_generate_variant:Nn \@@_new_delim_nabla_doc_cmd:NNN {cNN}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_new_nabla_doc_cmds:nN}
+% This internal function creates five different document level commands at once,
+% using \cs{@@_new_delim_nabla_doc_cmd:cNN}.
+% It takes two arguments:
+% \begin{arguments}
+% \item The a \meta{suffix~tl} for constructing the command names.
+%
+% The resulting commands will have the form \cs[no-index]{p\meta{suffix}},
+% \cs[no-index]{b\meta{suffix}}, \cs[no-index]{B\meta{suffix}},
+% \cs[no-index]{v\meta{suffix}} and \cs[no-index]{V\meta{suffix}}.
+%
+% \item The \meta{csname} of the operator to use
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_new_nabla_doc_cmds:nN
+{
+ \@@_new_delim_nabla_doc_cmd:cNN { p #1 } #2 \@@_inparent:w
+ \@@_new_delim_nabla_doc_cmd:cNN { b #1 } #2 \@@_inbrack:w
+ \@@_new_delim_nabla_doc_cmd:cNN { B #1 } #2 \@@_inbrace:w
+ \@@_new_delim_nabla_doc_cmd:cNN { v #1 } #2 \@@_in_vert:w
+ \@@_new_delim_nabla_doc_cmd:cNN { V #1 } #2 \@@_in_Vert:w
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Document Level Commands}
+% \label{sec:vec-doc-lvl-commands}
+%
+% The predefined macros for vector calculus are also guarded by a package
+% option to be conditionally disabled by the user.
+% \begin{macrocode}
+\bool_if:NTF \l_@@_predef_vector_op_bool
+{
+% \end{macrocode}
+% \subsubsection{Standalone Operators}
+% \label{par:impl-vector-calc-standalone}
+% The user might want to use also a non-delimited version
+% of the vector calculus operators,
+% we provide them with a standalone version of those.
+%
+% As the definition of a new document command can fail if the \meta{csname}
+% clashes with some already defined macro,
+% we define an error message to use when defining document level commands.
+% \begin{macrocode}
+\msg_new:nnn { moremath } { vector-calc / already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~\msg_line_context:.
+}
+% \end{macrocode}
+%
+% \begin{macro}{
+% \grad,
+% \divergence,
+% \curl,
+% \laplacian
+% }
+% Now we provide the user with document level commands for
+% \cs[no-index]{moremath_\meta{op}_operator:n}.
+% \begin{macrocode}
+\cs_if_free:NTF \grad
+{
+ \exp_args:NNe \NewDocumentCommand \grad { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_gradient_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip } {\grad}
+}
+
+\cs_if_free:NTF \divergence
+{
+ \exp_args:NNe \NewDocumentCommand \divergence
+ { !o E{ \char_generate:nn {`_} {8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_divergence_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip } {\divergence}
+}
+
+\cs_if_free:NTF \curl
+{
+ \exp_args:NNe \NewDocumentCommand \curl
+ { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_curl_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} {vector-calc / already-defined-skip} {\curl}
+}
+
+\cs_if_free:NTF \laplacian
+{
+ \exp_args:NNe \NewDocumentCommand \laplacian
+ { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_laplace_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip }
+ {\laplacian}
+}
+% \end{macrocode}
+% \begin{macro}{\quabla}
+% We now also define a command to use as a standalone
+% \foreignlanguage{french}{d'Alembert} operator.
+% As the name \cs[no-index]{dalembertian} is a bit cumbersome to type out,
+% I've decided to use one of its alternate names \cs{quabla}
+% \begin{macrocode}
+\cs_if_free:NTF \quabla
+{
+ \exp_args:NNe \NewDocumentCommand \quabla
+ { !o E{ \char_generate:nn {`_} { 8 } }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath } {#1}
+ }
+ \moremath_dalembert_operator:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \quabla FALSE BRANCH
+ \msg_warning:nnn { moremath } { vector-calc / already-defined-skip }
+ {\quabla}
+}
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{
+% Added \cs{quabla} command.
+% }
+% \changes{v0.3.0}{\GetVersionDate{v0.3.0}}{
+% Changed: Spaces between the \meta{csname}
+% and the optional argument are now disallowed.
+% }
+% \end{macro}^^X \quabla
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added \cs{grad}, \cs{divergence}, \cs{curl} and \cs{laplacian}
+% commands.
+% }
+% \changes{v0.3.0}{\GetVersionDate{v0.3.0}}{
+% Changed: Spaces between the \meta{csname}
+% and the optional argument are now disallowed
+% for \cs{grad}, \cs{divergence}, \cs{curl} and \cs{laplacian}.
+% }
+% \end{macro}
+%
+% \subsubsection{Operators with Delimiters}
+% \label{par:impl-vec-calc-op-delim}
+%
+% \begin{macro}{
+% \pgrad,
+% \bgrad,
+% \Bgrad,
+% \vgrad,
+% \Vgrad,
+% }
+% Now lets declare the delimited gradient operators.
+% We provide five versions using parenthesis, brackets, braces, single \tn{vert},
+% and double \tn{Vert}.
+% \begin{macrocode}
+\@@_new_nabla_doc_cmds:nN {grad} \moremath_gradient_operator:n
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added commands for delimited gradient operators.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \pdiv,
+% \bdiv,
+% \Bdiv,
+% \vdiv,
+% \Vdiv
+% }
+% Now we do the same for the divergence operator.
+% \begin{macrocode}
+\@@_new_nabla_doc_cmds:nN {div} \moremath_divergence_operator:n
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added commands for delimited divergence operators.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \pcurl,
+% \bcurl,
+% \Bcurl,
+% \vcurl,
+% \Vcurl
+% }
+% Now to the curl macros.
+% \begin{macrocode}
+\@@_new_nabla_doc_cmds:nN {curl} \moremath_curl_operator:n
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added commands for delimited curl operators.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \plaplacian,
+% \blaplacian,
+% \Blaplacian,
+% \vlaplacian,
+% \Vlaplacian
+% }
+% Next we take care of the laplacian
+% \begin{macrocode}
+\@@_new_nabla_doc_cmds:nN {laplacian} \moremath_laplace_operator:n
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added commands for delimited Laplace operators.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \pquabla,
+% \bquabla,
+% \Bquabla,
+% \vquabla,
+% \Vquabla
+% }
+% Finally we define delimited commands for the
+% \foreignlanguage{french}{d'Alembert} operator.
+% \begin{macrocode}
+\@@_new_nabla_doc_cmds:nN {quabla} \moremath_dalembert_operator:n
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{
+% Added commands for a delimited \foreignlanguage{french}{d'Alembert}
+% operator.
+% }
+% \end{macro}
+%
+% If the user issued \texttt{no-vector} as a package loading option,
+% write this to the log file.
+% \begin{macrocode}
+}{ % IF NOT \l_@@_predef_vector_op_bool
+ \msg_info:nnnn {moremath} { load /disabling } {no-vector}
+ {
+ predefined~vector~calculus~macros
+ }
+} % END \l_@@_predef_vector_op_bool
+% \end{macrocode}
+%
+% \section{Macros Producing Matrices and Vectors}
+% \label{sec:impl-matr-vec}
+%
+% \subsection{Producing Row and Column Vectors}
+%
+% The functions in this section are used to generate row and column vectors
+% utilizing \pkg{mathtools}~\autocite{mathtools} \env{matrix*} and
+% \env{smallmatrix*} environments.
+%
+% \begin{variable}{\l_@@_vector_entries_seq}
+% For generating row or column vectors it is necessary to store the entries
+% inside a variable. \cs{l_@@_vector_entries_seq} is used for this purpose.
+% \begin{macrocode}
+\seq_new:N \l_@@_vector_entries_seq
+% \end{macrocode}
+% \end{variable}
+%
+% Then we need a function for formatting the actual entries of the vector.
+% We need two version one for the row vector and one for the column vector
+% version.
+% \begin{macro}{
+% \@@_seq_to_column_vector:N,
+% \@@_seq_to_row_vector:N
+% }
+% These functions take one argument
+% \begin{arguments}
+% \item A sequence which should be converted to the contents of the single
+% column/row matrix.
+% \end{arguments}
+% They format the input suitable to be put inside a \env{matrix*} environment.
+% We begin with the column vector version.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \@@_seq_to_column_vector:N
+{
+ \seq_use:Nn #1 {\\}
+}
+% \end{macrocode}
+% Then we get to the row vector.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \@@_seq_to_row_vector:N
+{
+ \seq_use:Nn #1 {&}
+}
+% \end{macrocode}
+% \end{macro}
+%
+% In the next step we construct the single row/column matrix from the user
+% provided input.
+% \begin{macro}{
+% \moremath_column_vector:nn,
+% \moremath_row_vector:nn,
+% }
+% The two commands \cs{moremath_column_vector:n} and \cs{moremath_row_vector:n}
+% construct the matrix, they both take two arguments.
+% \begin{arguments}
+% \item The delimiter specifier.
+%
+% This should be one of the prefixes of the \env{\meta{prefix}matrix*},
+% environments.
+%
+% Another possibility is to issue |small| as this parameter to get
+% an inline matrix.
+%
+% \item The comma separated contents of the matrix.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_column_vector:nn
+{
+ \seq_clear:N \l_@@_vector_entries_seq
+ \seq_set_from_clist:Nn \l_@@_vector_entries_seq {#2}
+
+ \exp_args:NnNV \begin{#1 matrix*} [ \l_@@_matrix_align_tl ]
+ \@@_seq_to_column_vector:N \l_@@_vector_entries_seq
+ \end{#1 matrix*}
+}
+
+\cs_new_protected_nopar:Nn \moremath_row_vector:nn
+{
+ \seq_clear:N \l_@@_vector_entries_seq
+ \seq_set_from_clist:Nn \l_@@_vector_entries_seq {#2}
+
+ \exp_args:NnNV \begin{#1matrix*} [ \l_@@_matrix_align_tl ]
+ \@@_seq_to_row_vector:N \l_@@_vector_entries_seq
+ \end{#1matrix*}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added functions producing row- and column vectors.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \moremath_column_smallvector:nn,
+% \moremath_row_smallvector:nn
+% }
+% To make the code more readable, we define functions specifically for
+% creating row and column vectors using the \env{smallmatrix*} family of
+% environments. These functions take the same arguments as the non-small
+% versions above.
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_column_smallvector:nn
+{
+ \moremath_column_vector:nn {#1 small} {#2}
+}
+
+\cs_new_protected_nopar:Nn \moremath_row_smallvector:nn
+{
+ \moremath_row_vector:nn {#1 small} {#2}
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added functions producing inline math row- and column vectors.
+% }
+% \end{macro}
+%
+% ^^X SUBSECTION: Shorthands for simple matrices
+% \subsection{Shorthands for Simple Matrices}
+% \label{sec:impl-matr-shorth}
+%
+% The construction of several simple matrices like diagonal matrices,
+% can be simplified as there is no need to use the \env{matrix} environment.\footnote{%
+% The code in this section is heavily inspired by the following answer on
+% \TeX{}SE: \url{https://tex.stackexchange.com/a/539741}
+% }
+%
+% \begin{variable}{
+% \l_@@_mat_diag_entries_seq,
+% \l_@@_mat_row_entries_seq,
+% }
+% We construct the matrices row by row, therefore we need to store the
+% currently constructed row inside a variable.
+% The same is true for the diagonal entries which also need to be stored
+% somewhere.
+% We therefore declare two sequence variables \cs{l_@@_mat_diag_entries_seq}
+% and \cs{l_@@_mat_row_seq} for this purpose
+% \begin{macrocode}
+\seq_clear_new:N \l_@@_mat_diag_entries_seq
+\seq_clear_new:N \l_@@_mat_row_entries_seq
+% \end{macrocode}
+% \end{variable}
+%
+% \subsubsection{(Anti-)diagonal matrices}
+% We split the construction of the matrix into multiple parts,
+% utilizing internal helper functions.
+% \begin{macro}{
+% \@@_constr_diagmat_row:n,
+% \@@_constr_antidiagmat_row:n
+% }
+% \cs{@@_constr_diagmat_row:n} and \cs{@@_constr_antidiagmat_row:n}
+% take one integer argument:
+% \begin{arguments}
+% \item The number of the current row.
+% \end{arguments}
+% They both construct a matrix row and place it inside the input stream.
+% They take the content of the (anti-)diagonal from the variable
+% \cs{l_@@_mat_diag_entries_seq}
+% and use the variable \cs{l_@@_mat_row_entries_seq}
+% to store the current row.
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_constr_diagmat_row:n
+{
+ \seq_clear:N \l_@@_mat_row_entries_seq
+% \end{macrocode}
+% As all diagonal matrices \(M \in A^{m \times n}\), where \(A\) is a field,
+% are quadratic i.e.\ \(A^{m \times n} \equiv A^{n \times n}\) the length of the
+% diagonal sequence equals the number of rows and columns of the matrix.
+% We exploit this fact here.
+% \begin{macrocode}
+ \int_step_inline:nn {\seq_count:N \l_@@_mat_diag_entries_seq}
+ {
+ \int_compare:nTF { #1 == ##1 }
+ {
+ \seq_put_right:Nx \l_@@_mat_row_entries_seq
+ {
+ \seq_item:Nn \l_@@_mat_diag_entries_seq { #1 }
+ }
+ }{ % false branch
+ \seq_put_right:NV \l_@@_mat_row_entries_seq \l_@@_matrix_fill_tl
+ } % \int_compare:nTF { #1 == ##1 }
+ }
+ \seq_use:Nn \l_@@_mat_row_entries_seq { & } \\
+}
+
+% Anti-diagonal version
+\cs_new_protected:Nn \@@_constr_antidiagmat_row:n
+{
+ \seq_clear:N \l_@@_mat_row_entries_seq
+ \int_step_inline:nn {\seq_count:N \l_@@_mat_diag_entries_seq}
+ {
+ \int_compare:nTF { #1 == ##1 }
+ {
+ % as this is a anti diagonal matrix we put in the elements from the
+ % left so that the first entry is the right most entry
+ \seq_put_left:Nx \l_@@_mat_row_entries_seq
+ {
+ \seq_item:Nn \l_@@_mat_diag_entries_seq { #1 }
+ }
+ }{ % false branch
+ \seq_put_left:NV \l_@@_mat_row_entries_seq \l_@@_matrix_fill_tl
+ } % \int_compare:nTF { #1 == ##1 }
+ }
+ \seq_use:Nn \l_@@_mat_row_entries_seq { & } \\
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \moremath_diagonal_matrix:nn,
+% \moremath_antidiagonal_matrix:nn,
+% \moremath_diagonal_smallmatrix:nn,
+% \moremath_antidiagonal_smallmatrix:nn,
+% }
+% The \cs[no-index]{moremath_\meta{a or d}_matrix:nn} and
+% \cs[no-index]{moremath_\meta{a or d}_smallmatrix:nn} family of functions
+% produce a matrix based on \pkg{mathtools}~\autocite{mathtools}
+% \env{matrix*} environment.
+% The functions take two arguments.
+% \begin{arguments}
+% \item The delimiter specifier.
+%
+% This should be one of the prefixes of the \env{\meta{prefix}matrix*}
+% environments.
+%
+% \item The comma separated contents of the (anti-)diagonal.
+% \end{arguments}
+% These functions also use the values of the variables
+% \cs{l_@@_matrix_fill_tl} and \cs{l_@@_matrix_align_tl}.
+% And modifies the variable \cs{l_@@_mat_diag_entries_seq}.
+% \begin{macrocode}
+\cs_new_protected:Nn \moremath_diagonal_matrix:nn
+{
+ \seq_set_from_clist:Nn \l_@@_mat_diag_entries_seq { #2 }
+ \exp_args:NnNV \begin{#1 matrix*} [ \l_@@_matrix_align_tl ]
+ \int_step_function:nN { \seq_count:N \l_@@_mat_diag_entries_seq }
+ \@@_constr_diagmat_row:n
+ \end{#1 matrix*}
+}
+
+% Anti-diagonal matrix
+\cs_new_protected:Nn \moremath_antidiagonal_matrix:nn
+{
+ \seq_set_from_clist:Nn \l_@@_mat_diag_entries_seq { #2 }
+ \exp_args:NnNV \begin{ #1 matrix* } [ \l_@@_matrix_align_tl ]
+ \int_step_function:nN { \seq_count:N \l_@@_mat_diag_entries_seq }
+ \@@_constr_antidiagmat_row:n
+ \end{ #1 matrix* }
+}
+
+% Small versions
+\cs_new_protected:Nn \moremath_diagonal_smallmatrix:nn
+{
+ \moremath_diagonal_matrix:nn {#1 small} {#2}
+}
+
+\cs_new_protected:Nn \moremath_antidiagonal_smallmatrix:nn
+{
+ \moremath_antidiagonal_matrix:nn {#1 small} {#2}
+}
+% \end{macrocode}
+% \begin{macro}{
+% \moremath_diagonal_matrix:nV,
+% \moremath_diagonal_matrix:Vn,
+% \moremath_diagonal_matrix:VV,
+% \moremath_antidiagonal_matrix:nV,
+% \moremath_antidiagonal_matrix:Vn,
+% \moremath_antidiagonal_matrix:VV,
+% \moremath_diagonal_smallmatrix:nV,
+% \moremath_diagonal_smallmatrix:Vn,
+% \moremath_diagonal_smallmatrix:VV,
+% \moremath_antidiagonal_smallmatrix:nV,
+% \moremath_antidiagonal_smallmatrix:Vn,
+% \moremath_antidiagonal_smallmatrix:VV,
+% }
+% For convenience we also define some variants of the above functions.
+% \begin{macrocode}
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { n V }
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V n }
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V V }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { n V }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V n }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V V }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { n V }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V n }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V V }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { n V }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V n }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V V }
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{Added variants.}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{Added "nV" and "VV" variants.}
+% \end{macro}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added functions producing (anti-)diagonal matrices.
+% Also added versions for inline math.
+% }
+% \end{macro}
+%
+%
+% \subsubsection{Identity Matrices}
+% As we already have functions available for producing diagonal matrices,
+% it makes only sense to also provide a shorthand for producing an identity matrix,
+% i.e.\ a diagonal matrix with \enquote{1} along the diagonal.
+%
+%
+% \begin{macro}{
+% \@@_generate_one_filled_clist:Nn
+% }
+% The function \cs{@@_generate_one_filled_clist:Nn} produces a \meta{clist},
+% consisting only of \enquote{1} as entries.
+% This function takes two arguments:
+% \begin{arguments}
+% \item The \emph{csname} of a \meta{clist~var} to store the \meta{clist}
+% into.
+%
+% \item An \meta{int} to represent the number of entries to produce.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \@@_generate_one_filled_clist:Nn
+{
+ \seq_clear:N \l_tmpa_seq
+ \int_step_inline:nn {#2}
+ {
+ \seq_put_right:NV \l_tmpa_seq \c_one_int
+ }
+ \clist_set_from_seq:NN #1 \l_tmpa_seq
+}
+% \end{macrocode}
+% \begin{macro}{
+% \@@_generate_one_filled_clist:NV
+% }
+% We also define a variant accepting an integer variable.
+% \begin{macrocode}
+\cs_generate_variant:Nn \@@_generate_one_filled_clist:Nn { N V }
+% \end{macrocode}
+% \end{macro}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added function.
+% }
+% \end{macro}
+%
+% \begin{variable}{
+% \l_@@_id_entries_clist
+% }
+% As we want to utilize the \cs{moremath_diagonal_matrix:VV} and
+% \cs{moremath_diagonal_smallmatrix:VV} functions for creating the identity
+% matrix we declare an internal \meta{clist~var} called
+% \cs{l_@@_id_entries_clist} for passing the \meta{clist} around.
+% \begin{macrocode}
+\clist_new:N \l_@@_id_entries_clist
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{Added variable.}
+% \end{variable}
+%
+% \begin{macro}{
+% \moremath_id_matrix:n,
+% \moremath_id_smallmatrix:n
+% }
+% These functions are intended to produce an identity matrix from an integer
+% expression.
+% They take one argument.
+% \begin{arguments}
+% \item The number of diagonal entries.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_id_matrix:n
+{
+ \clist_clear:N \l_@@_id_entries_clist
+ \@@_generate_one_filled_clist:Nn \l_@@_id_entries_clist {#1}
+ \moremath_diagonal_matrix:VV \l_@@_matrix_delim_tl \l_@@_id_entries_clist
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected_nopar:Nn \moremath_id_smallmatrix:n
+{
+ \clist_clear:N \l_@@_id_entries_clist
+ \@@_generate_one_filled_clist:Nn \l_@@_id_entries_clist {#1}
+ \moremath_diagonal_smallmatrix:VV \l_@@_matrix_delim_tl \l_@@_id_entries_clist
+}
+% \end{macrocode}
+%
+% \begin{macro}{
+% \moremath_id_matrix:V,
+% \moremath_id_smallmatrix:V
+% }
+% We also provide variants, which accepts a "V"-type argument:
+% \begin{macrocode}
+\cs_generate_variant:Nn \moremath_id_matrix:n { V }
+\cs_generate_variant:Nn \moremath_id_smallmatrix:n { V }
+% \end{macrocode}
+% \end{macro}
+%
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added functions \cs{moremath_id_matrix:n} and \cs{moremath_id_smallmatrix:n}
+% and variants.
+% }
+% \end{macro}
+%
+% \subsection{Document Level Commands}
+% \label{sec:mat-doc-lvl-cmds}
+%
+% Now we define document level commands for the previously defined
+% functions.
+%
+% But before we do so we define a message to be issued in case the targeted
+% \meta{csname} is already defined elsewhere.
+% \begin{macrocode}
+\msg_new:nnnn { moremath } { matrix / already-defined-doc-cmd-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~\msg_line_context:.
+}
+{
+ The~control~sequence~'#1'~has~already\\
+ been~defined~by~some~other~package.\\
+ And~I~am~refusing~to~overwrite~the~existing~definition,\\
+ therefore~I~am~skipping~the~definition~of~this~command.
+}
+% \end{macrocode}
+%
+% \subsubsection{Row and Column Vectors}
+% We begin with the row and column vector functions.
+% As with the other document level commands, we guard the definitions
+% with a key value option, so that the user can disable them.
+% \begin{macrocode}
+\bool_if:nTF \l_@@_predef_crvector_bool
+{
+% \end{macrocode}
+% \begin{macro}{
+% \cvector,
+% \rvector,
+% \smallcvector,
+% \smallrvector
+% }
+% First we define the document level command for the bare column vector
+% \begin{macrocode}
+\cs_if_free:NTF \cvector
+{
+ \NewDocumentCommand \cvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_column_vector:nn {\l_@@_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % issue a warning message if the csname is already taken.
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \cvector
+ }
+} % \cs_if_free:NTF \cvector
+% \end{macrocode}
+% and the row vector.
+% \begin{macrocode}
+\cs_if_free:NTF \rvector
+{
+ \NewDocumentCommand \rvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_row_vector:nn {\l_@@_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % warn if csname is already taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip}
+ {
+ \rvector
+ }
+} % \cs_if_free:NTF \rvector
+% \end{macrocode}
+% Then we define the smaller inline versions of those commands.
+% \begin{macrocode}
+\cs_if_free:NTF \smallcvector
+{
+ \NewDocumentCommand \smallcvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath / matrix} {#1}
+ }
+ \moremath_column_smallvector:nn {\l_@@_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % Issue a warning message if the csname is already taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallcvector
+ }
+} % \cs_if_free:NTF \smallcvector
+
+\cs_if_free:NTF \smallrvector
+{
+ \NewDocumentCommand \smallrvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_row_smallvector:nn {\l_@@_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % warn if csname is taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallrvector
+ }
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added commands producing row and column vectors,
+% including inline math versions.
+% }
+% \end{macro}
+%
+% \paragraph{Commands with Pre-defined Delimiters}
+% Next we define several shorthands to for the commonly used delimiters,
+% to avoid code duplication, we first create some helper functions which
+% define those functions.
+% \begin{macro}{
+% \@@_new_vector_shorth_doc_cmd:NNn
+% }
+% The function \cs{@@_new_vector_shorth_doc_cmd} creates a new vector shorthand,
+% command. It takes three arguments:
+% \begin{arguments}
+% \item The \meta{csname} to be defined.
+% \item The \meta{function} to use for this shorthand.
+%
+% This should be one of the
+% \cs[no-index]{moremath_\meta{type}_\meta{size}vector:nn}
+% like commands.
+%
+% \item The \meta{delimiter} to use.
+%
+% Usually one of |p|, |b|, |B|, |v|, |V|.
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_new_vector_shorth_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ % set the delimiter key pre-set for this function
+ \keys_set:nn {moremath / matrix } {delimiter = #3}
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn {moremath / matrix } {##1}
+ }
+ #2 {\l_@@_matrix_delim_tl} {##2}
+ \group_end:
+ }
+ }{
+ % warn if csname is taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ #1
+ }
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \pcvector,
+% \bcvector,
+% \Bcvector,
+% \vcvector,
+% \Vcvector,
+% \prvector,
+% \brvector,
+% \Brvector,
+% \vrvector,
+% \Vrvector,
+% }
+% Now we define shorthands for all of the matrix types so that the user
+% does not have to specify |delimiter=|\meta{delim} every time.
+% We begin with the column vector.
+% \begin{macrocode}
+% parenthesis
+\@@_new_vector_shorth_doc_cmd:NNn \pcvector \moremath_column_vector:nn {p}
+% brackets
+\@@_new_vector_shorth_doc_cmd:NNn \bcvector \moremath_column_vector:nn {b}
+% braces
+\@@_new_vector_shorth_doc_cmd:NNn \Bcvector \moremath_column_vector:nn {B}
+% single vert
+\@@_new_vector_shorth_doc_cmd:NNn \vcvector \moremath_column_vector:nn {v}
+% double vert
+\@@_new_vector_shorth_doc_cmd:NNn \Vcvector \moremath_column_vector:nn {V}
+% \end{macrocode}
+% Now to the row vectors.
+% \begin{macrocode}
+% parenthesis
+\@@_new_vector_shorth_doc_cmd:NNn \prvector \moremath_row_vector:nn {p}
+% brackets
+\@@_new_vector_shorth_doc_cmd:NNn \brvector \moremath_row_vector:nn {b}
+% braces
+\@@_new_vector_shorth_doc_cmd:NNn \Brvector \moremath_row_vector:nn {B}
+% single vert
+\@@_new_vector_shorth_doc_cmd:NNn \vrvector \moremath_row_vector:nn {v}
+% double vert
+\@@_new_vector_shorth_doc_cmd:NNn \Vrvector \moremath_row_vector:nn {V}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added commands for row and column vectors with predefined delimiters.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \psmallcvector,
+% \bsmallcvector,
+% \Bsmallcvector,
+% \vsmallcvector,
+% \Vsmallcvector,
+% \psmallrvector,
+% \bsmallrvector,
+% \Bsmallrvector,
+% \vsmallrvector,
+% \Vsmallrvector
+% }
+% We also define shorthands for the \cs{shortcvector} and \cs{shortrvector}
+% versions.
+% \begin{macrocode}
+% column vectors
+% parenthesis
+\@@_new_vector_shorth_doc_cmd:NNn \psmallcvector \moremath_column_smallvector:nn
+ {p}
+% brackets
+\@@_new_vector_shorth_doc_cmd:NNn \bsmallcvector \moremath_column_smallvector:nn
+ {b}
+% braces
+\@@_new_vector_shorth_doc_cmd:NNn \Bsmallcvector \moremath_column_smallvector:nn
+ {B}
+% single vert
+\@@_new_vector_shorth_doc_cmd:NNn \vsmallcvector \moremath_column_smallvector:nn
+ {v}
+% double vert
+\@@_new_vector_shorth_doc_cmd:NNn \Vsmallcvector \moremath_column_smallvector:nn
+ {V}
+%
+% row vectors
+% parenthesis
+\@@_new_vector_shorth_doc_cmd:NNn \psmallrvector \moremath_row_smallvector:nn {p}
+% brackets
+\@@_new_vector_shorth_doc_cmd:NNn \bsmallrvector \moremath_row_smallvector:nn {b}
+% braces
+\@@_new_vector_shorth_doc_cmd:NNn \Bsmallrvector \moremath_row_smallvector:nn {B}
+% single vert
+\@@_new_vector_shorth_doc_cmd:NNn \vsmallrvector \moremath_row_smallvector:nn {v}
+% double vert
+\@@_new_vector_shorth_doc_cmd:NNn \Vsmallrvector \moremath_row_smallvector:nn {V}
+
+
+}{ % \bool_if:nTF \l_@@_predef_crvector_bool FALSE PATH
+ \msg_info:nnnn {moremath} {load / disabling} {no-crvector}
+ {
+ commands~producing~row~and~column~vectors
+ }
+} % \bool_if:nTF \l_@@_predef_crvector_bool
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added commands for inline math row and column vectors
+% with predefined delimiters.
+% }
+% \end{macro}
+%
+%
+% \subsubsection{(Anti-)diagonal Matrices}
+% Now to the (anti-)diagonal matrix shorthands,
+% these are also guarded by a key value option.
+% \begin{macrocode}
+\bool_if:nTF \l_@@_predef_matrix_bool
+{
+% \end{macrocode}
+% \begin{macro}{
+% \diagmat,
+% \antidiagmat,
+% \smalldiagmat,
+% \smallantidiagmat,
+% }
+% \begin{NOTE}{MI}
+% Say something like we begin with some commands producing a matrix that
+% is not necessarily delimited.
+% \end{NOTE}
+% \begin{macrocode}
+\cs_if_free:NTF \diagmat
+{
+ \NewDocumentCommand \diagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_diagonal_matrix:Vn \l_@@_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} {matrix / already-defined-doc-cmd-skip}
+ {
+ \diagmat
+ }
+} % \cs_if_free:nTF \diagmat
+
+\cs_if_free:NTF \antidiagmat
+{
+ \NewDocumentCommand \antidiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_antidiagonal_matrix:Vn \l_@@_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \antidiagmat
+ }
+} % \cs_if_free:nTF \antidiagmat
+
+\cs_if_free:NTF \smalldiagmat
+{
+ \NewDocumentCommand \smalldiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_diagonal_smallmatrix:Vn \l_@@_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smalldiagmat
+ }
+}
+
+\cs_if_free:NTF \smallantidiagmat
+{
+ \NewDocumentCommand \smallantidiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_antidiagonal_smallmatrix:Vn \l_@@_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallantidiagmat
+ }
+}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added commands producing (anti-)diagonal matrices, including inline math
+% versions.
+% }
+% \end{macro}
+%
+% \paragraph{(Anti-)diagonal Matrices with Pre-defined Delimiters}
+% As it is sort of cumbersome to always specify the delimiter key,
+% we also provide commands with pre-defined delimiters.
+% \begin{macro}{
+% \@@_new_matrix_shorth_doc_cmd:NNn
+% }
+% To provide several shorthands for delimited matrices,
+% we use a helper function to avoid code duplication.
+% \cs{@@_new_matrix_shorth_doc_cmd:NNn} takes three arguments:
+% \begin{arguments}
+% \item The \meta{csname} to define
+% \item The \meta{csname} of the matrix function to use,
+% which should have the signature |Vn|.
+% \item The \enquote{predefined} delimiter of this version
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_new_matrix_shorth_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ \tl_if_empty:nF {#3}
+ {
+ \keys_set:nn { moremath / matrix }
+ {
+ delimiter = #3
+ }
+ } % \tl_if_empty:nF {#3}
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn { moremath / matrix } {##1}
+ }
+ #2 \l_@@_matrix_delim_tl {##2}
+ \group_end:
+ }
+ }{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ #1
+ }
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% We now define the shorthand commands with predefined delimiters.
+% \begin{macro}{
+% \pdiagmat,
+% \bdiagmat,
+% \Bdiagmat,
+% \vdiagmat,
+% \Vdiagmat,
+% }
+% We begin with the regular diagonal matrix
+% \begin{macrocode}
+\@@_new_matrix_shorth_doc_cmd:NNn \pdiagmat \moremath_diagonal_matrix:Vn {p}
+\@@_new_matrix_shorth_doc_cmd:NNn \bdiagmat \moremath_diagonal_matrix:Vn {b}
+\@@_new_matrix_shorth_doc_cmd:NNn \Bdiagmat \moremath_diagonal_matrix:Vn {B}
+\@@_new_matrix_shorth_doc_cmd:NNn \vdiagmat \moremath_diagonal_matrix:Vn {v}
+\@@_new_matrix_shorth_doc_cmd:NNn \Vdiagmat \moremath_diagonal_matrix:Vn {V}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added commands for delimited diagonal matrices.
+% }
+% \end{macro}
+% \begin{macro}{
+% \pantidiagmat,
+% \bantidiagmat,
+% \Bantidiagmat,
+% \vantidiagmat,
+% \Vantidiagmat,
+% }
+% Now for the anti-diagonal matrix commands.
+% \begin{macrocode}
+\@@_new_matrix_shorth_doc_cmd:NNn \pantidiagmat
+ \moremath_antidiagonal_matrix:Vn {p}
+\@@_new_matrix_shorth_doc_cmd:NNn \bantidiagmat
+ \moremath_antidiagonal_matrix:Vn {b}
+\@@_new_matrix_shorth_doc_cmd:NNn \Bantidiagmat
+ \moremath_antidiagonal_matrix:Vn {B}
+\@@_new_matrix_shorth_doc_cmd:NNn \vantidiagmat
+ \moremath_antidiagonal_matrix:Vn {v}
+\@@_new_matrix_shorth_doc_cmd:NNn \Vantidiagmat
+ \moremath_antidiagonal_matrix:Vn {V}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added commands for delimited antidiagonal matrices.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \psmalldiagmat,
+% \bsmalldiagmat,
+% \Bsmalldiagmat,
+% \vsmalldiagmat,
+% \Vsmalldiagmat,
+% }
+% We continue with the inline math versions based on the \env{smallmatrix*}
+% environment.
+% \begin{macrocode}
+\@@_new_matrix_shorth_doc_cmd:NNn \psmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {p}
+\@@_new_matrix_shorth_doc_cmd:NNn \bsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {b}
+\@@_new_matrix_shorth_doc_cmd:NNn \Bsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {B}
+\@@_new_matrix_shorth_doc_cmd:NNn \vsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {v}
+\@@_new_matrix_shorth_doc_cmd:NNn \Vsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {V}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added commands for delimited diagonal matrices suitable for inline math.
+% }
+% \end{macro}
+% \begin{macro}{
+% \psmallantidiagmat,
+% \bsmallantidiagmat,
+% \Bsmallantidiagmat,
+% \vsmallantidiagmat,
+% \Vsmallantidiagmat,
+% }
+% We provide also anti-diagonal versions of the small matrices.
+% \begin{macrocode}
+\@@_new_matrix_shorth_doc_cmd:NNn \psmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {p}
+\@@_new_matrix_shorth_doc_cmd:NNn \bsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {b}
+\@@_new_matrix_shorth_doc_cmd:NNn \Bsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {B}
+\@@_new_matrix_shorth_doc_cmd:NNn \vsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {v}
+\@@_new_matrix_shorth_doc_cmd:NNn \Vsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {V}
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{
+% Added commands for delimited anti-diagonal matrices suitable for inline math.
+% }
+% \end{macro}
+%
+% \subsubsection{Identity Matrices}
+% We also provide document level commands for producing an identity matrix.
+% These commands are also guarded by the same variable as the other matrix commands
+% (\cs{l_@@_predef_matrix_bool}).
+%
+% \begin{macro}{
+% \idmat,
+% \smallidmat,
+% }
+% We provide two document level commands for producing the identiy matrix,
+% one for inline math mode and one for display math mode.
+%
+% We start with the display math mode version.
+% \begin{macrocode}
+\cs_if_free:NTF \idmat
+{
+ \NewDocumentCommand \idmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_id_matrix:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \idmat FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {\idmat}
+}
+% \end{macrocode}
+% Afterwards we continue with the inline math mode version.
+% \begin{macrocode}
+\cs_if_free:NTF \smallidmat
+{
+ \NewDocumentCommand \smallidmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_id_smallmatrix:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \smallidmat FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {\smallidmat}
+}
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added \cs{idmat} and \cs{smallidmat} document level commands.
+% }
+% \end{macro}
+%
+% \paragraph{Identity Matrices with Pre-defined Delimiters}
+% We also define shorthands for the commonly used delimiters around matrices,
+% to avoid code duplication, we first declare a helper function for this.
+% \begin{macro}{
+% \@@_new_id_matrix_doc_cmd:NNn
+% }
+% This function creates a new document level command for an identity matrix like
+% command.
+% It allows pre-setting \meta{kv~opts}.
+% The function takes three arguments.
+% \begin{arguments}
+% \item The \meta{csname} of the document level command to define
+%
+% \item The \meta{csname} of the function to use
+%
+% This is indented to be one of \cs{moremath_id_matrix:n} or
+% \cs{moremath_id_smallmatrix:n}
+%
+% \item \meta{kv~opts} to preset in the "moremath / matrix" namespace
+% for this command
+%
+% This is meant to be used for pre-setting the key "delimiter".
+% \end{arguments}
+% \begin{macrocode}
+\cs_new_protected:Nn \@@_new_id_matrix_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ \tl_if_empty:nF {#3}
+ {
+ \keys_set:nn { moremath / matrix } {#3}
+ }
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn { moremath / matrix } {##1}
+ }
+ #2 {##2}
+ \group_end:
+ }
+ }{ % \cs_if_free:NTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {#1}
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \pidmat,
+% \bidmat,
+% \Bidmat,
+% \vidmat,
+% \Vidmat
+% }
+% We begin with the display math versions,
+% starting with the version delimited by parenthesis,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \pidmat \moremath_id_matrix:n { delimiter = p }
+% \end{macrocode}
+% continue with the bracketed version,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \bidmat \moremath_id_matrix:n { delimiter = b }
+% \end{macrocode}
+% the version using braces,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \Bidmat \moremath_id_matrix:n { delimiter = B }
+% \end{macrocode}
+% single vertical lines,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \vidmat \moremath_id_matrix:n { delimiter = v }
+% \end{macrocode}
+% and finally double vertical lines.
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \Vidmat \moremath_id_matrix:n { delimiter = V }
+% \end{macrocode}
+%
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{
+% Added document level commands \cs{pidmat}, \cs{bidmat}, \cs{Bidmat},
+% \cs{vidmat}, and \cs{Vidmat}.
+% }
+% \end{macro}
+%
+% \begin{macro}{
+% \psmallidmat,
+% \bsmallidmat,
+% \Bsmallidmat,
+% \vsmallidmat,
+% \Vsmallidmat,
+% }
+% Now we also define shorthands for inline math mode.
+% We start again defining the version using parenthesis,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \psmallidmat \moremath_id_smallmatrix:n
+ { delimiter = p }
+% \end{macrocode}
+% then brackets,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \bsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = b }
+% \end{macrocode}
+% then braces,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \Bsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = B }
+% \end{macrocode}
+% followed by single vertical lines,
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \vsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = v }
+% \end{macrocode}
+% and finally double vertical lines.
+% \begin{macrocode}
+\@@_new_id_matrix_doc_cmd:NNn \Vsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = V }
+% \end{macrocode}
+% \changes{v0.2.0}{\GetVersionDate{v0.2.0}}{%
+% Added document level commands \cs{psmallidmat}, \cs{bsmallidmat},
+% \cs{Bsmallidmat}, \cs{vsmallidmat} and \cs{Vsmallidmat}.
+% }
+% \end{macro}
+%
+% \begin{macrocode}
+}{ % \bool_if:nTF \l_@@_predef_matrix_bool FALSE BRANCH
+ \msg_info:nnnn {moremath} { load / disabling } { no-matrix }
+ {
+ (anti-)diagonal~matrix~commands
+ }
+} % \bool_if:nTF \l_@@_predef_matrix_bool
+% \end{macrocode}
+%
+%
+% \section{Shorthand Macros for Absolute Value and Norm}
+% \label{sec:impl-abs-shorthands}
+%
+% We first declare another warning message to inform the user of the case that,
+% the \meta{csnames} are already taken.
+% \begin{macrocode}
+\msg_new:nnnn { moremath } { abs-shorth / csname-already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~declaration~of~paired~delimiter~\msg_line_context:.\\
+ Use~package~option~'no-abs-shorthands'~to~disable~the~paired\\
+ delimiter~shorthands.
+}{
+ The~control~sequence~'#1'~has~already~been\\
+ defined~by~something~else.\\
+ I~am~refusing~to~overwrite~its~existing~definition~and~instead~avoid\\
+ declaring~a~paired~delimiter.\\
+}
+% \end{macrocode}
+%
+%
+% As with the other parts these macros may be conditionally disabled.
+% \begin{macrocode}
+\bool_if:NTF \l_@@_predef_abs_bool
+{
+% \end{macrocode}
+% \begin{macro}{\abs,\norm}
+% These macros provide shorthands for \(\abs{\meta{content}}\)
+% and \(\norm{\meta{content}}\).
+% \begin{macrocode}
+\cs_if_free:NTF \abs
+{
+ \DeclarePairedDelimiter \abs {\lvert} {\rvert}
+}{
+ % warn if the csname is taken
+ \msg_warning:nnn { moremath } { abs-shorth / csname-already-defined-skip }
+ {\abs}
+} % \cs_if_free:NTF \abs
+
+\cs_if_free:NTF \norm
+{
+ \DeclarePairedDelimiter \norm {\lVert} {\rVert}
+}{
+ % warn if csname is already taken
+ \msg_warning:nnn { moremath } { abs-shorth / csname-already-defined-skip }
+ {\norm}
+} % \cs_if_free:NTF
+% \end{macrocode}
+% \changes{v0.1.0}{\GetVersionDate{v0.1.0}}{%
+% Added shorthands for absolute value and norm.
+% }
+% \end{macro}
+%
+% \begin{macrocode}
+}{
+ \msg_info:nnnn {moremath} {load / disabling} {no-abs-shorthands}
+ {
+ '\abs'~and~'\norm'~macros
+ }
+} % End of the conditional
+% \end{macrocode}
+%
+% \iffalse debug-switch
+%\debug_off:n {all}
+% \fi
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
+% \end{implementation}
+%
+% \section*{Copyright and License}
+% \addcontentsline{toc}{section}{Copyright and License}
+% \label{sec:license}
+%
+% The following copyright notice applies to the \pkg{moremath} package:
+%
+% \begin{quote}
+% Copyright \textcopyright{} 2024 Marcel Ilg
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% \url{https://www.latex-project.org/lppl.txt}
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \enquote{maintained}.
+%
+% The Current Maintainer of this work is Marcel Ilg.
+%
+% This work consists of the files listed in \file{MANIFEST.md}.
+% \end{quote}
+%
+% \noindent The file \file{MANIFEST.md} has to be distributed together with the
+% package.
+%
+%
+% \printbibliography[heading=bibintoc]
+% \PrintChanges
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/moremath/moremath.ins b/Master/texmf-dist/source/latex/moremath/moremath.ins
new file mode 100644
index 00000000000..f04f2b04b20
--- /dev/null
+++ b/Master/texmf-dist/source/latex/moremath/moremath.ins
@@ -0,0 +1,66 @@
+%%
+%% Copyright (C) 2024 Marcel Ilg
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%
+%% https://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status ‘maintained’.
+%%
+%% The Current Maintainer of this work is Marcel Ilg.
+%%
+%% This work consists of the files listed in MANIFEST.md.
+
+\input docstrip
+
+\usedir{tex/latex/moremath}
+
+\keepsilent
+
+\preamble
+
+This is a generated file.
+
+
+Copyright (C) 2024 Marcel Ilg
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+
+ https://www.latex-project.org/lppl.txt
+
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status ‘maintained’.
+
+The Current Maintainer of this work is Marcel Ilg.
+
+This work consists of the files listed in MANIFEST.md.
+
+\endpreamble
+
+\generate{\file{moremath.sty}{\from{moremath.dtx}{package}}}
+
+\obeyspaces
+\Msg{***************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following file into a}
+\Msg{* directory searched by TeX:}
+\Msg{*}
+\Msg{* moremath.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file moremath.dtx through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{***************************************************************************}
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/overarrows/overarrows.dtx b/Master/texmf-dist/source/latex/overarrows/overarrows.dtx
index 419593f5775..ff63a958c39 100644
--- a/Master/texmf-dist/source/latex/overarrows/overarrows.dtx
+++ b/Master/texmf-dist/source/latex/overarrows/overarrows.dtx
@@ -16,14 +16,17 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{overarrows}
%<*package>
-[2023/02/15 v1.1 Custom extensible arrows over math expressions]
+[2024/07/11 v1.2 Custom extensible arrows over math expressions]
%</package>
%
%<*driver>
\documentclass[nohyperref]{ltxdoc}
+\usepackage{metalogo}
+\usepackage{enumitem}
+\usepackage{array}
\usepackage{overarrows-doc} %^^A defined at end of this file, with guard <docstyle>
-\usepackage[old-arrows, esvect, tikz, pstarrows, allcommands]{overarrows}
+\usepackage[old-arrows, esvect, tikz, pstricks, pstarrows, allcommands]{overarrows}
\EnableCrossrefs
\PageIndex
@@ -36,8 +39,8 @@
%% Arrows used in doc
\usepackage{amssymb}% for \twoheadrightarrow
-\NewOverArrowCommand{amsoverrightarrow}{amsmath=strict, end={\rightarrow}}
-\NewOverArrowCommand{overrightnewarrow}{%
+\NewOverArrowCommand{\amsoverrightarrow}{amsmath=strict, end={\rightarrow}}
+\NewOverArrowCommand{\overrightnewarrow}{%
amsmath, middle config=relbar, end=\rightarrow,
right arrow,
}
@@ -49,22 +52,22 @@
\DeclareMathSymbol{\fldrf}{\mathrel}{esvector}{'026}
\DeclareMathSymbol{\fldrg}{\mathrel}{esvector}{'027}
\DeclareMathSymbol{\fldrh}{\mathrel}{esvector}{'030}
-\NewOverArrowCommand{esveca}{esvect=strict, end={\fldra}}
-\NewOverArrowCommand{esvecb}{esvect=strict, end={\fldrb}}
-\NewOverArrowCommand{esvecc}{esvect=strict, end={\fldrc}}
-\NewOverArrowCommand{esvecd}{esvect=strict, end={\fldrd}}
-\NewOverArrowCommand{esvece}{esvect=strict, end={\fldre}}
-\NewOverArrowCommand{esvecg}{esvect=strict, end={\fldrg}}
-\NewOverArrowCommand{esvech}{esvect=strict, end={\fldrh}}
-\NewOverArrowCommand{vva}{esvect, middle config=auto, end=\fldra}
-\NewOverArrowCommand{esvecf}{esvect=strict, end={\fldrf}}
-\NewOverArrowCommand{vvb}{esvect, middle config=auto, end=\fldrb}
-\NewOverArrowCommand{vvc}{esvect, middle config=auto, end=\fldrc}
-\NewOverArrowCommand{vvd}{esvect, middle config=auto, end=\fldrd}
-\NewOverArrowCommand{vve}{esvect, middle config=auto, end=\fldre}
-\NewOverArrowCommand{vvf}{esvect, middle config=auto, end=\fldrf}
-\NewOverArrowCommand{vvg}{esvect, middle config=auto, end=\fldrg}
-\NewOverArrowCommand{vvh}{esvect, middle config=auto, end=\fldrh}
+\NewOverArrowCommand{\esveca}{esvect=strict, end={\fldra}}
+\NewOverArrowCommand{\esvecb}{esvect=strict, end={\fldrb}}
+\NewOverArrowCommand{\esvecc}{esvect=strict, end={\fldrc}}
+\NewOverArrowCommand{\esvecd}{esvect=strict, end={\fldrd}}
+\NewOverArrowCommand{\esvece}{esvect=strict, end={\fldre}}
+\NewOverArrowCommand{\esvecg}{esvect=strict, end={\fldrg}}
+\NewOverArrowCommand{\esvech}{esvect=strict, end={\fldrh}}
+\NewOverArrowCommand{\vva}{esvect, middle config=auto, end=\fldra}
+\NewOverArrowCommand{\esvecf}{esvect=strict, end={\fldrf}}
+\NewOverArrowCommand{\vvb}{esvect, middle config=auto, end=\fldrb}
+\NewOverArrowCommand{\vvc}{esvect, middle config=auto, end=\fldrc}
+\NewOverArrowCommand{\vvd}{esvect, middle config=auto, end=\fldrd}
+\NewOverArrowCommand{\vve}{esvect, middle config=auto, end=\fldre}
+\NewOverArrowCommand{\vvf}{esvect, middle config=auto, end=\fldrf}
+\NewOverArrowCommand{\vvg}{esvect, middle config=auto, end=\fldrg}
+\NewOverArrowCommand{\vvh}{esvect, middle config=auto, end=\fldrh}
\makeatletter
\newcommand{\unsetoldarrows}{
@@ -94,7 +97,7 @@
%
% \title{The \pkg{overarrows} package\thanks{This document
% corresponds to \pkg{overarrows}~\fileversion, dated \filedate.}}
-% \author{Julien Labb\'e \\ \texttt{Julien.Labbe@univ-grenoble-alpes.fr}}
+% \author{Julien Labb\'e \\ {\small \url{https://github.com/julienlabbe/latex-packages}}}
%
% \maketitle
%
@@ -111,7 +114,7 @@
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{overrightharpoon}{%
+\NewOverArrowCommand{\overrightharpoon}{%
end=\rightharpoonup
}
@@ -188,9 +191,9 @@
%
% The \pkg{overarrows} package was primitively written for vectors, but in
% a highly customisable way. It can be used to define a large variety of arrows,
-% using math symbols, or PGF/TikZ commands. It's also possible to create
-% commands that draw the arrows under. Some predefined commands are provided,
-% giving\footnotemark{}, for arrow over:
+% using math symbols, or drawing commands from PGF/TikZ or PSTricks. It's also
+% possible to create commands that draw the arrows under. Some predefined
+% commands are provided, giving\footnotemark{}, for arrow over:
% \footnotetext{Displayed here with the \refOpt{old-arrows} option.}
% \begin{align*}
% \overrightarrow{\alpha+\beta}
@@ -222,34 +225,42 @@
% above\footnotemark{}. For this second convention, \TeX/\LaTeX provides the
% command \cs{vec}, which accents its content (using the \cs{mathaccent}
% command) with the character~\symb{\mathchar "017E\relax}
-% (\cs{mathchar}|"017E| in Computer Modern font).
-% But \symb{\mathchar "017E\relax} isn't extensible, and gives: $\vec{v}$,
-% $\vec{AB}$ or $\vec{\text{grad}}$ (there's no command \cs{widevec} analogous
-% to \cs{widehat}).
+% (\cs{mathchar}|"017E| in Computer Modern font). But \symb{\mathchar
+% "017E\relax} isn't extensible\footnotemark{}, and gives: $\vec{v}$, $\vec{AB}$
+% or $\vec{\text{grad}}$ (there's no command \cs{widevec} analogous to
+% \cs{widehat}).
%
+% \addtocounter{footnote}{-2}%^^A two footnotemarks
+%
+% \stepcounter{footnote}
% \footnotetext{See, for example: International Organization for
% Standardization. (2019). \emph{Quantities and units -- Part 2: Mathematics}
% (ISO Standard No. 80000-2:2019).
% \url{https://www.iso.org/standard/64973.html}.}
%
+% \stepcounter{footnote}
+% \footnotetext{In fact, with the unicode engines \LuaTeX{} and \XeTeX{}, the
+% command \cs{Umathaccent} can now define extensible accents. This is used by
+% the \pkg{unicode-math} package, which also set the arrows displayed by \cs{vec}
+% and \cs{overrightarrow} in a coherent manner.}
+%
% An extensible alternative is given by the command \cs{overrightarrow},
% available in \TeX/\LaTeX, and which is redefined by the commonly used
% \pkg{amsmath} package. But its arrow, built with the \cs{rightarrow} symbol
-% \symb{\rightarrow}, is too large with the default \emph{Computer Modern} font:
-% $\amsoverrightarrow{AB}$. Another alternative is the \pkg{esvect} package,
-% which provides the \cs{vv} command and a set of custom arrows: $\esveca{AB}$,
-% $\esvecb{AB}$, $\esvecc{AB}$, $\esvecd{AB}$, $\esvece{AB}$, $\esvecf{AB}$,
-% $\esvecg{AB}$, $\esvech{AB}$.
+% \symb{\rightarrow}, is too large, using the default \emph{Computer Modern}
+% font: $\amsoverrightarrow{AB}$. Another alternative is the \pkg{esvect}
+% package, which provides the \cs{vv} command and a set of custom arrows:
+% $\esveca{AB}$, $\esvecb{AB}$, $\esvecc{AB}$, $\esvecd{AB}$, $\esvece{AB}$,
+% $\esvecf{AB}$, $\esvecg{AB}$, $\esvech{AB}$.
%
% \subsection{Stack and arrow macros}
%
% It's worth looking at the definition of \pkg{amsmath} \cs{overrightarrow}
-% command:
-% \iffalse
+% command: \iffalse
%<*example>
% \fi
\begin{dispListing}
- \long macro:->\mathpalette {\overarrow@ \rightarrowfill@ }
+\long macro:->\mathpalette {\overarrow@ \rightarrowfill@ }
\end{dispListing}
% \iffalse
%</example>
@@ -314,7 +325,7 @@
% The \pkg{overarrows} package also provides an alternative mechanism.
% When used, the length \cs{overarrowlength} is set, according to the arrow
% command content, and can be employed, for example, to draw arrows using
-% PGF/TikZ or the \LaTeX{} picture environment.
+% PGF/TikZ, PSTricks or the \LaTeX{} picture environment.
%
% \section{Quick start}
%
@@ -382,14 +393,13 @@
% \subsection{Commands creation}
%
% Commands are created with \refCom{NewOverArrowCommand}. This macro take two
-% mandatory arguments : the name of the command (without backslash), and the
-% arrow configuration as comma-separated list of key-values. By default, a right
-% arrow is set:
+% mandatory arguments : the name of the command and the arrow configuration as
+% comma-separated list of key-values. By default, a right arrow is set:
% \iffalse
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{myovercmd}{}
+\NewOverArrowCommand{\myovercmd}{}
$\myovercmd{test}$
\end{dispExample}
% \iffalse
@@ -417,7 +427,7 @@ $ v_{sub} \qquad \myovercmd{v}_{sub} \qquad \myovercmd*{v}_{sub} $
%<*example>
% \fi
\begin{dispListing}
-\NewOverArrowCommand{overhooktwoheadrightarrow}{%
+\NewOverArrowCommand{\overhooktwoheadrightarrow}{%
start=\lhook, end=\twoheadrightarrow,
}
\end{dispListing}
@@ -436,12 +446,12 @@ $ v_{sub} \qquad \myovercmd{v}_{sub} \qquad \myovercmd*{v}_{sub} $
% \iffalse
%</example>
% \fi
-% With the previous definition, the result of the command
+% But with the previous definition, the result of the command
% \cs{overhooktwoheadrightarrow} is faulty:
% \iffalse
%<*example>
% \fi
-\NewOverArrowCommand{overhooktwoheadrightarrow}{%
+\NewOverArrowCommand{\overhooktwoheadrightarrow}{%
start=\lhook, end=\twoheadrightarrow,
}
\begin{dispExample}
@@ -459,7 +469,7 @@ $ \overhooktwoheadrightarrow{v} \qquad \overhooktwoheadrightarrow{AB} $
% \fi
\csundef{overhooktwoheadrightarrow}
\begin{dispExample}
-\NewOverArrowCommand{overhooktwoheadrightarrow}{%
+\NewOverArrowCommand{\overhooktwoheadrightarrow}{%
start=\lhook, end=\twoheadrightarrow,
trim start=1.5, trim end=2,
}
@@ -474,16 +484,18 @@ $ \overhooktwoheadrightarrow{v} \qquad \overhooktwoheadrightarrow{AB} $
% If the math font differs from the default \emph{Computer Modern}, the central
% part of the arrow may have inappropriate position or line width. This is
% because the default symbol used for the arrow line is \cs{relbareda}
-% \symb{\relbareda} from the \pkg{esvect} package. If needed, try to set the
-% \refKey{middle} key with the symbol \cs{relbar} \symb{\relbar}. The trimming
-% should also be adapted:
+% \symb{\relbareda} from the \pkg{esvect} package\footnote{Except if the
+% \pkg{unicode-math} package is used with a math font that provides the
+% \cs{harrowextender} symbol (see the \refKey*{middle config}|=auto| key).}.
+% If needed, try to set the \refKey{middle} key with the symbol \cs{relbar}
+% \symb{\relbar}. The trimming should also be adapted:
% \iffalse
%<*example>
% \fi
\csundef{overhooktwoheadrightarrow}
\begin{dispExample}
-\NewOverArrowCommand{overhooktwoheadrightarrow}{%
- start=\lhook, end=\twoheadrightarrow, middle=\relbar, %
+\NewOverArrowCommand{\overhooktwoheadrightarrow}{%
+ start=\lhook, end=\twoheadrightarrow, middle=\relbar,
trim start=0, trim end=3, trim middle=5,
}
$ \overhooktwoheadrightarrow{v} \qquad \overhooktwoheadrightarrow{AB} $
@@ -500,7 +512,7 @@ $ \overhooktwoheadrightarrow{v} \qquad \overhooktwoheadrightarrow{AB} $
%<*example>
% \fi
\begin{dispExample}
-\TestOverArrow{overhooktwoheadrightarrow}
+\TestOverArrow{\overhooktwoheadrightarrow}
\end{dispExample}
% \iffalse
%</example>
@@ -514,7 +526,7 @@ $ \overhooktwoheadrightarrow{v} \qquad \overhooktwoheadrightarrow{AB} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{OverRightarrow}{%
+\NewOverArrowCommand{\OverRightarrow}{%
start=\Relbar,
middle=\Relbar,
end=\Rightarrow,
@@ -535,7 +547,7 @@ $ \OverRightarrow{v} \qquad \OverRightarrow{AB} $
% \fi
\csundef{OverRightarrow}
\begin{dispExample}
-\NewOverArrowCommand{OverRightarrow}{%
+\NewOverArrowCommand{\OverRightarrow}{%
start={\smallermathstyle\Relbar},
middle={\smallermathstyle\Relbar},
end=\Rightarrow,
@@ -557,7 +569,7 @@ $ \OverRightarrow{v} \qquad \OverRightarrow{AB} $
% \fi
\csundef{OverRightarrow}
\begin{dispExample}
-\NewOverArrowCommand{OverRightarrow}{%
+\NewOverArrowCommand{\OverRightarrow}{%
start={\smallermathstyle\Relbar},
middle={\smallermathstyle\Relbar},
end=\Rightarrow,
@@ -579,7 +591,7 @@ $ \OverRightarrow{v} \qquad \OverRightarrow{AB} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{OverLeftarrow}{%
+\NewOverArrowCommand{\OverLeftarrow}{%
start={\smallermathstyle\Leftarrow},
middle={\smallermathstyle\Relbar},
end=\Relbar,
@@ -601,7 +613,7 @@ $ \OverLeftarrow{v} \qquad \OverLeftarrow{AB} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{OverLeftRightarrow}{%
+\NewOverArrowCommand{\UnderLeftRightarrow}{%
start={\smallermathstyle\Leftarrow},
middle={\smallermathstyle\Relbar},
end=\Rightarrow,
@@ -610,7 +622,7 @@ $ \OverLeftarrow{v} \qquad \OverLeftarrow{AB} $
space before arrow=0.5ex,
shift left=0, shift right=0,
}
-$ \OverLeftRightarrow{v} \qquad \OverLeftRightarrow{AB} $
+$ \UnderLeftRightarrow{v} \qquad \UnderLeftRightarrow{AB} $
\end{dispExample}
% \iffalse
%</example>
@@ -650,7 +662,7 @@ $ \tttail $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{overtttailrightarrow}{%
+\NewOverArrowCommand{\overtttailrightarrow}{%
start={\tttail},
end={\rightarrow},
trim start=12,
@@ -683,7 +695,7 @@ $ \overtttailrightarrow{v} \qquad \overtttailrightarrow{AB} $
% \fi
\csundef{overtttailrightarrow}
\begin{dispExample}
-\NewOverArrowCommand{overtttailrightarrow}{%
+\NewOverArrowCommand{\overtttailrightarrow}{%
start={\vcenter{\hbox{$\smallermathstyle\tttail$}}},
end={\rightarrow},
trim start=12,
@@ -710,7 +722,7 @@ $ \overtttailrightarrow{v} \qquad \overtttailrightarrow{AB} $
\begin{dispExample}
\newcommand*{\leftarrowhead}{\usefont{U}{lasy}{m}{n}\symbol{40}}
\newcommand*{\righttarrowhead}{\usefont{U}{lasy}{m}{n}\symbol{41}}
-\NewOverArrowCommand{overrightleftarrow}{%
+\NewOverArrowCommand{\overrightleftarrow}{%
start=\text{\righttarrowhead},
end=\text{\leftarrowhead},
trim start=0.7, trim end=0.7,
@@ -751,7 +763,7 @@ $ \overrightleftarrow{AB} \qquad \scriptstyle\overrightleftarrow{AB} $
% \medskip
%
% To use PGF/TikZ language, the optional argument |tikz| must be passed to
-% \refCom{NewOverArrowCommand} . TikZ picture are not extensible. That's why the
+% \refCom{NewOverArrowCommand}. TikZ pictures are not extensible. That's why the
% \pkg{overarrows} package provides three lengths that can be used in TikZ
% commands:
% \begin{itemize}
@@ -767,7 +779,7 @@ $ \overrightleftarrow{AB} \qquad \scriptstyle\overrightleftarrow{AB} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand[tikz]{overtikzarrow}{}
+\NewOverArrowCommand[tikz]{\overtikzarrow}{}
$ \overtikzarrow{v} \qquad \overtikzarrow{AB} $
\end{dispExample}
% \iffalse
@@ -791,7 +803,7 @@ $ \overtikzarrow{v} \qquad \overtikzarrow{AB} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand[tikz]{overarchedleftrightarrow}{%
+\NewOverArrowCommand[tikz]{\overarchedleftrightarrow}{%
add tikz options={y=\overarrowlength},
add tikz options={line width={\overarrowsmallerthickness}},
path options={arrows={<[scale=0.5]->[scale=0.5]}},
@@ -807,20 +819,72 @@ $ \overarchedleftrightarrow{v} \qquad \overarchedleftrightarrow{ABCD} $
%</example>
% \fi
%
+% \subsection{Drawing the arrow with PSTricks}
+%
+% In addition to PGF/TikZ, the arrow can be drawn with PSTricks macros.
+% For this, the optional argument |pstricks| must be passed to
+% \refCom{NewOverArrowCommand}. Like with
+% |tikz|, the three lengths \refCom{overarrowlength}, \refCom{overarrowthickness}
+% and \refCom{overarrowsmallerthickness} can be used in PSTricks commands.
+% By default, a right arrow is drawn:
+% \iffalse
+%<*example>
+% \fi
+\begin{dispExample}
+\NewOverArrowCommand[pstricks]{\overpstarrow}{}
+$ \overpstarrow{v} \qquad \overpstarrow{AB} $
+\end{dispExample}
+% \iffalse
+%</example>
+% \fi
+% \noindent The \pkg{pstricks} package has to be loaded (for example, using the
+% \refOpt{pstricks} option of the \pkg{overarrows} package)
+%
+% Keys to use PSTricks commands are described in section~\ref{sec:pstricks-keys},
+% page~\pageref{sec:pstricks-keys}. The main keys are \refKey{pstricks command},
+% \refKey{psset}, \refDoc{key:pstricks}{arrow}, \refDoc{key:pstricks}{geometry}
+% an \refDoc{key:pstricks}{line thickness}. Examples:
+% \iffalse
+%<*example>
+% \fi
+\begin{dispExample}
+\NewOverArrowCommand[pstricks]{\overreddisks}{%
+ psset={linecolor=red}, arrow=*-*, center arrow,
+}
+$ \overreddisks{v} \qquad \overreddisks{AB} $
+\end{dispExample}
+\begin{dispExample}
+\NewOverArrowCommand[pstricks]{\ellipticarrow}{%
+ pstricks command={%
+ \psellipticarcn{->}%^^A avoid space before coordinates
+ (0.5\overarrowlength,0.2\overarrowlength)%^^A avoid space before coordinates
+ (0.5\overarrowlength,0.2\overarrowlength)
+ {170}{10}
+ },
+ geometry={(0,0.2\overarrowlength)(\overarrowlength,0.4\overarrowlength)},
+ line thickness={\overarrowsmallerthickness},
+ center arrow,
+}
+$ \ellipticarrow{v} \qquad \ellipticarrow{AB} $
+\end{dispExample}
+% \iffalse
+%</example>
+% \fi
+%
% \subsection{Drawing the arrow with \LaTeX{} picture environment}
%
-% As well as TikZ, the \LaTeX{} |picture| environment can be used to draw the
-% arrow. For this, the optional argument |picture| must be passed to
-% \refCom{NewOverArrowCommand}. Like for TikZ, the three lengths
-% \refCom{overarrowlength}, \refCom{overarrowthickness} and
-% \refCom{overarrowsmallerthickness} can be used in |picture| commands.
-% By default, a right vector is drawn:
+% Without any other package, arrows can also be drawn with the \LaTeX{}
+% |picture| environment. In this case, the optional argument |picture| must be
+% passed to \refCom{NewOverArrowCommand}. As with |tikz| or |pstricks|, the
+% three lengths \refCom{overarrowlength}, \refCom{overarrowthickness} and
+% \refCom{overarrowsmallerthickness} are available and can be used in
+% |picture| drawing commands. By default, a right vector is drawn:
% \iffalse
%<*example>
% \fi
\ltxarrows%^^A classic arrows
\begin{dispExample}
-\NewOverArrowCommand[picture]{overpictarrow}{}
+\NewOverArrowCommand[picture]{\overpictarrow}{}
$ \overpictarrow{v} \qquad \overpictarrow{AB} $
\end{dispExample}
% \iffalse
@@ -835,7 +899,7 @@ $ \overpictarrow{v} \qquad \overpictarrow{AB} $
\pstarrows%^^A pst arrows
\csundef{overpictarrow}
\begin{dispExample}
-\NewOverArrowCommand[picture]{overpictarrow}{}
+\NewOverArrowCommand[picture]{\overpictarrow}{}
$ \overpictarrow{v} \qquad \overpictarrow{AB} $
\end{dispExample}
% \iffalse
@@ -844,13 +908,13 @@ $ \overpictarrow{v} \qquad \overpictarrow{AB} $
%
% Keys to use \LaTeX{} |picture| environment are described in
% section~\ref{sec:picture-keys}, page~\pageref{sec:picture-keys}. The main keys
-% are \refKey{picture command}, \refKey{geometry} an \refDoc{key:picture}{line
-% thickness}. Here is an example:
+% are \refKey{picture command}, \refDoc{key:picture}{geometry} an
+% \refDoc{key:picture}{line thickness}. Here is an example:
% \iffalse
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand[picture]{overbandedarrow}{
+\NewOverArrowCommand[picture]{\overbandedarrow}{
picture command={%
\qbezier
(0.0\overarrowlength,0)
@@ -875,7 +939,6 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
% \subsection{Package options}
% \label{sec:package-options}
%
-%
% The \pkg{overarrows} package accepts many options, given as a comma-separated
% list \meta{options} at package loading:
% \cs{usepackage}|[|\meta{options}|]{overarrows}|.
@@ -889,7 +952,8 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
% \begin{docOption}{esvect}
% Loads the \pkg{esvect} package and redefines its vector commands \refCom{vv}
% through the \pkg{overarrows} mechanism. Original \pkg{esvect} \cs{vv} macro
-% is still available with \refCom{esvectvv}.
+% is still available with \refCom{esvectvv}. The \pkg{esvect} font description
+% is fixed to allow any font sizes.
%
% The \pkg{esvect} package provides the symbol \cs{relbareda} \symb{\relbareda}
% which is smaller and often more flexible than the classic one \cs{relbar}
@@ -1098,6 +1162,16 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
% library are loaded independently.
% \end{docOption}
%
+% \begin{docOption}{pstricks}
+% Loads the package \pkg{pstricks-add}.
+%
+% Note that, as it, this will compile with \LaTeX{}, \LuaLaTeX{} and
+% \XeLaTeX{}, but not with \makebox{pdf\LaTeX} (see the PSTricks
+% documentation). PSTricks arrows, drawn with the |pstricks| method, are
+% always available, even if this option is not set, provided the
+% \pkg{pstricks} package is loaded independently.
+% \end{docOption}
+%
% \begin{docOption}{pstarrows}
% Loads the \pkg{pict2e} package, with its option |pstarrows|. Vectors using
% \LaTeX{} |picture| environment gives then \pstarrows$\overpictarrow{AB}$
@@ -1117,6 +1191,7 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
% \end{docOption}
%
% \begin{docOption}{subother}
+% \tcbdocmarginnote{\tcbdocnew{v1.1 2023/02/15}}
% Sets to 12 (\emph{other} catcode category) the catcode of the ``|_|" symbol
% used for subscript detection, when this is enabled by the key \refKey{detect
% subscripts} (see the section~\ref{sec:non-standard-subscripts},
@@ -1124,6 +1199,7 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
% \end{docOption}
%
% \begin{docOption}{subactive}
+% \tcbdocmarginnote{\tcbdocnew{v1.1 2023/02/15}}
% Sets to 13 (\emph{active} catcode category) the catcode of the ``|_|" symbol
% used for subscript detection, when this is enabled by the key \refKey{detect
% subscripts} (see the section~\ref{sec:non-standard-subscripts},
@@ -1142,45 +1218,51 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
% \begin{docCommands}{%
% {
% doc name=NewOverArrowCommand,
-% doc parameter=\oarg{method}\marg{name}\marg{keys},
+% doc parameter=\oarg{method}\marg{command}\marg{keys},
% },
% {
% doc name=RenewOverArrowCommand,
-% doc parameter=\oarg{method}\marg{name}\marg{keys},
+% doc parameter=\oarg{method}\marg{command}\marg{keys},
% },
% {
% doc name=ProvideOverArrowCommand,
-% doc parameter=\oarg{method}\marg{name}\marg{keys},
+% doc parameter=\oarg{method}\marg{command}\marg{keys},
% },
% {
% doc name=DeclareOverArrowCommand,
-% doc parameter=\oarg{method}\marg{name}\marg{keys},
+% doc parameter=\oarg{method}\marg{command}\marg{keys},
% },
% }
-% Creates the command \cs{\meta{name}} and its starred variant
-% \cs{\meta{name}*}. The starred variant \cs{\meta{name}*} removes the extra
+% Creates the command \meta{command} and its starred variant
+% \meta{command}|*|. The starred variant \meta{command}|*| removes the extra
% end space generated by the arrow, which is suitable, as example, when
% a subscript follows.
%
+% \tcbdocmarginnote{\tcbdocupdated{v1.2 2024/07/11}}
+% \meta{command} can be given with or without backslash (prior to the version
+% 1.2, only the name, without backslash, was accepted).
+%
% \begin{description}
-% \item[\cs{NewOverArrowCommand}] raises an error if \cs{\meta{name}} is
-% already defined.
+% \item[\cs{NewOverArrowCommand}] raises an error if \meta{command} is
+% already defined.
%
-% \item[\cs{RenewOverArrowCommand}] raises an error if \cs{\meta{name}} is undefined.
+% \item[\cs{RenewOverArrowCommand}] raises an error if \meta{command}
+% is undefined.
%
-% \item[\cs{ProvideOverArrowCommand}] sets \cs{\meta{name}} if the command is
-% undefined and does nothing if it is already defined, without raising
-% any error.
+% \item[\cs{ProvideOverArrowCommand}] sets \meta{command} if the command is
+% undefined and does nothing if it is already defined, without raising
+% any error.
%
-% \item[\cs{DeclareOverArrowCommand}] sets \cs{\meta{name}}, whether the
-% command is already defined
-% or not, without raising any error.
+% \item[\cs{DeclareOverArrowCommand}] sets \meta{command}, whether the command
+% is already defined or not, without raising any error.
% \end{description}
%
% The \meta{method} used to draw the arrow must be:
% \begin{description}
% \item[|symb|] to draw the arrow by symbols assemblage (default);
% \item[|tikz|] to draw the arrow with PGF/TikZ;
+% \item[|pstricks|] to draw the arrow with PSTricks;
+% \tcbdocmarginnote{\tcbdocnew{v1.2 2024/07/11}}
% \item[|picture|] to draw the arrow with the \LaTeX{}
% |picture| environment.
% \end{description}
@@ -1196,7 +1278,7 @@ $ \overbandedarrow{v} \qquad \overbandedarrow{AB} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand[tikz]{myoverarrow}{arrows={Bar-Bar}, center arrow}
+\NewOverArrowCommand[tikz]{\myoverarrow}{arrows={Bar-Bar}, center arrow}
$ \myoverarrow{v} \qquad \myoverarrow{ABCD} $
\end{dispExample}
% \iffalse
@@ -1207,19 +1289,23 @@ $ \myoverarrow{v} \qquad \myoverarrow{ABCD} $
% \begin{docCommands}{%
% {
% doc name=TestOverArrow,
-% doc parameter=\oarg{pattern}\marg{name},
+% doc parameter=\oarg{pattern}\marg{command},
% },
% {
% doc name=TestOverArrow*,
-% doc parameter=\oarg{pattern}\marg{name},
+% doc parameter=\oarg{pattern}\marg{command},
% },
% }
-% Displays the result of the command \meta{name} for patterns of various
+% Displays the result of the command \meta{command} for patterns of various
% lengths and for the four math styles. A custom \meta{pattern} can be added
% to the predefined ones.
%
% The starred variant \cs{TestOverArrow*} displays a full report, including
-% kerning tests of the commands \cs{\meta{name}} and \cs{\meta{name}*} .
+% kerning tests of the commands \meta{command} and \meta{command}|*|.
+%
+% \tcbdocmarginnote{\tcbdocupdated{v1.2 2024/07/11}}
+% \meta{command} can be given with or without backslash (prior to the version
+% 1.2, only the name, without backslash, was accepted).
%
% \iffalse
%<*example>
@@ -1261,9 +1347,9 @@ $ \myoverarrow{v} \qquad \myoverarrow{ABCD} $
% \begin{docCommand}{smallermathstyle}{}
% Applies the next math style, smaller than the current. That is:
% \begin{itemize}
-% \item sets \cs{scriptstyle} if the current math style is \cs{displaystyle}
+% \item uses \cs{scriptstyle} if the current math style is \cs{displaystyle}
% or \cs{textstyle};
-% \item sets \cs{scriptscriptstyle} if the current math style is
+% \item uses \cs{scriptscriptstyle} if the current math style is
% \cs{scriptstyle};
% \item does nothing if the current math style is \cs{scriptscriptstyle}.
% \end{itemize}
@@ -1283,19 +1369,20 @@ $ \displaystyle AB \quad \smallermathstyle AB
%
% \end{docCommand}
%
-% \subsubsection{Useful lengths for TikZ or \texttt{picture} environment}
+% \subsubsection{Useful lengths for TikZ, PSTricks or \texttt{picture} environment}
%
-% Arrows drawn with graphic languages, like PGF/TikZ or the \LaTeX{} |picture|
-% environment, are not extensible. The three lengths \refLen*{overarrowlength},
-% \refLen*{overarrowthickness} and \refLen*{overarrowsmallerthickness} are
-% computed at each utilisation of a command set with the |tikz| or |picture|
-% method, so they can be used in drawing commands.
+% Arrows drawn with graphic languages, like PGF/TikZ, PSTricks or the \LaTeX{}
+% |picture| environment, are not extensible. The three lengths
+% \refLen*{overarrowlength}, \refLen*{overarrowthickness} and
+% \refLen*{overarrowsmallerthickness} are computed at each utilisation of
+% a command set with the |tikz|, |pstricks| or |picture| method, so they can be
+% used in drawing commands.
%
% \iffalse
%<*example>
% \fi
\begin{dispExample*}{grow to left by=-2em}
-\NewOverArrowCommand[tikz]{overparabola}{%
+\NewOverArrowCommand[tikz]{\overparabola}{%
path options={x=\overarrowlength, line width=\overarrowsmallerthickness},
path={(0,0) parabola[parabola height=0.2\overarrowlength] (1,0)},
arrows={-}, center arrow, min length=30,
@@ -1320,8 +1407,13 @@ $\scriptstyle \overparabola{v} \qquad \overparabola{ABCD} $ \par
% \item |\fontdimen 8 \scriptscriptfont 3| in
% \cs{scriptscriptstyle}.
% \end{itemize}
+%
+% \tcbdocmarginnote{\tcbdocupdated{v1.2 2024/07/11}}
+% Theses settings are adapted when the package \pkg{unicode-math} is loaded
+% (using \cs{Umathoverbarrule} with \LuaLaTeX{} or |\fontdimen 54|, family~2
+% with \XeLaTeX{} --- see the manual of \pkg{unicode-math}).
% \end{docLength}
-%
+%
% \begin{docLength}{overarrowsmallerthickness}
% Is set to the default rule thickness of the next smaller math style.
% That is:
@@ -1330,6 +1422,11 @@ $\scriptstyle \overparabola{v} \qquad \overparabola{ABCD} $ \par
% \item |\fontdimen 8 \scriptscriptfont 3| in \cs{scriptstyle} or
% \cs{scriptscriptstyle}.
% \end{itemize}
+%
+% \tcbdocmarginnote{\tcbdocupdated{v1.2 2024/07/11}}
+% Theses settings are adapted when the package \pkg{unicode-math} is loaded
+% (using \cs{Umathoverbarrule} with \LuaLaTeX{} or |\fontdimen 54|, family~2
+% with \XeLaTeX{} --- see the manual of \pkg{unicode-math}).
% \end{docLength}
%
% \subsubsection{Vectors macros}
@@ -1507,8 +1604,9 @@ $ \esvectvv*{\imath}{0} \quad \esvectvv*{e}{r} \quad \esvectvv*{L}{\Delta} $
% page~\pageref{sec:macro-for-commands-creation} for the documentation of
% commands creation):
% \begin{itemize}
-% \item \meta{number}| = 0 | for the |symb| method (default);
+% \item \meta{number}| = 0 | for the |symb| method (method by default);
% \item \meta{number}| = 12| for the |tikz| method;
+% \item \meta{number}| = 12| for the |pstricks| method;
% \item \meta{number}| = 18| for the |picture| method.
% \end{itemize}
%
@@ -1516,7 +1614,7 @@ $ \esvectvv*{\imath}{0} \quad \esvectvv*{e}{r} \quad \esvectvv*{L}{\Delta} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{overlongarrow}{min length=50}
+\NewOverArrowCommand{\overlongarrow}{min length=50}
$ \overlongarrow{v} \qquad \overlongarrow{ABCDEF} $
\end{dispExample}
% \iffalse
@@ -1550,7 +1648,7 @@ $ \overlongarrow{v} \qquad \overlongarrow{ABCDEF} $
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{underhooks}{%
+\NewOverArrowCommand{\underhooks}{%
start={\lhook}, end={\rhook}, trim=1,
arrow under, shift leftright=-4,
}
@@ -1580,8 +1678,8 @@ $ \underhooks{v} \qquad \underhooks{AB} $
% page~\pageref{sec:macro-for-commands-creation} for the documentation of
% commands creation):
% \begin{itemize}
-% \item \meta{number}| = 0 | for the |symb| method (default);
-% \item \meta{number}| = -2| for the |tikz| and |picture| methods.
+% \item \meta{number}| = 0 | for the |symb| method (method by default);
+% \item \meta{number}| = -2| for the |tikz|, |pstricks| and |picture| methods.
% \end{itemize}
%
%\end{docKey}
@@ -1590,7 +1688,7 @@ $ \underhooks{v} \qquad \underhooks{AB} $
%<*example>
% \fi
\begin{dispExample*}{grow to left by=-2em}
-\NewOverArrowCommand{lookback}{%
+\NewOverArrowCommand{\lookback}{%
start={\leftarrow}, end={\rightharpoondown},
shift left=-50, shift right=-10,
}
@@ -1658,7 +1756,7 @@ $ \lookback{\text{look back}} $
%<*example>
% \fi
\begin{dispExample*}{grow to left by=-2em}
-\NewOverArrowCommand{overharpoonsdown}{%
+\NewOverArrowCommand{\overharpoonsdown}{%
start=\leftharpoondown, end=\rightharpoondown, center arrow,
space before arrow=-0.2ex, space after arrow=0.3ex,
}
@@ -1693,7 +1791,7 @@ $ \dot{\overharpoonsdown{v}} \qquad \ddot{\overharpoonsdown{AB}}$
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{autosub}{detect subscripts}
+\NewOverArrowCommand{\autosub}{detect subscripts}
$ \imath_0 \qquad \autosub{\imath}_0 \qquad
{\autosub{\imath}}_0 \qquad {\autosub*{\imath}}_0 $
\end{dispExample}
@@ -1745,7 +1843,7 @@ $ \imath_0 \qquad \autosub{\imath}_0 \qquad
%<*example>
% \fi
\begin{dispExample}
-\NewOverArrowCommand{smalleroverrightarrow}{%
+\NewOverArrowCommand{\smalleroverrightarrow}{%
start={\smallermathstyle\relbar},
middle={\smallermathstyle\relbareda},
end={\rightarrow},
@@ -1784,16 +1882,26 @@ $ \smalleroverrightarrow{v} \qquad \smalleroverrightarrow{AB} $
% Clears \refKey{trim start}, \refKey{trim middle} and \refKey{trim end}.
% \end{docKey}
%
-%\begin{docKey}{middle config}{=auto\textbar relbar\textbar relbareda}{no default}
-% Sets a suitable configuration for the keys \refKey{middle} and \refKey{trim middle}:
+%\begin{docKey}{middle config}{=auto\textbar relbar\textbar relbareda\textbar harrowextender}{no default}
+% Sets a suitable configuration for the keys \refKey{middle} and \refKey{trim
+% middle}:
% \begin{description}
-% \item[For \refKey*{middle config}| = relbar|,] \refKey{middle} is set to
-% \cs{relbar} \symb{\relbar} and \refKey{trim middle} to |2.5|.
-% \item[For \refKey*{middle config}| = relbareda|,] \refKey{middle} is set to
-% \cs{relbareda} \symb{\relbareda} and \refKey{trim middle} to |1|.
-% \item[For \refKey*{middle config}| = auto|,] \refKey{middle} is set with
-% \refKey*{middle config}| = relabareda| if the option \refOpt{esvect} is set
-% (which is the default) and \refKey*{middle config}| = relabar| if not.
+% \item[For \refKey*{middle config}| = relbar|,] \refKey{middle} is set to
+% \cs{relbar} \symb{\relbar} and \refKey{trim middle} to |2.5|.
+% \item[For \refKey*{middle config}| = relbareda|,] \refKey{middle} is set to
+% \cs{relbareda} \symb{\relbareda} and \refKey{trim middle} to |1|.
+% \item[For \refKey*{middle config}| = harrowextender|,]
+% \tcbdocmarginnote{\tcbdocnew{v1.2 2024/07/11}}
+% \refKey{middle} is set to \cs{harrowextender} and \refKey{trim middle} to
+% |0|.
+% \item[For \refKey*{middle config}| = auto|,]
+% \tcbdocmarginnote{\tcbdocupdated{v1.2 2024/07/11}}
+% if \cs{harrowextender} is provided by the math font\footnote{See the
+% documentation of the package \pkg{unicode-math}.}, \refKey{middle} is set
+% with \refKey*{middle config}| = harrowextender|. If \cs{harrowextender}
+% isn't availlable, \refKey{middle} is set with \refKey*{middle config}%
+% | = relbareda| if the option \refOpt{esvect} is set (which is the
+% default) and \refKey*{middle config}| = relabar| if not.
% \end{description}
%\end{docKey}
%
@@ -1880,14 +1988,14 @@ $ \smalleroverrightarrow{v} \qquad \smalleroverrightarrow{AB} $
% commands creation), the |tikz| method is chosen, then the arrow is drawn by
% the command:
% \begin{center}
-% \cs{tikz}|[|\refKey*{tikz options}|]{|\refKey*{tikz command}|}|
+% \cs{tikz}|[<|\refKey*{tikz options}|>]{<|\refKey*{tikz command}|>}|
% \end{center}
% \noindent where \refKey{tikz options} and \refKey{tikz command} are two keys
% described below. When \refKey*{tikz command} is let unset, the drawing command
% turns into:
% \begin{center}
-% \cs{tikz}|[|\refKey*{tikz options}|]{|\cs{draw}|[|\refKey*{path options}|]|
-% \refKey*{path}|;}|
+% \cs{tikz}|[<|\refKey*{tikz options}|>]{|\cs{draw}|[<|\refKey*{path options}|>]|
+% |<|\refKey*{path}|>;}|
% \end{center}
%
% The best way to customise |tikz| arrows is then to set the keys \refKey{tikz
@@ -1899,7 +2007,7 @@ $ \smalleroverrightarrow{v} \qquad \smalleroverrightarrow{AB} $
%<*example>
% \fi
\begin{dispExample*}{grow to left by=-2em}
-\NewOverArrowCommand[tikz]{overdotteddoublearrow}{%
+\NewOverArrowCommand[tikz]{\overdotteddoublearrow}{%
add tikz options={blue}, add path options={densely dotted},
arrows={->[scale=0.5]>[scale=0.5]}, thinner,
min length=20, space after arrow={0.3ex},
@@ -1910,16 +2018,18 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%</example>
% \fi
%
+% \bigskip
+%
% The following keys are available when the |tikz| method is chosen.
%
-% \begin{docKey}[][before lower=\medskip\par]
+% \begin{docKey}[][before lower=\bigskip\par]
% {tikz options}{=\marg{TikZ options}}
% {no default, initially |x=|\cs{overarrowlength}|, line
% width=|\cs{overarrowthickness}}
% Sets TikZ options to \meta{TikZ options}.
%\end{docKey}
%
-% \begin{docKey}[][before lower=\medskip\par]
+% \begin{docKey}[][before lower=\bigskip\par]
% {path options}{=\marg{path options}}
% {no default, initially |arrows={-Classical TikZ Rightarrow}, cap=round|}
% Sets TikZ path options to \meta{path options}.
@@ -1957,21 +2067,102 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% value \cs{draw}|[|\refKey*{path options}|] |\refKey*{path}|;| is used.
%\end{docKey}
%
+% \subsubsection{PSTricks settings}
+% \label{sec:pstricks-keys}
+%
+% \tcbdocmarginnote{\tcbdocnew{v1.2 2024/07/11}}
+% If, at command creation (see section~\ref{sec:macro-for-commands-creation},
+% page~\pageref{sec:macro-for-commands-creation} for the documentation of
+% commands creation), the |pstricks| method is chosen, then the arrow is drawn
+% by:
+% \begin{flushleft}\leftskip=3cm
+% \cs{begin}|{pspicture}<|\refDoc{key:pstricks}*{geometry}|>%|\\
+% \quad\cs{psset}|{linewidth=<|\refDoc{key:pstricks}*{line thickness}|>}%|\\
+% \quad\cs{psset}|{<|\refKey*{psset}|>}%|\\
+% \quad|<|\refKey*{pstricks command}|>%|\par
+% \cs{end}|{pspicture}%|
+% \end{flushleft}
+% \noindent where \refDoc{key:pstricks}{geometry}, \refDoc{key:pstricks}{line
+% thickness} \refKey*{psset} and \refKey*{pstricks command} are four keys
+% described below.
+%
+%\iffalse
+%<*example>
+% \fi
+\begin{dispExample*}{grow to left by=-2em}
+\NewOverArrowCommand[pstricks]{\overloopandarrow}{
+ pstricks command={%
+ \pscurve{->}(0,0)
+ (0.6\overarrowlength,0.05\overarrowlength)
+ (0.5\overarrowlength,0.1\overarrowlength)
+ (0.4\overarrowlength,0.05\overarrowlength)
+ (\overarrowlength,0)
+ },
+ geometry={(0,0)(\overarrowlength,0.2\overarrowlength)},
+ space after arrow=2pt, min length=20,
+ geometry={(0,0)(\overarrowlength,0.2\overarrowlength)},
+}
+$ \overloopandarrow{v} \qquad \overloopandarrow{AB} $
+\end{dispExample*}
+% \iffalse
+%</example>
+% \fi
+%
+% \bigskip
+%
+% The following keys are available when the |pstricks| method is chosen.
+%
+% \begin{docKey}[][before lower=\bigskip\par]
+% {pstricks command}{=\marg{pstricks command}}
+% {no default, initially \cs{psline}|\{->\}(0,0)(|\refCom*{overarrowlength}|,0)|}
+% Sets the |pspicture| command to \meta{pstricks command}.
+% \end{docKey}
+%
+% \begin{docKey}[][doc label={pstricks:arrow}]%^^A same name as for TikZ
+% {arrow}{=\marg{arrow}}
+% {no default, initially |->|}
+% Sets \refKey{pstricks command} with
+% |\psline{|\meta{arrow}|}(0,0)(|\refCom*{overarrowlength}|,0)|.
+% \end{docKey}
+%
+% \begin{docKey}[][]
+% {psset}{=\marg{pstricks setting}}
+% {no default, initially empty}
+% Sets \meta{pstricks setting} with \cs{psset}.
+% \end{docKey}
+%
+% \begin{docKey}[][before lower=\bigskip\par, doc label={pstricks:geometry}]%^^A same name as for picture
+% {geometry}{=\marg{pstricks geometry specification}}
+% {no default, initially |(0,-0.5ex)(|\refCom*{overarrowlength}|,1ex)|}
+% Sets the |pspicture| geometry to \meta{pstricks geometry specification}.
+% \end{docKey}
+%
+% \begin{docKey}[][doc label={pstricks:line thickness}]%^^A same name as for TikZ
+% {line thickness}{=\marg{length}}{no default}
+% Sets the line thickness to \meta{length}.
+% \end{docKey}
+%
+% \begin{docKey}[][doc label={pstricks:thinner}]%^^A same name as for TikZ
+% {thinner}{}{}
+% Sets the keys \refDoc{key:pstricks}{line thickness} with
+% \cs{overarrowsmallerthickness}.
+% \end{docKey}
+%
% \subsubsection{Picture environment settings}
% \label{sec:picture-keys}
%
% If, at command creation (see section~\ref{sec:macro-for-commands-creation},
% page~\pageref{sec:macro-for-commands-creation} for the documentation of
% commands creation), the |picture| method is chosen, then the arrow is drawn
-% with by:
+% by:
% \begin{flushleft}\leftskip=3cm
-% \cs{begin}|{picture}|\refKey*{geometry}|%|\\
-% \quad\cs{linethickness}|{|\refDoc{key:picture}*{line thickness}|}%|\\
-% \quad\refKey*{picture command}|%|\par
+% \cs{begin}|{picture}<|\refDoc{key:picture}*{geometry}|>%|\\
+% \quad\cs{linethickness}|{<|\refDoc{key:picture}*{line thickness}|>}%|\\
+% \quad|<|\refKey*{picture command}|>%|\par
% \cs{end}|{picture}%|
% \end{flushleft}
-% \noindent where \refKey{geometry}, \refDoc{key:picture}{line thickness} and
-% \refKey*{picture command} are three keys described below.
+% \noindent where \refDoc{key:picture}{geometry}, \refDoc{key:picture}{line
+% thickness} and \refKey*{picture command} are three keys described below.
%
%\iffalse
%<*example>
@@ -1979,7 +2170,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\begin{dispExample*}{grow to left by=-2em}
% ^^A \arc and \roundcap commands are from the pict2e package
% ^^A this example needs \usepackage{pict2e} in the preamble
- \NewOverArrowCommand[picture]{overarc}{%
+ \NewOverArrowCommand[picture]{\overarc}{%
picture command={%
\roundcap
\put(0.5\overarrowlength,0){\arc[180,0]{0.6\overarrowlength}}
@@ -1994,15 +2185,18 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \iffalse
%</example>
% \fi
-% The following keys are available when the |picture| method is chosen.
%
-% \begin{docKey}[][before lower=\medskip\par]
+% \bigskip
+%
+%The following keys are available when the |picture| method is chosen.
+%
+% \begin{docKey}[][before lower=\bigskip\par]
% {picture command}{=\marg{picture command}}
% {no default, initially \cs{put}|(0,0)\{|\cs{vector}|(1,0)\{|\refCom*{overarrowlength}|\}\}|}
% Sets picture command to \meta{picture command}.
% \end{docKey}
%
-% \begin{docKey}[][before lower=\medskip\par]
+% \begin{docKey}[][before lower=\bigskip\par, doc label={picture:geometry}]%^^A same name as for pstricks
% {geometry}{=\marg{picture geometry specification}}
% {no default, initially |(|\refCom*{overarrowlength}|,1ex)(0,-0.5ex)|}
% Sets picture geometry to \meta{picture geometry specification}.
@@ -2029,6 +2223,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \subsubsection{Advanced commands}
%
% \begin{docCommand}{SetOverArrowsSubscriptCommand}{\marg{command}}
+% \tcbdocmarginnote{\tcbdocnew{v1.1 2023/02/15}}
% Sets to \meta{command} the command used for subscript detection, when this
% is enabled by the key \refKey{detect subscripts} (see the
% section~\ref{sec:non-standard-subscripts},
@@ -2131,6 +2326,12 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \symb{\relbareda} from the \pkg{esvect} package. This can be fixed with the
% \refOpt{noesvect} option.
%
+% Depending of the math font, predefined commands may be faulty. For example, at
+% the time of writing, hooks vertical position is incorrect with \emph{Asana
+% Math} or \cs{harrowextender} is badly positioned with \emph{Stix two Math}
+% (for the smallest math styles), \emph{Libertinus Math} and
+% \emph{GFSNeohellenicMath}.
+%
% \subsubsection{Detection of non standard subscripts}
% \label{sec:non-standard-subscripts}
%
@@ -2225,11 +2426,25 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \subsection{Changelog}
%
-% \begin{description}
-% \item[v1.1] Support for non-standard subscripts
-% \item[v1.0.1] Bug fix for under* options.
-% \item[v1.0] Initial version.
-% \end{description}
+% \begingroup
+% \renewcommand{\arraystretch}{2}
+% \begin{tabular*}{\linewidth}
+% {@{} l @{\extracolsep{\fill}} p{0.9\linewidth} @{}}
+% v1.2 & \noindent\par\vspace{-\baselineskip}
+% \begin{itemize}[left=0pt, topsep=0pt, partopsep=0pt]
+% \item Fix compatibility issues with \pkg{unicode-math}.
+% \item Allow to draw the arrow with PSTricks.
+% \item Make \pkg{esvect} handle all font sizes.
+% \item Rewrite starred variant for better performances.
+% \end{itemize}
+% \\
+% v1.1 & Support for non-standard subscripts.
+% \\
+% v1.0.1 & Bug fix for under* options.
+% \\
+% v1.0 & Initial version.
+% \end{tabular*}
+% \endgroup
%
% \StopEventually{}
%
@@ -2250,6 +2465,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\newif\ifovar@option@oldarrows@
\newif\ifovar@option@esvect@ \ovar@option@esvect@true \PassOptionsToPackage{f}{esvect}
\newif\ifovar@option@tikz@
+\newif\ifovar@option@pstricks@
\newif\ifovar@option@pstarrows@
\newif\ifovar@detectsubscripts@
\newif\ifovar@option@subother@
@@ -2280,6 +2496,8 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \subsubsection*{Declaration of options}
%
+% \changes{v1.2}{2024/07/11}{Add option pstricks}
+%
% \begin{macrocode}
\DeclareOption{esvect}{\ovar@option@esvect@true}
\DeclareOption{noesvect}{\ovar@option@esvect@false}
@@ -2293,6 +2511,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\DeclareOption{esvecth}{\ovar@option@esvect@true\PassOptionsToPackage{h}{esvect}}
\DeclareOption{old-arrows}{\ovar@option@oldarrows@true}
\DeclareOption{tikz}{\ovar@option@tikz@true}
+\DeclareOption{pstricks}{\ovar@option@pstricks@true}
\DeclareOption{pstarrows}{\ovar@option@pstarrows@true}
\DeclareOption{subscripts}{\ovar@detectsubscripts@true}
\DeclareOption{subother}{\ovar@option@subother@true}
@@ -2381,23 +2600,42 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\RequirePackage{amsmath}
\RequirePackage{etoolbox}
% \end{macrocode}
+%
% Option \refOpt{old-arrows}. Configuration of arrows used for
% predefined commands.
+% \changes{v1.2}{2024/07/11}{Use \cs{def} instead of \cs{let} for
+% \cs{ovar@rightarrow} and \cs{ovar@leftarrow}}
% \begin{macrocode}
-\let\ovar@rightarrow\rightarrow
-\let\ovar@leftarrow\leftarrow
+\def\ovar@rightarrow{\rightarrow}
+\def\ovar@leftarrow{\leftarrow}
\ifovar@option@oldarrows@
\RequirePackage[old]{old-arrows}
- \let\ovar@rightarrow\varrightarrow
- \let\ovar@leftarrow\varleftarrow
+ \def\ovar@rightarrow{\varrightarrow}
+ \def\ovar@leftarrow{\varleftarrow}
\fi
% \end{macrocode}
+%
% Option \refOpt{esvect}.
% \begin{macrocode}
\ifovar@option@esvect@
\RequirePackage{esvect}
+% \end{macrocode}
+% \changes{v1.2}{2024/07/11}{Fix esvect font sizes}
+% Fix font description in |uesvect.fd| to allow any sizes (taken from Enrico
+% Gregorio, \url{https://tex.stackexchange.com/a/689863/})
+% \begin{macrocode}
+ \DeclareFontFamily{U}{esvect}{}
+ \DeclareFontShape{U}{esvect}{m}{n}{
+ <-5.5> vect5
+ <5.5-6.5> vect6
+ <6.5-7.5> vect7
+ <7.5-8.5> vect8
+ <8.5-9.5> vect9
+ <9.5-> vect10
+ }{}
\fi
% \end{macrocode}
+%
% Option \refOpt{tikz}.
% \begin{macrocode}
\ifovar@option@tikz@
@@ -2405,6 +2643,14 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\usetikzlibrary{arrows.meta}
\fi
% \end{macrocode}
+%
+% Option \refOpt{pstricks}.
+% \begin{macrocode}
+\ifovar@option@pstricks@
+ \RequirePackage{pstricks-add}
+\fi
+% \end{macrocode}
+%
% Option \refOpt{pstarrows}.
% \begin{macrocode}
\ifovar@option@pstarrows@
@@ -2412,6 +2658,43 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\fi
% \end{macrocode}
%
+% Add hook rules to apply settings after \pkg{unicode-math}.
+% \begin{macrocode}
+\DeclareHookRule{begindocument}{overarrows}{after}{unicode-math-luatex}
+\DeclareHookRule{begindocument}{overarrows}{after}{unicode-math-xetex}
+% \end{macrocode}
+%
+% \changes{v1.2}{2024/07/11}{Use \cs{harrowextender}, if availlable.}
+% Set \cs{ovar@auto@middle} and \cs{ovar@auto@trim@middle}, used by
+% configurations made with \refKey*{middle config}|=auto|.
+% \begin{macrocode}
+\AddToHook{begindocument}[overarrows]
+ {%
+ \ifdef{\relbareda}
+ {%
+ \gdef\ovar@auto@middle{\relbareda}
+ \gdef\ovar@auto@trim@middle{1}
+ }
+ {%
+ \gdef\ovar@auto@middle{\relbar}
+ \gdef\ovar@auto@trim@middle{2.5}
+ }%
+ \@ifpackageloaded{unicode-math}
+ {%
+% \end{macrocode}
+% Test of \cs{harrowextender} availability taken from Enrico Gregorio,
+% (\url{https://tex.stackexchange.com/a/218407/}).
+% \begin{macrocode}
+ \check@mathfonts
+ \iffontchar\textfont\tw@\string"23AF
+ \gdef\ovar@auto@middle{\mathrel\harrowextender}
+ \gdef\ovar@auto@trim@middle{0}
+ \fi
+ }
+ {}%
+ }
+% \end{macrocode}
+%
% \subsection*{Configuration of subscripts detection}
%
% \changes{v1.1}{2023/02/15}{Support for non-standard subscripts}
@@ -2424,6 +2707,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \end{macro}
%
% Initial configuration.
+% \changes{v1.2}{2024/07/11}{Remove useless \cs{AtBeginDocument}}
% \begin{macrocode}
\SetOverArrowsSubscriptCommand{_}
% \end{macrocode}
@@ -2432,7 +2716,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\ifovar@option@subother@
\begingroup
\catcode `_=12
- \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \SetOverArrowsSubscriptCommand{_}%
\endgroup
\fi
% \end{macrocode}
@@ -2441,7 +2725,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\ifovar@option@subactive@
\begingroup
\catcode `_=13
- \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \SetOverArrowsSubscriptCommand{_}%
\endgroup
\fi
% \end{macrocode}
@@ -2662,12 +2946,25 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
}
}
},
+% \end{macrocode}
+% \changes{v1.2}{2024/07/11}{Add config \refKey*{middle config}|=harrowextender|}
+% \begin{macrocode}
+ middle config/harrowextender/.code={%
+ \pgfkeysalso{%
+ middle={\harrowextender},
+ trim middle={0},
+ }
+ },
+% \end{macrocode}
+% Set \refKey*{middle config} with (hopefully) a good configuration. It would be
+% better to reuse the previous \refKey*{middle config} settings, but we have to
+% wait for the |begindocument| hook to know which one to use.
+% \begin{macrocode}
middle config/auto/.code={%
- \ifovar@option@esvect@
- \pgfkeysalso{middle config=relbareda}
- \else
- \pgfkeysalso{middle config=relbar}
- \fi
+ \pgfkeysalso{%
+ middle={\ovar@auto@middle},
+ trim middle={\ovar@auto@trim@middle},
+ }
},
% \end{macrocode}
% \refKey{amsmath}.
@@ -2775,6 +3072,59 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
}
% \end{macrocode}
%
+% \subsubsection*{Keys for the \texttt{pstricks} method}
+%
+% \changes{v1.2}{2024/07/11}{Add the method pstricks}
+%
+% \begin{macrocode}
+\SetOverArrowsMethod[lens]{pstricks}{%
+% \end{macrocode}
+% Arrow macro.
+% \begin{macrocode}
+ no arrow macro hook/.code={%
+ \ovar@set{%
+ arrow macro/.expanded={%
+ $\noexpand\mkern \expandonce{\ovar@shift@left} mu\noexpand\relax$%
+ \noexpand\begin{pspicture}\expandonce{\ovar@pstricks@geometry}%
+ \noexpand\psset{linewidth=\expandonce{\ovar@pstricks@linethickness}}%
+ \noexpand\psset{\expandonce{\ovar@pstricks@psset}}%
+ \expandonce{\ovar@pstricks@command}%
+ \noexpand\end{pspicture}%
+ $\noexpand\mkern \expandonce{\ovar@shift@right} mu\noexpand\relax$%
+ }
+ }
+ },
+% \end{macrocode}
+% Pstricks parts: \refKey{pstricks command}, \refKey{psset},
+% \refDoc{key:pstricks}{geometry}, \refDoc{key:pstricks}{line thickness}.
+% \begin{macrocode}
+ pstricks command/.store in=\ovar@pstricks@command,
+ psset/.store in=\ovar@pstricks@psset,
+ geometry/.store in=\ovar@pstricks@geometry,
+ line thickness/.store in=\ovar@pstricks@linethickness,
+ pstricks command/.value required,
+ psset/.value required,
+ geometry/.value required,
+ line thickness/.value required,
+% \end{macrocode}
+% Pstricks handy key: \refDoc{key:pstricks}{arrow}, \refDoc{key:pstricks}{thinner}.
+% \begin{macrocode}
+ arrow/.style={pstricks command={\psline{##1}(0,0)(\overarrowlength,0)}},%
+ arrow/.value required,%
+ thinner/.style={line thickness={\overarrowsmallerthickness}},%
+ thinner/.value forbidden,%
+% \end{macrocode}
+% Initial configuration.
+% \begin{macrocode}
+ shift right=-2,
+ min length=12,
+ geometry={(0,-0.5ex)(\overarrowlength,0.5ex)},%
+ line thickness={\overarrowthickness},%
+ arrow={->},%
+ psset={},%
+}
+% \end{macrocode}
+%
% \subsubsection*{Keys for the \texttt{picture} method}
%
% \begin{macrocode}
@@ -2795,7 +3145,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
}
},
% \end{macrocode}
-% Picture parts: \refKey{picture command}, \refKey{geometry},
+% Picture parts: \refKey{picture command}, \refDoc{key:picture}{geometry},
% \refDoc{key:picture}{line thickness}.
% \begin{macrocode}
picture command/.store in=\ovar@picture@command,
@@ -2831,9 +3181,9 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
Previous definition will be overridden}
}{}
% \end{macrocode}
-% Use a default value of |3.5 mu|, as recommended by egreg (see
+% Use a default value of |3.5 mu|, as recommended by Enrico Gregorio (see
% \url{https://tex.stackexchange.com/a/471736}). \cs{joinrel}
-% uses a value of 3 mu.
+% uses a value of 3 mu.
% \begin{macrocode}
\DeclareRobustCommand{\xjoinrel}[1][3.5]{\mathrel{\mkern-#1mu}}
% \end{macrocode}
@@ -2872,7 +3222,6 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\newlength{\overarrowlength}
\newlength{\overarrowthickness}
\newlength{\overarrowsmallerthickness}
-\newlength{\ovar@extralength}
\newlength{\ovar@tempdim}
% \end{macrocode}
%
@@ -2891,26 +3240,75 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
% \end{macro}
%
% \begin{macro}{\ovar@set@arrowthickness}
+% \begin{macro}{\ovar@set@arrowthickness@UM@lua}
% Sets \refLen{overarrowthickness} and \refLen{overarrowsmallerthickness}.\\
-% |#1|: arrow length\\
-% |#2|: math style
+% |#1|: math style
+%
+% Set to the default rule thickness of the current math style, normaly given by
+% \cs{fontdimen} 8 family 3. With \pkg{unicode-math}, use instead:
+% \begin{itemize}
+% \item \cs{fontdimen} 54 family 2 with XeTeX,
+% \item \cs{Umathoverbarrule} with LuaTex.
+% \end{itemize}
+% \changes{v1.2}{2024/07/11}{Get the correct rule thickness with unicode-math}
% \begin{macrocode}
-\def\ovar@set@arrowthickness#1{% use rule thickness=\fontdimen 8 font family 3
+\def\ovar@rulethickness@fontdimen{8}
+\def\ovar@rulethickness@family{3}
+\def\ovar@set@arrowthickness#1{%
\ifx#1\displaystyle%
- \overarrowthickness = \fontdimen 8 \textfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \textfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
\else\ifx#1\textstyle%
- \overarrowthickness = \fontdimen 8 \textfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \textfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
\else\ifx#1\scriptstyle%
- \overarrowthickness = \fontdimen 8 \scriptfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptscriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptscriptfont \ovar@rulethickness@family%
\else%
- \overarrowthickness = \fontdimen 8 \scriptscriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptscriptfont \ovar@rulethickness@family%
\overarrowsmallerthickness = \overarrowthickness%
\fi\fi\fi%
}
% \end{macrocode}
+% \pkg{unicode-math} with LuaTeX version.
+% \begin{macrocode}
+\def\ovar@set@arrowthickness@UM@lua#1{%
+ \overarrowthickness = \Umathoverbarrule #1
+ \ifx#1\displaystyle%
+ \overarrowsmallerthickness = \Umathoverbarrule \textstyle%
+ \else\ifx#1\textstyle%
+ \overarrowsmallerthickness = \Umathoverbarrule \scriptstyle%
+ \else%
+ \overarrowsmallerthickness = \Umathoverbarrule \scriptscriptstyle%
+ \fi\fi%
+}
+% \end{macrocode}
+% Test which version to use.
+% \begin{macrocode}
+\AddToHook{begindocument}[overarrows]
+ {%
+ \@ifpackageloaded{unicode-math-luatex}
+ {%
+ \global\let\ovar@set@arrowthickness\ovar@set@arrowthickness@UM@lua
+ }
+ {%
+ \@ifpackageloaded{unicode-math-xetex}
+ {%
+ \gdef\ovar@rulethickness@fontdimen{54}
+ \gdef\ovar@rulethickness@family{2}
+ }
+ {}
+ }
+ }
+% \end{macrocode}
+% \end{macro}
% \end{macro}
%
% \subsubsection*{Stack macros}
@@ -3017,18 +3415,39 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \subsubsection*{Macro for commands creation}
%
+% \changes{v1.2}{2024/07/11}{Allow backslash in command name}
+% In the initial version, the commands names must be given as csname (without
+% backslash). To harmonize the syntax with standard \cs{NewDocumentCommand},
+% define an argument processor so that both
+% \cs{NewOverArrowCommand}|{\myarrow}| and
+% \cs{NewOverArrowCommand}|{myarrow}| are accepted.
+%
+% \begin{macrocode}
+\ExplSyntaxOn
+\cs_new_protected:Npn \__overarrows_processor_strip_escape_char:n #1
+ {
+ \regex_match:nnTF { ^\cC. } { #1 }
+ { \tl_set:Nx \ProcessedArgument { \cs_to_str:N #1 } }
+ { \tl_set:Nx \ProcessedArgument { #1 } }
+ }
+\cs_new_eq:NN \ovar@cmdname@processor \__overarrows_processor_strip_escape_char:n
+\ExplSyntaxOff
+% \end{macrocode}
+%
% \begin{macro}{\DeclareOverArrowCommand}
% \begin{macrocode}
-\NewDocumentCommand{\DeclareOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\DeclareOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\begingroup
\ovar@set@common
\ifcsdef{ovar@set@#1}{%
\csuse{ovar@set@#1}
}{%
\PackageError{overarrows}{Unknown method #1}
- {Try with 'symb', 'tikz' or 'picture'}
+ {Try with 'symb', 'tikz', 'pstriks' or 'picture'}
}
- \ovar@set{#3 }
+ \ovar@set{#3}
\ifdef{\ovar@macro@arrow}{}{%
\ovar@set{no arrow macro hook}
}
@@ -3050,7 +3469,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\ifovar@detectsubscripts@%
\csgdef{ovar@#2@auto}##1{%
% \end{macrocode}
-% \vspace{-2\smallskipamount}%^^A remove space between code blocs
+% \vspace{-2\smallskipamount}%^^A remove space between code blocks
% \changes{v1.1}{2023/02/15}{Support for non-standard subscripts}
% \begin{macrocode}
\@ifnextchar \ovar@subcmd {%
@@ -3080,7 +3499,9 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \begin{macro}{\ProvideOverArrowCommand}
% \begin{macrocode}
-\NewDocumentCommand{\ProvideOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\ProvideOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsdef{#2}{}{
\DeclareOverArrowCommand[#1]{#2}{#3}
}
@@ -3090,7 +3511,9 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \begin{macro}{\NewOverArrowCommand}
% \begin{macrocode}
-\NewDocumentCommand{\NewOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\NewOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsdef{#2}{%
\PackageError{overarrows}{Command \csname #2\endcsname already defined}%
{You have used \protect\NewOverArrowCommand\space with a command that
@@ -3105,7 +3528,9 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \begin{macro}{\RenewOverArrowCommand}
% \begin{macrocode}
-\NewDocumentCommand{\RenewOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\RenewOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsundef{#2}{%
\PackageError{overarrows}{Command \csname #2\endcsname undefined}%
{You have used \protect\RenewOverArrowCommand\space with a command that was
@@ -3120,17 +3545,21 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \subsubsection*{Starred variant}
%
+% \changes{v1.2}{2024/07/11}{Use boxes in starred variant for better performances}
% \begin{macro}{\ovar@starversion}
% |#1|: definition (stack macro + arrow macro)\\
% |#2|: math style\\
% |#3|: content
% \begin{macrocode}
+\newsavebox\ovar@tempbox
\def\ovar@starversion#1#2#3{%
- #1#2{#3}%
- \settowidth{\ovar@extralength}{$\m@th#1#2{#3}$}
- \settowidth{\ovar@tempdim}{$\m@th#2{#3}$}
- \deflength{\ovar@extralength}{0.5\ovar@extralength-0.5\ovar@tempdim}%
- \kern-\ovar@extralength%
+ \sbox{\ovar@tempbox}{$\m@th #1#2{#3}$}%
+ \usebox{\ovar@tempbox}%
+% \end{macrocode}
+% Remove the extra space added by the arrow.
+% \begin{macrocode}
+ \settowidth{\ovar@tempdim}{$\m@th #2{#3}$}%
+ \kern\dimeval{0.5\ovar@tempdim - 0.5\wd\ovar@tempbox}%
}
% \end{macrocode}
% \end{macro}
@@ -3144,7 +3573,11 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\ifovar@option@esvect@
\let\esvectvv\vv
\undef\vv
- \NewOverArrowCommand{vv}{esvect, middle config=auto}
+% \end{macrocode}
+% \changes{v1.2}{2024/07/11}{Use \refKey{middle config}|=relbareda| instead of
+% \refKey{middle config}|=auto|}
+% \begin{macrocode}
+ \NewOverArrowCommand{\vv}{esvect, middle config = relbareda}
\fi
% \end{macrocode}
% \end{macro}
@@ -3152,216 +3585,231 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \subsubsection*{Predefined commands}
%
+% \changes{v1.2}{2024/07/11}{Declare predefined commands after \pkg{unicode-math} settings}
+% Declare predefined commands after \pkg{unicode-math} settings.
+%
+% \begin{macrocode}
+\AddToHook{begindocument}[overarrows]
+ {
+% \end{macrocode}
+%
% \begin{macro}{\overrightarrow}
% \begin{macrocode}
-\ifovar@option@overrightarrow@
- \DeclareOverArrowCommand{overrightarrow}{%
- amsmath, middle config=relbar,
- end=\ovar@rightarrow,
- right arrow,
- }
-\fi
+ \ifovar@option@overrightarrow@
+ \DeclareOverArrowCommand{\overrightarrow}{%
+ amsmath, middle config=relbar,
+ end=\ovar@rightarrow,
+ right arrow,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\underrightarrow}
% \begin{macrocode}
-\ifovar@option@underrightarrow@
- \DeclareOverArrowCommand{underrightarrow}{%
- amsmath, middle config=relbar,
- end=\ovar@rightarrow,
- right arrow,
- arrow under,
- }
-\fi
+ \ifovar@option@underrightarrow@
+ \DeclareOverArrowCommand{\underrightarrow}{%
+ amsmath, middle config=relbar,
+ end=\ovar@rightarrow,
+ right arrow,
+ arrow under,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\overleftarrow}
% \begin{macrocode}
-\ifovar@option@overleftarrow@
- \DeclareOverArrowCommand{overleftarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\relbar,
- left arrow,
- }
-\fi
+ \ifovar@option@overleftarrow@
+ \DeclareOverArrowCommand{\overleftarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\underleftarrow}
% \begin{macrocode}
-\ifovar@option@underleftarrow@
- \DeclareOverArrowCommand{underleftarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
+ \ifovar@option@underleftarrow@
+ \DeclareOverArrowCommand{\underleftarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\overleftrightarrow}
% \begin{macrocode}
-\ifovar@option@overleftrightarrow@
- \DeclareOverArrowCommand{overleftrightarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\ovar@rightarrow,
- center arrow,
- }
-\fi
+ \ifovar@option@overleftrightarrow@
+ \DeclareOverArrowCommand{\overleftrightarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\ovar@rightarrow,
+ center arrow,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\underleftrightarrow}
% \begin{macrocode}
-\ifovar@option@underleftrightarrow@
- \DeclareOverArrowCommand{underleftrightarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\ovar@rightarrow,
- center arrow,
- arrow under,
- }
-\fi
+ \ifovar@option@underleftrightarrow@
+ \DeclareOverArrowCommand{\underleftrightarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\ovar@rightarrow,
+ center arrow,
+ arrow under,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\overrightharpoonup}
% \begin{macrocode}
-\ifovar@option@overrightharpoonup@
- \DeclareOverArrowCommand{overrightharpoonup}{%
- amsmath, middle config=relbar,
- end=\rightharpoonup,
- right arrow,
- }
-\fi
+ \ifovar@option@overrightharpoonup@
+ \DeclareOverArrowCommand{\overrightharpoonup}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoonup,
+ right arrow,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\underrightharpoonup}
% \begin{macrocode}
-\ifovar@option@underrightharpoonup@
- \DeclareOverArrowCommand{underrightharpoonup}{%
- amsmath, middle config=relbar,
- end=\rightharpoonup,
- right arrow,
- arrow under,
- }
-\fi
+ \ifovar@option@underrightharpoonup@
+ \DeclareOverArrowCommand{\underrightharpoonup}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoonup,
+ right arrow,
+ arrow under,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\overrightharpoondown}
% \begin{macrocode}
-\ifovar@option@overrightharpoondown@
- \DeclareOverArrowCommand{overrightharpoondown}{%
- amsmath, middle config=relbar,
- end=\rightharpoondown,
- right arrow,
- }
-\fi
+ \ifovar@option@overrightharpoondown@
+ \DeclareOverArrowCommand{\overrightharpoondown}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoondown,
+ right arrow,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\underrightharpoondown}
% \begin{macrocode}
-\ifovar@option@underrightharpoondown@
- \DeclareOverArrowCommand{underrightharpoondown}{%
- amsmath, middle config=relbar,
- end=\rightharpoondown,
- right arrow,
- arrow under,
- }
-\fi
+ \ifovar@option@underrightharpoondown@
+ \DeclareOverArrowCommand{\underrightharpoondown}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoondown,
+ right arrow,
+ arrow under,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\overleftharpoonup}
% \begin{macrocode}
-\ifovar@option@overleftharpoonup@
- \DeclareOverArrowCommand{overleftharpoonup}{%
- amsmath, middle config=relbar,
- start=\leftharpoonup,
- end=\relbar,
- left arrow,
- }
-\fi
+ \ifovar@option@overleftharpoonup@
+ \DeclareOverArrowCommand{\overleftharpoonup}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoonup,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\underleftharpoonup}
% \begin{macrocode}
-\ifovar@option@underleftharpoonup@
- \DeclareOverArrowCommand{underleftharpoonup}{%
- amsmath, middle config=relbar,
- start=\leftharpoonup,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
+ \ifovar@option@underleftharpoonup@
+ \DeclareOverArrowCommand{\underleftharpoonup}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoonup,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\overleftharpoondown}
% \begin{macrocode}
-\ifovar@option@overleftharpoondown@
- \DeclareOverArrowCommand{overleftharpoondown}{%
- amsmath, middle config=relbar,
- start=\leftharpoondown,
- end=\relbar,
- left arrow,
- }
-\fi
+ \ifovar@option@overleftharpoondown@
+ \DeclareOverArrowCommand{\overleftharpoondown}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoondown,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\underleftharpoondown}
% \begin{macrocode}
-\ifovar@option@underleftharpoondown@
- \DeclareOverArrowCommand{underleftharpoondown}{%
- amsmath, middle config=relbar,
- start=\leftharpoondown,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
+ \ifovar@option@underleftharpoondown@
+ \DeclareOverArrowCommand{\underleftharpoondown}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoondown,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\overbar}
% \begin{macrocode}
-\ifovar@option@overbar@
- \DeclareOverArrowCommand{overbar}{%
- amsmath, middle config=relbar,
- start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
- shift leftright=0,
- space after arrow=-0.3ex,
- }
-\fi
+ \ifovar@option@overbar@
+ \DeclareOverArrowCommand{\overbar}{%
+ amsmath, middle config=relbar,
+ start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
+ shift leftright=0,
+ space after arrow=-0.3ex,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
+% With \pkg{unicode-math}, add |\vphantom{+}| to get the correct position.
% \begin{macro}{\underbar}
% \begin{macrocode}
-\ifovar@option@underbar@
- \DeclareOverArrowCommand{underbar}{%
- amsmath, middle config=relbar,
- start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
- shift leftright=0,
- arrow under,
- space before arrow=-0.3ex,
- }
-\fi
+ \ifovar@option@underbar@
+ \DeclareOverArrowCommand{\underbar}{%
+ amsmath, middle config=relbar,
+ start={\vphantom{+}\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
+ shift leftright=0,
+ arrow under,
+ space before arrow=-0.3ex,
+ }
+ \fi
% \end{macrocode}
% \end{macro}
%
+% End of |\AddToHook{begindocument}| hook.
+% \begin{macrocode}
+ }
+% \end{macrocode}
+%
+%
% \subsubsection*{Test macros}
%
% \begin{macro}{\ovar@testmathstyles}
@@ -3422,7 +3870,9 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
%
% \begin{macro}{\TestOverArrow}
% \begin{macrocode}
-\NewDocumentCommand{\TestOverArrow}{ s o m }{
+\NewDocumentCommand{\TestOverArrow}{
+ s o >{\ovar@cmdname@processor} m
+}{%
\ifcsdef{#3}{}{%
\PackageWarning{overarrows}{Unknown name '#3' passed to
\protect\TestOverArrow}
@@ -3494,6 +3944,7 @@ $ \overdotteddoublearrow{v} \qquad \overdotteddoublearrow{AB} $
\lstdefinestyle{lstovardoc}{%
language = [LaTeX]TeX,
columns = flexible,
+ keepspaces = true,
keywordstyle = {\bfseries\color{ovar_darkblue}},
texcsstyle = *{\bfseries\color{ovar_darkblue}},
commentstyle = {\color{gray}},
@@ -3618,7 +4069,7 @@ actual '='
name=macrocode,
firstnumber=auto,
style = lstovarcode,
- showlines=false,
+ showlines = false,
% \end{macrocode}
% Commands and lengths identification and indexing
%
@@ -3648,8 +4099,9 @@ actual '='
% \begin{macrocode}
texcs = [4]{% internal macros
ovar@rightarrow, ovar@leftarrow, ifovar@option@oldarrows@,
- ifovar@option@esvect@, ifovar@option@tikz@, ifovar@option@pstarrows@,
- ifovar@detectsubscripts@, ifovar@option@debug@,
+ ifovar@option@esvect@, ifovar@option@tikz@, ifovar@option@pstricks@,
+ ifovar@option@pstarrows@, ifovar@detectsubscripts@,
+ ifovar@option@subother@, ifovar@option@subactive@, ifovar@option@debug@,
ifovar@option@overrightarrow@, ifovar@option@underrightarrow@,
ifovar@option@overleftarrow@, ifovar@option@underleftarrow@,
ifovar@option@overleftrightarrow@, ifovar@option@underleftrightarrow@,
@@ -3657,20 +4109,23 @@ actual '='
ifovar@option@overrightharpoondown@, ifovar@option@underrightharpoondown@,
ifovar@option@overleftharpoonup@, ifovar@option@underleftharpoonup@,
ifovar@option@overleftharpoondown@, ifovar@option@underleftharpoondown@,
- ifovar@option@overbar@, ifovar@option@underbar@, ovar@set, ovar@length@min,
+ ifovar@option@overbar@, ifovar@option@underbar@, ovar@auto@middle,
+ ovar@auto@trim@middle, ovar@subcmd, ovar@set, ovar@length@min,
ovar@before@arrow, ovar@after@arrow, ovar@macro@stack, ovar@macro@arrow,
- ovar@set@, ovar@shift@left, ovar@shift@right, ovar@stack@fill,
- ovar@stackunder@fill, ovar@stack@lens, ovar@stackunder@lens,
- ovar@macro@arrowfill, ovar@arrow@fill, ovar@arrow@start, ovar@trim@start,
- ovar@trim@middle, ovar@arrow@middle, ovar@trim@end, ovar@arrow@end,
- ovar@tikz@command, ovar@tikz@pathoptions, ovar@tikz@path,
- ovar@tikz@options, ovar@picture@geometry, ovar@picture@linethickness,
- ovar@picture@command, ovar@extralength, ovar@tempdim, ovar@set@arrowlength,
- ovar@set@arrowthickness, ovar@stackover@@, ovar@stackunder@@,
- ovar@stackover@, ovar@stackunder@, ovar@stackover@fill,
- ovar@stackover@lens, ovar@set@common, ovar@starversion,
- ovar@testmathstyles, ovar@row@teststyle,%
- ifovar@option@subother@,ifovar@option@subactive@,ovar@subcmd,ovar@testkerning,%
+ ovar@shift@left, ovar@shift@right, ovar@stack@fill, ovar@stackunder@fill,
+ ovar@stack@lens, ovar@stackunder@lens, ovar@macro@arrowfill,
+ ovar@arrow@fill, ovar@arrow@start, ovar@trim@start, ovar@trim@middle,
+ ovar@arrow@middle, ovar@trim@end, ovar@arrow@end, ovar@tikz@command,
+ ovar@tikz@pathoptions, ovar@tikz@path, ovar@tikz@options,
+ ovar@pstricks@geometry, ovar@pstricks@linethickness, ovar@pstricks@psset,
+ ovar@pstricks@command, ovar@picture@geometry, ovar@picture@linethickness,
+ ovar@picture@command, ovar@tempdim, ovar@set@arrowlength,
+ ovar@set@arrowthickness, ovar@set@arrowthickness@UM@lua,
+ ovar@rulethickness@fontdimen, ovar@rulethickness@family, ovar@stackover@@,
+ ovar@stackunder@@, ovar@stackover@, ovar@stackunder@, ovar@stackover@fill,
+ ovar@stackover@lens, ovar@cmdname@processor, ovar@set@common,
+ ovar@starversion, ovar@tempbox, ovar@testmathstyles, ovar@row@teststyle,
+ ovar@testkerning%
},
index = [4][texcs4],%
indexstyle = [4]\indexmacrointernal,%
@@ -3678,20 +4133,25 @@ actual '='
% Other macros identification
% \begin{macrocode}
moretexcs = [5]{% other macros
- Relbar, relbareda, relbaredd, rightarrow, Rightarrow, varleftarrow,
- varrightarrow, twoheadrightarrow,%
+ relbar, Relbar, relbareda, relbaredd, harrowextender, rightarrow,
+ Rightarrow, varleftarrow, varrightarrow, twoheadrightarrow,%
},
% \end{macrocode}
-% Il would be nice to also index keys, but spaces are badly handled by listings.
+% Il would be nice to also index keys, but spaces are badly handled by
+% \pkg{listings}.
% \begin{macrocode}
%^^A morekeywords = [2]{%
-%^^A no stack macro hook, stack macro, arrow macro, no arrow macro hook, min
-%^^A length, before arrow, after arrow, space before arrow, space after arrow,
-%^^A shift left, shift right, shift leftright, center arrow, left arrow, right
-%^^A arrow, arrow under, fill macro, start, middle, end, trim start, trim
-%^^A middle, trim end, trim, no trimming, middle config, amsmath, esvect, tikz
-%^^A command, tikz options, path options, path, add path options, add tikz
-%^^A options, arrows, line thickness, thinner, picture command, geometry, detect subscripts,
+%^^A overarrows, no stack macro hook, stack macro, detect subscripts, arrow
+%^^A macro, no arrow macro hook, min length, before arrow, after arrow, space
+%^^A before arrow, space after arrow, shift left, shift right, shift leftright,
+%^^A center arrow, left arrow, right arrow, arrow under, arrow under/noconfig,
+%^^A arrow under/autoconfig, fill macro, start, middle, end, trim start, trim
+%^^A middle, trim end, trim, no trimming, middle config, middle config/relbar,
+%^^A middle config/relbareda, middle config/harrowextender, middle config/auto,
+%^^A amsmath, amsmath/mimic, amsmath/strict, esvect, esvect/mimic,
+%^^A esvect/strict, tikz command, tikz options, path options, path, add path
+%^^A options, add tikz options, arrows, line thickness, thinner, pstricks
+%^^A command, psset, geometry, arrow, picture command,%
%^^A },
%^^A index = [3][keywords2],%
%^^A indexstyle = [3]\lstindexmacro,%
diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
index ffdb92ee01b..573a23b6117 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.dtx
@@ -1,33 +1,33 @@
% \iffalse meta-comment
-%
+%
% File: pdfx.dtx
%
% Copyright (c) 2019, CV Radhakrishnan <cvr@river-valley.org>,
% Han The Thanh <thanh@river-valley.org>,
% Ross Moore <ross.moore@mq.edu.au>,
% Peter Selinger <selinger@mathstat.dal.ca>
-%
+%
% This file may be distributed and/or modified under the conditions
% of the LaTeX Project Public License, either version 1.2 of this
% license or (at your option) any later version. The latest version
% of this license is in:
-%
+%
% http://www.latex-project.org/lppl.txt
-%
+%
% and version 1.2 or later is part of all distributions of LaTeX
% version 1999/12/01 or later.
%
% \fi
%
-% \CheckSum{6309}
+% \CheckSum{6802}
% \iffalse
%
%<*driver>
\pdfcompresslevel 9
\providecommand{\pdfxopt}{a-2u}
\providecommand{\lastyear}{2018}
-\providecommand{\thisyear}{2019}
-\begin{filecontents*}{./\jobname.xmpdata}
+\providecommand{\thisyear}{2024}
+\begin{filecontents}[force]{./\jobname.xmpdata}
\Title{Generation of PDF/X- and PDF/A-compliant PDFs with pdfTeX \textemdash\ pdfx.sty}
\Author{\CVR\sep \Thanh\sep Ross Moore\sep Peter Selinger}
\Subject{This package supports generation of PDF/X-, PDF/A- and PDF/E-compliant documents, in most of their variants, using pdfLaTeX, LuaLaTeX and XeLaTeX.}
@@ -37,10 +37,10 @@
\Copyright{Public domain.}
\Copyrighted{False}
\CopyrightURL{http://tug.org/texlive/}
-\CoverDisplayDate{March \thisyear}
-\CoverDate{\thisyear-03-10}
+\CoverDisplayDate{July \thisyear}
+\CoverDate{\thisyear-07-01}
\CreatorTool{LaTeX + pdfx.sty with option \pdfxopt, from TeX Live \thisyear}
-\Date{2017-05-18\sep 2017-06-23\sep 2018-11-29\sep 2018-12-22\sep 2019-02-08\sep 2019-03-10}
+\Date{2024-07-01}
\Advisory{An earlier version of this documentation was published as: TUGboat 36, No.2, pp.136\textendash 142 (2015)}
\Advisory{v1.6: Added XMP support for PDF/UA-1. Added more Metadata fields and Language support.}
\Advisory{v1.6: Default RGB and CMYK profiles now require the colorprofiles.sty package.}
@@ -52,16 +52,29 @@
\Advisory{v1.6: Support for 8-bit Hebrew encodings, some Arabic and Devanagari.}
\Advisory{v1.6: Updated documentation, incl. for LaTeX changes.}
\Advisory{v1.6.1: Fixed issue with ifthen package; improved Metadata with LuaTeX and XeTeX.}
-\Advisory{v.1.6.1: Flexibility with page boxes for PDF/X.}
-\Advisory{v.1.6.2: Fixed passing of options to xcolor, and some glyphtounicode values.}
-\Advisory{v.1.6.2: Fixed encoding issue. Extra warning when colorprofiles.tex is missing.}
-\Advisory{v.1.6.3: Properly fixed encoding issue; supports \string\pdfomitcharset\ primitive.}
-\Advisory{v.1.6.3: Reference to veraPDF validation software; additions to glyphtounicode-ntx.tex.}
-\Advisory{v.1.6.3: Patched \string\mathaccentV\ to output accents after the base character.}
+\Advisory{v1.6.1: Flexibility with page boxes for PDF/X.}
+\Advisory{v1.6.2: Fixed passing of options to xcolor, and some glyphtounicode values.}
+\Advisory{v1.6.2: Fixed encoding issue. Extra warning when colorprofiles.tex is missing.}
+\Advisory{v1.6.3: Properly fixed encoding issue; supports \string\pdfomitcharset\ primitive.}
+\Advisory{v1.6.3: Reference to veraPDF validation software; additions to glyphtounicode-ntx.tex.}
+\Advisory{v1.6.3: Patched \string\mathaccentV\ to output accents after the base character.}
+\Advisory{v1.6.4: Added check and warning with luatex for whether \string\pdfminorversion\ can be changed.}
+\Advisory{v1.6.4: Ensure correct \string\catcode for input characters up to 31, when reading .xmpdata file.}
+\Advisory{v1.6.4: Disabled patched \string\mathaccentV\ due to incompatibility with wide base expressions.}
+\Advisory{v1.6.5: Support for \string\Nickname\ as Metadata command.}
+\Advisory{v1.6.5: Ensure par is unexpandable when reading Metadata.}
+\Advisory{v1.6.5a: Support for Memoir class's \string\stockwidth\ and \string\stockheight.}
+\Advisory{v1.6.5a: Added pdf20 option for PDF 2.0, with support for \string\pdfmajorversion.}
+\Advisory{v1.6.5b: Avoid loading xmpincl package from within a TeX grouping.}
+\Advisory{v1.6.5c: Avoid loading stringenc package from within a TeX grouping.}
+\Advisory{v1.6.5d: Disable some options for xcolor after use.}
+\Advisory{v1.6.5e: Ensure \string\pdfmajorversion\ and \string\pdfminorversion\ are both defined and set correctly.}
+\Advisory{v1.6.5e: Updated documentation; added new Bibliography entries and revised URL links.}
+\Advisory{v1.6.5f: Reset ifpdf properly; support \string\creationdate with XeTeX. Revised Glossary layout.}
\pdfxEnableCommands{%
\def\CVR{C.V. Radhakrishnan}\def\Thanh{H\`an Th\eee Thanh}%
\def\eee{^^c3^^aa^^cc^^81 }}
-\end{filecontents*}
+\end{filecontents}
\PassOptionsToPackage{dvipsnames,svgnames}{xcolor}
\documentclass[a4paper]{ltxdoc}
\usepackage[\pdfxopt]{pdfx}
@@ -104,12 +117,12 @@
% \GetFileInfo{pdfx.dtx}
%
% \DoNotIndex{\newcommand,\newenvironment}
-%
+%
% \DoNotIndex{\def,\edef,\gdef,\xdef,\global,\long,\let}
% \DoNotIndex{\expandafter,\string,\the,\ifx,\else,\fi}
% \DoNotIndex{\csname,\endcsname,\relax,\begingroup,\endgroup}
% \DoNotIndex{\DeclareTextCommand,\DeclareTextCompositeCommand}
-% \DoNotIndex{\space,\@empty,\special,\@nil,\advance\@nnil,\z@,\@@mod}
+% \DoNotIndex{\space,\@empty,\special,\@nil,\z@,\@@mod}
% \DoNotIndex{\\,\@gobble,\@@,\@fornoop,\@fortmp,\@ifundefined,\@firstoftwo,\@secondoftwo}
% \DoNotIndex{\@tempcnta,\@tempcntb,\@tempboxa,\ifnot@empty,\@this,\@firstofone}
% \DoNotIndex{\{,\},\alph,\bgroup,\dp,\ht,\kern,\egroup}
@@ -134,78 +147,92 @@
% \DoNotIndex{\scantokens,\typeout,\vrule,\wd}
%
% \changes{v1.00}{2008/12/01}{Initial commit to the CVS.}
-% \changes{v1.01}{2008/12/10}{glyphtounicode-cmr.tex included with the package.}
-% \changes{v1.3}{2008/12/01}{Fix copyright in xmp files.}
+% \changes{v1.01}{2008/12/10}{\texttt{glyphtounicode-cmr.tex} included with the package.}
+% \changes{v1.3}{2008/12/01}{Fix copyright in \texttt{.xmp} files.}
% \changes{v1.5.4}{2015/02/28}{Fixed timezone bug; Unicode support; more
% PDF variants; added color profiles.}
-% \changes{v1.5.5}{2015/03/23}{Support for PDF/X-4p and PDF/X-5pg
+% \changes{v1.5.5}{2015/03/23}{Support for PDF/X-4p and PDF/X-5pg
% with external color profiles.}
% \changes{v1.5.6}{2016/02/05}{Suppressed `dummy-space' font warning;
-% removed spurious '?' in XMP packets; improved handling of Color Profiles;
-% ensure Hy@pdfatrue when building PDF/A, for link flags;
-% properly enables xcolor conversion of color models.}
-% \changes{v1.5.7}{2016/02/17}{Removed UTF-8 characters that appear in
+% removed spurious `?' in XMP packets; improved handling of Color Profiles;
+% ensure \texttt{\textbackslash Hy@pdfatrue} when building PDF/A, for link flags;
+% properly enables \texttt{xcolor} conversion of color models.}
+% \changes{v1.5.7}{2016/02/17}{Removed UTF-8 characters that appear in
% the documentation only, within comments in the package source,
% but result in a validation failure. Language support in XMP metadata.
% Added macros for Windows and Mac system color profile directories.}
% \changes{v1.5.8}{2016/05/03}{MediaBox, TrimBox, etc. derived from
-% the paperheight, paperwidth. Improved language support, incl. KOI8-R
+% the \texttt{\textbackslash paperheight}, \texttt{\textbackslash paperwidth}.
+% Improved language support, incl. KOI8-R
% encoded cyrillics, Armenian OT6, and LGR Greek encoding, incl. polytonic Greek.
% All the encodings Latin-1--9 are supported for upper 8-bit characters.
-% Fixed the quoted file-name problem, evident with LuaTeX.
+% Fixed the quoted file-name problem, evident with Lua\TeX.
% Method to generate correct bookmarks with non-active (transliterated) input.
-% Added support for XeLaTeX, improvements with LuaTeX. Updated documentation.}
+% Added support for Xe\LaTeX, improvements with Lua\TeX. Updated documentation.}
% \changes{v1.5.82}{2017/05/12}{%
-% Adjusted to changes in the LaTeX core, affecting macros for composite
+% Adjusted to changes in the \LaTeX\ core, affecting macros for composite
% commands; incl. \texttt{\textbackslash textsuperscript} and others.}%
-% \changes{v1.5.83}{2017/05/16}{Improved support for XeLaTeX and LuaLaTeX.}%
-% \changes{v1.5.84}{2017/05/18}{Fully expand options for hyperref. Better support
+% \changes{v1.5.83}{2017/05/16}{Improved support for Xe\LaTeX\ and Lua\LaTeX.}%
+% \changes{v1.5.84}{2017/05/18}{Fully expand options for \texttt{hyperref}. Better support
% for extended IPA letters and modifiers. Adjusted release versions and dates.}%
-% \changes{v1.5.85}{2017/06/23}{Fixed bugs, and fully implemented L8U as
-% a pseudo-encoding; renamed L8U files into the form *-penc.def }%
-% \changes{v1.6}{2018/11/18}{Added XMP support for PDF/UA-1.
-% Added more Metadata fields and Language support.
-% Default RGB and CMYK profiles now require the colorprofiles.sty package.
-% Added file CallasColorProfiles.tex .
-% Revised glyphtounicode.sty to use variation selectors, altered maps to PUA
-% codepoints; added more glyphs via glyphtounicode-ntx.tex .
+% \changes{v1.5.85}{2017/06/23}{Fixed bugs, and fully implemented L8U as
+% a pseudo-encoding; renamed L8U files into the form \texttt{*-penc.def}.}%
+% \changes{v1.6}{2018/11/18}{Added XMP support for PDF/UA-1.
+% Added more Metadata fields and Language support.
+% Default RGB and CMYK profiles now require the \texttt{colorprofiles.sty} package.
+% Added file \texttt{CallasColorProfiles.tex}.
+% Revised \texttt{glyphtounicode.sty} to use variation selectors, altered maps to PUA
+% codepoints; added more glyphs via \texttt{glyphtounicode-ntx.tex}.
% Support for 8-bit Hebrew encodings, some Arabic and Devanagari.
-% Updated documentation, incl. for LaTeX changes.
+% Updated documentation, incl. for \LaTeX\ changes.
% }%
-% \changes{v1.6.1}{2018/12/22}{Fixed issue with ifthen package;
-% improved Metadata with LuaTeX and XeTeX. Flexibility with page boxes for PDF/X.}%
-% \changes{v1.6.2}{2019/01/04}{Fixed passing of options to xcolor, and some glyphtounicode values.}%
-% \changes{v1.6.3}{2019/02/27}{Fixed encoding issues; support for new pdfomitcharset primitive;
-% reference to veraPDF validation software; additions to glyphtounicode-ntx.tex.}%
+% \changes{v1.6.1}{2018/12/22}{Fixed issue with \texttt{ifthen} package;
+% improved Metadata with Lua\TeX\ and Xe\TeX. Flexibility with page boxes for PDF/X.}%
+% \changes{v1.6.2}{2019/01/04}{Fixed passing of options to \texttt{xcolor}, and some \texttt{glyphtounicode} values.}%
+% \changes{v1.6.3}{2019/02/27}{Fixed encoding issues; support for new \texttt{\textbackslash pdfomitcharset} primitive;
+% reference to \textsf{veraPDF} validation software; additions to \texttt{glyphtounicode-ntx.tex}.}%
+% \changes{v1.6.4}{2019/09/26}{Added check and warning with \texttt{luatex} for whether \texttt{\textbackslash pdfminorversion} can be changed;
+% ensure correct \texttt{\textbackslash catcode} for input characters up to 31, when reading \texttt{.xmpdata} file;
+% disabled patched \texttt{\textbackslash mathaccentV} due to incompatibility with wide base expressions.}
+% \changes{v1.6.5}{2021/07/06}{Support for \texttt{\textbackslash Nickname} as Metadata command;
+% ensure \texttt{\textbackslash par} is unexpandable when processing XMP metadata.}
+% \changes{v1.6.5a}{2023/10/17}{Added option \texttt{pdf20} for future need with PDF 2.0; support for \texttt{\textbackslash pdfmajorversion};
+% support for Memoir's \texttt{\textbackslash stockwidth} and \texttt{\textbackslash stockheight} dimen registers.}
+% \changes{v1.6.5b}{2024/04/05}{Avoid loading \texttt{xmpincl} package from within a \TeX\ grouping.}
+% \changes{v1.6.5c}{2024/05/23}{Avoid loading \texttt{stringenc} package from within a \TeX\ grouping.}
+% \changes{v1.6.5d}{2024/05/29}{Adjust for non-zero \texttt{\textbackslash stockwidth} only; prevent changes to \texttt{xcolor} options after use.}
+% \changes{v1.6.5e}{2024/06/22}{Ensure \texttt{\textbackslash pdfmajorversion} and \texttt{\textbackslash pdfminorversion}
+% are both defined and set correctly. Updated documentation; added new Bibliography entries and revised URL links.}
+% \changes{v1.6.5f}{2024/06/24}{Reset \texttt{\textbackslash ifpdf} properly; support \texttt{\textbackslash creationdate} with Xe\TeX. Revised Glossary layout.}
% \title{Generation of PDF/X- and PDF/A-\penalty-200 compliant PDFs with \pdftex --- \texttt{pdfx.sty}}
-% \date{2019/02/27}
-% \version{1.6.3}
+% \date{2024/07/01}
+% \version{1.6.5f}
% \keywords{PDF, PDF/A, PDF/X, pdf\TeX, \LaTeX, Multilingual Metadata}
% \author{C.\,V.\,Radhakrishnan, \Thanh, Ross Moore {\upshape\small
% and} Peter Selinger}
% \contact{\texttt{[cvr,thanh]@river-valley.org},\\%
-% \texttt{ross.moore@mq.edu.au}, \texttt{selinger@mathstat.dal.ca}\hss}
-%
+% \texttt{ozross@icloud.com}, \texttt{selinger@mathstat.dal.ca}\hss}
+%
% \maketitle
%
% \StopEventually{}
%
% \section[Introduction]{Introduction}
%
-% This package\footnote{An earlier version of this documentation
+% This package\footnote{An earlier version of this documentation
% was published as \cite{pdfx}. All the changes since then have been developed
% and coded by the 3rd-listed author.}
-% currently supports generation of PDF/X-, PDF/A- and PDF/E-compliant
+% currently supports generation of PDF/X-, PDF/A- and PDF/E-compliant
% documents, using \pdftex, in most of their variants;
% see the complete list in Section~\ref{ssec-options} below.
% As of \TeX\,Live 2016 it now also works with Lua\LaTeX\ and Xe\LaTeX,
% when using appropriate command-line options\footnote{%
-% The required invokation is:\quad
+% The required invocation is:\quad
% |xelatex --shell-escape -output-driver="xdvipdfmx -z 0" <filename>.tex |}, but
% with some limitations --- see Sections~\ref{sssec-xetex} and \ref{sssec-luatex}.
-% By `supports', we mean that the package provides correct and sufficient
+% By `supports', we mean that the package provides correct and sufficient
% means to declare that a document conforms with a stated PDF variant
-% (PDF/X, PDF/A, PDF/E, PDF/VT, PDF/UA, etc.) along with the version and/or
+% (PDF/X, PDF/A, PDF/E, PDF/VT, PDF/UA, etc.) along with the version and/or
% level of conformance.
% This package also allows appropriate Metadata and Color Profile
% to be specified, according to the requirements of the PDF variant.
@@ -216,7 +243,7 @@
% information as well as a large range of optional data, a fully validating
% PDF file cannot be achieved. The PDF can be created, having the correct
% visual appearance on all pages, but it will not pass validation checks.
-% Sections~\ref{ssec-metadata} and \ref{ssec-multi} describe
+% Sections~\ref{ssec-metadata} and \ref{ssec-multi} describe
% how this file should be constructed.
%
% \medskip
@@ -224,23 +251,24 @@
% of document structure and type of content that may be required
% (or restricted) within a PDF variant. For example, PDF/VT \cite{PDFVT} requires
% well-structured parts, using Form XObject sections tagged as `/DPart'.
-% Similarly PDF/A-1a (and 2a and 3a) \cite{PDFA,PDFA2,PDFA3} require
-% a fully `Tagged PDF', including a detailed structure tagging which
+% Similarly PDF/A-1a (and 2a and 3a) \cite{PDFA,PDFA2,PDFA3} require
+% a fully `Tagged PDF', including a detailed structure tagging which
% envelops the complete contents of the document, as does also PDF/UA \cite{PDF-UA}.
-% This is beyond the current version of \LaTeX\ engines, as commonly shipped.
+% This is beyond the current version of \LaTeX\ engines as commonly shipped;
+% though see Section~\ref{sec-pdf20} for recent developments.
% So while this package provides enough to meet the declaration,
-% metadata and font-handling aspects for these PDF/A variants,
-% it is not sufficient to produce fully conforming PDFs.
-% However, with extra \pdftex-based software or macro coding that \emph{is} capable
-% of producing `Tagged PDF', this package can be used as part of
-% the overall workflow to produce fully conforming documents.
+% Metadata and font-handling aspects for these PDF/A variants,
+% it is not sufficient to produce fully-conforming PDFs.
+% However, with extra \pdftex-based software or macro coding that \emph{is} capable
+% of producing `Tagged PDF', this package can be used as part of
+% the overall workflow to produce fully-conforming documents; see \cite{tpdf}.
%
%
% \subsection{PDF standards}\label{ssec-standards}
%
% PDF/X and PDF/A are umbrella terms used to denote several ISO
-% standards \cite{PDFX,PDFX3,PDFX1a,PDFX4,PDFX5,PDFA,PDFA2,PDFA3}
-% that define different subsets of the PDF standard \cite{PDF17,ISO32000}.
+% standards \cite{PDFX,PDFX3,PDFX1a,PDFX4,PDFX5,PDFA,PDFA2,PDFA3}
+% that define different subsets of the PDF standard \cite{PDF17,ISO32000}.
% The objective of PDF/X is to facilitate graphics exchange between
% document creator and printer and therefore, has all requirements
% related to printing. For instance, in PDF/X, all fonts need to be
@@ -249,28 +277,28 @@
% specifications of PDF/X.
% Since 2005 other variants of PDF/X have emerged, as extra effects
% (such as layering and transparency) have been supported within the PDF
-% standard itself. The full range of versions and conformance supported
+% standard itself. The full range of versions and conformance supported
% in this package is discussed below in Section~\ref{ssec-options}.
%
% PDF/A defines a profile for archiving PDF documents, which ensures
% the documents can be reproduced in the exact same way in years to
% come. A key element to achieving this is that PDF/A documents
% are 100\% self-contained. All the information needed to display the
-% document in the same manner every time is embedded in the file.
+% document in the same manner every time is embedded in the file.
% A PDF/A document is not permitted to be reliant on information from
% external sources. Other restrictions include avoidance of
-% audio/video content, JavaScript and encryption.
-% Mandatory inclusion of fonts, color profile and standards-based metadata
+% audio/video content, JavaScript and encryption.
+% Mandatory inclusion of fonts, color profile and standards-based metadata
% are absolutely essential for PDF/A.
% Later versions allow for use of image compression and file attachments.
%
-% PDF/E is an ISO standard \cite{PDFE} intended for documents used in engineering workflows.
+% PDF/E is an ISO standard \cite{PDFE} intended for documents used in engineering workflows.
% PDF/VT \cite{PDFVT} allows for high-volume customised form printing, such as utility bills.
% PDF/UA (`Universal Accessibility') has emerged as a standard \cite{PDF-UA,PDFUA1,PDFUABSI}
-% supporting Assistive Technologies, incorporating web-accessibility guidelines (WCAG)
-% for electronic documents.
+% supporting Assistive Technologies, incorporating web-accessibility guidelines (WCAG)
+% for electronic documents.
% In future, PDF/H may emerge for health records and medical-related
-% documents. Other applications can be envisaged.
+% documents. Other applications can be envisaged.
% Declarations and Metadata are supported for the first three of these.
% The others are the subject of further work; revised versions of this
% package can be expected in later years.
@@ -281,6 +309,30 @@
% and whatever else is relevant to how the standards have been established
% and how they can be used.
%
+% \subsection{Later \LaTeX\ changes, support for newer PDF standards}\label{sec-pdf20}
+%
+% Although PDF 2.0~\cite{PDF20} was first published in 2017 and revised in 2020, it has taken
+% a long time for it to become a target format for documents built using \LaTeX.
+% This is because the requirement of using `Tagged PDF' is stringent, requiring
+% a reworking of almost every aspect of \LaTeX's document production model \cite{LaTeXPDF}.
+% Work to this end is going on, via the PDF Association's `\LaTeX\ Project LWG'\cite{PDF-LaTeX},
+% the experimental |tagpdf| package \cite{tagpdf}, and Ross Moore's |tpdf| package and macro suite \cite{tpdf}.
+% Significant internal changes have been made to \LaTeX\ itself, which in turn have
+% required the |v1.6.5x| updates in 2024 to this |pdfx| package. We thank the following users for reporting
+% issues arising from such changes: Sergio Zenoni, Takehiko Tanabe, Tom\'a\v s Nov\'a\v cek.
+%
+% In early 2024 the PDF Association published several documents for new and updated standards
+% based upon PDF 2.0~\cite{PDF20}. These include PDF/UA-2 \cite{PDFUA2}, PDF `Declarations' \cite{PDFDecl},
+% `Well-Tagged PDF' (WTPDF) \cite{WTPDF} with declarations for `Accessibility' and `Reuse',
+% adding to PDF/A-4 \cite{PDFA4}, PDF/X-6 \cite{PDFX6} and PDF/VT-3 \cite{PDFVT3}, each with various flavours.
+% To support these, there will be released in late 2024 a variant named |pdfx2| as an extension of |pdfx|,
+% with separate documentation detailing how to specify appropriate XMP metadata \cite{XMP-ISO}.
+%
+% Once |pdfx2| becomes available, this will take on the role of handling new developments for
+% \LaTeX\ support of PDF 2.0-based software solutions. The |pdfx| package will remain under
+% active development, primarily to ensure compatibility of existing documents with PDF 1.7-based
+% requirements (tagged or otherwise), following any further changes in \LaTeX\ or other packages.
+%
% \section[Usage]{Usage}\label{sec-usage}
%
% The package can be loaded with the command:
@@ -292,7 +344,7 @@
% \subsection{Package options}\label{ssec-options}
%
% \subsubsection{PDF/A options}
-%
+%
% PDF/A is an ISO standard~\cite{PDFA,PDFA2,PDFA3} intended for long-term archiving of
% electronic documents. It therefore emphasizes self-containedness and
% reproducibility, as well as machine-readable metadata. The PDF/A
@@ -307,7 +359,7 @@
% versions contain a subset of the features of later versions, so for
% maximum portability, it is preferable to use a lower-numbered
% version, when the extra features allowed in higher versions are not used.
-% There is no conformance level `u' in version 1 of the standard.
+% There is no conformance level `u' in version 1 of the standard.
% Thus for many typical uses of PDF/A, it is sufficient to use PDF/A-1b.
%
% \begin{itemize}
@@ -320,28 +372,28 @@
% \item |a-3b|: generate PDF/A-3b.
% \item |a-3u|: generate PDF/A-3u.
% \end{itemize}
-% By `Experimental, not fully implemented' here we mean primarily that
+% By `Experimental, not fully implemented' here we mean primarily that
% the document structure, as required for `Tagged PDF', is not handled
-% by this package. Using other \pdftex-based software that \emph{is}
+% by this package. Using other \pdftex-based software that \emph{is}
% capable of producing such complete tagging, conforming documents
% can indeed be produced.
%
% \subsubsection{PDF/E options}
-%
+%
% PDF/E is an ISO standard~\cite{PDFE} intended for documents used in engineering
% workflows. There is only one version of the PDF/E standard so far,
% and it is called PDF/E-1.
-%
+%
% \begin{itemize}
% \item |e-1|: generate PDF/E-1.
% \item |e|: same as |e-1|.
% \end{itemize}
%
% \subsubsection{PDF/UA options}
-%
-% PDF/UA is an ISO and ANSI standard~\cite{PDF-UA,PDFUABSI} intended for making
-% structured documents readable and navigable using Assistive Technology;
-% e.g., screen-readers, Braille keyboards and such-like.
+%
+% PDF/UA is an ISO and ANSI standard~\cite{PDF-UA,PDFUABSI} intended for making
+% structured documents readable and navigable using Assistive Technology;
+% e.g., screen-readers, Braille keyboards and such-like.
% Documents prepared this way can be easily saved in other formats which
% preserve the structure, such as XML, HTML, and (Microsoft) Word-based formats.
%
@@ -359,20 +411,20 @@
% multi-file exchange, and level 2s is for streamed delivery.
% Currently, none of the PDF/VT conformance levels are fully
% implemented by the |pdfx| package.
-%
+%
% \begin{itemize}
% \item |vt-1|: generate PDF/VT-1, based on PDF/X-4. Experimental, not fully implemented
% \item |vt-2|: generate PDF/VT-2, based on PDF/X-5pg. Experimental, not fully implemented.
% \item |vt-2s|: generate PDF/VT-2s. Experimental, not fully implemented.
% \end{itemize}
-% By `Experimental, not fully implemented' here we mean primarily that
+% By `Experimental, not fully implemented' here we mean primarily that
% the structuring of a document into `/DPart' sections, as Form XObjects,
-% is not handled by this package.
-% This \emph{is} possible with current \pdftex\ software,
+% is not handled by this package.
+% This \emph{is} possible with current \pdftex\ software,
% but not yet in a way that lends itself easily to full automation, due to
% requirements of knowing the internal object number of certain internal
-% PDF constructs. All the other aspects: PDFInfo declaration, Metadata
-% and Color Profile, of the PDF/VT variants are correctly handled.
+% PDF constructs. All the other aspects: PDFInfo declaration, Metadata
+% and Color Profile, of the PDF/VT variants are correctly handled.
%
% \subsubsection{PDF/X options}
%
@@ -380,13 +432,13 @@
% emphasizes printing-related requirements, such as embedded fonts and
% color profiles. The PDF/X standard has a large number of variants
% and conformance levels. The basic variants are X-1, X-1a,
-% X-3, X-4, and X-5. (Note that a revised version of the X-2 standard
-% was published in 2003 but withdrawn as an ISO standard in 2011,
-% basically due to lack of interest in using it).
-% The PDF/X-1a standard exists in revisions of 2001 and 2003,
-% the PDF/X-3 standard exists in revisions of 2002 and 2003,
-% and the PDF/X-4 and PDF/X-5 standards exist in revisions of 2008 and 2010.
-% Moreover, some of these standards have a `p' version, which permits the
+% X-3, X-4, and X-5. (Note that a revised version of the X-2 standard
+% was published in 2003 but withdrawn as an ISO standard in 2011,
+% basically due to lack of interest in using it).
+% The PDF/X-1a standard exists in revisions of 2001 and 2003,
+% the PDF/X-3 standard exists in revisions of 2002 and 2003,
+% and the PDF/X-4 and PDF/X-5 standards exist in revisions of 2008 and 2010.
+% Moreover, some of these standards have a `p' version, which permits the
% use of an externally supplied color profile (instead of an embedded one),
% and/or a `g' version, which permits the use of external graphical
% content. Moreover, PDF/X-5 has an `n' version, which extends
@@ -401,14 +453,14 @@
% \item |x-2|: generate PDF/X-2; unpublished, doesn't validate.
% \item |x-3|: generate PDF/X-3. Options |x-302| and |x-303| are
% also available to specify PDF/X-3:2002 or PDF/X-3:2003 explicitly.
-% \item |x-4|: generate PDF/X-4. Options |x-408| and |x-410| are
+% \item |x-4|: generate PDF/X-4. Options |x-408| and |x-410| are
% also available to specify PDF/X-4:2008 or PDF/X-4:2010 explicitly.
% \item |x-4p|: generate PDF/X-4p. Options |x-4p08| and |x-4p10| are
% also available to specify PDF/X-4p:2008 or PDF/X-4p:2010 explicitly.
% \item |x-5g|: generate PDF/X-5g. Options |x-5g08| and |x-5g10| are
% also available to specify PDF/X-5g:2008 or PDF/X-5g:2010 explicitly.
% \item |x-5n|: generate PDF/X-5n. Options |x-5n08| and |x-5n10| are
-% also available to specify PDF/X-5n:2008 or PDF/X-5n:2010 explicitly.
+% also available to specify PDF/X-5n:2008 or PDF/X-5n:2010 explicitly.
% Experimental, not fully implemented.
% \item |x-5pg|: generate PDF/X-5pg. Options |x-5pg08| and |x-5pg10| are
% also available to specify PDF/X-5pg:2008 or PDF/X-5pg:2010 explicitly.
@@ -441,9 +493,11 @@
% applicable standard.\\This may produce a non-standard-conforming PDF file.
% \item |pdf17|: use PDF 1.7, overriding the version specified by the
% applicable standard.\\This may produce a non-standard-conforming PDF file.
+% \item |pdf20|: use PDF 2.0, experimental in preparation for use with future
+% software, under development. This may produce a non-standard-conforming PDF file.
% \item |nocharset|: do not generate the Charset entry for fonts (\pdftex\ only).
% \item |usecharset|: generate the Charset entry for fonts (\pdftex\ only).
-% \end{itemize}
+% \end{itemize}
% The latter two options affect the value of the |\pdfomitcharset| primitive,
% added to \pdftex\ in 2019, due to differing requirements for PDF/A-1
% and other PDF/A versions. Indeed use of the |/Charset| entry for a font
@@ -451,14 +505,14 @@
%
% \subsubsection{XMP language options}\label{ssec-xmplang}
%
-% These options allow for characters in alphabets other than those
-% used for English and Western European languages to be used
-% within the |.xmpdata| file (see Section~\ref{ssec-metadata}),
+% These options allow for characters in alphabets other than those
+% used for English and Western European languages to be used
+% within the |.xmpdata| file (see Section~\ref{ssec-metadata}),
% supported through \LaTeX\ character representation macros.
% \begin{itemize}
-% \item |latxmp|: extended Latin blocks, |Ux0180|--|Ux024F|
-% and |Ux1E00|--|Ux1EFF|
-% \item |armxmp|: armenian letters and ligatures, |Ux0530|--|Ux058F|,
+% \item |latxmp|: extended Latin blocks, |Ux0180|--|Ux024F|
+% and |Ux1E00|--|Ux1EFF|
+% \item |armxmp|: armenian letters and ligatures, |Ux0530|--|Ux058F|,
% via macros |\armyba|, |\armfe|, |\armcomma|, etc.
% \item |cyrxmp|: cyrillic letters and accents, |Ux0400|--|Ux04FF|
% and |Ux0500|--|Ux0527| via macros |\cyra|, |\CYRN|, etc.
@@ -472,8 +526,8 @@
% via macros |\abreve|, |\uhorn|, |\ECIRCUMFLEX|, etc.
% \item |ipaxmp|: phonetic extensions, |Ux0250|--|Ux02AF|
% and |Ux1D00|--|Ux1DFF|
-% \item |mathxmp|: mathematical letters, symbols, operators
-% arrows, alphanumeric forms.
+% \item |mathxmp|: mathematical letters, symbols, operators
+% arrows, alphanumeric forms.
% \item |allxmp|: all of the above, as well as those listed next;
% used primarily for testing compatibility with other packages.
% \end{itemize}
@@ -486,13 +540,13 @@
% Further options allow direct (enclosed) input of upper 8-bit
% characters, from encodings such as Latin-1--Latin-9, KOI8-R,
% LGR (Greek), ArmSSCI8, and a few more.
-% Use of these requires a carefully controlled parsing regime.
+% Use of these requires a carefully controlled parsing regime.
% Here we list the package options that declare such content
% may be present in the |.xmpdata| file.
-% A detailed account of how these are used is given
+% A detailed account of how these are used is given
% in~Section~\ref{ssec-multi} (``Multilingual Metadata'').
% \begin{itemize}
-% \item |LATxmp|: support for direct use of the upper-range characters
+% \item |LATxmp|: support for direct use of the upper-range characters
% (byte codes 160--255) for input encodings Latin1--Latin9, for
% Latin-based alphabets as used in European countries and elsewhere.
% This defines parser macros |\textLAT|, |\textLII|, \dots, |\textLIX|.
@@ -501,7 +555,7 @@
% of upper-range characters (byte codes 148--255) under input
% encodings KOI8-R and KOIR8-RU, using |\textKOI| as parser macro.
% All support from |cyrxmp| is loaded also.
-% \item |LGRxmp|: support for greek letters entered using either
+% \item |LGRxmp|: support for greek letters entered using either
% the LGR input transliteration of ASCII characters, or the ISO-8859-7
% encoding of upper-range characters (byte codes 160--255),
% or a combination of both, using |\textLGR| as parser macro.
@@ -509,25 +563,25 @@
% \item |AR8xmp|: support for armenian letters entered using the
% Arm\TeX~2.0 input transliteration of ASCII characters, or the
% ArmSCII8 encoding of upper-range characters (byte codes 160--255),
-% or a combination of both, using |\textARM| as parser macro.
+% or a combination of both, using |\textARM| as parser macro.
% All support from |armxmp| is loaded also.
-% \item |HEBxmp|: support for hebrew letters entered using either
-% LHE input transliteration of ASCII characters, or the CP1255, CP862
+% \item |HEBxmp|: support for hebrew letters entered using either
+% LHE input transliteration of ASCII characters, or the CP1255, CP862
% or ISO-8859-8 (HE8) encoding of upper-range characters (byte codes 160--255),
% or a combination of these using |\textLHE|, |\textHEBO|, |\textHEB| as parser macros.
% All support from |hebxmp| is loaded also.
% \end{itemize}
-% These `parser' options have received limited testing, so please
+% These `parser' options have received limited testing, so please
% report any mistakes in the UTF-8 output that you may encounter.
%
% \subsection{Data file for metadata}\label{ssec-metadata}
%
-% As mentioned above, standards-compliant PDF documents require
-% document-level metadata to be included.
-% This, known as an `XMP packet'~\cite{XMP-spec,XMP-ISO},
+% As mentioned above, standards-compliant PDF documents require
+% document-level metadata to be included.
+% This, known as an `XMP packet'~\cite{XMP-spec,XMP-ISO},
% is like having a library catalog card included within the PDF itself. It is an unencrypted
% portion of the PDF file, with data expressed in Extensible Markup Language (XML),
-% using Resource Description Format (RDF~\cite{RDF}) syntax, encoded as UTF-8
+% using Resource Description Format (RDF~\cite{RDF}) syntax, encoded as UTF-8
% so readable by any text editing software on any modern computing platform.
%
% Some advantages of doing this are clear.
@@ -539,12 +593,12 @@
% \item For the author(s): who can specify the kind of information most appropriate
% to help readers understand the nature and purpose of the document.
% \end{itemize}
-%
-% The |pdfx| package builds the XMP metadata from information supplied via a special data file
-% called |\jobname.xmpdata|. Here, |\jobname| is usually the basename of the document's main
-% |.tex| file. For example, if your document source is in the file |main.tex|,
-% then the metadata must be in a file called |main.xmpdata|.
-% None of the individual metadata fields are mandatory, but for most documents, it makes sense
+%
+% The |pdfx| package builds the XMP metadata from information supplied via a special data file
+% called |\jobname.xmpdata|. Here, |\jobname| is usually the basename of the document's main
+% |.tex| file. For example, if your document source is in the file |main.tex|,
+% then the metadata must be in a file called |main.xmpdata|.
+% None of the individual metadata fields are mandatory, but for most documents, it makes sense
% to specify at least the title and the author. For more technical aspects of metadata
% and its uses, consult the work of the Dublin Core Initiative~\cite{DC} and PRISM~\cite{PRISM}.
%
@@ -557,72 +611,73 @@
% |\Publisher{Baking International}|
% \end{decl}
% You should note that multiple authors and keywords have been separated
-% by |\sep|. This |\sep| macro serves a technical purpose and is
+% by |\sep|. This |\sep| macro serves a technical purpose and is
% permitted within the |\Author|, |\Keywords|, and |\Publisher| fields,
-% as well as some others. See \S\ref{mdfields} below for a complete listing
+% as well as some others. See \S\ref{mdfields} below for a complete listing
% of the supported author-supplied metadata fields.
%
% After processing, the local directory contains a file named such as
% |pdfa.xmpi| or |pdfe.xmpi| or |pdfx.xmpi| according to the PDF variant desired.
-% This file is the complete XMP Metadata packet.
-% It can be checked for validity, using an online validator, such as at
+% This file is the complete XMP Metadata packet.
+% It can be checked for validity, using an online validator, such as at
% \href{http://www.pdflib.com/knowledge-base/xmp-metadata/free-xmp-validator/}{www.pdflib.com}.
-% \textsf{veraPDF}~\cite{veraPDF} is Open Source software providing validation for PDF/A,
+% \textsf{veraPDF}~\cite{veraPDF} is Open Source software providing validation for PDF/A,
% and other checkers useful in a PDF/A production setting.
-%
+%
% \textbf{Warning}: The |\jobname.xmpdata| file may be included in the
-% main document source, within a |{filecontents*}| environment,
+% main document source, within a |{filecontents}| environment,
% provided this comes \emph{before} the |\documentclass| command, as follows.
+% The |force| option ensures overwriting a previous file to catch recent edits.
% \begin{decl}[]
-% |\begin{filecontents*}{\jobname.xmpdata}|\\
+% |\begin{filecontents}[force]{\jobname.xmpdata}|\\
% | \Title{Baking through the ages}|\\
% | \Author{A. Baker\sep C. Kneader}|\\
% | \Language{en-GB}|\\
% | \Keywords{cookies\sep muffins\sep cakes}|\\
% | \Publisher{Baking International}|\\
-% |\end{filecontents*}|\\
+% |\end{filecontents}|\\
% |\documentclass[11pt,a4paper]{article}|\\
% |...|
% \end{decl}
% Including the metadata with the \LaTeX\ source is very convenient.
-% Having it at the top of the file also brings attention to it, placing emphasis on
-% the desirability of including metadata, and keeping it accurate while the main
-% content of the document is subject to changes or revision.
-% Macro definitions can also occur prior to the |\documentclass| command,
-% including any that may be needed within the metadata.
+% Having it at the top of the file also brings attention to it, placing emphasis on
+% the desirability of including metadata, and keeping it accurate while the main
+% content of the document is subject to changes or revision.
+% Macro definitions can also occur prior to the |\documentclass| command,
+% including any that may be needed within the metadata.
% An example of this is apparent in Figure~\ref{koi8-code} occurring later.
%
-% However, this ordering is also extremely important, else any non-ascii UTF-8 byte
-% sequences can become active characters and expand upon data being written out,
+% However, this ordering is also extremely important, else any non-ascii UTF-8 byte
+% sequences can become active characters and expand upon data being written out,
% rather than remaining as inactive bytes.
% If you edit the metadata supplied this way, remember to remove the
% existing copy of |\jobname.xmpdata| file before the next processing run,
-% as \LaTeX\ does not write a new copy of the file when it exists on disk already,
+% as \LaTeX\ does not write a new copy of the file when it exists on disk already,
% within the current working directory or elsewhere that \LaTeX\ may find.
% In development or testing situations the filename may need to be given as
% |./\jobname.xmpdata|, else an older version may be loaded in error.
-%
+%
% Experienced users/programmers can employ the \verb|\write18| mechanism%
-% \footnote{If you don't already know what this is, they you probably
-% should not try using it |:-)|.}, together with the |--shell-escape| command-line
-% option, to automatically execute a shell command that removes |\jobname.xmpdata|
-% on every (or on selected) processing runs.
+% \footnote{If you don't already know what this is, they you probably
+% should not try using it |:-)|.}, together with the |--shell-escape| command-line
+% option, to automatically execute a shell command that removes |\jobname.xmpdata|
+% on every (or on selected) processing runs.
% This is only useful when the metadata changes, for whatever reason.
%
% \medskip
-% Other places for the |{filecontents*}| environment can work,
+% Other places for the |{filecontents}| environment can work,
% but \emph{only} when it contains \emph{no} non-ascii UTF-8 byte sequences.
-% Since 2018, with default
+% Since 2018, with default
% See Section~\ref{ssec-symbols} below for more information on the macros
% that can be safely used within |.xmpdata| metadata files.
-%
+%
% \subsection{List of supported metadata fields}\label{mdfields}
-%
+%
% Following is a complete list of user-definable metadata fields currently supported,
% separated into particular groupings.
-% Each command is accompanied by the specific XML tagged field name (with namespace)
-% that is placed into the document-level Metadata packet, as well as the kind of information
-% being conveyed.
+% Each command is accompanied by the specific XML tagged field name (with namespace)
+% that is placed into the document-level Metadata packet, as well as the kind of information
+% being conveyed.
% More may be added in the future.
% These commands can \emph{only} be used within the |.xmpdata| file.
%
@@ -630,13 +685,13 @@
% using RFC5646 (BCP 47)~\cite{BCP47} codes, in which the metadata field is given.
% Languages for multiple entries can use e.g., |\sep[de] ...|.
% Only those fields requiring a specific format (e.g. dates) do \emph{not}
-% support language specifiers; these are indicated with \fixmd.
+% support language specifiers; these are indicated with \fixmd.
% Fields allowing more than one value are indicated with \starmd.
% Multiple values may be given as separate instances of the macro, or as a single
-% instance with the values delimited by |\sep|, as in the example above.
-%
+% instance with the values delimited by |\sep|, as in the example above.
+%
% \subsubsection{General information:}
-%
+%
% \begin{itemize}
% \item \starmd|\Author|: \hfill (|dc:creator|)\\
% the document's human author(s). Separate multiple authors with |\sep|.
@@ -661,10 +716,10 @@
% location of a web page describing the owner
% and/or rights statement for this document.
% \item \fixmd|\Copyrighted|: \hfill (|xmpRights:Marked|)\\
-% `True' if the document is copyrighted, and `False' if it isn't.
-% This is automatically set to `True' if either |\Copyright| or |\CopyrightURL| is specified,
-% but this can be overridden.
-% For example, if the copyright statement is `Public Domain',
+% `True' if the document is copyrighted, and `False' if it isn't.
+% This is automatically set to `True' if either |\Copyright| or |\CopyrightURL| is specified,
+% but this can be overridden.
+% For example, if the copyright statement is `Public Domain',
% then specify also |\Copyrighted{False}|.
% \item \starmd|\Owner|: \hfill (|xmpRights:Owner|)\\
% specifies the owner(s) of the document or resource.
@@ -673,18 +728,18 @@
% \end{itemize}
%
% \subsubsection{more Dublin Core metadata:}\label{sssec-dc}
-% From version 1.6 of |pdfx.sty|, the following fields can be used to provide a greater
-% range of information to be specified as metadata.
+% From version 1.6 of |pdfx.sty|, the following fields can be used to provide a greater
+% range of information to be specified as metadata.
% \begin{itemize}
% \item \starmd|\Contributor|: \hfill (|dc:contributor|)\\
% contributor(s) other than author(s) of the PDF document.
% \item |\Coverage|: \hfill (|dc:coverage|)\\
% statement about the extent or scope of the document's contents.
% \item \starmd\fixmd|\Date|: \hfill (|dc:date|)\\
-% date(s) when something significant occurred relating to the resource (e.g., version changes);
+% date(s) when something significant occurred relating to the resource (e.g., version changes);
% must be in ISO date format |YYYY-MM-DD| or |YYYY-MM|.
% \item \fixmd|\PublicationType|: \hfill (|dc:type|)\\
-% The type of publication. If specified, must be one of `book', `catalog', `feed', `journal',
+% The type of publication. If specified, must be one of `book', `catalog', `feed', `journal',
% `magazine', `manual', `newsletter', `pamphlet'. This is automatically set to `journal'
% if |\Journaltitle| is specified (see below), but can be overridden.
% \item \starmd|\Relation|: \hfill (|dc:relation|)\\
@@ -700,10 +755,10 @@
% \end{itemize}
%
% The remaining Dublin Core field |(dc:format)| is always set to `|application/pdf|'.
-%
+%
% \subsubsection{Publication information:}\label{sssec-publ}
-% The following macros allow for inclusion of publication related metadata fields,
-% as specified by PRISM~\cite{PRISM} to meet publishing requirements.
+% The following macros allow for inclusion of publication related metadata fields,
+% as specified by PRISM~\cite{PRISM} to meet publishing requirements.
% \begin{itemize}
% \item |\Journaltitle|: \hfill (|prism:issueName|)\\
% The title of the journal in which the document was published.
@@ -720,7 +775,7 @@
% \item |\CoverDisplayDate|: \hfill (|prism:coverDisplayDate|)\\
% Date on the cover of the journal issue, as a human-readable text string.
% \item \fixmd|\CoverDate|: \hfill (|prism:coverDate|)\\
-% Date on the cover of the journal issue, in a format suitable for storing in a database
+% Date on the cover of the journal issue, in a format suitable for storing in a database
% field with a `date' data type; e.g. |YYYY-MM|, or |YYYY-MM-DD|.
% \end{itemize}
% This is an area which can be expanded, to deal with more kinds
@@ -729,20 +784,20 @@
% Examples of this can be found in the template files |pdfx.xmp|, |pdfa.xmp|, |pdfe.xmp|.
%
% \subsubsection{Backward Compatibility}
-% The following macros are also recognised, for backward compatibility
+% The following macros are also recognised, for backward compatibility
% with earlier versions of the package.
% \begin{itemize}
% \item \starmd|\AuthoritativeDomain|: \hfill (|pdfx:AuthoritativeDomain|)\\
% specifies extra names (e.g., of companies) associated to the existence of the PDF or resource.
% \item |\Creator|: \hfill (|xmp:CreatorTool|)\\
-% synonymous with |\CreatorTool| which is usually handled automatically anyway,
+% synonymous with |\CreatorTool| which is usually handled automatically anyway,
% but can be over-ridden.
% \item |\Org|: synonymous with |\Publisher|.
% \item |\WebStatement|: synonymous with |\CopyrightURL|.
% \end{itemize}
-%
+%
% \subsubsection{more XMP metadata:}\label{sssec-xmp}
-%
+%
% \begin{itemize}
% \item \starmd|\Advisory|: \hfill (|xmp:Advisory|)\\
% noteworthy information; e.g., revision data or changes.
@@ -763,7 +818,7 @@
% with a PDF standard, and level of conformance.
% There are no separate user-macros to alter these.
% The first three dates are usually set to be identical.
-%
+%
% \begin{itemize}
% \item (|xmp:CreateDate|) : creation date\&time of the PDF.
% \item (|xmp:MetadataDate|) : creation date\&time of the Metadata for the PDF.
@@ -776,7 +831,7 @@
% \item (|pdfaid:conformance|) : |a|, |b| or |u| for PDF/A-??
% \item (|pdfuaid:part|) : currently |1| for PDF/UA-1
% \item (|pdfe:ISO_PDFEVersion|) : currently |1| for PDF/E-1
-% \item (|pdf:Version|) : |PDF/X-1|, |PDF/X-2| or |PDF/X-3|
+% \item (|pdf:Version|) : |PDF/X-1|, |PDF/X-2| or |PDF/X-3|
% \item (|pdfx:GTS_PDFXVersion|) : e.g., |PDF/X-1a:2003| up to PDF/X-3 ;
% but no year for PDF/X-4 and PDF/X-5 variants
% \item (|pdfx:GTS_PDFXConformance|) : e.g., |PDF/X-1a:2003| up to PDF/X-2
@@ -788,13 +843,13 @@
% \subsection{Symbols permitted in metadata}\label{ssec-symbols}
%
% Within the metadata, all printable ASCII characters except
-% |\|, |{|, |}| and |%| represent themselves. Also, all printable Unicode characters
-% from the basic multilingual plane (i.e., up to code point U+FFFF)
+% |\|, |{|, |}| and |%| represent themselves. Also, all printable Unicode characters
+% from the basic multilingual plane (i.e., up to code point U+FFFF)
% can be used directly with the UTF-8 encoding.
-% (Please note: encodings other than UTF-8 are not supported in the metadata,
-% except as arguments to `parser-macros'; see Section~\ref{ssec-xmplang}).
-% Consecutive whitespace characters are combined into a single space.
-% Whitespace after a macro such as |\copyright|, |\backslash|, or |\sep| is ignored.
+% (Please note: encodings other than UTF-8 are not supported in the metadata,
+% except as arguments to `parser-macros'; see Section~\ref{ssec-xmplang}).
+% Consecutive whitespace characters are combined into a single space.
+% Whitespace after a macro such as |\copyright|, |\backslash|, or |\sep| is ignored.
% Blank lines are not permitted.
% Moreover, the following markup can be used:
%
@@ -807,32 +862,32 @@
% \item |\copyright|: the copyright symbol \textcopyright
% \end{itemize}
% The macro |\sep| is permitted within |\Author|, |\Keywords|,
-% |\Publisher|, and other macros marked with \starmd\ above.
-% It's purpose is to separate multiple authors, keywords, etc.
-% to appear as separate list items appropriately and consistently
-% in the different ways that such information is represented
-% within the PDF file.
+% |\Publisher|, and other macros marked with \starmd\ above.
+% It's purpose is to separate multiple authors, keywords, etc.
+% to appear as separate list items appropriately and consistently
+% in the different ways that such information is represented
+% within the PDF file.
% The package takes care of this when |\sep| is used.
% For example, in the XMP metadata, it expands as |</rdf:li><rdf:li>| tagging.
%
% \subsubsection{PDF Info strings}\label{sssec-info}
-% When |\sep| is not used within its argument, the metadata from |\Title|,
-% |\Author| and |\Keywords| is also included in the PDF |/Info| dictionary.
+% When |\sep| is not used within its argument, the metadata from |\Title|,
+% |\Author| and |\Keywords| is also included in the PDF |/Info| dictionary.
% When this is the case, validation for the declared standard
% will occur only if the corresponding |/Info| item and XMP metadata field
-% convert to exactly the same Unicode string.
+% convert to exactly the same Unicode string.
% This cannot happen when |\sep| is used, so the |/Info| items are then not populated.
%
% Unfortunately not all PDF browsers (in particular, older ones and much Apple software)
% give ready access to the XMP metadata packet. Some authors want to see everything
-% using e.g., the Unix/Linux command: |pdfinfo -enc UTF-8 |. In fact there is the |-meta|
-% option to get the complete metadata packet (in UTF-8 encoding).
+% using e.g., the Unix/Linux command: |pdfinfo -enc UTF-8 |. In fact there is the |-meta|
+% option to get the complete metadata packet (in UTF-8 encoding).
% This can give more than what one wants, so use it as follows:
% \begin{decl}[]
% pdfinfo -meta <filename>.pdf \textbar\ grep 'dc:'
% \end{decl}
% to extract just the Dublin Core metadata fields.
-%
+%
% Another possibility is to \emph{not} use |\sep| with multiple authors and/or keywords.
% Instead replace it with simply `|, |'. We do not recommend doing this, as more sophisticated
% metadata tools will see the result as a single value, rather than multiple authors, say.
@@ -842,21 +897,21 @@
%
% \subsection{Macros permitted in metadata}\label{ssec-macros}
%
-% Other \TeX\ macros actually can be used, provided the author is very
+% Other \TeX\ macros actually can be used, provided the author is very
% careful and not ask for too-complicated \TeX\ or \LaTeX\ expansions
% into internal commands or non-character primitives; basically just accents,
% macros for Latin-based special characters, and simple textual replacements,
-% perhaps with a simple parameter. A special macro |\pdfxEnableCommands{...}|
+% perhaps with a simple parameter. A special macro |\pdfxEnableCommands{...}|
% is provided to help resolve difficulties that may arise.
%
% Here is an example\footnote{ Other use cases are discussed with regard to
-% Figures~\ref{arm-code} and \ref{math-wflow}.} of the use of |\pdfxEnableCommands|,
-% which occurs with the name of one of our authors {(H\`an Th\'{\^e} Thanh)}
+% Figures~\ref{arm-code} and \ref{math-wflow}.} of the use of |\pdfxEnableCommands|,
+% which occurs with the name of one of our authors {(H\`an Th\'{\^e} Thanh)}
% due to the doubly-accented letter \'{\^e}.
% It is usual to define a macro such as: |\def\thanh{H\`an Th\'{\^e} Thanh}|.
-% In previous versions of the |pdfx| package, use of such a macro
+% In previous versions of the |pdfx| package, use of such a macro
% within the |.xmpdata| file, in the |Copyright| information say,
-% could result in the accent macros expanding into internal primitives, such as
+% could result in the accent macros expanding into internal primitives, such as
% \begin{decl}[]
% | H\unhbox \voidb@x \bgroup \let \unhbox \voidb@x \setbox \@tempboxa ... |
% \end{decl}
@@ -867,7 +922,7 @@
% | \def\`#1{#1^^cc^80}\def\'#1{#1^^cc^81}\def\^#1{#1^^cc^82}}|
% \end{decl}
% \removelastskip\noindent
-% where the |^^cc^80|, |^^cc^81|, |^^cc^82| cause \TeX\ to generate the correct
+% where the |^^cc^80|, |^^cc^81|, |^^cc^82| cause \TeX\ to generate the correct
% UTF-8 bytes for `combining accent' characters.
%
% This works fine for metadata fields that appear just in the XMP packet.
@@ -878,22 +933,22 @@
% | \def\thanh{H^^c3^^a0n Th\eee Thanh}\def\eee{^^c3^^aa^^cc^^81 }}|
% \end{decl}
% \removelastskip\noindent
-% or the above with `\`a' typed directly as UTF-8 instead of |^^c3^^a0|
+% or the above with `\`a' typed directly as UTF-8 instead of |^^c3^^a0|
% and `\^e' in UTF-8 for |^^c3^^aa|.
% The reason for this is due to the |\pdfstringdef| command, which constructs
-% the accented latin letters as single combined characters \`a and \^e,
+% the accented latin letters as single combined characters \`a and \^e,
% without resorting to combining accents, wherever possible.
-% If the Metadata does not have the same, irrespective of Unicode normalisation,
+% If the Metadata does not have the same, irrespective of Unicode normalisation,
% then validation fails.
%
% With version (1.5.6) of the |pdfx| package, such difficulties
-% have been overcome, at least for characters used in Western European,
-% Latin-based languages. The input encoding used when reading the |.xmpdata|
-% file now includes interpretations of \TeX's usual accent commands to
+% have been overcome, at least for characters used in Western European,
+% Latin-based languages. The input encoding used when reading the |.xmpdata|
+% file now includes interpretations of \TeX's usual accent commands to
% produce the required UTF-8 byte sequences.
%
% \medskip
-% Since version (1.5.8) this input encoding was extended to include
+% Since version (1.5.8) this input encoding was extended to include
% macro definitions covering \LaTeX's internal character representation
% of other alphabets (e.g., extended Latin, Cyrillic, Greek, etc.).
% However this can become memory intensive, requiring a large number of
@@ -902,12 +957,12 @@
% be relevant. Currently these are as in Section~\ref{ssec-xmplang}.
%
% A significant portion of the Unicode Basic Plane characters can be covered
-% this way. Modules could even be provided for CJK character sets and
+% this way. Modules could even be provided for CJK character sets and
% mathematical symbols, etc. However, as this can become memory intensive,
% significant testing will be required before these become a standard
-% part of the |pdfx| package.
+% part of the |pdfx| package.
+%
%
-%
% \subsection{Color profiles}\label{sec-profiles}
%
% Most standards compliant PDF documents require a \emph{color
@@ -915,26 +970,26 @@
% determines precisely how the colors used in the document will be
% rendered when printed to a physical medium. This can be used to
% ensure that the document will look exactly the same, even when it is
-% printed on different printers, with different paper types, etc.
-% The inclusion of a color profile is necessary to make the document
+% printed on different printers, with different paper types, etc.
+% The inclusion of a color profile is necessary to make the document
% completely self-contained.
%
% Since most \LaTeX\ users are not graphics professionals and are not
% particularly picky about colors, the |pdfx| package includes default
-% profiles that will be included when nothing else is specified.
+% profiles that will be included when nothing else is specified.
% Therefore, the average user doesn't have to do anything
% special about color.
%
% For users who have a specific color profile they wish to use, it is
% possible to do so by including a |\setRGBcolorprofile| or
% |\setCMYKcolorprofile| command in the |.xmpdata| file. Note that
-% PDF/A and PDF/E require a profile of type `|mnrt|' (monitor) which
-% is usually an RGB color profile, while PDF/X and PDF/VT require type `|prtr|'
+% PDF/A and PDF/E require a profile of type `|mnrt|' (monitor) which
+% is usually an RGB color profile, while PDF/X and PDF/VT require type `|prtr|'
% (printer) which is usually a CMYK color profile; but valid documents
% can be created with the correct type designed for the other color space.
-% Use the following commands to specify an RGB or CMYK color profile,
+% Use the following commands to specify an RGB or CMYK color profile,
% respectively:
-%
+%
% \begin{decl}
% \defmacro{setRGBcolorprofile}\marg{filename}\marg{identifier}\marg{info
% string}\marg{registry URL}
@@ -944,7 +999,7 @@
% \end{decl}
% Within the arguments of these macros, the characters |<|, |>|, |&|,
% |^|, |_|, |#|, |$|, and |~| can be used as themselves, but
-% |%| must be escaped as |\%|.
+% |%| must be escaped as |\%|.
%
% From version (1.6) the default RGB and CMYK color profiles are now supplied
% using the |colorprofiles| package by Norbert Preining and Ross Moore~\cite{colorp}.
@@ -966,7 +1021,7 @@
% \url{http://www.color.org/iccprofile.xalter}.
%
% Alternatively, color profiles are shipped with many Adobe software
-% applications; these are then available for use also with non-Adobe
+% applications; these are then available for use also with non-Adobe
% software. Now the |pdfx| package includes coding to streamline
% inclusion of these profiles in PDF documents, or to specify
% them as `external' profiles, with PDF/X-4p and PDF/X-5pg variants.
@@ -977,17 +1032,17 @@
% Both define commands to use Color Profiles as follows.
% \begin{decl}[]
% \begin{tabular}{ll}
-% \texttt{\string\FOGRAXXXIX} & Coated FOGRA39 (ISO 12647-2:2004)\\
+% \texttt{\string\FOGRAXXXIX} & Coated FOGRA39 (ISO 12647-2:2004)\\
% \texttt{\string\SWOPCGATSI} & U.S. Web Coated (SWOP) v2\\
-% \texttt{\string\JapanColorMMICoated} & Japan Color 2001 Coated\\
-% \texttt{\string\JapanColorMMIUncoated} & Japan Color 2001 Uncoated\\
-% \texttt{\string\JapanColorMMIINewspaper} & Japan Color 2002 Newspaper\\
-% \texttt{\string\JapanWebCoatedAd} & Japan Web Coated (Ad)\\
-% \texttt{\string\CoatedGRACoL} & Coated GRACoL 2006 (ISO 12647-2:2004)\\
+% \texttt{\string\JapanColorMMICoated} & Japan Color 2001 Coated\\
+% \texttt{\string\JapanColorMMIUncoated} & Japan Color 2001 Uncoated\\
+% \texttt{\string\JapanColorMMIINewspaper} & Japan Color 2002 Newspaper\\
+% \texttt{\string\JapanWebCoatedAd} & Japan Web Coated (Ad)\\
+% \texttt{\string\CoatedGRACoL} & Coated GRACoL 2006 (ISO 12647-2:2004)\\
% \texttt{\string\SNAPCGATSII} & CGATS TR 002\\
% \texttt{\string\SWOPCGATSIII} & CGATS TR 003\\
% \texttt{\string\SWOPCGATSV} & CGATS TR 005\\
-% \texttt{\string\ISOWebCoated} & Web Coated FOGRA28 (ISO 12647-2:2004)\\
+% \texttt{\string\ISOWebCoated} & Web Coated FOGRA28 (ISO 12647-2:2004)\\
% \texttt{\string\ISOCoatedECI} & ISO Coated v2 (ECI)\\
% \texttt{\string\CoatedFOGRA} & Coated FOGRA27 (ISO 12647-2:2004)\\
% \texttt{\string\WebCoatedFOGRA} & Web Coated FOGRA28 (ISO 12647-2:2004)\\
@@ -999,18 +1054,18 @@
% As of the time of first compiling this list, only the first six of these result in PDFs
% which can validate with external profiles (i.e., for PDF/X-4p and PDF/X-5pg)
% using the then-current versions of Adobe Acrobat Pro software. It is unclear
-% whether the others (incl.\,\verb|\IFRAXXVI| and \verb|\IFRAXXX|) failed due
-% to incorrect data or problems in the validation software.
+% whether the others (incl.\,\verb|\IFRAXXVI| and \verb|\IFRAXXX|) failed due
+% to incorrect data or problems in the validation software.
% Since then, with updates to Acrobat Pro, almost all the others have been verified
% to work, except \verb|\IFRAXXX| which seems no longer available.
-% Thus these commands come with a `use at own risk' clause.
+% Thus these commands come with a `use at own risk' clause.
%
-% For `external' profiles, there is a command |\setEXTERNALprofile|, taking 9 arguments,
+% For `external' profiles, there is a command |\setEXTERNALprofile|, taking 9 arguments,
% that must be used. Consult |AdobeExternalProfiles.tex| for examples of its use.
-%
-% All but the last of the macros listed above can also be used for valid embedded profiles,
-% providing the corresponding files can be found.
-% The following macros are used to set the (absolute or relative) path,
+%
+% All but the last of the macros listed above can also be used for valid embedded profiles,
+% providing the corresponding files can be found.
+% The following macros are used to set the (absolute or relative) path,
% on the local operating system, to the location of color profile files.
% \begin{decl}
% \defmacro{pdfxSetRGBcolorProfileDir}\marg{path to RGB color profiles}\\
@@ -1020,7 +1075,7 @@
% One can use either a macro |\MacOSColordir| which expands
% into the path for system-provided profiles:
% \begin{decl}[]
-% |/System/Library/ColorSync/Profiles/|
+% |/System/Library/ColorSync/Profiles/|
% \end{decl}
% or the macro |\MacOSLibraryColordir| expanding to:
% \begin{decl}[]
@@ -1030,23 +1085,23 @@
% \begin{decl}[]
% |/Library/Application Support/Adobe/Color/Profiles/Recommended/|
% \end{decl}
-% Under Windows an available macro is |\WindowsColordir| which expands to:
+% Under Windows an available macro is |\WindowsColordir| which expands to:
% \begin{decl}[]
% |C:\Windows\System32\Spool\Drivers\Color/|
% \end{decl}
% being the common location for color profiles.
-% Use these within the \verb|.xmpdata| file as, e.g.,
+% Use these within the \verb|.xmpdata| file as, e.g.,
% \begin{decl}[]
% |\pdfxSetCMYKcolorProfileDir{\AdobeMacOSdir}|
% \end{decl}
% Authors may change the paths to suit their own circumstances, either
-% \emph{before} loading |pdfx.sty| or within the \verb|.xmpdata| file.
+% \emph{before} loading |pdfx.sty| or within the \verb|.xmpdata| file.
%
% PDF/A and PDF/E usually need an RGB profile, while PDF/X and PDF/VT
-% require a CMYK profile. It is possible to use a CMYK profile with PDF/A
+% require a CMYK profile. It is possible to use a CMYK profile with PDF/A
% or PDF/E by specifying |\setRGBcolorprofile{}{}{}{}| in the \verb|.xmpdata| file.
% Beware however, that with PDF/A any coloured hyperlink annotations can
-% cause a validation problem, as these are interpreted as RGB colours
+% cause a validation problem, as these are interpreted as RGB colours
% even when 4 components are given. This may be a bug in validators,
% as PDF specifies that the number of components should match the color space.
%
@@ -1070,44 +1125,44 @@
% \end{decl}
% which uses a profile that accompanies the \texttt{pdfaPilot} software from
% Callas Software Gmbh~\cite{pdfaPilot}.
-% The macro |\CallasMacOSpdfaPilotdir|, defined in the file \texttt{CallasColorProfiles.tex},
+% The macro |\CallasMacOSpdfaPilotdir|, defined in the file \texttt{CallasColorProfiles.tex},
% specifies the directory where this Custom profile is located, when installed under MacOS.
% One needs to |\input CallasColorProfiles.tex| \emph{before} loading the |pdfx| package.
-% Macros for other directories are also defined in this file.
+% Macros for other directories are also defined in this file.
%
% \subsection{Notes on the internal representation of metadata}
-%
+%
% Within the PDF file, metadata is deposited in two places: some data
% goes into the native PDF |/Info| dictionary, and some data goes into
% an XMP packet stored separately within the file. XMP is Adobe's
-% Extensible Metadata Platform~\cite{XMP-spec,XMP-ISO}, and is an XML-based format.
+% Extensible Metadata Platform~\cite{XMP-spec,XMP-ISO}, and is an XML-based format.
% See \href{http://www.adobe.com/devnet/xmp/}{Adobe XMP Development Center}
-% for more exhaustive information about XMP.
+% for more exhaustive information about XMP.
% An XMP Toolkit SDK which supports the GNU/Linux, Macintosh and Windows operating
% systems is also available under modified BSD licence.
%
% Some of the metadata, such as the author, title, and keywords, can be
-% stored \emph{both} in the XMP packet and in the |/Info| dictionary.
-% For the resulting file to be standards-compliant, the two copies of the data
+% stored \emph{both} in the XMP packet and in the |/Info| dictionary.
+% For the resulting file to be standards-compliant, the two copies of the data
% must be identical. This is taken care of automatically by the |pdfx| package,
% except when |\sep| is used to handle multiple entries, as discussed above
-% in \S\ref{sssec-info}. In such cases the string is not included within the |/Info|
+% in \S\ref{sssec-info}. In such cases the string is not included within the |/Info|
% dictionary. Note that this is in accordance with the PDF 2.0 specification~\cite{PDF20},
% which deprecates use of the |/Info| dictionary for such metadata.
-%
-% In principle, users can resort to alternate ways to create an XMP file
-% for inclusion in PDF. In this case, one should create a customised template
+%
+% In principle, users can resort to alternate ways to create an XMP file
+% for inclusion in PDF. In this case, one should create a customised template
% file |pdfa.xmp| or |pdfx.xmp| or |pdfe.xmp| (etc., depending on the PDF flavor)
-% containing the pre-defined data. This can be done by modifying the ones supplied
-% with the |pdfx| package. However, this is an error-prone process and is
-% \emph{not} recommended for most users.
+% containing the pre-defined data. This can be done by modifying the ones supplied
+% with the |pdfx| package. However, this is an error-prone process and is
+% \emph{not} recommended for most users.
% If there is a particular field of metadata that you need and that is not currently
% supported, please contact the package authors.
%
% |pdfx| makes use of the |xmpincl| package to include XMP data into
% the PDF. The documentation of |xmpincl| package may help interested
% users to understand the process of XMP data inclusion.
-%
+%
% \subsection{Tutorials and technical notes}
%
% A tutorial with step-by-step instructions for generating PDF/A files
@@ -1120,7 +1175,7 @@
% \url{http://support.river-valley.com/wiki/index.php?title=Generating_PDF/A_compliant_PDFs_from_pdftex}.
% Be aware that this is based on use of an earlier version of the |pdfx| package,
% so some of the advice may have been superseded.
-%
+%
%
% \section[Installing]{Installing}
% The |pdfx.dtx| package is available on CTAN as usual, via
@@ -1131,24 +1186,24 @@
% For those wishing to do a manual installation, here are some notes.
% The file |pdfx.dtx| is a composite document of program code and
% documentation in \LaTeX{} format, in the tradition of \emph{literate
-% programming}. After having installed the package,
+% programming}. After having installed the package,
% to get the documentation that you are reading now,
-% run (\textsc{pdf})\LaTeX{} on the file |pdfx.dtx|.
+% run (\textsc{pdf})\LaTeX{} on the file |pdfx.dtx|.
% The resulting PDF should be valid as PDF/A-2u.
% Or better, use the included |Makefile|, which will also regenerate the index.
%
% To install the package, first extract the program code; i.e., the
-% file |pdfx.sty|, by running \LaTeX{} or \TeX{} on the file |pdfx.ins|.
+% file |pdfx.sty|, by running \LaTeX{} or \TeX{} on the file |pdfx.ins|.
% Create a directory named |pdfx| under |$TEXMF/tex/latex| and copy the files
-% |pdfx.sty|, |8bit.def|, |glyphtounicode-cmr.tex|, |glyphtounicode-ntx.tex| as well
+% |pdfx.sty|, |8bit.def|, |glyphtounicode-cmr.tex|, |glyphtounicode-ntx.tex| as well
% as the other |*.tex|, |l8u*-penc.def| and |*.xmp| files, into it. Then update
% \TeX's file database using the appropriate command for your distribution
% and operating system (such as |texhash| or |mktexlsr|, or similar).
-%
+%
% \subsection{Limitations and dependencies}
-%
-% The |pdfx.sty| package works with \pdftex\ and also Lua\TeX\ and Xe\TeX\
-% with some minor limitations.
+%
+% The |pdfx.sty| package works with \pdftex\ and also Lua\TeX\ and Xe\TeX\
+% with some minor limitations.
% It further depends on the following other packages.
% \begin{enumerate}
% \item |xmpincl| for insertion of metadata into PDF.
@@ -1159,28 +1214,28 @@
% hyperlinking, bookmarks, etc.
% \item |xcolor| for ensuring consistent use of the color model
% appropriate the PDF variant, within text and hyperlinks (when allowed).
-% \item |glyphtounicode.tex| (not Xe\LaTeX) maps glyph names
+% \item |glyphtounicode.tex| (not Xe\LaTeX) maps glyph names
% to corresponding Unicode code-points.
% \item |ifluatex| allowing coding specific to Lua\LaTeX.
% \item |ifxetex| allowing coding specific to Xe\LaTeX.
-% \item |luatex85| or |pdftexcmds| (Lua\TeX\ only) for access
+% \item |luatex85| or |pdftexcmds| (Lua\TeX\ only) for access
% to primitive commands using \pdftex\ macro names.
-% \item |stringenc| used to help generate proper bookmarks with transliterated input;
+% \item |stringenc| used to help generate proper bookmarks with transliterated input;
% e.g., with |\textLGR| or |\textARM| --- see Section~\ref{sssec-arm}.
% \end{enumerate}
% Other files and packages are loaded as sub-packages or as
-% configuration files for these. Since some of these packages
-% may be loaded by existing documents we provide here advice on
+% configuration files for these. Since some of these packages
+% may be loaded by existing documents we provide here advice on
% how to deal with potential loading and option conflicts.
%
% Firstly, it is best if |pdfx| is the first package loaded; e.g.,
-% directly after the |\documentclass| line. This is not a strict requirement,
+% directly after the |\documentclass| line. This is not a strict requirement,
% but it is worthwhile to deal with the metadata at the top of your \LaTeX\ source,
% allowing correct options to be loaded to cope with validation aspects.
%
% Secondly, replace |\usepackage[<options>]{hyperref}| with |\hypersetup{<options>}|.
-% This deals with most loading issues with the |hyperref| package.
-% Note that PDF/X is a format intended for printing.
+% This deals with most loading issues with the |hyperref| package.
+% Note that PDF/X is a format intended for printing.
% It forbids inclusion of hyperlinks and other actions, including via bookmarks.
% To produce a validating PDF/X document, |pdfx| overrides internal macros
% while keeping colors associated with link anchors.
@@ -1191,53 +1246,53 @@
% Furthermore, options to set metadata components (such as |pdfauthor|,
% |pdftitle|, |pdfsubject|, |pdfkeywords|, etc.) are disabled, since
% |pdfx| has already taken care of this information.
-%
+%
% Thirdly, conflicts with other packages may be dealt with by simply
% changing |\usepackage| to |\RequirePackage| within the document's
-% preamble. But this may not be possible when the |\usepackage|
+% preamble. But this may not be possible when the |\usepackage|
% or |\RequirePackage| command occurs within another package, or with
-% a specific set of options, thereby causing processing to stop.
-% Few packages have a command analogous to |\hypersetup|.
+% a specific set of options, thereby causing processing to stop.
+% Few packages have a command analogous to |\hypersetup|.
% Instead |\PassOptionsToPackage{<options>}{<package>}| can help.
% For |<options>| specify the ones associated with the loading yet to come.
% This can give a smooth processing run, but you'll need to check whether
% the results from those options have actually taken effect.
-% Some examples of this can be seen later, in Figures~\ref{koi8-code}
+% Some examples of this can be seen later, in Figures~\ref{koi8-code}
% and \ref{tldoc-pol}.
%
% \subsubsection{Limitations using Xe\LaTeX}\label{sssec-xetex}
%
-% To process a file using Xe\LaTeX, to produce a document that can
+% To process a file using Xe\LaTeX, to produce a document that can
% validate to a particular PDF standard, one need to use a command
% to run the \TeX\ engine, as follows.
% \begin{decl}[]
% |xelatex -shell-escape -output-driver="xdvipdfmx -z 0" <filename>.tex |
% \end{decl}
% The |-shell-escape| option allows a command-line task to be run,
-% which writes the creation-date \& time of the running job into
-% a small file on disk. This data, written in a specific format, is then
+% which writes the creation-date \& time of the running job into
+% a small file on disk. This data, written in a specific format, is then
% read by the job for inclusion into several metadata fields.
% This emulates the result of \pdftex's |\pdfcreationdate| primitive.
% As there are security implications in allowing arbitrary commands to be run,
-% this need for |-shell-escape| must be viewed as imposing a limitation on the
+% this need for |-shell-escape| must be viewed as imposing a limitation on the
% work-flows in which this can be safely used.
%
-% The |-output-driver="xdvipdfmx -z 0"| suppresses compression, which
+% The |-output-driver="xdvipdfmx -z 0"| suppresses compression, which
% is not allowed for the XMP metadata packet. Without this, the resulting PDF
-% may fail to pass validation tests.
+% may fail to pass validation tests.
%
% Xe\TeX\ is designed for processing UTF-8 input only. When presented
-% with \LaTeX\ source using a legacy encoding, such as |latin2| or |koi8-r|,
-% the input is accepted and a PDF produced. Yet there will be garbage
+% with \LaTeX\ source using a legacy encoding, such as |latin2| or |koi8-r|,
+% the input is accepted and a PDF produced. Yet there will be garbage
% characters corresponding to each character entered from the upper range
-% (128--255). This is evident in the PDF content and bookmarks;
+% (128--255). This is evident in the PDF content and bookmarks;
% yet |pdfx| produces the correct XMP metadata packet.
% So while the techniques explained later in Section~\ref{ssec-multi} are
% valid, the PDF itself does not contain correct content.
%
% Not all fonts, in particular Open-Type fonts (OTF), naturally come with
% mappings of the glyphs to Unicode code points. This is a requirement
-% with PDF/A, PDF/E and PDF/UA standards.
+% with PDF/A, PDF/E and PDF/UA standards.
% Use of such fonts can result in validation errors, such as:
% \begin{itemize}
% \item
@@ -1245,7 +1300,7 @@
% \item
% Type 2 CID font: CIDToGID map is invalid or missing.
% \end{itemize}
-%
+%
% If one has access to Adobe's |Acrobat Pro| software, then its |Preflight|
% utility can rewrite the uncompressed output from Xe\LaTeX\ into a valid
% PDF standard, using compression of the contents but not of the XMP packet.
@@ -1256,7 +1311,7 @@
%
% Lua\LaTeX\ can handle the OTF font issues mentioned for Xe\LaTeX,
% so can produce valid PDF/A documents where Xe\LaTeX\ fails.
-% However, since Lua\TeX\ expects all input source to be UTF8-encoded,
+% However, since Lua\TeX\ expects all input source to be UTF8-encoded,
% it cannot work at all with documents using older legacy encodings.
% Instead one gets error messages such as:
%\begin{decl}
@@ -1299,15 +1354,15 @@
% \item |l8uheb-penc.def| --- input macro declarations for Hebrew alphabet.
% \item |l8ulat-penc.def| --- input macro declarations for Latin 1--9 encodings.
% \item |l8umath-penc.def| --- input macro declarations for mathematical symbols.
-% \item |glyphtounicode-cmr.tex|, |glyphtounicode-ntx.tex| --- maps glyph names
+% \item |glyphtounicode-cmr.tex|, |glyphtounicode-ntx.tex| --- maps glyph names
% to corresponding Unicode for Computer Modern and other \TeX-specific fonts.
% \item |AdobeColorProfiles.tex| --- macros for inclusion of Adobe-supplied color profiles.
% \item |AdobeExternalProfiles.tex| --- macros for use of external color profiles.
% \item |CallasColorProfiles.tex| --- macros for profiles included with Callas pdfaPilot software.
% \end{itemize}
-%
+%
% \subsubsection{Documentation \& Examples}
-%
+%
% \begin{itemize}
% \item |README| --- usual top-level information.
% \item |manifest.txt| --- file list.
@@ -1315,9 +1370,9 @@
% \item |sample.tex|, |sample.xmpdata| --- a sample file with sample metadata.
% \item |small2e-pdfx.tex| --- sample file with included metadata.
% \end{itemize}
-%
+%
% \subsubsection{Sources}
-%
+%
% \begin{itemize}
% \item |src/pdfx.dtx| --- composite package and documentation.
% \item |src/pdfx.ins| --- installer batch file.
@@ -1326,10 +1381,10 @@
% \item |src/Makefile| --- a Makefile for building the documentation.
% \item |src/MANIFEST| --- list of files in this directory.
% \item |src/text89.def| --- used with Figure\,\ref{ex-arm} in the documentation.
-% \item |src/{arm-start,koi8-example,koi8-example2,latin2-example}.tex|
+% \item |src/{arm-start,koi8-example,koi8-example2,latin2-example}.tex|
% --- used in the documentation with figures showing example coding.
% \item |src/{TL-POL-meta,TL-RU-LICRs,TL-RU-metadata,TL-RU-toc,Armenian-example-UTF8,|\\
-% |armtex-meta,usage-meta,math-assign5}.png| --- screenshot images showing multilingual
+% |armtex-meta,usage-meta,math-assign5}.png| --- screenshot images showing multilingual
% and other metadata.
% \end{itemize}
%
@@ -1337,9 +1392,9 @@
%
% The package is released under the \LaTeX{} Project Public
% Licence. Bug reports, suggestions, feature requests, etc., may be
-% sent to the original authors at
+% sent to the original authors at
% \href{mailto:cvr@river-valley.org}{\ttfamily cvr@river-valley.org}
-% and/or
+% and/or
% \href{mailto:thanh@river-valley.org}{\ttfamily thanh@river-valley.org},
% or to the more recent contributors at
% \href{mailto:ross.moore@mq.edu.au}{\ttfamily ross.moore@mq.edu.au}
@@ -1348,9 +1403,9 @@
%
%
% \section[Multilingual and Technical Considerations]{Multilingual and Technical Considerations}\label{sec-meta}
-%
-% \TeX\ and \LaTeX\ have an on-going practice of including metadata within
-% the source files and package documentation. Usually this is done as comments
+%
+% \TeX\ and \LaTeX\ have an on-going practice of including metadata within
+% the source files and package documentation. Usually this is done as comments
% at the beginning of the file; such as the following from the English
% language version of the 2015 \TeX\ Live documentation\footnote{%
% found at |/usr/local/texlive/2016/texmf-dist/doc/texlive/texlive-en/|.}.
@@ -1360,10 +1415,10 @@
% |Michel Goossens, now maintained by Karl Berry and others.|\\
% |Public domain.|
% \end{decl}
-% This provides information, ideally suited for copyright metadata
-% fields, as in Section~\ref{sssec-copy}, as well as for |\Subject|
-% and |\CoverDate| from Section~\ref{sssec-publ}.
-%
+% This provides information, ideally suited for copyright metadata
+% fields, as in Section~\ref{sssec-copy}, as well as for |\Subject|
+% and |\CoverDate| from Section~\ref{sssec-publ}.
+%
% Also near the top of the file one finds front-matter content
% \begin{decl}[]
% |\title{%|\\
@@ -1374,7 +1429,7 @@
% | }|\\
% |\date{May 2015}|
% \end{decl}
-% which supplies metadata information for the commands |\Title|, |\Author|,
+% which supplies metadata information for the commands |\Title|, |\Author|,
% |\CoverDisplayDate| also from Section~\ref{sssec-publ}, and |\CopyrightURL|.
%
% Most of the hundreds of thousands, if not millions of documents prepared
@@ -1384,14 +1439,14 @@
% requirement, for PDFs to satisfy a standard that requires inclusion
% of metadata. This is especially so for government agencies and institutions
% receiving government funding, in several countries around the world.
-%
+%
% It is an aim of the |pdfx| to simplify the process of capturing and
-% including metadata within \LaTeX-produced PDFs, from both the author's
-% view and that of archivists. The extra features introduced with version
-% 1.5.8 take a large step in that direction.
+% including metadata within \LaTeX-produced PDFs, from both the author's
+% view and that of archivists. The extra features introduced with version
+% 1.5.8 take a large step in that direction.
% This includes the ability, described in the next subsection, to reliably
% include data presented in different text encodings, rather than being
-% restricted to UTF-8 only. It is a role of the software to make the
+% restricted to UTF-8 only. It is a role of the software to make the
% conversion, rather than rely on some 3rd party for a translation.
%
%
@@ -1400,40 +1455,40 @@
% A cursory search of the documentation (|.../texmf-dist/doc|) subtree
% of the forthcoming \TeX\,Live 2016 release reveals more than 730 different
% |.tex| or |.dtx| document sources which specify an input encoding,
-% via the |\usepackage[...]{inputenc}| command. Roughly 380 (a bit more
-% than half) declare UTF-8 as the input encoding.
-% Of the remainder there are $\approx 20$ other encodings specified,
-% covering a range of languages for at least part of their content.
+% via the |\usepackage[...]{inputenc}| command. Roughly 380 (a bit more
+% than half) declare UTF-8 as the input encoding.
+% Of the remainder there are $\approx 20$ other encodings specified,
+% covering a range of languages for at least part of their content.
% At some point in time, these documents may be required to have accurate
-% accompanying metadata, as part of conformance to a designated PDF
-% (or other) standard. There are libraries and archives that already must
+% accompanying metadata, as part of conformance to a designated PDF
+% (or other) standard. There are libraries and archives that already must
% meet such standards.
%
-% We have shown above, in Section~\ref{ssec-metadata}, how the |.xmpdata|
-% file can be inserted into the document source, which then ensures that
+% We have shown above, in Section~\ref{ssec-metadata}, how the |.xmpdata|
+% file can be inserted into the document source, which then ensures that
% metadata is reliably transferred along with the source itself.
% This seems a good strategy, but are there any problems with it,
% especially in a multi-lingual context?
-%
-% Modern editing software can require an encoding to be associated
-% with each file. This is what allows the correct characters to be shown,
-% from what is otherwise just a sequence of 8-bit bytes. The flip-side
-% is that arbitrary editing is not permitted. Add some UTF-8 data into
-% a file that is encoded as Latin-2 then try to save it. You may be asked
+%
+% Modern editing software can require an encoding to be associated
+% with each file. This is what allows the correct characters to be shown,
+% from what is otherwise just a sequence of 8-bit bytes. The flip-side
+% is that arbitrary editing is not permitted. Add some UTF-8 data into
+% a file that is encoded as Latin-2 then try to save it. You may be asked
% to specify a new encoding, or the application may even crash out entirely.
-% Maybe this happens \emph{accidentally}. It is not hard for a curly quote
-% (`) or endash (--) to be included; many editors have settings which can
+% Maybe this happens \emph{accidentally}. It is not hard for a curly quote
+% (`) or endash (--) to be included; many editors have settings which can
% do this with normal ascii input. Turn \emph{off} such settings.
%
% The approach that we advocate is that when editing to add metadata,
-% best is to:
+% best is to:
% \begin{enumerate}
-% \item
-% use the \emph{same encoding} as is specified for the file itself,
+% \item
+% use the \emph{same encoding} as is specified for the file itself,
% if known (as is usually the case);
-% \item
-% even if 1. is not possible, use Copy/Paste \emph{within} the document source
-% (e.g., for authors' names, addresses, affiliations, etc.) and from comments,
+% \item
+% even if 1. is not possible, use Copy/Paste \emph{within} the document source
+% (e.g., for authors' names, addresses, affiliations, etc.) and from comments,
% as in Section~\ref{sec-meta} above;
% \item
% avoid typing new characters, especially quotes and dashes, and be extra
@@ -1470,7 +1525,7 @@
% as could be produced for the Russian language version of the \TeX\ Live documentation,
% from coding as shown in Figure\,\ref{koi8-code}.
% The source file itself is actually encoded for KOI8-R, as indicated by the presence
-% of the code line |\usepackage[koi8-r]{inputenc}|,
+% of the code line |\usepackage[koi8-r]{inputenc}|,
% but is deliberately shown here encoded as |T1|~\cite[p.\,449]{LC2}.
% This difference is immaterial for checking the validity of the metadata.
% For example, the stream of upper (accents, etc.) characters within
@@ -1480,17 +1535,17 @@
% in the document, and from early subsection titles.
%
% It is the `parser' command/macro |\textKOI{ ... }| that indicates that the upper range
-% characters (having byte codes 128--255) are to be treated as KOI8-R characters,
+% characters (having byte codes 128--255) are to be treated as KOI8-R characters,
% rather than as part of UTF-8 byte sequences. It works by examining each byte in sequence,
-% and returning the appropriate UTF-8 2-byte sequence for the required cyrillic character.
-% This happens during the processing of data from |\jobname.xmpdata| for fleshing-out
+% and returning the appropriate UTF-8 2-byte sequence for the required cyrillic character.
+% This happens during the processing of data from |\jobname.xmpdata| for fleshing-out
% the XMP metadata packet to be included within the final PDF/A document.
%
% The `parser' macros defined for various encodings, are given in Figure\,\ref{parsers}.
-% In Section\,\ref{ssec-xmplang} the package options are given
+% In Section\,\ref{ssec-xmplang} the package options are given
% for loading the appropriate support for desired languages or alphabets.
% Support for other encodings can be added, if there proves to be a need.
-%
+%
%\begin{figure}[ht]
% \centering
% \begin{tabular}{lll}\hline
@@ -1519,13 +1574,13 @@
% \caption{How to see LICRs in the \texttt{.log} window.}\label{koi8-LICR}
% \end{figure}
%
-% With encoded characters marked in this way with a `parser' macro,
+% With encoded characters marked in this way with a `parser' macro,
% it is actually possible to mix UTF-8 metadata with other bytes;
% provided, of course, you have an editor that allows such a file
% to be created and saved. On the other hand, if you are unhappy with mixing
% content having different encodings, then there is another way, based upon
-% \LaTeX's LICR macros~\cite[\S\,7.11]{LC2} for representing accented
-% and non-latin characters.
+% \LaTeX's LICR macros~\cite[\S\,7.11]{LC2} for representing accented
+% and non-latin characters.
% These are normally hidden away (`I $=$ Internal') but in fact can be seen
% within auxiliary files, such as |.aux| and |.toc|, |.lof| and |.lot|.
% This is how \LaTeX\ stores the knowledge of such characters for use in
@@ -1548,20 +1603,20 @@
% \caption{How to get desired LICRs into the \texttt{.toc} file.}\label{koi8-toc}
% \end{figure}
%
-% Figure~\ref{koi8-LICR} shows how to see this.
+% Figure~\ref{koi8-LICR} shows how to see this.
% The document source in the lower portion clearly shows the cyrillic
% input, whereas the |.log| messages in a command-line window above
% reveal the LICR representation. A command |\showLICRs| is available
% with |pdfx.sty| version 1.5.8, specifically to allow this.
-% Now the LICR representation can be copied directly from the |.log| file,
+% Now the LICR representation can be copied directly from the |.log| file,
% modulo slight difficulties due to the way long lines are broken.
% As this representation is entirely with ASCII characters, it should not
% cause any conflict with any UTF-8 metadata that you want within the same file.
% The |.xmpdata| file might now look as in Figure~\ref{koi8-code2}.
% Although very verbose, this should be resistant to any corruption due to
-% character encodings, and produces the same result within the PDF,
+% character encodings, and produces the same result within the PDF,
% as in Figure~\ref{koi8-meta}.
-%
+%
% Alternatively one can exploit the |.toc| file, using \LaTeX's command
% |\addtocontents|, as shown in Figure~\ref{koi8-toc}.
% After processing the file, you can copy the LICR representations out
@@ -1570,24 +1625,24 @@
%
% Of course once you have harvested the metadata in this format, remove
% or comment-out those extra |\showLICRs| to get uninterrupted processing.
-% Similarly comment-out the extra |\addtocontents| lines, else the real
+% Similarly comment-out the extra |\addtocontents| lines, else the real
% Table-of-Contents will become corrupted with unwanted entries.
% A couple more \LaTeX\ processing runs should restore the PDF to the
% way you want it.
%
% \subsubsection[Metadata with Polish]{Metadata with Polish}\label{sssec-pol}
-%
-% The next example has upper-range bytes intended to represent Latin-2 encoded
-% characters, as used in Polish.
-% With the \LaTeX\ source starting as in Figure~\ref{tldoc-pol},
+%
+% The next example has upper-range bytes intended to represent Latin-2 encoded
+% characters, as used in Polish.
+% With the \LaTeX\ source starting as in Figure~\ref{tldoc-pol},
% the resulting metadata is shown in Figure~\ref{tlmeta-pol}.
-%
+%
%\begin{figure}[htb]
% \centering
% \includegraphics[scale=.45]{TL-POL-meta}
%\caption{Metadata generated from the coding shown in Figure~\ref{tldoc-pol}
-% for the Polish version of \TeX\ Live 2015 documentation, showing Latin-2 encoded
-% characters. The document is valid for PDF/A-2, after having been processed with
+% for the Polish version of \TeX\ Live 2015 documentation, showing Latin-2 encoded
+% characters. The document is valid for PDF/A-2, after having been processed with
% pdf-\LaTeX.}\label{tlmeta-pol}
%\end{figure}
%
@@ -1597,13 +1652,13 @@
% \input{latin2-example}
%\end{decl}
% }%
-%\caption{Start of the \LaTeX\ source for the Polish version of \TeX\ Live
-% documentation. Although Latin-2 encoded, the bytes are shown here using
+%\caption{Start of the \LaTeX\ source for the Polish version of \TeX\ Live
+% documentation. Although Latin-2 encoded, the bytes are shown here using
% \LaTeX's \texttt{T1} encoding \cite[p.\,449]{LC2}.}\label{tldoc-pol}
%\end{figure}
%
% Here the `parser macro' is |\textLII|, which can be seen in Figure~\ref{tldoc-pol}
-% to surround either complete metadata entries, or just those parts containing
+% to surround either complete metadata entries, or just those parts containing
% polish accented (or other) characters in entries that also contain english words.
% The macro |\textLF| provides a line-feed character for the UTF-8 output.
%
@@ -1619,38 +1674,38 @@
% Let's understand better how this example was created. There are three files involved.
%\begin{itemize}
% \item |pdfx.dtx|, the source for this documentation, open in an editor with
-% encoding declared as UTF-8;
+% encoding declared as UTF-8;
% \item |texlive-pl.tex| the Polish documentation for \TeX\ Live, open in the
% same editor with Latin-2 encoding;
% \item |latin2-example.tex| which starts life as an empty file on disk.
%\end{itemize}
% \noindent
-% This latter file must be opened in the editor, with encoding declared as
+% This latter file must be opened in the editor, with encoding declared as
% Latin-2 (ISO-8859-2).
% Next the preamble is copied from |texlive-pl.tex| and pasted into |latin2-example.tex|
% which is then saved to disk. Further editing is done to |latin2-example.tex| to
% add verbatim markers (\texttt{$\vert$...$\vert$}) and adjust line lengths for display
-% within Figure~\ref{tldoc-pol}. This file's contents is included as part of the
-% documentation via |\input{latin2-example}| within an environment that handles
+% within Figure~\ref{tldoc-pol}. This file's contents is included as part of the
+% documentation via |\input{latin2-example}| within an environment that handles
% presentation aspects, and (since 2018) declares |\UseRawInputEncoding|.
%
% What \emph{cannot} be done is to paste the preamble content directly into |pdfx.dtx|.
-% Consider what would then happen, using `t{\l}umaczy' (`translators', on line 10
-% following `UWAGA'). This word shows correctly in the Latin-2 encoded files.
-% It was typeset here using |\l| for the `\l' letter, having Unicode code-point
-% |Ux0142| (so UTF-8 byte pair |"C5|\,|"82|).
-% However, it occurs at slot |"B3| within Latin-2 encoding.
-% In the |T1| font encoding \cite[p.\,449]{LC2} the character glyph name
-% for slot |"B3| is |/scedilla|, which is what shows in Figure~\ref{tldoc-pol}.
-% When the `\l' is pasted directly into a UTF-8 file and shown verbatim,
-% the result is the pair of glyphs |"C5| (|/Aring|) and |"82| (|/Cacute|);
+% Consider what would then happen, using `t{\l}umaczy' (`translators', on line 10
+% following `UWAGA'). This word shows correctly in the Latin-2 encoded files.
+% It was typeset here using |\l| for the `\l' letter, having Unicode code-point
+% |Ux0142| (so UTF-8 byte pair |"C5|\,|"82|).
+% However, it occurs at slot |"B3| within Latin-2 encoding.
+% In the |T1| font encoding \cite[p.\,449]{LC2} the character glyph name
+% for slot |"B3| is |/scedilla|, which is what shows in Figure~\ref{tldoc-pol}.
+% When the `\l' is pasted directly into a UTF-8 file and shown verbatim,
+% the result is the pair of glyphs |"C5| (|/Aring|) and |"82| (|/Cacute|);
% \emph{viz.} {\UseRawInputEncoding |tłumaczy|}.
%
% As with Figure~\ref{koi8-code} it is not important that the correct characters
% are shown here, but that the metadata in |\jobname.xmpdata| corresponds to what
% is used on the titlepage of the PDF; e.g., the contents of |\Title| and |\title|,
% |\Author| and |\author|, etc.
-%
+%
%
% \subsubsection[Metadata with Greek]{Metadata with Greek}\label{sssec-grk}
%
@@ -1674,7 +1729,7 @@
%|% ... |\\
%| |\\
%|\providecommand{\pdfxopts}{a-2u,LGRxmp,LATxmp}|\\
-%|\begin{filecontents*}{\jobname.xmpdata}|\\
+%|\begin{filecontents}[force]{\jobname.xmpdata}|\\
%|\Title{Writing Greek with the "greek" option of the "babel" package}|\\
%{\color{verbcolor}\texttt{\string\Author\{Apostolos Syropoulos\string\sep\ G\"unter Milde\}}}\\
%|\Subject{This document describes the use of the Latin transliteration for Greek that is |\\
@@ -1690,11 +1745,11 @@
%| \textaristerikeraia\textAlpha\textSampi\textQoppa\textZeta\textdexiakeraia}}|\\
%|\CoverDate{1997-10-15}|\\
%|\CoverDisplayDate{October 15, 1997}|\\
-%|\Copyright{This file is part of the Babel system.\textLF This file may be distributed and/or|\\
+%|\Copyright{This file is part of the Babel system.\textLF This file may be distributed and/or|\\
%| modified under the conditions of the LaTeX Project Public License, either version 1.3 |\\
%| of this license or (at your option) any later version.}|\\
%|\CopyrightURL{http://www.latex-project.org/lppl.txt}|\\
-%|\end{filecontents*}|\\
+%|\end{filecontents}|\\
%|%|\\
%|\documentclass[11pt]{article}|\\
%|\usepackage[\pdfxopts]{pdfx}[2016/04/13]|\\
@@ -1725,70 +1780,70 @@
%
% Prior to proper support for UTF-8 input, a method for preparing document source
% for the modern Greek language (and also for polytonic Greek), involved the use
-% of LGR encoded fonts. Such a font has Greek (instead of Latin) letters in the
+% of LGR encoded fonts. Such a font has Greek (instead of Latin) letters in the
% slots for |a-zA-Z|, see~\cite[\S9.4.2]{LC2}. Thus ordinary ASCII letters are used
% to produce the Greek characters; the mapping of ASCII to Greek is referred to as
-% a `transliteration' scheme. It serves as \emph{both} an input encoding, and as
-% a font encoding. Accents and diacritic marks are provided through ligatures
-% built-in to the fonts. Various documents can be found on the web\footnote{e.g.,
+% a `transliteration' scheme. It serves as \emph{both} an input encoding, and as
+% a font encoding. Accents and diacritic marks are provided through ligatures
+% built-in to the fonts. Various documents can be found on the web\footnote{e.g.,
% \url{http://milde.users.sourceforge.net/LGR/}} and
% within \TeX\ Live distributions\footnote{%
-% TeXLive: \textcolor{urlcolor}{\texttt{.../2016/texmf-dist/doc/generic/babel-greek/}}}.
+% TeXLive: \textcolor{urlcolor}{\texttt{.../2016/texmf-dist/doc/generic/babel-greek/}}}.
%
% Indeed the current maintainer G\"unther Milde states
% ``The LGR transliteration does not work for PDF metadata''.
% This is because there is no translation of LGR input into \LaTeX\ LICRs,
% as happens with say |\usepackage[utf8]{inputenc}| for UTF-8 input,
-% or when upper 8-bit characters are present using |\usepackage[iso-8859-7]{inputenc}|.
-% With these, LICRs such as |\textAlpha|, |\textOmicron|, \dots, |\textomega|
+% or when upper 8-bit characters are present using |\usepackage[iso-8859-7]{inputenc}|.
+% With these, LICRs such as |\textAlpha|, |\textOmicron|, \dots, |\textomega|
% are produced, which result in the correct characters for metadata and bookmarks,
% perhaps employing Unicode `combining' characters for accented letters.
% Using |pdfx| the UTF-8 characters can be put directly into the |.xmpdata| file;
% LICRs are interpreted provided the |grkxmp| loading option has been specified.
-%
-% Using the methods of |pdfx| the metadata difficulty is remedied, as can be seen in
-% Figure~\ref{greek-meta} using coding as shown in Figure~\ref{greek-code}. This requires
-% the |LGRxmp| option and |\textLGR| `parser' macro. The original document source,
+%
+% Using the methods of |pdfx| the metadata difficulty is remedied, as can be seen in
+% Figure~\ref{greek-meta} using coding as shown in Figure~\ref{greek-code}. This requires
+% the |LGRxmp| option and |\textLGR| `parser' macro. The original document source,
% called |usage.tex|, can be found in the directory specified in the footnote below.
% As this document is essentially an English description of how to use LGR for Greek,
-% we have used the `Keywords' field to provide examples of such usage.
-% Since a macro |\textgreek| can be used for greek portions within such documents,
+% we have used the `Keywords' field to provide examples of such usage.
+% Since a macro |\textgreek| can be used for greek portions within such documents,
% this macro name is aliased to |\textLGR| within the context where metadata is processed.
-% Furthermore, parsing using |\textLGR| generates correct pre-composed characters
+% Furthermore, parsing using |\textLGR| generates correct pre-composed characters
% for letters with accents or diacritics. Bookmarks can also be generated from
% LGR input, using a technique described in Section~\ref{sssec-arm}.
%
% \bigskip\noindent
% The features available with different loading options are summarised here.
% \begin{itemize}
-% \item
+% \item
% no option: all metadata in |.xmpdata| file is in UTF-8 (incl. ASCII)
% \item
-% |grkxmp|: LICRs can be present; e.g. |\textAlpha|, |\textOmega|, etc.
+% |grkxmp|: LICRs can be present; e.g. |\textAlpha|, |\textOmega|, etc.
% \item
% |LGRxmp|: supports LGR-encoded input and |ISO-8859-7| upper range characters,
-% using the |\textLGR| `parser' macro.
+% using the |\textLGR| `parser' macro.
% \end{itemize}
-% With |LGRxmp| specified, the features of |grkxmp| are also available; so any
+% With |LGRxmp| specified, the features of |grkxmp| are also available; so any
% lower-listed option allows data to be mixed with that for higher-listed ones.
%
%
% The final piece to get validation for PDF/A from LGR input, is to specify
-% a Unicode point for the `|v|' used only in the strong `|sv|' ligature to obtain
-% a non-final `sigma' typeset in isolation.
+% a Unicode point for the `|v|' used only in the strong `|sv|' ligature to obtain
+% a non-final `sigma' typeset in isolation.
%\begin{decl}[]
% |\pdfglyphtounicode{internalchar2}{200D}|
%\end{decl}
% This gives an interpretation as `zero-width joiner'.
% There are two instances of this within |usage.tex|. Copy/Paste works as desired.
-% Using \pdftex\ the above command is done automatically.
-% Drivers, such as Xe\LaTeX\ lacking an implementation of |\pdfglyphtounicode|,
+% Using \pdftex\ the above command is done automatically.
+% Drivers, such as Xe\LaTeX\ lacking an implementation of |\pdfglyphtounicode|,
% can fail to produce a valid PDF due to this rather minor deficiency.
-%
+%
% Greek numerals, using |\greeknumeral| or |\Greeknumeral| cannot work directly within
% a |.xmpdata| file. However if such is desired, the following technique allows
-% correct LICRs to be found for use in the metadata.
-% At any convenient place within the \LaTeX\ source; e.g., near where the required
+% correct LICRs to be found for use in the metadata.
+% At any convenient place within the \LaTeX\ source; e.g., near where the required
% number is used, insert coding such as:
% \begin{decl}[]
% |{\pdfxGreeknumeralsHack \textgreek{\edef\num{\greeknumeral{1997}}\show\num}}%|
@@ -1820,7 +1875,7 @@
%
% \def\ArmTeX{Arm\kern -0.15em\TeX}%
% \subsubsection[Metadata with Armenian]{Metadata with Armenian}\label{sssec-arm}
-%
+%
% \begin{figure}[!htbp]
% \centering
% \includegraphics[scale=.42]{armtex-meta}
@@ -1840,20 +1895,20 @@
% \caption{Enriched \LaTeX\ source for the Armenian version of the \ArmTeX\ manual,
% with added metadata demonstrating the \ArmTeX\ transliteration scheme for \texttt{OT6} encoding.
% Also shown is coding used to produce bookmarks from the transliteration.}\label{arm-code}
-% \end{figure}
-%
+% \end{figure}
+%
% The \ArmTeX\ package\footnote{documentation: %
% TeXLive: \textcolor{urlcolor}{\texttt{.../2016/texmf-dist/doc/generic/armenian/}}}
-% provides the method to typeset Armenian, with input being specified in various ways
-% including a transliteration scheme from ASCII input. This transliteration is directed
+% provides the method to typeset Armenian, with input being specified in various ways
+% including a transliteration scheme from ASCII input. This transliteration is directed
% at the use of the |OT6| encoding, developed for this purpose.
% Each way is supported by |pdfx.sty| with appropriate loading options, similar
-% to the support for Greek~(see Section~\ref{sssec-grk}).
+% to the support for Greek~(see Section~\ref{sssec-grk}).
% \begin{itemize}
-% \item
-% no option: all metadata in |.xmpdata| file is in UTF-8 (incl. ASCII)
% \item
-% |armxmp|: using LICR-like macro names; e.g. |\armAyb|, |\armsha|, |\armfe| etc.
+% no option: all metadata in |.xmpdata| file is in UTF-8 (incl. ASCII)
+% \item
+% |armxmp|: using LICR-like macro names; e.g. |\armAyb|, |\armsha|, |\armfe| etc.
% \item
% |AR8xmp|: using the \ArmTeX\ (|OT6|) transliteration scheme or with upper-range
% characters in |ArmSCII8| encoding, using the `parser' macro |\textARM|.
@@ -1866,9 +1921,9 @@
% implemented in the |OT6|-encoded font, or careful parsing of the input into
% LICR-like macros.
% \LaTeX\ source\footnote{TeXLive: %
-% \textcolor{urlcolor}{\texttt{.../2016/texmf-dist/doc/generic/armenian/examples/latex/}}}
-% for the \ArmTeX\ documentation is available in both English and Armenian.
-% Figure~\ref{arm-meta} shows the result of enriching the Armenian version with relevant
+% \textcolor{urlcolor}{\texttt{.../2016/texmf-dist/doc/generic/armenian/examples/latex/}}}
+% for the \ArmTeX\ documentation is available in both English and Armenian.
+% Figure~\ref{arm-meta} shows the result of enriching the Armenian version with relevant
% metadata, using coding as shown in Figure~\ref{arm-code}.
%
% As in earlier examples, that metadata has come from the extensive comments at the head
@@ -1883,18 +1938,18 @@
% process, as follows.
% \begin{enumerate}
% \item
-% conversion of transliterated source into UTF-8.
+% conversion of transliterated source into UTF-8.
% This is done as the |.xmpdata| file is processed, using |\pdfxEnableCommands|
-% to make global definitions; e.g,
+% to make global definitions; e.g,
%\begin{decl}[]
-% |\xdef\sectAtitle{\textARM{Nerac'uthyun}}|
+% |\xdef\sectAtitle{\textARM{Nerac'uthyun}}|
%\end{decl}
% capturing the section title in the form supplied in the \LaTeX\ source.
-% This can be seen in Figure~\ref{arm-code}, near the end of the |{filecontents*}|
+% This can be seen in Figure~\ref{arm-code}, near the end of the |{filecontents}|
% environment, and at the bottom where the |\section| command would occur.
% \item
% conversion of the UTF-8 representation into |UTF16-be|, suitable for bookmark
-% strings within the PDF file. With \pdftex\ thishis is done using
+% strings within the PDF file. With \pdftex\ this is done using
% |\StringEncodingConvert| from Heiko Oberdiek's |stringenc.sty| package.
% Lua\LaTeX\ and Xe\LaTeX\ can use the UTF-8 representation directly.
% \item
@@ -1909,8 +1964,8 @@
% \end{decl}
% Now |\pdfxBookmark| first checks that the macro passed as the 2nd argument
% actually exists. If it does not, an error message is given and upon continuation
-% would just do |\section{Nerac'uthyun}| as normal.
-% When it does exist, then step 2 is done (by \pdftex) storing the result as |\pdfx@temp|.
+% would just do |\section{Nerac'uthyun}| as normal.
+% When it does exist, then step 2 is done (by \pdftex) storing the result as |\pdfx@temp|.
% With Lua\TeX\ and Xe\TeX, |\pdfx@temp| stores a copy of the UTF-8 data.
% Then the commands needing to be executed are essentially
%\begin{decl}[]
@@ -1921,9 +1976,9 @@
% so that the correct section heading is displayed on the page,
% but when |\sectAtitle| is processed to create a bookmark it is replaced
% by the pre-prepared contents of |\pdfx@temp|.
-% There are some technicalities\footnote{In fact a small change is made
-% to how \textcolor{verbcolor}{\texttt{\string\@@writetorep}} is used.}
-% to make this work cleanly,
+% There are some technicalities\footnote{In fact a small change is made
+% to how \textcolor{verbcolor}{\texttt{\string\@@writetorep}} is used.}
+% to make this work cleanly,
% as just doing these commands would interfere with other uses of |\pdfstringdef|.
% In case a long sectioning command has an optional argument, or a $*$-variant
% is needed, then include it this way.
@@ -1933,32 +1988,32 @@
%
%
% \subsubsection[Other Languages]{Other Languages}\label{sssec-other}
-%
+%
% There is support for Metadata using characters from other languages,
-% with corresponding loading options, as follows.
+% with corresponding loading options, as follows.
% \begin{itemize}
-% \item |arbxmp| : Arabic;
+% \item |arbxmp| : Arabic;
% via LICRs |\textarabicalef|, |\textarabicqaf|,\\ |\textarabicaleflowerhamza|, etc.
-% \item |devxmp| : Devanagari;
+% \item |devxmp| : Devanagari;
% via LICRs |\textdevanagaria|, |\textdevanagarivocalicr|,\\ |\textdevanagaricandrabindu|, etc.
% \item |hebxmp| : Hebrew;
% via LICRs |\hebalef|, |\hebsamekh|, |\hebfinalpe| and accent marks |\segol|, |\qubuts|, etc.
-% \item |vnmxmp| : Vietnamese;
+% \item |vnmxmp| : Vietnamese;
% via LICRs |\ABREVE|, |\OCIRCUMFLEX|, |\uhorn| etc. and the combinations of multiple accents
% applied as usual via |\'|, |\`|, |\^|, etc.
% \end{itemize}
% The LICRs include support mapping accented letters to precomposed glyphs, falling back on
% `combining characters' only in unusual situations. Special input conventions or methods,
-% such as transliteration schemes, are \emph{not yet} supported.
-% Indeed, these options are largely untested, so any difficulties encountered should
+% such as transliteration schemes, are \emph{not yet} supported.
+% Indeed, these options are largely untested, so any difficulties encountered should
% be reported to the package authors. Requests to support extra input methods or other
% language blocks should also be directed to the authors, along with pointers to where
-% the desired input methods are fully described.
+% the desired input methods are fully described.
% Sample `real-world' documents would be greatly appreciated.
%
%
% \subsection[L8U pseudo-encoding]{L8U pseudo-encoding}\label{ssec-L8U}
-%
+%
% To understand how |pdfx| handles the translation into UTF-8 of input that is not already
% in that format, we'll briefly discuss \LaTeX's font-encoding mechanism, which is the
% basis for LICR macros~\cite[\S\,7.11]{LC2}. As an example, consider the macro |\textgamma|
@@ -1973,32 +2028,32 @@
% |ucs/data/uni-3.def:\uc@dclc{947}{default}{\textgamma}%|
% \end{decl}
% Here the |\uc@dclc| commands associate UTF-8 input of |Ux0263| (IPA small letter gamma)
-% and |Ux03B3| (Greek small letter gamma) internally with |\textgamma|,
+% and |Ux03B3| (Greek small letter gamma) internally with |\textgamma|,
% whereas the others deal with output formats\footnote{Whereas {\color{verbcolor}\texttt{ucs.sty}}
-% handles UTF-8 input, mapping it to LICRs, with {\color{verbcolor}\texttt{pdfx.sty}}
+% handles UTF-8 input, mapping it to LICRs, with {\color{verbcolor}\texttt{pdfx.sty}}
% we need the reverse mapping into UTF-8, not just from LICRs but also from legacy
-% 8-bit encodings and transliteration schemes.}.
-% In four of these examples there is a number, which refers to a position in an `encoding vector'
+% 8-bit encodings and transliteration schemes.}.
+% In four of these examples there is a number, which refers to a position in an `encoding vector'
% for the particular font used to place the character onto the printable page.
% For example |LGR| refers to greek fonts, encoded as explained in Section~\ref{sssec-grk}.
% IPA phonetics use the |T3| encoding, so |\textgamma| refers to a character
% from a different Unicode block.
%
% With two of these cases there is no specific font.
-% For example, |PU| is used to create bookmark strings,
-% and other PDF string inclusions, using |\pdfstringdef| from the |hyperref| package.
-% With |greek-euenc.def| designed for Xe\TeX\ and Lua\TeX, the encoding can be variable,
-% with the output bytes being those for the UTF-8 encoding of $\gamma$, namely |^^ce^^b3|,
-% shown here as the |T1|-encoded pair |γ|.
-% The term `pseudo-encoding' has been coined by the \LaTeX\ team.
-% Although there is no actual font to determine the encoding, to an author there is essentially
-% no difference in how corresponding macros can be used to get a character placed into
-% an appropriate structure within the PDF.
+% For example, |PU| is used to create bookmark strings,
+% and other PDF string inclusions, using |\pdfstringdef| from the |hyperref| package.
+% With |greek-euenc.def| designed for Xe\TeX\ and Lua\TeX, the encoding can be variable,
+% with the output bytes being those for the UTF-8 encoding of $\gamma$, namely |^^ce^^b3|,
+% shown here as the |T1|-encoded pair |γ|.
+% The term `pseudo-encoding' has been coined by the \LaTeX\ team.
+% Although there is no actual font to determine the encoding, to an author there is essentially
+% no difference in how corresponding macros can be used to get a character placed into
+% an appropriate structure within the PDF.
%
% Thus there are 4 output forms for this character,
% and we've not even considered how $\gamma$ is used in mathematics!
% To handle these concurrently, one has internally-defined control-sequence names
-% \begin{decl}[]
+% \begin{decl}[]
% |\LGR\textgamma=\char"67| \qquad where $6\times 16 + 7 = 103$\\
% |\T3\textgamma=\char"47| \qquad where $4\times 16 + 7 = 71$\\
% |\PU\textgamma=\long macro:->\83\263|\\
@@ -2006,12 +2061,12 @@
% \end{decl}
% where the 2nd `\textbackslash' is part of the name\footnote{%
% obtained using {\color{verbcolor}%
-% \texttt{\string\csname\space LGR\string\string\string\textgamma\string\endcsname}}.}.
+% \texttt{\string\csname\space LGR\string\string\string\textgamma\string\endcsname}}.}.
% The latter macro is explained below.
% To use the specific version of the macro, \LaTeX\ maintains a `font-encoding'
% parameter, set using |\fontencoding{...}| local to the surrounding environment grouping.
%
-% To the above declarations of |\textgamma|, to deal with conversion to UTF-8,
+% To the above declarations of |\textgamma|, to deal with conversion to UTF-8,
% the |pdfx| package adds the following declarations when the |LGRxmp| option is used.
% \begin{decl}[]
% |pdfx/l8ugrk.def:\DeclareTextCommand{\textgamma}{L8U}{γ}|\\
@@ -2019,11 +2074,11 @@
% |pdfx/l8ugrk.def:\DeclareTextCompositeCommand{\textLGRenc}{L8U}{g}{γ} |\\
% |pdfx/l8ugrk.def:\DeclareTextCompositeCommand{\textLGRenc}{L8U}{^^e3}{γ}|
% \end{decl}
-% The pseudo-encoding name |L8U| indicates \textbf{L}ocal conversion into UTF-\textbf{8} \textbf{U}nicode,
-% as required for metadata, using |pdfx.sty|. Currently this pseudo-encoding is used in one place only;
+% The pseudo-encoding name |L8U| indicates \textbf{L}ocal conversion into UTF-\textbf{8} \textbf{U}nicode,
+% as required for metadata, using |pdfx.sty|. Currently this pseudo-encoding is used in one place only;
% during the interpretation of information supplied through the |\jobname.xmpdata| file.
% This happens as part of the |pdfx| package, \emph{before} it uses |xmpincl.sty|.
-% Such specificity justifies being called a `Local' encoding.
+% Such specificity justifies being called a `Local' encoding.
% However, other tasks may emerge requiring on-the-fly conversion to UTF-8.
% In this case all the functionality of this pseudo-encoding could be shifted into a separate package,
% and the name changed to reflect this more general usage.
@@ -2031,7 +2086,7 @@
% is possibly a sufficient reason to have a separate package. Another possibility is to
% generate on-the-fly creation of UTF-8 strings, to be sent to Xe\TeX\ or Lua\TeX\ running
% as a slave process to generate images of string using OTF fonts, which \pdftex\ currently
-% cannot handle. The result would then be imported back into the running job as an image.
+% cannot handle. The result would then be imported back into the running job as an image.
% The authors invite suggestions of how this |L8U| pseudo-encoding functionality can be put to
% good use.
%
@@ -2041,7 +2096,7 @@
% |\DeclareTextComposite{\`}{T1}{A}{192}|
%\end{decl}
% to get the pre-composed `\`A', rather than a composite built from \`{} and `A'.
-% The last parameter is an index into a font; however the |\DeclareTextCompositeCommand|
+% The last parameter is an index into a font; however the |\DeclareTextCompositeCommand|
% variant allows arbitrary coding as that final parameter, so can be the bytes for the
% UTF-8 representation of a character.
% In the above code lines, macros are defined as follows
@@ -2067,18 +2122,18 @@
% | ... \textLGRenc{#1}\textgreekLGR@i #2\@empty | \quad if |#2| has more tokens\\
% |\textgreekLGR@i #1->\textgreekLGR@ii #1|
%\end{decl}
-% Thus |\textLGRenc| is called on each token in the argument of |\textLGR|.
+% Thus |\textLGRenc| is called on each token in the argument of |\textLGR|.
% Now |\textLGRenc|, which is applicable only when |L8U| pseudo-encoding is in effect,
% has a default expansion of just passing the character through unchanged; \emph{viz.}
%\begin{decl}[]
% |\DeclareTextCommand{\textLGRenc}{L8U}[1]{#1}|
%\end{decl}
% but by using |\DeclareTextCompositeCommand{\textLGRenc}{L8U}{...}{...}|,
-% alternate expansions apply with specific arguments, as shown above.
+% alternate expansions apply with specific arguments, as shown above.
% In particular, that final argument can include coding that `looks ahead' to find the next
% character. This is used, for example, with diacritics in Greek, multi-letter sequences
% for Armenian letters, and other special cases related to ligatures and punctuation symbols.
-% To illustrate this Figure~\ref{ex-arm} (below) follows the conversion of a specific word,
+% To illustrate this Figure~\ref{ex-arm} (below) follows the conversion of a specific word,
% given in the transliteration for Armenian~(see Section~\ref{sssec-arm}).
% This conversion occurs using only \TeX's macro-expansion ability.
% Some details relevant to this example are explained there.
@@ -2117,26 +2172,26 @@
%\end{decl}
% The macro |\armen@en| (named for \textbf{e}mpty or \textbf{n}ext),
% looks ahead to see if the 5th-next argument token is |\@empty|,
-% signifying that there is nothing left of the original input.
-% (A closed bracing |{...}| counts as a single argument.) If |\@empty| the tokens in
+% signifying that there is nothing left of the original input.
+% (A closed bracing |{...}| counts as a single argument.) If |\@empty| the tokens in
% the 2nd bracing are substituted, otherwise those in the 3rd bracing.
-% Similarly |\armen@nc| (named for \textbf{n}ext \textbf{c}haracter)
+% Similarly |\armen@nc| (named for \textbf{n}ext \textbf{c}haracter)
% looks to see whether that 5th argument token matches with the character in the
% 1st bracing. If so, the 2nd bracing's tokens are substituted, else those of the 3rd bracing.
-% This is how to cope with `Sh' or `SH', implemented as ligatures in an |OT6| encoded font,
-% denoting a different letter from a single `S'. The macro |\armuh| is used here
+% This is how to cope with `Sh' or `SH', implemented as ligatures in an |OT6| encoded font,
+% denoting a different letter from a single `S'. The macro |\armuh| is used here
% to \emph{prevent} a ligature from |ev| that would otherwise occur.
-% One writes |e\armuh v| to get the separate letters. As the space becomes an active token,
-% we need |\textarmgobblespace| to restart parsing appropriately.
-% Of course |\textarmenARM@i| behaves like |\textgreekLGR@i|
-% as explained earlier, with a test for |\@empty| as the 2nd token.
+% One writes |e\armuh v| to get the separate letters. As the space becomes an active token,
+% we need |\textarmgobblespace| to restart parsing appropriately.
+% Of course |\textarmenARM@i| behaves like |\textgreekLGR@i|
+% as explained earlier, with a test for |\@empty| as the 2nd token.
% At the end, any remaining |\@empty| expand into nothing.
%
% \caption{Partial tracing of the conversion of an Armenian word, indicated by the red oval
% in Figure~\ref{arm-meta}, from {\color{verbcolor}\texttt{OT6}} transliterated form into UTF-8 bytes.
-% In each line, \TeX\ expansion occurs at the position of the left-most `\textbackslash'.
-% The resulting bytes are shown here in {\color{verbcolor}\texttt{T1}} encoding,
-% as in previous examples, with {\color{verbcolor}\texttt{?}} indicating an invisible character
+% In each line, \TeX\ expansion occurs at the position of the left-most `\textbackslash'.
+% The resulting bytes are shown here in {\color{verbcolor}\texttt{T1}} encoding,
+% as in previous examples, with {\color{verbcolor}\texttt{?}} indicating an invisible character
% in the byte range {\color{verbcolor}\texttt{Ox80}--\texttt{Ox9f}}.
% See Figure\,\ref{src-arm} for how this source appears with UTF-8 encoding.
% }\label{ex-arm}
@@ -2147,8 +2202,8 @@
% to an LICR called |\textarmuh|. Since |\armuh| is already defined, not as an LICR,
% it cannot be declared to be one without creating problems.
% Instead, within the environment grouping where |L8U| pseudo-encoding is specified,
-% one uses |\let\armuh\textarmuh| within a `rebinding' macro command
-% |\LIIXUmaparmenianletters|\footnote{The start of the macro name is derived from pseudo-Roman
+% one uses |\let\armuh\textarmuh| within a `rebinding' macro command
+% |\LIIXUmaparmenianletters|\footnote{The start of the macro name is derived from pseudo-Roman
% numerals: IX = 9, IIX = 8}
% to get LICR functionality from user-commands.
%\begin{decl}[]
@@ -2161,7 +2216,7 @@
% | \def\armbf{}%|\\
% | ... }|
%\end{decl}
-% As well as rebinding each command for a letter, the font style-switching commands
+% As well as rebinding each command for a letter, the font style-switching commands
% are aliased to do nothing, as these are not relevant to creating UTF-8 output.
% Being localised by the |L8U| grouping, this causes no problem elsewhere within the document.
% These are similar to macros |\psdaliasnames| and |\psdmapshortnames| from |hyperref.sty|,
@@ -2169,7 +2224,7 @@
%
% \begin{figure}[htb]
% \includegraphics[scale=.625]{Armenian-example-UTF8.png}
-% \caption{Image of part of the source coding for Figure~\ref{ex-arm},
+% \caption{Image of part of the source coding for Figure~\ref{ex-arm},
% viewed as UTF-8 encoded, within editing software.}\label{src-arm}
% \end{figure}
%
@@ -2186,10 +2241,10 @@
% \item |\LIIXUmaplatinchars| and |\LIIXUcancelfontswitches| with |LATxmp|
% \item |\LIIXUmapmathletterlikes| always defined
% \item |\LIIXUmapmathspaces| always defined
-% \item |\LIIXUmapmath...| with |mathxmp| --- see Section~\ref{ssec-math} below.
+% \item |\LIIXUmapmath...| with |mathxmp| --- see Section~\ref{ssec-math} below.
%\end{itemize}
% It may well be that more macro names can be added to some of these commands,
-% to allow macro usage within the metadata.
+% to allow macro usage within the metadata.
% Suggestions for such additions should be sent to the |pdfx| package authors, along
% with example documents. Similarly support for more languages can be requested.
%
@@ -2199,9 +2254,9 @@
% Macro commands for many mathematical symbols can be used directly in metadata without extra
% support; e.g., basic arithmetic operations, letter-like symbols, spacing commands.
% Super- and subscripted letters and numerals can use |\textsuperscript| and |\textsubscript|
-% when there is an appropriate Unicode character (digits, comma, $+$/$-$/$=$, parentheses,
+% when there is an appropriate Unicode character (digits, comma, $+$/$-$/$=$, parentheses,
% many letters but not all).
-%
+%
% When the |mathxmp| loading option is specified, many more symbols become available,
% using `rebinding' macros. These are necessary, as the macros for mathematical symbols
% are generally \emph{not} defined as LICRs, but use |\mathchar|. Thus new LICRs are needed,
@@ -2243,8 +2298,8 @@
% where |\liixu@mathreorder| uses some \TeX\ pattern-matching to allow the |\textmathrmstring|
% parser macro to work on the argument to |\mathrm| before allowing |\textmathnormal| parsing
% to continue afterwards. We refer to this as `nested parsing'.
-%
-% Similarly `nested parsing' can be used with superscripts and subscripts using |^{...}| and |_{...}|
+%
+% Similarly `nested parsing' can be used with superscripts and subscripts using |^{...}| and |_{...}|
% and to specify linebreaks, and even super-/subscripts within styles; viz.
%\begin{decl}[]
% |\Declar...CompositeCommand{\textmathnormal}{L8U}{^}{\liixu@mathreorder\textsuperstring}|\\
@@ -2259,7 +2314,7 @@
% is required to uncover cases which may require special handling.
% An ultimate aim is to be able to just copy the \LaTeX\ source for the `Abstract' of a technical
% paper into the |\Subject{...}| field of the |.xmpdata| file, with a large expectation that
-% it will `just work', or need only trivial edits to make it so.
+% it will `just work', or need only trivial edits to make it so.
%
%
% \subsection[Metadata in a Production Workflow]{Metadata in a Production Workflow}\label{ssec-wflow}
@@ -2273,8 +2328,8 @@
% \noindent
% At Macquarie University, the Mathematics Department produces personalised topmatter
% or coversheets for student assignments and tutorial papers using \LaTeX, incorporating
-% information that has been stored in a database. This is done by writing extra definitions
-% at the top of a copy of the \LaTeX\ source as prepared by the lecturers.
+% information that has been stored in a database. This is done by writing extra definitions
+% at the top of a copy of the \LaTeX\ source as prepared by the lecturers.
% For example information analogous to the following
%\begin{decl}[]
% |\def\thestudentname{\utext{Moore} Ross}|\\
@@ -2286,7 +2341,7 @@
% |\def\theduedate{09/05 2016}|\\
% |...|
%\end{decl}
-% is prepended to the file shown in Figure~\ref{math-wflow},
+% is prepended to the file shown in Figure~\ref{math-wflow},
% for each student downloading their personalised assignment paper.
% The \LaTeX\ source makes use of this information, including recording some of it
% within the Metadata.
@@ -2301,7 +2356,7 @@
% |\def\assigntopics{orbits, stabilisers, groups of matrices}|\\
% |\providecommand{\pdfxopts}{a-1b}|\\
% |%% XMP metadata for PDF/A conformance|\\
-% |\begin{filecontents*}{\jobname.xmpdata}|\\
+% |\begin{filecontents}[force]{\jobname.xmpdata}|\\
% |\Title{\theunitcode\ \theoffering: Assignment \theassignmentnumber}|\\
% |\Author{\assignLecturer}|\\
% |\Copyright{Macquarie University, Mathematics Department}|\\
@@ -2310,7 +2365,7 @@
% |\Keywords{\assigntopics}|\\
% |\Creator{pdfTeX + pdfx.sty with \pdfxopts\space option}|\\
% |\pdfxEnableCommands{\def\utext#1{#1,}}|\\
-% |\end{filecontents*}|\\
+% |\end{filecontents}|\\
% ||\\
% |\documentclass[a4paper,11pt]{article}|\\
% |\RequirePackage{assignments}|\\
@@ -2332,7 +2387,7 @@
% Another way that jobs can be customised using essentially the same \LaTeX\ source,
% is via the command used to initiate the job. For example the file |sample.tex|,
% accompanying the |pdfx| distribution, can be used to test the loading options to create
-% PDFs conforming to the various flavours of PDF/A, PDF/E and PDF/X.
+% PDFs conforming to the various flavours of PDF/A, PDF/E and PDF/X.
% Consider a shell script containing the following (Unix/Linux) commands.
%\begin{decl}[]
% |pdflatex "\def\pdfxopt{a-2b}\input sample.tex"|\\
@@ -2348,11 +2403,11 @@
% from the same \LaTeX\ source, named according to each particular variant.
% A default |\providecommand{\pdfxopt}{a-1b}| at the start of |sample.tex| catches the case
% of normal typesetting, doing nothing when |\pdfxopt| already has an expansion value.
-%
+%
% \goodbreak
% \subsection[Further Developments]{Further Developments}\label{ssec-further}
%
-% Prospects for further development of the |pdfx| package are as follows,
+% Prospects for further development of the |pdfx| package are as follows,
% listed not necessarily in order of perceived importance.
% \begin{itemize}
% \item
@@ -2363,7 +2418,7 @@
% Conformance to multiple PDF standards; e.g. both PDF/A and PDF/E,
% both PDF/A and PDF/X with RGB or CMYK color profile, other combinations.
% \item
-% Explore delaying the processing of metadata until |\begin{document}|,
+% Explore delaying the processing of metadata until |\begin{document}|,
% thereby allowing some fields to be set automatically from other information
% supplied within the document preamble.
% \item
@@ -2384,7 +2439,6 @@
% Support emerging standards based on PDF 2.0~\cite{PDF20}.
% \end{itemize}
%
-%
% \section[Bibliography]{Bibliography}%
% {\let\newpage\relax
% \begin{thebibliography}{999}
@@ -2396,28 +2450,35 @@
%
% \bibitem{XMP-spec}Adobe Systems Inc.;
% XMP Specification, Adding Intelligence to Media. September 2005.
-% Also available as ISO 16684-1:2012\,\cite{XMP-ISO}.\\
+% Also available as ISO 16684-1:2012\,\cite{XMP-ISO}. %\\
% \url{http://www.adobe.com/devnet/xmp/}.
%
% \bibitem{PDFUA1} ANSI\,/\,AIIM\,/\,ISO\,14289-1:2012;
% Document management applications --- Electronic document file format enhancement for accessibility
% --- Part 1: Use of ISO\,32000-1\,(PDF/UA-1);
-% Technical Committee ISO/TC\,171/SC\,2 (July 2012).
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=54564}.\\
-% Revised as ISO\,14289-1:2014 (December 2014):
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=64599}.\\
-% Available from ANSI at \url{https://webstore.ansi.org/Standards/ISO/ISO142892014}.
+% Technical Committee ISO/TC\,171/SC\,2 (July 2012 -- withdrawn). %\\
+% Revised as ISO\,14289-1:2014 (Dec. 2014):
+% \url{https://www.iso.org/standard/64599.html}.\\
+% Available from ANSI at \url{https://webstore.ansi.org/standards/iso/iso142892014}.
%
-% \bibitem{PDFUABSI} BS,/\,ISO\,14289-1:2014; Document Management Applications.
-% Electronic Document File Format Enhancement For Accessibility. Use Of ISO 32000-1 (PDF/UA-1) (British Standard)
-% \url{https://webstore.ansi.org/Standards/BSI/BSISO142892014}.
+% \bibitem{PDFUA2} ISO\,14289-2:2024;
+% Document management applications --- Electronic document file format enhancement for accessibility
+% --- Part 2: Use of ISO\,32000-2\,(PDF/UA-2);\\
+% Technical Committee ISO/TC\,171/SC\,2 WG9 (March 2024).
+% \href{https://pdfa.org/iso-14289-2-pdfua-2/}%
+% {\UrlFont https://pdfa.org/iso-\penalty-20 14289-2-pdfua-2/}
+%
+% \bibitem{PDFUABSI} BS,/\,ISO\,14289-1:2014; Document Management Applications.
+% Electronic Document File Format Enhancement For Accessibility.
+% Use Of ISO 32000-1 (PDF/UA-1) (British Standard)
+% \url{https://webstore.ansi.org/standards/bsi/bsiso142892014}.
%
-% \bibitem{pdfaPilot} Callas Software Gmbh.;
+% \bibitem{pdfaPilot} Callas Software Gmbh.;
% \texttt{pdfaPilot}, plug-in or desktop software for PDF/A versions.
% \url{https://www.callassoftware.com/en/products/pdfapilot}.
%
% \bibitem{DC}
-% Dublin Core Metadata Element Set, Version 1.1, October 2010\\
+% Dublin Core Metadata Element Set, Version 1.1, October 2010\\
% \url{http://dublincore.org/documents/dces/}.
%
% \bibitem{BCP47}IETF; Best Current Practice \#47: Tags for Identifying Languages.
@@ -2425,115 +2486,157 @@
% \url{https://tools.ietf.org/pdf/bcp47.pdf}.
%
% \bibitem{PDFX}ISO\,15930-1:2001;
-% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 1:
+% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 1:
% Complete exchange using CMYK data (PDF/X-1 and PDF/X-1a).
% Technical Committee ISO/TC\,130 (December 2001).
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=29061}.
+% \url{https://www.iso.org/standard/29061.html}.
%
% \bibitem{PDFX3}ISO\,15930-3:2002;
-% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 3:
+% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 3:
% Complete exchange suitable for colour-managed workflows (PDF/X-3).
% Technical Committee ISO/TC\,130 (September 2002).
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=34941}.
+% \url{https://www.iso.org/standard/34941.html}.
%
% \bibitem{PDFX1a}ISO\,15930-4:2003;
-% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 4:
+% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 4:
% Complete exchange of CMYK and spot colour printing data using PDF 1.4 (PDF/X-1a).
% Technical Committee ISO/TC\,130 (December 2003).
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=39938}.
+% \url{https://www.iso.org/standard/39938.html}.
%
% \bibitem{PDFX3a}ISO\,15930-6:2003;
-% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 6:
+% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 6:
% Complete exchange of printing data suitable for colour-managed workflows using PDF 1.4 (PDF/X-3).
% Technical Committee ISO/TC\,130 (December 2003).
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=39940}.
+% \url{https://www.iso.org/standard/39940.html}.
%
% \bibitem{PDFX4}ISO\,15930-7:2010;
-% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 7:
+% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 7:
% Complete exchange of printing data (PDF/X-4) and partial exchange of printing data with external profile reference (PDF/X-4p) using PDF 1.6.
% Technical Committee ISO/TC\,130 (July 2010).
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=55843}.
+% \url{https://www.iso.org/standard/55843.html}.
%
% \bibitem{PDFX5}ISO\,15930-8:2010;
-% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 8:
-% Partial exchange of printing data using PDF 1.6 (PDF/X-5). \hfil
-% Technical Committee ISO/TC\,130 (July 2010). \hfil
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=55844}.
+% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 8:
+% Partial exchange of printing data using PDF 1.6 (PDF/X-5).
+% Technical Committee ISO/TC\,130 (July 2010).
+% \url{https://www.iso.org/standard/55844.html}.
% Revision via Corrigendum: ISO\,15930-8:2010/Cor\,1:2011 (August 2011);
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=60210}.
+% \url{https://www.iso.org/standard/60210.html}.
+%
+% \bibitem{PDFX6}ISO\,15930-9:2020;
+% Graphic technology --- Prepress digital data exchange --- Use of PDF --- Part 9:
+% Complete exchange of printing data (PDF/X-6) and partial exchange of printing data
+% with external profile reference (PDF/X-6p and PDF/X-6n) using PDF 2.0
+% Technical Committee ISO/TC\,130 (November 2020).
+% \url{https://www.iso.org/standard/77103.html}.
+%
%
% \bibitem{PDFVT}ISO\,16612-2:2010;
-% Graphic technology\,---\,Variable data exchange\,---\,Part 2:\hfil
-% Using PDF/X-4 \penalty-5000 and PDF/X-5 (PDF/VT-1 and PDF/VT-2).
-% Technical Committee ISO/TC\,130 (December 2005). \hfil
-% \href{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=38013}%
-% {{\small\tt http://www.iso.org/iso/home/store/catalogue\_tc/catalogue\_detail.htm?\penalty-200csnumber=38013}}.
+% Graphic technology\,---\,Variable data exchange---Part\,2:
+% Using PDF/X-4\penalty-5000\ and PDF/X-5 (PDF/VT-1 and PDF/VT-2).
+% Technical Committee ISO/TC\,130 (December 2005).
+% \url{https://www.iso.org/standard/38013.html}.%
+%
+%
+% \bibitem{PDFVT3}ISO\,16612-3:2020;
+% Graphic technology\,---\,Variable data exchange---Part\,3:
+% Using PDF/X-6\penalty-5000\ (PDF/VT-3).
+% Technical Committee ISO/TC\,130 (Edition1, 2020).
+% \url{https://www.iso.org/standard/75218.html}.%
%
% \bibitem{XMP-ISO}ISO\,16684-1:2012;
-% Graphic technology --- Extensible metadata platform (XMP) specification --- Part 1:
+% Graphic technology --- Extensible metadata platform (XMP) specification --- Part 1:
% Data model, serialization and core properties.
-% Technical Committee ISO/TC\,130 (February 2012).
-% \url{http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumber=57421}.
+% Technical Committee ISO/TC\,130 (February 2012 -- withdrawn).
+% Revised as ISO\,16684-1:2019; (Edition 2, 2019).
+% \url{https://www.iso.org/standard/75163.html}.
%
-% \bibitem{PDFA}ISO\,19005-1:2005;
+% \bibitem{PDFA}ISO\,19005-1:2005;
% Document Management --- Electronic document file format for long term preservation
% --- Part 1: Use of PDF\,1.4\,(PDF/A-1);
% Technical Committee ISO/TC\,171/SC\,2 (Sept. 2005).
-% Revisions via Corrigenda: ISO\,19005-1:2005/Cor\,1:2007 (March 2007);
-% ISO\,19005-1:2005/Cor\,2:2011 (Dec. 2011). \\
-% \url{http://www.iso.org/iso/catalogue_detail?csnumber=38920}.
+% Revisions via Corrigenda: ISO\,19005-1:2005/Cor\,1:2007 (March 2007);
+% ISO\,19005-1:2005/Cor\,2:2011 (Dec. 2011).
+% \url{https://www.iso.org/standard/38920.html}.
%
% \bibitem{PDFA2}ISO\,19005-2:2011;
% Document Management --- Electronic document file format for long term preservation
% --- Part 2: Use of ISO\,32000-1\,(PDF/A-2); \hfill
-% Technical Committee ISO/\penalty-200 TC\,171/SC\,2 (June 2011).\\
-% \url{http://www.iso.org/iso/catalogue_detail?csnumber=50655}.
+% Technical Committee ISO/\penalty-200 TC\,171/SC\,2 (June 2011).
+% \url{https://www.iso.org/standard/50655.html}.
%
% \bibitem{PDFA3}ISO\,19005-3:2012;
% Document Management --- Electronic document file format for long term preservation
% --- Part 3: Use of ISO\,32000-1 with support for embedded files (PDF/A-3);
-% Technical Committee ISO/TC\,171/SC\,2 (October 2012).\\
-% \url{http://www.iso.org/iso/catalogue_detail?csnumber=57229}.
+% Technical Committee ISO/TC\,171/SC\,2 (October 2012).
+% \url{https://www.iso.org/standard/57229.html}.
+%
+% \bibitem{PDFA4}ISO\,19005-4:2020;
+% Document Management --- Electronic document file format for long term preservation
+% --- Part 4: Use of ISO\,32000-2 (PDF/A-4);
+% Technical Committee ISO/TC\,171/SC\,2 (Edition 1, 2020).
+% \url{https://www.iso.org/standard/71832.html}.
+%
+% \bibitem{PDFDecl} PDF Declarations. A use of ISO\,32000.
+% PDF Association, Berlin, Germany (2019).
+% \url{https://pdfa.org/resource/pdf-declarations/}
%
% \bibitem{PDFE}ISO\,24517-1:2008;
-% Document Management --- Engineering document format using PDF --- Part 1:
+% Document Management --- Engineering document format using PDF --- Part 1:
% Use of PDF 1.6 (PDF/E-1);
% Technical Committee ISO/TC\,171/SC\,2 (May 2008).\\
-% \url{http://www.iso.org/iso/catalogue_detail?csnumber=42274}.
+% \url{https://www.iso.org/standard/42274.html}.
%
% \bibitem{ISO32000}ISO\,32000-1:2008;
% Document management\,---\,Portable document format\,(PDF\,1.7);
-% Technical Committee ISO/TC\,171/SC\,2 (July 2008).
+% Technical Committee ISO/TC\,171/SC\,2 (July 2008).
% Also available as \cite{PDF17}.\\
-% \url{http://www.iso.org/iso/catalogue_detail?csnumber=51502}.
+% \url{https://www.iso.org/standard/51502.html}.
%
% \bibitem{PDF20}ISO\,32000-2:2017;
% Document management --- Portable document format --- Part~2: PDF\,2.0;
-% Technical Committee ISO/TC\,171/SC\,2 Document file formats, EDMS systems
-% and authenticity of information. (July 2017)\\
-% \url{https://www.iso.org/standard/63534.html}.
+% Technical Committee ISO/TC\,171/SC\,2 Document file formats, EDMS systems
+% and authenticity of information. (July 2017 --- withdrawn)
+% Revised as ISO\,32000-2:2020; (Edition 2, 2020)
+% \url{https://www.iso.org/standard/75839.html}.\\
+% Sponsored access available since 5 April 2023, from
+% \href{https://www.pdfa-inc.org/product/iso-32000-2-pdf-2-0-bundle-sponsored-access/}{PDF Association}.
%
% \bibitem{LC2} F.\,Mittelbach, M.\,Goossens with J.\,Braams, D.\,Carlisle, C.\,Rowley;
% The \LaTeX\ Companion --- 2nd edition. Addison--Wesley (now Pearson Education Inc.), 2004.
% ISBN 0-201-36299-6 (paperback).
%
-% \bibitem{TN0009}PDF/A Competence Centre;
-% TechNote 0009: XMP Extension Schemas in PDF/A-1. (March 2008)
+% \bibitem{PDF-LaTeX} \LaTeX\ Project Working Group, PDF Association.
+% \url{https://pdfa.org/community/latex-project-lwg/}
+%
+% \bibitem{LaTeXPDF} \LaTeX\ Tagged PDF\,---\,A blueprint for a large project.
+% Frank Mittelbach, Chris Rowley; TUGboat, Volume 41 (2020), No 3.
+% \url{https://tug.org/TUGboat/tb41-3/tb129mitt-tagpdf.pdf}.
+% Project website \url{https://www.latex-project.org/};
+% \href{https://www.latex-project.org/publications/2020-FMi-TUB-tb129mitt-tagpdf.pdf}{Preprint}.
+%
+% \bibitem{TN0009}PDF/A Competence Centre;\,
+% TechNote\,0009: XMP Extension Schemas in PDF/A-1.\penalty-2000\ (March 2008) \ \
% \href{https://www.pdfa.org/publication/technical-note-tn-0009-xmp-extension-schemas-in-pdfa-1/}%
-% {\small\tt https://www.pdfa.org/publication/technical-note-tn-0009-xmp-extension\penalty-200 -schemas-in-pdfa-1/}.
+% {\UrlFont https://www.pdfa.org/publication/technical-note-tn-0009-xmp-\penalty-20 extension-schemas-in-pdfa-1/}.
%
% \bibitem{PDF-UA}
-% PDF/UA Technical Implementation Guide: Understanding ISO\,14289-1 (PDF/UA-1). \penalty-200
-% AIIM Global Community of Information Professionals. \hfil
+% PDF/UA Technical Implementation Guide: Understanding ISO\,14289-1\penalty-2000\ (PDF/UA-1).
+% AIIM Global Community of Information Professionals.
% \href{http://www.aiim.org/Research-and-Publications/standards/committees/PDFUA/Technical-Implementation-Guide}%
-% {\small\tt http://www.aiim.org/Re\penalty-200 search-and-Publications/standards/committees/PDFUA/Technical-Implementation\penalty-200 -Guide}.
+% {\UrlFont http://\penalty-20 www.aiim.org/Research-and-Publications/standards/committees/PDFUA/Technical\penalty-200 -Implementation-Guide}.
+%
+% \bibitem{WTPDF} Well-Tagged PDF (WTPDF);
+% Using Tagged PDF for Accessibility and Reuse in PDF 2.0.
+% PDF Association; PDF Reuse TWG \& PDF/UA TWG. Version 1.0.0, February 2024.
+% \url{https://pdfa.org/wtpdf/}
%
-% \bibitem{colorp} N.\,Preining;
+% \bibitem{colorp} N.\,Preining;
% \texttt{colorprofiles} \textemdash\ Collection of free ICC profiles.
-% \TeX\ and \LaTeX\ package (by R.\,Moore), distributed with \TeX{}Live. (November 2018)\\
+% \TeX\ and \LaTeX\ package (by R.\,Moore), distributed with \TeX{}Live. (Nov. 2018)
% \url{https://ctan.org/pkg/colorprofiles}.
%
-% \bibitem{PRISM}PRISM; Publishing Requirements for Industry Standard Metadata.
+% \bibitem{PRISM}PRISM; Publishing Requirements for Industry Standard Metadata.
% PRISM Metadata Initiative; Idealliance Working Group.
% \url{http://www.idealliance.org/specifications/prism-metadata-initiative/prism}
%
@@ -2541,16 +2644,24 @@
% Generation of PDF/X- and PDF/A-compliant PDFs with \pdftex --- \texttt{pdfx.sty}.
% TUGboat Vol.\,36, No.\,2; TUG 2015 Conference Proceedings. \TeX\ Users Group, 2015; pp.\,136--142.
%
-% \bibitem{veraPDF} veraPDF. Industry Supported PDF/A Validation.
-% Software, dual-licensed under the GNU General Public License v3 or later (GPLv3+)
+% \bibitem{tagpdf} |tagpdf| -- Tools for experimenting with tagging using pdf\LaTeX\ and Lua\LaTeX.
+% Ulrike Fischer. Available via CTAN repository.
+% \url{https://ctan.org/pkg/tagpdf}.
+%
+% \bibitem{tpdf} |tpdf|; Ross Moore. Unpublished.
+% \LaTeX\ package and macro suite for producing `real-world' standards-conforming PDF documents.
+% Examples available at \url{http://maths.mq.edu.au/~ross/TaggedPDF/}.
+%
+% \bibitem{veraPDF} veraPDF. Industry Supported PDF/A Validation.
+% Software, dual-licensed under the GNU General Public License v3 or later (GPLv3+)
% and Mozilla Public License v2 or later (MPLv2+). \url{https://verapdf.org}.
% Wiki: \url{https://github.com/veraPDF/veraPDF-validation-profiles/wiki}
%
-% \bibitem{RDF} World Wide Web Consortium (W3C);
+% \bibitem{RDF} World Wide Web Consortium (W3C);
% Resource Description Format: RDF 1.1 XML Syntax. W3C Recommendation. (February 2014)
% \url{https://www.w3.org/TR/rdf-syntax-grammar/}.
-%
-% \bibitem{wikiPDF}Wikipedia;
+%
+% \bibitem{wikiPDF}Wikipedia;
% PDF/A: \url{https://en.wikipedia.org/wiki/PDF/A}\newline
% PDF/E: \url{https://en.wikipedia.org/wiki/PDF/E}\newline
% PDF/VT: \url{https://en.wikipedia.org/wiki/PDF/VT}\newline
@@ -2560,7 +2671,7 @@
% \end{thebibliography}
% }\goodbreak
% \section[Implementation]{Implementation}
-%
+%
% \iffalse
%<*package>
% \fi \hfuzz=2.5pt%
@@ -2575,7 +2686,7 @@
}{}%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfx}
- [2019/02/27 v1.6.3 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
+ [2024/06/24 v1.6.5f PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
\newif\ifpdfx@noBOM \pdfx@noBOMfalse % use a BOM in the XMP packet
\newif\ifpdfx@x \pdfx@xfalse % PDF/X mode
@@ -2594,13 +2705,28 @@
\def\xmp@ReleaseDate{2005} % 2001 for PDF/X-1, 2005 for PDF/A-1,
% 2010 for PDF/A-2, 2012 for PDF/A-3.
+%% with Beamer pgf will have written Resource objects already
+\newif\ifpdfx@luacheck@needed
+\@ifpackageloaded{pgfcore}{\pdfx@luacheck@neededtrue}{}
+%% thanks to Ryutaroh Matsumoto for reporting this issue
+
\newcount\pdfx@minorversion
+\newcount\pdfx@majorversion
+\expandafter\ifx\csname pdfmajorversion\endcsname\relax
+%% RRM: 20240614 LuaLaTeX may not have this defined
+ \newcount\pdfmajorversion
+ \pdfmajorversion=1\relax
+\fi
\expandafter\ifx\csname pdfminorversion\endcsname\relax
-\else
- \global\pdfx@minorversion=\the\pdfminorversion
+%% RRM: 20240614 this could be set in luatex85 package
+ \newcount\pdfminorversion
+ \pdfminorversion=3\relax
\fi
+%% options can change these from the defaults
+\global\pdfx@majorversion=\the\pdfmajorversion
+\global\pdfx@minorversion=\the\pdfminorversion
-\def\pdfx@ErrorWarning#1#2#3#4{%
+\def\pdfx@ErrorWarning #1#2#3#4{%
\ifpdfx@noerr \PackageWarning{pdfx}{#1.^^J #2#3.^^J}%
\else \PackageError{pdfx}{#1}{#2#4.^^J
Use option 'noerr' to avoid this message.^^J}%
@@ -2781,6 +2907,9 @@
\DeclareOption{pdf15}{\global\pdfx@minorversion=5 }% 2005 Acrobat 6
\DeclareOption{pdf16}{\global\pdfx@minorversion=6 }% 2006 Acrobat 7 (ISBN 0-321-30474-8)
\DeclareOption{pdf17}{\global\pdfx@minorversion=7 }% 2008 ISO 32000-1:2008
+\DeclareOption{pdf20}{% 2020 ISO 32000-2:2020
+ \global\pdfx@majorversion=2 \relax
+ \global\pdfx@minorversion=0 }%
%% inhibits writing the XMP byte-order marker
\DeclareOption{noBOM}{\pdfx@noBOMtrue}
@@ -2845,6 +2974,13 @@
\ExecuteOptions{noBOM,a-1b}
\ProcessOptions
+\RequirePackage{ifluatex}
+\ifpdfx@luacheck@needed
+ \ifluatex
+ \RequirePackage{luatex85}
+ \fi
+\fi
+
\ifpdfx@ua\ifpdfx@x\else
\expandafter\if\xmp@Conformance A\else
\pdfx@ErrorWarning{PDF/UA requires 'Tagged PDF' for any structure.^^J
@@ -2857,19 +2993,23 @@
\expandafter\ifx\csname pdflastobj\endcsname\relax
\else
- \ifnum\pdflastobj >\z@ % pdftex has already written objects
+ \ifnum\pdflastobj >\z@ % pdf/luatex has already written objects
+ % e.g. by pgfcore , called from Beamer or other class
\ifnum\pdfx@minorversion=\pdfminorversion\else
\PackageError{pdfx}%
{^^J(pdfx) Cannot change the \string\pdfminorversion^^J%
- (pdfx) PDF version remains at 1.\the\pdfminorversion.^^J%
- (pdfx) Use \string\pdfminorversion=\the\pdfx@minorversion\space
+ (pdfx) PDF version remains at \the\pdfmajorversion.\the\pdfminorversion.^^J%
+ (pdfx) Use \string\pdfmajorversion=\the\pdfx@majorversion\space^^J%
+ and \string\pdfminorversion=\the\pdfx@minorversion\space
before \string\documentclass}%
{(pdfx) Another package or document-class has written objects into the PDF.^^J%
- (pdfx) Hit return to continue with PDF version 1.\the\pdfminorversion.%
- }%
+ (pdfx) Hit return to continue with PDF version %
+ \the\pdfmajorversion.\the\pdfminorversion.}%
+ \global\pdfx@majorversion=\the\pdfmajorversion
\global\pdfx@minorversion=\the\pdfminorversion
\fi
\else
+ \global\pdfmajorversion\pdfx@majorversion
\global\pdfminorversion\pdfx@minorversion
\fi
\fi
@@ -2877,6 +3017,7 @@
\expandafter\ifx\csname thepdfminorversion\endcsname\relax
\expandafter\ifx\csname pdfminorversion\endcsname\relax
\else
+ \xdef\thepdfmajorversion{\the\pdfmajorversion}
\xdef\thepdfminorversion{\the\pdfminorversion}
\fi\fi
@@ -2885,16 +3026,21 @@
\def\pdf@minorversion@xetex=#1{\gdef\thepdfminorversion{#1}}%
\let\pdfminorversion\pdf@minorversion@xetex
\else
- \ifnum\pdfminorversion < 4\relax
- \ifpdfx@x
- % more testing needed with PDF/X
- \else
- \pdfminorversion=4\relax % assumed for PDF/A ; options may change this for PDF/X
- \gdef\thepdfminorversion{4}%
- \fi
+ \ifnum\pdfmajorversion > 1\relax
+ \pdfminorversion=3\relax
+ %% else some JPG graphics with DCT encoding will fail
\else
- \ifnum\pdfminorversion<\thepdfminorversion\relax
- \global\pdfminorversion=\thepdfminorversion\relax
+ \ifnum\pdfminorversion < 4\relax
+ \ifpdfx@x
+ % more testing needed with PDF/X
+ \else
+ \pdfminorversion=4\relax % assumed for PDF/A ; options may change this for PDF/X
+ \gdef\thepdfminorversion{4}%
+ \fi
+ \else
+ \ifnum\pdfminorversion<\thepdfminorversion\relax
+ \global\pdfminorversion=\thepdfminorversion\relax
+ \fi
\fi
\fi
\fi
@@ -2902,7 +3048,8 @@
\pdfresetpageorigin=0
\fi
-\expandafter\ifx\csname pdfomitcharset\endcsname\relax\else
+\expandafter\ifx\csname pdfomitcharset\endcsname\relax
+\else
\ifpdfx@omitcharset
\pdfomitcharset = 1 %
%% do not create /Charset listings of font glyphs;
@@ -2940,8 +3087,10 @@
\RequirePackage{iftex}
\RequirePackage{ifpdf}
+%\expandafter\show\csname ifpdf\endcsname
%% Support for pdfTeX primitives when using XeTeX:
\RequirePackage{ifxetex}
+%\expandafter\show\csname ifpdf\endcsname
\ifxetex
\def\pdfx@pages@xetex#1{\special{pdf:put @pages <<#1>>}}
\def\pdfx@pageattr@xetex#1{\special{pdf:put @thispage <<#1>>}}
@@ -2971,7 +3120,10 @@
}%
\RequirePackage{pdftexcmds}%
\let\pdfx@mdfivesum\pdf@mdfivesum
- \let\pdfescapestring\pdf@escapestring
+% \let\pdfescapestring\pdf@escapestring
+ \long\def\pdf@escapestring@byte #1{%
+ \directlua {oberdiek.pdftexcmds.escapestring("\luaescapestring {#1}", "byte")}}%
+ %\let\pdf@escapestring\pdf@escapestring@byte
\else
\ifxetex
\expandafter\ifx\csname mdfivesum\endcsname\relax
@@ -3021,6 +3173,13 @@
\pdfgeninterwordspace=0 \relax
\fi
\begingroup
+ \expandafter\ifx\csname stockwidth\endcsname\relax\else
+ \ifdim\stockwidth=\z@ %% 20240528
+ \else
+ %% 20231023 support for memoir's stockwidth/height
+ \let\paperwidth\stockwidth
+ \let\paperheight\stockheight
+ \fi \fi
\dimen0=0.996264009963\paperwidth\relax
\edef\pdfx@mwidth{\strip@pt\dimen0}%
\advance\dimen0 -25\p@
@@ -3049,7 +3208,7 @@
\expandafter\immediate\pdfx@pageattr@xetex{\pdfx@everypage@xetex}}%
\EveryShipout{%
\expandafter\immediate\pdfx@pageattr@xetex{\pdfx@everypage@xetex}}%
- \else
+ \else
\EveryShipout{%
\expandafter\ifx\expandafter\relax\the\pdfpageattr\relax
\immediate\pdfpageattr\expandafter{\the\pdfpagesattr}%
@@ -3068,7 +3227,8 @@
\else
\ifnum\thepdfminorversion >3 \relax
\expandafter\ifx\csname pdfsuppresswarningdupmap\endcsname\relax
- \expandafter\ifx\csname pdfmapline\endcsname\relax\else
+ \expandafter\ifx\csname pdfmapline\endcsname\relax
+ \else
\pdfmapline{+dummy-space <dummy-space.pfb}
\fi
\else
@@ -3098,16 +3258,46 @@
\@namedef{M@L8U}{}%
%% adjust to LaTeX's 2018 change to the default encoding
+\def\pdfx@utfencodingname{utf8}%
+\def\pdfx@RawInputEncoding{%
+% \begingroup
+% \@tempcnta=0
+% % print out the catcodes of chars < 32
+% \loop
+% \typeout{\the\@tempcnta: \expandafter\the\catcode\@tempcnta}%
+% \advance\@tempcnta\@ne
+% \ifnum\@tempcnta<32
+% \repeat
+% \endgroup
+ \UseRawInputEncoding
+}
\expandafter\ifx\csname inputencodingname\endcsname\relax
\else
\def\pdfx@restoreencoding#1{%
- \@tempcnta=128
+ \@tempcnta=1\relax
+ \loop
+% \catcode\@tempcnta=13\relax
+ \advance\@tempcnta\@ne
+ \ifnum\@tempcnta<8\relax
+ \repeat
+ \catcode11=13 \relax
+ \@tempcnta=14\relax
+ \loop
+% \catcode\@tempcnta=13\relax
+ \advance\@tempcnta\@ne
+ \ifnum\@tempcnta<31 \relax
+ \repeat
+ \@tempcnta=128\relax
\loop
- \catcode\@tempcnta=13
+% \catcode\@tempcnta=13\relax
\advance\@tempcnta\@ne
\ifnum\@tempcnta<256
\repeat
- \inputencoding{#1}%
+% {\tracingall
+% \ifx\inputencodingname\pdfx@utfencodingname\else
+ \let\inputencodingname\relax %% kill previous
+% \fi
+ \inputencoding{#1}%}%
\let\LastDeclaredEncoding\pdfx@LastDeclaredEncoding
\let\DeclareFontEncoding@\pdfx@DeclareFontEncoding@
\let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
@@ -3116,7 +3306,18 @@
\let\pdfx@inputencodingname\inputencodingname
\global\let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
\global\let\pdfx@DeclareFontEncoding@\DeclareFontEncoding@
- \UseRawInputEncoding
+% \@tempcnta=0
+% \loop
+% \typeout{\the\@tempcnta: \expandafter\the\catcode\@tempcnta}%
+%% \expandafter\showthe\catcode\@tempcnta
+% \advance\@tempcnta\@ne
+% \ifnum\@tempcnta<32
+% \repeat
+%\show\UseRawInputEncoding
+%% if the encoding is utf8 then don't change it here – wrong!
+% \ifx\inputencodingname\pdfx@utfencodingname\else
+% \expandafter\expandafter
+ \expandafter\pdfx@RawInputEncoding %\fi
\fi
\InputIfFileExists{\pdfx@encodingfile}{}{}
\expandafter\ifx\csname pdfx@inputencodingname\endcsname\relax
@@ -3243,6 +3444,10 @@
\ifx\relax#1\relax\else\gdef\xmp@lang@Identifier{#1}\fi
\def\afterxmp@parse{\let\Identifier\pdfx@extraIdentifier}%
\xmp@parse{\global\let\xmp@Identifier\@this}}
+\newcommand{\pdfx@Nickname}[1][]{%
+ \ifx\relax#1\relax\else\gdef\xmp@lang@Nickname{#1}\fi
+% \def\afterxmp@parse{\let\Identifier\pdfx@extraNickname}%
+ \xmp@parse{\global\let\xmp@Nickname\@this}}
\newcommand{\pdfx@Thumbnails}{%
\def\afterxmp@parse{\let\Thumbnails\pdfx@extraThumbnails}%
\xmp@parse{\global\let\xmp@Thumbnails\@this}}
@@ -3443,6 +3648,28 @@
\xmp@parse{\global\let\xmp@extraIdentifier\@this}%
}%
+%% Nickname only supports a single usage, for PDF/X
+%\newcommand{\pdfx@extraNickname}[1][]{%
+% \ifx\relax#1\relax
+% \expandafter\expandafter\expandafter\gdef
+% \expandafter\expandafter\expandafter\xmp@Nickname
+% \expandafter\expandafter\expandafter{%
+% \expandafter\xmp@Nickname\pdfx@insert@sep}%
+% \else
+% \expandafter\expandafter\expandafter\gdef
+% \expandafter\expandafter\expandafter\xmp@Nickname
+% \expandafter\expandafter\expandafter{%
+% \expandafter\xmp@Nickname\pdfx@insert@sep[#1]}%
+% \fi
+% \def\afterxmp@parse{%
+% \expandafter\expandafter\expandafter\gdef
+% \expandafter\expandafter\expandafter\xmp@Nickname
+% \expandafter\expandafter\expandafter{%
+% \expandafter\xmp@Nickname\xmp@extraNickname}%
+% }%
+% \xmp@parse{\global\let\xmp@extraNickname\@this}%
+% }%
+
\newcommand{\pdfx@extraThumbnails}[1][]{%
\ifx\relax#1\relax
\expandafter\expandafter\expandafter\gdef
@@ -3737,7 +3964,7 @@
%\let\sep\pdfx@sep
%% Note: '\ ', \&, \copyright are already predefined by hyperref.
%% allow LICRs to expand into PDF strings
- \def\cf@encoding{PU}%
+ \def\cf@encoding{PU}%
\def\9##1{\ifcase##1\string\0\or\string\1\or\string\2\or\string\3\fi}%
\def\8{\string\00}%
\def\0{\string\0}\def\1{\string\1}\def\2{\string\2}\def\3{\string\3}%
@@ -3798,6 +4025,9 @@
%%----------------------------------------------------------------------
%% Alternative way to get the CreationDate using Lua for XeTeX
\ifdefined\pdfcreationdate\else
+ \ifdefined\creationdate %% added to XeTeX in 2019
+ \let\pdfcreationdate\creationdate
+ \else
\begingroup %% ensure correct catcodes, not done by \dospecials
\catcode`\:=12 \catcode`\.=12
\begin{filecontents*}{creationdate.lua}
@@ -3833,7 +4063,7 @@
\def\noexpand\pdfcreationdate{\string D:20181028075445+10'00'}}%
\x
\fi
-\fi
+\fi \fi
%%----------------------------------------------------------------------
\def\pdfx@findUUID#1{\edef\pdfx@tmpstring{\pdfx@mdfivesum{#1}}
@@ -4004,7 +4234,7 @@
\fi\fi
}%
\fi\fi
-\hypersetup{pdfencoding=auto}% unicode
+%\hypersetup{pdfencoding=auto}% 2019-12-08 No; this writes 8-bit bookmarks.
\expandafter\ifx\csname KV@Hyp@psdextra\endcsname\relax\else
\hypersetup{psdextra}
\fi
@@ -4370,7 +4600,7 @@
%% ----------------------------------------------------------------------
\begingroup
- \catcode`\_ 12 \catcode`\" 12 \catcode`\' 12
+ \catcode`\_ 12 \catcode`\" 12 \catcode`\' 12
\catcode`\< 12 \catcode`\> 12 \catcode`\/ 12 \catcode`\[ 12 \catcode`\] 12
\edef\@pctchar{\expandafter\@gobble\string\%}
\edef\@bchar{\expandafter\@gobble\string\\}
@@ -4733,22 +4963,24 @@
\fi
}% end of \catcode
+
%% ----------------------------------------------------------------------
%% \pdfx@topdfstring\toka\tokb: Convert the string in \tokb to a format
%% appropriate for PDF /Info strings, i.e., PDFDoc encoding or UTF-16
%% encoding, and store the result in \toka As a special case, if \tokb
%% is \@empty, set \toka to \@empty.
-\def\pdfx@topdfstring#1#2{%
- \ifx#2\@empty
+\RequirePackage{stringenc}% prevent it loading later inside a group
+\def\pdfx@topdfstring #1#2{%
+ \ifx #2\@empty
\global\let#1\empty
\else
\begingroup
\ifluatex\else\ifxetex\else
\inputencoding{utf8}%
\fi\fi
- \hypersetup{pdfencoding=auto}%
- \pdfstringdef#1{#2}%
+ \@ifl@t@r\fmtversion{2022/06/01}{}{\hypersetup{pdfencoding=auto}}%
+ \pdfstringdef #1{#2}%
\endgroup
\fi
}
@@ -4858,7 +5090,7 @@
\RequirePackage{stringenc}%
\begingroup
\catcode`\| 0
- \catcode `\\ 12
+ \catcode `\\ 12
|gdef |pdfx@parsebackslash#1{%
|begingroup
|def |pdfx@parsemacro{#1}%
@@ -4873,7 +5105,7 @@
|edef |pdfx@parseout{|pdfx@parseout \\}%
|def |next{|pdfx@doparsebackslash#2|pdfx@endparse}%
|fi |next
- }
+ }
|endgroup
\def\pdfx@parseend{%
\edef\next{\endgroup\def\expandafter\noexpand\pdfx@parsemacro{\pdfx@parseout}}%
@@ -5018,7 +5250,7 @@
\spacefactor\accent@spacefactor
}
%% same for named accents in math-mode
-\def\pdfx@mathaccentV#1#2#3#4#5{%
+\def\pdfx@mathaccentV #1#2#3#4#5{%
#5{\mathsurround=\z@\relax
\everymath{}%
\mathchoice
@@ -5027,12 +5259,74 @@
{\setbox\z@\hbox{$\scriptstyle #5$}\kern-\wd\z@}%
{\setbox\z@\hbox{$\scriptscriptstyle #5$}\kern-\wd\z@}%
}%
+% \pdfx@AMS@mathaccentV{#1}{#2}{#3}{#4}{#5}%
\AMS@mathaccentV{#1}{#2}{#3}{#4}{\phantom{#5}}%
}
+
+%%% the original AMS coding:
+%%\mathaccentV=macro: #1#2#3#4#5->\ifmmode
+%% \gdef \macc@tmp {\macc@depth \@ne }%
+%% \setbox \z@ \hbox {\let\mathaccentV \macc@test
+%% \let \use@mathgroup \@gobbletwo
+%% \let \select@group \@gobblethree \frozen@everymath {}$#5$}\macc@tmp
+%% \ifnum \macc@depth =\@ne
+%% \global \let \macc@nucleus \@empty
+%% \mathaccent "\accentclass@
+%% \else \@xp \macc@nested
+%% \fi #2#3#4{#5}\macc@nucleus
+%% \else
+%% \@xp \nonmatherr@ \csname #1\endcsname \fi .
+
+\def\pdfx@AMS@mathaccentV #1#2#3#4#5{%
+ \ifmmode
+ \gdef \macc@tmp {\macc@depth \@ne }%
+ \setbox \z@ \hbox {\let\mathaccentV \macc@test
+ \let \use@mathgroup \@gobbletwo
+ \let \select@group \@gobblethree \frozen@everymath {}$\phantom{#5}$}\macc@tmp
+ \ifnum \macc@depth =\@ne
+ \global \let \macc@nucleus \@empty
+ \mathaccent "\accentclass@
+ \else \@xp \macc@nested
+ \fi #2#3#4{#5}\macc@nucleus
+ \else
+ \@xp \nonmatherr@ \csname #1\endcsname
+ \fi
+}
+
+
+%% code supplied by Yuwsuke Kieda, 7 May 2019 :
+%% https://gist.github.com/yuw/a31936370647d0044eeb4e47f3ae913f
+%%
+\@ifpackageloaded{amsmath}{%
+ \def\pdfx@macc@a #1#2{%
+ \begingroup
+ \let\macc@style#1\relax
+ \def\macc@palette ##1{##1\macc@style}%
+ \advance\macc@depth\m@ne
+ \ifnum\macc@depth=\z@
+ \gdef\macc@nucleus{\phantom{#2}}%% <<< here
+ \setbox\z@\hbox{$#1#2\@empty{}\macc@skewchar$}%
+ \setbox\tw@\hbox{$#1#2\@empty\macc@skewchar$}%
+ \dimen@\tw@\wd\tw@ \advance\dimen@-\tw@\wd\z@
+ \xdef\macc@kerna{\the\dimen@\relax}%
+ \setbox4\hbox{$#1#2\acc@check\@empty$}%
+ \global\setbox\@ne\hbox to\wd4{}%
+ \ht\@ne\ht4 \dp\@ne\dp4
+ \xdef\macc@kernb{\the\wd4\relax}%
+ \mathaccent\macc@code{\box\@ne\kern\macc@kerna}%
+ \else
+ \mathaccent\macc@code{\let\macc@adjust\@empty #1#2\@empty}%
+ \macc@adjust
+ \fi
+ \endgroup
+ }}\relax
+%
\AtBeginDocument{%
\@ifpackageloaded{amsmath}{%
\let\AMS@mathaccentV\mathaccentV
- \let\mathaccentV\pdfx@mathaccentV}%
+% \let\mathaccentV\pdfx@mathaccentV
+% \let\macc@a\pdfx@macc@a
+ }%
}%
%% How to support XeTeX here ?
@@ -5284,10 +5578,25 @@
%% it should be loaded outside the grouping, else biblatex may barf
%%
\RequirePackage{ifthen}
-\begingroup
+
+%% 2024-04-05: from July 2024 LaTeX will not allow packages to load
+%% within a grouping, so reorganise a bit.
+%%
%% override the \ifpdf check of xmpincl package, inside the grouping
- \pdftrue
- \RequirePackage{xmpincl}
+%% after saving its current value:
+\let\pdfx@ifpdf\ifpdf
+\pdftrue
+%% now load the packages, then enter the grouping:
+\RequirePackage{xmpincl}
+%%
+\begingroup
+%%% 20240405 revert the value of \ifpdf ...
+\pdfx@ifpdf
+\else
+ %% 20240624 ... outside the grouping
+ \aftergroup\pdffalse
+\fi
+
%% combine coding from xmpincl and hyperxml to support XeTeX
\def\pdfx@xmpincl@xetex#1{%
\IfFileExists{#1.xmp}{%
@@ -5343,6 +5652,13 @@
%%----------------------------------------------------------------------
\begingroup
+%% 20210706 we need a pointer to unexpandable \par
+ \expandafter\ifx\csname tex_par:D\endcsname \relax
+ \let\pdfx@par\par
+ \else
+%% using LaTeX 2021-06 or later
+ \expandafter\let\expandafter\pdfx@par\csname tex_par:D\endcsname
+ \fi
\ifpdfx@x
\ifpdfx@vt
\def\xmp@template{pdfvt}%
@@ -5396,9 +5712,11 @@
%% beware 128 space characters -- for padding end of XMP packet
\gdef\paddingline{ }%
\typeout{Using XMP template file: \xmp@template.xmp}%
+ %% 20210706 ensure \par is unexpandable
+ \let\par\pdfx@par
\includexmp{\xmp@template}%
\endgroup
-
+%%%
%%
%% revert active characters to previous encoding
%%
@@ -5462,13 +5780,27 @@
%%
%% controls the color model and conversions with xcolor package
%%
+\def\pdfx@selectcolormodel@doing #1{%% Warning
+ \PackageWarning{pdfx}{Setting all color commands to #1,^^J%
+ consistent with the Color Model for PDF/%
+ \ifpdfx@x X \else \ifpdfx@e E \else A \fi\fi}%
+ }%% 20240528 inhibit any changes
+\def\pdfx@selectcolormodel@done #1{%% Warning
+ \PackageWarning{pdfx}{Color Model already set for PDF/%
+ \ifpdfx@x X\else \ifpdfx@e E\else A\fi\fi,^^Jcannot change to #1 }%
+ }%% 20240528 inhibit any changes
+%%
\ifpdfx@cmyk
%
% this will have been done already for PDF/X
%
\PassOptionsToPackage{cmyk,hyperref}{xcolor}
- \def\pdfx@handlexcolor{\def\@@mod{cmyk}\selectcolormodel{cmyk}%
- \convertcolorsUtrue\convertcolorsDtrue}
+ \def\pdfx@handlexcolor{\def\@@mod{cmyk}%
+ \pdfx@selectcolormodel@doing{cmyk}%
+ \selectcolormodel{cmyk}%
+ \convertcolorsUtrue\convertcolorsDtrue
+ \let\selectcolormodel\pdfx@selectcolormodel@done
+ }
\ifpdfx@x
\else
%% \AtBeginDocument{%
@@ -5491,8 +5823,12 @@
\fi
\else
\PassOptionsToPackage{rgb,hyperref}{xcolor}
- \def\pdfx@handlexcolor{\def\@@mod{rgb}\selectcolormodel{rgb}%
- \convertcolorsUtrue\convertcolorsDtrue}
+ \def\pdfx@handlexcolor{\def\@@mod{rgb}%
+ \pdfx@selectcolormodel@doing{rgb}%
+ \selectcolormodel{rgb}%
+ \convertcolorsUtrue\convertcolorsDtrue
+ \let\selectcolormodel\pdfx@selectcolormodel@done
+ }
\fi
\@ifpackageloaded{xcolor}{\pdfx@handlexcolor
\ifpdfx@cmyk\else\color{black}\fi}{%
@@ -5628,7 +5964,9 @@
%</package>
% \fi
% \Finale
-% \let\newpage\relax
% \PrintIndex
+% \let\realGlossaryParms\GlossaryParms \let\realsubitem\subitem
+% \long\def\GlossaryParms{\realGlossaryParms \def\hdpindex ##1##2{}%
+% \long\def\subitem ##1:\ ##2\pfill{\par\hangindent 30pt\hspace*{15pt}##2\hfil}}%
% \PrintChanges
% \endinput
diff --git a/Master/texmf-dist/source/latex/pdfx/pdfx.ins b/Master/texmf-dist/source/latex/pdfx/pdfx.ins
index afd943fbb59..88defbfee80 100644
--- a/Master/texmf-dist/source/latex/pdfx/pdfx.ins
+++ b/Master/texmf-dist/source/latex/pdfx/pdfx.ins
@@ -4,9 +4,9 @@
\preamble
- Copyright (c) 2019, CV Radhakrishnan <cvr@river-valley.org>,
+ Copyright (c) 2019-2024, CV Radhakrishnan <cvr@river-valley.org>,
Han The Thanh <thanh@river-valley.org>,
- Ross Moore <ross.moore@mq.edu.au>,
+ Ross Moore <ozross@icloud.com> - primary contact,
Peter Selinger <selinger@mathstat.dal.ca>
This file may be distributed and/or modified under the conditions
diff --git a/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx b/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx
index 09cac66703d..9e018afc668 100644
--- a/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx
+++ b/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx
@@ -8,7 +8,7 @@
\iffalse
%</internal>
%<*README>
-# THE POLYGLOSSIA PACKAGE v2.1
+# THE POLYGLOSSIA PACKAGE v2.2
## Multilingual typesetting with XeLaTeX and LuaLaTeX
This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX.
@@ -65,7 +65,8 @@ to track the issues and follow progress.
____________________________
The polyglossia package
- (C) 2008–2010 François Charette
+ (C) 2008–2010 François Charette
+ (C) 2023-2024 Udi Fogiel
(C) 2011–2024 Arthur Reutenauer
(C) 2013 Elie Roux
(C) 2019 Bastien Roucariès
@@ -76,19 +77,29 @@ to track the issues and follow progress.
\endpreamble
\postamble
- Copyright (C) 2024 by Arthur Reutenauer <arthur 'dot' reutenauer 'at' normalesup 'dot' org>
+ Copyright (C) 2024 by The Polyglossia Team http://github.com/reutenauer/polyglossia/
- This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either version 1.3
- of this license of (at your option) any later version.
- The latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of LaTeX
- version 2005/12/01 or later.
-
- This work has the LPPL maintenance status `maintained'.
+ Except where otherwise noted, Polyglossia is placed under the terms of the
+ MIT licence (https://opensource.org/licenses/MIT).
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the Software
+ is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR
+ A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
- The Current Maintainer of this work is Arthur Reutenauer.
+ Please report issues to http://github.com/reutenauer/polyglossia/issues
\endpostamble
@@ -98,8 +109,8 @@ to track the issues and follow progress.
\generate{\file{farsical.sty}{\from{polyglossia.dtx}{farsical.sty}}}
\generate{\file{hebrewcal.sty}{\from{polyglossia.dtx}{hebrewcal.sty}}}
\generate{\file{hijrical.sty}{\from{polyglossia.dtx}{hijrical.sty}}}
+\generate{\file{polyglossia-cjk-spacing.lua}{\from{polyglossia.dtx}{polyglossia-cjk-spacing.lua}}}
\generate{\file{polyglossia-french.lua}{\from{polyglossia.dtx}{polyglossia-french.lua}}}
-\generate{\file{polyglossia-korean.lua}{\from{polyglossia.dtx}{polyglossia-korean.lua}}}
\generate{\file{polyglossia-latin.lua}{\from{polyglossia.dtx}{polyglossia-latin.lua}}}
\generate{\file{polyglossia-punct.lua}{\from{polyglossia.dtx}{polyglossia-punct.lua}}}
\generate{\file{polyglossia-sanskrit.lua}{\from{polyglossia.dtx}{polyglossia-sanskrit.lua}}}
@@ -109,7 +120,7 @@ to track the issues and follow progress.
\generate{\file{babelsh.def}{\from{polyglossia.dtx}{babelsh.def}}}
\generate{\file{cal-util.def}{\from{polyglossia.dtx}{cal-util.def}}}
\generate{\file{xgreek-fixes.def}{\from{polyglossia.dtx}{xgreek-fixes.def}}}
-\generate{\file{gloss-acadien.ldf}{\from{polyglossia.dtx}{gloss-acadien.ldf}}}
+\generate{\file{gloss-acadian.ldf}{\from{polyglossia.dtx}{gloss-acadian.ldf}}}
\generate{\file{gloss-aeb.ldf}{\from{polyglossia.dtx}{gloss-aeb.ldf}}}
\generate{\file{gloss-af.ldf}{\from{polyglossia.dtx}{gloss-af.ldf}}}
\generate{\file{gloss-afb.ldf}{\from{polyglossia.dtx}{gloss-afb.ldf}}}
@@ -163,6 +174,7 @@ to track the issues and follow progress.
\generate{\file{gloss-ckb-Arab.ldf}{\from{polyglossia.dtx}{gloss-ckb-Arab.ldf}}}
\generate{\file{gloss-ckb-Latn.ldf}{\from{polyglossia.dtx}{gloss-ckb-Latn.ldf}}}
\generate{\file{gloss-ckb.ldf}{\from{polyglossia.dtx}{gloss-ckb.ldf}}}
+\generate{\file{gloss-classiclatin.ldf}{\from{polyglossia.dtx}{gloss-classiclatin.ldf}}}
\generate{\file{gloss-cop.ldf}{\from{polyglossia.dtx}{gloss-cop.ldf}}}
\generate{\file{gloss-coptic.ldf}{\from{polyglossia.dtx}{gloss-coptic.ldf}}}
\generate{\file{gloss-croatian.ldf}{\from{polyglossia.dtx}{gloss-croatian.ldf}}}
@@ -195,6 +207,7 @@ to track the issues and follow progress.
\generate{\file{gloss-dsb.ldf}{\from{polyglossia.dtx}{gloss-dsb.ldf}}}
\generate{\file{gloss-dutch.ldf}{\from{polyglossia.dtx}{gloss-dutch.ldf}}}
\generate{\file{gloss-dv.ldf}{\from{polyglossia.dtx}{gloss-dv.ldf}}}
+\generate{\file{gloss-ecclesiasticlatin.ldf}{\from{polyglossia.dtx}{gloss-ecclesiasticlatin.ldf}}}
\generate{\file{gloss-el-monoton.ldf}{\from{polyglossia.dtx}{gloss-el-monoton.ldf}}}
\generate{\file{gloss-el-polyton.ldf}{\from{polyglossia.dtx}{gloss-el-polyton.ldf}}}
\generate{\file{gloss-el.ldf}{\from{polyglossia.dtx}{gloss-el.ldf}}}
@@ -277,9 +290,6 @@ to track the issues and follow progress.
\generate{\file{gloss-lao.ldf}{\from{polyglossia.dtx}{gloss-lao.ldf}}}
\generate{\file{gloss-latex.ldf}{\from{polyglossia.dtx}{gloss-latex.ldf}}}
\generate{\file{gloss-latin.ldf}{\from{polyglossia.dtx}{gloss-latin.ldf}}}
-\generate{\file{gloss-latinclassic.ldf}{\from{polyglossia.dtx}{gloss-latinclassic.ldf}}}
-\generate{\file{gloss-latinecclesiastic.ldf}{\from{polyglossia.dtx}{gloss-latinecclesiastic.ldf}}}
-\generate{\file{gloss-latinmedieval.ldf}{\from{polyglossia.dtx}{gloss-latinmedieval.ldf}}}
\generate{\file{gloss-latvian.ldf}{\from{polyglossia.dtx}{gloss-latvian.ldf}}}
\generate{\file{gloss-lithuanian.ldf}{\from{polyglossia.dtx}{gloss-lithuanian.ldf}}}
\generate{\file{gloss-lo.ldf}{\from{polyglossia.dtx}{gloss-lo.ldf}}}
@@ -292,6 +302,7 @@ to track the issues and follow progress.
\generate{\file{gloss-malay.ldf}{\from{polyglossia.dtx}{gloss-malay.ldf}}}
\generate{\file{gloss-malayalam.ldf}{\from{polyglossia.dtx}{gloss-malayalam.ldf}}}
\generate{\file{gloss-marathi.ldf}{\from{polyglossia.dtx}{gloss-marathi.ldf}}}
+\generate{\file{gloss-medievallatin.ldf}{\from{polyglossia.dtx}{gloss-medievallatin.ldf}}}
\generate{\file{gloss-mk.ldf}{\from{polyglossia.dtx}{gloss-mk.ldf}}}
\generate{\file{gloss-ml.ldf}{\from{polyglossia.dtx}{gloss-ml.ldf}}}
\generate{\file{gloss-mn.ldf}{\from{polyglossia.dtx}{gloss-mn.ldf}}}
@@ -351,16 +362,9 @@ to track the issues and follow progress.
\generate{\file{gloss-welsh.ldf}{\from{polyglossia.dtx}{gloss-welsh.ldf}}}
\generate{\file{gloss-zh-CN.ldf}{\from{polyglossia.dtx}{gloss-zh-CN.ldf}}}
\generate{\file{gloss-zh-TW.ldf}{\from{polyglossia.dtx}{gloss-zh-TW.ldf}}}
-\generate{\file{arabicdigits.map}{\from{polyglossia.dtx}{arabicdigits.map}}}
-\generate{\file{bengalidigits.map}{\from{polyglossia.dtx}{bengalidigits.map}}}
-\generate{\file{devanagaridigits.map}{\from{polyglossia.dtx}{devanagaridigits.map}}}
-\generate{\file{farsidigits.map}{\from{polyglossia.dtx}{farsidigits.map}}}
-\generate{\file{gurmukhidigits.map}{\from{polyglossia.dtx}{gurmukhidigits.map}}}
-\generate{\file{odiadigits.map}{\from{polyglossia.dtx}{odiadigits.map}}}
-\generate{\file{thaidigits.map}{\from{polyglossia.dtx}{thaidigits.map}}}
\def\MetaPrefix{-- }
+\generate{\file{polyglossia-cjk-spacing.lua}{\from{polyglossia.dtx}{polyglossia-cjk-spacing.lua}}}
\generate{\file{polyglossia-french.lua}{\from{polyglossia.dtx}{polyglossia-french.lua}}}
-\generate{\file{polyglossia-korean.lua}{\from{polyglossia.dtx}{polyglossia-korean.lua}}}
\generate{\file{polyglossia-latin.lua}{\from{polyglossia.dtx}{polyglossia-latin.lua}}}
\generate{\file{polyglossia-punct.lua}{\from{polyglossia.dtx}{polyglossia-punct.lua}}}
\generate{\file{polyglossia-sanskrit.lua}{\from{polyglossia.dtx}{polyglossia-sanskrit.lua}}}
@@ -405,8 +409,10 @@ to track the issues and follow progress.
]{hyperref}
\usepackage{array}
\usepackage{metalogo}
-\let\XeTeX\undefined
-\let\XeLaTeX\undefined
+\ifxetex
+ \let\XeTeX\undefined
+ \let\XeLaTeX\undefined
+\fi
\usepackage[babelshorthands]{polyglossia}
\usepackage{farsical}
%
@@ -506,15 +512,23 @@ to track the issues and follow progress.
\usepackage[osf]{libertine}
% Monospace: Package dejavu-otf
\setmonofont[Scale=MatchLowercase]{DejaVuSansMono}
-% Libertine includes Hebrew, but we load it separately since
-% osf is not supported with this script and we want to avoid the
-% respective warnings
-\newfontfamily\hebrewfont[Script=Hebrew]{Linux Libertine O}
+% Package culmus
+\newfontfamily\hebrewfont[Script=Hebrew]{DavidCLM}[
+ UprightFont = *-Medium,
+ BoldFont = *-Bold,
+ Extension = .otf,
+ ItalicFont = *-MediumItalic,
+ BoldItalicFont = *-BoldItalic]
% Package dejavu-otf
\newfontfamily\armenianfont[Script=Armenian,Scale=MatchLowercase]{DejaVuSans}
\newfontfamily\georgianfont[Scale=MatchLowercase]{DejaVuSerif}
% Package amiri
-\newfontfamily\arabicfont[Script=Arabic]{Amiri-Regular}
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ Extension = .ttf,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic]
% No Syriac otf/ttf font seems available on CTAN
% This one, from the Syriac Institute, is included on Linux
% in the x11-fonts set and can be downloaded from
@@ -850,7 +864,7 @@ to track the issues and follow progress.
% dv & divehi & \tabularnewline
% el & greek & \tabularnewline
% el-monoton & greek & variant=monotonic [\emph{default}] \tabularnewline
-% el-polyton & greek & varant=polytonic \tabularnewline
+% el-polyton & greek & variant=polytonic \tabularnewline
% en & english & \tabularnewline
% en-AU & english & variant=australian \tabularnewline
% en-CA & english & variant=canadian \tabularnewline
@@ -1164,13 +1178,25 @@ to track the issues and follow progress.
%
% \section{Font setup}
%
-% With polyglossia it is possible to associate a specific font with any script or language
+% With \pkg{polyglossia} it is possible to associate a specific font with any script or language
% that occurs in the document. That font should always be defined as
-% \cmd{\⟨script⟩font}\ or \cmd{\⟨language⟩font}.
+% \cmd{\⟨script⟩font}\ or \cmd{\⟨language⟩font}. Note that ¦⟨language⟩¦ points to the \pkg{polyglossia}
+% language name, ¦⟨script⟩¦ might point either to an OpenType script name as defined by \pkg{fontspec}
+% (\eg ¦Latin¦) \new{2.2}or a BCP-47 script tag (\eg ¦Latn¦), though the script is fully lower-cased
+% in the \cmd{\⟨script⟩font}\ command.
+%
% For instance, if the default font defined by \cmd\setmainfont\
% does not support Greek, then one can define the font used to display Greek with:\\
-% \centerline{ \cmd\newfontfamily\cmd{\greekfont[Script=Greek,\meta{…}]\marg{font}}. }
-% Note that polyglossia will use the font defined as is, so assure to do all necessary settings
+% \centerline{\cmd\newfontfamily\cmd{\greekfont[Script=Greek,\meta{…}]\marg{font}}}
+% ^^A
+% If you want to setup a blackletter font specifically for the German blackletter script variant,
+% you might do so by:\\
+% \centerline{\cmd\newfontfamily\cmd{\latffont[\meta{…}]\marg{font}}}
+% ^^A
+% Setting up a font specifically for traditional Chinese is possible via:\\
+% \centerline{\cmd\newfontfamily\cmd{\hantfont[Script=CJK,\meta{…}]\marg{font}}}
+% ^^A
+% Note that \pkg{polyglossia} will use the font defined as is, so assure to do all necessary settings
% (please refer to the \pkg{fontspec} documentation for details).
% For instance, if \cmd\arabicfont\ is explicitly defined, then the option ¦Script=Arabic¦ should
% be included in that definition.
@@ -1180,10 +1206,12 @@ to track the issues and follow progress.
% \cmd{\⟨script⟩fontsf} or \cmd{\⟨language⟩fontsf} and \cmd{\⟨script⟩fonttt} or \cmd{\⟨language⟩fonttt}, respectively.
%
% Whenever a new language is activated, \pkg{polyglossia} will first check whether
-% a font has been defined for that language or – for languages in non-Latin scripts –
-% for the script it uses. If it is not defined, it will use the currently active font
-% and – in the case of OpenType fonts – will attempt to turn on the appropriate
-% OpenType tags for the script and language used, in case these are available in
+% a font has been defined for that language. If this is not the case, it will check whether a font associated
+% with the BCP-47 script tag of the current language is defined. If this also isn't the case, \pkg{polyglossia}
+% will finally check (but this only for languages in non-Latin scripts) whether there is a font associated
+% with the OpenType script tag. If none of these fonts is defined, \pkg{polyglossia} will use the currently
+% active font as defined by ¦\setmainfont¦, ¦\setsansfont¦ or ¦\setmonofont¦ and – in the case of OpenType fonts –
+% will attempt to turn on the appropriate OpenType tags for the script and language used, in case these are available in
% the font, by means of \pkg{fontspec}’s \cmd\addfontfeature. If the current font
% does not appear to support the script of that language, an error message is
% displayed.
@@ -1978,7 +2006,7 @@ to track the issues and follow progress.
% \end{table}
% \item \xpgchoicekey[1.46]{hyphenation}{\xpgvalue{classic}, \xpgvalue{modern}, or \xpgvalue{liturgical}}
% There are three different sets of hyphenation patterns for Latin. Separate
-% documention for them is available on the
+% documentation for them is available on the
% Internet.\footnote{Refer to \url{https://github.com/gregorio-project/hyphen-la/blob/master/doc/README.md\#hyphenation-styles}}
% Each of the four variants mentioned above has its default set of hyphenation
% patterns as indicated by table \ref{tab:latin-hyphenation}. Use the
@@ -2050,7 +2078,7 @@ to track the issues and follow progress.
% \item[¦'AE¦] for Ǽ (AE ligature with acute), also available for \'Œ
% \end{shorthands}
% \item \xpgboolkeyfalse[1.46]{prosodicshorthands}
-% Enable shorthands for prosodic marks (macrons and breves) very similiar to
+% Enable shorthands for prosodic marks (macrons and breves) very similar to
% those provided by \pkg{babel-latin} using the ¦withprosodicmarks¦
% modifier.
% Note that the active ¦=¦ character used for macrons will cause problems with
@@ -2956,7 +2984,7 @@ to track the issues and follow progress.
% \subsection{Islamic calendar (hijrical.sty)}\label{sec:hijrical}
% This package computes dates in the lunar Islamic (Hijra) calendar.\footnote{ %
% It makes use of the arithmetical algorithm in chapter 6 of
-% Reingold \& Gershowitz, \textit{Calendrical calculation: the Millenium edition}
+% Reingold \& Gershowitz, \textit{Calendrical calculation: the Millennium edition}
% (Cambridge University Press, 2001).\label{reingold}}
% It provides two macros for the end-user.
% The command
@@ -3091,6 +3119,31 @@ to track the issues and follow progress.
%
% \bgroup\footnotesize
%
+% \subsection*{2.2 (2024/07/15)}
+%
+% \subsubsection*{Bug fixes}
+% \begin{itemize}
+% \item Fix \texttt{lang} environment (\TXI{633}).
+% \item Fix first number of Maghrib abjad numbering for Algeria, Morocco and
+% Tunisia (\TXI{640}).
+% \item Fix some captions strings in Bulgarian, Chinese, Esperanto, Estonian, Hindi,
+% Latvian, and Slovak (\TXP{651})
+% \item Improve performance with multilingual documents that have a TOC (\TXI{641}).
+% \end{itemize}
+%
+% \subsubsection*{New Features}
+% \begin{itemize}
+% \item Add possibility to associate a font to a language/variant with reference to
+% a BCP-47 script tag (\TXI{636}).
+% \end{itemize}
+%
+% \subsubsection*{Internal work}
+% \begin{itemize}
+% \item The major rewrite of the package code has been finished. More code has been cleaned up,
+% and \pkg{polyglossia} employs modern concepts (\pkg{latex3} and modern \LaTeXe).
+% All key-val handling uses \pkg{l3keys} now rather than \pkg{xkeyval}.
+% \end{itemize}
+%
% \subsection*{2.1 (2024/03/07)}
%
% \subsubsection*{Bug fixes}
@@ -4149,7 +4202,7 @@ to track the issues and follow progress.
% \section{Acknowledgements (by François Charette)}
% \pkg{Polyglossia} is notable for being a recycle box of previous contributions
% by other people. I take this opportunity to thank the following individuals,
-% whose splendid work has made my task almost trivial in comparision: \TA{Johannes
+% whose splendid work has made my task almost trivial in comparison: \TA{Johannes
% Braams} and the numerous contributors to the \pkg{babel} package (in particular
% \TA{Boris Lavva} and others for its Hebrew support), \TA{Alexej Kryukov} (\pkg{antomega}),
% \TA{Will Robertson} (\pkg{fontspec}), \TA{Apostolos Syropoulos} (\pkg{xgreek}), \TA{Youssef Jabri}
@@ -4176,7 +4229,7 @@ to track the issues and follow progress.
% since we took over.
% In alphabetical order: \TA{Ignas Anikevicius}, \TA{Sina Ahmadi}, \TA{Matthew Bertucci}, \TA{Wouter Bolsterlee}, \TA{Christian Buhtz},
% \TA{Ashok Das}, \TA{Oleg Domanov}, user \TA{fakhriaunur}, \TA{Philipp Gesang}, \TA{Kevin Godby},
-% \TA{Enrico Gregorio}, \TA{Khaled Hosny}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime},
+% \TA{Enrico Gregorio}, \TA{Khaled Hosny}, \TA{Stephen Huan}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime},
% \TA{Mike Kroutikov}, \TA{Ivan Kokan}, \TA{Caleb Maclennan}, \TA{Gyula Magyarkuti}, \TA{José Mancera}, \TA{Miquel Ortega},
% \TA{Yevgen Pogribnyi}, \TA{Will Robertson}, \TA{Maïeul Rouquette}, \TA{Elie Roux}, \TA{Hugo Roy}, \TA{Guy Rutenberg},
% \TA{Marcin Serwin}, \TA{Arvinder Singh}, \TA{Avisek Jena}, \TA{Philipp Stephani}, \TA{Niranjan Tambe}, \TA{Takuji Tanaka},
@@ -4208,33 +4261,28 @@ to track the issues and follow progress.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage
- {polyglossia} {2024/03/07} {v2.1}
+ {polyglossia} {2024/07/15} {v2.2}
{Modern multilingual typesetting with XeLaTeX and LuaLaTeX}
+% TODO Handle remaining uses in the gloss files (\patchcmd)
+% and remove package call afterwards
\RequirePackage{etoolbox}
-\RequirePackage{xkeyval}[2008/08/13]
% Will raise error if used with anything else than XeTeX or LuaTeX
\RequirePackage{fontspec}[2010/06/08]% v2.0
\RequirePackage{iftex}
\prg_generate_conditional_variant:Nnn \clist_if_in:Nn {Ne} {TF, T, F} % check if needed
-% correct a bug in tracklang
-\AddToHook{package/tracklang/after}{%
- \IfPackageAtLeastTF{tracklang}{2019/08/30}
- {}
- {\cs_gset_eq:NN \AddTrackedLangage \AddTrackedLanguage}
-}
-
%% The following is for compatibility with Babel-aware package:
% \languageshorthands is provided by babelsh.def, which is
% only loaded by some glosses, but some classes presuppose
% it is there generally. So let's provide a stub:
\ProvideDocumentCommand \languageshorthands { m } {}
% These have to be provided at the end of the preamble
-\AddToHook{begindocument/before}{
- \cs_gset_eq:NN \bbl@set@language \xpg@set@language@aux % for biblatex
- \cs_gset_eq:NN \bbl@main@language \xpg@main@language % for biblatex
+\hook_gput_code:nnn {begindocument/before} {.}
+{
+ \cs_gset_eq:NN \bbl@set@language \xpg_set_language_aux:nn % for biblatex
+ \cs_gset_eq:NN \bbl@main@language \xpg_main_language_tl % for biblatex
\ProvideDocumentCommand \texorpdfstring { m m } { #1 } % dummy command if hyperref is not loaded
}
@@ -4243,16 +4291,15 @@ to track the issues and follow progress.
%% \l@nohyphenation is defined in polyglossia.lua
\sys_if_engine_luatex:TF
{
- \RequirePackage{luatexbase} % already included by fontspec, but needed here
- \RequireLuaModule{polyglossia}
+ \lua_load_module:n{polyglossia}
}{
\cs_if_free:cT { l@nohyphenation }
{ \chardef\l@nohyphenation=255 }
}
-% Which version of XeTeX do we use? What is the boudary class? 4095 or 255
+% Which version of XeTeX do we use? What is the boundary class? 4095 or 255
\cs_if_exist:cTF { e@alloc@intercharclass@top }
- { \let\xpg@boundaryclass=\e@alloc@intercharclass@top }
+ { \cs_gset_eq:NN \xpg@boundaryclass \e@alloc@intercharclass@top }
{ \chardef\xpg@boundaryclass=\@cclv }
% Useful for getting list of loaded languages and variants. Like babel's bbl@loaded
@@ -4288,18 +4335,18 @@ to track the issues and follow progress.
\cs_new_nopar:Nn \__xpg_at_begin_document:
{
% save various command
- \let\latin@alph\@alph % TODO rename when we have the C locale
- \let\latin@Alph\@Alph % TODO rename when we have the C locale
+ \cs_gset_eq:cc{latin@alph}{@alph}% TODO rename when we have the C locale
+ \cs_gset_eq:cc{latin@Alph}{@Alph}% TODO rename when we have the C locale
% push to C language gloss
- \let\polyglossia@Clang@@arabic\@arabic
- \let\polyglossia@Clang@arabic\arabic
+ \cs_gset_eq:cc{xpg_Clang_arabic}{@arabic}
\xpg_initial_setup:
% apply \familydefault changes
- \xpg@set@familydefault
+ \xpg_set_familydefault:
}
-\AddToHook{begindocument}{
+\hook_gput_code:nnn {begindocument} {.}
+{
\__xpg_at_begin_document:
}
@@ -4307,7 +4354,8 @@ to track the issues and follow progress.
% loaded after \set[main|other]language
% Track whether the main language has been set
\bool_new:N \g_xpg_main_lang_set_bool
-\AddToHook{begindocument/end}{
+\hook_gput_code:nnn {begindocument/end} {.}
+{
% now we have the C locale definition: select the language
\__xpg_at_begin_document_selectlanguage:
\bool_gset_true:N \g_xpg_main_lang_set_bool
@@ -4315,99 +4363,177 @@ to track the issues and follow progress.
\__xpg_at_begin_document_hyphenation:
}
-%% custom message macros
-\providecommand*{\xpg@error}[1]{
- \PackageError{polyglossia}{#1}{}
+%
+% MESSAGES
+%
+
+% message templates
+\msg_new:nnn { polyglossia } { general } { #1 }
+
+\msg_new:nnn { polyglossia } { languagenotloaded }
+{
+ The~ language~ #1~ is~ not~ loaded.~ You~ must~ load~ it~ in~ order~ to~ use~ it.
}
+\msg_redirect_name:nnn { polyglossia } { languagenotloaded } { critical }
-\providecommand*{\xpg@warning}[1]{
- \PackageWarning{polyglossia}{#1}
+\msg_new:nnn { polyglossia } { languagenolongerloaded }
+{
+ The~ language~ #1~ is~ no~ longer~ loaded.~ Please~ rerun~ LaTeX.
}
+\msg_redirect_name:nnn { polyglossia } { languagenolongerloaded } { warning }
-\providecommand*{\xpg@info}[1]{
- \PackageInfo{polyglossia}
- {#1\@gobble}
-} %% the \@gobble is to prevent displaying the line nr
+\msg_new:nnn { polyglossia } { unknownlocalnumeral }
+{
+ Unknown~ key~ "#1"~ in~ \string\localnumeral.
+}
-%TODO change all instances of \xpg@nopatterns in gloss-*.ldf files
-\providecommand*{\xpg@nopatterns@fallback}[2][nohyphenation]{
- \xpg@warning{No~ hyphenation~ patterns~ were~ loaded~ for~ `#2'\MessageBreak
- I~ will~ use~ \string\language=\string\l@ #1\space instead}
- \expandafter\adddialect\csname l@#2\expandafter\endcsname\csname l@#1\endcsname\relax}
+\msg_new:nnn { polyglossia } { localnumeralemptyvalue }
+{
+ Keys~ of~ \string\localnumeral~ must~ have~ a~ value.
+}
-\providecommand*{\xpg@nopatterns}[1]{
- \xpg@warning{No~ hyphenation~ patterns~ were~ loaded~ for~ `#1'\MessageBreak
- I~ will~ use~ \string\language=\string\l@nohyphenation\space instead}
- %%TODO? \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax
- }
+\msg_new:nnn { polyglossia } { illvalue }
+{
+ Illegal~ value~ (#1)~ for~ #2!
+}
-\def\xpg@ill@value#1#2{
- \xpg@warning{Illegal~ value~ (#1)~ for~ #2}}
+\msg_new:nnn { polyglossia } { illarg }
+{
+ Invalid~ argument~ (#1)~ for~ #2!
+}
-% error out if lang is not loaded
-\cs_new_nopar:Nn \xpg_error_if_lang_not_loaded:n
+\msg_new:nnn { polyglossia } { nopatterns }
{
- \seq_if_in:NeF \__xpg_langs_loaded {#1}
- {
- \xpg@error{language~ #1~ is~ not~ loaded.~ Please~ load~ it~ before~ using~ it.}
- }
+ No~ hyphenation~ patterns~ were~ loaded~ for~ `#2' \iow_newline:
+ I~ will~ use~ \string\language=\string\l@ #1\space instead.
}
-\msg_new:nnn { polyglossia } { languagenotloaded }
+\msg_new:nnn { polyglossia } { undefcmd }
{
- The~ language~ #1~ is~ not~ loaded.~ You~ should~ load~ it.
+ \tl_to_str:N {#1} ~ is~ not~ defined!
}
-\msg_redirect_name:nnn { polyglossia } { languagenotloaded } { critical }
-\msg_new:nnn { polyglossia } { languagenolongerloaded }
+%% custom message macros
+\cs_new_nopar:Nn \xpg_error_msg:n
{
- The~ language~ #1~ is~ no~ longer~ loaded.~ Please~ rerun~ LaTeX.
+ \exp_args:Nnne \msg_error:nnn { polyglossia } { general } { #1 }
}
-\msg_redirect_name:nnn { polyglossia } { languagenolongerloaded } { warning }
-\msg_new:nnn { polyglossia } { unknownlocalnumeral }
+\cs_new_nopar:Nn \xpg_warning_msg:n
{
- Unknown~ key~ "#1"~ in~ \string\localnumeral.
+ \exp_args:Nnne \msg_warning:nnn { polyglossia } { general } { #1 }
}
-\msg_new:nnn { polyglossia } { localnumeralemptyvalue }
+\cs_new_nopar:Nn \xpg_info_msg:n
+{
+ \exp_args:Nnne \msg_info:nnn { polyglossia } { general } { #1 }
+}
+
+\cs_new_nopar:Nn \xpg_no_patterns_msg:n
{
- Keys~ of~ \string\localnumeral~ must~ have~ value.
+ \msg_warning:nnnn { polyglossia } { nopatterns } { nohyphenation } { #1 }
}
+\cs_new_nopar:Nn \xpg_ill_value_msg:nn
+{
+ \msg_warning:nnnn { polyglossia } { illvalue } { #1 } { #2 }
+}
+
+\cs_new_nopar:Nn \xpg_ill_arg_msg:nn
+{
+ \msg_error:nnnn { polyglossia } { illarg } { #1 } { #2 }
+}
+
+% error out if lang is not loaded
+\cs_new_nopar:Nn \xpg_error_if_lang_not_loaded:n
+{
+ \seq_if_in:NeF \__xpg_langs_loaded {#1}
+ {
+ \msg_error:nnn { polyglossia } { languagenotloaded } { #1 }
+ }
+}
%% use macro if defined, else warn that it is not
\cs_new_nopar:Nn \__xpg_use_or_warn:N
{
\cs_if_exist_use:NF {#1}
{
- \xpg@warning { \tl_to_str:N {#1} ~ is~ not~ defined }
+ \msg_error:nnn { polyglossia } { undefcmd } { #1 }
}
}
\cs_generate_variant:Nn \__xpg_use_or_warn:N {c}
+% gloss message interface
+\cs_set_eq:cc { xpg@error } { xpg_error_msg:n }
+\cs_set_eq:cc { xpg@warning } { xpg_warning_msg:n }
+\cs_set_eq:cc { xpg@info } { xpg_info_msg:n }
+\cs_set_eq:cc { xpg@ill@value } { xpg_ill_value_msg:nn }
+
+
+\NewDocumentCommand \XPGNoPatternsFallback { O{ nohyphenation } m }
+{
+ \msg_warning:nnnn { polyglossia } { nopatterns } { #1 } { #2 }
+ \exp_args:Ncc \adddialect {l@#2} {l@#1}
+}
+
+\NewDocumentCommand \CheckHyphenationPatterns { m }
+{
+ \xpg_if_language_defined:nF {#1}
+ {
+ \XPGNoPatternsFallback{#1}
+ }
+}
+
+%
+% END MESSAGES
+
%% ensure directionality if bidi is loaded, else ignore
-\def\@@ensure@dir#1{\ifcsundef{@ensure@dir}{#1}{\@ensure@dir{#1}}}
-\def\@@ensure@maindir#1{\ifcsundef{@ensure@maindir}{#1}{\@ensure@maindir{#1}}}
+%%% FIXME still used?
+\cs_new_nopar:Npn \@@ensure@dir #1
+{
+ \cs_if_exist_use:c{@ensure@dir}{#1}
+}
-%% Used by the language definitions files for right-to-left languages
-\NewDocumentCommand \RequireBidi {}
+\cs_new_nopar:Npn \@@ensure@maindir #1
{
- \sys_if_engine_luatex:TF
- {\ifx\@onlypreamble\@notprerr\else\RequirePackage{luabidi}\fi}
- {\ifx\@onlypreamble\@notprerr\else\RequirePackage{bidi}\fi}
+ \cs_if_exist_use:c{@ensure@maindir}{#1}
}
-% if #1 is LR run #2 else #3
+% if we are in the document preamble run T else F
+\prg_set_conditional:Nnn \xpg_if_in_preamble: {T, F, TF}
+{
+ \cs_if_eq:NNTF { \@onlypreamble } { \@notprerr }
+ {
+ \prg_return_false:
+ }
+ {
+ \prg_return_true:
+ }
+}
+
+%% Used by the language definitions files for right-to-left languages
+\DeclareDocumentCommand \RequireBidi {}
+ {
+ \xpg_if_in_preamble:T
+ {
+ \sys_if_engine_luatex:TF
+ { \RequirePackage{luabidi} }
+ { \RequirePackage{bidi} }
+ }
+ \DeclareDocumentCommand \RequireBidi {} {}
+ }
+
+% if #1 is LR run T else F
\prg_set_conditional:Nnn \__xpg_if_LR_str:n {p, T, F, TF}
{
- \str_case_e:nnF{#1}{
+ \str_case_e:nnF{#1}
+ {
{LR}{\prg_return_true:}
{RL}{\prg_return_false:}
}
{
- \xpg@error{Unknown~ direction~#1}
+ \xpg_error_msg:n {Unknown~ direction~#1}
\prg_return_false:
}
}
@@ -4420,17 +4546,18 @@ to track the issues and follow progress.
{
\__xpg_if_LR_str:nF {#1}
{
- \xpg@error{right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
+ \xpg_error_msg:n {right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
}
}
\cs_new_nopar:Nn \__xpg_set_text_direction:n
{
\__xpg_if_LR_str:nF {#1}
{
- \xpg@error{right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
+ \xpg_error_msg:n {right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
}
}
-\AddToHook{package/bidi/after}{
+\hook_gput_code:nnn {package/bidi/after} {.}
+{
\cs_gset_nopar:Nn \__xpg_set_par_direction:n
{
\__xpg_if_LR_str:nTF{#1}
@@ -4452,7 +4579,8 @@ to track the issues and follow progress.
}
}
}
-\AddToHook{package/luabidi/after}{
+\hook_gput_code:nnn {package/luabidi/after} {.}
+{
\cs_gset_nopar:Nn \__xpg_set_par_direction:n
{
\__xpg_if_LR_str:nTF{#1}
@@ -4481,13 +4609,21 @@ to track the issues and follow progress.
{ \cs_new_nopar:Nn \__xpg_setRTLmain: { \@RTLmaintrue\setnonlatin } }
%% compatibility with babel
-\let\addto\gappto % gappto is defined in etoolbox
+\cs_set:Npn \addto #1 #2
+{
+ \cs_if_exist:NF { #1 }
+ { \cs_new:Npn { #1 } {} }
+ \tl_gput_right:Nn { #1 } { #2 }
+}
-%% NEW EXPERIMENTAL SETUP INTERFACE FOR GLOSS FILES
+%% SETUP INTERFACE FOR GLOSS FILES
%% options currently available:
%% language : the name of the language (as understood by fontspec)
%% hyphennames : the different hyphenation patterns to try (comma separated list)
-%%% TODO: if pattern is prefixed by !, then it should be loaded as a fallback, with \xpg@nopatterns@fallback - i.e. with a warning: e.g. sanskrit for hindi, or catalan for asturian. – Also for languages with variants! (English and German, etc.)
+%%% TODO: if pattern is prefixed by !, then it should be loaded as a fallback,
+%%%% with \CheckHyphenationPatterns - i.e. with a warning: e.g. sanskrit for hindi,
+%%%% or catalan for asturian. – Also for languages with variants!
+%%%% (English and German, etc.)
%% script : the name of the script (as understood by fontspec) – default is Latin
%% scripttag : the OpenType tag for the script
%% langtag : the OpenType tag for the language
@@ -4495,19 +4631,20 @@ to track the issues and follow progress.
%% frenchspacing : boolean
%% indentfirst : boolean
%% fontsetup : boolean
-%% TODO: nouppercase : boolean (for scripts like Arabic, Devanagari, etc which have no concept of uppercase/lowercase)
+%% TODO: nouppercase : boolean (for scripts like Arabic, Devanagari, etc which have
+%% no concept of uppercase/lowercase)
%% TODO: localalph = {<alph_csname>,<Alph_csname>}
%% TODO: localnumeral = <csname>
%% or even better localdigits = {0123456789} for fully automatic setup
-\newcommand*\PolyglossiaSetup[2]{
+\NewDocumentCommand \PolyglossiaSetup { m m }
+{
\__xpg_keys_define_lang:n{#1}
\keys_set:nn { polyglossia / #1 } { #2 }
\__xpg_setup_hyphen:n {#1}
%define booleans etoolbox style and set defaults
%% TODO ? \providetoggle{#1@setup@done}%
- % we initialize these so that we can use \gappto below
- \csgdef{init@extras@#1}{}
- \csgdef{init@noextras@#1}{} % we don't use this yet: remove?
+ % we initialize this so that we can append below
+ \cs_gset:cpn {init@extras@#1} {}
% here we do the fontsetup:
\__xpg_auto_setupfont:n { #1 }
%% TODO? \toggletrue{#1@setup@done}
@@ -4526,35 +4663,41 @@ to track the issues and follow progress.
\clist_map_inline:nn { #1 } { \keys_set:nn { polyglossia / ##1 } { #2 } }
}
-
+\bool_new:N \l__xpg_have_hyphen_bool
% setup hyphennames from a str list of hyphen
\cs_new:Nn \__xpg_setup_hyphen:n
{
- \clist_set:Ne{\l_tmpa_clist}{\prop_item:Nn \g_xpg_langsetup_prop {#1 / hyphennames}}
- \providebool{havehyphen}
- \boolfalse{havehyphen}
+ \clist_set:Ne{\l_tmpa_clist}{\prop_item:Nn \l_xpg_langsetup_prop {#1 / hyphennames}}
+ \bool_set_false:N \l__xpg_have_hyphen_bool
% for each hyphen in the set until we find one that works
- \clist_map_inline:Nn \l_tmpa_clist {
- \ifbool{havehyphen}{}{
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ \bool_if:NF \l__xpg_have_hyphen_bool
+ {
% check if language hyphenname is defined
- \__xpg_check_if_exist_l@:nF{#1}{
+ \__xpg_pattern_check_if_exists:nF{#1}
+ {
% if not, first consider nohyphenation
\str_if_eq:nnTF{##1}{nohyphenation}
{
\cs_gset_eq:cc{l@#1}{l@##1}
- \global\booltrue{havehyphen}
- }{
+ \bool_gset_true:N \l__xpg_have_hyphen_bool
+ }
+ {
% then test if hyphenation is defined
- \xpg@ifdefined{##1}{
+ \xpg_if_language_defined:nT {##1}
+ {
% test if language hyphenation is nohyphenation
- \cs_if_eq:cNF{l@#1}{\l@nohyphenation}{\global\booltrue{havehyphen}}{%
+ \cs_if_eq:cNTF{l@#1}{\l@nohyphenation}
+ { \bool_gset_true:N \l__xpg_have_hyphen_bool }
+ {
% if false define language to hyphenation if it is not equal...
\str_if_eq:nnF{#1}{##1}{\cs_gset_eq:cc{l@#1}{l@##1}}
% ...and load
- \xpg@set@hyphenation@patterns{##1}
- \global\booltrue{havehyphen}
- }
- }{}
+ \xpg_set_hyphenation_patterns:n {##1}
+ \bool_gset_true:N \l__xpg_have_hyphen_bool
+ }
+ }
}
}
}
@@ -4562,19 +4705,17 @@ to track the issues and follow progress.
% if l@#1 does not yet exist,
% we assign it to nohyphenation
% we do this here in case and if the hyphennames key was omitted
- \ifbool{havehyphen}{}{
- \xpg@ifdefined{#1}{}
- {
- \xpg@nopatterns{#1}
- \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax
- }
+ \bool_if:NF \l__xpg_have_hyphen_bool
+ {
+ \CheckHyphenationPatterns{#1}
}
- \csdef{#1@language}{
- \polyglossia@setup@language@patterns{#1}
+ \cs_gset:cpn {#1@language}
+ {
+ \SetupPolyglossiaLangPatterns{#1}
}
% setup hyphenmins
\clist_set:Ne \l_tmpa_clist
- { \prop_item:Nn \g_xpg_langsetup_prop {#1 / hyphenmins} }
+ { \prop_item:Nn \l_xpg_langsetup_prop {#1 / hyphenmins} }
\cs_if_eq:cNF {l@#1} \l@nohyphenation
{
\use:x
@@ -4586,7 +4727,8 @@ to track the issues and follow progress.
}
}
-\newcommand*\polyglossia@setup@language@patterns[1]{
+\NewDocumentCommand \SetupPolyglossiaLangPatterns { m }
+{
\bool_if:NTF \g__xpg_hyphenation_disabled_bool
{
\tl_gset:Ne \g__xpg_lastlanguage_tl {\the\csname l@#1\endcsname}
@@ -4600,32 +4742,29 @@ to track the issues and follow progress.
\language=\l@nohyphenation
}
{
- \xpg@set@hyphenation@patterns{#1}
+ \xpg_set_hyphenation_patterns:n {#1}
}
}
{
% Since this function is sometimes called from the gloss files
% directly, we need to check whether the requested hyphenname exists.
- \xpg@ifdefined{#1}{}
- {
- \xpg@nopatterns{#1}
- \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax%
- }
- \xpg@set@hyphenation@patterns{#1}
+ \CheckHyphenationPatterns{#1}
+ \xpg_set_hyphenation_patterns:n {#1}
}
}
}
-\prop_new:N \g_xpg_langsetup_prop
+\prop_new_linked:N \l_xpg_langsetup_prop
\cs_new_protected:Npn \__xpg_keys_define_lang:n #1
{
- \keys_define:nn {polyglossia}{
+ \keys_define:nn {polyglossia}
+ {
% the script font
#1 / script
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/script}{##1}
- \prop_gput:Nne{\g_xpg_langsetup_prop}{#1/lcscript}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/script}{##1}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/lcscript}
{\tl_if_empty:nF{##1}{\str_lowercase:n{##1}}}
},
#1 / script
@@ -4634,84 +4773,89 @@ to track the issues and follow progress.
.initial:n = latin,
% the opentype script tag
#1 / scripttag
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/scripttag}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/scripttag}{##1}},
#1 / scripttag
.default:n = {},
#1 / scripttag
.initial:n = {},
% the language full name
#1 / language
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/language}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/language}{##1}},
#1 / language
.value_required:n = true,
#1 / language
.initial:x = {\str_uppercase:n#1},
% the language tag
#1 / langtag
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/langtag}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/langtag}{##1}},
#1 / langtag
.value_required:n = true,
#1 / langtag
.initial:n = {},
% the BCP-47 tag
#1 / bcp47
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47}{##1}},
#1 / bcp47
.value_required:n = true,
#1 / bcp47
.initial:n = {},
% the BCP-47 language tag
#1 / bcp47-language
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-language}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-language}{##1}},
#1 / bcp47-language
.value_required:n = true,
#1 / bcp47-language
.initial:n = {},
% the BCP-47 region tag
#1 / bcp47-region
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-region}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-region}{##1}},
#1 / bcp47-region
.value_required:n = false,
#1 / bcp47-region
.initial:n = {},
% the BCP-47 script tag
#1 / bcp47-script
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-script}{##1}},
+ .code:n =
+ {
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-script}{##1}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/lc-bcp47-script}
+ {\tl_if_empty:nF{##1}{\str_lowercase:n{##1}}}
+ },
#1 / bcp47-script
.value_required:n = true,
#1 / bcp47-script
- .initial:n = {},
+ .initial:n = {Latn},
% the BCP-47 variant tag
#1 / bcp47-variant
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-variant}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-variant}{##1}},
#1 / bcp47-variant
.value_required:n = false,
#1 / bcp47-variant
.initial:n = {},
% the BCP-47 extension-t tag
#1 / bcp47-extension-t
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-t}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-t}{##1}},
#1 / bcp47-extension-t
.value_required:n = false,
#1 / bcp47-extension-t
.initial:n = {},
% the BCP-47 extension-u tag
#1 / bcp47-extension-u
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-u}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-u}{##1}},
#1 / bcp47-extension-u
.value_required:n = false,
#1 / bcp47-extension-u
.initial:n = {},
% the BCP-47 extension-x tag
#1 / bcp47-extension-x
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-x}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-x}{##1}},
#1 / bcp47-extension-x
.value_required:n = false,
#1 / bcp47-extension-x
.initial:n = {},
% the BCP-47 casing alias
#1 / bcp47-casing
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-casing}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-casing}{##1}},
#1 / bcp47-casing
.value_required:n = false,
#1 / bcp47-casing
@@ -4720,7 +4864,7 @@ to track the issues and follow progress.
#1 / hyphennames
.code:n = {
\clist_set:Nn{\l_tmpa_clist}{##1}
- \prop_gput:Nne{\g_xpg_langsetup_prop}{#1/hyphennames}{\clist_use:Nn \l_tmpa_clist {,}}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/hyphennames}{\clist_use:Nn \l_tmpa_clist {,}}
},
#1 / hyphennames
.value_required:n = true,
@@ -4733,8 +4877,8 @@ to track the issues and follow progress.
{LR}{}
{RL}{\RequireBidi}
}
- {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/direction}{##1}}
- {\xpg@error{Unknown~ direction~ "##1"~ for~ language~ "#1"}}
+ { \prop_put:Nnn \l_xpg_langsetup_prop {#1/direction}{##1} }
+ { \xpg_error_msg:n {Unknown~ direction~ "##1"~ for~ language~ "#1"} }
},
#1 / direction
.value_required:n = true,
@@ -4745,9 +4889,9 @@ to track the issues and follow progress.
.code:n = {
% check syntax
\int_compare:nNnF { \clist_count:n {##1} } = {2}
- {\xpg@error{hypenmins~should~be~a~list~of~two~entries,~got~"##1"}}
+ { \xpg_error_msg:n {hypenmins~should~be~a~list~of~two~entries,~got~"##1"} }
% set prop
- \prop_gput:Nnn \g_xpg_langsetup_prop {#1/hyphenmins} {##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/hyphenmins} {##1}
},
#1 / hyphenmins
.value_required:n = true,
@@ -4758,9 +4902,9 @@ to track the issues and follow progress.
.code:n = {
% check syntax
\int_compare:nNnF { \clist_count:n {##1} } = {1}
- {\xpg@error{totalhyphenhypenmin~should~be~a~single~entry,~got~"##1"}}
+ { \xpg_error_msg:n {totalhyphenhypenmin~should~be~a~single~entry,~got~"##1"} }
% set prop
- \prop_gput:Nnn \g_xpg_langsetup_prop {#1/totalhyphenmin} {##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/totalhyphenmin} {##1}
},
#1 / totalhyphenmin
.value_required:n = false,
@@ -4779,35 +4923,35 @@ to track the issues and follow progress.
% environment name
#1 / envname
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/envname}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/envname}{##1}
},
#1/ envname.value_required:n = true,
#1/ envname.initial:n = {#1},
% babel name
#1 / babelname
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/babelname}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/babelname}{##1}
},
#1/ babelname.value_required:n = true,
#1/ babelname.initial:n = {#1},
% default numerals
#1 / localnumeral
. code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/localnumeral}{##1}
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/Localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/Localnumeral}{##1}
},
#1 / localnumeral.value_required:n = true,
- #1 / localnumeral.initial:n = {polyglossia@C@localnumeral},
+ #1 / localnumeral.initial:n = {xpg_C_localnumeral:nn},
% uppercased
#1 / Localnumeral
. code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/Localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/Localnumeral}{##1}
},
#1 / Localnumeral.value_required:n = true,
- #1 / Localnumeral.initial:n = {polyglossia@C@localnumeral},
+ #1 / Localnumeral.initial:n = {xpg_C_localnumeral:nn},
% environment define command (by default create the environment)
#1 / DefineCommandsCmd
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/DefineCommandsCmd}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/DefineCommandsCmd}{##1}},
#1 / DefineCommandsCmd
.value_required:n = true,
#1 / DefineCommandsCmd
@@ -4815,9 +4959,20 @@ to track the issues and follow progress.
}
}
+\DeclareExpandableDocumentCommand \babelname { }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / babelname }
+ }
+
+\DeclareExpandableDocumentCommand \mainbabelname { }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / babelname }
+ }
+
% TODO move to C module
-\newcommand*{\polyglossia@C@localnumeral}[2]{
- \polyglossia@Clang@@arabic{#2}
+\cs_new:Nn \xpg_C_localnumeral:nn
+{
+ \xpg_Clang_arabic{#2}
}
\cs_new:Npn \__xpg_localnumeral_parse:nn #1 #2
@@ -4841,7 +4996,7 @@ to track the issues and follow progress.
\__xpg_localnumeral_parse:nn
} { #2 }
}
- { \use:c { \prop_item:Ne \g_xpg_langsetup_prop
+ { \use:c { \prop_item:Ne \l_xpg_langsetup_prop
{ \languagename / #3 } } { } { #1 } }
}
@@ -4876,31 +5031,31 @@ to track the issues and follow progress.
\cs_new_nopar:Npn \__xpg_indent_first:n #1
{
\bool_if:cTF { g__xpg_#1_if_bool }
- { \french@indent } { \nofrench@indent }
+ { \__xpg_french_indent: } { \__xpg_no_french_indent: }
}
\cs_new:Nn \__xpg_lang_set_par_direction:n
{
- \prop_get:NeNTF \g_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
+ \prop_get:NeNTF \l_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
{
\__xpg_set_par_direction:n{\l_tmpa_tl}
}
{
- \xpg@error{Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
- \prop_show:N{\g_xpg_langsetup_prop}
+ \xpg_error_msg:n {Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
+ \prop_show:N{\l_xpg_langsetup_prop}
}
}
\cs_new:Nn \__xpg_lang_set_text_direction:nn
{
- \prop_get:NeNTF \g_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
+ \prop_get:NeNTF \l_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
{
\__xpg_set_text_direction:n{\l_tmpa_tl}{#2}
}
{
- \xpg@error{Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
- \prop_show:N{\g_xpg_langsetup_prop}
+ \xpg_error_msg:n {Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
+ \prop_show:N{\l_xpg_langsetup_prop}
}
}
@@ -4931,7 +5086,7 @@ to track the issues and follow progress.
{
\bool_gset_true:N \g__xpg_hyphenation_disabled_bool
\tl_gset:Ne \g__xpg_lastlanguage_tl { \the\language }
- % We do not call \xpg@set@hyphenation@patterns here to avoid a warning message.
+ % We do not call \xpg_set_hyphenation_patterns:n here to avoid a warning message.
% "nohyphenation" is not listed in language.dat.lua.
\language=\l@nohyphenation
}
@@ -4943,19 +5098,19 @@ to track the issues and follow progress.
{
\bool_gset_false:N \g__xpg_hyphenation_disabled_bool
\language=\tl_use:N{\g__xpg_lastlanguage_tl}
- }%
+ }
}
\cs_new:Npn \__xpg_auto_setupfont:n #1
{
\bool_if:cTF { g__xpg_#1_fontsetup_bool }
{
- \str_if_eq:eeTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript}}{latin}
- {\xpg@fontsetup@latin{#1}}
- {\xpg@fontsetup@nonlatin{#1}}
+ \str_if_eq:eeTF{\prop_item:Nn{\l_xpg_langsetup_prop}{#1/lcscript}}{latin}
+ {\SetupLatinPolyglossiaFont{#1}}
+ {\SetupNonLatinPolyglossiaFont{#1}}
}
{
- \xpg@info{Skipping~ automatic~ font~ setup~ for~ language~ #1}
+ \xpg_info_msg:n{Skipping~ automatic~ font~ setup~ for~ language~ #1}
}
}
@@ -4967,40 +5122,40 @@ to track the issues and follow progress.
\bool_if:nTF{\tl_if_empty_p:n{#1} || \tl_if_empty_p:n{#2}}
{
% maybe an error ?
- \xpg@warning{Asking~ to~ add~ empty~ feature~to~ main~ font~
+ \xpg_warning_msg:n{Asking~ to~ add~ empty~ feature~to~ main~ font~
(Language="#2"~ to~ langtag~ "#1")}
}
{
- \str_if_eq:nnTF{#2}{Turkish}{
+ \str_if_eq:nnTF{#2}{Turkish}
+ {
\fontspec_if_language:nTF {TRK}
{
\addfontfeature{Language=Turkish}
}
{
- \fontspec_if_language:nTF {TUR}
+ \fontspec_if_language:nT {TUR}
{
\addfontfeature{Language=Turkish}
- }{}
+ }
}
}{
- \fontspec_if_language:nTF{#1}
+ \fontspec_if_language:nT{#1}
{
\addfontfeature{Language=#2}
}
- {}
}
}
}
-\cs_generate_variant:Nn \__xpg_add_font_feature_language:nn { on , no, oo , Vn, nV, VV , xn, nx, xx}
+\cs_generate_variant:Nn \__xpg_add_font_feature_language:nn { ee }
-% add fontfeature Script=#2 to scripttag #1
-% do nothing if #1 or #2 is empty
+% add fontfeature Script=#3 to scripttag #2 for family #1
+% do nothing if #2 or #3 is empty
\cs_new:Nn \__xpg_add_font_feature_script:nnn
{
\bool_if:nTF{\tl_if_empty_p:n{#2} || \tl_if_empty_p:n{#3}}
{
% maybe an error ?
- \xpg@warning{Asking~ to~ add~ empty~ feature~to~ main~ font
+ \xpg_warning_msg:n{Asking~ to~ add~ empty~ feature~to~ main~ font
(Script="#3"~ to~ scripttag~ "#2")}
}
{
@@ -5036,118 +5191,58 @@ to track the issues and follow progress.
\regex_replace_once:nnN { \.[^\.]* \Z } { } \xpg_fname_str
% ... and, finally, quotation marks
\regex_replace_once:nnN { " } { } \xpg_fname_str
- \xpg@error{
- The~ current~ main ~ \xpg_ffamily_tl\space font,~ \xpg_fname_str,~ does~ not~ contain~ the~"#3"~ script!\MessageBreak
- Please~ define~\csname\tl_if_empty:nF{#3}{\str_lowercase:n{#3}}font\xpg_ffamilysh_tl\endcsname~
- with~ \string\newfontfamily\space command
+ \xpg_error_msg:n
+ {
+ The~ current~ main ~ \xpg_ffamily_tl\space font,~ \xpg_fname_str,~ does~ not~ contain~ the~"#3"~ script! \iow_newline:
+ Please~ define~\csname\tl_if_empty:nF{#3}{\str_lowercase:n{#3}}font\xpg_ffamilysh_tl\endcsname~
+ with~ \string\newfontfamily\space command
}
}
}
}
-\cs_generate_variant:Nn \__xpg_add_font_feature_script:nnn { non , nno, noo , nVn, nnV, nVV , nxn, nnx, nxx}
-
-\def\xpg@fontsetup@latin#1{
- \begingroup
- \csgdef{#1@font@rm}{
- \cs_if_exist_use:cF{#1font}{
- \rmfamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \csgdef{#1@font@sf}{
- \cs_if_exist_use:cF{#1fontsf}{
- \sffamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \csgdef{#1@font@tt}{
- \cs_if_exist_use:cF{#1fonttt}{
- \ttfamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \endgroup
-}
+\cs_generate_variant:Nn \__xpg_add_font_feature_script:nnn { nee }
-\def\xpg@fontsetup@nonlatin#1{
- \begingroup
- \csgdef{#1@font@rm}{
- \cs_if_exist_use:cF{#1font}
- {
- \providetoggle{#1@use@script@font}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\rmfamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} font}
- {
- \toggletrue{#1@use@script@font}
- }
- {
- \rmfamilylatin
- }
- }
- \iftoggle{#1@use@script@font}{}{
- \__xpg_add_font_feature_script:nxx{rm}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }%
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }%
- \def\familytype{rm}
- }%
- \csgdef{#1@font@sf}{
- \cs_if_exist_use:cF{#1fontsf}
+%% TODO: probably can be cleaned a little more
+\cs_new_protected:Npn \__xpg_setup_font:nnnnn #1 #2 #3 #4 #5 % #1 = lang, #2 = family, #3 = family, #4 = gobble, #5 gobble
+ {
+ \cs_set_protected_nopar:cpn { #1@font@#2 }
{
- \providetoggle{#1@use@script@fontsf}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\sffamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} fontsf}
+ \cs_if_exist_use:cF{ #1font#3 }
{
- \toggletrue{#1@use@script@fontsf}
- }
- {
- \sffamilylatin
- }
- }
- \iftoggle{#1@use@script@fontsf}{}{
- \__xpg_add_font_feature_script:nxx{sf}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }%
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }%
- \def\familytype{sf}
- }%
- \csgdef{#1@font@tt}{
- \cs_if_exist_use:cF{#1fonttt}
- {
- \providetoggle{#1@use@script@fonttt}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\ttfamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} fonttt}
- {
- \toggletrue{#1@use@script@fonttt}
- }
- {
- \ttfamilylatin
- }
- }
- \iftoggle{#1@use@script@fonttt}{}{
- \__xpg_add_font_feature_script:nxx{tt}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
+ \cs_if_exist_use:cF { \prop_item:Nn \l_xpg_langsetup_prop { #1 / lc-bcp47-script } font#3 }
+ {
+ #4 { \prop_item:Nn \l_xpg_langsetup_prop { #1 / lcscript } font#3 }
+ {
+ \use:c { #2familylatin }
+ #5
+ {
+ \__xpg_add_font_feature_script:nee { #2 }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / scripttag } }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / script } }
+ }
+ }
+ }
+ \__xpg_add_font_feature_language:ee
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / langtag } }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / language } }
+ }
+ \tl_set:Nn \familytype { #2 }
}
- \def\familytype{tt}
}
- \endgroup
-}
+
+\NewDocumentCommand \SetupLatinPolyglossiaFont { m }
+ {
+ \__xpg_setup_font:nnnnn { #1 } { rm } { } { \use_ii:nn } { \use_none:n }
+ \__xpg_setup_font:nnnnn { #1 } { sf } { sf } { \use_ii:nn } { \use_none:n }
+ \__xpg_setup_font:nnnnn { #1 } { tt } { tt } { \use_ii:nn } { \use_none:n }
+ }
+
+\NewDocumentCommand \SetupNonLatinPolyglossiaFont { m }
+ {
+ \__xpg_setup_font:nnnnn { #1 } { rm } { } { \cs_if_exist_use:cF } { \use:n }
+ \__xpg_setup_font:nnnnn { #1 } { sf } { sf } { \cs_if_exist_use:cF } { \use:n }
+ \__xpg_setup_font:nnnnn { #1 } { tt } { tt } { \cs_if_exist_use:cF } { \use:n }
+ }
%%% END OF PolyglossiaSetup
@@ -5156,40 +5251,53 @@ to track the issues and follow progress.
\cs_new_nopar:Nn \__xpg_local_marks:n { }
\cs_new_nopar:Nn \__xpg_enable_local_marks:
{
- \xpg@info{Option:~ localmarks}
+ \xpg_info_msg:n{Option:~ localmarks}
\cs_gset_nopar:Nn \__xpg_local_marks:n
{
- \def\xpg@tmp@lang{##1}
- \DeclareRobustCommand\markboth[2]{
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \unrestored@protected@xdef\@themark
- {
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####2}}}
- }
- \@temptokena \expandafter{\@themark}
- \mark{\the\@temptokena}
- \endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi
- }
- \DeclareRobustCommand\markright[1]{
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \expandafter\@markright\@themark
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}
- \@temptokena \expandafter{\@themark}
- \mark{\the\@temptokena}
- \endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi
- }
+ \DeclareDocumentCommand \markboth { m m }
+ {
+ \group_begin:
+ \cs_set_eq:cc { label } { relax }
+ \cs_set_eq:cc { index } { relax }
+ \cs_set_eq:cc { glossary } { relax }
+ \unrestored@protected@xdef\@themark
+ {
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####2}}}
+ }
+ \@temptokena \expandafter{\@themark}
+ \mark_insert:nn{2e-left}{####1}
+ \mark_insert:nn{2e-right}{####2}
+ \tl_if_empty:nF{####2}{ \mark_insert:nn{2e-right-nonempty}{####2} }
+ \mark{\the\@temptokena}
+ \group_end:
+ \if@nobreak\ifvmode\nobreak\fi\fi
+ }
+ \DeclareDocumentCommand \markright { m }
+ {
+ \group_begin:
+ \cs_set_eq:cc { label } { relax }
+ \cs_set_eq:cc { index } { relax }
+ \cs_set_eq:cc { glossary } { relax }
+ \expandafter\@markright\@themark
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}
+ \@temptokena \expandafter{\@themark}
+ \mark_insert:nn{2e-right}{####1}
+ \tl_if_empty:nF{####1}{ \mark_insert:nn{2e-right-nonempty}{####1} }
+ \mark{\the\@temptokena}
+ \group_end:
+ \if@nobreak\ifvmode\nobreak\fi\fi
+ }
}
}
%we call this macro when a gloss file is not found for a given language
-\def\xpg@nogloss#1{
- \xpg@warning{File~ gloss-#1.ldf~ do~ not~ exists!\MessageBreak
- I~ will~ nevertheless~ try~ to~ use~ hyphenation~ patterns~ for~ #1.}
+\cs_new_nopar:Nn \__xpg_no_gloss:n
+{
+ \xpg_warning_msg:n
+ {File~ gloss-#1.ldf~ do~ not~ exists! \iow_newline:
+ I~ will~ nevertheless~ try~ to~ use~ hyphenation~ patterns~ for~ #1.}
+
\PolyglossiaSetup{#1}{hyphenmins={2,3},hyphennames={#1},fontsetup=true}
% the above amounts to:
%\ifcsundef{l@#1}%
@@ -5198,59 +5306,64 @@ to track the issues and follow progress.
%\csdef{#1@language}{\language=\csname l@#1\endcsname}%
}
-\newcommand{\xpg@input}[1]{
+\cs_new_nopar:Nn \xpg_input:n
+{
% Store catcode of @ before making at letter
- \chardef\xpg@saved@at@catcode\catcode`\@
- \makeatletter
- \input{#1}
+ \cs_set_protected_nopar:Npx \__xpg_restore_at_catcode:
+ { \char_set_catcode:nn { `@ } { \char_value_catcode:n {`\@ } } }
+ \char_set_catcode_letter:N @
+ \file_input:n { #1 }
% restore former @ catcode
- \catcode`\@=\xpg@saved@at@catcode
+ \__xpg_restore_at_catcode:
}
% try to load a language file
-\cs_new:Nn \__xpg_load_lang_definition:nn {
- \file_if_exist:nTF{gloss-#2.ldf}
+\cs_new:Nn \__xpg_load_lang_definition:nn
+{
+ \file_if_exist:nTF{gloss-#2.ldf}
{
- % Temporarily force catcode of ~ to 13 since babelsh.def
+ \tl_set:Nn \xpg__tmp_default_options_tl { #1 }
+ % Temporarily force catcode of ~ to 13 (active) since babelsh.def
% requires it. This is needed particularly with LaTeX3
% packages which force \ExplSyntaxOn (#425)
- \protected\edef\xpg@restore@tilde@catcode{\catcode 126 = \the\catcode 126\relax}
- \catcode 126 = 13
- \xpg@input{gloss-#2.ldf}
- \setkeys{#2}{#1}
+ \cs_gset_protected:Npx \__xpg_restore_tilde_catcode:
+ { \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } } }
+ \char_set_catcode_active:n { 126 }
+ \xpg_input:n {gloss-#2.ldf}
% restore former ~ catcode
- \xpg@restore@tilde@catcode
+ \__xpg_restore_tilde_catcode:
}
{
- \xpg@nogloss{#2}
+ \__xpg_no_gloss:n {#2}
}
}
\cs_generate_variant:Nn \__xpg_load_lang_definition:nn { ee }
% load a master language from an alias file
-\newcommand*\xpg@load@master@language[1] {
- \xpg@input{gloss-#1.ldf}
+\NewDocumentCommand \InheritGlossFile { m }
+{
\seq_if_in:NeF \__xpg_langs_loaded {#1}
{
+ \xpg_input:n {gloss-#1.ldf}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#1/target}} {#1} {
- \use:c{\prop_item:Nn{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Nn{\l_xpg_langsetup_prop}
{#1/DefineCommandsCmd}}
{#1}
}
+ \seq_gput_right:Nn \__xpg_langs_loaded {#1}
}
\__xpg_register_language:nn{}{#1}
- \seq_gput_right:Nn \__xpg_langs_loaded {#1}
}
-\prop_new:N \__xpg_alias
+\prop_new_linked:N \__xpg_alias
% define environment and command if not alias
\cs_new:Nn \xpg_define_language_commands:n {
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#1/target}} {#1}
{
\exp_args:Ne
- \NewDocumentEnvironment {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/envname}} { O{} }
+ \NewDocumentEnvironment {\prop_item:Nn{\l_xpg_langsetup_prop}{#1/envname}} { O{} }
{
\otherlanguage [ ##1 ] { #1 }
}
@@ -5278,7 +5391,7 @@ to track the issues and follow progress.
% target to self fall back to language table
\str_if_eq:eeTF { \prop_item:Ne \__xpg_alias {#1/target} } { #1 }
{
- \prop_item:Nn{\g_xpg_langsetup_prop} {#1/#2}
+ \prop_item:Nn{\l_xpg_langsetup_prop} {#1/#2}
}
% load alias by recursion
{
@@ -5401,20 +5514,29 @@ to track the issues and follow progress.
\clist_if_in:NeF \xpg@loaded {#2}{
\clist_gput_right:Ne \xpg@loaded {#2}
}
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@set@langvariant}
+ \group_begin:
+ % set language options
+ \__xpg_set_language_options:nn {#2} {#1}
% register babelname
- \prop_get:NeN \g_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
+ \prop_get:NeN \l_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
\clist_if_in:NeF \xpg@bloaded {\l_tmpa_tl}{
\clist_gput_right:Ne \xpg@bloaded {\l_tmpa_tl}
}
% register BCP-47 ID
- \prop_get:NeN \g_xpg_langsetup_prop {#2/bcp47} \l_tmpa_tl
+ \prop_get:NeN \l_xpg_langsetup_prop {#2/bcp47} \l_tmpa_tl
\clist_if_in:NeF \xpg@bcp@loaded {\l_tmpa_tl}{
\clist_gput_right:Ne \xpg@bcp@loaded {\l_tmpa_tl}
}
+ % register variant
+ \prop_get:NnNT \l_xpg_curropt_prop {#2/variant} \l_tmpa_tl {
+ \clist_if_in:NeF \xpg@vloaded {\l_tmpa_tl}{
+ \clist_gput_right:Ne \xpg@vloaded {\l_tmpa_tl}
+ }}
+ \group_end:
}
+\prop_new_linked:N \l_xpg_curropt_prop
+
\DeclareDocumentCommand \setdefaultlanguage { O{} m }
{
% latex is an internal language, so do not record
@@ -5429,12 +5551,13 @@ to track the issues and follow progress.
\__xpg_load_lang_definition:nn{#1}{#2}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#2/target}} {#2} {
- \use:c{\prop_item:Ne{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Ne{\l_xpg_langsetup_prop}
{#2/DefineCommandsCmd}}
{#2}
}
\seq_gput_right:Ne \__xpg_langs_loaded {#2}
}
+ \cs_set_nopar:Npe \mainlanguagevariant { \prop_item:Ne \l_xpg_curropt_prop { \xpg_alias_base_lang:n{#2} / variant } }
\exp_args:Nee \__xpg_set_default_language:nn {\xpg_alias_add_to_option_i:nn{#2}{#1}}
{\xpg_alias_base_lang:n{#2}}
}
@@ -5442,70 +5565,22 @@ to track the issues and follow progress.
\cs_new:Nn \__xpg_set_default_language:nn
{
- \gdef\xpg@main@language{#2}
- \tl_if_blank:nTF {#1}
- {
- \cs_gset_nopar:Npn \mainlanguagevariant {}
- }
- {
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@main@langvariant}
- }
- \csgdef{#2@gvar}{\mainlanguagevariant}
+ \tl_gset:Nn \xpg_main_language_tl {#2}
%% The following settings are for the default language and script
% this tells bidi.sty or luabidi.sty that the document is RTL
- \__xpg_if_LR_str:eF{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eF{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{
\__xpg_setRTLmain:
}
\cs_gset_nopar:Nn \__xpg_at_begin_document_selectlanguage: {
\selectbackgroundlanguage{#2}
- \selectlanguage[#1]{#2}%
+ \selectlanguage[#1]{#2}
}
- \xpg@info{Default~ language~ is~ #2}
- \polyglossia@set@language@name[#1]{#2}
+ \str_if_eq:eeF { #2 } { latex }
+ { \xpg_info_msg:n{Default~ language~ is~ #2} }
+ \xpg_set_language_name:n { #2 }
\cs_gset_nopar:Npn \mainlanguagename {#2}
- % Store babelname of main language (for external packages such as biblatex)
- \cs_gset_nopar:Npe \mainbabelname { \prop_item:Nn \g_xpg_langsetup_prop {#2/babelname} }
- % Store babelname of current language (for external packages such as biblatex)
- \cs_gset_eq:NN \babelname \mainbabelname
- \cs_gset_eq:cc{#2@gbabelname}{babelname}%
- % Store BCP-47 ID and subtags of main language:
- % 1. store main.* (sub)tags
- \cs_gset_nopar:cpe {bcp47.main.tag} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47 } }
- \cs_gset_nopar:cpe {bcp47.main.language} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-language } }
- \cs_gset_nopar:cpe {bcp47.main.region} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-region } }
- \cs_gset_nopar:cpe {bcp47.main.script} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-script } }
- \cs_gset_nopar:cpe {bcp47.main.variant} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-variant } }
- \cs_gset_nopar:cpe {bcp47.main.extension.t} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47extension-t } }
- \cs_gset_nopar:cpe {bcp47.main.extension.u} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-extension-u } }
- \cs_gset_nopar:cpe {bcp47.main.extension.x} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-extension-x } }
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_nopar:cpe {bcp47.main.casing} { \prop_item:Nn \g_xpg_langsetup_prop {#2 / bcp47-language} } }
- { \cs_gset_nopar:cpe {bcp47.main.casing} { \tmpcasing } }
- % 2. Store lang (sub)tags
- \cs_gset_eq:cc {bcp47.tag} {bcp47.main.tag}
- \cs_gset_eq:cc {bcp47.language} {bcp47.main.language}
- \cs_gset_eq:cc {bcp47.region} {bcp47.main.region}
- \cs_gset_eq:cc {bcp47.script} {bcp47.main.script}
- \cs_gset_eq:cc {bcp47.variant} {bcp47.main.variant}
- \cs_gset_eq:cc {bcp47.extension.t} {bcp47.main.extension.t}
- \cs_gset_eq:cc {bcp47.extension.u} {bcp47.main.extension.u}
- \cs_gset_eq:cc {bcp47.extension.x} {bcp47.main.extension.x}
- \cs_gset_eq:cc {bcp47.casing} {bcp47.main.casing}
- % 3. Store global language BCP47 settings (with default subtags as set by main language options)
- \cs_gset_eq:cc{#2@g.bcp47.tag}{bcp47.tag}
- \cs_gset_eq:cc{#2@g.bcp47.language}{bcp47.language}
- \cs_gset_eq:cc{#2@g.bcp47.region}{bcp47.region}
- \cs_gset_eq:cc{#2@g.bcp47.script}{bcp47.script}
- \cs_gset_eq:cc{#2@g.bcp47.variant}{bcp47.variant}
- \cs_gset_eq:cc{#2@g.bcp47.extension.t}{bcp47.extension.t}
- \cs_gset_eq:cc{#2@g.bcp47.extension.u}{bcp47.extension.u}
- \cs_gset_eq:cc{#2@g.bcp47.extension.x}{bcp47.extension.x}
- \cs_gset_eq:cc{#2@g.bcp47.casing}{bcp47.casing}
}
\DeclareCommandCopy \setmainlanguage \setdefaultlanguage
@@ -5516,11 +5591,11 @@ to track the issues and follow progress.
{
\str_case:nnF {#1}
{
- {bcp-47} { \csuse{bcp47.tag} }
- {bcp47} { \csuse{bcp47.tag} }
+ {bcp-47} { \use:c{bcp47.tag} }
+ {bcp47} { \use:c{bcp47.tag} }
}
{
- \xpg@error{Invalid~ \string\languageid\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \languageid }
}
}
@@ -5530,11 +5605,11 @@ to track the issues and follow progress.
{
\str_case:nnF {#1}
{
- {bcp-47} { \csuse{bcp47.main.tag} }
- {bcp47} { \csuse{bcp47.main.tag} }
+ {bcp-47} { \use:c{bcp47.main.tag} }
+ {bcp47} { \use:c{bcp47.main.tag} }
}
{
- \xpg@error{Invalid~ \string\mainlanguageid\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \mainlanguageid }
}
}
% Kernel command to access to BCP-47 data.
@@ -5554,281 +5629,205 @@ to track the issues and follow progress.
% and main.* variants thereof
% See https://github.com/latex3/latex2e/issues/1035
\DeclareExpandableDocumentCommand \BCPdata {m}
+ {
+ \cs_if_exist_use:cF{bcp47.#1}
+ { \xpg_ill_arg_msg:nn { #1 } { \BCPdata } }
+ }
+
+\clist_map_inline:nn
+ {
+ language, region, script, variant,
+ extension.t, extension.u, extension.x
+ }{
+ \tl_set:Nn \l_tmpa_tl { #1 }
+ \tl_replace_once:Nnn \l_tmpa_tl { . } { - }
+ \cs_gset_nopar:cpe { bcp47.#1 }
+ {
+ \exp_not:n { \prop_item:Ne \l_xpg_langsetup_prop } { \exp_not:N \languagename / bcp47-\l_tmpa_tl }
+ }
+ \cs_gset_nopar:cpe { bcp47.main.#1 }
+ {
+ \exp_not:n { \prop_item:Ne \l_xpg_langsetup_prop } { \exp_not:N \mainlanguagename / bcp47-\l_tmpa_tl }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.casing }
+ {
+ \tl_if_empty:eTF { \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-casing } }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-language }
+ }{
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-casing }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.main.casing }
+ {
+ \tl_if_empty:eTF { \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-casing } }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-language }
+ }{
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-casing }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.tag }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47 }
+ }
+\cs_gset_nopar:cpn { bcp47.main.tag }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47 }
+ }
+
+\cs_new_nopar:Npn \languagevariant
+ {
+ \prop_item:Ne \l_xpg_curropt_prop { \languagename / variant }
+ }
+
+\cs_new:Nn \xpg_set_language_name:n
{
- \cs_if_exist_use:cF{bcp47.#1}
- { \xpg@error{Invalid~ \string\BCPdata\space argument:~ #1} }
-}
-
-% main babel name
-\cs_new_nopar:Npn \mainlanguagename {}
-\cs_new_nopar:Npn \mainbabelname {}
-\cs_new_nopar:cpn {bcp47.main.tag} {}
-\cs_new_nopar:cpn {bcp47.main.language} {}
-\cs_new_nopar:cpn {bcp47.main.region} {}
-\cs_new_nopar:cpn {bcp47.main.script} {}
-\cs_new_nopar:cpn {bcp47.main.variant} {}
-\cs_new_nopar:cpn {bcp47.main.extension.t} {}
-\cs_new_nopar:cpn {bcp47.main.extension.u} {}
-\cs_new_nopar:cpn {bcp47.main.extension.x} {}
-\cs_new_nopar:cpn {bcp47.main.casing} {}
-\cs_new_nopar:Npn \mainlanguagevariant {}%
-% Store main language variant for external packages
-\define@key{xpg@main@langvariant}{variant}{
- \cs_gset_nopar:Npn \mainlanguagevariant {#1}
-}
-
-\cs_new_nopar:Npn \babelname {}
-\def\languagevariant{}
-% Store current language variant for external packages
-\define@key{xpg@set@langvariant}{variant}{
- \def\languagevariant{#1}
-}
-
-\newcommand*\polyglossia@set@language@name[2][]{
- \def\languagename{#2}
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gvar}{\def\languagevariant{}}{\def\languagevariant{\csuse{#2@gvar}}}
- }{
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@set@langvariant}
- \cs_set_eq:cc{#2@var}{languagevariant}
- }%
+ \cs_set:Npn \languagename { #1 }
}
-
-\newcommand*{\resetdefaultlanguage}[2][]{
+\NewDocumentCommand \resetdefaultlanguage { O{} m }
+{
\__xpg_reset_default_language:nn
{\xpg_alias_add_to_option_i:nn{#2}{#1}}
{\xpg_alias_base_lang:n{#2}}
}
-\cs_new:Nn \__xpg_store_bcp_info:nn
-{
- % Store BCP-47 ID and subtags of current language
- \tl_if_blank:nTF {#1}{
- % tag (e.g., en-US)
- \ifcsundef{#2@g.bcp47.tag}{
- \csedef{bcp47.tag}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47 } }
- }{
- \csedef{bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- % language (e.g., en)
- \ifcsundef{#2@g.bcp47.language}{
- \csedef{bcp47.language}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-language } }
- }{
- \csedef{bcp47.language}{\csuse{#2@g.bcp47.language}}
- }
- % region (e.g., US)
- \ifcsundef{#2@g.bcp47.region}{%
- \csedef{bcp47.region}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-region } }
- }{
- \csedef{bcp47.region}{\csuse{#2@g.bcp47.region}}%
- }
- % script (e.g., Latn)
- \ifcsundef{#2@g.bcp47.script}{
- \csedef{bcp47.script}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-script } }
- }{
- \csedef{bcp47.script}{\csuse{#2@g.bcp47.script}}
- }
- % variant (e.g., 1996)
- \ifcsundef{#2@g.bcp47.variant}{
- \csedef{bcp47.variant}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-variant } }
- }{
- \csedef{bcp47.variant}{\csuse{#2@g.bcp47.variant}}
- }
- % extension.t (tranformation)
- \ifcsundef{#2@g.bcp47.extension.t}{%
- \csedef{bcp47.extension.t}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-t } }
- }{
- \csedef{bcp47.extension.t}{\csuse{#2@g.bcp47.extension.t}}
- }
- % extension.u (additional locale information)
- \ifcsundef{#2@g.bcp47.extension.u}{%
- \csedef{bcp47.extension.u}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-u } }
- }{
- \csedef{bcp47.extension.u}{\csuse{#2@g.bcp47.extension.u}}
- }
- % extension.x (private use area)
- \ifcsundef{#2@g.bcp47.extension.x}{
- \csedef{bcp47.extension.x}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-x } }
- }{
- \csedef{bcp47.extension.x}{\csuse{#2@g.bcp47.extension.x}}
- }
- % casing
- \ifcsundef{#2@g.bcp47.casing}{
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_eq:cc {bcp47.casing} {bcp47.language} }
- { \csedef{bcp47.casing}{ \tmpcasing } }
- }{
- \csedef{bcp47.casing}{\csuse{#2@g.bcp47.casing}}
- }
- }{
- \csedef{bcp47.tag}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47 } }
- \csedef{bcp47.language}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-language } }
- \csedef{bcp47.region}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-region } }
- \csedef{bcp47.script}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-script } }
- \csedef{bcp47.variant}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-variant } }
- \csedef{bcp47.extension.t}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-t } }
- \csedef{bcp47.extension.u}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-u } }
- \csedef{bcp47.extension.x}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-x } }
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_eq:cc {bcp47.casing} {bcp47.language} }
- { \csedef{bcp47.casing}{ \tmpcasing } }
- }
-}
-
\cs_new:Nn \__xpg_reset_default_language:nn
{
\xpg_error_if_lang_not_loaded:n{#2}
% disable globalnumbers of previously defined default language
- \csuse{no\xpg@main@language @globalnumbers}
- \csuse{noextras@\xpg@main@language}%
+ \use:c{no\xpg_main_language_tl @globalnumbers}
+ \use:c{noextras@\xpg_main_language_tl}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{noextras@bbl@\mainbabelname}%
- \csuse{init@noextras@\xpg@main@language}%
- \polyglossia@set@language@name[#1]{#2}%
- \__xpg_if_LR_str:eF{\prop_item:Ne{\g_xpg_langsetup_prop}{#2/direction}}
+ \cs_if_exist_use:c{noextras@bbl@\mainbabelname}
+ \use:c{init@noextras@\xpg_main_language_tl}
+ \xpg_set_language_name:n { #2 }
+ \__xpg_if_LR_str:eF{\prop_item:Ne{\l_xpg_langsetup_prop}{#2/direction}}
{
\@rlmaintrue\@rl@footnotetrue
}
- \selectlanguage[#1]{#2}%
- \selectbackgroundlanguage{#2}%
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{%
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store variant
- \tl_if_blank:nTF {#1}
- {
- \cs_gset_nopar:Npn \mainlanguagevariant {}
- }
- {
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@main@langvariant}
- }
- \csgdef{#2@gvar}{\mainlanguagevariant}
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
+ \selectlanguage[#1]{#2}
+ \selectbackgroundlanguage{#2}
+ \cs_set_nopar:Npe \mainlanguagevariant { \prop_item:Ne \l_xpg_curropt_prop { \xpg_alias_base_lang:n{#2} / variant } }
}
% This saves the normalfont for the latin script since we may change normalfont in other scripts
-\let\normalfontlatin=\normalfont
+\cs_set_eq:cc { normalfontlatin } { normalfont }
% Provide default fonts (as set with \setmainfont, \setsansfont and \setmonofont)
% for Latin scripts and as a fallback for non-Latin scripts.
-\DeclareRobustCommand\xpg@defaultfont@rm{
+\cs_set_protected:Nn \xpg_defaultfont_rm:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\rmdefault
- \ifdefined\UseHook\UseHook{rmfamily}\fi
+ \hook_use:n { rmfamily }
\selectfont
}
-\DeclareRobustCommand\xpg@defaultfont@sf{
+
+\cs_set_protected:Nn \xpg_defaultfont_sf:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\sfdefault
- \ifdefined\UseHook\UseHook{sffamily}\fi
+ \hook_use:n { sffamily }
\selectfont
}
-\DeclareRobustCommand\xpg@defaultfont@tt{
+
+\cs_set_protected:Nn \xpg_defaultfont_tt:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\ttdefault
- \ifdefined\UseHook\UseHook{ttfamily}\fi
+ \hook_use:n { ttfamily }
\selectfont
}
-\def\xpg@patch@fontfamilies{
+\cs_new:Nn \__xpg_patch_fontfamilies:
+{
% This robustifies the redefinitions of \<xx>family (suggestion by Enrico Gregorio)
% e.g. to prevent expansion of the \familytype redefinition in auxiliary files
- \csgappto{rmfamily~}{\def\familytype{rm}}
- \csgappto{sffamily~}{\def\familytype{sf}}
- \csgappto{ttfamily~}{\def\familytype{tt}}
+ \tl_put_right:cn {rmfamily~} {\tl_set:Nn \familytype {rm}}
+ \tl_put_right:cn {sffamily~} {\tl_set:Nn \familytype {sf}}
+ \tl_put_right:cn {ttfamily~} {\tl_set:Nn \familytype {tt}}
}
% These switches activate the default fonts
% Note that a simple \let\rmfamilylatin=\rmfamily
% does not work reliably (see #24)
-\cs_gset_eq:cc{rmfamilylatin}{xpg@defaultfont@rm}
-\cs_gset_eq:cc{sffamilylatin}{xpg@defaultfont@sf}
-\cs_gset_eq:cc{ttfamilylatin}{xpg@defaultfont@tt}
-
-\def\xpg@set@familydefault{
- % We need the \edef route here in order
- % to detect both \renewcommand and \let
- % changes.
- \edef\tempa{\familydefault}
- \edef\tempb{\sfdefault}
- \ifcsequal{tempa}{tempb}
- {\def\familytype{sf}}
- {\edef\tempb{\ttdefault}
- \ifcsequal{tempa}{tempb}
- {\def\familytype{tt}}
- {\def\familytype{rm}}}
- \xpg@patch@fontfamilies
+\cs_set_eq:cc{rmfamilylatin}{xpg_defaultfont_rm:}
+\cs_set_eq:cc{sffamilylatin}{xpg_defaultfont_sf:}
+\cs_set_eq:cc{ttfamilylatin}{xpg_defaultfont_tt:}
+
+\cs_new:Nn \xpg_set_familydefault:
+{
+ \tl_set:Ne \l_tmpa_tl { \familydefault }
+ \tl_set:Ne \l_tmpb_tl { \sfdefault }
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {sf} }
+ { \tl_set_eq:NN \l_tmpb_tl \ttdefault
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {tt} }
+ { \tl_set:Nn \familytype {rm} }
+ }
+ \__xpg_patch_fontfamilies:
% This (re-)saves the normalfont for the latin script since we may
% change normalfont in other scripts
- \let\normalfontlatin=\normalfont
+ \cs_set_eq:cc{ normalfontlatin }{ normalfont }
% And for all cases, we also reset \<xx>familylatin
- \cs_gset_eq:cc{rmfamilylatin}{xpg@defaultfont@rm}
- \cs_gset_eq:cc{sffamilylatin}{xpg@defaultfont@sf}
- \cs_gset_eq:cc{ttfamilylatin}{xpg@defaultfont@tt}
-}
-
-\def\resetfontlatin{
- \DeclareRobustCommand\rmfamily{\xpg@defaultfont@rm}
- \DeclareRobustCommand\sffamily{\xpg@defaultfont@sf}
- \DeclareRobustCommand\ttfamily{\xpg@defaultfont@tt}
- \xpg@patch@fontfamilies
- \global\let\normalfont=\normalfontlatin
-}
-
-\def\selectfontfamilylatin{
- \def\tmp@tt{tt}\def\tmp@sf{sf}
- \ifx\familytype\tmp@tt
- \ttfamilylatin
- \else\ifx\familytype\tmp@sf
- \sffamilylatin
- \else\rmfamilylatin\fi\fi}
-
-\def\xpg@select@fontfamily#1{
- \def\tmp@tt{tt}\def\tmp@sf{sf}
- \ifx\familytype\tmp@tt
- \__xpg_use_or_warn:c{#1@font@tt}
- \else\ifx\familytype\tmp@sf
- \__xpg_use_or_warn:c{#1@font@sf}
- \else\__xpg_use_or_warn:c{#1@font@rm}\fi\fi}
-
-\def\xpg@set@normalfont#1{
- \letcs{\rmfamily}{#1@font@rm}
- \letcs{\sffamily}{#1@font@sf}
- \letcs{\ttfamily}{#1@font@tt}
- \robustify\rmfamily
- \robustify\sffamily
- \robustify\ttfamily
- \gdef\normalfont{\protect\xpg@select@fontfamily{#1}
- \fontseries{\seriesdefault}\selectfont
- \fontshape{\shapedefault}
- \ifdefined\UseHook\UseHook{normalfont}\fi
- \selectfont}
- \gdef\reset@font{\protect\normalfont}
-}
-
-\let\@@fterindentfalse\@afterindentfalse
-\def\french@indent{
- \let\@afterindentfalse\@afterindenttrue
+ \cs_set_eq:cc{ rmfamilylatin }{ xpg_defaultfont_rm: }
+ \cs_set_eq:cc{ sffamilylatin }{ xpg_defaultfont_sf: }
+ \cs_set_eq:cc{ ttfamilylatin }{ xpg_defaultfont_tt: }
+}
+
+\cs_set_nopar:Nn \xpg_select_fontfamily:n
+{
+ \str_if_eq:VnTF \familytype { tt }
+ { \__xpg_use_or_warn:c { #1@font@tt } }
+ { \str_if_eq:VnTF \familytype { sf }
+ { \__xpg_use_or_warn:c { #1@font@sf } }
+ { \__xpg_use_or_warn:c { #1@font@rm } }
+ }
+}
+
+\cs_set_protected:Npn \xpg_select_default_fontfamily:n #1
+ {
+ \tl_set:Ne \l_tmpa_tl { \familydefault }
+ \tl_set:Ne \l_tmpb_tl { \sfdefault }
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {sf} }
+ { \tl_set_eq:NN \l_tmpb_tl \ttdefault
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {tt} }
+ { \tl_set:Nn \familytype {rm} }
+ }
+ \xpg_select_fontfamily:n{#1}
+ }
+
+\cs_new_nopar:Nn \xpg_set_normalfont:n
+{
+ \cs_set_eq:cc { rmfamily } { #1@font@rm }
+ \cs_set_eq:cc { sffamily } { #1@font@sf }
+ \cs_set_eq:cc { ttfamily } { #1@font@tt }
+ \cs_set_nopar:Npn \normalfont
+ { \xpg_select_default_fontfamily:n {#1}
+ \fontseries{\seriesdefault}\selectfont
+ \fontshape{\shapedefault}
+ \hook_use:n { normalfont }
+ \selectfont
+ }
+ \cs_set_nopar:Npn \reset@font {\protect\normalfont}
+}
+
+\cs_gset_eq:cc { @@fterindentfalse } { @afterindentfalse }
+\cs_new_nopar:Nn \__xpg_french_indent:
+{
+ \cs_set_eq:cc { @afterindentfalse } { @afterindenttrue }
\@afterindenttrue
}
-\def\nofrench@indent{
- \let\@afterindentfalse\@@fterindentfalse
+\cs_new_nopar:Nn \__xpg_no_french_indent:
+{
+ \cs_set_eq:cc { @afterindentfalse } { @@fterindentfalse }
\@afterindentfalse
}
@@ -5839,10 +5838,10 @@ to track the issues and follow progress.
\cs_new:Nn \__xpg_select_background_language:n
{
- \str_if_eq:eeTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript}}{latin}
+ \str_if_eq:eeTF { \prop_item:Nn{\l_xpg_langsetup_prop}{#1/lcscript} } { latin }
{}
- {\xpg@set@normalfont{#1}}
- \csuse{#1@globalnumbers}
+ { \xpg_set_normalfont:n{#1} }
+ \use:c{#1@globalnumbers}
}
\cs_generate_variant:Nn \__xpg_select_background_language:n {e}
% Declare secondary language #2 with language options #1
@@ -5853,7 +5852,7 @@ to track the issues and follow progress.
\__xpg_load_lang_definition:ee {#1} {#2}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#2/target}} {#2} {
- \use:c{\prop_item:Ne{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Ne{\l_xpg_langsetup_prop}
{#2/DefineCommandsCmd}}
{#2}
}
@@ -5866,28 +5865,13 @@ to track the issues and follow progress.
\cs_new:Nn \__xpg_set_otherlanguage:nn
{
\__xpg_register_language:nn{#1}{#2}
- % If a variant is set, store it.
- \gdef\otherlanguagevariant{}
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@other@langvariant}
-
- \csgdef{#2@gvar}{\otherlanguagevariant}
- \prop_get:NeNT \g_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
- { \xdef\otherlanguagebabelname{\l_tmpa_tl} }
- \cs_gset_eq:cc{#2@gbabelname}{otherlanguagebabelname}
}
\cs_generate_variant:Nn \__xpg_set_otherlanguage:nn { ee }
-
-% Store main language variant for external packages
-\define@key{xpg@other@langvariant}{variant}{
- \gdef\otherlanguagevariant{#1}
-}
-
\NewDocumentCommand \setotherlanguages { m }
- {
+{
\clist_map_function:eN { #1 } \setotherlanguage
- }
+}
\cs_set:Nn \xpg_common_language:
{% FIXME is this really needed???
@@ -5910,7 +5894,8 @@ to track the issues and follow progress.
% for specific (esp. tag-based) aliases
% where \text<alias> would cause clashes
% (e.g., \textit)
-\newcommand\textlang[3][]{
+\NewDocumentCommand \textlang { O{} m +m }
+{
\__xpg_textlanguage:een {#1} {#2} {#3}
}
@@ -5919,45 +5904,20 @@ to track the issues and follow progress.
% inside case changing commands (e.g. \MakeUppercase)
\tl_put_right:Nn \l_text_case_exclude_arg_tl { \textlang }
-% Alias to {<lang>}, but more suitable
-% for specific (esp. tag-based) aliases
-% where {<alias>} would cause clashes
-% (e.g., \fi)
-\DeclareEnvironmentCopy { lang } { otherlanguage }
-
% wrapper for foreignlanguage and otherlanguage*
-\newcommand*\polyglossia@setforeignlanguage[2][]{
- \select@@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_foreign_language:nn
+{
+ \xpg_select_language:nn { #1 } { #2 }
\__xpg_register_language:nn{#1}{#2}
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
-}
-
-% Expandable lowercasing. We use this to assure keyval
-% options are lowercased (also when used in \MakeUppercase
-% contexts e.g. in headings)
-% Macro adapted from tudscr.sty
-\newcommand*\xpg@str@lowercase[2]{
- \protected@edef#1{
- \lowercase{\def\noexpand#1{#2}}
- }#1
}
% lowercase options before passing to setkeys
-\cs_new:Nn \__xpg_set_keys:nn
+\NewDocumentCommand \SetGlossOptions { m m }
{
- \xpg@str@lowercase{\xpg@tmp@opts}{#2}
- \exp_args:Nne \setkeys{#1}{\xpg@tmp@opts}
+ % \text_lowercase:n fully expands
+ % (as opposed to \str_lowercase:n)
+ \use:c { xpg_#1_default_options_tl }
+ \exp_args:Ne \keys_set:ne{ polyglossia / gloss / #1 }{ \text_lowercase:n {#2} }
}
% joint code of \foreignlanguage, otherlanguage*
@@ -5967,54 +5927,30 @@ to track the issues and follow progress.
\cs_new:Nn \xpg_otherlanguage:nn
{
\xpg_error_if_lang_not_loaded:n{#2}
- \__xpg_set_keys:nn{#2}{#1}
- \polyglossia@setforeignlanguage[#1]{#2}
+ \SetGlossOptions{#2}{#1}
+ \xpg_set_foreign_language:nn { #1 } { #2 }
% Hook for external packages such as biblatex
\polyglossia@language@switched
% buggy restoration heure
- \csuse{inlineextras@#2}
+ \use:c{inlineextras@#2}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
\cs_if_exist_use:c{inlineextras@bbl@\babelname}
}
\DeclareDocumentCommand { \foreignlanguage } { O{} m +m }
- {
+{
\__xpg_foreignlanguage:eeen {#1} {#2} {\xpg_alias_base_lang:n{#2}} {#3}
- }
+}
% prevent case changing of language name in \foreignlanguage
\tl_put_right:Nn \l_text_case_exclude_arg_tl { \foreignlanguage }
-% Direct access to polyglossia@setforeignlanguage
+% Direct access to \xpg_set_foreign_language:nn
% used in captions
-\newcommand{\setforeignlanguage}[2][]
+\NewDocumentCommand \setforeignlanguage { O{} m }
{
- \polyglossia@setforeignlanguage[#1]{#2}
-}
-
-% Stack to store matrix languages
-\seq_new:N \__xpg_current_matrixlang_stack
-
-% Store embedding language when an embedded language is switched to
-\cs_new_nopar:Nn \__xpg_store_matrixlang:
-{
- \seq_gput_left:Nn \__xpg_current_matrixlang_stack \languagename
-}
-
-% When an embedded language is closed, reset to the embedding language
-% and remove stored matrix language from stack
-\cs_new_nopar:Nn \__xpg_reset_to_matrixlang:
-{
- % if stack is empty, use main language
- \seq_gpop_left:NNTF \__xpg_current_matrixlang_stack \l_tmpa_tl
- { \cs_set_eq:NN \__xpg_current_matrixlang \l_tmpa_tl }
- { \cs_set_eq:NN \__xpg_current_matrixlang \mainlanguagename }
- % Reset the language's/script's font families if the embedding script is latin
- \str_if_eq:eeT{\prop_item:Ne{\g_xpg_langsetup_prop}{\__xpg_current_matrixlang/lcscript}}{latin}
- {\resetfontlatin}
- % In case a \<lang>font is defined, re-activate that
- \exp_args:Ne \xpg@set@normalfont{\__xpg_current_matrixlang}
+ \xpg_set_foreign_language:nn { #1 } { #2 }
}
% internal wrapper for foreign language
@@ -6028,12 +5964,10 @@ to track the issues and follow progress.
{
\msg_show:nnn { polyglossia } { languagenotloaded } {#2}
}{
- \__xpg_store_matrixlang:
\group_begin:
\xpg_otherlanguage:nn{ \xpg_alias_add_to_option_i:nn{#2}{#1} }{ #3 }
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
- \__xpg_reset_to_matrixlang:
}
}
\cs_generate_variant:Nn \__xpg_foreignlanguage:nnnn {eeen}
@@ -6042,11 +5976,9 @@ to track the issues and follow progress.
% otherlanguage* is the environment equivalent of \foreignlanguage
\DeclareDocumentEnvironment { otherlanguage* } { O{} m }
{
- \__xpg_store_matrixlang:
\__xpg_otherlanguage:eee { #1 } { #2 } { \xpg_alias_base_lang:n { #2 } }
}{
- \egroup% \group_end: does not work here!
- \__xpg_reset_to_matrixlang:
+ \c_group_end_token% \group_end: does not work here!
}
% internal wrapper
@@ -6061,7 +5993,7 @@ to track the issues and follow progress.
}{
\xpg_otherlanguage:nn{ \xpg_alias_add_to_option_i:nn{#2}{#1} }{ #3 }
\__xpg_lang_set_text_direction:nn{#3}%
- \bgroup% \group_begin: does not work here!
+ \c_group_begin_token% \group_begin: does not work here!
}
}
\cs_generate_variant:Nn \__xpg_otherlanguage:nnn { eee }
@@ -6077,9 +6009,6 @@ to track the issues and follow progress.
}
\cs_generate_variant:Nn \__xpg_textlanguage:nnn {een}
-% Track whether we are in an inline lang (\text...) switch
-\bool_new:N \l__xpg_inline_lang_bool
-
% use by \text<lang> and \textlang. Equivalent to \foreignlanguage,
% except that dates are localized.
% #1: option
@@ -6093,41 +6022,43 @@ to track the issues and follow progress.
\msg_show:nnn { polyglossia } { languagenotloaded } {#2}
}
{
- \__xpg_store_matrixlang:
\group_begin:
- \bool_set_true:N \l__xpg_inline_lang_bool
\xpg_otherlanguage:nn{#1}{#3}
- \csuse{date#3}
+ \use:c{date#3}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
\cs_if_exist_use:c{date@bbl@\babelname}
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
- \__xpg_reset_to_matrixlang:
}
}
\cs_generate_variant:Nn \__xpg_textlanguage:nnnn {nnen}
% Define language-specific hyphenation exceptions
-\newcommand\pghyphenation[3][]{
- \bgroup
- \xpg_error_if_lang_not_loaded:n{#2}
- \setkeys{#2}{#1}
- \select@@language[#1]{#2}
+\NewDocumentCommand \pghyphenation {O{} m m}
+{
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n { #2 }
+ \SetGlossOptions{#2}{#1}
+ \xpg_select_language:nn { #1 } { #2 }
\hyphenation{#3}
- \egroup
+ \c_group_end_token
}
% Hook that other package authors can use
% (for instance biblatex):
% Do not rename!
-\newcommand*{\xpg@hook@setlanguage}{}
+\cs_set_nopar:Npn \xpg@hook@setlanguage {}
-\def\xpg@pop@language@i#1#2{
- \xpg@set@language@aux[#1]{#2}
+\cs_set_nopar:Nn \__xpg_pop_language:nn
+{
+ \xpg_set_language_aux:nn { #1 } { #2 }
\xpg@hook@setlanguage
- \let\emp@langname\@undefined}
+% FIXME This seems to be a very old relict.
+% The macro is nowhere used. Probably remove.
+% \let\emp@langname\@undefined
+}
\DeclareDocumentCommand \selectlanguage {s O{} m}
{
@@ -6146,131 +6077,124 @@ to track the issues and follow progress.
\cs_new:Nn \__xpg_select_language:nnn
{
% Register the language options
- \__xpg_set_language_options:nnn {#3} {#2} {@xpg@set@langvariant}
+ \__xpg_set_language_options:nn {#3} {#2}
\IfBooleanTF { #1 } % The starred variant does not write to the aux
{
- \xpg@set@language@nonaux[#2]{#3}
+ \xpg_set_language_nonaux:nn { #2 } { #3 }
}{
- \cs_set_nopar:Npe \xpg@pop@language { \exp_not:N \xpg@pop@language@i {#2} {#3} }
- \group_insert_after:N \xpg@pop@language
- \xpg@set@language@aux[#2]{#3}
+ \cs_set_nopar:Ne \xpg_pop_language: { \exp_not:N \__xpg_pop_language:nn { #2 } { #3 } }
+ \group_insert_after:N \xpg_pop_language:
+ \xpg_set_language_aux:nn { #2 } { #3 }
}
- \__xpg_register_language:nn{#2}{#3}
+ \__xpg_register_language:nn { #2 } { #3 }
}
\cs_generate_variant:Nn \__xpg_select_language:nnn { nee, nne }
-
% set lang option #2 for lang #1
-\cs_new:Nn \__xpg_set_language_options:nnn
+\cs_new:Nn \__xpg_set_language_options:nn
{
- \tl_if_blank:nF {#2}
+ \cs_if_exist:cT { xpg_#1_default_options_prop }
{
- % If the optional argument sets a value for the key “variant”, copy it to xpg@langvariant
- \clist_map_inline:nn { #2 } {
- \xpg@parsevariantkeyvalue##1=#3:#1\relax
- }%
- \__xpg_set_keys:nn{#1}{#2}
+ \prop_concat:ccc { l_xpg_curropt_prop } { l_xpg_curropt_prop }
+ { xpg_#1_default_options_prop }
}
+ \xpg__keyval_parser:eeN { #2 } { #1 } \l_xpg_curropt_prop
+ \SetGlossOptions{#1}{#2}
}
% Initialize default language options, so that
% \iflanguageoption has the info it needs also
% for default settings
-\newcommand*\xpg@initialize@gloss@options[2]{
- \__xpg_set_language_options:nnn {#1} {#2} {@xpg@set@langvariant}
-}
+\NewDocumentCommand \InitializeGlossOptions { m m }
+{
+ \tl_new:c { xpg_#1_default_options_tl }
+ \prop_new:c { xpg_#1_default_options_prop }
+ \keys_precompile:nec { polyglossia / gloss / #1 }
+ { \text_lowercase:n { #2, \xpg__tmp_default_options_tl } }
+ { xpg_#1_default_options_tl }
+ \xpg__keyval_parser:enc { #2, \xpg__tmp_default_options_tl } { #1 }
+ { xpg_#1_default_options_prop }
+ \prop_concat:ccc { l_xpg_curropt_prop } { l_xpg_curropt_prop }
+ { xpg_#1_default_options_prop }
+ \use:c { xpg_#1_default_options_tl }
+ \__xpg_set_language_options:nn {#1} {#2}
+}
+\tl_new:N \xpg__tmp_default_options_tl
+\cs_generate_variant:Nn \keys_precompile:nnN { nec }
% Record synonymous keyvals such as variant=us and variant=american
-% Syntax: \xpg@set@alias@values{<lang>}{<key>}{<val>}{<alias vals, comma-separated>}
-\newcommand*\xpg@set@alias@values[4]{%
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#3 }
- { \prop_new:c {xpg@alias@keyvals@#1@#3} }
- \prop_put:cnn { xpg@alias@keyvals@#1@#3 }
- {#2}{#4}
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#4 }
- { \prop_new:c {xpg@alias@keyvals@#1@#4} }
- \prop_put:cnn { xpg@alias@keyvals@#1@#4 }
- {#2}{#3}
-}
-
-% Patch xkeyval to record default values of keys
-\pretocmd{\XKV@define@default}{%
- \csgdef{xpg@default@opt@\XKV@header #1}{#2}
-}{}{\xpg@warning{Patching xkeyval failed!}}
-
-% Helper to get and register option keyvals
-\def\xpg@parsevariantkeyvalue#1=#2@#3:#4\relax{
- \def\@tmpa{#1}
- \def\@tmpb{variant}
- % variant values are stored in specific macros
- % (\xpg@main@langvariant, \xpg@other@langvariant
- % and \xpg@set@langvariant)
- \ifx\@tmpa\@tmpb\setkeys{#3}{#1=#2}\fi
- \tl_if_empty:nTF{#2}
- {
- \ifcsdef{xpg@default@opt@KV@#4@#1}
- {\xpg@store@opt@keyval#1:\csuse{xpg@default@opt@KV@#4@#1}=:#4\relax}
- {}%
- }
- { \xpg@store@opt@keyval#1:#2:#4\relax }
-}%
-
-% Store option keys and values
-% This strips trailing '=' from values.
-\def\xpg@store@opt@keyval#1:#2=:#3\relax{
- \prop_if_exist:cF { xpg@current@options@#3 }
- { \prop_new:c {xpg@current@options@#3} }
- \prop_put:cnn { xpg@current@options@#3 }
- {#1}{#2}
+% Syntax: \SetLanguageAliasValues{<lang>}{<key>}{<alias vals, comma-separated>}
+\int_new:N \l_xpg_alias_keyvals_int
+\int_set:Nn \l_xpg_alias_keyvals_int { 2 }
+\NewDocumentCommand \SetLanguageAliasValues { m m m }
+{
+ \clist_map_inline:nn { #3 }
+ {
+ \int_const:cn { c_xpg_alias_keyvals_#1_#2_##1_int } { \l_xpg_alias_keyvals_int }
+ }
+ \int_incr:N \l_xpg_alias_keyvals_int
}
+\cs_new:Npn \xpg__keyval_parser:nnN #1 #2 #3 % #1 = key-vals, #2 = language, #3 = prop
+ {
+ \keyval_parse:nnn
+ { \xpg__keyval_parser_default:nnn { #2 } { #3 } }
+ { \xpg__keyval_parser_nondefault:nnnn { #2 } { #3 } }
+ { #1 }
+ }
+\cs_generate_variant:Nn \xpg__keyval_parser:nnN { eeN, enc }
+
+\cs_new:Npn \xpg__keyval_parser_default:nnn #1 #2 #3 % #1 = lang, #2 = prop, #3 = key
+ {
+ \str_set:Nn \l_tempa_str { #1 / #3 }
+ \str_concat:NNN \l_tempa_str \c__keys_default_root_str \l_tempa_str
+ \prop_put:Nne #2 { #1 / #3 } { \use:c { \l_tempa_str } }
+ }
+
+\cs_new:Npn \xpg__keyval_parser_nondefault:nnnn #1 #2 #3 #4 % #1 = lang, #2 = prop, #3 = key, #4 = value
+ {
+ \prop_put:Nnn #2 { #1 / #3 } { #4 }
+ }
\prg_set_conditional:Npnn \__xpg_check_option_value:NNN #1#2#3 { p , T , F , TF }
-{
- \prop_get:cnNTF {xpg@current@options@#1} {#2} \l_tmpa_tl
- {
- \str_if_eq:eeTF{\l_tmpa_tl}{#3}
- {\prg_return_true:}
+ {
+ \bool_lazy_or:nnTF
+ {
+ \str_if_eq_p:ee { \prop_item:Nn \l_xpg_curropt_prop { #1 / #2 } } { #3 }
+ } {
+ \int_compare_p:nNn
{
- \prop_get:cnNTF {xpg@alias@keyvals@#1@#3} {#2} \l_tmpb_tl
- {
- \clist_set:Ne{\l_tmpa_clist}{\l_tmpb_tl}
- \providetoggle{xpgvalfound}
- \togglefalse{xpgvalfound}
- \clist_map_inline:Nn \l_tmpa_clist {
- \str_if_eq:eeT{##1}{\l_tmpa_tl}
- { \toggletrue{xpgvalfound} }
- }
- \iftoggle{xpgvalfound}{\prg_return_true:}{\prg_return_false:}
- }
- {
- \prg_return_false:
- }
- }
- }
- {
- \prg_return_false:
- }
+ \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_#3_int } { 0 }
+ } = {
+ \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_\prop_item:Nn \l_xpg_curropt_prop { #1 / #2 }_int } { 1 }
+ }
+ } { \prg_return_true: } { \prg_return_false: }
+ }
+
+\prg_set_conditional:Npnn \xpg_if_main_language:n #1 { T, F, TF }
+{
+ \str_if_eq:VnTF \xpg_main_language_tl { #1 }
+ { \prg_return_true: }
+ { \prg_return_false: }
}
+\cs_set_eq:NN \IfMainLanguageTF \xpg_if_main_language:nTF
+
+\cs_set_eq:NN \IfMainLanguageT \xpg_if_main_language:nT
+
+\cs_set_eq:NN \IfMainLanguageF \xpg_if_main_language:nF
+
% Test if option value is set
\DeclareDocumentCommand \iflanguageoption { m m m m m }
{
\__xpg_check_option_value:NNNTF{#1}{#2}{#3}{#4}{#5}
}
-
-% Append any variant to csv list of variants
-\define@key{xpg@langvariant}{variant}{
- \clist_if_in:NeF \xpg@vloaded {#1}{
- \clist_gput_right:Ne \xpg@vloaded {#1}
- }
-}
-
% Test if language is loaded
\DeclareDocumentCommand \iflanguageloaded { m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\clist_if_in:NeTF \xpg@loaded{#1}{#2}{#3}
}
}
@@ -6278,7 +6202,8 @@ to track the issues and follow progress.
% Same for babellanguage is loaded
\DeclareDocumentCommand \ifbabellanguageloaded { m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\clist_if_in:NeTF \xpg@bloaded{#1}{#2}{#3}
}
}
@@ -6286,7 +6211,8 @@ to track the issues and follow progress.
% Same for languageid
\DeclareDocumentCommand \iflanguageidloaded { m m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\str_case:nnTF {#1}
{
{bcp-47} { \clist_if_in:NeTF \xpg@bcp@loaded{#2}{#3}{#4} }
@@ -6294,7 +6220,7 @@ to track the issues and follow progress.
}
{}
{
- \xpg@error{Invalid~ \string\iflanguageidloaded\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \iflanguageidloaded }
}
}%
}
@@ -6324,53 +6250,46 @@ to track the issues and follow progress.
}
-\newcommand*{\xpg@set@language@nonaux}[2][]{
- \@select@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_language_nonaux:nn
+{
+ \__xpg_start_language:nn { #1 } { #2 }
}
-\newcommand*{\xpg@set@language@aux}[2][]{
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
- \@select@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_language_aux:nn
+{
+ \__xpg_start_language:nn { #1 } { #2 }
% Write to the aux
- \xpg@set@language@only@aux[#1]{#2}
+ \xpg_set_language_only_aux:nn { #1 } { #2 }
}
-\newcommand*{\xpg@set@language@only@aux}[2][]{
+\cs_new_nopar:Nn \xpg_set_language_only_aux:nn
+{
% Write to the aux (toc files)
\if@filesw
\addtocontents{toc}{\selectlanguage*[#1]{#2}}
\fi
}
-\AtBeginDocument{
+\hook_gput_code:nnn {begindocument} {.}
+{
\if@filesw
- \immediate\write\@mainaux
- {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
+ \immediate\write\@mainaux
+ {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
\fi
}
% Since captions might float to other language regions,
% we need to change the language here (#542)
-\AddToHook{cmd/caption/before}{
+\hook_gput_code:nnn {cmd/caption/before} {.}
+{
\ifhmode\unskip\fi
\addtocontents{lof}{\protect\setforeignlanguage{\languagename}}
\addtocontents{lot}{\protect\setforeignlanguage{\languagename}}
}
% check if language is defined
-\prg_set_conditional:Npnn \__xpg_check_if_exist_l@:n #1 { F, TF }
+\prg_set_conditional:Npnn \__xpg_pattern_check_if_exists:n #1 { F, TF }
{
\bool_lazy_and:nnTF
{ \cs_if_exist_p:c { l@#1 } }
@@ -6379,82 +6298,125 @@ to track the issues and follow progress.
{ \prg_return_false: }
}
-\def\polyglossia@luatex@load@lang#1{
+\cs_new_nopar:Nn \__xpg_luatex_load_lang:n
+{
% if \l@#1 is not properly defined, call lua function newloader(#1),
% and assign the returned number to \l@#1
- \__xpg_check_if_exist_l@:nF {#1}
+ \__xpg_pattern_check_if_exists:nF {#1}
{
\directlua { token.set_char('l@#1', polyglossia.newloader'#1') }
}
}
-% This check is also used by biblatex, so don't
-% rename silently.
-\newcommand\xpg@ifdefined[3]{
+% check if language is defined
+\prg_set_conditional:Npnn \xpg_if_language_defined:n #1 { T, F, TF }
+{
% With luatex, we first need to define \l@#1.
\sys_if_engine_luatex:T
{
- \polyglossia@luatex@load@lang{#1}
+ \__xpg_luatex_load_lang:n {#1}
}
- \__xpg_check_if_exist_l@:nTF{#1}{#2}{#3}
+ \__xpg_pattern_check_if_exists:nTF{#1}
+ { \prg_return_true: }
+ { \prg_return_false: }
}
+% Aliases for gloss files
+\cs_gset_eq:cc { IfLanguageDefinedTF } { xpg_if_language_defined:nTF }
+\cs_gset_eq:cc { IfLanguageDefinedT } { xpg_if_language_defined:nT }
+\cs_gset_eq:cc { IfLanguageDefinedF } { xpg_if_language_defined:nF }
+
+% Check if patterns for language #1 is defined. If not, try
+% the comma-separated list of fallbacks in #2
+\NewDocumentCommand \TryPatternWithFallback { m m }
+{
+ \xpg_if_language_defined:nF { #1 }
+ {
+ \clist_clear_new:N \l_xpg_lang_patterns
+ \clist_set:Ne \l_xpg_lang_patterns { #2 }
+ \bool_set_false:N \l_tmpa_bool
+ \clist_map_inline:Nn \l_xpg_lang_patterns
+ {
+ \xpg_if_language_defined:nT { ##1 }
+ {
+ \cs_gset_eq:cc { l@#1 } { l@##1 }
+ \bool_set_true:N \l_tmpa_bool
+ \clist_map_break:
+ }
+ }
+ \bool_if:NF \l_tmpa_bool
+ {
+ \xpg_warning_msg:n
+ {No~ hyphenation~ patterns~ for~ #1~ found \iow_newline:
+ Falling~ back~ to~ the~ default~ patterns~ (=~English)!}
+ \exp_args:Nc \adddialect {l@#1} 0
+ }
+ }
+}
+
+% This old term is used by biblatex, so don't drop!
+\cs_gset_eq:cc { xpg@ifdefined } { xpg_if_language_defined:nTF }
+
% Set \bbl@hyphendata@\the\language, which is (lua)babel's
% hyphenation pattern hook
% FIXME Clarifiy why/when this is needed.
-\newcommand*\xpg@set@bbl@hyphendata[1]{
+\cs_new:Nn \xpg_set_bbl_hyphendata:n
+{
\sys_if_engine_luatex:T
{
- \ifcsdef{bbl@hyphendata@#1}{}{
- \global\@namedef{bbl@hyphendata@\the\language}{}
+ \cs_if_exist:cF {bbl@hyphendata@#1}
+ {
+ \cs_gset:cpn {bbl@hyphendata@\the\language} {}
}
}
}
% Set hyphenation patterns for a given language. This does the right
% thing both for XeTeX and LuaTeX
-\newcommand*\xpg@set@hyphenation@patterns[1]{
- \sys_if_engine_luatex:T { \polyglossia@luatex@load@lang{#1} }
+\cs_new:Nn \xpg_set_hyphenation_patterns:n
+{
+ \sys_if_engine_luatex:T { \__xpg_luatex_load_lang:n {#1} }
\language=\csname l@#1\endcsname
}
-\newcommand*\@select@language[2][]{
+\cs_new:Nn \__xpg_start_language:nn
+{
% hook for compatibility with biblatex
- \select@language{#2}
- \xpg@set@bbl@hyphendata{\the\language}
+ \select@language { #2 }
+ \xpg_set_bbl_hyphendata:n {\the\language}
\xpg_initial_setup:
- \select@@language[#1]{#2}%
+ \xpg_select_language:nn { #1 } { #2 }
% Hook for external packages such as biblatex
- \polyglossia@language@switched%
- \__xpg_lang_set_par_direction:n{#2}
- \csuse{captions#2}%
- \csuse{date#2}%
+ \polyglossia@language@switched
+ \__xpg_lang_set_par_direction:n {#2}
+ \use:c {captions#2}
+ \use:c {date#2}
% These are hooks for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{captions@bbl@\babelname}
- \cs_if_exist_use:c{date@bbl@\babelname}
- \__xpg_local_marks:n{#2}
- \csuse{init@extras@#2}%
+ \cs_if_exist_use:c {captions@bbl@\babelname}
+ \cs_if_exist_use:c {date@bbl@\babelname}
+ \__xpg_local_marks:n {#2}
+ \use:c {init@extras@#2}
\__xpg_indent_first:n { #2 }
- \csuse{blockextras@#2}%
+ \cs_if_exist_use:c {blockextras@#2}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{blockextras@bbl@\babelname}
- }
+ \cs_if_exist_use:c {blockextras@bbl@\babelname}
+}
% hook for compatibility with biblatex
% (probably no longer used due to the
% more general hook that follows, but
% we keep it for backwards comp.)
-\def\select@language#1{}
+\cs_set:Npn \select@language #1 {}
% Hook for external packages such as biblatex
% do not rename!
-\def\polyglossia@language@switched{}
+\cs_new:Npn \polyglossia@language@switched {}
-% remove all custumization for language #1
+% remove all customization for language #1
\cs_new:Npn \noextrascurrent #1
-{%
+{
\cs_if_exist_use:c{noextras@#1}%
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
@@ -6462,160 +6424,105 @@ to track the issues and follow progress.
}
% Common code for `\select@language' and `\foreignlanguage'.
-\newcommand{\select@@language}[2][]{%
+\cs_new:Nn \xpg_select_language:nn
+{
% disable the extras and number settings of the previous language
\cs_if_exist:cT{languagename}
{
\noextrascurrent{\languagename}
\cs_if_exist_use:c{no\languagename @numbers}
\sys_if_engine_xetex:T{
- \__xpg_if_LR_str:eTF{\prop_item:Ne{\g_xpg_langsetup_prop}{\languagename/direction}}
+ \__xpg_if_LR_str:eTF{\prop_item:Ne{\l_xpg_langsetup_prop}{\languagename/direction}}
{
- \__xpg_if_LR_str:eF{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eF{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{\setnonlatin} % LTR -> RTL
}
{
- \__xpg_if_LR_str:eT{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eT{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{\setlatin} % RTL -> LTR
}
}
}
- \polyglossia@set@language@name[#1]{#2}
- % Set the language's/script's font families
- \str_if_eq:eeT{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/lcscript}} {latin}
- {
- \resetfontlatin
- }
- \bool_if:NF \l__xpg_inline_lang_bool
- { % This for non-inline font switches
- % in case a \<lang>font is defined
- \xpg@set@normalfont{#2}
- }
- \xpg@select@fontfamily{#2}
+ \xpg_set_language_name:n { #2 }
+ \xpg_set_normalfont:n { #2 }
+ \xpg_select_fontfamily:n { #2 }
\__xpg_use_or_warn:c{#2@language}
\cs_if_exist_use:c{#2@numbers}
- \use@localhyphenmins[#1]{#2}
+ \__xpg_use_localhyphenmins:nn { #1 } { #2 }
\__xpg_french_spacing:n { #2 }
}
-\let\xpg@pop@language\relax
+\cs_undefine:N \xpg_pop_language:
-%
-% Keep track of the active (nested) languages and options
-%
-\clist_new:N \l_xpg_lang_stack
-
-\cs_new:Nn \__xpg_stack_language:nn
-{
- \clist_gpush:Nn \l_xpg_lang_stack {#1:#2}
-}
+\DeclareDocumentEnvironment { otherlanguage } { O{} m }
+ {
+ \selectlanguage[#1]{#2}
+ } { }
-\cs_generate_variant:Nn \__xpg_stack_language:nn {nx}
+% Alias to {<lang>}, but more suitable
+% for specific (esp. tag-based) aliases
+% where {<alias>} would cause clashes
+% (e.g., \fi)
+\DeclareEnvironmentCopy { lang } { otherlanguage }
-\cs_new:Nn \__xpg_unstack_language:n
+\NewDocumentCommand \setlocalhyphenmins { m m m }
{
- \clist_gpop:NNTF \l_xpg_lang_stack \l_tmpa_tl {
- % Stored format = options:language => split:
- \seq_set_split:Nne \l_tmpa_seq {:} \l_tmpa_tl
- \seq_get_left:NN \l_tmpa_seq \l_tmpb_tl
- \seq_get_right:NN \l_tmpa_seq \l_tmpc_tl
- % Execute passed command with language and maybe options
- % and re-set stored language's keys
- \tl_if_empty:NTF \l_tmpb_tl {\cs_if_exist_use:c{#1}{\l_tmpc_tl}}
- {\__xpg_set_keys:nn{\l_tmpc_tl}{\l_tmpb_tl}
- \cs_if_exist_use:c{#1}[\l_tmpb_tl]{\l_tmpc_tl}
- }
- }
- {}
-}
-
-\DeclareDocumentEnvironment { otherlanguage } { O{} m }
- {
- % Get real current (pre-switch) options (incl. defaults)
- \clist_clear_new:N \l_xpg_current_options
- \prop_if_exist:cF { xpg@current@options@\languagename }
- { \prop_new:c {xpg@current@options@\languagename} }
- \prop_map_inline:cn {xpg@current@options@\languagename}
+ \xpg_if_language_defined:nTF{#1}
+ {
+ \cs_if_eq:ccTF { l@#1 } { l@nohyphenation }
{
- \clist_put_right:Nn \l_xpg_current_options {##1=##2}
+ \xpg_warning_msg:n {\string\setlocalhyphenmin\space~ useless~ for~ unhyphenated~ language~ #1}
+ }{
+ \providehyphenmins{#1}{#2#3}
}
- % Store current (pre-switch) options and language on stack
- \__xpg_stack_language:nx{\clist_use:Nn \l_xpg_current_options {,}}{\languagename}
- \selectlanguage[#1]{#2}
- }
- {
- % restore previous language in aux file and remove closed one from stack
- \__xpg_unstack_language:n{xpg@set@language@only@aux}
- }
-
-\newcommand{\setlocalhyphenmins}[3]{
- \xpg@ifdefined{#1}{
- \expandafter\ifx\csname l@#1\endcsname\l@nohyphenation
- \xpg@warning{\string\setlocalhyphenmin\space~ useless~ for~ unhyphenated~ language~ #1}
- \else
- \providehyphenmins{#1}{#2#3}
- \fi
}{
- \xpg@warning{\string\setlocalhyphenmin\space~ useless~ for~ unknown~ language~ #1}
+ \xpg_warning_msg:n {\string\setlocalhyphenmin\space~ useless~ for~ unknown~ language~ #1}
}
}
% \setlanghyphenmins[options]{lang}{l}{r}
-\newcommand*\setlanghyphenmins[4][]{%
+\NewDocumentCommand \setlanghyphenmins { O{} m m m }
+{
% Check for real language name and options
- \edef\xpg@tmp@opts{\xpg_alias_add_to_option_i:nn{#2}{#1}}
- \edef\xpg@tmp@lang{\xpg_alias_base_lang:n{#2}}
- \bgroup
- \xpg_error_if_lang_not_loaded:n{\xpg@tmp@lang}
- \__xpg_set_keys:nn{\xpg@tmp@lang}{\xpg@tmp@opts}
+ \tl_set:Nx \l_tmp_opts_tl { \xpg_alias_add_to_option_i:nn{#2}{#1} }
+ \tl_set:Nx \l_tmp_lang_tl { \xpg_alias_base_lang:n{#2} }
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n{\l_tmp_lang_tl}
+ \SetGlossOptions{\l_tmp_lang_tl}{ \l_tmp_opts_tl }
% Store bcp47.tag@hypenmins
- \tl_if_blank:nTF {\xpg@tmp@opts}{%
- \ifcsundef{\csname xpg@tmp@lang\endcsname @g.bcp47.tag}{
- \csedef{tmp@bcp47.tag}{\prop_item:Ne{\g_xpg_langsetup_prop}{ \xpg@tmp@lang / bcp47 }}
- }{
- \csedef{tmp@bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- }{
- \csedef{tmp@bcp47.tag}{\prop_item:Ne{\g_xpg_langsetup_prop}{ \xpg@tmp@lang / bcp47 }}
- }
- \csgdef{\csname tmp@bcp47.tag\endcsname @hyphenmins}{{#3}{#4}}
- \egroup
+ \cs_set_nopar:cpe {tmp@bcp47.tag} { \prop_item:Ne{\l_xpg_langsetup_prop}{ \l_tmp_lang_tl / bcp47 } }
+ \cs_gset:cpn {\csname tmp@bcp47.tag\endcsname @hyphenmins} {{#3}{#4}}
+ \c_group_end_token
}
-% \use@localhypenmins[options]{lang}
-\newcommand*\use@localhyphenmins[2][]{
- \bgroup
- \xpg_error_if_lang_not_loaded:n{#2}
- \__xpg_set_keys:nn{#2}{#1}
+% \__xpg_use_localhyphenmins:nn {options}{lang}
+\cs_new_nopar:Nn \__xpg_use_localhyphenmins:nn
+{
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n {#2}
+ \SetGlossOptions {#2} {#1}
% Use bcp47.tag@hypenmins
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@g.bcp47.tag}{
- \csxdef{tmp@bcp47.tag}{\prop_item:Nn{\g_xpg_langsetup_prop}{ #2 / bcp47 }}
- }{
- \csxdef{tmp@bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- }{
- \csxdef{tmp@bcp47.tag}{\prop_item:Nn{\g_xpg_langsetup_prop}{ #2 / bcp47 }}
- }
- \egroup
- \ifcsundef{\csname tmp@bcp47.tag\endcsname @hyphenmins}{
- \ifcsundef{#2hyphenmins}{}
+ \cs_gset_nopar:cpe {tmp@bcp47.tag} { \prop_item:Nn{\l_xpg_langsetup_prop}{ #2 / bcp47 } }
+ \c_group_end_token
+ \cs_if_exist:cTF {\csname tmp@bcp47.tag\endcsname @hyphenmins}
+ {
+ \tl_set:Ne \l_tmpa_tl { \use:c{\csname tmp@bcp47.tag\endcsname @hyphenmins} }
+ \expandafter \set@hyphenmins \l_tmpa_tl
+ }{
+ \cs_if_exist:cT{#2hyphenmins}
{
\expandafter\expandafter\expandafter\set@hyphenmins\csname #2hyphenmins\endcsname\relax
}
- }{
- \edef\tmpa{\csuse{\csname tmp@bcp47.tag\endcsname @hyphenmins}}
- \expandafter\expandafter\expandafter\set@hyphenmins\tmpa\relax
}
- \sys_if_engine_luatex:T{
+ \sys_if_engine_luatex:T
+ {
% Set \totalhyphenmin if specified
- \prop_get:NeNTF \g_xpg_langsetup_prop {#2/totalhyphenmin} \l_tmpa_tl
+ \prop_get:NeNT \l_xpg_langsetup_prop {#2/totalhyphenmin} \l_tmpb_tl
{
- \xpg@info{totalhyphenmin: '\l_tmpa_tl'}
- \expandafter\hyphenationmin \l_tmpa_tl
+ \xpg_info_msg:n {totalhyphenmin: '\l_tmpb_tl'}
+ \expandafter\hyphenationmin \l_tmpb_tl
}
- {}
}
}
@@ -6627,23 +6534,26 @@ to track the issues and follow progress.
\DeclareDocumentEnvironment { hyphenrules } { O{} m }
{
% Check for real language name and options
- \edef\xpg@tmp@opts{\xpg_alias_add_to_option_i:nn{#2}{#1}}
- \edef\xpg@tmp@lang{\xpg_alias_base_lang:n{#2}}
+ \tl_set:Nx \l_tmp_opts_tl { \xpg_alias_add_to_option_i:nn{#2}{#1} }
+ \tl_set:Nx \l_tmp_lang_tl { \xpg_alias_base_lang:n{#2} }
% Register the language options
- \__xpg_set_language_options:nnn {\xpg@tmp@lang} {\xpg@tmp@opts} {@xpg@set@langvariant}
+ \__xpg_set_language_options:nn { \l_tmp_lang_tl } { \l_tmp_opts_tl }
% Now switch patterns
- \__xpg_use_or_warn:c{\use:c{xpg@tmp@lang}@language}
+ \__xpg_use_or_warn:c{\use:c{l_tmp_lang_tl}@language}
% And activate hyphenmins
- \use@localhyphenmins[\xpg@tmp@opts]{\xpg@tmp@lang}
+ \__xpg_use_localhyphenmins:nn { \l_tmp_opts_tl } { \l_tmp_lang_tl }
}
{ }
-\AddToHook{begindocument/before}{
- \IfPackageLoadedTF{bidi}{
- \providecommand*{\aemph}[1]{$\overline{\hboxR{#1}}$}
+\hook_gput_code:nnn {begindocument/before} {.}
+{
+ \IfPackageLoadedTF{bidi}
+ {
+ \ProvideDocumentCommand \aemph { m } { $\overline{\hboxR{#1}}$ }
}{}
- \IfPackageLoadedTF{luabidi}{
- \providecommand*{\aemph}[1]{$\overline{\hbox{\RL{#1}}}$}
+ \IfPackageLoadedTF{luabidi}
+ {
+ \ProvideDocumentCommand \aemph { m } { $\overline{\hbox{\RL{#1}}}$ }
}{}
}
@@ -6677,7 +6587,8 @@ to track the issues and follow progress.
.value_required:n = true,
}
-\keys_set:nn { polyglossia } {
+\keys_set:nn { polyglossia }
+{
localmarks = false,
verbose = true,
babelshorthands = false,
@@ -6694,23 +6605,35 @@ to track the issues and follow progress.
\sys_if_engine_luatex:T{
\str_if_eq:eeF{\g_xpg_luatex_renderer_str}{none}
{
- \xpg@info{Setting~ LuaTeX~ font~ renderer~ to~ \g_xpg_luatex_renderer_str}
+ \xpg_info_msg:n{Setting~ LuaTeX~ font~ renderer~ to~ \g_xpg_luatex_renderer_str}
\exp_args:Ne \defaultfontfeatures{Renderer=\g_xpg_luatex_renderer_str}
}
}
-\bool_if:nF \g_xpg_verbose_bool {
- \gdef\@latex@info#1{\relax} % no latex info
- \gdef\@font@info#1{\relax} % no latex font info
- \gdef\@font@warning#1{\relax} % no latex font warnings
- \gdef\zf@PackageInfo#1{\relax} % no fontspec info
- \gdef\xpg@info#1{\relax} % no polyglossia info
+\bool_if:nF \g_xpg_verbose_bool
+{
+ \cs_gset_nopar:Npn \@latex@info #1 { \relax } % no latex info
+ \cs_gset_nopar:Npn \@font@info #1 { \relax } % no latex font info
+ \cs_gset_nopar:Npn \@font@warning #1 { \relax } % no latex font warnings
+ \msg_redirect_module:nnn { fontspec } { info } { none } % no fontspec info
+ \msg_redirect_module:nnn { polyglossia } { info } { none } % no polyglossia info
}
\bool_if:nT \g_xpg_localmarks_bool {
\__xpg_enable_local_marks:
}
+% common code to initiate babelshordhands in glosses
+\cs_new:Npn \InitializeBabelShorthands
+{
+ \cs_if_exist:cF {initiate@active@char}
+ {
+ \file_input:n {babelsh.def}
+ \initiate@active@char{"}
+ \shorthandoff{"}
+ }
+}
+
% Control shorthand (de-)activation
% This checks that the shorthand char is only deactivated
% if we have activated it ourselves and hence keeps
@@ -6738,21 +6661,22 @@ to track the issues and follow progress.
% Inherit shorthands in other languages
\NewDocumentCommand \inheritbabelshorthands { m m }
{
- \AddToHook{begindocument/before}{
+ \hook_gput_code:nnn {begindocument/before} {.}
+ {
% Load the involved languages if necessary
% Error if they do not exist
\tl_set:Nn \l__xpg_tmpa_lang_tl { \xpg_alias_base_lang:n{#1} }
\clist_if_in:NeF \xpg@loaded {\l__xpg_tmpa_lang_tl}{
\file_if_exist:nTF{gloss-\l__xpg_tmpa_lang_tl .ldf}
{ \setotherlanguage{#1} }
- { \xpg@error{ Source~ language~ #1,~ used~ in~
+ { \xpg_error_msg:n { Source~ language~ #1,~ used~ in~
\string\inheritbabelshorthands,~ does~ not~ exist } }
}
\tl_set:Nn \l__xpg_tmpb_lang_tl { \xpg_alias_base_lang:n{#2} }
\clist_if_in:NeF \xpg@loaded {\l__xpg_tmpb_lang_tl}{
\file_if_exist:nTF{gloss-\l__xpg_tmpb_lang_tl .ldf}
{ \setotherlanguage{#2} }
- { \xpg@error{ Target~ language~ #2,~ used~ in~
+ { \xpg_error_msg:n { Target~ language~ #2,~ used~ in~
\string\inheritbabelshorthands,~ does~ not~ exist } }
}
% Test whether the requested shorthands exist
@@ -6764,7 +6688,7 @@ to track the issues and follow progress.
{ \bool_set_true:N \l__xpg_no_shorthands_bool }
\bool_if:nT { \l__xpg_no_shorthands_bool }
{
- \xpg@error{ No~ babel~ shorthands~ exist~ for~ language~ #1 }
+ \xpg_error_msg:n { No~ babel~ shorthands~ exist~ for~ language~ #1 }
}
% If so, apply:
\bool_if:nF { \l__xpg_no_shorthands_bool }
@@ -6789,7 +6713,7 @@ to track the issues and follow progress.
\iflanguageloaded{\l__xpg_tmpa_lang_tl}{
\use:c{\l__xpg_tmpa_lang_tl @shorthands}
}{
- \xpg@error{ Language~ #1,~ requested~ in~
+ \xpg_error_msg:n { Language~ #1,~ requested~ in~
\string\startbabelshorthands,~ is~ not~ loaded }
}
}
@@ -7090,7 +7014,7 @@ to track the issues and follow progress.
\ifnum#1<5000
\Hebrewnumeral{#1}%
\else
- \ifnum#1<6000 % current millenium, print without thousands
+ \ifnum#1<6000 % current millennium, print without thousands
\@tempcnta=#1\relax
\if@xpg@hebrew@fullyear\else\advance\@tempcnta by -5000\fi
\Hebrewnumeral{\@tempcnta}%
@@ -7419,7 +7343,7 @@ l3calc. Please update expl3!
\@ifundefined{@Remainder}{\input{cal-util.def}}{}
%% The following functions are straightforward implementation
-%% of Reingold & Dershowitz, Calendrical Calculations, The Millenium Edition
+%% of Reingold & Dershowitz, Calendrical Calculations, The Millennium Edition
%%
\def\@FixedFromHijri#1#2#3#4{% year,month,day,counter
@@ -7494,82 +7418,15 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
% \end{macrocode}
% \iffalse
%</hijrical.sty>
-%<*polyglossia-french.lua>
+%<*polyglossia-cjk-spacing.lua>
% \fi
% \clearpage
%
-% \subsection{polyglossia-french.lua}
+% \subsection{polyglossia-cjk-spacing.lua}
% \begin{macrocode}
--
--- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
---
-
-require('polyglossia-punct')
-
-local function set_left_space(lang, char, kern, rubber)
- polyglossia.add_left_spaced_character(lang, char, kern, "space", rubber)
-end
-
-local function set_right_space(lang, char, kern, rubber)
- polyglossia.add_right_spaced_character(lang, char, kern, "space", rubber)
-end
-
-local function activate_french_punct(thincolonspace, autospaceguillemets)
- -- We need different language tags here to make switching of options possible
- -- within a paragraph.
- local lang = "french"
- if thincolonspace then
- lang = lang.."-thincolon"
- end
- if autospaceguillemets then
- lang = lang.."-autospace"
- end
-
- polyglossia.activate_punct(lang)
- polyglossia.clear_spaced_characters(lang)
-
- if thincolonspace then
- set_left_space(lang, ':', 0.5)
- else
- set_left_space(lang, ':', 1, true) -- stretchable and shrinkable space
- end
-
- set_left_space(lang, '!', 0.5)
- set_left_space(lang, '?', 0.5)
- set_left_space(lang, ';', 0.5)
- set_left_space(lang, '‼', 0.5)
- set_left_space(lang, '⁇', 0.5)
- set_left_space(lang, '⁈', 0.5)
- set_left_space(lang, '⁉', 0.5)
- set_left_space(lang, '‽', 0.5) -- U+203D (interrobang)
-
- if autospaceguillemets then
- set_left_space(lang, '»', 0.5)
- set_left_space(lang, '›', 0.5)
- set_right_space(lang, '«', 0.5)
- set_right_space(lang, '‹', 0.5)
- end
-end
-
-local function deactivate_french_punct()
- polyglossia.deactivate_punct()
-end
-
-polyglossia.activate_french_punct = activate_french_punct
-polyglossia.deactivate_french_punct = deactivate_french_punct
-% \end{macrocode}
-% \iffalse
-%</polyglossia-french.lua>
-%<*polyglossia-korean.lua>
-% \fi
-% \clearpage
-%
-% \subsection{polyglossia-korean.lua}
-% \begin{macrocode}
---
--- polyglossia-korean.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- polyglossia-cjk-spacing.lua
+-- part of polyglossia v2.2 -- 2024/07/15
--
local glyph_id = node.id"glyph"
@@ -7577,13 +7434,17 @@ local hbox_id = node.id"hlist"
local vbox_id = node.id"vlist"
local glue_id = node.id"glue"
local penalty_id = node.id"penalty"
-local disc_id = node.id"disc"
+local whatsit_id = node.id"whatsit"
+local math_id = node.id"math"
--
--- attr_korean: variant = plain (0), classic (1), modern (2)
+-- attr_cjk: variant = plain: 0, JP/classic: 1, KR/modern: 2, SC: 3, TC: 4
+--
+local attr_cjk = luatexbase.attributes["xpg@attr@cjkspacing"]
+--
+-- attr_josa: ONLY For Korean. DO NOT declare \newattribute for other langs
--
-local attr_korean = luatexbase.attributes["xpg@attr@korean"]
-local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
+local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
--
-- characters after which linebreak is not allowed
@@ -7632,9 +7493,9 @@ local nobr_after = {
-- characters before which linebreak is not allowed
-- (currently, not much differences among the followings)
-- 1: normal chars
--- 2: hangul jamo vowels and trailing consonants
+-- 2: hangul jamo vowels and trailing consonants plus combinings
-- 3: kana small letters
--- 0: dashes (supress visible spacing)
+-- 0: dashes (suppress visible spacing after this char)
--
local nobr_before = setmetatable({
[0x21] = 1, -- ! EXCLAMATION MARK
@@ -7645,7 +7506,7 @@ local nobr_before = setmetatable({
[0x2D] = 0, -- - HYPHEN-MINUS
[0x2E] = 1, -- . FULL STOP
[0x2F] = 0, -- / SOLIDUS
- [0x3A] = 0, -- : COLON
+ [0x3A] = 1, -- : COLON
[0x3B] = 1, -- ; SEMICOLON
[0x3E] = 1, -- > GREATER-THAN SIGN
[0x3F] = 1, -- ? QUESTION MARK
@@ -7657,11 +7518,11 @@ local nobr_before = setmetatable({
[0xBB] = 1, -- » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
[0x2013] = 0, -- – EN DASH
[0x2014] = 0, -- — EM DASH
- [0x2015] = 1, -- ― HORIZONTAL BAR
+ [0x2015] = 0, -- ― HORIZONTAL BAR
[0x2019] = 1, -- ’ RIGHT SINGLE QUOTATION MARK
[0x201D] = 1, -- ” RIGHT DOUBLE QUOTATION MARK
- [0x2025] = 1, -- ‥ TWO DOT LEADER
- [0x2026] = 1, -- … HORIZONTAL ELLIPSIS
+ [0x2025] = 0, -- ‥ TWO DOT LEADER
+ [0x2026] = 0, -- … HORIZONTAL ELLIPSIS
[0x232A] = 1, -- 〉 RIGHT-POINTING ANGLE BRACKET
[0x3001] = 1, -- 、 IDEOGRAPHIC COMMA
[0x3002] = 1, -- 。 IDEOGRAPHIC FULL STOP
@@ -7693,10 +7554,10 @@ local nobr_before = setmetatable({
[0x308E] = 3, -- ゎ HIRAGANA LETTER SMALL WA
[0x3095] = 3, -- ゕ HIRAGANA LETTER SMALL KA
[0x3096] = 3, -- ゖ HIRAGANA LETTER SMALL KE
- [0x3099] = 1, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309A] = 1, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
- [0x309B] = 1, -- ゛ KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309C] = 1, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x3099] = 2, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309A] = 2, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x309B] = 2, -- ゛ KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309C] = 2, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
[0x309D] = 1, -- ゝ HIRAGANA ITERATION MARK
[0x309E] = 1, -- ゞ HIRAGANA VOICED ITERATION MARK
[0x30A0] = 1, -- ゠ KATAKANA-HIRAGANA DOUBLE HYPHEN
@@ -7716,9 +7577,9 @@ local nobr_before = setmetatable({
[0x30FC] = 1, -- ー KATAKANA-HIRAGANA PROLONGED SOUND MARK
[0x30FD] = 1, -- ヽ KATAKANA ITERATION MARK
[0x30FE] = 1, -- ヾ KATAKANA VOICED ITERATION MARK
- [0xFE30] = 1, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
- [0xFE31] = 1, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
- [0xFE32] = 1, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
+ [0xFE30] = 0, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
+ [0xFE31] = 0, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
+ [0xFE32] = 0, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
[0xFE36] = 1, -- ︶ PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
[0xFE38] = 1, -- ︸ PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
[0xFE3A] = 1, -- ︺ PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
@@ -7745,18 +7606,18 @@ local nobr_before = setmetatable({
[0xFF63] = 1, -- 」 HALFWIDTH RIGHT CORNER BRACKET
[0xFF64] = 1, -- 、 HALFWIDTH IDEOGRAPHIC COMMA
[0xFF65] = 1, -- ・ HALFWIDTH KATAKANA MIDDLE DOT
- [0xFF9E] = 1, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
- [0xFF9F] = 1, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+ [0xFF9E] = 2, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
+ [0xFF9F] = 2, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
}, { __index = function(_,c)
if c >= 0x1160 and c <= 0x11FF then return 2 end
if c >= 0xD7B0 and c <= 0xD7FF then return 2 end
- if c >= 0x302A and c <= 0x302F then return 1 end
+ if c >= 0x302A and c <= 0x302F then return 2 end -- tone marks
if c >= 0x31F0 and c <= 0x31FF then return 3 end
if c >= 0xFF67 and c <= 0xFF70 then return 3 end
- if c >= 0xFE00 and c <= 0xFE0F then return 1 end
+ if c >= 0xFE00 and c <= 0xFE0F then return 2 end -- variation selectors
if c >= 0xFE10 and c <= 0xFE19 and not (c == 0xFE17) then return 1 end
if c >= 0xFE50 and c <= 0xFE58 then return 1 end
- if c >= 0xE0100 and c <= 0xE01EF then return 1 end
+ if c >= 0xE0100 and c <= 0xE01EF then return 2 end -- variation selecters
end
})
@@ -7774,6 +7635,7 @@ local function is_cjk (c)
or c >= 0xFF00 and c <= 0xFFEF
or c >= 0x1F100 and c <= 0x1F2FF
or c >= 0x20000 and c <= 0x2FA1F
+ or c >= 0x30000 and c <= 0x323AF
or nobr_after[c] and c > 0x2014
or nobr_before[c] and c > 0x2014
end
@@ -7813,8 +7675,28 @@ local charclass = setmetatable({
}, { __index = function() return 0 end })
--
+-- get character class
+-- var : variant = plain, JP/classic, KR/modern, SC, TC
+-- c : codepoint
+--
+local function get_charclass (var, c)
+ if var < 3 then
+ return charclass[c]
+ elseif var == 3 then
+ -- SC : these are left aligned
+ return (c == 0xFF01 or c == 0xFF1F) and 4 -- FULLWIDTH EXCLAMATION/QUESTION MARK
+ or (c == 0xFF1A or c == 0xFF1B) and 2 -- FULLWIDTH COLON/SEMICOLON
+ or charclass[c]
+ end
+ -- TC : these are center aligned
+ return (c == 0x3001 or c == 0xFF0C) and 3 -- IDEOGRAPHIC/FULLWIDTH COMMA
+ or (c == 0x3002 or c == 0xFF0E) and 3 -- IDEOGRAPHIC/FULLWIDTH FULL STOP -- 5 ?
+ or charclass[c]
+end
+
+--
-- table for spacing between char classes
--- 1 stands for 0.5*fontsize when variant=classic
+-- 1 stands for 0.5*fontsize when variant = JP/classic or SC or TC
--
local intercharclass = { [0] =
{ [0] = nil, {1,1}, nil, {.5,.5} },
@@ -7846,7 +7728,7 @@ end
--
-- return 0.5*fontsize of given fontid
--- space: true if variant=modern; then 0.5*interword_space
+-- space: true if variant=KR/modern; then 0.5*interword_space
--
local function get_font_size (fid, space)
local size = font.getparameters(fid)
@@ -7860,7 +7742,7 @@ end
--
-- charclass 1 thru 4 will be packed in \hbox to 0.5em{\hss? curr \hss?}
--- when variant=classic/modern
+-- when variant ~= plain
--
local function glyph_to_box (head, curr, class)
local g, h = curr
@@ -7889,7 +7771,7 @@ end
--
-- insert spacing defined as charclass[a][b] between a and b
-- f: fontid
--- var: variant = plain, classic, modern
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
-- cc: charclass of current char
-- nc: charclass of next char
-- nobr: linebreak is not allowed
@@ -7908,12 +7790,16 @@ end
--
-- insert inter-character spacing in other normal cases
--- f: fontid
--- var: variant = plain, classic, modern
--- x: true between cjk and non-cjk (a little more spacing)
+-- f: fontid
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
+-- nobr: no linebreak
+-- x: true between cjk and non-cjk (a little more spacing)
--
-local function insert_penalty_glue (head, curr, f, var, x)
- if var ~= 1 then
+local function insert_penalty_glue (head, curr, f, var, nobr, x)
+ if nobr then
+ local penalty = get_new_penalty(10000)
+ head, curr = node.insert_after(head, curr, penalty)
+ elseif var == 0 or var == 2 then
local penalty = get_new_penalty(50)
head, curr = node.insert_after(head, curr, penalty)
end
@@ -7929,53 +7815,64 @@ end
--
-- main process for linebreak and inter-character spacing
--- lb: true if pre_linebreak_filter
--
-local function korean_break (head, lb)
+local function cjk_break (head)
local curr = head
while curr do
- if curr.id == glyph_id then
- local var = node.has_attribute(curr, attr_korean)
+ if attr_cjk and (curr.id == glyph_id or curr.id == math_id and curr.subtype == 1) then
+ local var = node.has_attribute(curr, attr_cjk)
if var then
- local c, f = curr.char or 0, curr.font or 0
- local cc, cjkc = charclass[c], is_cjk(c)
+ local c, f = curr.char or 0, curr.font
+ local cc, cjkc = get_charclass(var, c), is_cjk(c)
-- compress cjk punctuations when charclass is 1 thru 4
if var > 0 and cc > 0 and cc < 5 then
head, curr = glyph_to_box(head, curr, cc)
end
- local next = curr.next
- if next and next.id == glyph_id then
+ local next = node.getnext(curr)
+ while next and next.id == whatsit_id do -- skip whatsit nodes
+ curr, next = next, node.getnext(next)
+ end
+
+ if next and (next.id == glyph_id or next.id == math_id and next.subtype == 0) then
local n = next.char or 0
- local nc = charclass[n]
+ f = f or next.font or 0 -- in case of curr == math_off
+
+ -- skip combining. or dash+dash case to suppress stretching
+ if nobr_before[n] == 2 or (nobr_before[c] == 0 and nobr_before[n] == 0) then
+ goto skip_combining
+ end
+
+ local nc = get_charclass(var, n)
local nobr = nobr_before[n] or nobr_after[c]
-- insert spacing as of intercharclass
if var > 0 and intercharclass[cc][nc] then
head, curr = insert_cjk_penalty_glue(head, curr, f, var, cc, nc, nobr)
- -- or insert spacing when linebreak is allowed
- elseif not nobr then
+ else
local cjkn = is_cjk(n)
-- if curr or next is cjk char
if cjkc or cjkn then
- -- if between cjk and non-cjk
- if var > 0 and not (cjkc and cjkn) and nobr_before[c] ~= 0 then
- head, curr = insert_penalty_glue(head, curr, f, var, true)
+ -- plain variant / cjk+cjk / nobr cjk+noncjk / after dash
+ -- : insert a 0pt glue
+ if var == 0 or (cjkc and cjkn) or nobr or nobr_before[c] == 0 then
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr)
- -- or under pre_linebreak_filter
- elseif lb then
- head, curr = insert_penalty_glue(head, curr, f, var)
+ -- other cases: insert a small glue
+ else
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr, true)
end
end
end
end
end
end
- curr = curr.next
+ ::skip_combining::
+ curr = node.getnext(curr)
end
return head
end
@@ -7989,7 +7886,7 @@ end
local function reorder_tm (head)
local curr, tone = node.slide(head)
while curr do
- if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
+ if curr.id == glyph_id and node.has_attribute(curr, attr_cjk) then
local f = font.getfont(curr.font) or font.fonts[curr.font]
if f and f.hb then -- harfbuzz do the right thing
tone = nil
@@ -8005,7 +7902,7 @@ local function reorder_tm (head)
end
end
end
- curr = curr.prev
+ curr = node.getprev(curr)
end
return head
end
@@ -8092,7 +7989,7 @@ local function get_prev_char (p)
local pc = get_prev_char(node.slide(p.head))
if pc then return pc end
end
- p = p.prev
+ p = node.getprev(p)
end
end
@@ -8107,10 +8004,10 @@ local function auto_josa (head)
if josa then
local cc = curr.char or 0
if josa == 0 then
- josa = josa_code[get_prev_char(curr.prev) or 0x30]
+ josa = josa_code[get_prev_char(node.getprev(curr)) or 0x30]
end
if cc == 0xC774 then
- local n = curr.next
+ local n = node.getnext(curr)
if n and n.char and n.char >= 0xAC00 and n.char <= 0xD7A3 then
else
cc = 0xAC00
@@ -8129,7 +8026,7 @@ local function auto_josa (head)
node.unset_attribute(curr, attr_josa)
end
end
- curr = curr.next
+ curr = node.getnext(curr)
end
for _,v in ipairs(tofree) do node.free(v) end
return head
@@ -8140,45 +8037,86 @@ end
-- As char value of glyphs can be changed by opentype GSUB process,
-- we have to occupy the first position among callback functions.
--
-local prepend_to_callback
-if luatexbase.base_add_to_callback then
- prepend_to_callback = function(name, func, desc)
- luatexbase.add_to_callback(name, func, desc, 1)
+luatexbase.add_to_callback( "pre_shaping_filter",
+function(head)
+ if attr_josa then head = auto_josa(head) end
+ head = cjk_break(head)
+ if attr_josa then head = reorder_tm(head) end
+ return head
+end,
+"polyglossia.lang_cjk_spacing")
+
+-- vim:ft=lua:tw=0:sw=4:ts=4:expandtab
+% \end{macrocode}
+% \iffalse
+%</polyglossia-cjk-spacing.lua>
+%<*polyglossia-french.lua>
+% \fi
+% \clearpage
+%
+% \subsection{polyglossia-french.lua}
+% \begin{macrocode}
+--
+-- polyglossia-punct.lua
+-- part of polyglossia v2.2 -- 2024/07/15
+--
+
+require('polyglossia-punct')
+
+local function set_left_space(lang, char, kern, rubber)
+ polyglossia.add_left_spaced_character(lang, char, kern, "space", rubber)
+end
+
+local function set_right_space(lang, char, kern, rubber)
+ polyglossia.add_right_spaced_character(lang, char, kern, "space", rubber)
+end
+
+local function activate_french_punct(thincolonspace, autospaceguillemets)
+ -- We need different language tags here to make switching of options possible
+ -- within a paragraph.
+ local lang = "french"
+ if thincolonspace then
+ lang = lang.."-thincolon"
end
-else
- prepend_to_callback = function(name, func, desc)
- local t = { {func, desc} }
- for _,v in ipairs(luatexbase.callback_descriptions(name)) do
- table.insert(t, {luatexbase.remove_from_callback(name, v)})
- end
- for _,v in ipairs(t) do
- luatexbase.add_to_callback(name, v[1], v[2])
- end
+ if autospaceguillemets then
+ lang = lang.."-autospace"
+ end
+
+ polyglossia.activate_punct(lang)
+ polyglossia.clear_spaced_characters(lang)
+
+ if thincolonspace then
+ set_left_space(lang, ':', 0.5)
+ else
+ set_left_space(lang, ':', 1, true) -- stretchable and shrinkable space
+ end
+
+ set_left_space(lang, '!', 0.5)
+ set_left_space(lang, '?', 0.5)
+ set_left_space(lang, ';', 0.5)
+ set_left_space(lang, '‼', 0.5)
+ set_left_space(lang, '⁇', 0.5)
+ set_left_space(lang, '⁈', 0.5)
+ set_left_space(lang, '⁉', 0.5)
+ set_left_space(lang, '‽', 0.5) -- U+203D (interrobang)
+
+ if autospaceguillemets then
+ set_left_space(lang, '»', 0.5)
+ set_left_space(lang, '›', 0.5)
+ set_right_space(lang, '«', 0.5)
+ set_right_space(lang, '‹', 0.5)
end
end
-prepend_to_callback ("pre_linebreak_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head, true)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
-
-prepend_to_callback ("hpack_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
+local function deactivate_french_punct()
+ polyglossia.deactivate_punct()
+end
--- vim:ft=lua:tw=0:sw=4:ts=4:expandtab
+polyglossia.activate_french_punct = activate_french_punct
+polyglossia.deactivate_french_punct = deactivate_french_punct
% \end{macrocode}
% \iffalse
-%</polyglossia-korean.lua>
+%</polyglossia-french.lua>
%<*polyglossia-latin.lua>
% \fi
% \clearpage
@@ -8187,7 +8125,7 @@ prepend_to_callback ("hpack_filter",
% \begin{macrocode}
--
-- polyglossia-latin.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
@@ -8242,14 +8180,13 @@ polyglossia.deactivate_latin_punct = deactivate_latin_punct
% \begin{macrocode}
--
-- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
-local remove_from_callback = luatexbase.remove_from_callback
-local priority_in_callback = luatexbase.priority_in_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local new_attribute = luatexbase.new_attribute
local node = node
@@ -8573,13 +8510,16 @@ local function activate(lang)
-- important to be able to intermix languages with different spacings
-- in one paragraph.
tex.setattribute(punct_attr, id)
- for _, callback_name in ipairs{ "pre_linebreak_filter", "hpack_filter" } do
- if not priority_in_callback(callback_name, "polyglossia-punct.process") then
- add_to_callback(callback_name, process, "polyglossia-punct.process", 1)
- end
- end
end
+add_to_callback("pre_linebreak_filter",process,"polyglossia-punct.process")
+add_to_callback("hpack_filter",process,"polyglossia-punct.process")
+declare_callback_rule("pre_linebreak_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+declare_callback_rule("hpack_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+
+
local function deactivate()
tex.setattribute(punct_attr, -0x7FFFFFFF) -- this value means "unset"
-- Though it would make compilation slightly faster, it is not possible to
@@ -8610,7 +8550,7 @@ polyglossia.clear_spaced_characters = clear_spaced_characters
% \begin{macrocode}
--
-- polyglossia-sanskrit.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
@@ -8660,31 +8600,29 @@ polyglossia.deactivate_sanskrit_punct = deactivate_sanskrit_punct
% \begin{macrocode}
--
-- polyglossia-tibt.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
local remove_from_callback = luatexbase.remove_from_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local priority_in_callback = luatexbase.priority_in_callback
local next, type = next, type
-
-local nodes, fonts, node = nodes, fonts, node
-
-local nodecodes = nodes.nodecodes --- <= preloaded node.types()
+local node = node
local insert_node_before = node.insert_before
local insert_node_after = node.insert_after
-local remove_node = nodes.remove
+local remove_node = node.remove
local copy_node = node.copy
local has_attribute = node.has_attribute
local end_of_math = node.end_of_math
if not end_of_math then -- luatex < .76
local traverse_nodes = node.traverse_id
- local math_code = nodecodes.math
+ local math_code = node.id('math_char')
local end_of_math = function (n)
for n in traverse_nodes(math_code, n.next) do
return n
@@ -8692,10 +8630,10 @@ if not end_of_math then -- luatex < .76
end
end
--- node types as of April 2013
-local glyph_code = nodecodes.glyph
-local penalty_code = nodecodes.penalty
-local kern_code = nodecodes.kern
+-- node types as of April 2024
+local glyph_code = node.id('glyph')
+local penalty_code = node.id('penalty')
+local kern_code = node.id('kern')
-- we make a new node, so that we can copy it later on
local penalty_node = node.new(penalty_code)
@@ -8726,7 +8664,6 @@ local function process(head)
end
end
elseif id == math_code then
- -- warning: this is a feature of luatex > 0.76
start = end_of_math(start) -- weird, can return nil .. no math end?
end
if start then
@@ -8739,15 +8676,13 @@ end
local callback_name = "pre_linebreak_filter"
local function activate()
- if not priority_in_callback (callback_name, "polyglossia-tibt.process") then
- add_to_callback(callback_name, process, "polyglossia-tibt.process", 1)
- end
+ add_to_callback(callback_name, process, "polyglossia-tibt.process")
+ declare_callback_rule(callback_name,
+ "polyglossia-tibt.process", "before", "luaotfload.node_processor")
end
local function desactivate()
- if priority_in_callback (callback_name, "polyglossia-tibt.process") then
- remove_from_callback(callback_name, "polyglossia-tibt.process")
- end
+ remove_from_callback(callback_name, "polyglossia-tibt.process")
end
polyglossia.activate_tibt_eol = activate
@@ -8763,7 +8698,7 @@ polyglossia.desactivate_tibt_eol = desactivate
% \begin{macrocode}
--
-- polyglossia.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
local module_name = "polyglossia"
@@ -8839,7 +8774,7 @@ local function newloader(langentry)
end
-- language info will be written into the .log file
- local s = { "Language data for " .. langentry }
+ local s = { }
for k, v in pairs(langdata) do
if type(v) == 'table' then -- for 'synonyms'
s[#s+1] = k .. "\t" .. table.concat(v,',')
@@ -8847,7 +8782,10 @@ local function newloader(langentry)
s[#s+1] = k .. "\t" .. tostring(v)
end
end
- log_info(table.concat(s,"\n"))
+ local a = {}
+ for _,n in pairs(s) do table.insert(a, n) end
+ table.sort(a)
+ log_info("Language data for " .. langentry .. "\n" .. table.concat(a,"\n"))
--
-- LaTeX's \newlanguage increases language register (count19),
@@ -8857,7 +8795,7 @@ local function newloader(langentry)
-- this possible situation, our newloader() function will
-- unfortunately overwrite the language \lang@xyz.
--
- -- Threfore here we will compare LaTeX's \newlanguage number with
+ -- Therefore here we will compare LaTeX's \newlanguage number with
-- LuaTeX's lang.new() id and select the bigger one for our new
-- language object. Also we will update LaTeX's language register
-- by this new id, so that another possible \newlanguage should not
@@ -8872,7 +8810,7 @@ local function newloader(langentry)
local newlangid = math.max(langcnt, langid)
-- set language register for possible \newlanguage
tex.setcount('global', lang_register, newlangid)
- -- get new lang object if needeed
+ -- get new lang object if needed
if langid ~= newlangid then
langobject = lang.new(newlangid)
end
@@ -9716,7 +9654,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%% This is an algorithm from Reingold & Dershowitz,
-%% Calendrical Calculations, The Millenium Edition
+%% Calendrical Calculations, The Millennium Edition
%%
\def\@FixedFromGregorian#1#2#3#4{%
\setcounter{tmpA}{(#1-1)*365}%
@@ -10069,36 +10007,36 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \end{macrocode}
% \iffalse
%</xgreek-fixes.def>
-%<*gloss-acadien.ldf>
+%<*gloss-acadian.ldf>
% \fi
% \clearpage
%
-% \subsection{gloss-acadien.ldf}
+% \subsection{gloss-acadian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for Canadian (Acadian) French]
% We provide this as a babel alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
% \end{macrocode}
% \iffalse
-%</gloss-acadien.ldf>
+%</gloss-acadian.ldf>
%<*gloss-aeb.ldf>
% \fi
% \clearpage
%
% \subsection{gloss-aeb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-aeb.ldf}[polyglossia: module for aeb (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -10109,13 +10047,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-af.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-af.ldf}[polyglossia: module for af (Afrikaans)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{afrikaans}
+\InheritGlossFile{afrikaans}
% \end{macrocode}
% \iffalse
@@ -10126,13 +10064,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-afb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-afb.ldf}[polyglossia: module for afb (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -10143,7 +10081,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-afrikaans.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-afrikaans.ldf}[polyglossia: module for Afrikaans]
@@ -10161,22 +10099,21 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{afrikaans}{af}
-\define@boolkey{afrikaans}[afrikaans@]{babelshorthands}[true]{}
-
+\DeclareKeys[polyglossia/gloss/afrikaans]
+ {
+ babelshorthands.if = afrikaans@babelshorthands,
+ babelshorthands.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{afrikaans}{babelshorthands=false}
+\InitializeGlossOptions{afrikaans}{babelshorthands=false}
\ifsystem@babelshorthands
- \setkeys{afrikaans}{babelshorthands=true}
+ \SetGlossOptions{afrikaans}{babelshorthands=true}
\else
- \setkeys{afrikaans}{babelshorthands=false}
+ \SetGlossOptions{afrikaans}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\afrikaans@shorthands{%
\xpg@activate@shorthands%
@@ -10248,7 +10185,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-albanian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-albanian.ldf}[polyglossia: module for Albanian]
@@ -10305,13 +10242,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-am.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-am.ldf}[polyglossia: module for am (Amharic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{amharic}
+\InheritGlossFile{amharic}
% \end{macrocode}
% \iffalse
@@ -10322,13 +10259,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-american.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-american.ldf}[polyglossia: module for American English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -10339,7 +10276,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-amharic.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-amharic.ldf}[polyglossia: module for Amharic]
\PolyglossiaSetup{amharic}{
@@ -10559,13 +10496,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-apd.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-apd.ldf}[polyglossia: module for apd (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -10576,13 +10513,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-IQ.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-IQ.ldf}[polyglossia: module for ar-IQ (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar,bcp47-region=IQ}%
@@ -10595,13 +10532,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-JO.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-JO.ldf}[polyglossia: module for ar-JO (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-JO,bcp47-language=ar,bcp47-region=JO}%
@@ -10614,13 +10551,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-LB.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-LB.ldf}[polyglossia: module for ar-LB (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-LB,bcp47-language=ar,bcp47-region=LB}%
@@ -10633,13 +10570,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-MR.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-MR.ldf}[polyglossia: module for ar-MR (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
@@ -10652,13 +10589,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-PS.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-PS.ldf}[polyglossia: module for ar-PS (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-PS,bcp47-language=ar,bcp47-region=PS}%
@@ -10671,13 +10608,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-SY.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-SY.ldf}[polyglossia: module for ar-SY (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-SY,bcp47-language=ar,bcp47-region=SY}%
@@ -10690,13 +10627,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-YE.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-YE.ldf}[polyglossia: module for ar-YE (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar,bcp47-region=YE}%
@@ -10709,13 +10646,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar.ldf}[polyglossia: module for ar (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -10726,7 +10663,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-arabic.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arabic.ldf}[polyglossia: module for Arabic]
\RequireBidi
@@ -10766,104 +10703,112 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*[locale=default]{arabic}{apd}
\setlanguagealias*[locale=mashriq]{arabic}{ar-PS}
-\define@boolkey{arabic}[arabic@]{abjadalph}[true]{}
-
\newif\ifeastern@numerals
-\define@choicekey*+{arabic}{numerals}[\xpg@val\xpg@nr]{mashriq,maghrib,eastern,western}[mashriq]{%
- \ifcase\xpg@nr\relax
- % mashriq:
- \eastern@numeralstrue%
- \or
- % maghrib:
- \eastern@numeralsfalse
- \or
- % eastern:
- \eastern@numeralstrue%
- \or
- % western:
- \eastern@numeralsfalse
- \fi
- \xpg@info{Option: Arabic, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Arabic numerals option `#1'}}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{arabic}[arabic@]{abjadjimnotail}[true]{%
- \ifarabic@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi}
-
-\define@choicekey*+{arabic}{locale}[\xpg@val\xpg@nr]{default,mashriq,libya,algeria,tunisia,morocco,mauritania}[default]{%
- \ifcase\xpg@nr\relax
- % default:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar}%
- \xpg@info{Option: arabic, locale=default}%
- \or
- % mashriq:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar}%
- \xpg@info{Option: arabic, locale=mashriq}%
- \or
- % libya:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ayl,bcp47-language=ar,bcp47-region=LY}%
- \xpg@info{Option: arabic, locale=libya}%
- \or
- % algeria:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=arq,bcp47-language=ar,bcp47-region=DZ,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=algeria}%
- \or
- % tunisia:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=aeb,bcp47-language=ar,bcp47-region=TN,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=tunisia}%
- \or
- % morocco:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=ary,bcp47-language=ar,bcp47-region=MA,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=morocco}%
- \or
- % mauritania:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
- \xpg@info{Option: arabic, locale=mauritania}%
- \fi
- \gdef\@@arabic@month{\@arabic@month{#1}}
- }{\xpg@warning{Unknown Arabic locale `#1'}}
-
\newif\if@hijrical
-\define@choicekey*+{arabic}{calendar}[\xpg@val\xpg@nr]{gregorian,hijri,islamic}[gregorian]{%
- \ifcase\xpg@nr\relax
- % gregorian:
- \@hijricalfalse
- \or
- % hijri:
- \@hijricaltrue
- \or
- % islamic:
- \@hijricaltrue
- \fi
- \xpg@info{Option: Arabic, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Arabic calendar option `#1'}}
-
-
-\define@key{arabic}{hijricorrection}[0]{%
- \gdef\arabic@hijri@correction{#1}}%
-
\newif\ifarabic@customsep\arabic@customsepfalse
-\def\xpg@sepmark{}
-\define@key{arabic}{sectionsep}[.]{%
- \arabic@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
+
+\DeclareKeys[polyglossia/gloss/arabic]
+ {
+ hijricorrection.code = \gdef\arabic@hijri@correction{#1},
+ hijricorrection.default:n = 0,
+ sectionsep.code = \gdef\xpg@sepmark{#1}\arabic@customseptrue,
+ sectionsep.default:n = .,
+ abjadalph.if = arabic@abjadalph,
+ abjadalph.default:n = true,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ numerals.choice:,
+ numerals / mashriq.code =
+ {%
+ \eastern@numeralstrue
+ },
+ numerals / maghrib.code =
+ {%
+ \eastern@numeralsfalse
+ },
+ numerals / eastern.code =
+ {%
+ \eastern@numeralstrue
+ },
+ numerals / western.code =
+ {%
+ \eastern@numeralsfalse
+ },
+ numerals.default:n = mashriq,
+ numerals/unknown.code = \xpg@warning{Unknown Arabic numerals option `#1'},
+ locale.choice:,
+ locale / default.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / mashriq.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / libya.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ayl,bcp47-language=ar,bcp47-region=LY}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / algeria.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{أ}%
+ \SetLanguageKeys{arabic}{bcp47=arq,bcp47-language=ar,bcp47-region=DZ,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / tunisia.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{أ}%
+ \SetLanguageKeys{arabic}{bcp47=aeb,bcp47-language=ar,bcp47-region=TN,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / morocco.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{أ}%
+ \SetLanguageKeys{arabic}{bcp47=ary,bcp47-language=ar,bcp47-region=MA,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / mauritania.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale.default:n = default,
+ locale/unknown.code = \xpg@warning{Unknown Arabic locale `#1'},
+ calendar.choice:,
+ calendar / gregorian.code =
+ {%
+ \@hijricalfalse
+ },
+ calendar / hijri.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar / islamic.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Arabic calendar option `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{arabic}{locale=default,calendar=gregorian,numerals=mashriq,hijricorrection=0,abjadjimnotail=false}
+\InitializeGlossOptions{arabic}{locale=default,calendar=gregorian,numerals=mashriq,hijricorrection=0,abjadjimnotail=false}
% Register alias options
-\xpg@set@alias@values{arabic}{calendar}{islamic}{hijri}
+\SetLanguageAliasValues{arabic}{calendar}{islamic,hijri}
\def\arabicgregmonth@default#1{\ifcase#1%
% Egypt, Sudan, Yemen and Golf states
@@ -10883,9 +10828,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\arabicgregmonth@mauritania#1{\ifcase#1%
\or يناير\or فبراير\or مارس\or إبريل\or مايو\or يونيو\or يوليو\or أغشت\or شتمبر\or أكتوبر\or نوفمبر\or دجمبر\fi}
-\def\@arabic@month#1{\ifcsdef{arabicgregmonth@#1}{\expandafter\csname arabicgregmonth@#1\endcsname}%
-{\xpg@warning{Option `locale=#1' is not defined for Arabic: using `default' instead}%
-\arabicgregmonth@default}}
+\def\@arabic@month#1{%
+ \@ifundefined{arabicgregmonth@#1}%
+ {\xpg@warning{Option `locale=#1' is not defined for Arabic: using `default' instead}%
+ \arabicgregmonth@default}%
+ {\expandafter\csname arabicgregmonth@#1\endcsname}%
+}
%\Hijritoday is now locale-aware and will format the date with this macro:
\DefineFormatHijriDate{arabic}{\@ensure@RTL{\arabicnumber{\value{Hijriday}}%
@@ -10917,18 +10865,18 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\datearabic{%
\def\today{%
- \if@hijrical%
+ \if@hijrical
\Hijritoday[\arabic@hijri@correction]%
\else%
- \if@RTL%
+ \if@RTL
\arabicnumber\day\space\@@arabic@month{\month}%
\space\arabicnumber\year%
\else% in LR environment we format the gregorian date within \textenglish
- \ifcsdef{english@loaded}{\textenglish{\today}}%else US format
- {\normalfontlatin\ifcase\month\or January\or February\or March\or April\or May\or June\or%
- July\or August\or September\or October\or November\or December\fi%
+ \iflanguageloaded{english}{\textenglish{\today}}%else US format
+ {\normalfontlatin\ifcase\month\or January\or February\or March\or April\or May\or June\or
+ July\or August\or September\or October\or November\or December\fi
\space\number\day,\space\number\year}%
- \fi%
+ \fi
\fi}}
% Use \providecommand here as the ldf file might
@@ -10954,10 +10902,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\or ح\or ط\or ي\or ك\or ل\or م\or ن%
\or س\or ع\or ف\or ص\or ق\or ر\or ش%
\or ت\or ث\or خ\or ذ\or ض\or ظ\or غ%
- \else\xpg@ill@value{#1}{arabic@abjad@alph}\fi%
+ \else\xpg@ill@value{#1}{arabic@abjad@alph}\fi
}
-
\def\abjadmaghribi#1{%
\ifnum#1>1999\xpg@ill@value{#1}{abjad}%
\else
@@ -10980,111 +10927,111 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%maghribi س -> ص ص -> ض ش -> س ض -> ظ ظ -> غ غ -> ش
\def\abj@maghribi@num@ii#1{%
- \ifcase#1\or ي\or ك\or ل\or م\or ن%
+ \ifcase#1\abjad@zero\or ي\or ك\or ل\or م\or ن%
\or ص\or ع\or ف\or ض\fi
- \ifnum#1=\z@\abjad@zero\fi\abj@num@i}
+ \abj@num@i}
\def\abj@maghribi@num@iii#1{%
\ifcase#1\or ق\or ر\or س\or ت\or ث%
\or خ\or ذ\or ظ\or غ\fi
- \ifnum#1=\z@\fi\abj@maghribi@num@ii}
+ \abj@maghribi@num@ii}
\def\abj@maghribi@num@iv#1{%
\ifcase#1\or ش\fi
- \ifnum#1=\z@\fi\abj@maghribi@num@iii}
+ \abj@maghribi@num@iii}
\def\arabic@numbers{%
\ifarabic@abjadalph
- \let\@alph\abjadalph%
- \let\@Alph\abjadalph%
+ \let\@alph\abjadalph
+ \let\@Alph\abjadalph
\else
- \let\@alph\abjad%
- \let\@Alph\abjad%
+ \let\@alph\abjad
+ \let\@Alph\abjad
\fi
}
\def\noarabic@numbers{%
- \let\@alph\latin@alph%
- \let\@Alph\latin@Alph%
+ \let\@alph\latin@alph
+ \let\@Alph\latin@Alph
}
% Store original definition
\let\xpg@save@arabic\@arabic
\def\arabic@globalnumbers{%
- \let\@arabic\arabicnumber%
+ \let\@arabic\arabicnumber
\renewcommand\thefootnote{\localnumeral*{footnote}}%
\renewcommand\theequation{\localnumeral*{equation}}%
}
\def\noarabic@globalnumbers{%
- \let\@arabic\xpg@save@arabic%
+ \let\@arabic\xpg@save@arabic
}
\def\arabic@xetex@capsformat{%
- \let\xpg@save@sepmark\@SepMark%
+ \let\xpg@save@sepmark\@SepMark
\SepMark{\xpg@sepmark}
}
\def\noarabic@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi
}
\def\arabic@luatex@capsformat{%
%
% change chapter and part headings
\ifarabic@customsep
- \ifcsdef{chapter}{%
- \let\xpg@save@thesection\thesection%
+ \ifcsname chapter\endcsname
+ \let\xpg@save@thesection\thesection
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
- \let\xpg@save@theequation\theequation%
+ \let\xpg@save@theequation\theequation
\renewcommand*\theequation{%
\ifnum \c@chapter>\z@ \thechapter\xpg@sepmark\fi\@arabic\c@equation}
- \let\xpg@save@thefigure\thefigure%
+ \let\xpg@save@thefigure\thefigure
\renewcommand*\thefigure{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@figure}
- \let\xpg@save@thetable\thetable%
+ \let\xpg@save@thetable\thetable
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
- \let\xpg@save@thesubsection\thesubsection%
+ \fi
+ \let\xpg@save@thesubsection\thesubsection
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
- \let\xpg@save@thesubsubsection\thesubsubsection%
+ \let\xpg@save@thesubsubsection\thesubsubsection
\renewcommand\thesubsubsection{\thesubsection\xpg@sepmark\@arabic\c@subsubsection}
- \let\xpg@save@theparagraph\theparagraph%
+ \let\xpg@save@theparagraph\theparagraph
\renewcommand\theparagraph
{\thesubsubsection\xpg@sepmark\@arabic\c@paragraph}
- \let\xpg@save@thesubparagraph\thesubparagraph%
+ \let\xpg@save@thesubparagraph\thesubparagraph
\renewcommand\thesubparagraph{\theparagraph\xpg@sepmark\@arabic\c@subparagraph}
- \fi% (end \ifarabic@customsep)
+ \fi % (end \ifarabic@customsep)
}
\def\noarabic@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
- \let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
- \let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
- \let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
- \let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
- \let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
- \let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
- \let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
- \let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \ifcsname xpg@save@thesection\endcsname
+ \let\thesection\xpg@save@thesection
+ \fi
+ \ifcsname xpg@save@theequation\endcsname
+ \let\theequation\xpg@save@theequation
+ \fi
+ \ifcsname xpg@save@thefigure\endcsname
+ \let\thefigure\xpg@save@thefigure
+ \fi
+ \ifcsname xpg@save@thetable\endcsname
+ \let\thetable\xpg@save@thetable
+ \fi
+ \ifcsname xpg@save@thesubsection\endcsname
+ \let\thesubsection\xpg@save@thesubsection
+ \ifcsname xpg@save@thesubsubsection\endcsname
+ \let\thesubsubsection\xpg@save@thesubsubsection
+ \fi
+ \fi
+ \ifcsname xpg@save@theparagraph\endcsname
+ \let\theparagraph\xpg@save@theparagraph
+ \fi
+ \ifcsname xpg@save@thesubparagraph\endcsname
+ \let\thesubparagraph\xpg@save@thesubparagraph
+ \fi
}
\def\blockextras@arabic{%
@@ -11096,7 +11043,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\fi
\fi
}
-%
+
\def\noextras@arabic{%
\ifarabic@customsep
\ifxetex
@@ -11116,7 +11063,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-armenian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-armenian.ldf}[polyglossia: module for Armenian]
@@ -11139,43 +11086,49 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@eastern@armenian
\@eastern@armenianfalse
-\define@choicekey*+{armenian}{variant}[\xpg@val\xpg@nr]{western,eastern}[western]{%
- \ifcase\xpg@nr\relax
- % western:
- \@eastern@armenianfalse%
- \or
- % eastern:
- \@eastern@armeniantrue%
- \fi
- \xpg@info{Option: Armenian, variant=\xpg@val}%
-}{\xpg@warning{Unknown Armenian variant `#1'}}
\newif\if@armenian@numerals
\@armenian@numeralsfalse
-\define@key{armenian}{numerals}[armenian]{%
- \ifstrequal{#1}{arabic}{%
- \@armenian@numeralsfalse%
- \SetLanguageKeys{armenian}{bcp47-extension-u=nu-latn}%
- }{%
- \@armenian@numeralstrue%
- \SetLanguageKeys{armenian}{bcp47-extension-u={}}%
- }%
-}
-\define@boolkey{armenian}[armenian@]{capitalyiwn}[true]{%
- \ifarmenian@capitalyiwn
- % MakeUppercase capitalizes the ligature of letters ech and yiwn (U+0587)
- % to capital ech and yiwn (also the output if Armenian is not selected at all)
- \SetLanguageKeys{armenian}{bcp47-casing=hy-x-yiwn,bcp47-extension-x=yiwn}
- \else
- % Capitalize ech and yiwn ligature to capital ech and vew,
- % following Armenian spelling reform
- \SetLanguageKeys{armenian}{bcp47-casing=hy,bcp47-extension-x={}}
- \fi
-}
+\DeclareKeys[polyglossia/gloss/armenian]
+ {
+ variant.choice:,
+ variant / western.code =
+ {%
+ \@eastern@armenianfalse
+ },
+ variant / eastern.code =
+ {%
+ \@eastern@armeniantrue
+ },
+ variant.default:n = western,
+ variant/unknown.code = \xpg@warning{Unknown Armenian variant `#1'},
+ numerals.choice:,
+ numerals / armenian.code =
+ {%
+ \@armenian@numeralstrue
+ \SetLanguageKeys{armenian}{bcp47-extension-u={}}%
+ },
+ numerals / arabic.code =
+ {%
+ \@armenian@numeralsfalse
+ \SetLanguageKeys{armenian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = armenian,
+ capitalyiwn.choice:,
+ capitalyiwn / true.code =
+ {%
+ \SetLanguageKeys{armenian}{bcp47-casing=hy-x-yiwn,bcp47-extension-x=yiwn}%
+ },
+ capitalyiwn / false.code =
+ {%
+ \SetLanguageKeys{armenian}{bcp47-casing=hy,bcp47-extension-x={}}%
+ },
+ capitalyiwn.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{armenian}{numerals=armenian,variant=western}
+\InitializeGlossOptions{armenian}{numerals=armenian,variant=western}
% Taken from ArmTeX. Audit!
\def\captionsarmenian{%
@@ -11324,13 +11277,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-arq.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arq.ldf}[polyglossia: module for arq (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -11341,13 +11294,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ary.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ary.ldf}[polyglossia: module for ary (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -11358,13 +11311,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-arz.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arz.ldf}[polyglossia: module for arz (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -11375,13 +11328,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ast.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ast.ldf}[polyglossia: module for ast (Asturian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{asturian}
+\InheritGlossFile{asturian}
% \end{macrocode}
% \iffalse
@@ -11392,7 +11345,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-asturian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translated by Xuacu <xuacusk8 at gmail dot com>
% Contributed by Kevin Godby <godbyk at gmail dot com>
@@ -11452,13 +11405,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-australian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-australian.ldf}[polyglossia: module for Australian English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -11469,13 +11422,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-austrian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-austrian.ldf}[polyglossia: module for Austrian German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -11486,13 +11439,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ayl.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ayl.ldf}[polyglossia: module for ayl (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
% \end{macrocode}
% \iffalse
@@ -11503,13 +11456,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bahasa.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasa.ldf}[polyglossia: module for Bahasa Indonesia]
% We provide this as a babel alias
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
% \end{macrocode}
% \iffalse
@@ -11520,14 +11473,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bahasai.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasai.ldf}[polyglossia: module for Bahasa Indonesia]
% We only provide this gloss for babel compatibility. Since bahasai is
% a malay variety, we use 'malay' with variant 'indonesian' now.
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
% \end{macrocode}
% \iffalse
@@ -11538,14 +11491,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bahasam.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasam.ldf}[polyglossia: module for Bahasa Melayu]
% We only provide this gloss for babel compatibility. Since bahasam is
% a malay variety, we use 'malay' with variant 'malaysian' now.
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
% \end{macrocode}
% \iffalse
@@ -11556,7 +11509,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-basque.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-basque.ldf}[polyglossia: module for Basque]
\PolyglossiaSetup{basque}{
@@ -11614,13 +11567,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-be-tarask.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-be-tarask.ldf}[polyglossia: module for be-tarask (Belarusian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{belarusian}
+\InheritGlossFile{belarusian}
% \end{macrocode}
% \iffalse
@@ -11631,13 +11584,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-be.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-be.ldf}[polyglossia: module for be (Belarusian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{belarusian}
+\InheritGlossFile{belarusian}
% \end{macrocode}
% \iffalse
@@ -11648,7 +11601,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-belarusian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-belarusian.ldf}[polyglossia: module for Belarusian]
@@ -11676,63 +11629,68 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*{belarusian}{be}
\def\belarusian@spelling{modern}
-\define@choicekey*+{belarusian}{spelling}[\xpg@val\xpg@nr]{modern,classic,tarask}[modern]{%
- \ifcase\xpg@nr\relax
- % modern:
- \def\belarusian@spelling{modern}%
- \SetLanguageKeys{belarusian}{bcp47=be,bcp47-variant=1959acad}%
- \or
- % classic:
- \def\belarusian@spelling{tarask}%
- \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
- \or
- % tarask:
- \def\belarusian@spelling{tarask}%
- \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
- \fi
-}{\xpg@warning{Unknown Belarusian spelling `#1'}}
-
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{belarusian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \fi
- \xpg@info{Option: Belarusian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Belarusian numerals value `#1'}}
-\define@boolkey{belarusian}[belarusian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/belarusian]
+ {
+ babelshorthands.if = belarusian@babelshorthands,
+ babelshorthands.default:n = true,
+ spelling.choice:,
+ spelling / modern.code =
+ {%
+ \def\belarusian@spelling{modern}%
+ \SetLanguageKeys{belarusian}{bcp47=be,bcp47-variant=1959acad}%
+ },
+ spelling / classic.code =
+ {%
+ \def\belarusian@spelling{tarask}%
+ \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
+ },
+ spelling / tarask.code =
+ {%
+ \def\belarusian@spelling{tarask}%
+ \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
+ },
+ spelling.default:n = modern,
+ spelling/unknown.code = \xpg@warning{Unknown Belarusian spelling `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Belarusian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{belarusian}{babelshorthands=false,numerals=arabic,spelling=modern}
+\InitializeGlossOptions{belarusian}{babelshorthands=false,numerals=arabic,spelling=modern}
% Register alias options
-\xpg@set@alias@values{belarusian}{spelling}{classic}{tarask}
+\SetLanguageAliasValues{belarusian}{spelling}{classic,tarask}
\ifsystem@babelshorthands
- \setkeys{belarusian}{babelshorthands=true}
+ \SetGlossOptions{belarusian}{babelshorthands=true}
\else
- \setkeys{belarusian}{babelshorthands=false}
+ \SetGlossOptions{belarusian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\belarusian@shorthands{%
\xpg@activate@shorthands%
@@ -11976,7 +11934,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bengali.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by সাজেদুর রহিম জোয়ারদার <toshazed@gmail.com>
% TODO implement Bengali calendar
@@ -12005,30 +11963,36 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\ifbengali@devanagari@numerals
\newif\ifbengali@bengali@numerals
-\define@choicekey*+{bengali}{numerals}[\xpg@val\xpg@nr]{Devanagari,Bengali,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \bengali@bengali@numeralsfalse%
- \bengali@devanagari@numeralstrue%
- \or
- % Bengali:
- \bengali@bengali@numeralstrue%
- \bengali@devanagari@numeralsfalse%
- \or
- % Western:
- \bengali@bengali@numeralsfalse%
- \bengali@devanagari@numeralsfalse%
- \fi
- \xpg@info{Option: Bengali, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Bengali numeral `#1'}}
\def\extras@bengali{}
\def\noextras@bengali{}
-\define@boolkey{bengali}[bengali@]{changecounternumbering}[true]{}
+\DeclareKeys[polyglossia/gloss/bengali]
+ {
+ changecounternumbering.if = bengali@changecounternumbering,
+ changecounternumbering.default:n = true,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \bengali@bengali@numeralsfalse
+ \bengali@devanagari@numeralstrue
+ },
+ numerals / bengali.code =
+ {%
+ \bengali@bengali@numeralstrue
+ \bengali@devanagari@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \bengali@bengali@numeralsfalse
+ \bengali@devanagari@numeralsfalse
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Bengali numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{bengali}{changecounternumbering=false,numerals=Devanagari}
+\InitializeGlossOptions{bengali}{changecounternumbering=false,numerals=Devanagari}
\def\captionsbengali{%
\def\refname{তথ্যসূত্রসমূহ}%
@@ -12117,13 +12081,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bg.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bg.ldf}[polyglossia: module for bg (Bulgarian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bulgarian}
+\InheritGlossFile{bulgarian}
% \end{macrocode}
% \iffalse
@@ -12134,13 +12098,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bn.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bn.ldf}[polyglossia: module for bn (Bengali)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bengali}
+\InheritGlossFile{bengali}
% \end{macrocode}
% \iffalse
@@ -12151,13 +12115,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bo.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bo.ldf}[polyglossia: module for bo (Tibetan)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{tibetan}
+\InheritGlossFile{tibetan}
% \end{macrocode}
% \iffalse
@@ -12168,7 +12132,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bosnian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bosnian.ldf}[polyglossia: module for Bosnian]
@@ -12232,13 +12196,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-br.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-br.ldf}[polyglossia: module for br (Breton)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{breton}
+\InheritGlossFile{breton}
% \end{macrocode}
% \iffalse
@@ -12249,7 +12213,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-brazil.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for Brazilian Portuguese]
@@ -12257,7 +12221,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% 'brazil' was selected in accordance with babel.
% Since brazil is a variety of portuguese, we use 'portuguese' now.
-\xpg@load@master@language{portuguese}
+\InheritGlossFile{portuguese}
% \end{macrocode}
% \iffalse
@@ -12268,7 +12232,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-breton.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-breton.ldf}[polyglossia: module for Breton]
\PolyglossiaSetup{breton}{
@@ -12376,13 +12340,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-british.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-british.ldf}[polyglossia: module for British English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -12393,13 +12357,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bs.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bs.ldf}[polyglossia: module for bs (Bosnian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bosnian}
+\InheritGlossFile{bosnian}
% \end{macrocode}
% \iffalse
@@ -12410,7 +12374,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bulgarian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bulgarian.ldf}[polyglossia: module for Bulgarian]
\PolyglossiaSetup{bulgarian}{
@@ -12473,15 +12437,15 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\figurename{Фигура}%
\def\tablename{Таблица}%
%\def\thepart{}%
- %\def\partname{}%
+ \def\partname{Част}%
\def\pagename{Стр.}%
\def\seename{вж.}%
\def\alsoname{вж.\ също и}%
\def\enclname{Приложения}%
\def\ccname{копия}%
- %\def\headtoname{}%
- \def\proofname{Proof}%
- \def\glossaryname{Glossary}%
+ \def\headtoname{За}%
+ \def\proofname{Доказателство}%
+ \def\glossaryname{Притурка}%
}
\def\datebulgarian{%
@@ -12512,13 +12476,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ca.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ca.ldf}[polyglossia: module for ca (Catalan)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{catalan}
+\InheritGlossFile{catalan}
% \end{macrocode}
% \iffalse
@@ -12529,13 +12493,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-canadian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-canadian.ldf}[polyglossia: module for Canadian English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -12546,13 +12510,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-canadien.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-canadien.ldf}[polyglossia: module for Canadian French]
% We provide this as a babel alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
% \end{macrocode}
% \iffalse
@@ -12563,7 +12527,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-catalan.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-catalan.ldf}[polyglossia: module for Catalan]
\PolyglossiaSetup{catalan}{
@@ -12581,21 +12545,21 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{catalan}{ca}
-\define@boolkey{catalan}[catalan@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/catalan]
+ {
+ babelshorthands.if = catalan@babelshorthands,
+ babelshorthands.default:n = true,
+ }
\ifsystem@babelshorthands
- \setkeys{catalan}{babelshorthands=true}
+ \SetGlossOptions{catalan}{babelshorthands=true}
\else
- \setkeys{catalan}{babelshorthands=false}
+ \SetGlossOptions{catalan}{babelshorthands=false}
\fi
% Register default options
-\xpg@initialize@gloss@options{catalan}{babelshorthands=false}
+\InitializeGlossOptions{catalan}{babelshorthands=false}
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
%%% adapted from Babel's catalan.ldf
\newdimen\leftllkern \newdimen\rightllkern \newdimen\raiselldim
@@ -12732,7 +12696,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-chinese.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-chinese.ldf}[polyglossia: module for Chinese]
@@ -12756,51 +12720,60 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*[variant=simplified]{chinese}{zh-CN}
\setlanguagealias*[variant=traditional]{chinese}{zh-TW}
-\providebool{chinese@traditional}
+\@ifundefined{ifchinese@traditional}%
+ {\newif\ifchinese@traditional}{}
-\def\chinese@variant{chinese}
-
-\newif\ifchinese@numerals
-\define@key{chinese}{numerals}[arabic]{%
- \ifstrequal{#1}{chinese}%
- {\chinese@numeralstrue%
- \SetLanguageKeys{chinese}{bcp47-extension-u=nu-hant}%
- }{\chinese@numeralsfalse%
- \SetLanguageKeys{chinese}{bcp47-extension-u=nu-latn}%
- }%
-}
+\@ifundefined{ifchinese@numerals}%
+ {\newif\ifchinese@numerals}{}
+\def\chinese@variant{chinese}
-\define@choicekey*+{chinese}{variant}[\xpg@val\xpg@nr]{cn,simplified,tw,traditional}[cn]{%
- \ifcase\xpg@nr\relax
- % cn:
- \chinese@traditionalfalse
- \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
- \xpg@info{Option: Chinese, variant=simplified}%
- \or
- % simplified:
- \chinese@traditionalfalse
- \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
- \xpg@info{Option: Chinese, variant=simplified}%
- \or
- % tw:
- \chinese@traditionaltrue
- \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
- \xpg@info{Option: Chinese, variant=traditional}%
- \or
- % traditional:
- \chinese@traditionaltrue
- \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
- \xpg@info{Option: Chinese, variant=traditional}%
- \fi
-}{\xpg@warning{Unknown Chinese variant `#1'}}
+\DeclareKeys[polyglossia/gloss/chinese]
+ {
+ variant.choice:,
+ variant / cn.code =
+ {%
+ \chinese@traditionalfalse
+ \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
+ },
+ variant / simplified.code =
+ {%
+ \chinese@traditionalfalse
+ \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
+ },
+ variant / tw.code =
+ {%
+ \chinese@traditionaltrue
+ \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
+ },
+ variant / traditional.code =
+ {%
+ \chinese@traditionaltrue
+ \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
+ },
+ variant.default:n = cn,
+ variant/unknown.code = \xpg@warning{Unknown Chinese variant `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \chinese@numeralsfalse
+ \SetLanguageKeys{chinese}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / chinese.code =
+ {%
+ \chinese@numeralstrue
+ \SetLanguageKeys{chinese}{bcp47-extension-u=nu-hant}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Chinese numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{chinese}{variant=cn,numerals=arabic}
-%\xpg@initialize@gloss@options{chinese}{variant=tw,numerals=arabic}
+\InitializeGlossOptions{chinese}{variant=cn,numerals=arabic}
+%\InitializeGlossOptions{chinese}{variant=tw,numerals=arabic}
% Register alias options
-\xpg@set@alias@values{chinese}{variant}{cn}{simplified}
-\xpg@set@alias@values{chinese}{variant}{tw}{traditional}
+\SetLanguageAliasValues{chinese}{variant}{cn,simplified}
+\SetLanguageAliasValues{chinese}{variant}{tw,traditional}
\def\chinese@capsformat{%
@@ -12852,7 +12825,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\enclname{附件}%
\def\ccname{抄送}%
\def\headtoname{收件人}%
- \def\\glossaryname{詞彙表}%
+ \def\glossaryname{詞彙表}%
}
\def\captions@chinese@simplified{%
\def\contentsname{目录}%
@@ -12875,7 +12848,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\enclname{附件}%
\def\ccname{抄送}%
\def\headtoname{收件人}%
- \def\\glossaryname{词汇表}%
+ \def\glossaryname{词汇表}%
}
\newcount\c@TempJNum%
@@ -13023,13 +12996,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ckb-Arab.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb-Arab.ldf}[polyglossia: module for ckb-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -13040,13 +13013,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ckb-Latn.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb-Latn.ldf}[polyglossia: module for ckb-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -13057,30 +13030,47 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ckb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb.ldf}[polyglossia: module for ckb (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
%</gloss-ckb.ldf>
+%<*gloss-classiclatin.ldf>
+% \fi
+% \clearpage
+%
+% \subsection{gloss-classiclatin.ldf}
+% \begin{macrocode}
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-classiclatin.ldf}[polyglossia: module for classic Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+% \end{macrocode}
+% \iffalse
+%</gloss-classiclatin.ldf>
%<*gloss-cop.ldf>
% \fi
% \clearpage
%
% \subsection{gloss-cop.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cop.ldf}[polyglossia: module for cop (Coptic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{coptic}
+\InheritGlossFile{coptic}
% \end{macrocode}
% \iffalse
@@ -13091,7 +13081,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-coptic.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-coptic.ldf}[polyglossia: module for Coptic]
\PolyglossiaSetup{coptic}{
@@ -13147,7 +13137,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-croatian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-croatian.ldf}[polyglossia: module for Croatian]
\PolyglossiaSetup{croatian}{
@@ -13169,40 +13159,40 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\RequirePackage{luavlna}
\fi
-\define@boolkey{croatian}[croatian@]{babelshorthands}[true]{}
-
-\define@boolkey{croatian}[croatian@]{disabledigraphs}[true]{}
-
-% Alias kept for backwards compatibility. Please do not remove
-\define@boolkey{croatian}[croatian@]{disableligatures}[true]{%
- \xpg@warning{The option disableligatures is deprected.\MessageBreak
- Please use disabledigraphs instead}%
- \ifcroatian@disableligatures
- \croatian@disabledigraphstrue
- \else
- \croatian@disabledigraphsfalse
- \fi
-}
-
-\define@boolkey{croatian}[croatian@]{splithyphens}[true]{}
-
-\define@boolkey{croatian}[croatian@]{localalph}[true]{}
+\DeclareKeys[polyglossia/gloss/croatian]
+ {
+ babelshorthands.if = croatian@babelshorthands,
+ babelshorthands.default:n = true,
+ disabledigraphs.if = croatian@disabledigraphs,
+ disabledigraphs.default:n = true,
+ splithyphens.if = croatian@splithyphens,
+ splithyphens.default:n = true,
+ localalph.if = croatian@localalph,
+ localalph.default:n = true,
+ disableligatures.choices:nn = { true, false }
+ {%
+ \xpg@warning{The option disableligatures is deprecated.\MessageBreak
+ Please use disabledigraphs instead}%
+ \ifcase\UseName{l_keys_choice_int}\or
+ \croatian@disabledigraphstrue
+ \or
+ \croatian@disabledigraphsfalse
+ \fi
+ },
+ disableligatures.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{croatian}{babelshorthands=false,disabledigraphs=false,
+\InitializeGlossOptions{croatian}{babelshorthands=false,disabledigraphs=false,
splithyphens=true,localalph=true}
\ifsystem@babelshorthands
- \setkeys{croatian}{babelshorthands=true}
+ \SetGlossOptions{croatian}{babelshorthands=true}
\else
- \setkeys{croatian}{babelshorthands=false}
+ \SetGlossOptions{croatian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\croatian@@splhyphen#1{%
@@ -13423,13 +13413,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-cy.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cy.ldf}[polyglossia: module for cy (Welsh)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{welsh}
+\InheritGlossFile{welsh}
% \end{macrocode}
% \iffalse
@@ -13440,13 +13430,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-cz.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cz.ldf}[polyglossia: module for cz (Czech)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{czech}
+\InheritGlossFile{czech}
% \end{macrocode}
% \iffalse
@@ -13457,7 +13447,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-czech.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-czech.ldf}[polyglossia: module for Czech]
@@ -13480,26 +13470,26 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\RequirePackage{luavlna}
\fi
-\define@boolkey{czech}[czech@]{babelshorthands}[true]{}
-
-\define@boolkey{czech}[czech@]{splithyphens}[true]{}
-
-\define@boolkey{czech}[czech@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/czech]
+ {
+ babelshorthands.if = czech@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = czech@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = czech@vlna,
+ vlna.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{czech}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{czech}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{czech}{babelshorthands=true}
+ \SetGlossOptions{czech}{babelshorthands=true}
\else
- \setkeys{czech}{babelshorthands=false}
+ \SetGlossOptions{czech}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\czech@@splithyphen#1{%
\def\czech@sh@tmp{%
@@ -13716,13 +13706,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-da.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-da.ldf}[polyglossia: module for da (Danish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{danish}
+\InheritGlossFile{danish}
% \end{macrocode}
% \iffalse
@@ -13733,7 +13723,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-danish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-danish.ldf}[polyglossia: module for Danish]
\PolyglossiaSetup{danish}{
@@ -13790,13 +13780,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-AT-1901.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1901.ldf}[polyglossia: module for de-AT-1901 (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13807,13 +13797,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-AT-1996.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1996.ldf}[polyglossia: module for de-AT-1996 (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13824,13 +13814,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-AT.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT.ldf}[polyglossia: module for de-AT (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13841,13 +13831,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-CH-1901.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1901.ldf}[polyglossia: module for de-CH-1901 (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13858,13 +13848,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-CH-1996.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1996.ldf}[polyglossia: module for de-CH-1996 (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13875,13 +13865,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-CH.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH.ldf}[polyglossia: module for de-CH (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13892,13 +13882,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-DE-1901.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1901.ldf}[polyglossia: module for de-DE-1901 (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13909,13 +13899,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-DE-1996.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1996.ldf}[polyglossia: module for de-DE-1996 (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13926,13 +13916,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-DE.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE.ldf}[polyglossia: module for de-DE (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13943,13 +13933,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-AT-1901.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1901-Latf.ldf}[polyglossia: module for de-AT-1901-Latf (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13960,13 +13950,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-AT-1996.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1996-Latf.ldf}[polyglossia: module for de-AT-1996-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13977,13 +13967,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-AT.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-Latf.ldf}[polyglossia: module for de-AT-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -13994,13 +13984,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-CH-1901.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1901-Latf.ldf}[polyglossia: module for de-CH-1901-Latf (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14011,13 +14001,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-CH-1996.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1996-Latf.ldf}[polyglossia: module for de-CH-1996-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14028,13 +14018,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-CH.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-Latf.ldf}[polyglossia: module for de-CH-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14045,13 +14035,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-DE-1901.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1901-Latf.ldf}[polyglossia: module for de-DE-1901-Latf (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14062,13 +14052,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-DE-1996.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1996-Latf.ldf}[polyglossia: module for de-DE-1996-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14079,13 +14069,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-DE.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-Latf.ldf}[polyglossia: module for de-DE-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14096,13 +14086,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-Latf.ldf}[polyglossia: module for de-Latf (German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14113,13 +14103,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de.ldf}[polyglossia: module for de (German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -14130,7 +14120,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-divehi.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-divehi.ldf}[polyglossia: module for Divehi]
@@ -14185,13 +14175,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-dsb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dsb.ldf}[polyglossia: module for dsb (Sorbian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
% \end{macrocode}
% \iffalse
@@ -14202,7 +14192,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-dutch.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dutch.ldf}[polyglossia: module for Dutch]
\PolyglossiaSetup{dutch}{
@@ -14219,24 +14209,24 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{dutch}{nl}
-\define@boolkey{dutch}[dutch@]{babelshorthands}[true]{}
-
-\define@boolkey{dutch}[dutch@]{tremahyphenation}[true]{}
+\DeclareKeys[polyglossia/gloss/dutch]
+ {
+ babelshorthands.if = dutch@babelshorthands,
+ babelshorthands.default:n = true,
+ tremahyphenation.if = dutch@tremahyphenation,
+ tremahyphenation.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{dutch}{babelshorthands=false,tremahyphenation=true}
+\InitializeGlossOptions{dutch}{babelshorthands=false,tremahyphenation=true}
\ifsystem@babelshorthands
- \setkeys{dutch}{babelshorthands=true}
+ \SetGlossOptions{dutch}{babelshorthands=true}
\else
- \setkeys{dutch}{babelshorthands=false}
+ \SetGlossOptions{dutch}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\xpg@trema#1{\allowhyphens\discretionary{-}{#1}{\"{#1}}\allowhyphens}
@@ -14412,30 +14402,47 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-dv.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dv.ldf}[polyglossia: module for dv (Divehi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{divehi}
+\InheritGlossFile{divehi}
% \end{macrocode}
% \iffalse
%</gloss-dv.ldf>
+%<*gloss-ecclesiasticlatin.ldf>
+% \fi
+% \clearpage
+%
+% \subsection{gloss-ecclesiasticlatin.ldf}
+% \begin{macrocode}
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-ecclesiasticlatin.ldf}[polyglossia: module for ecclesiastic Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+% \end{macrocode}
+% \iffalse
+%</gloss-ecclesiasticlatin.ldf>
%<*gloss-el-monoton.ldf>
% \fi
% \clearpage
%
% \subsection{gloss-el-monoton.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el-monoton.ldf}[polyglossia: module for el-monoton (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
% \end{macrocode}
% \iffalse
@@ -14446,13 +14453,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-el-polyton.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el-polyton.ldf}[polyglossia: module for el-polyton (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
% \end{macrocode}
% \iffalse
@@ -14463,13 +14470,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-el.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el.ldf}[polyglossia: module for el (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
% \end{macrocode}
% \iffalse
@@ -14480,13 +14487,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-AU.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-AU.ldf}[polyglossia: module for en-AU (Australian English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -14497,13 +14504,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-CA.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
-\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadan English)]
+\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadian English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -14514,13 +14521,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-GB.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-GB.ldf}[polyglossia: module for en-GB (British English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -14531,13 +14538,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-NZ.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-NZ.ldf}[polyglossia: module for en-NZ (Newzealand English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -14548,13 +14555,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-US.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-US.ldf}[polyglossia: module for en-US (American English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -14565,13 +14572,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en.ldf}[polyglossia: module for en (English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -14582,7 +14589,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-english.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-english.ldf}[polyglossia: module for English]
@@ -14614,9 +14621,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias[variant=canadian]{english}{canadian}
\setlanguagealias[variant=newzealand]{english}{newzealand}
-\providebool{british@hyphen}
-\providebool{english@ordinalmonthday}
-\providebool{british@dateformat}
+\@ifundefined{ifbritish@hyphen}%
+ {\newif\ifbritish@hyphen}{}
+\@ifundefined{ifenglish@ordinalmonthday}%
+ {\newif\ifenglish@ordinalmonthday}{}
+\@ifundefined{ifbritish@dateformat}%
+ {\newif\ifbritish@dateformat}{}
% US English (\l@english) is default
% Initialize its settings
@@ -14625,49 +14635,46 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\english@ordinalmonthdayfalse
\british@dateformatfalse
-% Option ordinalmonthday
-\define@boolkey{english}[english@]{ordinalmonthday}[true]{}
-
-\define@choicekey*+{english}{variant}[\xpg@val\xpg@nr]{uk,british,us,american,usmax,australian,newzealand,canadian}[us]{%
- \ifcase\xpg@nr\relax
+\DeclareKeys[polyglossia/gloss/english]
+ {
+ ordinalmonthday.if = english@ordinalmonthday,
+ ordinalmonthday.default:n = true,
+ variant.choices:nn = { uk, british, us, american, usmax, australian, newzealand, canadian }
+ {%
+ \ifcase\UseName{l_keys_choice_int}\or
% uk:
\british@hyphentrue
\british@dateformattrue
\english@ordinalmonthdaytrue
\SetLanguageKeys{english}{babelname=british,bcp47=en-GB,bcp47-language=en,bcp47-region=GB}%
- \xpg@info{Option: English, variant=british}%
\or
% british:
\british@hyphentrue
\british@dateformattrue
\english@ordinalmonthdaytrue
\SetLanguageKeys{english}{babelname=british,bcp47=en-GB,bcp47-language=en,bcp47-region=GB}%
- \xpg@info{Option: english variant=british}%
\or
% us:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: English, variant=american}%
\or
% american:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: English, variant=american}%
\or
% usmax:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: english variant=american (with additional patterns)}%
- \xpg@ifdefined{usenglishmax}{}%
+ \IfLanguageDefinedF{usenglishmax}%
{\xpg@warning{No hyphenation patterns were loaded for "US English Max"\MessageBreak
I will use the standard patterns for US English instead}%
- \adddialect\l@usenglishmax\l@english\relax%
+ \adddialect\l@usenglishmax\l@english
}%
\def\english@variant{usenglishmax}%
\or
@@ -14678,8 +14685,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\british@dateformattrue
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=australian,bcp47=en-AU,bcp47-language=en,bcp47-region=AU}%
- \xpg@info{Option: English, variant=australian}%
- \adddialect\l@australian\l@english%
+ \adddialect\l@australian\l@english
\or
% newzealand:
% These use the british hyphenation patterns
@@ -14688,8 +14694,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\british@dateformattrue
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=newzealand,bcp47=en-NZ,bcp47-language=en,bcp47-region=NZ}%
- \xpg@info{Option: English, variant=newzealand}%
- \adddialect\l@newzealand\l@english%
+ \adddialect\l@newzealand\l@english
\or
% canadian:
% This is currently equivalent to usenglish (as in babel)
@@ -14697,45 +14702,35 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=canadian,bcp47=en-CA,bcp47-language=en,bcp47-region=CA}%
- \xpg@info{Option: English, variant=american}%
- \adddialect\l@canadian\l@english%
+ \adddialect\l@canadian\l@english
\fi
\ifbritish@hyphen
- \xpg@ifdefined{ukenglish}{}%
+ \IfLanguageDefinedF{ukenglish}%
{\xpg@warning{No hyphenation patterns were loaded for British English\MessageBreak
I will use the patterns for US English instead}%
- \adddialect\l@ukenglish\l@english\relax%
+ \adddialect\l@ukenglish\l@english
}%
\def\english@variant{ukenglish}%
\fi
-}{\xpg@warning{Unknown English variant `#1'}}
+ },
+ variant.default:n = us,
+ variant/unknown.code = \xpg@warning{Unknown English variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{english}{variant=us,ordinalmonthday=false}
+\InitializeGlossOptions{english}{variant=us,ordinalmonthday=false}
% Register alias options
-\xpg@set@alias@values{english}{variant}{us}{american}
-\xpg@set@alias@values{english}{variant}{uk}{british}
+\SetLanguageAliasValues{english}{variant}{us,american}
+\SetLanguageAliasValues{english}{variant}{uk,british}
\ifxetex
% Check if \l@english is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{english}{}{%
- \def\do##1{%
- \xpg@ifdefined{#1}%
- {\csletcs{l@english}{l@#1}\listbreak}%
- {%
- \xpg@warning{No hyphenation patterns for English found"\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@english0
- }%
- }%
- \docsvlist{british, american, usenglishmax, australian, newzealand}
- \xpg@ifdefined{english}{}{}
- }%
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{english}{british, american, usenglishmax, australian, newzealand}
\fi
\def\english@language{%
- \polyglossia@setup@language@patterns{\english@variant}%
+ \SetupPolyglossiaLangPatterns{\english@variant}%
}%
\def\captionsenglish{%
@@ -14793,13 +14788,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-eo.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-eo.ldf}[polyglossia: module for eo (Esperanto)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{esperanto}
+\InheritGlossFile{esperanto}
% \end{macrocode}
% \iffalse
@@ -14810,13 +14805,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-es-ES.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es-ES.ldf}[polyglossia: module for es-ES (Spain's Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
% \end{macrocode}
% \iffalse
@@ -14827,13 +14822,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-es-MX.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es-MX.ldf}[polyglossia: module for es-MX (Mexican Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
% \end{macrocode}
% \iffalse
@@ -14844,13 +14839,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-es.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es.ldf}[polyglossia: module for es (Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
% \end{macrocode}
% \iffalse
@@ -14861,7 +14856,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-esperanto.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-esperanto.ldf}[polyglossia: module for Esperanto]
\PolyglossiaSetup{esperanto}{
@@ -14892,10 +14887,10 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\figurename{Figuro}%
\def\tablename{Tabelo}%
%\def\thepart{}%
- %\def\partname{}%
+ \def\partname{Parto}%
\def\pagename{Paĝo}%
\def\seename{vidu}%
- \def\alsoname{Parto}%
+ \def\alsoname{vidu ankaŭ}%
\def\enclname{Aldono(j)}%
\def\ccname{Kopie al}%
\def\headtoname{Al}%
@@ -14941,7 +14936,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-estonian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-estonian.ldf}[polyglossia: module for Estonian]
\PolyglossiaSetup{estonian}{
@@ -14981,7 +14976,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\ccname{Koopia(d)}%
%\def\headtoname{}%
\def\proofname{Korrektuur}%
- \def\glossaryname{Glossary}% <-- need translation
+ \def\glossaryname{Sõnastik}%
}
\def\dateestonian{%
\def\today{\number\day.\space\ifcase\month\or
@@ -14998,13 +14993,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-et.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-et.ldf}[polyglossia: module for et (Estonian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{estonian}
+\InheritGlossFile{estonian}
% \end{macrocode}
% \iffalse
@@ -15015,13 +15010,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-eu.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-eu.ldf}[polyglossia: module for eu (Basque)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{basque}
+\InheritGlossFile{basque}
% \end{macrocode}
% \iffalse
@@ -15032,13 +15027,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fa.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fa.ldf}[polyglossia: module for fa (Persian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{persian}
+\InheritGlossFile{persian}
% \end{macrocode}
% \iffalse
@@ -15049,14 +15044,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-farsi.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-farsi.ldf}[polyglossia: module for Farsi]
% We only provide this gloss for babel compatibility.
% The proper English language name is Persian.
-\xpg@load@master@language{persian}
+\InheritGlossFile{persian}
% \end{macrocode}
% \iffalse
@@ -15067,13 +15062,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fi.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fi.ldf}[polyglossia: module for fi (Finnish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{finnish}
+\InheritGlossFile{finnish}
% \end{macrocode}
% \iffalse
@@ -15084,7 +15079,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-finnish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-finnish.ldf}[polyglossia: module for Finnish]
\PolyglossiaSetup{finnish}{
@@ -15102,51 +15097,54 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{finnish}{fi}
-\define@boolkey{finnish}[finnish@]{babelshorthands}[true]{}
-
\newif\if@finnish@schoolhyphens
\newif\if@finnish@babelhyphens
-\define@choicekey*+{finnish}{hyphens}[\xpg@val\xpg@nr]{default,school,babel}[default]{%
- \ifcase\xpg@nr\relax
- % default:
- \@finnish@schoolhyphensfalse
- \@finnish@babelhyphensfalse
- \or
- % school:
- \@finnish@schoolhyphenstrue
- \@finnish@babelhyphensfalse
- \or
- % babel:
- \@finnish@schoolhyphensfalse
- \@finnish@babelhyphenstrue
- \fi
- \xpg@info{Option: Finnish, hyphens=\xpg@val}%
-}{\xpg@warning{Unknown Finnish hyphens `#1'}}
-
-% backwards compatibility
-\define@boolkey{finnish}[finnish@]{schoolhyphens}[true]{%
- \iffinnish@schoolhyphens
- \@finnish@schoolhyphenstrue
- \@finnish@babelhyphensfalse
- \else
- \@finnish@schoolhyphensfalse
- \fi
-}
+
+\DeclareKeys[polyglossia/gloss/finnish]
+ {
+ babelshorthands.if = finnish@babelshorthands,
+ babelshorthands.default:n = true,
+ hyphens.choice:,
+ hyphens / default.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ \@finnish@babelhyphensfalse
+ },
+ hyphens / school.code =
+ {%
+ \@finnish@schoolhyphenstrue
+ \@finnish@babelhyphensfalse
+ },
+ hyphens / babel.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ \@finnish@babelhyphenstrue
+ },
+ hyphens.default:n = default,
+ hyphens/unknown.code = \xpg@warning{Unknown Finnish hyphens `#1'},
+ schoolhyphens.choice:,
+ schoolhyphens / true.code =
+ {%
+ \@finnish@schoolhyphenstrue
+ \@finnish@babelhyphensfalse
+ },
+ schoolhyphens / false.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ },
+ schoolhyphens.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{finnish}{babelshorthands=false,hyphens=default}
+\InitializeGlossOptions{finnish}{babelshorthands=false,hyphens=default}
\ifsystem@babelshorthands
- \setkeys{finnish}{babelshorthands=true}
+ \SetGlossOptions{finnish}{babelshorthands=true}
\else
- \setkeys{finnish}{babelshorthands=false}
+ \SetGlossOptions{finnish}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\finnish@shorthands{%
\xpg@activate@shorthands%
@@ -15191,15 +15189,15 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\finnish@language{%
\if@finnish@schoolhyphens
- \xpg@ifdefined{schoolfinnish}{%
- \polyglossia@setup@language@patterns{schoolfinnish}%
+ \IfLanguageDefinedTF{schoolfinnish}{%
+ \SetupPolyglossiaLangPatterns{schoolfinnish}%
}{%
\xpg@warning{Finnish 'School' hyphenation patterns (schoolfinnish) not available.\MessageBreak
I will use the standard patterns for Finnish instead}%
- \polyglossia@setup@language@patterns{finnish}%
+ \SetupPolyglossiaLangPatterns{finnish}%
}%
\else
- \polyglossia@setup@language@patterns{finnish}%
+ \SetupPolyglossiaLangPatterns{finnish}%
\fi
}
@@ -15253,13 +15251,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr-CA-u-sd-canb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CA-u-sd-canb.ldf}[polyglossia: module for fr-CA-u-sd-canb (Canadian French, Acadian subvariety)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
% \end{macrocode}
% \iffalse
@@ -15270,13 +15268,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr-CA.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CA.ldf}[polyglossia: module for fr-CA (Canadian French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
% \end{macrocode}
% \iffalse
@@ -15287,13 +15285,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr-CH.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CH.ldf}[polyglossia: module for fr-CH (Swiss French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
% \end{macrocode}
% \iffalse
@@ -15304,13 +15302,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr-FR.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-FR.ldf}[polyglossia: module for fr-FR (France's French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
% \end{macrocode}
% \iffalse
@@ -15321,13 +15319,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr.ldf}[polyglossia: module for fr (French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
% \end{macrocode}
% \iffalse
@@ -15338,7 +15336,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-french.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-french.ldf}[polyglossia: module for French]
@@ -15368,43 +15366,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias[variant=canadian]{french}{canadien}
\def\french@variant{french}
-\define@choicekey*+{french}{variant}[\xpg@val\xpg@nr]{french,canadian,acadian,swiss}[french]{%
- \ifcase\xpg@nr\relax
- % french:
- \def\french@variant{french}%
- \SetLanguageKeys{french}{babelname=french,bcp47=fr-FR,bcp47-language=fr,bcp47-region=FR}%
- \french@thincolonspacefalse
- \or
- % canadian:
- \def\french@variant{canadien}%
- \SetLanguageKeys{french}{babelname=canadien,bcp47=fr-CA,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-caqc}%
- \xpg@ifdefined{canadien}{}%
- {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
- I will use the standard patterns for French instead}%
- \adddialect\l@canadien\l@french\relax}%
- \french@thincolonspacefalse
- \or
- % acadian:
- \def\french@variant{acadian}%
- \SetLanguageKeys{french}{babelname=acadian,bcp47=fr-CA-u-sd-canb,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-canb}%
- \xpg@ifdefined{acadian}{}%
- {\xpg@warning{No hyphenation patterns were loaded for "French (Canada, Acadian)"\MessageBreak
- I will use the standard patterns for French instead}%
- \adddialect\l@acadian\l@french\relax}%
- \french@thincolonspacefalse
- \or
- % swiss:
- \def\french@variant{swissfrench}%
- \SetLanguageKeys{french}{babelname=french,bcp47=fr-CH,bcp47-language=fr,bcp47-region=CH}%
- \adddialect\l@swissfrench\l@french\relax%
- \french@thincolonspacetrue
- \fi
- \xpg@info{Option: French, variant=\xpg@val}%
-}{\xpg@warning{Unknown French variant `#1'}}
-
\def\french@language{%
- \polyglossia@setup@language@patterns{\french@variant}%
+ \SetupPolyglossiaLangPatterns{\french@variant}%
}%
\ifluatex
@@ -15424,91 +15388,103 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% Save original footnote definition
% Do this at the end of the preamble to catch other
% packages' footnote changes (#391)
-\AtEndPreamble{%
+\AddToHook{begindocument/before}{%
\let\xpg@orig@makefntext\@makefntext
}
-\define@boolkey{french}[french@]{frenchfootnote}[true]{}
-
-\define@boolkey{french}[french@]{autospacing}[true]{}
-\french@autospacingtrue
-
-\define@boolkey{french}[french@]{frenchpart}[true]{}
-\french@frenchparttrue
-
-\newif\iffrench@autospaceguillemets
-\define@boolkey{french}[french@]{autospaceguillemets}[true]{}
-\french@autospaceguillemetstrue
-
-\newif\iffrench@thincolonspace
-\define@boolkey{french}[french@]{thincolonspace}[true]{}
-\french@thincolonspacefalse
-
-% Backwards compatibility
-\define@boolkey{french}[french@]{automaticspacesaroundguillemets}[true]{%
- \iffrench@automaticspacesaroundguillemets
- \setkeys{french}{autospaceguillemets=true}%
- \else
- \setkeys{french}{autospaceguillemets=false}%
- \fi
-}
-
% name is for compatibility with babel
\let\french@ttfamilyORI\ttfamily
\DeclareRobustCommand\french@ttfamilyFB{\nofrench@punctuation\french@ttfamilyORI}
-% Allow to switch on autospacing in ttfamily context
-\define@boolkey{french}[french@]{autospacetypewriter}[true]{}
-\french@autospacetypewriterfalse
-
-% This is how babel-french has it
-\define@boolkey{french}[french@]{OriginalTypewriter}[true]{%
- \iffrench@OriginalTypewriter
- \setkeys{french}{autospacetypewriter=false}%
- \else
- \setkeys{french}{autospacetypewriter=true}%
- \fi
-}
-
% Configuration of item labels
\def\french@itemi{\textemdash}
\def\french@itemii{\textemdash}
\def\french@itemiii{\textemdash}
\def\french@itemiv{\textemdash}
-\define@key{french}{itemlabels}[\textemdash]{%
- \def\french@itemi{#1}
- \def\french@itemii{#1}
- \def\french@itemiii{#1}
- \def\french@itemiv{#1}
-}
-
-\define@key{french}{itemlabeli}[\textemdash]{%
- \def\french@itemi{#1}
-}
-
-\define@key{french}{itemlabelii}[\textemdash]{%
- \def\french@itemii{#1}
-}
-
-\define@key{french}{itemlabeliii}[\textemdash]{%
- \def\french@itemiii{#1}
-}
-
-\define@key{french}{itemlabeliv}[\textemdash]{%
- \def\french@itemiv{#1}
-}
+\newif\iffrench@autospacetypewriter
+\french@autospacetypewriterfalse
+\newif\iffrench@autospacing
+\french@autospacingtrue
+\newif\iffrench@frenchpart
+\french@frenchparttrue
+\newif\iffrench@autospaceguillemets
+\french@autospaceguillemetstrue
-\define@boolkey{french}[french@]{frenchitemlabels}[true]{}
+\DeclareKeys[polyglossia/gloss/french]
+ {
+ variant.choice:,
+ variant / french.code =
+ {%
+ \def\french@variant{french}%
+ \SetLanguageKeys{french}{babelname=french,bcp47=fr-FR,bcp47-language=fr,bcp47-region=FR}%
+ \french@thincolonspacefalse
+ },
+ variant / canadian.code =
+ {%
+ \def\french@variant{canadien}%
+ \SetLanguageKeys{french}{babelname=canadien,bcp47=fr-CA,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-caqc}%
+ \IfLanguageDefinedF{canadien}%
+ {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
+ I will use the standard patterns for French instead}%
+ \adddialect\l@canadien\l@french\relax}%
+ \french@thincolonspacefalse
+ },
+ variant / acadian.code =
+ {%
+ \def\french@variant{acadian}%
+ \SetLanguageKeys{french}{babelname=acadian,bcp47=fr-CA-u-sd-canb,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-canb}%
+ \IfLanguageDefinedF{acadian}%
+ {\xpg@warning{No hyphenation patterns were loaded for "French (Canada, Acadian)"\MessageBreak
+ I will use the standard patterns for French instead}%
+ \adddialect\l@acadian\l@french\relax}%
+ \french@thincolonspacefalse
+ },
+ variant / swiss.code =
+ {%
+ \def\french@variant{swissfrench}%
+ \SetLanguageKeys{french}{babelname=french,bcp47=fr-CH,bcp47-language=fr,bcp47-region=CH}%
+ \adddialect\l@swissfrench\l@french\relax%
+ \french@thincolonspacetrue
+ },
+ variant.default:n = french,
+ variant/unknown.code = \xpg@warning{Unknown French variant `#1'},
+ frenchfootnote.if = french@frenchfootnote,
+ frenchfootnote.default:n = true,
+ autospacing.if = french@autospacing,
+ autospacing.default:n = true,
+ frenchpart.if = french@frenchpart,
+ frenchpart.default:n = true,
+ autospaceguillemets.if = french@autospaceguillemets,
+ autospaceguillemets.default:n = true,
+ thincolonspace.if = french@thincolonspace,
+ thincolonspace.default:n = true,
+ automaticspacesaroundguillemets.meta:n = {autospaceguillemets=#1},
+ autospacetypewriter.if = french@autospacetypewriter,
+ autospacetypewriter.default:n = true,
+ originaltypewriter.meta:n = {autospacetypewriter=#1},
+ itemlabeli.store = \french@itemi,
+ itemlabelii.store = \french@itemii,
+ itemlabeliii.store = \french@itemiii,
+ itemlabeliv.store = \french@itemiv,
+ frenchitemlabels.if = french@frenchitemlabels,
+ frenchitemlabels.default:n = true,
+ itemlabels.code =
+ \def\french@itemi{#1}%
+ \def\french@itemii{#1}%
+ \def\french@itemiii{#1}%
+ \def\french@itemiv{#1},
+ itemlabels.default:n = \textemdash
+ }
% Register default options
-\xpg@initialize@gloss@options{french}{variant=french,autospacing=true,thincolonspace=false,
+\InitializeGlossOptions{french}{variant=french,autospacing=true,thincolonspace=false,
autospaceguillemets=true,autospacetypewriter=false,
frenchfootnote=false,frenchitemlabels=false,
itemlabels=\textemdash,itemlabeli=\textemdash,itemlabelii=\textemdash,
itemlabeliii=\textemdash,itemlabeliv=\textemdash}
% Register alias options
-\xpg@set@alias@values{french}{variant}{canadian}{acadian}
+\SetLanguageAliasValues{french}{variant}{canadian,acadian}
\def\french@fontsetup{%
@@ -15679,100 +15655,100 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\french@capsformat{%
% Change part heading
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\xpg@french@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
+ \@ifundefined{titleformat}{%
+ % With KOMA
+ \@ifundefined{sectionformat}{%
+ % With memoir
+ \@ifundefined{@memptsize}{% (not \ifdefined\@memptsize)
+ % With standard classes
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\xpg@french@part\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for French}}}%
+ }% (end \ifdefined \@part)
+ }{% Hyperref
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\xpg@french@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{}%
- }%
- }{% (not \ifdefined\titleformat)
- % With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\xpg@french@part~\partname}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
- {\partnamefont\xpg@french@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
+ }% (end \ifdefined\NR@part)
+ }{%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
\let\xpg@save@part@format\@part%
\patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
{\partnamefont\xpg@french@part\partnamenum\printpartname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
- % With standard classes
- \ifcsdef{NR@part}{% Hyperref
+ }%
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
+ \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
+ {\partnamefont\xpg@french@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for French}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\xpg@french@part~\partname}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
{\partname\nobreakspace\thepart}%
{\xpg@french@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\xpg@french@part\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for French}}{}}%
- }{}% (end \ifdefined \NR@part)
- }% (end \ifdefined\@part)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\xpg@french@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for French}}%
+ }%
}% (end \ifdefined\titleformat)
}
\def\nofrench@capsformat{%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
- % With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- }{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
}%
- }{}%
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
}% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ % With titlesec
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
+ }%
+ }%
}% (end \ifdefined\titleformat)
}
@@ -15783,7 +15759,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\if@xpg@french@footnote@set%
\else%
\iffrench@frenchfootnote%
- \ifdefstring{\xpg@main@language}{french}{%
+ \IfMainLanguageTF{french}{%
\ifx\@makefntext\undefined\else%
\long\def\french@makefntext##1{%
\parindent1em \noindent\quad%
@@ -15807,7 +15783,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\if@xpg@french@itemlabels@set%
\else%
\iffrench@frenchitemlabels
- \ifdefstring{\xpg@main@language}{french}{%
+ \IfMainLanguageTF{french}{%
\renewcommand{\labelitemi}{\french@itemi}%
\renewcommand{\labelitemii}{\french@itemii}%
\renewcommand{\labelitemiii}{\french@itemiii}%
@@ -15882,13 +15858,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-friulan.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-friulan.ldf}[polyglossia: module for Friulian]
% We only provide this gloss for babel compatibility.
-\xpg@load@master@language{friulian}
+\InheritGlossFile{friulian}
% \end{macrocode}
% \iffalse
@@ -15899,7 +15875,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-friulian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-friulian.ldf}[polyglossia: module for Friulian]
@@ -15953,7 +15929,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
Lui\or Avost\or Setembar\or Otobar\or Novembar\or Dicembar%
\fi\space dal\space\number\year}}
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgfu@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
@@ -15985,13 +15961,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fur.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fur.ldf}[polyglossia: module for fur (Friulian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{friulian}
+\InheritGlossFile{friulian}
% \end{macrocode}
% \iffalse
@@ -16002,13 +15978,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ga.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ga.ldf}[polyglossia: module for ga (Gaelic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
% \end{macrocode}
% \iffalse
@@ -16019,7 +15995,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-gaelic.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gaelic.ldf}[polyglossia: module for Gaelic]
@@ -16043,23 +16019,28 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias[variant=scottish]{gaelic}{scottish}
\def\gaelic@variant{irish}
-\define@choicekey*+{gaelic}{variant}[\xpg@val\xpg@nr]{irish,scottish}[irish]{%
- \ifcase\xpg@nr\relax
- % irish:
- \gdef\gaelic@variant{irish}%
- \SetLanguageKeys{gaelic}{language=Irish,langtag=IRI,babelname=irish,bcp47=ga,bcp47-language=ga}%
- \xpg@fontsetup@latin{gaelic}%
- \or
- % scottish:
- \gdef\gaelic@variant{scottish}%
- \SetLanguageKeys{gaelic}{language=Gaelic,langtag=GAE,babelname=scottish,bcp47=gd,bcp47-language=gd}%
- \xpg@fontsetup@latin{gaelic}%
- \fi
- \xpg@info{Option: gaelic, variant=\xpg@val}%
-}{\xpg@warning{Unknown gaelic variant `#1'}}
+
+\DeclareKeys[polyglossia/gloss/gaelic]
+ {
+ variant.choice:,
+ variant / irish.code =
+ {%
+ \gdef\gaelic@variant{irish}%
+ \SetLanguageKeys{gaelic}{language=Irish,langtag=IRI,babelname=irish,bcp47=ga,bcp47-language=ga}%
+ \SetupLatinPolyglossiaFont{gaelic}%
+ },
+ variant / scottish.code =
+ {%
+ \gdef\gaelic@variant{scottish}%
+ \SetLanguageKeys{gaelic}{language=Gaelic,langtag=GAE,babelname=scottish,bcp47=gd,bcp47-language=gd}%
+ \SetupLatinPolyglossiaFont{gaelic}%
+ },
+ variant.default:n = irish,
+ variant/unknown.code = \xpg@warning{Unknown gaelic variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{gaelic}{variant=irish}
+\InitializeGlossOptions{gaelic}{variant=irish}
\def\captionsgaelic@irish{%
\def\refname{Tagairtí}%
@@ -16149,7 +16130,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-galician.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-galician.ldf}[polyglossia: module for Galician]
\PolyglossiaSetup{galician}{
@@ -16206,13 +16187,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-gd.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gd.ldf}[polyglossia: module for gd (Gaelic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
% \end{macrocode}
% \iffalse
@@ -16223,7 +16204,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-georgian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-georgian.ldf}[polyglossia: module for Georgian]
@@ -16243,34 +16224,37 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*{georgian}{ka}
\newif\ifgeorgian@numerals
-\define@key{georgian}{numerals}[arabic]{%
- \ifstrequal{#1}{georgian}%
- {\georgian@numeralstrue%
- \SetLanguageKeys{georgian}{bcp47-extension-u=nu-geor}%
- }%
- {\georgian@numeralsfalse%
- \SetLanguageKeys{georgian}{bcp47-extension-u=nu-latn}%
- }%
-}
-
-\define@boolkey{georgian}[georgian@]{babelshorthands}[true]{}
-\define@boolkey{georgian}[georgian@]{oldmonthnames}[true]{}
+\DeclareKeys[polyglossia/gloss/georgian]
+ {
+ babelshorthands.if = georgian@babelshorthands,
+ babelshorthands.default:n = true,
+ oldmonthnames.if = georgian@oldmonthnames,
+ oldmonthnames.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \georgian@numeralsfalse
+ \SetLanguageKeys{georgian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / georgian.code =
+ {%
+ \georgian@numeralstrue
+ \SetLanguageKeys{georgian}{bcp47-extension-u=nu-geor}%
+ },
+ numerals.default:n = arabic
+ }
% Register default options
-\xpg@initialize@gloss@options{georgian}{babelshorthands=false,oldmonthnames=false,numerals=arabic}
+\InitializeGlossOptions{georgian}{babelshorthands=false,oldmonthnames=false,numerals=arabic}
\ifsystem@babelshorthands
- \setkeys{georgian}{babelshorthands=true}
+ \SetGlossOptions{georgian}{babelshorthands=true}
\else
- \setkeys{georgian}{babelshorthands=false}
+ \SetGlossOptions{georgian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\georgian@shorthands{%
\xpg@activate@shorthands%
@@ -16471,7 +16455,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-german.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-german.ldf}[polyglossia: module for German]
@@ -16520,51 +16504,11 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@german@oldspelling
\@german@oldspellingfalse
-\define@choicekey*+{german}{spelling}[\xpg@val\xpg@nr]{new,old,1901,1996}[new]{%
- \ifcase\xpg@nr\relax
- % new:
- \@german@oldspellingfalse
- \or
- % old:
- \@german@oldspellingtrue
- \or
- % 1901:
- \@german@oldspellingtrue
- \or
- % 1996:
- \@german@oldspellingfalse
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, spelling=\xpg@val}%
-}{\xpg@warning{Unknown German spelling `#1'}}
\newif\if@austrian@locale
\@austrian@localefalse
\newif\if@swiss@locale
\@swiss@localefalse
-\define@choicekey*+{german}{variant}[\xpg@val\xpg@nr]{german,austrian,swiss}[german]{%
- \ifcase\xpg@nr\relax
- % german:
- \@swiss@localefalse%
- \@austrian@localefalse%
- \or
- % austrian:
- \@austrian@localetrue%
- \@swiss@localefalse%
- \or
- % swiss:
- \@swiss@localetrue%
- \@austrian@localefalse%
- \xpg@ifdefined{swissgerman}{}%
- {%
- \xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
- I will use the standard patterns for German (old spelling) instead}%
- \adddialect\l@swissgerman\l@german\relax%
- }%
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, variant=\xpg@val}%
-}{\xpg@warning{Unknown German variant `#1'}}
\def\german@set@babelname{%
\if@german@oldspelling
@@ -16613,58 +16557,110 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\newif\if@german@blackletter
-\define@choicekey*+{german}{script}[\xpg@val\xpg@nr]{latin,blackletter,fraktur}[latin]{%
- \ifcase\xpg@nr\relax
- % latin:
- \@german@blackletterfalse%
- \or
- % blackletter:
- \@german@blacklettertrue%
- \or
- % fraktur:
- \@german@blacklettertrue%
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, script=\xpg@val}%
-}{\xpg@warning{Unknown German script `#1'}}
-
-\define@boolkey{german}[german@]{capitaleszett}[true]{%
- \ifgerman@capitaleszett
- % MakeUppercase capitalizes the eszett (U+00DF) with U+1E9E
- \SetLanguageKeys{german}{bcp47-casing=de-x-eszett,bcp47-extension-x=eszett}
- \else
- % Capitalize eszett as <SS>
- \SetLanguageKeys{german}{bcp47-casing=de,bcp47-extension-x={}}
- \fi
-}
-
-
-% Option defunc'ed, as both XeTeX and LuaTeX meanwhile
-% use the experimental German hyphenation patterns by default.
-\define@boolkey{german}[german@]{latesthyphen}[true]{}
-\define@boolkey{german}[german@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/german]
+ {
+ babelshorthands.if = german@babelshorthands,
+ babelshorthands.default:n = true,
+ latesthyphen.if = german@latesthyphen,
+ latesthyphen.default:n = true,
+ capitaleszett.choice:,
+ capitaleszett / true.code =
+ {% MakeUppercase capitalizes the eszett (U+00DF) with U+1E9E
+ \SetLanguageKeys{german}{bcp47-casing=de-x-eszett,bcp47-extension-x=eszett}%
+ },
+ capitaleszett / false.code =
+ {% Capitalize eszett as <SS>
+ \SetLanguageKeys{german}{bcp47-casing=de,bcp47-extension-x={}}%
+ },
+ capitaleszett.default:n = true,
+ script.choice:,
+ script / latin.code =
+ {%
+ \@german@blackletterfalse
+ \german@set@babelname
+ },
+ script / blackletter.code =
+ {%
+ \@german@blacklettertrue
+ \german@set@babelname
+ },
+ script / fraktur.code =
+ {%
+ \@german@blacklettertrue
+ \german@set@babelname
+ },
+ script.default:n = latin,
+ script/unknown.code = \xpg@warning{Unknown German script `#1'},
+ spelling.choice:,
+ spelling / new.code =
+ {%
+ \@german@oldspellingfalse
+ \german@set@babelname
+ },
+ spelling / old.code =
+ {%
+ \@german@oldspellingtrue
+ \german@set@babelname
+ },
+ spelling / 1901.code =
+ {%
+ \@german@oldspellingtrue
+ \german@set@babelname
+ },
+ spelling / 1996.code =
+ {%
+ \@german@oldspellingfalse
+ \german@set@babelname
+ },
+ spelling.default:n = new,
+ spelling/unknown.code = \xpg@warning{Unknown German spelling `#1'},
+ variant.choice:,
+ variant / german.code =
+ {%
+ \@swiss@localefalse
+ \@austrian@localefalse
+ \german@set@babelname
+ },
+ variant / austrian.code =
+ {%
+ \@austrian@localetrue
+ \@swiss@localefalse
+ \german@set@babelname
+ },
+ variant / swiss.code =
+ {%
+ \@swiss@localetrue
+ \@austrian@localefalse
+ \IfLanguageDefinedF{swissgerman}
+ {%
+ \xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
+ I will use the standard patterns for German (old spelling) instead}%
+ \adddialect\l@swissgerman\l@german\relax
+ }%
+ \german@set@babelname
+ },
+ variant.default:n = german,
+ variant/unknown.code = \xpg@warning{Unknown German variant `#1'}
+ }
+
-\setkeys{german}{spelling,script,variant}
+\SetGlossOptions{german}{spelling,script,variant}
% Register default options
-\xpg@initialize@gloss@options{german}{variant=german,spelling=new,script=latin,babelshorthands=false}
+\InitializeGlossOptions{german}{variant=german,spelling=new,script=latin,babelshorthands=false}
% Register alias options
-\xpg@set@alias@values{german}{spelling}{new}{1996}
-\xpg@set@alias@values{german}{spelling}{old}{1901}
-\xpg@set@alias@values{german}{script}{blackletter}{fraktur}
+\SetLanguageAliasValues{german}{spelling}{new,1996}
+\SetLanguageAliasValues{german}{spelling}{old,1901}
+\SetLanguageAliasValues{german}{script}{blackletter,fraktur}
\ifsystem@babelshorthands
- \setkeys{german}{babelshorthands=true}
+ \SetGlossOptions{german}{babelshorthands=true}
\else
- \setkeys{german}{babelshorthands=false}
+ \SetGlossOptions{german}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\german@shorthands{%
\xpg@activate@shorthands%
@@ -16786,15 +16782,15 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\german@language{%
\if@german@oldspelling
\if@swiss@locale
- \polyglossia@setup@language@patterns{swissgerman}%
+ \SetupPolyglossiaLangPatterns{swissgerman}%
\else
- \polyglossia@setup@language@patterns{german}%
+ \SetupPolyglossiaLangPatterns{german}%
\fi
\if@austrian@locale
\adddialect\l@austrian\l@german%
\fi
\else
- \polyglossia@setup@language@patterns{ngerman}%
+ \SetupPolyglossiaLangPatterns{ngerman}%
\if@austrian@locale
\adddialect\l@naustrian\l@ngerman%
\fi
@@ -16825,13 +16821,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-germanb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-germanb.ldf}[polyglossia: module for German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -16842,13 +16838,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-gl.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gl.ldf}[polyglossia: module for gl (Galician)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{galician}
+\InheritGlossFile{galician}
% \end{macrocode}
% \iffalse
@@ -16859,13 +16855,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-grc.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-grc.ldf}[polyglossia: module for grc (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
% \end{macrocode}
% \iffalse
@@ -16876,7 +16872,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-greek.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-greek.ldf}[polyglossia: module for Greek]
@@ -16900,7 +16896,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*[variant=ancient]{greek}{grc}
-\setlanguagealias*[varant=polytonic]{greek}{el-polyton}
+\setlanguagealias*[variant=polytonic]{greek}{el-polyton}
\setlanguagealias*[variant=monotonic]{greek}{el-monoton}
\setlanguagealias*{greek}{el}
@@ -16920,44 +16916,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@greek@ancient\@greek@ancientfalse
\newif\if@greek@poly\@greek@polyfalse
-\define@choicekey*+{greek}{variant}[\xpg@val\xpg@nr]{monotonic,mono,polytonic,poly,ancient,ancientgreek}[monotonic]{%
- \xpg@ifdefined{greek}{}{%
- \xpg@nopatterns{greek}%
- \adddialect\l@greek\l@nohyphenation
- }%
- \ifcase\xpg@nr\relax
- % monotonic:
- \@greek@polyfalse
- \@greek@ancientfalse
- \or
- % mono:
- \@greek@polyfalse
- \@greek@ancientfalse
- \or
- % polytonic:
- \@greek@polytrue
- \@greek@ancientfalse
- \or
- % poly:
- \@greek@polytrue
- \@greek@ancientfalse
- \or
- % ancient:
- \@greek@polyfalse
- \@greek@ancienttrue
- \or
- % ancientgreek:
- \@greek@polyfalse
- \@greek@ancienttrue
- \fi
- \greek@set@langdata
- \xpg@info{Option: Greek, variant=\xpg@val}%
-}{\xpg@warning{Unknown Greek variant `#1'}}
-
-
\def\greek@set@langdata{%
\if@greek@ancient
- \xpg@ifdefined{ancientgreek}{}%
+ \IfLanguageDefinedF{ancientgreek}%
{\xpg@warning{No hyphenation patterns were loaded for Ancient Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@ancientgreek\l@greek\relax}%
@@ -16967,7 +16928,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\SetLanguageKeys{greek}{babelname=greek,bcp47=grc,bcp47-language=grc,bcp47-variant={}}%
\else
\if@greek@poly
- \xpg@ifdefined{polygreek}{}%
+ \IfLanguageDefinedF{polygreek}%
{\xpg@warning{No hyphenation patterns were loaded for Polytonic Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@polygreek\l@greek\relax}%
@@ -16976,7 +16937,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\dategreek{\datepolygreek}%
\SetLanguageKeys{greek}{babelname=polutonikogreek,bcp47=el-polyton,bcp47-language=el,bcp47-variant=polyton}%
\else% monotonic greek
- \xpg@ifdefined{monogreek}{}%
+ \IfLanguageDefinedF{monogreek}%
{\xpg@warning{No hyphenation patterns were loaded for Monotonic Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@monogreek\l@greek\relax}%
@@ -16990,42 +16951,85 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\greek@language{%
- \polyglossia@setup@language@patterns{\greek@variant}%
+ \SetupPolyglossiaLangPatterns{\greek@variant}%
}
\newif\if@greek@numerals
-\define@choicekey*+{greek}{numerals}[\xpg@val\xpg@nr]{greek,arabic}[greek]{%
- \ifcase\xpg@nr\relax
- % greek:
- \@greek@numeralstrue%
- \SetLanguageKeys{greek}{bcp47-extension-u=nu-grek}%
- \or
- % arabic:
- \@greek@numeralsfalse%
- \SetLanguageKeys{greek}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Greek, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Greek numerals value `#1'}}
-
-\define@boolkey{greek}[greek@]{capitaliota}[true]{%
- \ifgreek@capitaliota
- % \MakeUppercase converts the ypogegrammeni (subscript muted iota) to capital iota
- \SetLanguageKeys{greek}{bcp47-casing=el-x-iota,bcp47-extension-x=iota}
- \else
- % \MakeUppercase retains the subscript versions (default)
- \SetLanguageKeys{greek}{bcp47-casing=el,bcp47-extension-x={}}
- \fi
-}
-
-\define@boolkey{greek}{attic}[true]{\xpg@warning{Greek option `attic' is no longer required.}}
+\DeclareKeys[polyglossia/gloss/greek]
+ {
+ variant.choices:nn = { monotonic, mono,polytonic, poly,ancient, ancientgreek }
+ {%
+ \CheckHyphenationPatterns{greek}%
+ \ifcase\UseName{l_keys_choice_int}\or
+ % monotonic:
+ \@greek@polyfalse
+ \@greek@ancientfalse
+ \or
+ % mono:
+ \@greek@polyfalse
+ \@greek@ancientfalse
+ \or
+ % polytonic:
+ \@greek@polytrue
+ \@greek@ancientfalse
+ \or
+ % poly:
+ \@greek@polytrue
+ \@greek@ancientfalse
+ \or
+ % ancient:
+ \@greek@polyfalse
+ \@greek@ancienttrue
+ \or
+ % ancientgreek:
+ \@greek@polyfalse
+ \@greek@ancienttrue
+ \fi
+ \greek@set@langdata
+ },
+ variant.default:n = monotonic,
+ variant/unknown.code = \xpg@warning{Unknown Greek variant `#1'},
+ numerals.choice:,
+ numerals / greek.code =
+ {%
+ \@greek@numeralstrue
+ \SetLanguageKeys{greek}{bcp47-extension-u=nu-grek}%
+ },
+ numerals / arabic.code =
+ {%
+ \@greek@numeralsfalse
+ \SetLanguageKeys{greek}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = greek,
+ numerals/unknown.code = \xpg@warning{Unknown Greek numerals value `#1'},
+ capitaliota.choice:,
+ capitaliota / true.code =
+ {%
+ \@greek@capitaliotatrue
+ % \MakeUppercase converts the ypogegrammeni (subscript muted iota) to capital iota
+ \SetLanguageKeys{greek}{bcp47-casing=el-x-iota,bcp47-extension-x=iota}%
+ },
+ capitaliota / false.code =
+ {%
+ \@greek@capitaliotafalse
+ % \MakeUppercase retains the subscript versions (default)
+ \SetLanguageKeys{greek}{bcp47-casing=el,bcp47-extension-x={}}%
+ },
+ capitaliota.default:n = true,
+ attic.choices:nn = { true, false }
+ {%
+ \xpg@warning{Greek option `attic' is no longer required.}
+ },
+ capitaliota.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{greek}{variant=monotonic,numerals=greek}
+\InitializeGlossOptions{greek}{variant=monotonic,numerals=greek}
% Register alias options
-\xpg@set@alias@values{greek}{variant}{monotonic}{mono}
-\xpg@set@alias@values{greek}{variant}{polytonic}{poly}
+\SetLanguageAliasValues{greek}{variant}{monotonic,mono}
+\SetLanguageAliasValues{greek}{variant}{polytonic,poly}
\def\monogreekcaptions{%
\def\refname{Αναφορές}%
@@ -17344,13 +17348,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-he.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-he.ldf}[polyglossia: module for he (Hebrew)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hebrew}
+\InheritGlossFile{hebrew}
% \end{macrocode}
% \iffalse
@@ -17361,7 +17365,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hebrew.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hebrew.ldf}[polyglossia: module for Hebrew]
@@ -17387,41 +17391,48 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{hebrew}{he}
-% hebrewcal options
-\define@key{hebrew}{marcheshvan}[true]{\setkeys{hebrewcal}{marcheshvan=#1}}
-\define@key{hebrew}{transliteration}[alt]{\setkeys{hebrewcal}{transliteration=#1}}
-\define@key{hebrew}{fullyear}[true]{\setkeys{hebrewcal}{fullyear=#1}}
-
\newif\if@calendar@hebrew
-\define@choicekey*+{hebrew}{calendar}[\xpg@val\xpg@nr]{hebrew,gregorian}[gregorian]{%
- \ifcase\xpg@nr\relax
- % hebrew:
- \@calendar@hebrewtrue
- \or
- % gregorian:
- \@calendar@hebrewfalse
- \fi
- \xpg@info{Option: Hebrew, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Hebrew calendar `#1'}}
-
\newif\if@hebrew@numerals
-\define@choicekey*+{hebrew}{numerals}[\xpg@val\xpg@nr]{hebrew,arabic}[arabic]{%
- \ifcase\xpg@nr\relax
- % hebrew:
- \@hebrew@numeralstrue
- \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-hebr}%
- \or
- % arabic:
- \@hebrew@numeralsfalse
- \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Hebrew, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Hebrew numerals value `#1'}}
-\setkeys{hebrew}{numerals}
+\DeclareKeys[polyglossia/gloss/hebrew]
+ {
+ marcheshvan.code = \setkeys{hebrewcal}{marcheshvan=#1},
+ marcheshvan.default:n = true,
+ transliteration.code = \setkeys{hebrewcal}{transliteration=#1},
+ transliteration.default:n = alt,
+ fullyear.code = \setkeys{hebrewcal}{fullyear=#1},
+ fullyear.default:n = true,
+ calendar.choice:,
+ calendar / hebrew.code =
+ {%
+ \@calendar@hebrewtrue
+ },
+ calendar / gregorian.code =
+ {%
+ \@calendar@hebrewfalse
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Hebrew calendar `#1'},
+ numerals.choice:,
+ numerals / hebrew.code =
+ {%
+ \@hebrew@numeralstrue
+ \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-hebr}%
+ },
+ numerals / arabic.code =
+ {%
+ \@hebrew@numeralsfalse
+ \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Hebrew numerals value `#1'}
+ }
+
+
+\SetGlossOptions{hebrew}{numerals}
% Register default options
-\xpg@initialize@gloss@options{hebrew}{numerals=arabic,calendar=gregorian,marcheshvan=false,fullyear=false}
+\InitializeGlossOptions{hebrew}{numerals=arabic,calendar=gregorian,marcheshvan=false,fullyear=false}
\def\captionshebrew{%
\def\prefacename{מבוא}%
@@ -17535,13 +17546,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hi.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hi.ldf}[polyglossia: module for hi (Hindi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hindi}
+\InheritGlossFile{hindi}
% \end{macrocode}
% \iffalse
@@ -17552,7 +17563,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hindi.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% UTF-8 strings kindly provided by Zdenĕk Wagner, 10-03-2008
% with corrections and additional contributions by Anshuman Pandey
@@ -17579,8 +17590,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\ifx\l@hindi\@undefined%
\ifx\l@sanskrit\@undefined%
- \xpg@nopatterns{Hindi}%
- \adddialect\l@hindi\l@nohyphenation%
+ \XPGNoPatternsFallback{hindi}%
\else
\xpg@warning{No hyphenation patterns were loaded for Hindi\MessageBreak
I will use the patterns for Sanskrit instead}
@@ -17589,26 +17599,31 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\fi
\def\hindi@language{%
- \polyglossia@setup@language@patterns{hindi}%
+ \SetupPolyglossiaLangPatterns{hindi}%
}
\newif\ifhindi@devanagari@numerals
\hindi@devanagari@numeralstrue
-\define@choicekey*+{hindi}{numerals}[\xpg@val\xpg@nr]{Devanagari,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \hindi@devanagari@numeralstrue%
- \SetLanguageKeys{hindi}{bcp47-extension-u=nu-deva}%
- \or
- % Western:
- \hindi@devanagari@numeralsfalse%
- \SetLanguageKeys{hindi}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Hindi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Hindi numeral `#1'}}
+
+\DeclareKeys[polyglossia/gloss/hindi]
+ {
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \hindi@devanagari@numeralstrue
+ \SetLanguageKeys{hindi}{bcp47-extension-u=nu-deva}%
+ },
+ numerals / western.code =
+ {%
+ \hindi@devanagari@numeralsfalse
+ \SetLanguageKeys{hindi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Hindi numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{hindi}{numerals=devanagari}
+\InitializeGlossOptions{hindi}{numerals=devanagari}
\newcommand{\hindinumerals}[2]{\hindinumber{#2}}
@@ -17628,6 +17643,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\contentsname{विषय सूची}%
\def\enclname{}%
\def\figurename{चित्र}% रेखाचित्र
+ \def\glossaryname{शब्दार्थ सूची}%
\def\headpagename{पृष्ठ}%
\def\headtoname{}%
\def\indexname{सूची}%
@@ -17639,6 +17655,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\pagename{पृष्ठ}%
\def\partname{खण्ड}%
\def\prefacename{प्रस्तावना}% प्राक्कथन
+ \def\proofname{प्रमाण}%
\def\refname{हवाले}%
\def\tablename{तालिका}%
\def\seename{देखिए}%
@@ -17671,13 +17688,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hr.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hr.ldf}[polyglossia: module for hr (Croatian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{croatian}
+\InheritGlossFile{croatian}
% \end{macrocode}
% \iffalse
@@ -17688,13 +17705,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hsb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hsb.ldf}[polyglossia: module for hsb (Higher Sorbian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
% \end{macrocode}
% \iffalse
@@ -17705,13 +17722,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hu.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hu.ldf}[polyglossia: module for hu (Hungarian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hungarian}
+\InheritGlossFile{hungarian}
% \end{macrocode}
% \iffalse
@@ -17722,7 +17739,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hungarian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hungarian.ldf}[polyglossia: module for Hungarian]
@@ -17749,53 +17766,61 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@hungarian@swapcaptions
\newif\if@hungarian@swapheadings
\newif\if@hungarian@swapheaders
-\define@choicekey*+{hungarian}{swapstrings}[\xpg@val\xpg@nr]{all,captions,headings,headers,hheaders,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@hungarian@swapcaptionstrue%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheaderstrue%
- \or
- % captions:
- \@hungarian@swapcaptionstrue%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheadersfalse%
- \or
- % headings:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheadersfalse%
- \or
- % headers:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheaderstrue%
- \or
- % hheaders:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheaderstrue%
- \or
- % none:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheadersfalse%
- \fi
- \xpg@info{Option: Hungarian, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Hungarian swapstrings value `#1'}}
-% Force punctuation: 1) after section type counters; 2) after @chapapp in the running head
-\define@boolkey{hungarian}[hungarian@]{forceheadingpunctuation}[true]{}
+\DeclareKeys[polyglossia/gloss/hungarian]
+ {
+ forceheadingpunctuation.if = hungarian@forceheadingpunctuation,
+ forceheadingpunctuation.default:n = true,
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@hungarian@swapcaptionstrue
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / captions.code =
+ {%
+ \@hungarian@swapcaptionstrue
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings / headings.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / hheaders.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Hungarian swapstrings value `#1'}
+ }
% Register default options
% forceheadinpunctuatin is recommended, but the default value is false for compatibility reasons
-\xpg@initialize@gloss@options{hungarian}{swapstrings=all,
+\InitializeGlossOptions{hungarian}{swapstrings=all,
forceheadingpunctuation=false}
\def\hungarian@language{%
- \polyglossia@setup@language@patterns{hungarian}%
- \xpg@ifdefined{hungarian}{\adddialect\l@magyar\l@hungarian}{}%
+ \SetupPolyglossiaLangPatterns{hungarian}%
+ \IfLanguageDefinedT{hungarian}{\adddialect\l@magyar\l@hungarian}%
}%
\def\captionshungarian{%
@@ -17867,120 +17892,104 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% change chapter and part headings
\if@hungarian@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
- {\thechapter.\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
+ \@ifundefined{titleformat}{%
% With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\thepart.~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat%
- \renewcommand{\chapterformat}{\mbox{\thechapter\autodot%
- \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead%
- \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
- {\printchapternum.\chapternamenum\printchaptername}%
- {}%
- {\xpg@warning{Failed to patch chapter for Hungarian}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
- {\printpartnum.\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
- {\printpartnum.\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{sectionformat}{%
+ % Memoir?
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{@makechapterhead}{%
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead%
\patchcmd{\@makechapterhead}%
{\@chapapp\space \thechapter}%
{\thechapter.\space \@chapapp}%
{}%
{\xpg@warning{Failed to patch chapter for Hungarian}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Hungarian}}}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part%
\patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\thepart.\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Hungarian}}{}}%
- }{}% (end \ifdefined\@part)
}% (end not hyperref)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }{% with memoir (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead%
+ \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
+ {\printchapternum.\chapternamenum\printchaptername}%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Hungarian}}%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
+ {\printpartnum.\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
+ {\printpartnum.\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\thepart.~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat%
+ \renewcommand{\chapterformat}{\mbox{\thechapter\autodot%
+ \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+ {\thechapter.\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+ }%
}% (end \ifdefined\titleformat)
\fi% (end \if@hungarian@swapheadings)
%
% Change running headers
\if@hungarian@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat%
- \renewcommand*\chaptermarkformat{%
- \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\@hungarian@forced@dot\enskip}{}}
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark%
- \renewcommand*\chaptermark[1]{%
- \markboth{\memUChead{%
- \ifnum \c@secnumdepth >\m@ne
- \ifbool{@mainmatter}{%
- \thechapter.\ \@chapapp\@hungarian@forced@dot\ %
- }{}%
- \fi
- ##1}}{}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter.}%
{\let\xpg@save@chaptermark@format\chaptermark%
@@ -17990,8 +17999,24 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
{}%
{\xpg@warning{Failed to patch chaptermark for Hungarian}}}%
{}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark%
+ \renewcommand*\chaptermark[1]{%
+ \markboth{\memUChead{%
+ \ifnum \c@secnumdepth >\m@ne
+ \ifbool{@mainmatter}{%
+ \thechapter.\ \@chapapp\@hungarian@forced@dot\ %
+ }{}%
+ \fi
+ ##1}}{}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat%
+ \renewcommand*\chaptermarkformat{%
+ \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\@hungarian@forced@dot\enskip}{}}
}% (end \ifdefined\chapterformat)
\fi% (end \if@hungarian@swapheaders)
}
@@ -18003,58 +18028,58 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\fnum@figure\xpg@save@fnum@figure%
%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format%
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format%
- }{}%
- }{}% (end \ifdefined\chaptermark)
- }% (end \ifdefined\chapterformat)
+ }%
+ }% (end \ifdefined\chaptermark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format%
+ }%
+ }% (end \ifdefined\chaptermarkformat)
}
% Hungarian needs 1) trailing dots in chapter headings; 2) trailing dot in section, subsection, etc, counters
\def\@hungarian@forced@dot{}
@@ -18121,13 +18146,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hy.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hy.ldf}[polyglossia: module for hy (Armenian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{armenian}
+\InheritGlossFile{armenian}
% \end{macrocode}
% \iffalse
@@ -18138,13 +18163,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ia.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ia.ldf}[polyglossia: module for ia (Interlingua)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{interlingua}
+\InheritGlossFile{interlingua}
% \end{macrocode}
% \iffalse
@@ -18155,7 +18180,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-icelandic.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-icelandic.ldf}[polyglossia: module for Icelandic]
\PolyglossiaSetup{icelandic}{
@@ -18213,13 +18238,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-id.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-id.ldf}[polyglossia: module for id (Malay)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
% \end{macrocode}
% \iffalse
@@ -18230,7 +18255,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-interlingua.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-interlingua.ldf}[polyglossia: module for Interlingua]
\PolyglossiaSetup{interlingua}{
@@ -18288,14 +18313,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-irish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-irish.ldf}[polyglossia: module for Irish]
% We only provide this gloss for babel compatibility. Since irish is
% a gaelic variety, we use 'gaelic' with variant 'irish' now.
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
% \end{macrocode}
% \iffalse
@@ -18306,13 +18331,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-is.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-is.ldf}[polyglossia: module for is (Icelandic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{icelandic}
+\InheritGlossFile{icelandic}
% \end{macrocode}
% \iffalse
@@ -18323,13 +18348,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-it.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-it.ldf}[polyglossia: module for it (Italian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{italian}
+\InheritGlossFile{italian}
% \end{macrocode}
% \iffalse
@@ -18341,7 +18366,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \subsection{gloss-italian.ldf}
% \begin{macrocode}
% !TEX encoding = UTF-8 Unicode
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-italian.ldf}[polyglossia: module for Italian]
\PolyglossiaSetup{italian}{
@@ -18360,24 +18385,22 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{italian}{it}
-
-%%% CHANGES START %%% by Enrico Gregorio
-\define@boolkey{italian}[italian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/italian]
+ {
+ babelshorthands.if = italian@babelshorthands,
+ babelshorthands.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{italian}{babelshorthands=false}
+\InitializeGlossOptions{italian}{babelshorthands=false}
\ifsystem@babelshorthands
- \setkeys{italian}{babelshorthands=true}
+ \SetGlossOptions{italian}{babelshorthands=true}
\else
- \setkeys{italian}{babelshorthands=false}
+ \SetGlossOptions{italian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\italian@shorthands{%
\xpg@activate@shorthands%
@@ -18457,7 +18480,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%%% CHANGES START %%% by Enrico Gregorio
\let\xpgit@savedvalues\empty
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgit@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
@@ -18493,13 +18516,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ja.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ja.ldf}[polyglossia: module for ja (Japanese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{japanese}
+\InheritGlossFile{japanese}
% \end{macrocode}
% \iffalse
@@ -18510,7 +18533,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-japanese.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-japanese.ldf}[polyglossia: module for Japanese]
@@ -18749,13 +18772,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ka.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ka.ldf}[polyglossia: module for ka (Georgian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{georgian}
+\InheritGlossFile{georgian}
% \end{macrocode}
% \iffalse
@@ -18767,7 +18790,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \subsection{gloss-kannada.ldf}
% \begin{macrocode}
%% gloss-kannada.ldf
-%% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+%% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%%
%% Copyright 2011 Aravinda VK <hallimanearavind AT gmail.com>,
%% Shankar Prasad <prasad.mvs AT gmail.com>,
@@ -18821,12 +18844,20 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\tmp@western{Western}
\newif\ifkannada@numerals
\kannada@numeralstrue
-
-\define@key{kannada}{numerals}[Kannada]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@western
- \kannada@numeralsfalse
- \fi}
+
+\DeclareKeys[polyglossia/gloss/kannada]
+ {
+ numerals.choice:,
+ numerals / kannada.code =
+ {%
+ \kannada@numeralstrue
+ },
+ numerals / western.code =
+ {%
+ \kannada@numeralsfalse
+ },
+ numerals.default:n = kannada
+ }
\def\captionskannada{%
@@ -18890,7 +18921,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-khmer.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-khmer.ldf}[polyglossia: module for Khmer]
\PolyglossiaSetup{khmer}{
@@ -18911,18 +18942,24 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@khmer@numerals
\def\tmp@khmer{khmer}
-\define@key{khmer}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@khmer%
- \@khmer@numeralstrue%
- \SetLanguageKeys{khmer}{bcp47-extension-u=nu-khmr}%
- \else%
- \@khmer@numeralsfalse%
- \SetLanguageKeys{khmer}{bcp47-extension-u=nu-latn}%
- \fi%
-}
-\setkeys{khmer}{numerals}
+\DeclareKeys[polyglossia/gloss/khmer]
+ {
+ numerals.choice:,
+ numerals / khmer.code =
+ {%
+ \@khmer@numeralstrue
+ \SetLanguageKeys{khmer}{bcp47-extension-u=nu-khmr}%
+ },
+ numerals / arabic.code =
+ {%
+ \@khmer@numeralsfalse
+ \SetLanguageKeys{khmer}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = arabic
+ }
+
+\SetGlossOptions{khmer}{numerals}
\def\captionskhmer{%
\def\prefacename{អារម្ភកថា}%
@@ -19073,13 +19110,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-km.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-km.ldf}[polyglossia: module for km (Khmer)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{khmer}
+\InheritGlossFile{khmer}
% \end{macrocode}
% \iffalse
@@ -19090,13 +19127,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kmr-Arab.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr-Arab.ldf}[polyglossia: module for kmr-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -19107,13 +19144,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kmr-Latn.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr-Latn.ldf}[polyglossia: module for kmr-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -19124,13 +19161,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kmr.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr.ldf}[polyglossia: module for kmr (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -19141,13 +19178,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kn.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kn.ldf}[polyglossia: module for kn (Kannada)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kannada}
+\InheritGlossFile{kannada}
% \end{macrocode}
% \iffalse
@@ -19158,13 +19195,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ko.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ko.ldf}[polyglossia: module for ko (Korean)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{korean}
+\InheritGlossFile{korean}
% \end{macrocode}
% \iffalse
@@ -19175,7 +19212,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-korean.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-korean.ldf}[polyglossia: module for Korean]
@@ -19195,40 +19232,48 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{korean}{ko}
-% variant : plain (0), classic (1), or modern (2)
-\define@choicekey{korean}{variant}[\xpg@val\xpg@nr]{plain,classic,modern}[plain]{%
- \let\xpg@korean@variant\xpg@nr
-}
-% captions : hangul (0) or hanja (1)
-\define@choicekey{korean}{captions}[\xpg@val\xpg@nr]{hangul,hanja}[hangul]{%
- \let\xpg@korean@captions\xpg@nr
-}
-% swapstrings: all (0), headings (1), headers (2), or none (3)
\newif\if@korean@swapheadings
\newif\if@korean@swapheaders
-\define@choicekey*+{korean}{swapstrings}[\xpg@val\xpg@nr]{all,headings,headers,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@korean@swapheadingstrue%
- \@korean@swapheaderstrue%
- \or
- % headings:
- \@korean@swapheadingstrue%
- \@korean@swapheadersfalse%
- \or
- % headers:
- \@korean@swapheadingsfalse%
- \@korean@swapheaderstrue%
- \or
- % none:
- \@korean@swapheadingsfalse%
- \@korean@swapheadersfalse%
- \fi
- \xpg@info{Option: Korean, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Korean swapstrings value `#1'}}
+
+\DeclareKeys[polyglossia/gloss/korean]
+ {
+ variant.choices:nn = { plain, classic, modern }
+ {%
+ \edef\xpg@korean@variant{\the\numexpr\UseName{l_keys_choice_int}-1\relax}
+ },
+ variant.default:n = plain,
+ captions.choices:nn = { hangul, hanja }
+ {%
+ \edef\xpg@korean@captions{\the\numexpr\UseName{l_keys_choice_int}-1\relax}
+ },
+ captions.default:n = hangul,
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@korean@swapheadingstrue
+ \@korean@swapheaderstrue
+ },
+ swapstrings / headings.code =
+ {%
+ \@korean@swapheadingstrue
+ \@korean@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@korean@swapheadingsfalse
+ \@korean@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@korean@swapheadingsfalse
+ \@korean@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Korean swapstrings value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{korean}{variant=plain,swapstrings=all,captions=hangul}
+\InitializeGlossOptions{korean}{variant=plain,swapstrings=all,captions=hangul}
\def\captionskorean{%
\ifcase\xpg@korean@captions\relax
@@ -19290,60 +19335,48 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% change chapter and part headings
\if@korean@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
- {}%
- {\xpg@warning{Failed to patch part for Korean}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part
- \patchcmd{\@part}%
+ \@ifundefined{titleformat}{%
+ % With KOMA
+ \@ifundefined{sectionformat}{%
+ % With memoir
+ \@ifundefined{@memptsize}{%
+ % With standard classes
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead
+ \patchcmd{\@makechapterhead}%
+ {\@chapapp\space \thechapter}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\space \thechapter
+ \else
+ \koreanTHEname\space \thechapter\space \@chapapp
+ \fi
+ }%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Korean}}%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \ifpatchable{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\let\xpg@save@part@format\@part
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Korean}}}}%
+ {}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
{}%
{\xpg@warning{Failed to patch part for Korean}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\space \thechapter
- \else
- \koreanTHEname\space \thechapter\space \@chapapp
- \fi
- }{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
- }{}%
- }{% (not \ifdefined\titleformat)
- % With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat
- \renewcommand*{\partformat}{\koreanTHEname~\thepart~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat
- \renewcommand*{\chapterformat}{\mbox{%
- \IfChapterUsesPrefixLine
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \chapapp\nobreakspace \thechapter\autodot
- \else
- \koreanTHEname\nobreakspace \thechapter\nobreakspace \chapapp\autodot
- \fi
- }%
- {\thechapter\autodot\enskip}%
- }}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
+ }% (end not hyperref)
+ }{% (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead
\patchcmd{\@makechapterhead}%
{\printchaptername \chapternamenum \printchapternum}%
@@ -19361,19 +19394,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\ifpatchable\printchaptername\@chapapp
{\chapnamefont\koreanTHEname\chapternamenum}{}}%
\fi
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part
- \patchcmd{\NR@part}%
- {\printpartname \partnamenum \printpartnum}%
- {\printkoreanpartthe \printpartnum\partnamenum \printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Korean}}%
- \ifdefined\printkoreanpartthe\else
- \def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
- \fi
- }{% not hyperref
- \ifcsdef{@part}{%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
\let\xpg@save@part@format\@part
\patchcmd{\@part}%
{\printpartname \partnamenum \printpartnum}%
@@ -19383,84 +19406,77 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\ifdefined\printkoreanpartthe\else
\def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
\fi
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
- % With standard classes
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead
- \patchcmd{\@makechapterhead}%
- {\@chapapp\space \thechapter}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\space \thechapter
- \else
- \koreanTHEname\space \thechapter\space \@chapapp
- \fi
- }%
- {}%
- {\xpg@warning{Failed to patch chapter for Korean}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
+ }%
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part
\patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {\printpartname \partnamenum \printpartnum}%
+ {\printkoreanpartthe \printpartnum\partnamenum \printpartname}%
{}%
{\xpg@warning{Failed to patch part for Korean}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \ifpatchable{\@part}%
- {\partname\nobreakspace\thepart}%
- {\let\xpg@save@part@format\@part
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Korean}}{}}}%
- {}%
- }{}% (end \ifdefined\@part)
- }% (end not hyperref)
+ \ifdefined\printkoreanpartthe\else
+ \def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
+ \fi
+ }%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat
+ \renewcommand*{\partformat}{\koreanTHEname~\thepart~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat
+ \renewcommand*{\chapterformat}{\mbox{%
+ \IfChapterUsesPrefixLine
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \chapapp\nobreakspace \thechapter\autodot
+ \else
+ \koreanTHEname\nobreakspace \thechapter\nobreakspace \chapapp\autodot
+ \fi
+ }%
+ {\thechapter\autodot\enskip}%
+ }}%
+ }%
}% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Korean}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Korean}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\space \thechapter
+ \else
+ \koreanTHEname\space \thechapter\space \@chapapp
+ \fi
+ }{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
+ }%
}% (end \ifdefined\titleformat)
\fi % (end \if@korean@swapheadings)
%
% Change running headers
\if@korean@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat
- \renewcommand*\chaptermarkformat{%
- \IfChapterUsesPrefixLine
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \chapapp\ \thechapter\autodot
- \else
- \koreanTHEname\ \thechapter\ \chapapp\autodot
- \fi
- }%
- {\thechapter\autodot}%
- \enskip
- }%
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark
- \patchcmd{\chaptermark}%
- {\@chapapp\ \@nameuse{thechapter}}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\ \@nameuse{thechapter}%
- \else
- \koreanTHEname\ \@nameuse{thechapter}\ \@chapapp
- \fi
- }%
- {}%
- {\xpg@warning{Failed to patch chaptermark for Korean}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter}%
{\let\xpg@save@chaptermark@format\chaptermark
@@ -19476,65 +19492,94 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
{}%
{\xpg@warning{Failed to patch chaptermark for Korean}}}%
{}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark
+ \patchcmd{\chaptermark}%
+ {\@chapapp\ \@nameuse{thechapter}}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\ \@nameuse{thechapter}%
+ \else
+ \koreanTHEname\ \@nameuse{thechapter}\ \@chapapp
+ \fi
+ }%
+ {}%
+ {\xpg@warning{Failed to patch chaptermark for Korean}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat
+ \renewcommand*\chaptermarkformat{%
+ \IfChapterUsesPrefixLine
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \chapapp\ \thechapter\autodot
+ \else
+ \koreanTHEname\ \thechapter\ \chapapp\autodot
+ \fi
+ }%
+ {\thechapter\autodot}%
+ \enskip
+ }%
}% (end \ifdefined\chapterformat)
\fi % (end \if@korean@swapheaders)
}
\def\nokorean@headingsformat{%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format
+ }{%
+ \let\NR@part\xpg@save@part@format
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format
+ }{%
+ \let\NR@part\xpg@save@part@format
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format
- }{%
- \let\@part\xpg@save@part@format
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format
- }{}%
- }{}% (end \ifdefined\chaptermark)
+ }%
+ }% (end \ifdefined\chaptermark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format
+ }%
}% (end \ifdefined\chapterformat)
}
@@ -19598,13 +19643,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\XeTeXinterchartokenstate\z@
\XeTeXlinebreakpenalty\z@
\XeTeXlinebreakskip\z@skip
- \XeTeXlinebreaklocale "en"
+ \XeTeXlinebreaklocale ""
\noextras@korean@common
}
\else % luatex
- \def\inlineextras@korean{\xpg@attr@korean\xpg@korean@variant\relax}
+ \def\inlineextras@korean{\xpg@attr@cjkspacing\xpg@korean@variant\relax}
\def\noextras@korean{%
- \unsetattribute\xpg@attr@korean
+ \unsetattribute\xpg@attr@cjkspacing
\noextras@korean@common
}
\fi
@@ -19624,7 +19669,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\newattribute\newluatexattribute
\let\unsetattribute\unsetluatexattribute
\fi
-\newattribute\xpg@attr@korean
+\newattribute\xpg@attr@cjkspacing
\newattribute\xpg@attr@autojosa
% user commands for Josa
% Josa : particles in Korean grammar that immediately follow a noun or pronoun.
@@ -19645,7 +19690,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\protected\def\로{\으 로}
\def\xpg@reset@josa {\global\let\xpg@josa@zwang\z@}\xpg@reset@josa
% load lua file for korean
-\directlua{ require "polyglossia-korean" }
+\directlua{ require "polyglossia-cjk-spacing" }
% \end{macrocode}
% \iffalse
%</gloss-korean.ldf>
@@ -19655,13 +19700,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ku-Arab.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku-Arab.ldf}[polyglossia: module for ku-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -19672,13 +19717,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ku-Latn.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku-Latn.ldf}[polyglossia: module for ku-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -19689,13 +19734,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ku.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku.ldf}[polyglossia: module for ku (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -19706,7 +19751,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kurdish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Created on September 1, 2019
% Last updated on May 17, 2020
@@ -19749,36 +19794,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@kurdish@kurmanji
\def\kurdish@variant{sorani}
-\define@choicekey*+{kurdish}{variant}[\xpg@val\xpg@nr]{sorani,kurmanji}[sorani]{%
- \ifcase\xpg@nr\relax
- % sorani:
- \def\kurdish@variant{sorani}%
- \@kurdish@kurmanjifalse%
- \or
- % kurmanji:
- \def\kurdish@variant{kurmanji}%
- \@kurdish@kurmanjitrue%
- \fi
- \kurdish@set@variety%
- \xpg@info{Option: kurdish, variant=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish variant `#1'}}
\newif\if@kurdish@latin
\newif\if@kurdish@arabic
-\define@choicekey*+{kurdish}{script}[\xpg@val\xpg@nr]{arabic,latin}{%
- \ifcase\xpg@nr\relax
- % arabic:
- \@kurdish@latinfalse%
- \@kurdish@arabictrue%
- \or
- % latin:
- \@kurdish@latintrue%
- \@kurdish@arabicfalse%
- \fi
- \kurdish@set@variety%
- \xpg@info{Option: kurdish, script=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish script `#1'}}
-
\newif\if@western@numerals
\newif\if@force@western@numerals
@@ -19795,7 +19813,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\SetLanguageKeys{kurdish}{script=Latin,direction=LR,scripttag=latn,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
\fi
\def\kurdish@script{latin}
- \xpg@fontsetup@latin{kurdish}%
+ \SetupLatinPolyglossiaFont{kurdish}%
\else
\if@kurdish@arabic% arabic explicitly set
\if@kurdish@kurmanji
@@ -19805,61 +19823,84 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\else
\SetLanguageKeys{kurdish}{script=Arabic,direction=RL,scripttag=arab,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
\fi
- \xpg@fontsetup@nonlatin{kurdish}%
+ \SetupNonLatinPolyglossiaFont{kurdish}%
\else% sorani=arabic, kurmanji=latin
\if@kurdish@kurmanji
\@western@numeralstrue%
\SetLanguageKeys{kurdish}{script=Latin,direction=LR,scripttag=latn,babelname=kurmanji,bcp47=kmr-Latn,bcp47-language=kmr,bcp47-script=Latn,bcp47-casing=kmr-Latn}%
- \xpg@fontsetup@latin{kurdish}%
+ \SetupLatinPolyglossiaFont{kurdish}%
\def\kurdish@script{latin}
\else
\SetLanguageKeys{kurdish}{script=Arabic,direction=RL,scripttag=arab,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
- \xpg@fontsetup@nonlatin{kurdish}%
+ \SetupNonLatinPolyglossiaFont{kurdish}%
\fi
\fi
\fi
}
\newif\if@western@numerals
-\define@choicekey*+{kurdish}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \or
- % western:
- \@western@numeralstrue%
- \@force@western@numeralstrue%
- \fi
- \xpg@info{Option: Kurdish, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish numerals option `#1'}}
\newif\ifkurdish@customsep\kurdish@customsepfalse
\def\xpg@sepmark{}
-\define@key{kurdish}{sectionsep}[.]{%
- \kurdish@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{kurdish}[kurdish@]{abjadjimnotail}[true]{%
- \ifkurdish@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi%
-}
-
-% NOT YET USED
-\define@key{kurdish}{locale}[default]{%
- \def\@kurdish@locale{#1}}
%TODO add option for CALENDAR
+\DeclareKeys[polyglossia/gloss/kurdish]
+ {
+ variant.choice:,
+ variant / sorani.code =
+ {%
+ \def\kurdish@variant{sorani}%
+ \@kurdish@kurmanjifalse
+ \kurdish@set@variety
+ },
+ variant / kurmanji.code =
+ {%
+ \def\kurdish@variant{kurmanji}%
+ \@kurdish@kurmanjitrue
+ \kurdish@set@variety
+ },
+ variant.default:n = sorani,
+ variant/unknown.code = \xpg@warning{Unknown Kurdish variant `#1'},
+ script.choice:,
+ script / arabic.code =
+ {%
+ \@kurdish@latinfalse
+ \@kurdish@arabictrue
+ \kurdish@set@variety
+ },
+ script / latin.code =
+ {%
+ \@kurdish@latintrue
+ \@kurdish@arabicfalse
+ \kurdish@set@variety
+ },
+ script.default:n = sorani,
+ script/unknown.code = \xpg@warning{Unknown Kurdish script `#1'},
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \@force@western@numeralstrue
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Kurdish numerals value `#1'},
+ sectionsep.code = \gdef\xpg@sepmark{#1}\kurdish@customseptrue,
+ sectionsep.default:n = .,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ locale.store = \@kurdish@locale
+ }
+
% Register default options
-\xpg@initialize@gloss@options{kurdish}{variant=sorani,locale=default,script=arabic,abjadjimnotail=false,numerals=eastern}
+\InitializeGlossOptions{kurdish}{variant=sorani,locale=default,script=arabic,abjadjimnotail=false,numerals=eastern}
\def\kurdish@language{%
- \polyglossia@setup@language@patterns{\kurdish@pattern}%
+ \SetupPolyglossiaLangPatterns{\kurdish@pattern}%
}%
\def\kurdishNativemonth#1{\ifcase#1%
@@ -20112,16 +20153,16 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nokurdish@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\kurdish@luatex@capsformat{%
%
% change chapter and part headings
\ifkurdish@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -20133,7 +20174,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -20148,30 +20189,30 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nokurdish@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@kurdish{%
@@ -20203,13 +20244,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kurmanji.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kurmanji.ldf}[polyglossia: module for Kurmanji Kurdish]
% We provide this gloss for babel compatibility.
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
% \end{macrocode}
% \iffalse
@@ -20220,13 +20261,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la-x-classic.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xclassic.ldf}[polyglossia: module for la-xclassic (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
% \end{macrocode}
% \iffalse
@@ -20237,13 +20278,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la-x-ecclesia.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xecclesiastic.ldf}[polyglossia: module for la-xecclesiastic (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
% \end{macrocode}
% \iffalse
@@ -20254,13 +20295,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la-x-medieval.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xmedieval.ldf}[polyglossia: module for la-xmedieval (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
% \end{macrocode}
% \iffalse
@@ -20271,13 +20312,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la.ldf}[polyglossia: module for la (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
% \end{macrocode}
% \iffalse
@@ -20288,7 +20329,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lao.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lao.ldf}[polyglossia: module for Lao]
@@ -20312,14 +20353,23 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@lao@numerals
\def\tmp@lao{lao}
-\define@key{lao}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@lao\@lao@numeralstrue\else
- \@lao@numeralsfalse\fi
-}
+
+\DeclareKeys[polyglossia/gloss/lao]
+ {
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \@lao@numeralsfalse
+ },
+ numerals / lao.code =
+ {%
+ \@lao@numeralstrue
+ },
+ numerals.default:n = arabic
+ }
% Register default options
-\xpg@initialize@gloss@options{lao}{numerals=arabic}
+\InitializeGlossOptions{lao}{numerals=arabic}
% Translations provided by Brian Wilson <bountonw at gmail.com>
\def\captionslao{%
@@ -20399,7 +20449,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latex.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latex.ldf}[polyglossia: module for default language]
@@ -20449,7 +20499,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latin.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latin.ldf}[polyglossia: module for Latin]
@@ -20484,6 +20534,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\bool_new:N \l_polyglossia_latin_use_v_bool
\bool_new:N \l_polyglossia_latin_use_ligatures_bool
\bool_new:N \l_polyglossia_latin_capitalize_month_bool
+\bool_new:N \l_polyglossia_latin_babelshorthands_bool
+\bool_new:N \l_polyglossia_latin_prosodic_shorthands_bool
+\bool_new:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
\cs_new:Npn \polyglossia_latin_classical_character_codes:
{
@@ -20519,11 +20572,11 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\cs_new:Npn \polyglossia_latin_use_modern_patterns:
{
- \xpg@ifdefined {latin}
+ \IfLanguageDefinedTF {latin}
{
\def \latin@language
{
- \polyglossia@setup@language@patterns {latin}
+ \SetupPolyglossiaLangPatterns {latin}
\str_case:Vn \l_polyglossia_latin_variant_str
{
{classic} { \adddialect \l@classiclatin \l@latin }
@@ -20547,11 +20600,11 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\cs_new:Npn \polyglossia_latin_set_patterns:n #1
% #1 may be "classiclatin" or "liturgicallatin"
{
- \xpg@ifdefined {#1}
+ \IfLanguageDefinedTF {#1}
{
\def \latin@language
{
- \polyglossia@setup@language@patterns {#1}
+ \SetupPolyglossiaLangPatterns {#1}
\str_case:Vn \l_polyglossia_latin_variant_str
{
{classic} {
@@ -20767,7 +20820,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% Save original footnote definition
% Do this at the end of the preamble to catch other
% packages' footnote changes (#391)
-\AtEndPreamble{%
+\hook_gput_code:nnn { begindocument / before } {.}
+{
\cs_if_exist:NT \@makefntext
{
\cs_set_eq:NN \polyglossia_latin_original_footnote:n \@makefntext
@@ -20791,40 +20845,27 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\cs_new:Npn \polyglossia_latin_apply_footnote_option:
{
- \str_if_eq:VnTF \xpg@main@language {latin}
+ \IfMainLanguageTF {latin}
{
\cs_if_exist:NT \@makefntext
{
- \iflatin@ecclesiasticfootnotes
+ \bool_if:NTF \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ {
\let \@makefntext \polyglossia_latin_variant_footnote:n
- \else
+ }
+ {
\let \@makefntext \polyglossia_latin_original_footnote:n
- \fi
+ }
}
}
{
- \iflatin@ecclesiasticfootnotes
- \msg_warning:nn {polyglossia} {latin / ineffective footnote option}
- \fi
- }
- }
-
-\define@boolkey {latin} [latin@] {ecclesiasticfootnotes} [true]
- {
- \token_if_eq_meaning:NNTF \@onlypreamble \@notprerr
- {
- % within the document
- \polyglossia_latin_apply_footnote_option:
- }
- {
- % within the preamble
- % The application of the option has to be postponed as the main
- % language may be undefined when the option is called.
- \AtBeginDocument { \polyglossia_latin_apply_footnote_option: }
+ \bool_if:NT \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ {
+ \msg_warning:nn {polyglossia} {latin / ineffective footnote option}
+ }
}
}
-
%%%%% Language variants: classic, medieval, modern, and ecclesiastic
\str_new:N \l_polyglossia_latin_variant_str
@@ -20887,58 +20928,6 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\polyglossia_latin_use_modern_patterns:
}
-\define@key{latin}{variant}
- {
- \str_case:nnF {#1}
- {
- {classic}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {classic}
- \polyglossia_latin_classic_settings:
- }
- {medieval}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {medieval}
- \polyglossia_latin_medieval_settings:
- }
- {modern}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {modern}
- \polyglossia_latin_modern_settings:
- }
- {ecclesiastic}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {ecclesiastic}
- \polyglossia_latin_ecclesiastic_settings:
- }
- }
- {
- \msg_warning:nnn {polyglossia} {latin / illegal language variant} {#1}
- }
- }
-
-
-%%%%% Boolean options concerning spelling
-
-\define@boolkey{latin}[latin@]{usej}[true]
- {
- \iflatin@usej
- \bool_set_true:N \l_polyglossia_latin_use_j_bool
- \else
- \bool_set_false:N \l_polyglossia_latin_use_j_bool
- \fi
- }
-
-\define@boolkey{latin}[latin@]{capitalizemonth}[true]
- {
- \iflatin@capitalizemonth
- \bool_set_true:N \l_polyglossia_latin_capitalize_month_bool
- \else
- \bool_set_false:N \l_polyglossia_latin_capitalize_month_bool
- \fi
- }
-
-
%%%%% Hyphenation variants: classic, liturgical, and modern
\msg_new:nnn {polyglossia} {latin / hyphenation variant}
@@ -20951,23 +20940,6 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
The~Latin~hyphenation~variant~"#1"~is~undefined~\msg_line_context:.
}
-\define@key {latin} {hyphenation}
- {
- \str_case:nnTF {#1}
- {
- {classic} { \polyglossia_latin_set_patterns:n {classiclatin} }
- {liturgical} { \polyglossia_latin_set_patterns:n {liturgicallatin} }
- {modern} { \polyglossia_latin_use_modern_patterns: }
- }
- {
- \msg_info:nnn {polyglossia} {latin / hyphenation variant} {#1}
- }
- {
- \msg_warning:nnn {polyglossia} {latin / illegal hyphenation variant} {#1}
- }
- }
-
-
%%%%% Latin captions and date
\def \captionslatin
@@ -21039,30 +21011,89 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
}
-
-%%%%% Latin shorthands
-
-\define@boolkey{latin}[latin@]{babelshorthands}[true]
- {
- }
-
-\define@boolkey{latin}[latin@]{prosodicshorthands}[true]
+\DeclareKeys[polyglossia/gloss/latin]
{
+ babelshorthands.bool_set:N = \l_polyglossia_latin_babelshorthands_bool,
+ babelshorthands.default:n = true,
+ prosodicshorthands.bool_set:N = \l_polyglossia_latin_prosodic_shorthands_bool,
+ prosodicshorthands.default:n = true,
+ usej.bool_set:N = \l_polyglossia_latin_use_j_bool,
+ capitalizemonth.bool_set:N = \l_polyglossia_latin_capitalize_month_bool,
+ hyphenation.code =
+ \str_case:nnTF {#1}
+ {
+ {classic} { \polyglossia_latin_set_patterns:n {classiclatin} }
+ {liturgical} { \polyglossia_latin_set_patterns:n {liturgicallatin} }
+ {modern} { \polyglossia_latin_use_modern_patterns: }
+ }
+ {
+ \msg_info:nnn {polyglossia} {latin / hyphenation variant} {#1}
+ }
+ {
+ \msg_warning:nnn {polyglossia} {latin / illegal hyphenation variant} {#1}
+ },
+ variant.code =
+ \str_case:nnF {#1}
+ {
+ {classic}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {classic}
+ \polyglossia_latin_classic_settings:
+ }
+ {medieval}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {medieval}
+ \polyglossia_latin_medieval_settings:
+ }
+ {modern}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {modern}
+ \polyglossia_latin_modern_settings:
+ }
+ {ecclesiastic}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {ecclesiastic}
+ \polyglossia_latin_ecclesiastic_settings:
+ }
+ }
+ {
+ \msg_warning:nnn {polyglossia} {latin / illegal language variant} {#1}
+ },
+ ecclesiasticfootnotes.choices:nn = { true, false }
+ {
+ \ifcase\UseName{l_keys_choice_int}\or
+ \bool_set_true:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ \else
+ \bool_set_false:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ \fi
+ \xpg_if_in_preamble:TF
+ {
+ % within the preamble
+ % The application of the option has to be postponed as the main
+ % language may be undefined when the option is called.
+ \AtBeginDocument { \polyglossia_latin_apply_footnote_option: }
+ }
+ {
+ % within the document
+ \polyglossia_latin_apply_footnote_option:
+ }
+ },
+ ecclesiasticfootnotes.default:n = true
}
% Register default options
-\xpg@initialize@gloss@options{latin}{variant=modern,hyphenation=modern,babelshorthands=false,
+\InitializeGlossOptions{latin}{variant=modern,hyphenation=modern,babelshorthands=false,
prosodicshorthands=false,ecclesiasticfootnotes=false,
usej=false,capitalizemonth=true}
\ifsystem@babelshorthands
- \setkeys{latin}{babelshorthands=true}
+ \SetGlossOptions{latin}{babelshorthands=true}
\else
- \setkeys{latin}{babelshorthands=false}
+ \SetGlossOptions{latin}{babelshorthands=false}
\fi
\ExplSyntaxOff % babelsh.def does not support expl3 syntax
-\ifcsundef{initiate@active@char}{\input{babelsh.def}}{}
+\@ifundefined{initiate@active@char}{\input{babelsh.def}}{}
\ExplSyntaxOn
\initiate@active@char {"}
@@ -21094,13 +21125,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\AtBeginDocument
{
- \str_if_eq:VnTF \xpg@main@language {latin}
+ \IfMainLanguageTF {latin}
{
- \iflatin@prosodicshorthands
- \else
+ \bool_if:NF \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\shorthandoff {=}
\shorthandoff* {^}
- \fi
+ }
}
{
% The following command should not be called if the main language
@@ -21462,7 +21493,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let \xpgla@savedvalues \empty
-\AtEndPreamble
+\hook_gput_code:nnn { begindocument / before } {.}
{
\edef \xpgla@savedvalues
{
@@ -21475,12 +21506,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def \noextras@latin
{
- \iflatin@babelshorthands
+ \bool_if:NT \l_polyglossia_latin_babelshorthands_bool
+ {
\polyglossia_latin_no_shorthands:
- \fi
- \iflatin@prosodicshorthands
+ }
+ \bool_if:NT \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\polyglossia_latin_no_prosodic_shorthands:
- \fi
+ }
\xpgla@savedvalues
\polyglossia_latin_no_punctuation_spacing:
\polyglossia_latin_modern_character_codes:
@@ -21496,16 +21529,20 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
{
\polyglossia_latin_punctuation_spacing:
}
- \iflatin@babelshorthands
+ \bool_if:NTF \l_polyglossia_latin_babelshorthands_bool
+ {
\polyglossia_latin_shorthands:
- \else
+ }
+ {
\polyglossia_latin_no_shorthands:
- \fi
- \iflatin@prosodicshorthands
+ }
+ \bool_if:NTF \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\polyglossia_latin_prosodic_shorthands:
- \else
+ }
+ {
\polyglossia_latin_no_prosodic_shorthands:
- \fi
+ }
}
\def \blockextras@latin
@@ -21558,64 +21595,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \end{macrocode}
% \iffalse
%</gloss-latin.ldf>
-%<*gloss-latinclassic.ldf>
-% \fi
-% \clearpage
-%
-% \subsection{gloss-latinclassic.ldf}
-% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinclassic.ldf}[polyglossia: module for classic Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-% \end{macrocode}
-% \iffalse
-%</gloss-latinclassic.ldf>
-%<*gloss-latinecclesiastic.ldf>
-% \fi
-% \clearpage
-%
-% \subsection{gloss-latinecclesiastic.ldf}
-% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinecclesiastic.ldf}[polyglossia: module for ecclesiastic Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-% \end{macrocode}
-% \iffalse
-%</gloss-latinecclesiastic.ldf>
-%<*gloss-latinmedieval.ldf>
-% \fi
-% \clearpage
-%
-% \subsection{gloss-latinmedieval.ldf}
-% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinmedieval.ldf}[polyglossia: module for medieval Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-% \end{macrocode}
-% \iffalse
-%</gloss-latinmedieval.ldf>
%<*gloss-latvian.ldf>
% \fi
% \clearpage
%
% \subsection{gloss-latvian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latvian.ldf}[polyglossia: module for Latvian]
\PolyglossiaSetup{latvian}{
@@ -21642,12 +21628,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\contentsname{Saturs}%
\def\listfigurename{Attēlu saraksts}%
\def\listtablename{Tabulu saraksts}%
- \def\indexname{Index}%
+ \def\indexname{Priekšmetu rādītājs}%
\def\figurename{Att.}%
\def\tablename{Tabula}%
\def\partname{Daļa}%
- \def\enclname{encl}%
- \def\ccname{cc}%
+ \def\enclname{Pielikumā}%
+ \def\ccname{Kopija(s)}%
\def\headtoname{To}%
\def\pagename{lpp.}%
\def\seename{sk.}%
@@ -21673,7 +21659,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lithuanian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translated by Paulius Sladkevičius <komsas@gmail.com>
@@ -21755,13 +21741,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lo.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lo.ldf}[polyglossia: module for lo (Lao)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{lao}
+\InheritGlossFile{lao}
% \end{macrocode}
% \iffalse
@@ -21772,13 +21758,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lowersorbian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lowersorbian.ldf}[polyglossia: module for Lower Sorbian]
% We provide this as a babel alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
% \end{macrocode}
% \iffalse
@@ -21789,14 +21775,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lsorbian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lsorbian.ldf}[polyglossia: module for Lower Sorbian]
% We only provide this gloss for babel compatibility. Since lsorbian is
% a sorbian variety, we use 'sorbian' with variant 'lower' now.
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
% \end{macrocode}
% \iffalse
@@ -21807,13 +21793,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lt.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lt.ldf}[polyglossia: module for lt (Lithuanian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{lithuanian}
+\InheritGlossFile{lithuanian}
% \end{macrocode}
% \iffalse
@@ -21824,13 +21810,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lv.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lv.ldf}[polyglossia: module for lv (Latvian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latvian}
+\InheritGlossFile{latvian}
% \end{macrocode}
% \iffalse
@@ -21841,7 +21827,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-macedonian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-macedonian.ldf}[polyglossia: module for Macedonian]
\PolyglossiaSetup{macedonian}{
@@ -21940,13 +21926,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-magyar.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-magyar.ldf}[polyglossia: module for Hungarian (Magyar)]
% We only provide this gloss for babel compatibility.
-\xpg@load@master@language{hungarian}
+\InheritGlossFile{hungarian}
% \end{macrocode}
% \iffalse
@@ -21957,7 +21943,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-malay.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-malay.ldf}[polyglossia: module for Malay]
@@ -21985,65 +21971,44 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% Backwards compat. alias
\setlanguagealias[variant=malaysian]{malay}{bahasam}
-\providebool{malay@melayu}
+\@ifundefined{ifmalay@melayu}%
+ {\newif\ifmalay@melayu}{}
\malay@melayufalse
\def\malay@variant{malay}
-\define@choicekey*+{malay}{variant}[\xpg@val\xpg@nr]{indonesian,malaysian}[malaysian]{%
- \ifcase\xpg@nr\relax
- % indonesian:
- \def\malay@variant{indonesian}%
- \malay@melayufalse
- \or
- % malaysian:
- \def\malay@variant{malay}%
- \malay@melayutrue
- \fi
- \ifmalay@melayu
- \SetLanguageKeys{malay}{language=Malay,langtag=MLY,babelname=bahasam,bcp47=zsm,bcp47-language=zsm}%
- \xpg@fontsetup@latin{malay}%
- % Check if \l@malay is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{malay}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@malay}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{melayu,bahasam,bahasai,indonesian,indon,bahasa}
- \xpg@ifdefined{malay}{}{%
- \xpg@warning{No hyphenation patterns for Malay (Malaysian) found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@malay0%
- }%
- }%
- \else
- \SetLanguageKeys{malay}{language=Indonesian,langtag=IND,babelname=bahasa,bcp47=id,bcp47-language=id}%
- \xpg@fontsetup@latin{malay}%
- % Check if \l@indonesian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{indonesian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@indonesian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{indon,bahasai,bahasam,malay,melayu,bahasa}
- \xpg@ifdefined{indonesian}{}{%
- \xpg@warning{No hyphenation patterns for Malay (Indonesian) found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@indonesian0
- }%
- }%
- \fi
- \xpg@info{Option: malay, variant=\xpg@val}%
-}{\xpg@warning{Unknown malay variant `#1'}}
+
+\DeclareKeys[polyglossia/gloss/malay]
+ {
+ variant.choice:,
+ variant / indonesian.code =
+ {%
+ \def\malay@variant{indonesian}%
+ \malay@melayufalse
+ \SetLanguageKeys{malay}{language=Indonesian,langtag=IND,babelname=bahasa,bcp47=id,bcp47-language=id}%
+ \SetupLatinPolyglossiaFont{malay}%
+ % Check if \l@indonesian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{indonesian}{indon,bahasai,bahasam,malay,melayu,bahasa}%
+ },
+ variant / malaysian.code =
+ {%
+ \def\malay@variant{malay}%
+ \malay@melayutrue
+ \SetLanguageKeys{malay}{language=Malay,langtag=MLY,babelname=bahasam,bcp47=zsm,bcp47-language=zsm}%
+ \SetupLatinPolyglossiaFont{malay}%
+ % Check if \l@malay is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{malay}{melayu,bahasam,bahasai,indonesian,indon,bahasa}%
+ },
+ variant.default:n = malaysian,
+ variant/unknown.code = \xpg@warning{Unknown malay variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{malay}{variant=malaysian}
+\InitializeGlossOptions{malay}{variant=malaysian}
\def\malay@language{%
- \polyglossia@setup@language@patterns{\malay@variant}%
+ \SetupPolyglossiaLangPatterns{\malay@variant}%
}%
@@ -22156,7 +22121,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-malayalam.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-malayalam.ldf}[polyglossia: module for Malayalam]
@@ -22226,7 +22191,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-marathi.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by Abhijit Navale <abhi_navale@live.in>
% Ordinals (1-100) added by Niranjan Tambe <niranjanvikastambe@gmail.com> on 14th December, 2019
@@ -22256,21 +22221,25 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\ifmarathi@devanagari@numerals
\marathi@devanagari@numeralstrue
-\define@choicekey*+{marathi}{numerals}[\xpg@val\xpg@nr]{Western,Devanagari}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Western:
- \marathi@devanagari@numeralsfalse%
- \SetLanguageKeys{marathi}{bcp47-extension-u=nu-latn}%
- \or
- % Devanagari:
- \marathi@devanagari@numeralstrue%
- \SetLanguageKeys{marathi}{bcp47-extension-u=nu-deva}%
- \fi
- \xpg@info{Option: Marathi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Marathi numerals value `#1'}}
+\DeclareKeys[polyglossia/gloss/marathi]
+ {
+ numerals.choice:,
+ numerals / western.code =
+ {%
+ \marathi@devanagari@numeralsfalse
+ \SetLanguageKeys{marathi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / devanagari.code =
+ {%
+ \marathi@devanagari@numeralstrue
+ \SetLanguageKeys{marathi}{bcp47-extension-u=nu-deva}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Marathi numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{marathi}{numerals=Devanagari}
+\InitializeGlossOptions{marathi}{numerals=Devanagari}
\newcommand{\marathinumerals}[2]{\marathinumber{#2}}
@@ -22370,19 +22339,36 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \end{macrocode}
% \iffalse
%</gloss-marathi.ldf>
+%<*gloss-medievallatin.ldf>
+% \fi
+% \clearpage
+%
+% \subsection{gloss-medievallatin.ldf}
+% \begin{macrocode}
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-medievallatin.ldf}[polyglossia: module for medieval Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+% \end{macrocode}
+% \iffalse
+%</gloss-medievallatin.ldf>
%<*gloss-mk.ldf>
% \fi
% \clearpage
%
% \subsection{gloss-mk.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mk.ldf}[polyglossia: module for mk (Macedonian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{macedonian}
+\InheritGlossFile{macedonian}
% \end{macrocode}
% \iffalse
@@ -22393,13 +22379,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ml.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ml.ldf}[polyglossia: module for ml (Malayalam)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{malayalam}
+\InheritGlossFile{malayalam}
% \end{macrocode}
% \iffalse
@@ -22410,13 +22396,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-mn.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mn.ldf}[polyglossia: module for mn (Mongolian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{mongolian}
+\InheritGlossFile{mongolian}
% \end{macrocode}
% \iffalse
@@ -22427,7 +22413,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-mongolian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mongolian.ldf}[polyglossia: module for Mongolian]
@@ -22459,43 +22445,46 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{mongolian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \fi
- \xpg@info{Option: Mongolian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Mongolian numerals value `#1'}}
-\define@boolkey{mongolian}[mongolian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/mongolian]
+ {
+ babelshorthands.if = mongolian@babelshorthands,
+ babelshorthands.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Mongolian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{mongolian}{babelshorthands=false,numerals=arabic}
+\InitializeGlossOptions{mongolian}{babelshorthands=false,numerals=arabic}
\ifsystem@babelshorthands
- \setkeys{mongolian}{babelshorthands=true}
+ \SetGlossOptions{mongolian}{babelshorthands=true}
\else
- \setkeys{mongolian}{babelshorthands=false}
+ \SetGlossOptions{mongolian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\mongolian@shorthands{%
\xpg@activate@shorthands%
@@ -22548,7 +22537,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\bibname{Номзүй}%
\def\chaptername{Бүлэг}%
\def\appendixname{Хавсралт}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Агуулга}}%
{\def\contentsname{Гарчиг}}%
\def\listfigurename{Зургийн жагсаалт}%
@@ -22666,13 +22655,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-mr.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mr.ldf}[polyglossia: module for mr (Marathi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{marathi}
+\InheritGlossFile{marathi}
% \end{macrocode}
% \iffalse
@@ -22683,13 +22672,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-naustrian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-naustrian.ldf}[polyglossia: module for Austrian German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -22700,13 +22689,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nb.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nb.ldf}[polyglossia: module for nb (Norwegian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
% \end{macrocode}
% \iffalse
@@ -22717,13 +22706,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-newzealand.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-newzealand.ldf}[polyglossia: module for Newzealand English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
% \end{macrocode}
% \iffalse
@@ -22734,13 +22723,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ngerman.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ngerman.ldf}[polyglossia: module for German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -22751,7 +22740,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nko.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nko.ldf}[Polyglossia: module for N’Ko]
\PolyglossiaSetup{nko}{%
@@ -22849,14 +22838,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-norsk.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-norsk.ldf}[polyglossia: module for Norwegian (Bokmal)]
% We only provide this gloss for babel compatibility. Since norsk is
% actually norwegian bokmal, we use 'norwegian' with variant 'bokmal' now.
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
% \end{macrocode}
% \iffalse
@@ -22867,7 +22856,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-norwegian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-norwegian.ldf}[polyglossia: module for Norwegian]
\PolyglossiaSetup{norwegian}{
@@ -22889,28 +22878,32 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias[variant=nynorsk]{norwegian}{nynorsk}
\def\norwegian@variant{nynorsk}
-\define@choicekey*+{norwegian}{variant}[\xpg@val\xpg@nr]{nynorsk,bokmal}[nynorsk]{%
- \ifcase\xpg@nr\relax
- % nynorsk:
- \def\norwegian@variant{nynorsk}%
- \SetLanguageKeys{norwegian}{langtag=NYN,babelname=nynorsk,bcp47=nn,bcp47-language=nn}%
- \xpg@fontsetup@latin{norwegian}%
- \or
- % bokmal:
- \def\norwegian@variant{norsk}%
- \SetLanguageKeys{norwegian}{langtag=NOR,babelname=norsk,bcp47=nb,bcp47-language=nb}%
- \xpg@fontsetup@latin{norwegian}%
- \fi
- \xpg@info{Option: norwegian, variant=\xpg@val}%
-}{\xpg@warning{Unknown norwegian variant `#1'}}
+\DeclareKeys[polyglossia/gloss/norwegian]
+ {
+ variant.choice:,
+ variant / nynorsk.code =
+ {%
+ \def\norwegian@variant{nynorsk}%
+ \SetLanguageKeys{norwegian}{langtag=NYN,babelname=nynorsk,bcp47=nn,bcp47-language=nn}%
+ \SetupLatinPolyglossiaFont{norwegian}%
+ },
+ variant / bokmal.code =
+ {%
+ \def\norwegian@variant{norsk}%
+ \SetLanguageKeys{norwegian}{langtag=NOR,babelname=norsk,bcp47=nb,bcp47-language=nb}%
+ \SetupLatinPolyglossiaFont{norwegian}%
+ },
+ variant.default:n = nynorsk,
+ variant/unknown.code = \xpg@warning{Unknown norwegian variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{norwegian}{variant=nynorsk}
+\InitializeGlossOptions{norwegian}{variant=nynorsk}
\def\norwegian@language{%
- \polyglossia@setup@language@patterns{\norwegian@variant}%
+ \SetupPolyglossiaLangPatterns{\norwegian@variant}%
}%
\def\captionsnorwegian@nynorsk{%
@@ -22994,13 +22987,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nswissgerman.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nswissgerman.ldf}[polyglossia: module for Swiss German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -23011,14 +23004,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nynorsk.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nynorsk.ldf}[polyglossia: module for Norwegian (Nynorsk)]
% We only provide this gloss for babel compatibility. Since nynorsk is
% a norwegian variety, we use 'norwegian' with variant 'nynorsk' now.
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
% \end{macrocode}
% \iffalse
@@ -23029,7 +23022,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-occitan.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
%%
%% This is file `gloss-occitan.ldf',
@@ -23065,19 +23058,19 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{occitan}{oc}
-\define@boolkey{occitan}[occitan@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/occitan]
+ {
+ babelshorthands.if = occitan@babelshorthands,
+ babelshorthands.default:n = true
+ }
\ifsystem@babelshorthands
- \setkeys{occitan}{babelshorthands=true}
+ \SetGlossOptions{occitan}{babelshorthands=true}
\else
- \setkeys{occitan}{babelshorthands=false}
+ \SetGlossOptions{occitan}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\occitan@shorthands{%
\xpg@activate@shorthands%
@@ -23169,7 +23162,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\today{\occitanday\space \occitanmonth\space de~\number\year}%
}
\let\xpgoc@savedvalues\empty
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgoc@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
@@ -23210,7 +23203,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-odia.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by ଅଶୋକ ଦାସ୍ <das@pas.rochester.edu> and ଅଭିଷେକ ଜେନା <avisekjena@gmail.com>
% TODO implement Odia calendar
@@ -23242,32 +23235,37 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\ifodia@devanagari@numerals
\newif\ifodia@odia@numerals
-\define@choicekey*+{odia}{numerals}[\xpg@val\xpg@nr]{Devanagari,Odia,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \odia@odia@numeralsfalse%
- \odia@devanagari@numeralstrue%
- \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-deva}%
- \or
- % Odia:
- \odia@odia@numeralstrue%
- \odia@devanagari@numeralsfalse%
- \or
- % Western:
- \odia@odia@numeralsfalse%
- \odia@devanagari@numeralsfalse%
- \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Odia, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Odia numeral `#1'}}
-
\def\extras@odia{}
\def\noextras@odia{}
-\define@boolkey{odia}[odia@]{changecounternumbering}[true]{}
+\DeclareKeys[polyglossia/gloss/odia]
+ {
+ changecounternumbering.if = odia@changecounternumbering,
+ changecounternumbering.default:n = true,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \odia@odia@numeralsfalse
+ \odia@devanagari@numeralstrue
+ \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-deva}%
+ },
+ numerals / odia.code =
+ {%
+ \odia@odia@numeralstrue
+ \odia@devanagari@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \odia@odia@numeralsfalse
+ \odia@devanagari@numeralsfalse
+ \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Odia numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{odia}{changecounternumbering=false,numerals=Devanagari}
+\InitializeGlossOptions{odia}{changecounternumbering=false,numerals=Devanagari}
\def\captionsodia{%
\def\refname{ସନ୍ଦର୍ଭ}%
@@ -23370,13 +23368,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-or.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-odia.ldf}[polyglossia: module for or (Odia)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{odia}
+\InheritGlossFile{odia}
% \end{macrocode}
% \iffalse
@@ -23387,13 +23385,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-pa.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-pa.ldf}[polyglossia: module for pa (Punjabi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{punjabi}
+\InheritGlossFile{punjabi}
% \end{macrocode}
% \iffalse
@@ -23404,7 +23402,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-persian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-persian.ldf}[polyglossia: module for Persian]
@@ -23433,42 +23431,36 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias{persian}{farsi}
\newif\if@western@numerals
-\define@choicekey*+{persian}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \SetLanguageKeys{persian}{bcp47-extension-u=nu-arab}%
- \or
- % western:
- \@western@numeralstrue%
- \SetLanguageKeys{persian}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Persian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Persian numerals option `#1'}}
-
\newif\ifpersian@customsep\persian@customsepfalse
\def\xpg@sepmark{}
-\define@key{persian}{sectionsep}[.]{%
- \persian@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{persian}[persian@]{abjadjimnotail}[true]{%
- \ifpersian@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi}
-
-% NOT YET USED
-\define@key{persian}{locale}[default]{%
- \def\@persian@locale{#1}}
%TODO add option for CALENDAR
+\DeclareKeys[polyglossia/gloss/persian]
+ {
+ sectionsep.code = \gdef\xpg@sepmark{#1}\persian@customseptrue,
+ sectionsep.default:n = .,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ locale.store = \@persian@locale,
+ locale.default:n = default,
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ \SetLanguageKeys{persian}{bcp47-extension-u=nu-arab}%
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \SetLanguageKeys{persian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Persian numerals option `#1'}
+ }
+
% Register default options
-\xpg@initialize@gloss@options{persian}{locale=default,numerals=eastern,abjadjimnotail=false}
+\InitializeGlossOptions{persian}{locale=default,numerals=eastern,abjadjimnotail=false}
\def\farsigregmonth#1{\ifcase#1%
\or ژانویه\or فوریه\or مارس\or آوریل\or مه\or ژوئن\or ژوئیه\or اوت\or سپتامبر\or اکتبر\or نوامبر\or دسامبر\fi}
@@ -23553,16 +23545,16 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nopersian@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\persian@luatex@capsformat{%
%
% change chapter and part headings
\ifpersian@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -23574,7 +23566,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -23589,30 +23581,30 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nopersian@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@persian{%
@@ -23645,7 +23637,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \subsection{gloss-piedmontese.ldf}
% \begin{macrocode}
% !TEX encoding = UTF-8 Unicode
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-piedmontese.ldf}[2013/02/12 v1.0 polyglossia: module for Piedmontese]
\makeatletter
@@ -23663,19 +23655,19 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{piedmontese}{pms}
-\define@boolkey{piedmontese}[piedmontese@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/piedmontese]
+ {
+ babelshorthands.if = piedmontese@babelshorthands,
+ babelshorthands.default:n = true
+ }
\ifsystem@babelshorthands
- \setkeys{piedmontese}{babelshorthands=true}
+ \SetGlossOptions{piedmontese}{babelshorthands=true}
\else
- \setkeys{piedmontese}{babelshorthands=false}
+ \SetGlossOptions{piedmontese}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\piedmontese@shorthands{%
\xpg@activate@shorthands%
@@ -23739,7 +23731,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
ëd luj\or d'agost\or dë stèmber\or d'otóber\or ëd novèmber\or dë dzèmber%
\fi\space dal\space\number\year}}
-\AtEndPreamble{%
+\AddToHook{begindocument/before}{%
\edef\xpgpms@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
@@ -23775,7 +23767,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-polish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-polish.ldf}[polyglossia: module for Polish]
@@ -23797,26 +23789,26 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\RequirePackage{luavlna}
\fi
-\define@boolkey{polish}[polish@]{babelshorthands}[true]{}
-
-\define@boolkey{polish}[polish@]{splithyphens}[true]{}
-
-\define@boolkey{polish}[polish@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/polish]
+ {
+ babelshorthands.if = polish@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = polish@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = polish@vlna,
+ vlna.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{polish}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{polish}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{polish}{babelshorthands=true}
+ \SetGlossOptions{polish}{babelshorthands=true}
\else
- \setkeys{polish}{babelshorthands=false}
+ \SetGlossOptions{polish}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\polish@@splhyphen#1{%
@@ -24034,13 +24026,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-polutonikogreek.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-polutonikogreek.ldf}[polyglossia: module for polytonic Greek]
% We provide this as a babel alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
% \end{macrocode}
% \iffalse
@@ -24051,7 +24043,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-portuges.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for Portuguese]
@@ -24060,7 +24052,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% introduced it in 8.3 filename times). Since polyglossia uses full
% English language names, we use 'portuguese' now.
-\xpg@load@master@language{portuguese}
+\InheritGlossFile{portuguese}
% \end{macrocode}
% \iffalse
@@ -24071,7 +24063,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-portuguese.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-portuguese.ldf}[polyglossia: module for Portuguese]
@@ -24101,41 +24093,42 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\fi
\def\portuguese@variant{portuges}
-\define@choicekey*+{portuguese}{variant}[\xpg@val\xpg@nr]{portuguese,brazilian}[portuguese]{%
- \ifcase\xpg@nr\relax
- % portuguese:
- \def\portuguese@variant{portuges}%
- \SetLanguageKeys{portuguese}{babelname=portuges,bcp47=pt-PT,bcp47-language=pt,bcp47-region=PT}%
- \or
- % brazilian:
- \def\portuguese@variant{brazil}%
- \SetLanguageKeys{portuguese}{babelname=brazil,bcp47=pt-BR,bcp47-language=pt,bcp47-region=BR}%
- % There are no specific brazil patterns
- \adddialect\l@brazil\l@portuges\relax%
- \fi
- \xpg@info{Option: portuguese, variant=\xpg@val}%
-}{\xpg@warning{Unknown portuguese variant `#1'}}
-
-\define@boolkey{portuguese}[portuguese@]{babelshorthands}[true]{}
-\define@boolkey{portuguese}[portuguese@]{splithyphens}[true]{}
+\DeclareKeys[polyglossia/gloss/portuguese]
+ {
+ babelshorthands.if = portuguese@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = portuguese@splithyphens,
+ splithyphens.default:n = true,
+ variant.choice:,
+ variant / portuguese.code =
+ {%
+ \def\portuguese@variant{portuges}%
+ \SetLanguageKeys{portuguese}{babelname=portuges,bcp47=pt-PT,bcp47-language=pt,bcp47-region=PT}%
+ },
+ variant / brazilian.code =
+ {%
+ \def\portuguese@variant{brazil}%
+ \SetLanguageKeys{portuguese}{babelname=brazil,bcp47=pt-BR,bcp47-language=pt,bcp47-region=BR}%
+ % There are no specific brazil patterns
+ \adddialect\l@brazil\l@portuges\relax
+ },
+ variant.default:n = portuguese,
+ variant/unknown.code = \xpg@warning{Unknown portuguese variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{portuguese}{variant=portuguese,
+\InitializeGlossOptions{portuguese}{variant=portuguese,
babelshorthands=false,
splithyphens=true}
\ifsystem@babelshorthands
- \setkeys{portuguese}{babelshorthands=true}
+ \SetGlossOptions{portuguese}{babelshorthands=true}
\else
- \setkeys{portuguese}{babelshorthands=false}
+ \SetGlossOptions{portuguese}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\portuguese@@splhyphen#1{%
@@ -24204,7 +24197,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\portuguese@language{%
- \polyglossia@setup@language@patterns{\portuguese@variant}%
+ \SetupPolyglossiaLangPatterns{\portuguese@variant}%
}%
\def\captionsportuguese@portuges{%
@@ -24302,7 +24295,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-punjabi.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% UTF-8 strings kindly provided by
% Arvinder Singh Kang, <17-11-2022>
@@ -24329,26 +24322,31 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\punjabi@language{%
% patterns are spelled panjabi
- \polyglossia@setup@language@patterns{panjabi}%
+ \SetupPolyglossiaLangPatterns{panjabi}%
}
\newif\ifpunjabi@gurmukhi@numerals
\punjabi@gurmukhi@numeralstrue
-\define@choicekey*+{punjabi}{numerals}[\xpg@val\xpg@nr]{Gurmukhi,Western}[Gurmukhi]{%
- \ifcase\xpg@nr\relax
- % Gurmukhi:
- \punjabi@gurmukhi@numeralstrue%
- \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-guru}%
- \or
- % Western:
- \punjabi@gurmukhi@numeralsfalse%
- \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Punjabi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Punjabi numeral `#1'}}
+
+\DeclareKeys[polyglossia/gloss/punjabi]
+ {
+ numerals.choice:,
+ numerals / gurmukhi.code =
+ {%
+ \punjabi@gurmukhi@numeralstrue
+ \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-guru}%
+ },
+ numerals / western.code =
+ {%
+ \punjabi@gurmukhi@numeralsfalse
+ \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = gurmukhi,
+ numerals/unknown.code = \xpg@warning{Unknown Punjabi numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{punjabi}{numerals=gurmukhi}
+\InitializeGlossOptions{punjabi}{numerals=gurmukhi}
\newcommand{\punjabinumerals}[2]{\punjabinumber{#2}}
@@ -24410,7 +24408,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-romanian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-romanian.ldf}[polyglossia: module for Romanian]
@@ -24469,7 +24467,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-romansh.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-romansh.ldf}[polyglossia: module for Romansh]
\makeatletter
@@ -24527,7 +24525,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-russian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-russian.ldf}[polyglossia: module for Russian]
@@ -24556,11 +24554,6 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*[spelling=old]{russian}{ru-petr1708}
\newif\if@russian@modern
-\define@key{russian}{spelling}[modern]{%
- \ifstrequal{#1}{old}%
- {\@russian@modernfalse\SetLanguageKeys{russian}{bcp47=ru-petr1708,bcp47-variant=petr1708}}%
- {\@russian@moderntrue\SetLanguageKeys{russian}{bcp47=ru,bcp47-variant=luna1918}}%
-}
\def\captionsrussian{%
\if@russian@modern\captionsrussian@modern\else\captionsrussian@old\fi%
@@ -24572,49 +24565,68 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{russian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Russian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Russian numerals value `#1'}}
-\define@boolkey{russian}[russian@]{indentfirst}[true]{%
- \ifrussian@indentfirst
- \SetLanguageKeys{russian}{indentfirst=true}%
- \else
- \SetLanguageKeys{russian}{indentfirst=false}%
- \fi%
-}
-
-\define@boolkey{russian}[russian@]{babelshorthands}[true]{}
-
-% Force punctuation after heading number
-\define@boolkey{russian}[russian@]{forceheadingpunctuation}[true]{}
-
-% Define some math functions
-\define@boolkey{russian}[russian@]{mathfunctions}[true]{}
+\DeclareKeys[polyglossia/gloss/russian]
+ {
+ babelshorthands.if = russian@babelshorthands,
+ babelshorthands.default:n = true,
+ forceheadingpunctuation.if = russian@forceheadingpunctuation,
+ forceheadingpunctuation.default:n = true,
+ mathfunctions.if = russian@mathfunctions,
+ mathfunctions.default:n = true,
+ spelling.choice:,
+ spelling / modern.code =
+ {%
+ \@russian@moderntrue
+ \SetLanguageKeys{russian}{bcp47=ru,bcp47-variant=luna1918}%
+ },
+ spelling / old.code =
+ {%
+ \@russian@modernfalse
+ \SetLanguageKeys{russian}{bcp47=ru-petr1708,bcp47-variant=petr1708}%
+ },
+ spelling.default:n = modern,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Russian numerals value `#1'},
+ indentfirst.choice:,
+ indentfirst / true.code =
+ {%
+ \SetLanguageKeys{russian}{indentfirst=true}%
+ },
+ indentfirst / false.code =
+ {%
+ \SetLanguageKeys{russian}{indentfirst=false}%
+ },
+ indentfirst.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{russian}{babelshorthands=false,
+\InitializeGlossOptions{russian}{babelshorthands=false,
spelling=modern,
numerals=arabic,
indentfirst=true,
@@ -24623,16 +24635,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\ifsystem@babelshorthands
- \setkeys{russian}{babelshorthands=true}
+ \SetGlossOptions{russian}{babelshorthands=true}
\else
- \setkeys{russian}{babelshorthands=false}
+ \SetGlossOptions{russian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\russian@shorthands{%
\xpg@activate@shorthands%
@@ -24684,7 +24692,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\bibname{Литература}%
\def\chaptername{Глава}%
\def\appendixname{Приложение}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Содержание}}%
{\def\contentsname{Оглавление}}%
\def\listfigurename{Список иллюстраций}%
@@ -24727,7 +24735,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\bibname{Библіографія}%
\def\chaptername{Глава}%
\def\appendixname{Приложеніе}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Содержаніе}}%
{\def\contentsname{Оглавленіе}}%
\def\listfigurename{Списокъ иллюстрацій}%
@@ -24926,7 +24934,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-sami.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sami.ldf}[polyglossia: module for Sami]
@@ -24956,19 +24964,19 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% % northern:
% \def\sami@variant{samin}%
% \SetLanguageKeys{sami}{language=Northern Sami,langtag=NSM}%
-% \xpg@fontsetup@latin{sami}%
+% \SetupLatinPolyglossiaFont{sami}%
% \or
% % other:
% \def\sami@variant{}%
% \SetLanguageKeys{sami}{language= Sami,langtag=}%
-% \xpg@fontsetup@latin{sami}%
+% \SetupLatinPolyglossiaFont{sami}%
% \fi
% \xpg@info{Option: sami, variant=\xpg@val}%
%}{\xpg@warning{Unknown sami variant `#1'}}
%\def\sami@language{%
-% \polyglossia@setup@language@patterns{\sami@variant}%
+% \SetupPolyglossiaLangPatterns{\sami@variant}%
%}%
\def\captionssami@northern{%
@@ -25030,14 +25038,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-samin.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-samin.ldf}[polyglossia: module for Northern Sami]
% We only provide this gloss for babel compatibility. Since samin is
% a sami variety, we use 'sami' with variant 'northern' now.
-\xpg@load@master@language{sami}
+\InheritGlossFile{sami}
% \end{macrocode}
% \iffalse
@@ -25048,7 +25056,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-sanskrit.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sanskrit.ldf}[polyglossia: module for Sanskrit]
@@ -25077,56 +25085,55 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*[script=gujarati]{sanskrit}{sa-Gujr}
\setlanguagealias*[script=latin]{sanskrit}{sa-Latn}
-\define@key{sanskrit}{Script}[devanagari]{%
- \ifcsdef{fontsetup@sanskrit@#1}%
- {\csname fontsetup@sanskrit@#1\endcsname}%
- {\xpg@error{`#1' is not a valid script for Sanskrit}%
- }%
-}
-
-\define@key{sanskrit}{script}[devanagari]{\setkeys{sanskrit}{Script=#1}}
-
\def\fontsetup@sanskrit@devanagari{%
\SetLanguageKeys{sanskrit}{scripttag=deva,script=Devanagari,bcp47=sa-Deva,bcp47-language=sa,bcp47-script=Deva,bcp47-casing=sa-Deva}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@gujarati{%
\SetLanguageKeys{sanskrit}{scripttag=gujr,script=Gujarati,bcp47=sa-Gujr,bcp47-language=sa,bcp47-script=Gujr,bcp47-casing=sa-Gujr}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@malayalam{%
\SetLanguageKeys{sanskrit}{scripttag=mlym,script=Malayalam,bcp47=sa-Mlym,bcp47-language=sa,bcp47-script=Mlym,bcp47-casing=sa-Mlym}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@bengali{%
\SetLanguageKeys{sanskrit}{scripttag=beng,script=Bengali,bcp47=sa-Beng,bcp47-language=sa,bcp47-script=Beng,bcp47-casing=sa-Beng}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@kannada{%
\SetLanguageKeys{sanskrit}{scripttag=knda,script=Kannada,bcp47=sa-Knda,bcp47-language=sa,bcp47-script=Knda,bcp47-casing=sa-Knda}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@telugu{%
\SetLanguageKeys{sanskrit}{scripttag=telu,script=Telugu,bcp47=sa-Relu,bcp47-language=sa,bcp47-script=Relu,bcp47-casing=sa-Relu}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@latin{%
\SetLanguageKeys{sanskrit}{scripttag=latn,script=Latin,bcp47=sa-Latn,bcp47-language=sa,bcp47-script=Latn,bcp47-casing=sa-Latn}
- \xpg@fontsetup@latin{sanskrit}}
+ \SetupLatinPolyglossiaFont{sanskrit}}
\newif\ifsanskrit@devanagari@numerals
\sanskrit@devanagari@numeralstrue
-\define@choicekey*+{sanskrit}{numerals}[\xpg@val\xpg@nr]{devanagari,western}[devanagari]{%
- \ifcase\xpg@nr\relax
- % devanagari:
- \sanskrit@devanagari@numeralstrue%
- \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-deva}%
- \or
- % western:
- \sanskrit@devanagari@numeralsfalse%
- \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Sanskrit, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Sanskrit numeral `#1'}}
+\DeclareKeys[polyglossia/gloss/sanskrit]
+ {
+ script.code = \@ifundefined{fontsetup@sanskrit@#1}%
+ {\xpg@error{`#1' is not a valid script for Sanskrit}}%
+ {\csname fontsetup@sanskrit@#1\endcsname},
+ script.default:n = devanagari,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \sanskrit@devanagari@numeralstrue
+ \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-deva}%
+ },
+ numerals / western.code =
+ {%
+ \sanskrit@devanagari@numeralsfalse
+ \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Sanskrit numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{sanskrit}{script=devanagari,numerals=devanagari}
+\InitializeGlossOptions{sanskrit}{script=devanagari,numerals=devanagari}
% Use \providecommand here as the ldf file might
% be reloaded via BCP.
@@ -25207,14 +25214,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-scottish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-scottish.ldf}[polyglossia: module for Scottish Gaelic]
% We only provide this gloss for babel compatibility. Since scottish is
% a gaelic variety, we use 'gaelic' with variant 'scottish' now.
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
% \end{macrocode}
% \iffalse
@@ -25225,7 +25232,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-serbian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-serbian.ldf}[polyglossia: module for Serbian]
%TODO split into gloss-serbiancyr.ldf and gloss-serbianlat.ldf
@@ -25266,67 +25273,10 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\fi
\newif\if@serbian@cyr
-\define@choicekey*+{serbian}{Script}[\xpg@val\xpg@nr]{cyrillic,latin}[cyrillic]{%
- \ifcase\xpg@nr\relax
- % cyrillic:
- \@serbian@cyrtrue
- \xpg@fontsetup@nonlatin{serbian}%
- \or
- % latin:
- \@serbian@cyrfalse
- \xpg@fontsetup@latin{serbian}%
- %TODO \def\serbian@language{\language=\l@serbianlat}%
- % or should we use Croatian patterns as a fallback for the time being???
- \fi
- \serbian@set@languagekeys%
- \xpg@info{Option: Serbian, script=\xpg@val}%
-}{\xpg@warning{Unknown Serbian script `#1'}}
-
-\define@key{serbian}{script}[cyrillic]{\setkeys{serbian}{Script=#1}}
-
\newif\if@serbian@ijekavian
-\define@choicekey*+{serbian}{variant}[\xpg@val\xpg@nr]{ekavian,ijekavian}[ekavian]{%
- \ifcase\xpg@nr\relax
- % ekavian:
- \@serbian@ijekavianfalse%
- \or
- % ijekavian:
- \@serbian@ijekaviantrue%
- \fi
- \serbian@set@languagekeys%
- \xpg@info{Option: Serbian, variant=\xpg@val}%
-}{\xpg@warning{Unknown Serbian variant `#1'}}
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{serbian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Serbian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Serbian numerals value `#1'}}
-
-\define@boolkey{serbian}[serbian@]{splithyphens}[true]{}
-
-\define@boolkey{serbian}[serbian@]{datei}[true]{}
\def\serbian@set@languagekeys{%
\if@serbian@cyr
@@ -25344,10 +25294,75 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\fi%
}
-\setkeys{serbian}{Script,numerals}
+\DeclareKeys[polyglossia/gloss/serbian]
+ {
+ splithyphens.if = serbian@splithyphens,
+ splithyphens.default:n = true,
+ datei.if = serbian@datei,
+ datei.default:n = true,
+ variant.choice:,
+ variant / ekavian.code =
+ {%
+ \@serbian@ijekavianfalse
+ \serbian@set@languagekeys
+ },
+ variant / ijekavian.code =
+ {%
+ \@serbian@ijekaviantrue
+ \serbian@set@languagekeys
+ },
+ variant.default:n = ekavian,
+ variant/unknown.code = \xpg@warning{Unknown Serbian variant `#1'},
+ script.choice:,
+ script / cyrillic.code =
+ {%
+ \@serbian@cyrtrue
+ \SetupNonLatinPolyglossiaFont{serbian}%
+ \serbian@set@languagekeys
+ },
+ script / latin.code =
+ {%
+ \@serbian@cyrfalse
+ \SetupLatinPolyglossiaFont{serbian}%
+ %TODO \def\serbian@language{\language=\l@serbianlat}%
+ % or should we use Croatian patterns as a fallback for the time being???
+ \serbian@set@languagekeys
+ },
+ script.default:n = cyrillic,
+ script/unknown.code = \xpg@warning{Unknown Serbian script `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Serbian numerals value `#1'}
+ }
+
+\SetGlossOptions{serbian}{script,numerals}
% Register default options
-\xpg@initialize@gloss@options{serbian}{script=cyrillic,numerals=arabic,splithyphens=true}
+\InitializeGlossOptions{serbian}{script=cyrillic,numerals=arabic,splithyphens=true}
\def\captionsserbian{%
\if@serbian@cyr\captionsserbian@cyr\else\captionsserbian@lat\fi
@@ -25648,13 +25663,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-serbianc.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-serbianc.ldf}[polyglossia: module for Serbian (cyrillic)]
% We provide this as a babel alias
-\xpg@load@master@language{serbian}
+\InheritGlossFile{serbian}
% \end{macrocode}
% \iffalse
@@ -25665,7 +25680,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-slovak.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovak.ldf}[polyglossia: module for Slovak]
@@ -25686,26 +25701,26 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\RequirePackage{luavlna}
\fi
-\define@boolkey{slovak}[slovak@]{babelshorthands}[true]{}
-
-\define@boolkey{slovak}[slovak@]{splithyphens}[true]{}
-
-\define@boolkey{slovak}[slovak@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/slovak]
+ {
+ babelshorthands.if = slovak@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = slovak@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = slovak@vlna,
+ vlna.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{slovak}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{slovak}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{slovak}{babelshorthands=true}
+ \SetGlossOptions{slovak}{babelshorthands=true}
\else
- \setkeys{slovak}{babelshorthands=false}
+ \SetGlossOptions{slovak}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\slovak@@splhyphen#1{%
@@ -25881,7 +25896,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\def\contentsname{Obsah}%
\def\listfigurename{Zoznam obrázkov}%
\def\listtablename{Zoznam tabuliek}%
- \def\indexname{Index}%
+ \def\indexname{Register}%
\def\figurename{Obrázok}%
\def\tablename{Tabuľka}%
%\def\thepart{}%
@@ -25932,13 +25947,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-slovene.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovene.ldf}[polyglossia: module for Slovenian]
% We provide this as a babel alias
-\xpg@load@master@language{slovenian}
+\InheritGlossFile{slovenian}
% \end{macrocode}
% \iffalse
@@ -25949,7 +25964,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-slovenian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovenian.ldf}[polyglossia: module for Slovenian]
@@ -25970,10 +25985,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% Babel aliases
\setlanguagealias{slovenian}{slovene}
-\define@boolkey{slovenian}[slovenian@]{localalph}[true]{}
+\DeclareKeys[polyglossia/gloss/slovenian]
+ {
+ localalph.if = slovenian@localalph,
+ localalph.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{slovenian}{localalph=false}
+\InitializeGlossOptions{slovenian}{localalph=false}
\def\captionsslovenian{%
@@ -26041,7 +26060,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-sorbian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sorbian.ldf}[polyglossia: module for Sorbian]
@@ -26069,60 +26088,40 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias[variant=upper]{sorbian}{uppersorbian}
\def\sorbian@variant{usorbian}
-\define@choicekey*+{sorbian}{variant}[\xpg@val\xpg@nr]{upper,lower}[upper]{%
- \ifcase\xpg@nr\relax
- % upper:
- \def\sorbian@variant{usorbian}%
- \SetLanguageKeys{sorbian}{language=Upper Sorbian,langtag=USB,babelname=uppersorbian,bcp47=hsb,bcp47-language=hsb}%
- \xpg@fontsetup@latin{sorbian}%
- % Check if \l@usorbian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{usorbian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@usorbian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{uppersorbian}
- \xpg@ifdefined{usorbian}{}{%
- \xpg@warning{No hyphenation patterns for Upper Sorbian found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@usorbian0%
- }
- }%
- \or
- % lower:
- \def\sorbian@variant{lsorbian}%
- \SetLanguageKeys{sorbian}{language=Lower Sorbian,langtag=LSB,babelname=lowersorbian,bcp47=dsb,bcp47-language=dsb}%
- \xpg@fontsetup@latin{sorbian}%
- % Check if \l@lsorbian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{lsorbian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@lsorbian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{lowersorbian,Lsorbian,usorbian,uppersorbian}
- \xpg@ifdefined{lsorbian}{}{%
- \xpg@warning{No hyphenation patterns for Lower Sorbian found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@lsorbian0%
- }
- }%
- \fi
- \xpg@info{Option: sorbian, variant=\xpg@val}%
-}{\xpg@warning{Unknown sorbian variant `#1'}}
-
-\define@boolkey{sorbian}[sorbian@]{olddate}[true]{}
+\DeclareKeys[polyglossia/gloss/sorbian]
+ {
+ olddate.if = sorbian@olddate,
+ olddate.default:n = true,
+ variant.choice:,
+ variant / upper.code =
+ {%
+ \def\sorbian@variant{usorbian}%
+ \SetLanguageKeys{sorbian}{language=Upper Sorbian,langtag=USB,babelname=uppersorbian,bcp47=hsb,bcp47-language=hsb}%
+ \SetupLatinPolyglossiaFont{sorbian}%
+ % Check if \l@usorbian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{usorbian}{uppersorbian}%
+ },
+ variant / lower.code =
+ {%
+ \def\sorbian@variant{lsorbian}%
+ \SetLanguageKeys{sorbian}{language=Lower Sorbian,langtag=LSB,babelname=lowersorbian,bcp47=dsb,bcp47-language=dsb}%
+ \SetupLatinPolyglossiaFont{sorbian}%
+ % Check if \l@lsorbian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{lsorbian}{lowersorbian,Lsorbian,usorbian,uppersorbian}%
+ },
+ variant.default:n = upper,
+ variant/unknown.code = \xpg@warning{Unknown sorbian variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{sorbian}{variant=upper,olddate=false}
+\InitializeGlossOptions{sorbian}{variant=upper,olddate=false}
\def\sorbian@language{%
- \polyglossia@setup@language@patterns{\sorbian@variant}%
+ \SetupPolyglossiaLangPatterns{\sorbian@variant}%
}%
@@ -26232,7 +26231,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-spanish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-spanish.ldf}[polyglossia: module for Spanish]
@@ -26261,52 +26260,58 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@spanish@mexico
\@spanish@mexicofalse
-\define@choicekey*+{spanish}{variant}[\xpg@val\xpg@nr]{spanish,mexican}[spanish]{%
- \ifcase\xpg@nr\relax
- % spanish:
- \@spanish@mexicofalse%
- \SetLanguageKeys{spanish}{babelname=spanish,bcp47=es-ES,bcp47-region=ES}%
- \or
- % mexican:
- \@spanish@mexicotrue%
- \SetLanguageKeys{spanish}{babelname=spanishmx,bcp47=es-MX,bcp47-region=MX}%
- \fi
- \xpg@info{Option: spanish, variant=\xpg@val}%
-}{\xpg@warning{Unknown spanish variant `#1'}}
% Localized math operators à la babel
\newif\ifspanish@accentedoperators
\newif\ifspanish@spacedoperators
\newif\ifspanish@locoperators
-\define@choicekey*+{spanish}{spanishoperators}[\xpg@val\xpg@nr]{all,accented,spaced,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \spanish@locoperatorstrue%
- \spanish@accentedoperatorstrue%
- \spanish@spacedoperatorstrue%
- \or
- % accented:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorstrue%
- \spanish@spacedoperatorsfalse%
- \or
- % spaced:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorsfalse%
- \spanish@spacedoperatorstrue%
- \or
- % none:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorsfalse%
- \spanish@spacedoperatorsfalse%
- \fi
- \xpg@info{Option: Spanish, spanishoperators=\xpg@val}%
-}{\xpg@warning{Unknown spanishoperators value `#1'}}
-
+\DeclareKeys[polyglossia/gloss/spanish]
+ {
+ variant.choice:,
+ variant / spanish.code =
+ {%
+ \@spanish@mexicofalse
+ \SetLanguageKeys{spanish}{babelname=spanish,bcp47=es-ES,bcp47-region=ES}%
+ },
+ variant / mexican.code =
+ {%
+ \@spanish@mexicotrue
+ \SetLanguageKeys{spanish}{babelname=spanishmx,bcp47=es-MX,bcp47-region=MX}%
+ },
+ variant.default:n = spanish,
+ variant/unknown.code = \xpg@warning{Unknown spanish variant `#1'},
+ spanishoperators.choice:,
+ spanishoperators / all.code =
+ {%
+ \spanish@locoperatorstrue
+ \spanish@accentedoperatorstrue
+ \spanish@spacedoperatorstrue
+ },
+ spanishoperators / accented.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorstrue
+ \spanish@spacedoperatorsfalse
+ },
+ spanishoperators / spaced.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorsfalse
+ \spanish@spacedoperatorstrue
+ },
+ spanishoperators / none.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorsfalse
+ \spanish@spacedoperatorsfalse
+ },
+ spanishoperators.default:n = all,
+ spanishoperators/unknown.code = \xpg@warning{Unknown spanishoperators value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{spanish}{variant=spanish,spanishoperators=none}
+\InitializeGlossOptions{spanish}{variant=spanish,spanishoperators=none}
\let\xpg@save@lim\lim
\let\xpg@save@limsup\limsup
@@ -26472,13 +26477,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-spanishmx.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-spanishmx.ldf}[polyglossia: module for Mexican Spanish]
% We provide this as a babel alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
% \end{macrocode}
% \iffalse
@@ -26489,7 +26494,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-swedish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-swedish.ldf}[polyglossia: module for Swedish]
@@ -26554,13 +26559,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-swissgerman.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-swissgerman.ldf}[polyglossia: module for Swiss German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
% \end{macrocode}
% \iffalse
@@ -26571,7 +26576,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-syriac.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-syriac.ldf}[polyglossia: module for Syriac]
@@ -26595,34 +26600,37 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{syriac}{syr}
-\def\syriacnumber#1{\@syriacnumber{#1}}%
+\def\syriacnumber#1{\@syriacnumber{#1}}
\newif\if@eastern@numerals
-\define@choicekey*+{syriac}{numerals}[\xpg@val\xpg@nr]{eastern,western,abjad}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@eastern@numeralstrue
- \SetLanguageKeys{syriac}{bcp47-extension-u=nu-syrc}%
- \or
- % western:
- \@eastern@numeralsfalse
- \SetLanguageKeys{syriac}{bcp47-extension-u=nu-latn}%
- \or
- % abjad:
- \let\syriacnumber\abjadsyriac%
- \fi
- \xpg@info{Option: Syriac, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Syriac numerals option `#1'}}
-
\newif\ifsyriac@customsep\syriac@customsepfalse
\def\xpg@sepmark{}
-\define@key{syriac}{sectionsep}[.]{%
- \syriac@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
+
+\DeclareKeys[polyglossia/gloss/syriac]
+ {
+ sectionsep.code = \gdef\xpg@sepmark{#1}\syriac@customseptrue,
+ sectionsep.default:n = .,
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@eastern@numeralstrue
+ \SetLanguageKeys{syriac}{bcp47-extension-u=nu-syrc}%
+ },
+ numerals / western.code =
+ {%
+ \@eastern@numeralsfalse
+ \SetLanguageKeys{syriac}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / abjad.code =
+ {%
+ \let\syriacnumber\abjadsyriac
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Syriac numerals option `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{syriac}{numerals=western}
+\InitializeGlossOptions{syriac}{numerals=western}
%\define@key{polyglossia}{syriaclocale}[default]{%
% \def\@syriac@locale{#1}}
@@ -26709,13 +26717,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\IfCharIsAvailableTF{0661}%
{\@ensure@LTR{\protect\arabicdigits{\number#1}}}%
{\@ensure@LTR{\arabicdigits{\number#1}}
- \ifcsdef{arabicfont}%
- {\@ensure@LTR{\protect\arabicdigits{\number#1}}%
- \xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
- I am using \string\arabicfont instead}}%
+ \@ifundefined{arabicfont}%
{\number#1%%% <---changed from \RL{\protect\reset@font\protect\number#1}%
\xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
since \string\arabicfont is not defined, we'll use Western numerals instead}}%
+ {\@ensure@LTR{\protect\arabicdigits{\number#1}}%
+ \xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
+ I am using \string\arabicfont instead}}%
}%
\else
%%\RL{\protect\reset@font\number#1}%
@@ -26753,16 +26761,16 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nosyriac@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\syriac@luatex@capsformat{%
%
% change chapter and part headings
\ifsyriac@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -26774,7 +26782,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -26789,30 +26797,30 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nosyriac@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@syriac{%
@@ -26844,7 +26852,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-tamil.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-tamil.ldf}[polyglossia: module for Tamil]
@@ -26914,7 +26922,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-telugu.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-telugu.ldf}[polyglossia: module for Telugu]
@@ -26987,7 +26995,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-thai.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-thai.ldf}[polyglossia: module for Thai]
%% This is partly based on thai-latex for Babel:
@@ -27018,19 +27026,25 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@thai@numerals
\def\tmp@thai{thai}
-\define@key{thai}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@thai
- \@thai@numeralstrue%
- \SetLanguageKeys{thai}{bcp47-extension-u=nu-thai}%
- \else
- \@thai@numeralsfalse%
- \SetLanguageKeys{thai}{bcp47-extension-u=nu-latn}%
- \fi
-}
+
+\DeclareKeys[polyglossia/gloss/thai]
+ {
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \@thai@numeralsfalse
+ \SetLanguageKeys{thai}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / thai.code =
+ {%
+ \@thai@numeralstrue
+ \SetLanguageKeys{thai}{bcp47-extension-u=nu-thai}%
+ },
+ numerals.default:n = arabic,
+ }
% Register default options
-\xpg@initialize@gloss@options{thai}{numerals=arabic}
+\InitializeGlossOptions{thai}{numerals=arabic}
\def\captionsthai{%
\def\refname{หนังสืออ้างอิง}%
@@ -27145,7 +27159,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-tibetan.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-tibetan.ldf}[polyglossia: module for Tibetan]
%% Copyright 2013 Elie Roux
@@ -27171,20 +27185,18 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*{tibetan}{bo}
\newif\if@tibetan@numerals
-\def\tmp@tibetan{tibetan}
-\define@key{tibetan}{numerals}[tibetan]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@tibetan
- \@tibetan@numeralstrue%
- \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-tibt}%
- \else
- \@tibetan@numeralsfalse%
- \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-latn}%
- \fi%
-}
+\DeclareKeys[polyglossia/gloss/tibetan]
+ {
+ numerals.choice:,
+ numerals/tibetan.code = \@tibetan@numeralstrue
+ \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-tibt},
+ numerals/arabic.code = \@tibetan@numeralsfalse
+ \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-latn},
+ numerals.default:n = tibetan
+ }
\ifluatex
- \newluatexattribute\xpg@tibteol %
+ \newattribute\xpg@tibteol %
\directlua{polyglossia.load_tibt_eol()}%
\fi
@@ -27209,7 +27221,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
% Register default options
-\xpg@initialize@gloss@options{tibetan}{numerals=tibetan}
+\InitializeGlossOptions{tibetan}{numerals=tibetan}
% some are known, but very few
% a few come from "Standardizing Tibetan Terms of Information Technology"
@@ -27371,7 +27383,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-turkish.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-turkish.ldf}[polyglossia: module for Turkish]
\RequirePackage{hijrical}
@@ -27489,7 +27501,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-turkmen.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-turkmen.ldf}[polyglossia: module for Turkmen]
%% Translations provided by Nazar Annagurban <nazartm at gmail dot com>
@@ -27547,12 +27559,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ug.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ug.ldf}[polyglossia: module for ug (Uyghur)]
% BCP 47 tag for Uyghur
-\xpg@load@master@language{uyghur}
+\InheritGlossFile{uyghur}
% \end{macrocode}
% \iffalse
@@ -27563,7 +27575,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ukrainian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ukrainian.ldf}[polyglossia: module for Ukrainian]
% Strings taken from Babel
@@ -27591,51 +27603,52 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{ukrainian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Ukrainian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Ukrainian numerals value `#1'}}
-
-% Define some math functions
-\define@boolkey{ukrainian}[ukrainian@]{mathfunctions}[true]{}
+\DeclareKeys[polyglossia/gloss/ukrainian]
+ {
+ babelshorthands.if = ukrainian@babelshorthands,
+ babelshorthands.default:n = true,
+ mathfunctions.if = ukrainian@mathfunctions,
+ mathfunctions.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Ukrainian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{ukrainian}{numerals=arabic,mathfunctions=true}
-
-\define@boolkey{ukrainian}[ukrainian@]{babelshorthands}[true]{}
+\InitializeGlossOptions{ukrainian}{numerals=arabic,mathfunctions=true}
\ifsystem@babelshorthands
- \setkeys{ukrainian}{babelshorthands=true}
+ \SetGlossOptions{ukrainian}{babelshorthands=true}
\else
- \setkeys{ukrainian}{babelshorthands=false}
+ \SetGlossOptions{ukrainian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\ukrainian@shorthands{%
\xpg@activate@shorthands%
@@ -27862,13 +27875,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-uppersorbian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-uppersorbian.ldf}[polyglossia: module for Upper Sorbian]
% We provide this as a babel alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
% \end{macrocode}
% \iffalse
@@ -27879,7 +27892,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-urdu.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
%%% Adapted from a file contributed by Kamal Abdali
\ProvidesFile{gloss-urdu.ldf}[polyglossia: module for Urdu]
@@ -27906,52 +27919,46 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setlanguagealias*{urdu}{ur}
\newif\if@western@numerals
-\define@choicekey*+{urdu}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \SetLanguageKeys{urdu}{bcp47-extension-u=nu-arab}%
- \or
- % western:
- \@western@numeralstrue%
- \SetLanguageKeys{urdu}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Urdu, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Urdu numerals option `#1'}}
-
\newif\ifurdu@customsep\urdu@customsepfalse
\def\xpg@sepmark{}
-\define@key{urdu}{sectionsep}[.]{%
- \urdu@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{urdu}[urdu@]{abjadjimnotail}[true]{%
- \ifurdu@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi%
-}
-
\newif\if@hijrical
-\define@choicekey*+{urdu}{calendar}[\xpg@val\xpg@nr]{gregorian,hijri}[gregorian]{%
- \ifcase\xpg@nr\relax
- % gregorian:
- \@hijricalfalse
- \or
- % hijri:
- \@hijricaltrue
- \fi
- \xpg@info{Option: Urdu, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Urdu calendar option `#1'}}
-\define@key{urdu}{hijricorrection}[0]{%
- \gdef\urdu@hijri@correction{#1}}%
+\DeclareKeys[polyglossia/gloss/urdu]
+ {
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ sectionsep.code = \gdef\xpg@sepmark{#1}\urdu@customseptrue,
+ sectionsep.default:n = .,
+ hijricorrection.code = \gdef\urdu@hijri@correction{#1},
+ hijricorrection.default:n = 0,
+ calendar.choice:,
+ calendar / gregorian.code =
+ {%
+ \@hijricalfalse
+ },
+ calendar / hijri.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Urdu calendar option `#1'},
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ \SetLanguageKeys{urdu}{bcp47-extension-u=nu-arab}%
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \SetLanguageKeys{urdu}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Urdu numerals option `#1'}
+ }
% This should set the defaults
-\setkeys{urdu}{calendar,numerals,hijricorrection}
+\SetGlossOptions{urdu}{calendar,numerals,hijricorrection}
\def\urdugregmonth#1{\ifcase#1%
\or جنوری\or فروری\or مارچ\or اپریل\or مئی\or جون\or جولائی\or اگست\or ستمبر\or اکتوبر\or نومبر\or دسمبر\fi}
@@ -28038,16 +28045,16 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nourdu@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\urdu@luatex@capsformat{%
%
% change chapter and part headings
\ifurdu@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -28059,7 +28066,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -28074,30 +28081,30 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
\def\nourdu@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@urdu{%
@@ -28129,14 +28136,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-usorbian.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-usorbian.ldf}[polyglossia: module for Upper Sorbian]
% We only provide this gloss for babel compatibility. Since usorbian is
% a sorbian variety, we use 'sorbian' with variant 'upper' now.
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
% \end{macrocode}
% \iffalse
@@ -28147,7 +28154,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-uyghur.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-uyghur.ldf}[polyglossia: module for Uyghur]
%% Translations provided by Osman Tursun (Github Account: neouyghur)
@@ -28171,62 +28178,72 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\newif\if@uyghur@swapcaptions
\newif\if@uyghur@swapheadings
\newif\if@uyghur@swapheaders
-\define@choicekey*+{uyghur}{swapstrings}[\xpg@val\xpg@nr]{all,captions,headings,headers,hheaders,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@uyghur@swapcaptionstrue%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheaderstrue%
- \or
- % captions:
- \@uyghur@swapcaptionstrue%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheadersfalse%
- \or
- % headings:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheadersfalse%
- \or
- % headers:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheaderstrue%
- \or
- % hheaders:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheaderstrue%
- \or
- % none:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheadersfalse%
- \fi
- \xpg@info{Option: Uyghur, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Uyghur swapstrings value `#1'}}
-
\newif\if@uyghur@ordchapter
\newif\if@uyghur@romchapter
-\define@choicekey*+{uyghur}{chapterformat}[\xpg@val\xpg@nr]{ordinal,roman,arabic}[ordinal]{%
- \ifcase\xpg@nr\relax
- % ordinal:
- \@uyghur@ordchaptertrue%
- \@uyghur@romchapterfalse%
- \or
- % roman:
- \@uyghur@ordchapterfalse%
- \@uyghur@romchaptertrue%
- \or
- % arabic:
- \@uyghur@ordchapterfalse%
- \@uyghur@romchapterfalse%
- \fi
- \xpg@info{Option: Uyghur, chapterformat=\xpg@val}%
-}{\xpg@warning{Unknown Uyghur chapterformat value `#1'}}
+
+\DeclareKeys[polyglossia/gloss/uyghur]
+ {
+ chapterformat.choice:,
+ chapterformat / ordinal.code =
+ {%
+ \@uyghur@ordchaptertrue
+ \@uyghur@romchapterfalse
+ },
+ chapterformat / roman.code =
+ {%
+ \@uyghur@ordchapterfalse
+ \@uyghur@romchaptertrue
+ },
+ chapterformat / arabic.code =
+ {%
+ \@uyghur@ordchapterfalse
+ \@uyghur@romchapterfalse
+ },
+ chapterformat.default:n = ordinal,
+ chapterformat/unknown.code = \xpg@warning{Unknown Uyghur chapterformat value `#1'},
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@uyghur@swapcaptionstrue
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / captions.code =
+ {%
+ \@uyghur@swapcaptionstrue
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings / headings.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / hheaders.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Uyghur swapstrings value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{uyghur}{swapstrings=all,chapterformat=ordinal}
+\InitializeGlossOptions{uyghur}{swapstrings=all,chapterformat=ordinal}
\def\captionsuyghur{%
@@ -28274,120 +28291,104 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% change chapter and part headings
\if@uyghur@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
- {\the@uyghur@chapter\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
+ \@ifundefined{titleformat}{%
% With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\the@uyghur@part~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat%
- \renewcommand{\chapterformat}{\mbox{\the@uyghur@chapter%
- \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
- }{}%
- }{% (not \ifdefined\sectionformat)
+ \@ifundefined{sectionformat}{%
% With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead%
- \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
- {\chapnumfont\the@uyghur@chapter\chapternamenum\printchaptername}%
- {}%
- {\xpg@warning{Failed to patch chapter for Uyghur}}%
- }{}%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}{\printpartname \partnamenum \printpartnum}%
- {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
- {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{@makechapterhead}{%
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead%
\patchcmd{\@makechapterhead}%
{\@chapapp\space \thechapter}%
{\the@uyghur@chapter\space \@chapapp}%
{}%
{\xpg@warning{Failed to patch chapter for Uyghur}}%
- }{}%
- \ifcsdef{H@old@part}{% Hyperref
+ }%
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Uyghur}}}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref
\let\xpg@save@part@format\H@old@part%
\patchcmd{\H@old@part}%
{\partname\nobreakspace\thepart}%
{\the@uyghur@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Uyghur}}{}}%
- }{}% (end \ifdefined\@part)
}% (end not hyperref)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead%
+ \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
+ {\chapnumfont\the@uyghur@chapter\chapternamenum\printchaptername}%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Uyghur}}%
+ }%
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
+ {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }{% Hyperref
+ \let\xpg@save@part@format\H@old@part%
+ \patchcmd{\H@old@part}{\printpartname \partnamenum \printpartnum}%
+ {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\the@uyghur@part~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat%
+ \renewcommand{\chapterformat}{\mbox{\the@uyghur@chapter%
+ \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }{% Hyperref
+ \let\xpg@save@part@format\H@old@part%
+ \patchcmd{\H@old@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+ {\the@uyghur@chapter\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+ }%
}% (end \ifdefined\titleformat)
\fi% (end \if@uyghur@swapheadings)
%
% Change running headers
\if@uyghur@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat%
- \renewcommand*\chaptermarkformat{%
- \the@uyghur@chapter\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark%
- \renewcommand*\chaptermark[1]{%
- \markboth{\memUChead{%
- \ifnum \c@secnumdepth >\m@ne
- \ifbool{@mainmatter}{%
- \the@uyghur@chapter\ \@chapapp\ %
- }{}%
- \fi
- ##1}}{}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter.}%
{\let\xpg@save@chaptermark@format\chaptermark%
@@ -28397,21 +28398,38 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
{}%
{\xpg@warning{Failed to patch chaptermark for Uyghur}}}%
{}%
- }{}% (end \ifdefined\sectionmark)
- \ifcsdef{sectionmark}{%
- \ifpatchable{\sectionmark}%
- {\thesection.}%
- {\let\xpg@save@sectionmark@format\sectionmark%
- \patchcmd{\sectionmark}%
- {\thesection.}%
- {\thesection}%
- {}%
- {\xpg@warning{Failed to patch sectionmark for Uyghur}}}%
- {}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\sectionmark)
+ \@ifundefined{sectionmark}{}{%
+ \ifpatchable{\sectionmark}%
+ {\thesection.}%
+ {\let\xpg@save@sectionmark@format\sectionmark%
+ \patchcmd{\sectionmark}%
+ {\thesection.}%
+ {\thesection}%
+ {}%
+ {\xpg@warning{Failed to patch sectionmark for Uyghur}}%
+ }%
+ {}%
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark%
+ \renewcommand*\chaptermark[1]{%
+ \markboth{\memUChead{%
+ \ifnum \c@secnumdepth >\m@ne
+ \ifbool{@mainmatter}{%
+ \the@uyghur@chapter\ \@chapapp\ %
+ }{}%
+ \fi
+ ##1}}{}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat%
+ \renewcommand*\chaptermarkformat{%
+ \the@uyghur@chapter\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
}% (end \ifdefined\chapterformat)
- \fi% (end \if@uyghur@swapheaders)
+ \fi% (end \if@uyghur@swapheaders)
}
\def\nouyghur@capsformat{%
@@ -28421,62 +28439,62 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\fnum@figure\xpg@save@fnum@figure%
%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{H@old@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\H@old@part\xpg@save@part@format%
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{H@old@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\H@old@part\xpg@save@part@format%
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format%
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format%
- }{}%
- }{}% (end \ifdefined\chaptermark)
- \ifcsdef{sectionmark}{%
- \ifcsdef{xpg@save@sectionmark@format}{%
+ }%
+ }% (end \ifdefined\chaptermark)
+ \@ifundefined{sectionmark}{}{%
+ \@ifundefined{xpg@save@sectionmark@format}{}{%
\let\sectionmark\xpg@save@sectionmark@format%
- }{}%
- }{}% (end \ifdefined\sectionmark)
+ }%
+ }% (end \ifdefined\sectionmark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format%
+ }%
}% (end \ifdefined\chapterformat)
}
@@ -28512,22 +28530,22 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\let\the@uyghur@chapter\thechapter
\def\uyghur@chapterformat{%
- \ifcsdef{part}{%
+ \@ifundefined{part}{}{%
\if@uyghur@ordchapter%
\renewcommand{\the@uyghur@part}{\uyghurord{part}}%
\fi%
\if@uyghur@romchapter%
\renewcommand{\the@uyghur@part}{\Roman{part}}%
\fi%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\if@uyghur@ordchapter%
\renewcommand{\the@uyghur@chapter}{\uyghurord{chapter}}%
\fi%
\if@uyghur@romchapter%
\renewcommand{\the@uyghur@chapter}{\Roman{chapter}}%
\fi%
- }{}%
+ }%
}
\def\uyghur@numbers{%
@@ -28588,7 +28606,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-vietnamese.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-vietnamese.ldf}[polyglossia: module for Vietnamese]
%% Strings contributed by Daniel Owens < dhowens . pmbx . net >
@@ -28647,7 +28665,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-welsh.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-welsh.ldf}[polyglossia: module for Welsh]
@@ -28664,21 +28682,26 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% BCP-47 compliant aliases
\setlanguagealias*{welsh}{cy}
-\providebool{welsh@formaldate}
+\@ifundefined{ifwelsh@formaldate}%
+ {\newif\ifwelsh@formaldate}{}
-\define@choicekey*+{welsh}{date}[\xpg@val\xpg@nr]{long,short}[short]{%
- \ifcase\xpg@nr\relax
- % long:
- \welsh@formaldatetrue
- \or
- % accented:
- \welsh@formaldatefalse
- \fi
- \xpg@info{Option: Welsh, date=\xpg@val}%
-}{\xpg@warning{Unknown date value `#1'}}
+\DeclareKeys[polyglossia/gloss/welsh]
+ {
+ date.choice:,
+ date / long.code =
+ {%
+ \welsh@formaldatetrue
+ },
+ date / short.code =
+ {%
+ \welsh@formaldatefalse
+ },
+ date.default:n = short,
+ date/unknown.code = \xpg@warning{Unknown date value `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{welsh}{date=short}
+\InitializeGlossOptions{welsh}{date=short}
\def\captionswelsh{%
\def\refname{Cyfeiriadau}%
@@ -28747,13 +28770,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-zh-CN.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-zh-CN.ldf}[polyglossia: module for zh-CN (Chinese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{chinese}
+\InheritGlossFile{chinese}
% \end{macrocode}
% \iffalse
@@ -28764,268 +28787,26 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-zh-TW.ldf}
% \begin{macrocode}
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-zh-TW.ldf}[polyglossia: module for zh-TW (Chinese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{chinese}
+\InheritGlossFile{chinese}
% \end{macrocode}
% \iffalse
%</gloss-zh-TW.ldf>
-%<*arabicdigits.map>
-% \fi
-% \clearpage
-%
-% \subsection{arabicdigits.map}
-% \begin{macrocode}
-; FC ...
-LHSName "Digits"
-RHSName "ArabicDigits"
-
-pass(Unicode)
-U+0030 <> U+0660 ;
-U+0031 <> U+0661 ;
-U+0032 <> U+0662 ;
-U+0033 <> U+0663 ;
-U+0034 <> U+0664 ;
-U+0035 <> U+0665 ;
-U+0036 <> U+0666 ;
-U+0037 <> U+0667 ;
-U+0038 <> U+0668 ;
-U+0039 <> U+0669 ;
-
-% \end{macrocode}
-% \iffalse
-%</arabicdigits.map>
-%<*bengalidigits.map>
-% \fi
-% \clearpage
-%
-% \subsection{bengalidigits.map}
-% \begin{macrocode}
-; FC ...
-LHSName "Digits"
-RHSName "BengaliDigits"
-
-pass(Unicode)
-U+0030 <> U+09E6 ;
-U+0031 <> U+09E7 ;
-U+0032 <> U+09E8 ;
-U+0033 <> U+09E9 ;
-U+0034 <> U+09EA ;
-U+0035 <> U+09EB ;
-U+0036 <> U+09EC ;
-U+0037 <> U+09ED ;
-U+0038 <> U+09EE ;
-U+0039 <> U+09EF ;
-
-% \end{macrocode}
-% \iffalse
-%</bengalidigits.map>
-%<*devanagaridigits.map>
-% \fi
-% \clearpage
-%
-% \subsection{devanagaridigits.map}
-% \begin{macrocode}
-; FC ...
-LHSName "Digits"
-RHSName "DevanagariDigits"
-
-pass(Unicode)
-U+0030 <> U+0966 ;
-U+0031 <> U+0967 ;
-U+0032 <> U+0968 ;
-U+0033 <> U+0969 ;
-U+0034 <> U+096A ;
-U+0035 <> U+096B ;
-U+0036 <> U+096C ;
-U+0037 <> U+096D ;
-U+0038 <> U+096E ;
-U+0039 <> U+096F ;
-
-% \end{macrocode}
-% \iffalse
-%</devanagaridigits.map>
-%<*farsidigits.map>
-% \fi
-% \clearpage
-%
-% \subsection{farsidigits.map}
-% \begin{macrocode}
-; FC ...
-LHSName "Digits"
-RHSName "FarsiDigits"
-
-pass(Unicode)
-U+0030 <> U+06F0 ;
-U+0031 <> U+06F1 ;
-U+0032 <> U+06F2 ;
-U+0033 <> U+06F3 ;
-U+0034 <> U+06F4 ;
-U+0035 <> U+06F5 ;
-U+0036 <> U+06F6 ;
-U+0037 <> U+06F7 ;
-U+0038 <> U+06F8 ;
-U+0039 <> U+06F9 ;
-
-% \end{macrocode}
-% \iffalse
-%</farsidigits.map>
-%<*gurmukhidigits.map>
-% \fi
-% \clearpage
-%
-% \subsection{gurmukhidigits.map}
-% \begin{macrocode}
-; FC ...
-LHSName "Digits"
-RHSName "GurmukhiDigits"
-
-pass(Unicode)
-U+0030 <> U+0A66 ;
-U+0031 <> U+0A67 ;
-U+0032 <> U+0A68 ;
-U+0033 <> U+0A69 ;
-U+0034 <> U+0A6A ;
-U+0035 <> U+0A6B ;
-U+0036 <> U+0A6C ;
-U+0037 <> U+0A6D ;
-U+0038 <> U+0A6E ;
-U+0039 <> U+0A6F ;
-
-% \end{macrocode}
-% \iffalse
-%</gurmukhidigits.map>
-%<*odiadigits.map>
-% \fi
-% \clearpage
-%
-% \subsection{odiadigits.map}
-% \begin{macrocode}
-; FC ...
-LHSName "Digits"
-RHSName "OdiaDigits"
-
-pass(Unicode)
-U+0030 <> U+0B66 ;
-U+0031 <> U+0B67 ;
-U+0032 <> U+0B68 ;
-U+0033 <> U+0B69 ;
-U+0034 <> U+0B6A ;
-U+0035 <> U+0B6B ;
-U+0036 <> U+0B6C ;
-U+0037 <> U+0B6D ;
-U+0038 <> U+0B6E ;
-U+0039 <> U+0B6F ;
-
-% \end{macrocode}
-% \iffalse
-%</odiadigits.map>
-%<*thaidigits.map>
-% \fi
-% \clearpage
-%
-% \subsection{thaidigits.map}
-% \begin{macrocode}
-; FC ...
-LHSName "Digits"
-RHSName "ThaiDigits"
-
-pass(Unicode)
-U+0030 <> U+0E50 ;
-U+0031 <> U+0E51 ;
-U+0032 <> U+0E52 ;
-U+0033 <> U+0E53 ;
-U+0034 <> U+0E54 ;
-U+0035 <> U+0E55 ;
-U+0036 <> U+0E56 ;
-U+0037 <> U+0E57 ;
-U+0038 <> U+0E58 ;
-U+0039 <> U+0E59 ;
-
-% \end{macrocode}
-% \iffalse
-%</thaidigits.map>
-%<*polyglossia-french.lua>
-% \fi
-% \clearpage
-%
-% \subsection{polyglossia-french.lua}
-% \begin{macrocode}
---
--- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
---
-
-require('polyglossia-punct')
-
-local function set_left_space(lang, char, kern, rubber)
- polyglossia.add_left_spaced_character(lang, char, kern, "space", rubber)
-end
-
-local function set_right_space(lang, char, kern, rubber)
- polyglossia.add_right_spaced_character(lang, char, kern, "space", rubber)
-end
-
-local function activate_french_punct(thincolonspace, autospaceguillemets)
- -- We need different language tags here to make switching of options possible
- -- within a paragraph.
- local lang = "french"
- if thincolonspace then
- lang = lang.."-thincolon"
- end
- if autospaceguillemets then
- lang = lang.."-autospace"
- end
-
- polyglossia.activate_punct(lang)
- polyglossia.clear_spaced_characters(lang)
-
- if thincolonspace then
- set_left_space(lang, ':', 0.5)
- else
- set_left_space(lang, ':', 1, true) -- stretchable and shrinkable space
- end
-
- set_left_space(lang, '!', 0.5)
- set_left_space(lang, '?', 0.5)
- set_left_space(lang, ';', 0.5)
- set_left_space(lang, '‼', 0.5)
- set_left_space(lang, '⁇', 0.5)
- set_left_space(lang, '⁈', 0.5)
- set_left_space(lang, '⁉', 0.5)
- set_left_space(lang, '‽', 0.5) -- U+203D (interrobang)
-
- if autospaceguillemets then
- set_left_space(lang, '»', 0.5)
- set_left_space(lang, '›', 0.5)
- set_right_space(lang, '«', 0.5)
- set_right_space(lang, '‹', 0.5)
- end
-end
-
-local function deactivate_french_punct()
- polyglossia.deactivate_punct()
-end
-
-polyglossia.activate_french_punct = activate_french_punct
-polyglossia.deactivate_french_punct = deactivate_french_punct
-% \end{macrocode}
-% \iffalse
-%</polyglossia-french.lua>
-%<*polyglossia-korean.lua>
+%<*polyglossia-cjk-spacing.lua>
% \fi
% \clearpage
%
-% \subsection{polyglossia-korean.lua}
+% \subsection{polyglossia-cjk-spacing.lua}
% \begin{macrocode}
--
--- polyglossia-korean.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- polyglossia-cjk-spacing.lua
+-- part of polyglossia v2.2 -- 2024/07/15
--
local glyph_id = node.id"glyph"
@@ -29033,13 +28814,17 @@ local hbox_id = node.id"hlist"
local vbox_id = node.id"vlist"
local glue_id = node.id"glue"
local penalty_id = node.id"penalty"
-local disc_id = node.id"disc"
+local whatsit_id = node.id"whatsit"
+local math_id = node.id"math"
--
--- attr_korean: variant = plain (0), classic (1), modern (2)
+-- attr_cjk: variant = plain: 0, JP/classic: 1, KR/modern: 2, SC: 3, TC: 4
+--
+local attr_cjk = luatexbase.attributes["xpg@attr@cjkspacing"]
+--
+-- attr_josa: ONLY For Korean. DO NOT declare \newattribute for other langs
--
-local attr_korean = luatexbase.attributes["xpg@attr@korean"]
-local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
+local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
--
-- characters after which linebreak is not allowed
@@ -29088,9 +28873,9 @@ local nobr_after = {
-- characters before which linebreak is not allowed
-- (currently, not much differences among the followings)
-- 1: normal chars
--- 2: hangul jamo vowels and trailing consonants
+-- 2: hangul jamo vowels and trailing consonants plus combinings
-- 3: kana small letters
--- 0: dashes (supress visible spacing)
+-- 0: dashes (suppress visible spacing after this char)
--
local nobr_before = setmetatable({
[0x21] = 1, -- ! EXCLAMATION MARK
@@ -29101,7 +28886,7 @@ local nobr_before = setmetatable({
[0x2D] = 0, -- - HYPHEN-MINUS
[0x2E] = 1, -- . FULL STOP
[0x2F] = 0, -- / SOLIDUS
- [0x3A] = 0, -- : COLON
+ [0x3A] = 1, -- : COLON
[0x3B] = 1, -- ; SEMICOLON
[0x3E] = 1, -- > GREATER-THAN SIGN
[0x3F] = 1, -- ? QUESTION MARK
@@ -29113,11 +28898,11 @@ local nobr_before = setmetatable({
[0xBB] = 1, -- » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
[0x2013] = 0, -- – EN DASH
[0x2014] = 0, -- — EM DASH
- [0x2015] = 1, -- ― HORIZONTAL BAR
+ [0x2015] = 0, -- ― HORIZONTAL BAR
[0x2019] = 1, -- ’ RIGHT SINGLE QUOTATION MARK
[0x201D] = 1, -- ” RIGHT DOUBLE QUOTATION MARK
- [0x2025] = 1, -- ‥ TWO DOT LEADER
- [0x2026] = 1, -- … HORIZONTAL ELLIPSIS
+ [0x2025] = 0, -- ‥ TWO DOT LEADER
+ [0x2026] = 0, -- … HORIZONTAL ELLIPSIS
[0x232A] = 1, -- 〉 RIGHT-POINTING ANGLE BRACKET
[0x3001] = 1, -- 、 IDEOGRAPHIC COMMA
[0x3002] = 1, -- 。 IDEOGRAPHIC FULL STOP
@@ -29149,10 +28934,10 @@ local nobr_before = setmetatable({
[0x308E] = 3, -- ゎ HIRAGANA LETTER SMALL WA
[0x3095] = 3, -- ゕ HIRAGANA LETTER SMALL KA
[0x3096] = 3, -- ゖ HIRAGANA LETTER SMALL KE
- [0x3099] = 1, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309A] = 1, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
- [0x309B] = 1, -- ゛ KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309C] = 1, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x3099] = 2, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309A] = 2, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x309B] = 2, -- ゛ KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309C] = 2, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
[0x309D] = 1, -- ゝ HIRAGANA ITERATION MARK
[0x309E] = 1, -- ゞ HIRAGANA VOICED ITERATION MARK
[0x30A0] = 1, -- ゠ KATAKANA-HIRAGANA DOUBLE HYPHEN
@@ -29172,9 +28957,9 @@ local nobr_before = setmetatable({
[0x30FC] = 1, -- ー KATAKANA-HIRAGANA PROLONGED SOUND MARK
[0x30FD] = 1, -- ヽ KATAKANA ITERATION MARK
[0x30FE] = 1, -- ヾ KATAKANA VOICED ITERATION MARK
- [0xFE30] = 1, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
- [0xFE31] = 1, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
- [0xFE32] = 1, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
+ [0xFE30] = 0, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
+ [0xFE31] = 0, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
+ [0xFE32] = 0, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
[0xFE36] = 1, -- ︶ PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
[0xFE38] = 1, -- ︸ PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
[0xFE3A] = 1, -- ︺ PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
@@ -29201,18 +28986,18 @@ local nobr_before = setmetatable({
[0xFF63] = 1, -- 」 HALFWIDTH RIGHT CORNER BRACKET
[0xFF64] = 1, -- 、 HALFWIDTH IDEOGRAPHIC COMMA
[0xFF65] = 1, -- ・ HALFWIDTH KATAKANA MIDDLE DOT
- [0xFF9E] = 1, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
- [0xFF9F] = 1, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+ [0xFF9E] = 2, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
+ [0xFF9F] = 2, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
}, { __index = function(_,c)
if c >= 0x1160 and c <= 0x11FF then return 2 end
if c >= 0xD7B0 and c <= 0xD7FF then return 2 end
- if c >= 0x302A and c <= 0x302F then return 1 end
+ if c >= 0x302A and c <= 0x302F then return 2 end -- tone marks
if c >= 0x31F0 and c <= 0x31FF then return 3 end
if c >= 0xFF67 and c <= 0xFF70 then return 3 end
- if c >= 0xFE00 and c <= 0xFE0F then return 1 end
+ if c >= 0xFE00 and c <= 0xFE0F then return 2 end -- variation selectors
if c >= 0xFE10 and c <= 0xFE19 and not (c == 0xFE17) then return 1 end
if c >= 0xFE50 and c <= 0xFE58 then return 1 end
- if c >= 0xE0100 and c <= 0xE01EF then return 1 end
+ if c >= 0xE0100 and c <= 0xE01EF then return 2 end -- variation selecters
end
})
@@ -29230,6 +29015,7 @@ local function is_cjk (c)
or c >= 0xFF00 and c <= 0xFFEF
or c >= 0x1F100 and c <= 0x1F2FF
or c >= 0x20000 and c <= 0x2FA1F
+ or c >= 0x30000 and c <= 0x323AF
or nobr_after[c] and c > 0x2014
or nobr_before[c] and c > 0x2014
end
@@ -29269,8 +29055,28 @@ local charclass = setmetatable({
}, { __index = function() return 0 end })
--
+-- get character class
+-- var : variant = plain, JP/classic, KR/modern, SC, TC
+-- c : codepoint
+--
+local function get_charclass (var, c)
+ if var < 3 then
+ return charclass[c]
+ elseif var == 3 then
+ -- SC : these are left aligned
+ return (c == 0xFF01 or c == 0xFF1F) and 4 -- FULLWIDTH EXCLAMATION/QUESTION MARK
+ or (c == 0xFF1A or c == 0xFF1B) and 2 -- FULLWIDTH COLON/SEMICOLON
+ or charclass[c]
+ end
+ -- TC : these are center aligned
+ return (c == 0x3001 or c == 0xFF0C) and 3 -- IDEOGRAPHIC/FULLWIDTH COMMA
+ or (c == 0x3002 or c == 0xFF0E) and 3 -- IDEOGRAPHIC/FULLWIDTH FULL STOP -- 5 ?
+ or charclass[c]
+end
+
+--
-- table for spacing between char classes
--- 1 stands for 0.5*fontsize when variant=classic
+-- 1 stands for 0.5*fontsize when variant = JP/classic or SC or TC
--
local intercharclass = { [0] =
{ [0] = nil, {1,1}, nil, {.5,.5} },
@@ -29302,7 +29108,7 @@ end
--
-- return 0.5*fontsize of given fontid
--- space: true if variant=modern; then 0.5*interword_space
+-- space: true if variant=KR/modern; then 0.5*interword_space
--
local function get_font_size (fid, space)
local size = font.getparameters(fid)
@@ -29316,7 +29122,7 @@ end
--
-- charclass 1 thru 4 will be packed in \hbox to 0.5em{\hss? curr \hss?}
--- when variant=classic/modern
+-- when variant ~= plain
--
local function glyph_to_box (head, curr, class)
local g, h = curr
@@ -29345,7 +29151,7 @@ end
--
-- insert spacing defined as charclass[a][b] between a and b
-- f: fontid
--- var: variant = plain, classic, modern
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
-- cc: charclass of current char
-- nc: charclass of next char
-- nobr: linebreak is not allowed
@@ -29364,12 +29170,16 @@ end
--
-- insert inter-character spacing in other normal cases
--- f: fontid
--- var: variant = plain, classic, modern
--- x: true between cjk and non-cjk (a little more spacing)
+-- f: fontid
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
+-- nobr: no linebreak
+-- x: true between cjk and non-cjk (a little more spacing)
--
-local function insert_penalty_glue (head, curr, f, var, x)
- if var ~= 1 then
+local function insert_penalty_glue (head, curr, f, var, nobr, x)
+ if nobr then
+ local penalty = get_new_penalty(10000)
+ head, curr = node.insert_after(head, curr, penalty)
+ elseif var == 0 or var == 2 then
local penalty = get_new_penalty(50)
head, curr = node.insert_after(head, curr, penalty)
end
@@ -29385,53 +29195,64 @@ end
--
-- main process for linebreak and inter-character spacing
--- lb: true if pre_linebreak_filter
--
-local function korean_break (head, lb)
+local function cjk_break (head)
local curr = head
while curr do
- if curr.id == glyph_id then
- local var = node.has_attribute(curr, attr_korean)
+ if attr_cjk and (curr.id == glyph_id or curr.id == math_id and curr.subtype == 1) then
+ local var = node.has_attribute(curr, attr_cjk)
if var then
- local c, f = curr.char or 0, curr.font or 0
- local cc, cjkc = charclass[c], is_cjk(c)
+ local c, f = curr.char or 0, curr.font
+ local cc, cjkc = get_charclass(var, c), is_cjk(c)
-- compress cjk punctuations when charclass is 1 thru 4
if var > 0 and cc > 0 and cc < 5 then
head, curr = glyph_to_box(head, curr, cc)
end
- local next = curr.next
- if next and next.id == glyph_id then
+ local next = node.getnext(curr)
+ while next and next.id == whatsit_id do -- skip whatsit nodes
+ curr, next = next, node.getnext(next)
+ end
+
+ if next and (next.id == glyph_id or next.id == math_id and next.subtype == 0) then
local n = next.char or 0
- local nc = charclass[n]
+ f = f or next.font or 0 -- in case of curr == math_off
+
+ -- skip combining. or dash+dash case to suppress stretching
+ if nobr_before[n] == 2 or (nobr_before[c] == 0 and nobr_before[n] == 0) then
+ goto skip_combining
+ end
+
+ local nc = get_charclass(var, n)
local nobr = nobr_before[n] or nobr_after[c]
-- insert spacing as of intercharclass
if var > 0 and intercharclass[cc][nc] then
head, curr = insert_cjk_penalty_glue(head, curr, f, var, cc, nc, nobr)
- -- or insert spacing when linebreak is allowed
- elseif not nobr then
+ else
local cjkn = is_cjk(n)
-- if curr or next is cjk char
if cjkc or cjkn then
- -- if between cjk and non-cjk
- if var > 0 and not (cjkc and cjkn) and nobr_before[c] ~= 0 then
- head, curr = insert_penalty_glue(head, curr, f, var, true)
+ -- plain variant / cjk+cjk / nobr cjk+noncjk / after dash
+ -- : insert a 0pt glue
+ if var == 0 or (cjkc and cjkn) or nobr or nobr_before[c] == 0 then
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr)
- -- or under pre_linebreak_filter
- elseif lb then
- head, curr = insert_penalty_glue(head, curr, f, var)
+ -- other cases: insert a small glue
+ else
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr, true)
end
end
end
end
end
end
- curr = curr.next
+ ::skip_combining::
+ curr = node.getnext(curr)
end
return head
end
@@ -29445,7 +29266,7 @@ end
local function reorder_tm (head)
local curr, tone = node.slide(head)
while curr do
- if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
+ if curr.id == glyph_id and node.has_attribute(curr, attr_cjk) then
local f = font.getfont(curr.font) or font.fonts[curr.font]
if f and f.hb then -- harfbuzz do the right thing
tone = nil
@@ -29461,7 +29282,7 @@ local function reorder_tm (head)
end
end
end
- curr = curr.prev
+ curr = node.getprev(curr)
end
return head
end
@@ -29548,7 +29369,7 @@ local function get_prev_char (p)
local pc = get_prev_char(node.slide(p.head))
if pc then return pc end
end
- p = p.prev
+ p = node.getprev(p)
end
end
@@ -29563,10 +29384,10 @@ local function auto_josa (head)
if josa then
local cc = curr.char or 0
if josa == 0 then
- josa = josa_code[get_prev_char(curr.prev) or 0x30]
+ josa = josa_code[get_prev_char(node.getprev(curr)) or 0x30]
end
if cc == 0xC774 then
- local n = curr.next
+ local n = node.getnext(curr)
if n and n.char and n.char >= 0xAC00 and n.char <= 0xD7A3 then
else
cc = 0xAC00
@@ -29585,7 +29406,7 @@ local function auto_josa (head)
node.unset_attribute(curr, attr_josa)
end
end
- curr = curr.next
+ curr = node.getnext(curr)
end
for _,v in ipairs(tofree) do node.free(v) end
return head
@@ -29596,45 +29417,86 @@ end
-- As char value of glyphs can be changed by opentype GSUB process,
-- we have to occupy the first position among callback functions.
--
-local prepend_to_callback
-if luatexbase.base_add_to_callback then
- prepend_to_callback = function(name, func, desc)
- luatexbase.add_to_callback(name, func, desc, 1)
+luatexbase.add_to_callback( "pre_shaping_filter",
+function(head)
+ if attr_josa then head = auto_josa(head) end
+ head = cjk_break(head)
+ if attr_josa then head = reorder_tm(head) end
+ return head
+end,
+"polyglossia.lang_cjk_spacing")
+
+-- vim:ft=lua:tw=0:sw=4:ts=4:expandtab
+% \end{macrocode}
+% \iffalse
+%</polyglossia-cjk-spacing.lua>
+%<*polyglossia-french.lua>
+% \fi
+% \clearpage
+%
+% \subsection{polyglossia-french.lua}
+% \begin{macrocode}
+--
+-- polyglossia-punct.lua
+-- part of polyglossia v2.2 -- 2024/07/15
+--
+
+require('polyglossia-punct')
+
+local function set_left_space(lang, char, kern, rubber)
+ polyglossia.add_left_spaced_character(lang, char, kern, "space", rubber)
+end
+
+local function set_right_space(lang, char, kern, rubber)
+ polyglossia.add_right_spaced_character(lang, char, kern, "space", rubber)
+end
+
+local function activate_french_punct(thincolonspace, autospaceguillemets)
+ -- We need different language tags here to make switching of options possible
+ -- within a paragraph.
+ local lang = "french"
+ if thincolonspace then
+ lang = lang.."-thincolon"
end
-else
- prepend_to_callback = function(name, func, desc)
- local t = { {func, desc} }
- for _,v in ipairs(luatexbase.callback_descriptions(name)) do
- table.insert(t, {luatexbase.remove_from_callback(name, v)})
- end
- for _,v in ipairs(t) do
- luatexbase.add_to_callback(name, v[1], v[2])
- end
+ if autospaceguillemets then
+ lang = lang.."-autospace"
+ end
+
+ polyglossia.activate_punct(lang)
+ polyglossia.clear_spaced_characters(lang)
+
+ if thincolonspace then
+ set_left_space(lang, ':', 0.5)
+ else
+ set_left_space(lang, ':', 1, true) -- stretchable and shrinkable space
+ end
+
+ set_left_space(lang, '!', 0.5)
+ set_left_space(lang, '?', 0.5)
+ set_left_space(lang, ';', 0.5)
+ set_left_space(lang, '‼', 0.5)
+ set_left_space(lang, '⁇', 0.5)
+ set_left_space(lang, '⁈', 0.5)
+ set_left_space(lang, '⁉', 0.5)
+ set_left_space(lang, '‽', 0.5) -- U+203D (interrobang)
+
+ if autospaceguillemets then
+ set_left_space(lang, '»', 0.5)
+ set_left_space(lang, '›', 0.5)
+ set_right_space(lang, '«', 0.5)
+ set_right_space(lang, '‹', 0.5)
end
end
-prepend_to_callback ("pre_linebreak_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head, true)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
-
-prepend_to_callback ("hpack_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
+local function deactivate_french_punct()
+ polyglossia.deactivate_punct()
+end
--- vim:ft=lua:tw=0:sw=4:ts=4:expandtab
+polyglossia.activate_french_punct = activate_french_punct
+polyglossia.deactivate_french_punct = deactivate_french_punct
% \end{macrocode}
% \iffalse
-%</polyglossia-korean.lua>
+%</polyglossia-french.lua>
%<*polyglossia-latin.lua>
% \fi
% \clearpage
@@ -29643,7 +29505,7 @@ prepend_to_callback ("hpack_filter",
% \begin{macrocode}
--
-- polyglossia-latin.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
@@ -29698,14 +29560,13 @@ polyglossia.deactivate_latin_punct = deactivate_latin_punct
% \begin{macrocode}
--
-- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
-local remove_from_callback = luatexbase.remove_from_callback
-local priority_in_callback = luatexbase.priority_in_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local new_attribute = luatexbase.new_attribute
local node = node
@@ -30029,13 +29890,16 @@ local function activate(lang)
-- important to be able to intermix languages with different spacings
-- in one paragraph.
tex.setattribute(punct_attr, id)
- for _, callback_name in ipairs{ "pre_linebreak_filter", "hpack_filter" } do
- if not priority_in_callback(callback_name, "polyglossia-punct.process") then
- add_to_callback(callback_name, process, "polyglossia-punct.process", 1)
- end
- end
end
+add_to_callback("pre_linebreak_filter",process,"polyglossia-punct.process")
+add_to_callback("hpack_filter",process,"polyglossia-punct.process")
+declare_callback_rule("pre_linebreak_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+declare_callback_rule("hpack_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+
+
local function deactivate()
tex.setattribute(punct_attr, -0x7FFFFFFF) -- this value means "unset"
-- Though it would make compilation slightly faster, it is not possible to
@@ -30066,7 +29930,7 @@ polyglossia.clear_spaced_characters = clear_spaced_characters
% \begin{macrocode}
--
-- polyglossia-sanskrit.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
@@ -30116,31 +29980,29 @@ polyglossia.deactivate_sanskrit_punct = deactivate_sanskrit_punct
% \begin{macrocode}
--
-- polyglossia-tibt.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
local remove_from_callback = luatexbase.remove_from_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local priority_in_callback = luatexbase.priority_in_callback
local next, type = next, type
-
-local nodes, fonts, node = nodes, fonts, node
-
-local nodecodes = nodes.nodecodes --- <= preloaded node.types()
+local node = node
local insert_node_before = node.insert_before
local insert_node_after = node.insert_after
-local remove_node = nodes.remove
+local remove_node = node.remove
local copy_node = node.copy
local has_attribute = node.has_attribute
local end_of_math = node.end_of_math
if not end_of_math then -- luatex < .76
local traverse_nodes = node.traverse_id
- local math_code = nodecodes.math
+ local math_code = node.id('math_char')
local end_of_math = function (n)
for n in traverse_nodes(math_code, n.next) do
return n
@@ -30148,10 +30010,10 @@ if not end_of_math then -- luatex < .76
end
end
--- node types as of April 2013
-local glyph_code = nodecodes.glyph
-local penalty_code = nodecodes.penalty
-local kern_code = nodecodes.kern
+-- node types as of April 2024
+local glyph_code = node.id('glyph')
+local penalty_code = node.id('penalty')
+local kern_code = node.id('kern')
-- we make a new node, so that we can copy it later on
local penalty_node = node.new(penalty_code)
@@ -30182,7 +30044,6 @@ local function process(head)
end
end
elseif id == math_code then
- -- warning: this is a feature of luatex > 0.76
start = end_of_math(start) -- weird, can return nil .. no math end?
end
if start then
@@ -30195,15 +30056,13 @@ end
local callback_name = "pre_linebreak_filter"
local function activate()
- if not priority_in_callback (callback_name, "polyglossia-tibt.process") then
- add_to_callback(callback_name, process, "polyglossia-tibt.process", 1)
- end
+ add_to_callback(callback_name, process, "polyglossia-tibt.process")
+ declare_callback_rule(callback_name,
+ "polyglossia-tibt.process", "before", "luaotfload.node_processor")
end
local function desactivate()
- if priority_in_callback (callback_name, "polyglossia-tibt.process") then
- remove_from_callback(callback_name, "polyglossia-tibt.process")
- end
+ remove_from_callback(callback_name, "polyglossia-tibt.process")
end
polyglossia.activate_tibt_eol = activate
@@ -30219,7 +30078,7 @@ polyglossia.desactivate_tibt_eol = desactivate
% \begin{macrocode}
--
-- polyglossia.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
local module_name = "polyglossia"
@@ -30295,7 +30154,7 @@ local function newloader(langentry)
end
-- language info will be written into the .log file
- local s = { "Language data for " .. langentry }
+ local s = { }
for k, v in pairs(langdata) do
if type(v) == 'table' then -- for 'synonyms'
s[#s+1] = k .. "\t" .. table.concat(v,',')
@@ -30303,7 +30162,10 @@ local function newloader(langentry)
s[#s+1] = k .. "\t" .. tostring(v)
end
end
- log_info(table.concat(s,"\n"))
+ local a = {}
+ for _,n in pairs(s) do table.insert(a, n) end
+ table.sort(a)
+ log_info("Language data for " .. langentry .. "\n" .. table.concat(a,"\n"))
--
-- LaTeX's \newlanguage increases language register (count19),
@@ -30313,7 +30175,7 @@ local function newloader(langentry)
-- this possible situation, our newloader() function will
-- unfortunately overwrite the language \lang@xyz.
--
- -- Threfore here we will compare LaTeX's \newlanguage number with
+ -- Therefore here we will compare LaTeX's \newlanguage number with
-- LuaTeX's lang.new() id and select the bigger one for our new
-- language object. Also we will update LaTeX's language register
-- by this new id, so that another possible \newlanguage should not
@@ -30328,7 +30190,7 @@ local function newloader(langentry)
local newlangid = math.max(langcnt, langid)
-- set language register for possible \newlanguage
tex.setcount('global', lang_register, newlangid)
- -- get new lang object if needeed
+ -- get new lang object if needed
if langid ~= newlangid then
langobject = lang.new(newlangid)
end
@@ -30394,7 +30256,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\setmainfont{Linux Libertine O}
\defaultfontfeatures{Scale=MatchLowercase}
\setmonofont{Inconsolata}
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ Extension = .ttf,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic]
\newfontfamily\syriacfont[Script=Syriac]{Serto Jerusalem}
\newfontfamily\hebrewfont[Script=Hebrew]{Ezra SIL}
\newfontfamily\sanskritfont[Script=Devanagari]{Sanskrit 2003}
@@ -30530,7 +30397,12 @@ Quamquam sermone nativo fungi desinit, cumque nostris diebus perpauci Latine loq
\usepackage{xltxtra,url,amsmath}
\setmainfont{Linux Libertine O}
\defaultfontfeatures{Scale=MatchLowercase}
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
+ UprightFont = *-Regular,
+ BoldFont = *-Bold,
+ Extension = .ttf,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-BoldItalic]
\newfontfamily\arabicfonttt[Script=Arabic,Scale=.75]{DejaVu Sans Mono}
\newfontfamily\farsifont[Script=Arabic,Scale=1.1,WordSpace=2]{IranNastaliq}
\let\XeTeX\undefined
@@ -30700,7 +30572,7 @@ This is today: \today
% \typeout{* To finish the installation you have to move the following}
% \typeout{* file into a directory searched by TeX:}
% \typeout{*}
-% \typeout{* \space\space all *.sty, *.lua, *.def, *.lde and *.ldf files}
+% \typeout{* \space\space\space all *.sty, *.lua, *.def and *.ldf files}
% \typeout{*}
% \typeout{* You also need to compile the *.map files with teckit_compile}
% \typeout{* and place the resulting *.tec files under}
diff --git a/Master/texmf-dist/source/latex/synthslant/Makefile b/Master/texmf-dist/source/latex/synthslant/Makefile
index d8de419230a..8ef77a6982b 100644
--- a/Master/texmf-dist/source/latex/synthslant/Makefile
+++ b/Master/texmf-dist/source/latex/synthslant/Makefile
@@ -19,8 +19,9 @@ DVIPS := dvips
DVIPS_FLAGS := -d1 # debug \special{}
-LATEX := /usr/bin/env max_print_line=2147483647 pdflatex
-LATEX_FLAGS := -file-line-error -halt-on-error -interaction=nonstopmode
+LATEX_PROPER := pdflatex
+LATEX := /usr/bin/env max_print_line=2147483647 $(LATEX_PROPER)
+LATEX_FLAGS := -file-line-error -halt-on-error -interaction=nonstopmode -output-directory=.
LATEX_RERUN_TRIGGER := '^Package rerunfilecheck Warning: File [^ ]* has changed'
LATEX_WARNING := '^LaTeX (|[A-Za-z0-9_]* )Warning:'
@@ -33,18 +34,9 @@ METAPOST := mpost
METAPOST_FLAGS := -file-line-error -interaction=nonstopmode -tex=latex
-SPELLCHECK := aspell
-SPELLCHECK_FLAGS := \
- --add-tex-command='citenum p' --add-tex-command='code p' \
- --add-tex-command='Cref p' --add-tex-command='cref p' \
- --add-tex-command='cs p' \
- --add-tex-command='DescribeEnv p' --add-tex-command='DescribeMacro p' \
- --add-tex-command='marg p' --add-tex-command='meta p' \
- --add-tex-command='oarg p' \
- --lang=en_US --mode=tex
-
-
-SOURCE_FILES := LICENSE Makefile synthslant.dtx synthslant.ins
+PROJECT_NAME := synthslant
+SOURCE_FILES := LICENSE Makefile README.md synthslant.dtx synthslant.ins
+DOCUMENTATION_FILES := synthslant-gauge.pdf synthslant.pdf
@@ -57,7 +49,7 @@ sty: synthslant.sty
.PHONY: pdf
-pdf: doc gauge
+pdf: doc gauge test
.PHONY: doc
@@ -68,19 +60,42 @@ doc: synthslant.pdf
gauge: synthslant-gauge.pdf
-.PHONY: cpio
-cpio:
- cd ..; \
- echo $(addprefix synthslant/,$(SOURCE_FILES)) | \
- cpio -o | \
- gzip > "synthslant-$$(date +%Y-%m-%d).cpio.gz"
+.PHONY: test
+test: synthslant-minimal-test.pdf
+
+
+export TEMPORARY_DIRECTORY
+
+
+.PHONY: dist
+dist:
+ $(eval TEMPORARY_DIRECTORY := $(shell mktemp -d))
+ trap '$(RM) -r $(TEMPORARY_DIRECTORY); exit 1' HUP INT QUIT TERM; $(MAKE) __dist
+ $(RM) -r $(TEMPORARY_DIRECTORY)
+
+
+.PHONY: __dist
+__dist: LATEX_FLAGS += -interaction=batchmode
+__dist: $(DOCUMENTATION_FILES)
+ test -d '$(TEMPORARY_DIRECTORY)'
+ test -w '$(TEMPORARY_DIRECTORY)'
+ mkdir $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)
+ cp $(SOURCE_FILES) $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)
+ mkdir $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)/docs
+ cp $(DOCUMENTATION_FILES) $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)/docs
+ tar czf $(PROJECT_NAME).tar.gz -C $(TEMPORARY_DIRECTORY) $(PROJECT_NAME)
-.PHONY: tar
-tar:
- cd ..; \
- tar czf "synthslant-$$(date +%Y-%m-%d).tar.gz" \
- $(addprefix synthslant/,$(SOURCE_FILES))
+.PHONY: distcheck
+distcheck: LATEX_FLAGS += -interaction=batchmode
+distcheck: dist
+ $(eval TEMPORARY_DIRECTORY := $(shell mktemp -d))
+ test -d '$(TEMPORARY_DIRECTORY)'
+ test -w '$(TEMPORARY_DIRECTORY)'
+ tar xzf $(PROJECT_NAME).tar.gz -C $(TEMPORARY_DIRECTORY)
+ $(MAKE) --directory=$(TEMPORARY_DIRECTORY)/$(PROJECT_NAME) LATEX_FLAGS='$(LATEX_FLAGS)' all
+ $(RM) -r $(TEMPORARY_DIRECTORY)
+ @printf '\n\ndistcheck passed.\n'
.PHONY: clean
@@ -91,6 +106,7 @@ clean:
$(RM) mptextmp.* mpxerr.tex
$(RM) README README.html RELEASE-HOWTO RELEASE-HOWTO.html
$(RM) compare-with-the-gimp.eps compare-with-the-gimp.png
+ $(RM) $(PROJECT_NAME).tar.gz
.PHONY: mostlyclean
@@ -99,35 +115,27 @@ mostlyclean: clean
.PHONY: maintainer-clean
maintainer-clean: mostlyclean
- $(RM) ./*.base64 ./*.ist ./*.mp ./*.sty ./*.tex
+ $(RM) ./*.base64 ./*.gst ./*.ist ./*.mp ./*.sty ./*.tex
.PHONY: perf
perf: synthslant-gauge.tex synthslant.sty
- perf stat --repeat=10 -- $(LATEX) $(LATEX_FLAGS) -interaction batchmode -draftmode $<
+ perf stat --repeat=10 -- $(LATEX) $(LATEX_FLAGS) -interaction=batchmode -draftmode $<
.PHONY: tool-check
tool-check:
- @printf '*** LATEX = "%s"\n' '$(LATEX)'
- $(LATEX) --version
+ @printf '*** LATEX_PROPER = "%s"\n' '$(LATEX_PROPER)'
+ $(LATEX_PROPER) --version
+ @printf '\n\n*** BibTeX\n'
+ bibtex --version
@printf '\n\n*** MAKEINDEX = "%s"\n' '$(MAKEINDEX)'
- $(MAKEINDEX) < /dev/null
+ $(MAKEINDEX) < /dev/null
@printf '\n\n*** METAPOST = "%s"\n' '$(METAPOST)'
$(METAPOST) --version
@printf '\n*** BASE64 = "%s"\n' '$(BASE64)'
$(BASE64) --version
- @printf '\n\nTool check passed.\n'
-
-
-.PHONY: spell-check
-spell-check:
- @sed -e '\#<DISABLE-SPELL-CHECK/>#d' \
- -e '\#<DISABLE-SPELL-CHECK>#,\#</DISABLE-SPELL-CHECK>#d' < synthslant.dtx | \
- sed -e 's/^ *%%*//' | \
- sed -e 's/\\-//g' -e 's/|[^|]*|/ /g' | \
- $(SPELLCHECK) $(SPELLCHECK_FLAGS) list | \
- sort | uniq | fmt | sed -e 's/ / /g'
+ @printf '\n\ntool check passed.\n'
.PHONY: update-docs
@@ -142,8 +150,12 @@ all: Make everything there is to make. This is the .DEFAULT_GOAL.
clean: Remove some products.
-cpio: In the parent directory create a cpio(1) archive of the
- project source files whose name is time-stamped.
+dist: Create a tar file of the project source files and the PDF
+ documentation files. The archive is in the form and has a
+ name that CTAN prefers.
+
+distcheck: Create a tar file of the project source files, unpack it in
+ a different location and build all targets.
doc: Build "synthslant.pdf" the Syntslant documentation.
@@ -160,15 +172,22 @@ pdf: Build doc: and gauge:.
sty: Only extract "synthslant.sty" from "synthslant.dtx". This
operation requires LaTeX (-> $(LATEX)) and nothing else.
-tar: In the parent directory create a tar(1) file of the project
- source files whose name is time-stamped.
+test: Run some tests. Currently only compiles a minimal document
+ to check whether "synthslant.sty" contains all the necessary
+ \RequirePackage directives.
tool-check: Check whether some of the required tools to build the
project are available.
+update-docs: Copy the documentation files into the "docs"
+ sub-directory.
+
Selected Implicit Rules
-----------------------
+%: %.html
+ Convert HTML to plain text. Requires w3m(1).
+
%.dvi %.pdf: %.dtx
Run LaTeX or pdfLaTeX (-> $(LATEX)) on dtx source until a
fix-point is reached.
@@ -177,6 +196,9 @@ Selected Implicit Rules
Run LaTeX or pdfLaTeX (-> $(LATEX)) on tex file until a
fix-point is reached.
+%.html: %.md
+ Convert markdown to HTML. Requires markdown(1).
+
%.mx.pdf: %.dvi
Convert dvi to pdf via dvipdfmx (-> $(DVIPDFMX)).
@@ -187,9 +209,9 @@ Selected Implicit Rules
Some Explicit Rules
-------------------
README.html:
- Convert "README.md" to html. Requires markdown(1).
+ Convert "README.md" to html.
-README: Convert "README.html" to plain text. Requires w3m(1).
+README: Convert "README.html" to plain text.
endef
@@ -205,8 +227,8 @@ help:
define MAKE_INDEX_AND_GLOSSARY
sed -e '/@/d' < $*.idx > ,$*.idx; mv ,$*.idx $*.idx; \
-$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s synthslant.ist -t $*.ilg -o $*.ind $*.idx; \
-$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s gglo.ist -t $*.glg -o $*.gls $*.glo
+$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s $*.ist -t $*.ilg -o $*.ind $*.idx; \
+$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s $*.gst -t $*.glg -o $*.gls $*.glo
endef
define GREP_LATEX_WARNINGS
@@ -250,7 +272,13 @@ endef
%.mps: %.mp
- $(METAPOST) -s 'outputtemplate="%j.mps"' $(METAPOST_FLAGS) $<
+ $(METAPOST) -s 'outputtemplate="%j.mps"' $(METAPOST_FLAGS) $< || { \
+ printf '=== $*.log ===\n'; \
+ cat $*.log; \
+ printf '\n\n=== mpxerr.log ===\n'; \
+ cat mpxerr.log; \
+ false; \
+ } 1>&2
%.eps: %.png
@@ -265,7 +293,8 @@ endef
-synthslant.sty synthslant.ist synthslant-gauge.tex \
+synthslant.sty synthslant.ist \
+synthslant-gauge.tex synthslant-minimal-test.tex \
compare-with-the-gimp.png.base64 shear-transform.mp title.mp: \
synthslant.ins synthslant.dtx
$(LATEX) $(LATEX_FLAGS) $<
diff --git a/Master/texmf-dist/source/latex/synthslant/synthslant.dtx b/Master/texmf-dist/source/latex/synthslant/synthslant.dtx
index f5424cf7fa1..6c052c64a7f 100644
--- a/Master/texmf-dist/source/latex/synthslant/synthslant.dtx
+++ b/Master/texmf-dist/source/latex/synthslant/synthslant.dtx
@@ -3,11 +3,11 @@
% Copyright (C) 2024 by Ch. L. Spiel
%
% This work may be distributed and/or modified under the conditions
-% of the LaTeX Project Public License, either version 1.3 of this
+% of the LaTeX Project Public License, either version 1.3c of this
% license or (at your option) any later version. The latest version
% of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
+% httpc://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2003/12/01 or later.
%
% \fi
@@ -26,7 +26,6 @@
\PassOptionsToClass{a4paper}{article}
\PassOptionsToPackage{hyperfootnotes=false}{hyperref}
-\PassOptionsToPackage{charter, scale=1.06}{newtxmath}
\PassOptionsToPackage{dvipsnames}{xcolor}
\usepackage{amsmath}
@@ -52,6 +51,7 @@
\newcommand*{\textls}[2][]{#2}
\fi
\usepackage{needspace}
+\usepackage[section]{placeins}
\usepackage{ragged2e}
\usepackage{setspace}
\usepackage[slant=.18, negslant=-.16]{synthslant}
@@ -65,7 +65,7 @@
\usepackage[default, lining, proportional, regular, semibold]{sourceserifpro}
\usepackage[lining, proportional, regular, semibold]{sourcesanspro}
\usepackage[lining, regular]{sourcecodepro}
-\usepackage[xcharter]{newtxmath}
+\usepackage[scaled=1.08, uprightscript, xcharter]{newtxmath}
\setstretch{1.04166}% \baselineskip: 12.5pt
@@ -74,15 +74,15 @@
\newcommand*{\fontclan}{\expandafter\@get@fontclan\f@family\relax}
\makeatother
-\newcommand*{\proportionalliningfigures}{\fontfamily{\fontclan-LF}\selectfont}
-\newcommand*{\proportionaloldstylefigures}{\fontfamily{\fontclan-OsF}\selectfont}
-\newcommand*{\tabularliningfigures}{\fontfamily{\fontclan-TLF}\selectfont}
-\newcommand*{\tabularoldstylefigures}{\fontfamily{\fontclan-TOsF}\selectfont}
+\DeclareRobustCommand{\proportionalliningfigures}{\fontfamily{\fontclan-LF}\selectfont}
+\DeclareRobustCommand{\proportionaloldstylefigures}{\fontfamily{\fontclan-OsF}\selectfont}
+\DeclareRobustCommand{\tabularliningfigures}{\fontfamily{\fontclan-TLF}\selectfont}
+\DeclareRobustCommand{\tabularoldstylefigures}{\fontfamily{\fontclan-TOsF}\selectfont}
-\newcommand*{\textdenominator}[1]{{\fontfamily{\fontclan-Dnom}\selectfont #1}}
-\newcommand*{\textinferior}[1]{{\fontfamily{\fontclan-Inf}\selectfont #1}}
-\newcommand*{\textnumerator}[1]{{\fontfamily{\fontclan-Numr}\selectfont #1}}
-\newcommand*{\textsuperior}[1]{{\fontfamily{\fontclan-Sup}\selectfont #1}}
+\DeclareRobustCommand{\textdenominator}[1]{{\fontfamily{\fontclan-Dnom}\selectfont #1}}
+\DeclareRobustCommand{\textinferior}[1]{{\fontfamily{\fontclan-Inf}\selectfont #1}}
+\DeclareRobustCommand{\textnumerator}[1]{{\fontfamily{\fontclan-Numr}\selectfont #1}}
+\DeclareRobustCommand{\textsuperior}[1]{{\fontfamily{\fontclan-Sup}\selectfont #1}}
\newcommand*{\nativetextfraction}[2]
{\mbox{\textnumerator{#1}\textfractionsolidus\textdenominator{#2}}}
@@ -92,21 +92,23 @@
\newenvironment*{tabfigures}
{\edef\rmdefault{\fontclan-T\sourceserifpro@figurestyle}\rm\ignorespaces}
{\ignorespacesafterend}
-
-\newcommand*{\elseries}{\def\mdseries@rm{el}\def\mdseries@sf{el}\def\mdseries@tt{el}}
-\newcommand*{\textel}[1]{{\elseries\textmd{#1}}}
-\newcommand*{\lseries}{\def\mdseries@rm{l}\def\mdseries@sf{l}\def\mdseries@tt{l}}
-\newcommand*{\textl}[1]{{\lseries\textmd{#1}}}
-%%--\newcommand*{\mdseries}{\def\mdseries@rm{m}\def\mdseries@sf{m}\def\mdseries@tt{m}}
-%%--\newcommand*{\textmd}[1]{{\mdseries\textmd{#1}}}
-\newcommand*{\sbseries}{\def\bfseries@rm{sb}\def\bfseries@sf{sb}\def\bfseries@tt{sb}}
-\newcommand*{\textsb}[1]{{\sbseries\textbf{#1}}}
-\newcommand*{\bseries}{\def\bfseries@rm{b}\def\bfseries@sf{b}\def\bfseries@tt{b}}
-\newcommand*{\textb}[1]{{\bseries\textbf{#1}}}
-\newcommand*{\ebseries}{\def\bfseries@rm{k}\def\bfseries@sf{eb}\def\bfseries@tt{k}}
-\newcommand*{\texteb}[1]{{\ebseries\textbf{#1}}}
\makeatother
+\DeclareRobustCommand{\elseries}{\fontseries{el}\selectfont}
+\DeclareTextFontCommand{\textel}{\elseries}
+\DeclareRobustCommand{\lseries}{\fontseries{l}\selectfont}
+\DeclareTextFontCommand{\textl}{\lseries}
+%%--\DeclareRobustCommand{\mdseries}{\fontseries{m}\selectfont}
+%%--\DeclareTextFontCommand{\textmd}{\mdseries}
+\DeclareRobustCommand{\sbseries}{\fontseries{sb}\selectfont}
+\DeclareTextFontCommand{\textsb}{\sbseries}
+\DeclareRobustCommand{\bseries}{\fontseries{b}\selectfont}
+\DeclareTextFontCommand{\textb}{\bseries}
+\DeclareRobustCommand{\ebseries}{\fontseries{eb}\selectfont}
+\DeclareTextFontCommand{\texteb}{\ebseries}
+\DeclareRobustCommand{\ubseries}{\fontseries{k}\selectfont}
+\DeclareTextFontCommand{\textub}{\ubseries}
+
\usepackage{cleveref}
@@ -119,7 +121,7 @@
citecolor = blue,
colorlinks = true,
linkcolor = blue,
- linktocpage = false,
+ linktocpage = true,
pdfauthor={Dr. Christoph L. Spiel},
pdfcreationdate={\pdffiledate},
pdfkeywords={LaTeX, font, italic, oblique, slant, upright},
@@ -131,9 +133,94 @@
}
+\SetExtraKerning[context=drop-left-sidebearing, name=source-code-normal, unit=space]
+ {font={T1/SourceCodePro-LF/m/n/44, T1/SourceCodePro-TLF/m/n/44}}
+ {
+ 1={-150,},
+ 2={-120,},
+ 3={-120,},
+ 4={-40,},
+ A={-100,},
+ B={-170,}
+ }
+
+\newlength{\sectiontocindent}
+\newlength{\sectionnumberwidth}
+\newlength{\subsectiontocindent}
+\newlength{\subsectionnumberwidth}
+\newlength{\subsubsectiontocindent}
+\newlength{\subsubsectionnumberwidth}
+
+\setlength{\sectiontocindent}{0pt}
+\setlength{\sectionnumberwidth}{40pt}
+\setlength{\subsectiontocindent}{40pt}
+\setlength{\subsectionnumberwidth}{25pt}
+\setlength{\subsubsectiontocindent}{65pt}
+\setlength{\subsubsectionnumberwidth}{30pt}
+
\makeatletter
-\renewcommand*{\@dotsep}{10000} % suppress leaders
-\patchcmd{\@dottedtocline}{\normalfont}{\bfseries}{\relax}{\PatchingFailed}
+\renewcommand*{\l@section}[2]
+ {\ifnum \c@tocdepth >\z@
+ \addpenalty\@secpenalty
+ \addvspace{1.0em \@plus\p@}%
+ \setlength{\@tempdima}{\sectionnumberwidth}%
+ \begingroup
+ \def\numberline##1{\hb@xt@\@tempdima{%
+ \tt\lseries
+ \fontsize{44}{0}\selectfont
+ \microtypecontext{kerning=drop-left-sidebearing}%
+ \iffalse\raisebox{-30pt}[0pt][0pt]{\rule{0.1pt}{40pt}}\fi
+ \textcolor{customred3}{##1}%
+ \hfil}}%
+ \parindent \z@
+ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode
+ \advance\leftskip\@tempdima
+ \hskip -\leftskip
+ \bfseries
+ \iffalse
+ \nobreak\hfil
+ \nobreak\hb@xt@\@pnumwidth{\hss #2\kern-\p@\kern\p@}%
+ \else
+ {\sffamily\large #1}\quad
+ {#2}\hfil\hbox{}
+ \fi
+ \par
+ \endgroup
+ \fi}
+
+\renewcommand*{\@dottedtocline}[5]
+ {\ifnum #1>\c@tocdepth
+ \else
+ \vskip \z@ \@plus.2\p@
+ \begingroup
+ \leftskip #2\relax
+ \rightskip \@tocrmarg
+ \parfillskip -\rightskip
+ \parindent #2\relax\@afterindenttrue
+ \interlinepenalty\@M
+ \leavevmode
+ \@tempdima #3\relax
+ \advance\leftskip \@tempdima
+ \null\nobreak
+ \hskip -\leftskip
+ {#4}\nobreak
+ \iffalse
+ \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill
+ \nobreak\hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5\kern-\p@\kern\p@}%
+ \else
+ \hbox{\quad\normalfont\bfseries #5}\nobreak\hfill\hbox{}%
+ \fi
+ \par
+ \endgroup
+ \fi}
+
+\renewcommand*{\l@subsection}{\@dottedtocline{2}{\subsectiontocindent}{\subsectionnumberwidth}}
+\renewcommand*{\l@subsubsection}{\@dottedtocline{3}{\subsubsectiontocindent}{\subsubsectionnumberwidth}}
+\newrobustcmd*{\tocsquashedsubsections}
+ {\def\l@subsection{\@dottedtocline{2}{0pt}{\subsubsectionnumberwidth}}%
+ \def\l@subsubsection{\@dottedtocline{3}{0pt}{\subsubsectionnumberwidth}}}
\makeatother
@@ -156,8 +243,10 @@
\newcommand*{\floatcaptionwidth}{.79\textwidth}
-\captionsetup[figure]{font=small, justification=centerlast, labelfont=sc, width=\floatcaptionwidth}
-\captionsetup[table]{font=small, justification=centerlast, labelfont=sc, width=\floatcaptionwidth}
+\captionsetup[figure]{font=small, justification=centerlast,
+ labelfont=sc, width=\floatcaptionwidth}
+\captionsetup[table]{font=small, justification=centerlast,
+ labelfont=sc, width=\floatcaptionwidth}
\newsavebox{\listlabelbox}
@@ -188,13 +277,15 @@
\fancypagestyle{pagenumberonly}{
+ \fancyhf{}
\fancyhead[L]{}
\fancyhead[R]{\thepage}
}
-\pagestyle{fancy}
-\fancyhf{}
-\fancyhead[L]{\rightmark}
-\fancyhead[R]{\textsf{\thepage}}
+\fancypagestyle{fancy}{
+ \fancyhf{}
+ \fancyhead[L]{\rightmark}
+ \fancyhead[R]{\thepage}
+}
\newcommand*{\resetfancyhead}
{\fancyhead[L]{\textsf{\textsc{\textls[20]{\nouppercase\rightmark}}}}}
@@ -236,12 +327,9 @@
\pretocmd{\DescribeMacro}{\needspace{25pt}}{\relax}{\PrependingFailed}
-\setcounter{IndexColumns}{2}
-
-
\setlength{\columnsep}{20pt}
\setlength{\skip\footins}{25pt}
-\setlength{\overfullrule}{3pt}
+\setlength{\overfullrule}{0pt}
@@ -273,15 +361,19 @@
\newcommand*{\citenum}[1]{\@nameuse{b@#1}}
\makeatother
-\def\code#1{\texttt{#1}}
+\renewcommand*{\code}[1]{\texttt{#1}}
+
+\newcommand*{\codelineindicator}{\mbox{\small$\mathscr{l}$}}
\newrobustcmd*{\command}[1]{\mbox{\textbf{#1}}}
\newcommand*{\degree}{{}^\circ}
+\newcommand*{\detoxindex}[1]{\index{\detokenize{#1}}}
+
\newcommand*{\doublequotes}[1]{\guillemetright\kern-.03333em #1\guillemetleft}
-\newcommand*{\dumpmacro}[1]{\texttt{\detokenize\expandafter{#1}}}
+\newcommand*{\dumpmacro}[1]{\texttt{\detokenize\expandafter{#1}\unskip}}
\newcommand*{\filesystem}[1]{\mbox{\textit{#1\/}}}
@@ -295,12 +387,48 @@
\renewcommand*{\fps@table}{htbp}
\makeatother
+\apptocmd{\GlossaryParms}
+ {\RaggedRight\normalsize}
+ {\relax}
+ {\AppendingFailed}
+
+\let\oldhdclindex=\hdclindex
+\renewcommand*{\hdclindex}[2]
+ {\ifstrequal{#2}{code}
+ {\oldhdclindex{#1}{codeidx}}
+ {\oldhdclindex{#1}{#2}}}
+
+\let\oldhdpindex=\hdpindex
+\renewcommand*{\hdpindex}[2]{\textbf{\oldhdpindex{#1}{#2}}}
+
\newcommand*{\hollowrectangle}[2]
{\setlength{\fboxrule}{.5pt}%
\setlength{\fboxsep}{0pt}%
\framebox{\rule{#1}{0pt}\rule{0pt}{#2}}}
\newcommand*{\hollowsquare}[1]{\hollowrectangle{#1}{#1}}
+\apptocmd{\IndexParms}
+ {\RaggedRight\small}
+ {\relax}
+ {\AppendingFailed}
+
+\makeatletter
+\ExplSyntaxOn
+\apptocmd{\index@prologue}
+ {\legacy_if:nTF {codeline@index}
+ {We\space prefix\space all\space references\space
+ to\space code\space lines\space with~\singlequotes{\codelineindicator}.}
+ {}}
+ {\relax}
+ {\AppendingFailed}
+
+\newcommand*{\linenumberdecoration}
+ {\legacy_if:nTF {codeline@index}
+ {\codelineindicator}
+ {}}
+\ExplSyntaxOff
+\makeatother
+
\newcommand*{\logmacro}[1]
{\ifdef{#1}
{\message{^^JDump of macro \string#1 follows.^^J}
@@ -314,6 +442,24 @@
\begin{fullwidth}}
{\end{fullwidth}}
+
+\let\originalmulticols=\multicols
+\let\endoriginalmulticols=\endmulticols
+\RenewDocumentEnvironment{multicols}{m o o}
+ {\ifnum #1=1
+ \IfNoValueTF{#2}{\relax}{#2}%
+ \else
+ \IfNoValueTF{#2}
+ {\originalmulticols{#1}}
+ {\originalmulticols{#1}[#2]}%
+ \fi}
+ {\ifnum #1=1
+ \relax
+ \else
+ \endoriginalmulticols
+ \fi}
+
+
\newenvironment*{multilinecodeexample}
{\begin{quote}\tt
\def\indent{\mbox{}\hspace{25pt}}%
@@ -409,7 +555,7 @@
\newenvironment*{specialcodesection}[1]
{\Needspace{4\baselineskip}%
\begin{tcolorbox}[colback=white, colframe=\markercolor,
- bottomrule=0pt, leftrule=5pt, rightrule=0pt, toprule=0pt]
+ bottomrule=.5pt, leftrule=5pt, rightrule=.5pt, toprule=.5pt]
\sffamily
\begin{list}
{\specialcodesectionheading{#1}}
@@ -464,6 +610,12 @@
\newcommand*{\tikzlogo}{\textrm{Ti\textit{k\/}Z}}
+\newcommand*{\toccontinuesonnextpage}
+ {\addtocontents{toc}{\par
+ \bigskip
+ \hfill\textit{Table of Contents continued on next page.}\par
+ \clearpage}}
+
\newcommand*{\topstrut}{\rule{0pt}{1.3em}}
\newcommand*{\transpose}[1]{{#1}^{\text{T}}}
@@ -477,6 +629,12 @@
\copy0\kern\ttellipsisgap
\box0\kern\ttellipsisgap}
+\newcommand*{\unmarkedfntext}[1]
+ {{\def\thefootnote{}\footnote{#1}%
+ \addtocounter{footnote}{-1}}}
+
+\newcommand*{\userman}[1]{\textbf{\hyperpage{#1}}}
+
\newcommand*{\visualpar}{\textcolor{\markercolor}{\P}\linebreak[1]\enspace}
\newenvironment*{widecodeexample}
@@ -491,6 +649,15 @@
\hyphenation{% https://hyphenateit.com/en-us
+ neg-slant-context
+ neg-slant-environment
+ slant-context
+ slant-environment
+ synth-neg-slant
+ synth-slant
+ synth-slant-box
+ text-synth-slant
+ text-synth-upright-italic
}
@@ -515,12 +682,33 @@
%</driver>
%<*index-style>
actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
heading_suffix "}\\nopagebreak\n"
headings_flag 1
level '>'
+line_max 65536
quote '!'
%</index-style>
+%<*changes-style>
+actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
+heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
+heading_suffix "}\\nopagebreak\n"
+headings_flag 0
+item_x1 "\\efill\n\\subitem "
+item_x2 "\\ "
+keyword "\\glossaryentry"
+level '>'
+line_max 65536
+postamble "\n\\end{theglossary}\n"
+preamble "\\begin{theglossary}\n \\makeatletter\\scan@allowedfalse"
+quote '!'
+%</changes-style>
% \fi
%
%
@@ -530,7 +718,7 @@ quote '!'
% \DoNotIndex{\edef,\else}
% \DoNotIndex{\endgroup,\endmicrotypecontext,\endnegslantenvironment,\endslantenvironment}
% \DoNotIndex{\expandafter,\ExplSyntaxOff,\ExplSyntaxOn}
-% \DoNotIndex{\fi,\font,\fontdimen,\fontspec,\fp}
+% \DoNotIndex{\fi,\font,\fontdimen,\fontspec,\fp,\fpeval}
% \DoNotIndex{\hbox,\hskip}
% \DoNotIndex{\ifcase,\ifcsdef,\ifdefined,\ifluatex,\ifmmode,\ifnum,\ifpdftex,\ifx,\itshape}
% \DoNotIndex{\kern}
@@ -540,16 +728,17 @@ quote '!'
% \DoNotIndex{\newbox,\newcommand,\NewDocumentCommand,\NewDocumentEnvironment,\newenvironment,\newrobustcmd}
% \DoNotIndex{\node,\nolinebreak}
% \DoNotIndex{\or}
-% \DoNotIndex{\PackageInfo,\PackageWarning,\ProcessOptionsX,\providecommand,\ProvidesPackage}
+% \DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\ProcessOptionsX,\providecommand,\ProvidesPackage}
% \DoNotIndex{\pdfoutput,\pdfrestore,\pdfsave,\pdfsetmatrix,\pstilt}
% \DoNotIndex{\relax,\RequirePackage}
-% \DoNotIndex{\sbox,\skip,\space}
+% \DoNotIndex{\sbox,\skip,\space,\string}
% \DoNotIndex{\tikz}
% \DoNotIndex{\upshape,\usebox}
% \DoNotIndex{\wd}
+% \DoNotIndex{\xdef}
%
%
-% \changes{v0.1}{2024-2-12}{Initial version}
+% \changes{v0.1}{2024-2-12}{Initial version.}
%
%
% \pagenumbering{roman}
@@ -636,39 +825,83 @@ end
% \footnotesize
% \noindent
% This package is copyright \textcopyright~2024 Ch.~L.~Spiel. It may be distributed and/or
-% modified under the conditions of the \LaTeX{} Project Public License \acronym{(LPPL)},
-% either version~1.3c of this license or --~at your option~-- any later version. This work
-% has the \acronym{LPPL} maintenance status \doublequotes{author-maintained}.\par
+% modified under the conditions of the \href{https://www.latex-project.org/lppl.txt}{\LaTeX{}
+% Project Public License} \acronym{(LPPL)}, either version~1.3c of this license or --~at your
+% option~-- any later version. This work has the \acronym{LPPL} maintenance status
+% \doublequotes{author-maintained}.\par
% \endgroup
%
%
% \clearpage
-% \thispagestyle{pagenumberonly}
-% \tableofcontents
+% \pagestyle{pagenumberonly}
%
-% \vspace{\fill}
-%
-% \begingroup
-% \footnotesize
-% \singlespacing
-% \noindent
-% The font samples~\singlequotes{fga} on the title page
-% were generated with the help of \MP{} using \doublequotes{\acronym{URW} Palladio~L}
-% in styles~\singlequotes{roman} and~\singlequotes{italic}.
-% The affine transformations were \code{slanted .2} for the slanted roman and
-% \code{slanted -.2} for the upright italics.\par
-% \endgroup
+% \unmarkedfntext{The font samples~\singlequotes{fga} on the title page were generated with the
+% help of \MP{} using \doublequotes{\acronym{URW} Palladio} in styles~\singlequotes{roman}
+% and~\singlequotes{italic}. The affine transformations were\enspace \code{slanted
+% .2}\enspace for the slanted roman and\enspace \code{slanted -.2}\enspace for the upright
+% italics.}
+% \tableofcontents
%
%
% \clearpage
-% \thispagestyle{pagenumberonly}
% \listoftables
% \bigskip
% \listoffigures
%
%
% \clearpage
+% \phantomsection
+% \addcontentsline{toc}{section}{\numberline{}Quick Reference}
+% \addtocontents{toc}{\medskip}
+% \section*{Quick Reference}
+%
+% Alphabetically sorted list of all user macros and environments defined by
+% package~\packagename{synthslant}. The list of all package options can be found on
+% \cpageref{sec:package-options} and \pageref{secend:package-options}. The
+% \hyperref[sec:index]{Index} on pages~\pageref{sec:index} to~\pageref{secend:index} may
+% provide some more detailed insights.
+%
+% \begin{list}{}{\itemindent=-\leftmargin \itemsep=4.5pt plus 2pt minus 1pt}
+% \NewDocumentCommand{\qritem}{m m O{}}
+% {\item
+% \hyperref[#1]{#2}#3\relax
+% \def\qrref{\cpageref{#1}}\par\ignorespaces}
+% \qritem{syn:negslantcontext}{\cs{negslantcontext}}
+% Name of the \packagename{microtype} context used when typesetting backward slanted
+% text~(\qrref)
+%
+% \qritem{syn:negslantenvironment}{\code{negslantenvironment}}
+% Wrapper around \cs{synthslantbox} when slanting backward with
+% \cs{textsynthuprightitalic}~(\qrref)
+%
+% \qritem{syn:slantcontext}{\cs{slantcontext}}
+% Name of the \packagename{microtype} context used when typesetting forward slanted
+% text~(\cpageref{syn:slantcontext})
+%
+% \qritem{syn:slantenvironment}{\code{slantenvironment}}
+% Wrapper around \cs{synthslantbox} when slanting forward with
+% \cs{textsynthslant}~(\qrref)
+%
+% \qritem{syn:synthnegslant}{\cs{synthnegslant}}
+% Slant value used by \cs{textsynthuprightitalic}~(\qrref)
+%
+% \qritem{syn:synthslantbox}{\cs{synthslantbox}}[\marg{slant}\marg{text}]
+% Slant \meta{text} (forward or backward) with \meta{slant}~(\qrref)
+%
+% \qritem{syn:synthslant}{\cs{synthslant}}
+% Slant value used by \cs{textsynthslant}~(\qrref)
+%
+% \qritem{syn:textsynthslant}{\cs{textsynthslant}}[\marg{text}]
+% Forward slant upright glyphs~(\qrref)
+%
+% \qritem{syn:textsynthuprightitalic}{\cs{textsynthuprightitalic}}[\marg{text}]
+% Backward slant italics or oblique glyphs~(\qrref)
+% \end{list}
+%
+%
+% \clearpage
% \pagenumbering{arabic}
+% \pagestyle{fancy}
% \section{Introduction}\label{sec:introduction}
%
% The \packagename{synthslant} package provides a translator (e.\,g.~\LaTeX, \pdfLaTeX, or
@@ -688,8 +921,8 @@ end
%
% \subsection{Appeal for Artificially Slanted Type}\label{sec:appleal-for-artificially-slanted}
%
-% Artificially slanted type have a bad reputation. Whenever there is an order to round up the
-% usual font suspects synthetically slanted, bolded\footnote{Package~\packagename{amsbsy}
+% Artificially slanted type have a lousy reputation. Whenever there is an order to round up
+% the usual font suspects synthetically slanted, bolded\footnote{Package~\packagename{amsbsy}
% defines a \doublequotes{Poor Man's Bold} macro~\cs{pmb} that works by
% \singlequotes{overprinting}. The authors of \packagename{amsbsy} recommend to prefer
% package~\packagename{bm} for bold mathematical symbols, though.}, and condensed type along
@@ -699,8 +932,9 @@ end
% condescension for synthetic bold and condensed variants. They spoil the glyphs' outline
% because they do not (and cannot) conserve the necessary proportions. For small-caps the
% problems are somewhat minor and I wonder how far one could get with an
-% \propername{OpenType}~font that supports a \code{size}~axis\index{font>axis>size=\code{size}}
-% as well as an \code{opsz}~axis\index{font>axis>opsz=\code{opsz}} in the necessary ranges to
+% \propername{OpenType}~font that supports a
+% \code{size}~axis\index{font>axis>size=\code{size}|userman} as well as an
+% \code{opsz}~axis\index{font>axis>opsz=\code{opsz}|userman} in the necessary ranges to
% construct convincing small-caps out of the multiple-master font.
%
% In my view artificial slanting keeps much of the font's character intact. In fact one
@@ -741,13 +975,14 @@ end
%
% Some fonts in current \LaTeX{} distributions offer slanted series right out of the box.
% \foreignphrase{Eureka!} In particular the oldest (and once upon a time the only) font family
-% shipping with \TeX, \href{https://tug.org/FontCatalogue/cmrfonts.html}{Computer Modern
-% Roman}\index{font>Computer Modern Roman} --~nowadays member of the \acronym{CM}-Super
-% family~-- is available in a deluge of almost thirty shapes. It covers not just slanted roman
-% or slanted smallcaps but also slanted typewriter and somewhat surprisingly upright italics.
-% Furthermore, the \LaTeXe{} font selection scheme provisions \singlequotes{\code{sl}} for
-% slanted shapes and \singlequotes{\code{ui}} for upright italics~\cite{fntguide}. The former
-% is accompanied by the macros~\cs{slshape} and~\cs{textsl}.
+% shipping with \TeX, \href{https://tug.org/FontCatalogue/cmrfonts.html}{\acronym{CM}
+% Roman}\index{font>typeface>CM Roman=\acronym{CM} Roman|userman} --~nowadays member of the
+% \acronym{CM}-Super family~-- is available in a deluge of almost thirty shapes. It covers not
+% just slanted roman or slanted smallcaps but also slanted typewriter and somewhat surprisingly
+% upright italics. Furthermore, the \LaTeXe{} font selection scheme provisions
+% \singlequotes{\code{sl}} for slanted shapes and \singlequotes{\code{ui}} for upright
+% italics~\cite{fntguide}. The former is accompanied by the macros~\cs{slshape}
+% and~\cs{textsl}.
%
% \begin{wraptable}{r}{.382\textwidth}
% \renewcommand*{\floatcaptionwidth}{\textwidth}
@@ -759,15 +994,15 @@ end
%
% \begin{tabular}{@{}l@{}}
% \toprule
-% Font Name \\
+% Font \\
% \midrule
-% Cairo\index{font>Cairo} \\
-% Commissioner\index{font>Commissioner} \\
-% Geologica\index{font>Geologica} \\
-% Gluten\index{font>Gluten} \\
-% Inter\index{font>Inter} \\
-% Recursive\index{font>Recursive} \\
-% Roboto Flex\index{font>Roboto Flex} \\
+% Cairo\index{font>typeface>Cairo|userman} \\
+% Commissioner\index{font>typeface>Commissioner|userman} \\
+% Geologica\index{font>typeface>Geologica|userman} \\
+% Gluten\index{font>typeface>Gluten|userman} \\
+% Inter\index{font>typeface>Inter|userman} \\
+% Recursive\index{font>typeface>Recursive|userman} \\
+% Roboto Flex\index{font>typeface>Roboto Flex|userman} \\
% \bottomrule
% \end{tabular}
% \end{wraptable}
@@ -781,8 +1016,9 @@ end
% \code{slnt}-axis} or fonts with an \href{https://v-fonts.com/tags/C5}{unusual variation} at
% \href{https://v-fonts.com/}{Variable Fonts}.} that offer a slant-axis\footnote{The
% registered axis is called \code{slnt} and it is not to be confused with the
-% \code{ital}~axis.}\index{font>axis>slant=\code{slant}}\index{font>axis>ital=\code{ital}} that
-% can be controlled with \packagename{fontspec}'s\index{package>\packagename{fontspec}}
+% \code{ital}~axis.}\index{font>axis>slant=\code{slant}|userman}\index{font>axis>ital=\code{ital}|userman}
+% that can be controlled with
+% \packagename{fontspec}'s\index{package>fontspec=\packagename{fontspec}|userman}
% \code{Slant}\footnote{Since \packagename{fontspec} version~2.9a as of 2024/2/13.}~key and
% \cref{tab:slanted-series-fonts} for a rather incomplete list of fonts that are shipped with
% slanted shapes. For these fonts \packagename{synthslant} is largely superfluous unless
@@ -801,35 +1037,35 @@ end
%
% \begin{tabular}[t]{@{}p{12em}@{}}
% \toprule
-% Font Name \\
+% Font \\
% \midrule
-% Arvo\index{font>Arvo} \\
-% Computer Modern Roman\index{font>Computer Modern Roman} \\
-% Domitian\index{font>Domitian} \\
-% Droid Serif\index{font>Droid Serif} \\
-% Erewhon\index{font>Erewhon} \\
-% Extended Charter\index{font>Extended Charter} \\
-% \acronym{GFS} Artemisia\index{font>GFS Artemisia=\acronym{GFS} Artemisia} \\
-% \acronym{GFS} Bodoni\index{font>GFS Bodoni=\acronym{GFS} Bodoni} \\
-% \acronym{GFS} Didot\index{font>GFSDidot=\acronym{GFS} Didot} \\
+% Arvo\index{font>typeface>Arvo|userman} \\
+% \acronym{CM} Roman\index{font>typeface>CM Roman=\acronym{CM} Roman|userman} \\
+% Domitian\index{font>typeface>Domitian|userman} \\
+% Droid Serif\index{font>typeface>Droid Serif|userman} \\
+% Erewhon\index{font>typeface>Erewhon|userman} \\
+% Extended Charter\index{font>typeface>Extended Charter|userman} \\
+% \acronym{GFS} Artemisia\index{font>typeface>GFS Artemisia=\acronym{GFS} Artemisia|userman} \\
+% \acronym{GFS} Bodoni\index{font>typeface>GFS Bodoni=\acronym{GFS} Bodoni|userman} \\
+% \acronym{GFS} Didot\index{font>typeface>GFS Didot=\acronym{GFS} Didot|userman} \\
% \\
% \bottomrule
% \end{tabular}
% \qquad
% \begin{tabular}[t]{@{}p{12em}@{}}
% \toprule
-% Font Name \\
+% Font \\
% \midrule
-% Cabin\index{font>Cabin} \\
-% Clear Sans\index{font>Clear Sans} \\
-% Cuprum\index{font>Cuprum} \\
-% Fira Sans\index{font>Fira Sans} \\
-% Gandhi Sans\index{font>Gandhi Sans} \\
-% \acronym{Inria} Sans\index{font>Inria Sans=\acronym{Inria} Sans} \\
-% Lato\index{font>Lato}\itshapemark \\
-% Montserrat\index{font>Montserrat} \\
-% \acronym{PT} Sans\index{font>PT Sans=\acronym{PT} Sans} \\
-% Source Sans Pro\index{font>Source Sans Pro} \\
+% Cabin\index{font>typeface>Cabin|userman} \\
+% Clear Sans\index{font>typeface>Clear Sans|userman} \\
+% Cuprum\index{font>typeface>Cuprum|userman} \\
+% Fira Sans\index{font>typeface>Fira Sans|userman} \\
+% Gandhi Sans\index{font>typeface>Gandhi Sans|userman} \\
+% \acronym{Inria} Sans\index{font>typeface>Inria Sans=\acronym{Inria} Sans|userman} \\
+% Lato\itshapemark\index{font>typeface>Lato|userman} \\
+% Montserrat\index{font>typeface>Montserrat|userman} \\
+% \acronym{PT} Sans\index{font>typeface>PT Sans=\acronym{PT} Sans|userman} \\
+% Source Sans Pro\index{font>typeface>Source Sans Pro|userman} \\
% \bottomrule
% \end{tabular}
%
@@ -852,15 +1088,16 @@ end
% \pdfTeX~version~1.40.0~\cite{schroeder:2007}.} With the help of the latter affine
% transformations of arbitrary content can be coded directly by setting the transformation
% matrix. A slight variant of his code is used in this package for the \acronym{PDF}- and
-% \packagename{l3draw}\index{package>\packagename{l3draw}}-slant~engines. The implementations
-% for \pstrickslogo, \tikzlogo{}, and \packagename{fontspec}\packagename{fontspec} are trivial
-% as they build upon shear~functions supplied by the respective packages.
+% \packagename{l3draw}\index{package>l3draw=\packagename{l3draw}|userman}-slant~engines. The
+% implementations for \pstrickslogo, \tikzlogo{}, and
+% \packagename{fontspec}\packagename{fontspec} are trivial as they build upon shear~functions
+% supplied by the respective packages.
%
%
% \subsection{Shear Transformation, Slant, and Angle}\label{sec:shear-transformation}
%
-% \index{slant>operation}
-% \index{shear>transformation}
+% \index{slant>operation|userman}
+% \index{shear>transformation|userman}
% Mathematically the slant operation is a shear transformation, which can be expressed with the
% equation
% \begin{equation}\label{equ:shear-transformation}
@@ -1018,7 +1255,7 @@ end
% For \(\alpha = 0\) the shear matrix becomes the identity matrix. Throughout of
% \packagename{synthslant} we work with the \meta{slant} which is \(\sin \alpha\) in
% \cref{equ:shear-transformation} and avoid converting back and forth to the
-% \index{shear>angle}shear angle~\(\alpha\).\footnote{At least one slant engine currently
+% \index{shear>angle|userman}shear angle~\(\alpha\).\footnote{At least one slant engine currently
% requires such a conversion, namely~\pstrickslogo. The math is hidden from the user, though.}
% Some values for orientation: \mbox{\(\sin 5.74\degree \approx .1\)}, \mbox{\(\sin 11.5\degree
% \approx .2\)}, and \mbox{\(\sin 17.5\degree \approx .3\)}.\footnote{For small
@@ -1038,8 +1275,8 @@ end
% \begin{enumerate}
% \item\label{it:no-italics}
% Generate a slanted serif in the unfortunate situation when a serif font comes without
-% italics such as \singlequotes{\acronym{URW}~Antiqua}\index{font>URW Antiqua=\acronym{URW}
-% Antiqua}.
+% italics such as
+% \singlequotes{\acronym{URW}~Antiqua}\index{font>typeface>URW Antiqua=\acronym{URW} Antiqua|userman}.
%
% Here, the user is relatively free to choose a \meta{slant}, for there are no italics whose
% angle must be matched. \packagename{Synthslant}'s default of~.2 should be a good starting
@@ -1053,8 +1290,8 @@ end
%
% \item\label{it:correct-italics-angle}
% An italics shape that has an excessive slant angle, as
-% e.\,g.~\singlequotes{Libre~Caslon}\index{font>Libre Caslon} may be corrected, i.\,e.,
-% partially un-slanted.
+% e.\,g.~\singlequotes{Libre~Caslon}\index{font>typeface>Libre Caslon|userman} may be corrected,
+% i.\,e., partially un-slanted.
%
% In this case, and generally if a font as a whole needs to be corrected, an alternative
% approach like the one sketched in \cref{sec:alternative} on \cpageref{sec:alternative} may
@@ -1062,16 +1299,16 @@ end
%
% \item\label{it:generate-sole-obliques}
% Generate an oblique sans-serif if a sans-serif font comes without an oblique shape as,
-% e.\,g., \singlequotes{\acronym{URW}~Grotesk}.\index{font>URW Grotesk=\acronym{URW} Grotesk}
+% e.\,g., \singlequotes{\acronym{URW}~Grotesk}.\index{font>typeface>URW Grotesk=\acronym{URW} Grotesk|userman}
%
% \item\label{it:generate-extra-obliques}
% Supply a slanted sans-serif shape for sans-serif fonts with designed, this is \emph{true}
-% obliques as e.\,g.~\singlequotes{Open Sans}.\index{font>Open Sans}
+% obliques as e.\,g.~\singlequotes{Open Sans}.\index{font>typeface>Open Sans|userman}
%
% \item\label{it:slant-typewriter}
% Fixed-width --~also called \singlequotes{typewriter} or \singlequotes{teletype}~-- fonts
-% without obliques (Yes, I am looking at you, Inconsolata!)\index{font>Inconsolata} finally
-% get an oblique shape.
+% without obliques (Yes, I am looking at you, Inconsolata!)\index{font>typeface>Inconsolata|userman}
+% finally get an oblique shape.
%
% \item\label{it:slanted-small-caps}
% Small caps without accompanying italics can be slanted, too.
@@ -1109,7 +1346,9 @@ end
%
% \begingroup
% \newcommand*{\indexpackageoption}[1]
-% {\index{package option>#1=\code{#1}}\index{#1=\code{#1}~(option)}\ignorespaces}
+% {\detoxindex{package option>#1=\code{#1}|userman}%
+% \detoxindex{#1=\code{#1}~(option)|userman}%
+% \ignorespaces}
% \begin{description}
% [before={\let\oldmakelabel=\makelabel
% \renewcommand{\makelabel}[1]
@@ -1130,13 +1369,14 @@ end
%
% \item[|fontspec|]\label{item:fontspec}
% \indexpackageoption{fontspec}
-% Use \packagename{fontspec}\index{package>\packagename{fontspec}} as slanting
-% back-end.\footnote{Requires \filesystem{fontspec.sty.}}
+% Use \packagename{fontspec}\index{package>fontspec=\packagename{fontspec}|userman} as
+% slanting back-end.\footnote{Requires \filesystem{fontspec.sty.}}
%
% \item[|l3draw|]\label{item:l3draw}
% \indexpackageoption{l3draw}
-% Select the \singlequotes{draw} layer\index{package>\packagename{l3draw}} of \LaTeXIII{} as
-% base for the slanting engine.\footnote{This option requires \filesystem{l3draw.sty.}}
+% Select the \singlequotes{draw} layer\index{package>l3draw=\packagename{l3draw}|userman} of
+% \LaTeXIII{} as base for the slanting engine.\footnote{This option requires
+% \filesystem{l3draw.sty.}}
%
% \begin{caution}
% This engine is experimental and the \singlequotes{draw} layer of \LaTeXIII{} itself is
@@ -1148,7 +1388,7 @@ end
% \indexpackageoption{negslant}
% Set the default value for \hyperref[syn:synthnegslant]{\cs{synthnegslant}} \emph{only.}
% The argument \meta{slant-expr} is a floating-point expression. Note that for this option
-% \meta{slant-expr} must evaluate to a non-positive value.
+% \meta{slant-expr} must evaluate to a nonpositive value.
%
% \item[|PDF|, |pdf|]\label{item:pdf}
% \indexpackageoption{pdf}
@@ -1159,14 +1399,14 @@ end
% \indexpackageoption{posslant}
% Set the default value for \hyperref[syn:synthslant]{\cs{synthslant}} \emph{only.} The
% argument \meta{slant-expr} is a floating-point expression. Note that for this option
-% \meta{slant-expr} must evaluate to a non-negative value.
+% \meta{slant-expr} must evaluate to a nonnegative value.
%
% \item[|PS|, |ps|]\label{item:postscript}
-% \index{ps}
-% Use \pstrickslogo\index{package>\packagename{pstricks}} to delegate slanting to the
-% PostScript\index{PostScript} interpreter. Obviously requires \pstrickslogo\footnote{The
-% package actually required is \filesystem{pst-3d.sty.}} and \acronym{DVI}-to-PostScript
-% translation.
+% \index{ps|userman}
+% Use \pstrickslogo\index{package>pstricks=\packagename{pstricks}|userman} to delegate
+% slanting to the PostScript\index{PostScript|userman} interpreter. Obviously requires
+% \pstrickslogo\footnote{The package actually required is \filesystem{pst-3d.sty.}} and
+% \acronym{DVI}-to-PostScript translation.
%
% \begin{caution}
% This engine is still experimental and produces low-quality output! See
@@ -1176,7 +1416,7 @@ end
% \item[|slant=|\meta{slant-expr}]\label{item:slant}
% \indexpackageoption{slant}
% Set the default values for both \hyperref[syn:synthslant]{\cs{synthslant}} and
-% \hyperref[syn:synthnegslant]{\cs{synthnegslant}}, this is, behave as if the two package
+% \hyperref[syn:synthnegslant]{\cs{synthnegslant}}, this is, act as if the two package
% options \(\code{posslant} = \meta{slant-expr}\) and \(\code{negslant} =
% -(\meta{slant-expr})\) have been given. The argument \meta{slant-expr} is a floating-point
% expression.
@@ -1185,8 +1425,8 @@ end
%
% \item[|TikZ|, |tikz|]\label{item:tikz}
% \indexpackageoption{tikz}
-% Use \packagename{TikZ}\index{package>\packagename{TikZ}} for slanting.\footnote{Requires
-% \filesystem{tikz.sty.}}
+% Use \packagename{TikZ}\index{package>tikz=\packagename{tikz}|userman} for
+% slanting.\footnote{Requires \filesystem{tikz.sty.}}
%
% \begin{caution}
% This engine is still experimental and produces low-quality output! See
@@ -1199,7 +1439,7 @@ end
% floating-point \emph{expressions} as their arguments not just plain floating-point literals.
% See Ref.~\citenum{latex3-interfaces}, Ch.~29, \doublequotes{The \textsf{l3fp}~module~--
% Floating points} for a description of the floating-point expression syntax and the available
-% functions.
+% functions.\label{secend:package-options}
%
%
% \clearpage
@@ -1218,7 +1458,7 @@ end
%
% \DescribeMacro{\synthslant}
% Control the slant applied by \hyperref[syn:textsynthslant]{\cs{textsynthslant}}.
-% This value is non-negative.
+% This value is nonnegative.
%
% \begin{synopsis}\label{syn:synthslant}
% \cs{synthslant}
@@ -1248,43 +1488,43 @@ end
% \begin{tabfigures}
% \begin{tabular}[t]{@{}p{9.5em}l@{}}
% \toprule
-% Font Name & Slant \\
+% Font & Slant \\
% \midrule
-% \acronym{ADF} Accanthis\index{font>ADF Accanthis=\acronym{ADF} Accanthis} & .26 \\
-% \acronym{ADF} Baskervald\index{font>ADF Baskervald=\acronym{ADF} Baskervald} & .32 \\
-% \acronym{ADF} Berenis\index{font>ADF Berenis=\acronym{ADF} Berenis} & .2 \\
-% \acronym{ADF} Venturis\index{font>ADF Venturis=\acronym{ADF} Venturis} & .2 \\
-% Alegreya\index{font>Alegreya} & .2 \\
-% Arvo\index{font>Arvo} & .2 \\
-% BaskervilleF\index{font>BaskervilleF} & .2 \\
-% Bera Serif\index{font>Bera Serif} & .2 \\
-% Bitter\index{font>Bitter} & .16 \\
-% Caladea\index{font>Caladea} & .14 \\
-% Clara\index{font>Clara} & .24 \\
-% Cochineal\index{font>Cochineal} & .2 \\
-% Coelacanth\index{font>Coelacanth} & .2 \\
-% Crimson Pro\index{font>Crimson Pro} & .2 \\
-% Crimson Text\index{font>Crimson Text} & .2 \\
+% \acronym{ADF} Accanthis\index{font>typeface>ADF Accanthis=\acronym{ADF} Accanthis|userman} & .26 \\
+% \acronym{ADF} Baskervald\index{font>typeface>ADF Baskervald=\acronym{ADF} Baskervald|userman} & .32 \\
+% \acronym{ADF} Berenis\index{font>typeface>ADF Berenis=\acronym{ADF} Berenis|userman} & .2 \\
+% \acronym{ADF} Venturis\index{font>typeface>ADF Venturis=\acronym{ADF} Venturis|userman} & .2 \\
+% Alegreya\index{font>typeface>Alegreya|userman} & .2 \\
+% Arvo\index{font>typeface>Arvo|userman} & .2 \\
+% BaskervilleF\index{font>typeface>BaskervilleF|userman} & .2 \\
+% Bera Serif\index{font>typeface>Bera Serif|userman} & .2 \\
+% Bitter\index{font>typeface>Bitter|userman} & .16 \\
+% Caladea\index{font>typeface>Caladea|userman} & .14 \\
+% Clara\index{font>typeface>Clara|userman} & .24 \\
+% Cochineal\index{font>typeface>Cochineal|userman} & .2 \\
+% Coelacanth\index{font>typeface>Coelacanth|userman} & .2 \\
+% Crimson Pro\index{font>typeface>Crimson Pro|userman} & .2 \\
+% Crimson Text\index{font>typeface>Crimson Text|userman} & .2 \\
% \bottomrule
% \end{tabular}%
% \qquad
% \begin{tabular}[t]{@{}p{9.5em}l@{}}
% \toprule
-% Font Name & Slant \\
+% Font & Slant \\
% \midrule
-% Day Roman\index{font>Day Roman} & .2 \\
-% \acronym{EB} Garamond\index{font>EB Garamond=\acronym{EB} Garamond} & .3 \\
-% etbb\index{font>etbb} & .2 \\
-% fbb\index{font>fbb} & .2 \\
-% Garamond Expert\index{font>Garamond Expert} & .2 \\
-% Gandhi Serif\index{font>Gandhi Serif} & .2 \\
-% Gentium\index{font>Gentium} & .2 \\
-% Ibarra Real Nova\index{font>Ibarra Real Nova} & .2 \\
-% \acronym{IBM} Plex Serif\index{font>IBM Plex Serif=\acronym{IBM} Plex Serif} & .24 \\
-% \acronym{Inria} Serif\index{font>Inria Serif=\acronym{Inria} Serif} & .2 \\
-% Libertinus Serif\index{font>Libertinus Serif} & .2 \\
-% Libre Baskerville\index{font>Libre Baskerville} & .3 \\
-% Libre Caslon\index{font>Libre Caslon} & .38 \\
+% Day Roman\index{font>typeface>Day Roman|userman} & .2 \\
+% \acronym{EB} Garamond\index{font>typeface>EB Garamond=\acronym{EB} Garamond|userman} & .3 \\
+% etbb\index{font>typeface>etbb|userman} & .2 \\
+% fbb\index{font>typeface>fbb|userman} & .2 \\
+% Garamond Expert\index{font>typeface>Garamond Expert|userman} & .2 \\
+% Gandhi Serif\index{font>typeface>Gandhi Serif|userman} & .2 \\
+% Gentium\index{font>typeface>Gentium|userman} & .2 \\
+% Ibarra Real Nova\index{font>typeface>Ibarra Real Nova|userman} & .2 \\
+% \acronym{IBM} Plex Serif\index{font>typeface>IBM Plex Serif=\acronym{IBM} Plex Serif|userman} & .24 \\
+% \acronym{Inria} Serif\index{font>typeface>Inria Serif=\acronym{Inria} Serif|userman} & .2 \\
+% Libertinus Serif\index{font>typeface>Libertinus Serif|userman} & .2 \\
+% Libre Baskerville\index{font>typeface>Libre Baskerville|userman} & .3 \\
+% Libre Caslon\index{font>typeface>Libre Caslon|userman} & .38 \\
% & \\
% & \\
% \bottomrule
@@ -1292,22 +1532,22 @@ end
% \qquad
% \begin{tabular}[t]{@{}p{9.5em}l@{}}
% \toprule
-% Font Name & Slant \\
+% Font & Slant \\
% \midrule
-% Merriweather\index{font>Merriweather} & .14 \\
-% MLModern\index{font>MLModern} & .23 \\
-% Noto Serif\index{font>Noto Serif} & .22 \\
-% \acronym{PT} Serif\index{font>PT Serif=\acronym{PT} Serif} & .2 \\
-% Roboto Slab\index{font>Roboto Slab} & .2 \\
-% Quattrocento\index{font>Quattrocento} & .2 \\
-% Source Serif Pro\index{font>Source Serif Pro} & .18 \\
-% Spectral\index{font>Spectral} & .18 \\
-% \acronym{STIX}\index{font>STIX=\acronym{STIX}} & .2 \\
-% \TeX{} Gyre Pagella\index{font>TeX Gyre Pagella=\TeX{} Gyre Pagella} & .16 \\
-% \acronym{TX} Fonts Serif\index{font>TX Fonts Serif=\acronym{TX} Fonts Serif} & .2 \\
-% \acronym{URW} Antiqua\index{font>URW Antiqua=\acronym{URW} Antiqua} & .2 \\
-% \acronym{URW} Nimbus Roman\index{font>URW Nimbus Roman=\acronym{URW} Nimbus Roman} & .2 \\
-% Utopia\index{font>Utopia} & .2 \\
+% Merriweather\index{font>typeface>Merriweather|userman} & .14 \\
+% \acronym{ML} Modern\index{font>typeface>ML Modern=\acronym{ML} Modern|userman} & .23 \\
+% Noto Serif\index{font>typeface>Noto Serif|userman} & .22 \\
+% \acronym{PT} Serif\index{font>typeface>PT Serif=\acronym{PT} Serif|userman} & .2 \\
+% Roboto Slab\index{font>typeface>Roboto Slab|userman} & .2 \\
+% Quattrocento\index{font>typeface>Quattrocento|userman} & .2 \\
+% Source Serif Pro\index{font>typeface>Source Serif Pro|userman} & .18 \\
+% Spectral\index{font>typeface>Spectral|userman} & .18 \\
+% \acronym{STIX}\index{font>typeface>STIX=\acronym{STIX}|userman} & .2 \\
+% \TeX{} Gyre Pagella\index{font>typeface>TeX Gyre Pagella=\TeX{} Gyre Pagella|userman} & .16 \\
+% \acronym{TX} Fonts Serif\index{font>typeface>TX Fonts Serif=\acronym{TX} Fonts Serif|userman} & .2 \\
+% \acronym{URW} Antiqua\index{font>typeface>URW Antiqua=\acronym{URW} Antiqua|userman} & .2 \\
+% \acronym{URW} Nimbus Roman\index{font>typeface>URW Nimbus Roman=\acronym{URW} Nimbus Roman|userman} & .2 \\
+% Utopia\index{font>typeface>Utopia|userman} & .2 \\
% & \\
% \bottomrule
% \end{tabular}
@@ -1319,7 +1559,7 @@ end
% \DescribeMacro{\synthnegslant}
% Control the slant applied by
% \hyperref[syn:textsynthuprightitalic]{\cs{textsynthuprightitalic}}. This value is
-% non-positive.
+% nonpositive.
%
% \begin{synopsis}\label{syn:synthnegslant}
% \cs{synthnegslant}
@@ -1332,9 +1572,9 @@ end
% more flexible and powerful interface, see~\cref{sec:advanced-interface}.
%
% \begin{note}
-% The following restrictions and workarounds to get line-breaking and automatic hyphenation
-% working again do \emph{not} apply to the
-% \packagename{fontspec}\index{package>\packagename{fontspec}} back-end.
+% The following restrictions and workarounds to get line-breaking and \TeX's automatic
+% hyphenation working again do \emph{not} apply to the
+% \packagename{fontspec}\index{package>fontspec=\packagename{fontspec}|userman} back-end.
% \end{note}
%
% \noindent
@@ -1344,7 +1584,7 @@ end
% provisions to re-enable at least some breakability.
%
% \begin{enumerate}
-% \item Spaces introduce breakpoint,\index{breakpoint at space} e.\,g.
+% \item Spaces introduce breakpoint,\index{breakpoint at space|userman} e.\,g.
% \begin{codeexample}
% \cs{textsynthslant}\{topological dual space\}
% \end{codeexample}
@@ -1352,8 +1592,8 @@ end
% second word (producing another horizontal box). \TeX{} sees two (unbreakable) boxes and a
% discardable space when it comes to linebreaking.
%
-% \item Discretionary hyphens\index{discretionary hyphen} in the form of \singlequotes{\cs{-}}
-% get propagated. So, we could improve on our above example by saying
+% \item Discretionary hyphens\index{discretionary hyphen|userman} in the form of
+% \singlequotes{\cs{-}} get propagated. So, we could improve on our above example by saying
% \begin{codeexample}
% \cs{textsynthslant}\{topo\cs{-}log\cs{-}i\cs{-}cal dual space\}
% \end{codeexample}
@@ -1374,7 +1614,7 @@ end
%
% In horizontal mode switch to an upright shape, slant \meta{text} with the slant value stored
% in \hyperref[syn:synthslant]{\cs{synthslant}} and apply \doublequotes{slant
-% correction}\index{slant>correction} --~the equivalent of italics correction~-- at the
+% correction}\index{slant>correction|userman} --~the equivalent of italics correction~-- at the
% right-hand side of~\meta{text}.
%
% In math mode just slant \meta{text} with the slant value stored in
@@ -1391,7 +1631,7 @@ end
%
% \noindent
% where we show the font modification in conjunction with the
-% \packagename{babel}~macro\index{package>\packagename{babel}}
+% \packagename{babel}~macro\index{package>babel=\packagename{babel}|userman}
% \cs{foreignlanguage}~\cite{package:babel}.~\visualpar
%
% In math-mode you cannot have enough fonts, symbols, and most of the gizmos over there! I
@@ -1485,7 +1725,7 @@ end
% \end{synopsis}
%
% Switch to an upright font shape and --~if
-% package~\packagename{microtype}~\cite{package:microtype}\index{package>\packagename{microtype}}
+% package~\packagename{microtype}~\cite{package:microtype}\index{package>microtype=\packagename{microtype}|userman}
% has been loaded~-- enter the Microtype-context defined by
% macro~\hyperref[syn:slantcontext]{\cs{slantcontext}}. At the end add some slant correction,
% which is the equivalent of italics correction.
@@ -1511,7 +1751,7 @@ end
% Microtype-context defined by macro~\hyperref[syn:negslantcontext]{\cs{negslantcontext}}.
%
% \DescribeMacro{\slantcontext}
-% Microtype context used when typesetting slanted text.
+% Name of the \packagename{microtype} context used when typesetting slanted text.
%
% \begin{synopsis}\label{syn:slantcontext}
% \cs{slantcontext}
@@ -1530,7 +1770,7 @@ end
% \end{note}
%
% \DescribeMacro{\negslantcontext}
-% Microtype context used when typesetting un-slanted text.
+% Name of the \packagename{microtype} context used when typesetting backward slanted text.
%
% \begin{synopsis}\label{syn:negslantcontext}
% \cs{negslantcontext}
@@ -1667,13 +1907,13 @@ end
% and --~after recompiling with the appropriate \LaTeX-engine~-- used to examine the details of
% the slant operations.
%
-% Page~2, Sec.~3.1, \singlequotes{Copy}, shows wild mixes of different font shapes, native al
-% well as synthesized ones. Here, the slanted glyphs as well as the upright italics should
-% blend well with the native italics/obliques and the normal font, respectively.
+% Page~2, Sec.~3.1, \singlequotes{Copy}, shows wild mixes of different font shapes, native and
+% synthesized ones. Here, the slanted glyphs as well as the upright italics should blend well
+% with the native italics/obliques and with the normal font, respectively.
%
-% Page~3, Sec.~3.2 and following sub-sections, examines the coupling of
-% \packagename{synthslant} with the \TeX-system and some of its extensions. If a slant engine
-% malfunctions, it will become evident on this page.
+% Page~3, Sec.~3.2 and following sub-sections, examine the coupling of \packagename{synthslant}
+% with the \TeX-system and some of its extensions. If a slant engine malfunctions, it will
+% become evident on this page.
%
%
% \clearpage
@@ -1687,7 +1927,7 @@ end
% \packagename{Syntslant}~manipulations may not survive
% (pre-)\discretionary{}{}{}processing by \MP.
%
-% \item[\packagename{l3draw} engine.]\index{package>\packagename{l3draw}}\mbox{}
+% \item[\packagename{l3draw} engine.]\index{package>l3draw=\packagename{l3draw}|userman}\mbox{}
% \begin{itemize}
% \item Depending of the shear direction the \packagename{l3draw} engine may generate some
% extra positive or negative space at the ends of the text.
@@ -1697,10 +1937,10 @@ end
% \item Markedly slower than the \acronym{PDF}-implementation!
% \end{itemize}
%
-% \item[\pstrickslogo{} engine.]\index{package>\packagename{pstricks}}
+% \item[\pstrickslogo{} engine.]\index{package>pstricks=\packagename{pstricks}|userman}
% The \pstrickslogo{} engine produces some extra space at the ends of the text.
%
-% \item[\tikzlogo{} engine.]\index{package>\packagename{tikz}}
+% \item[\tikzlogo{} engine.]\index{package>tikz=\packagename{tikz}|userman}
% The \tikzlogo{} engine produces some extra space at the ends of the text.
% \end{description}
%
@@ -1753,7 +1993,7 @@ end
%
% I want to elaborate the example given in \cref{sec:usage-ideas},
% \cref{it:correct-italics-angle} and generate less-angled italics for
-% Libre~Caslon.\index{font>Libre Caslon} Here is a suitable map line taken from
+% Libre~Caslon.\index{font>typeface>Libre Caslon|userman} Here is a suitable map line taken from
% \filesystem{pdftex.map} on my system:
%
% \begin{multilinecodeexample}
@@ -1824,7 +2064,8 @@ end
% \end{example}
%
%
-% \subsection{Combining \LaTeX{} and \command{dvipdfmx}}\label{sec:alternative-latex}
+% \subsection{Combining \LaTeX{} and
+% \texorpdfstring{\command{dvipdfmx}}{dvipdfmx}}\label{sec:alternative-latex}
%
% The alternative when using \LaTeX{} is similar the one elaborated in the previous section.
% The font mapline gets modified by \cs{special} primitive
@@ -1872,14 +2113,20 @@ end
%
% \MaybeStop{
% \clearpage
-% \phantomsection
-% \resetfancyhead
-% \addcontentsline{toc}{section}{Change History}
-% \PrintChanges
+% \begingroup
+% \setcounter{GlossaryColumns}{1}
+% \phantomsection
+% \label{sec:changes}
+% \resetfancyhead
+% \addtocontents{toc}{\bigskip}
+% \addcontentsline{toc}{section}{\numberline{}Change History}
+% \PrintChanges
+% \endgroup
%
% \clearpage
% \phantomsection
-% \addcontentsline{toc}{section}{References}
+% \addtocontents{toc}{\medskip}
+% \addcontentsline{toc}{section}{\numberline{}References}
% \begin{RaggedRight}
% \begin{thebibliography}{88}
% \bibitem{package:relsize}
@@ -1986,20 +2233,31 @@ end
%
%
% \clearpage
-% \begin{RaggedRight}
+% \begingroup
% \setcounter{IndexColumns}{2}
% \setlength{\columnsep}{30pt}
-% \label{sec:index}
% \phantomsection
-% \addcontentsline{toc}{section}{Index}
+% \label{sec:index}
+% \addtocontents{toc}{\medskip}
+% \addcontentsline{toc}{section}{\numberline{}Index}
+% \raggedcolumns
+% \def\codeidx##1{\linenumberdecoration\textbf{##1}}
+% \def\main##1{\linenumberdecoration\underbar{\textbf{##1}}}
+% \def\usage##1{\textit{\textbf{##1}}}
% \PrintIndex
-% \end{RaggedRight}
+% \label{secend:index}
+% \endgroup
% }
%
%
% \clearpage
+% \toccontinuesonnextpage
% \section{Package Code}\label{sec:package-code}
-% \addtocontents{toc}{\begingroup\small}
+% \addtocontents{toc}{\protect\begin{list}{}{\leftmargin=\subsectiontocindent\parsep=0pt}}
+% \addtocontents{toc}{\protect\item}
+% \addtocontents{toc}{\RaggedRight}
+% \addtocontents{toc}{\small}
+% \addtocontents{toc}{\tocsquashedsubsections}
% \addtocontents{toc}{\protect\begin{multicols}{2}}
% \addtocontents{toc}{\protect\raggedcolumns}
%
@@ -2008,12 +2266,15 @@ end
% and explain its implementation details.
%
%
+% \changes{v0.1a}{2024-6-2}{Add missing dependency on \packagename{etoolbox}.
+% Fix suggested by \code{mbertucci47}.}
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{synthslant}
- [2024/05/07 v0.1 Synthetically Slant glyphs]
+ [2024/07/08 v0.1a Synthetically Slant glyphs]
+\RequirePackage{etoolbox}
\RequirePackage{iftex}
\RequirePackage{xkeyval}
@@ -2094,12 +2355,16 @@ end
% \begin{macrocode}
\ExplSyntaxOn
\fp_compare:nNnTF {\synthslant} < {.0}
- {\PackageError{synthslant}{\string\synthslant\space <\space 0}
- {Pass\space a\space value\space that\space is\space non-negative.}}
+ {\PackageError{synthslant}
+ {\string\synthslant\space <\space 0}
+ {Pass\space a\space value\space that\space
+ is\space nonnegative.}}
{}
\fp_compare:nNnTF {\synthnegslant} > {.0}
- {\PackageError{synthslant}{\string\synthnegslant\space >\space 0}
- {Pass\space a\space value\space that\space is\space non-positive.}}
+ {\PackageError{synthslant}
+ {\string\synthnegslant\space >\space 0}
+ {Pass\space a\space value\space that\space
+ is\space nonpositive.}}
{}
\ExplSyntaxOff
@@ -2176,7 +2441,7 @@ end
% \end{macro}
%
%
-% \subsubsection{\acronym{PDF} Slant Engine}
+% \subsubsection{\texorpdfstring{\acronym{PDF}}{PDF} Slant Engine}
%
% The \acronym{PDF}-engine works well and it is the best tested alternative.
%
@@ -2251,13 +2516,15 @@ end
% \begin{macrocode}
\fp_compare:nNnTF {#1} >= {.0}
{
- \box_set_wd:Nn \l_tmpa_box {\l_tmpa_dim - #1\l_tmpb_dim}
+ \box_set_wd:Nn \l_tmpa_box
+ {\l_tmpa_dim - #1\l_tmpb_dim}
}
{
\draw_suspend_begin:
\kern#1\l_tmpb_dim
\draw_suspend_end:
- \box_set_wd:Nn \l_tmpa_box {\l_tmpa_dim + #1\l_tmpb_dim}
+ \box_set_wd:Nn \l_tmpa_box
+ {\l_tmpa_dim + #1\l_tmpb_dim}
}
% \end{macrocode}
%
@@ -2348,7 +2615,8 @@ end
% \begin{macrocode}
\newcommand*{\synthslantbox@fontspect@shear@box}[2]{
\begingroup
- \expandafter\fontspec[FakeSlant = #1]{\l_fontspec_family_tl}
+ \expandafter
+ \fontspec[FakeSlant=#1]{\l_fontspec_family_tl}
#2
\endgroup
}
@@ -2473,8 +2741,12 @@ end
% \begin{macrocode}
\ifnum\synthslant@engine=4% fontspec
\newrobustcmd*{\synthslantbox}[2]{%
- \edef\synthslant@slant@value{#1}% definition for compatibility of both branches
- \synthslantbox@fontspect@shear@box{\synthslant@slant@value}{#2}%
+% \end{macrocode}
+% The following (expanding) definition is only here for the compatibility of both branches.
+% \begin{macrocode}
+ \edef\synthslant@slant@value{#1}
+ \synthslantbox@fontspect@shear@box{\synthslant@slant@value}
+ {#2}%
}
% \end{macrocode}
%
@@ -2530,7 +2802,8 @@ end
\NewDocumentEnvironment{slantenvironment}{}
{\upshape
\ifcsdef{microtypecontext}
- {\expandafter\microtypecontext\expandafter{\slantcontext}}
+ {\expandafter\microtypecontext
+ \expandafter{\slantcontext}}
{}}
{\ifcsdef{endmicrotypecontext}
{\endmicrotypecontext}
@@ -2557,8 +2830,8 @@ end
% \end{macro}
%
% \begin{macro}{\synthslantbox@right@negslant@correction}
-% We could play the same trick here as in \cs{synthslantbox@right@slant@correction} and use
-% \cs{synthnegslant} instead of \cs{synthslant}. But my experiments show no need for a
+% We could play the same trick here as in \cs{synthslantbox@\-right@\-slant@\-correction} and
+% use \cs{synthnegslant} instead of \cs{synthslant}. But my experiments show no need for a
% correction. Anyhow, this macro may be convenient to override someday.
%
% \begin{macrocode}
@@ -2588,7 +2861,8 @@ end
\NewDocumentEnvironment{negslantenvironment}{}
{\itshape
\ifcsdef{microtypecontext}
- {\expandafter\microtypecontext\expandafter{\negslantcontext}}
+ {\expandafter\microtypecontext
+ \expandafter{\negslantcontext}}
{}}
{\ifcsdef{endmicrotypecontext}
{\endmicrotypecontext}
@@ -2622,7 +2896,7 @@ end
%
%
% \addtocontents{toc}{\protect\end{multicols}}
-% \addtocontents{toc}{\endgroup}
+% \addtocontents{toc}{\protect\end{list}}
%
%
% \Finale
@@ -4889,7 +5163,7 @@ KJ8AAAAASUVORK5CYII=
\setlength{\headheight}{0pt}
\setlength{\headsep}{0pt}
-\setlength{\overfullrule}{3pt}
+\setlength{\overfullrule}{0pt}
\pagestyle{plain}
@@ -5254,6 +5528,20 @@ right: \code{\cs{textsynthslant}\{Show line-break\cs{-}ing in a sen\cs{-}tence.\
%
%
%
+% \iffalse
+%<*minimal-test>
+\documentclass{minimal}
+
+\usepackage{synthslant}
+
+\begin{document}
+\textsynthslant{abc}
+\end{document}
+%</minimal-test>
+% \fi
+%
+%
+%
\endinput
%
%
diff --git a/Master/texmf-dist/source/latex/synthslant/synthslant.ins b/Master/texmf-dist/source/latex/synthslant/synthslant.ins
index 845b4378b19..f7027fe6f5e 100644
--- a/Master/texmf-dist/source/latex/synthslant/synthslant.ins
+++ b/Master/texmf-dist/source/latex/synthslant/synthslant.ins
@@ -1,11 +1,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
@@ -23,11 +23,11 @@ This is a generated file.
Copyright (C) 2024 by Ch. L. Spiel
This work may be distributed and/or modified under the conditions
-of the LaTeX Project Public License, either version 1.3 of this
+of the LaTeX Project Public License, either version 1.3c of this
license or (at your option) any later version. The latest version
of this license is in
- http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX
+ https://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
version 2003/12/01 or later.
This work has the LPPL maintenance status `maintained'.
@@ -46,12 +46,15 @@ shear-transform.mp, and title.mp.
\generate{\file{synthslant.sty}{\from{\source}{package}}
\file{synthslant-gauge.tex}{\from{\source}{gauge}}
- \file{synthslant.ist}{\from{\source}{index-style}}}
+ \file{synthslant-minimal-test.tex}{\from{\source}{minimal-test}}}
\nopostamble
-\generate{\file{title.mp}{\from{\source}{title}}}
-\generate{\file{shear-transform.mp}{\from{\source}{shear-transform}}}
+\generate{\file{shear-transform.mp}{\from{\source}{shear-transform}}
+ \file{synthslant.gst}{\from{\source}{changes-style}}
+ \file{synthslant.ist}{\from{\source}{index-style}}
+ \file{title.mp}{\from{\source}{title}}}
+
\nopreamble
diff --git a/Master/texmf-dist/source/latex/texvc/Makefile b/Master/texmf-dist/source/latex/texvc/Makefile
new file mode 100644
index 00000000000..d32d473d3bd
--- /dev/null
+++ b/Master/texmf-dist/source/latex/texvc/Makefile
@@ -0,0 +1,17 @@
+PACKAGE = texvc
+all: $(PACKAGE).pdf
+
+$(PACKAGE).sty: $(PACKAGE).dtx $(PACKAGE).ins
+ pdflatex $(PACKAGE).ins
+
+$(PACKAGE).idx: $(PACKAGE).dtx $(PACKAGE).sty
+ pdflatex $(PACKAGE).dtx
+
+$(PACKAGE).ind: $(PACKAGE).idx $(PACKAGE).sty
+ makeindex -s gind.ist $(PACKAGE).idx
+
+$(PACKAGE).gls: $(PACKAGE).idx $(PACKAGE).sty
+ makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
+
+$(PACKAGE).pdf: $(PACKAGE).dtx $(PACKAGE).sty $(PACKAGE).ind $(PACKAGE).gls
+ pdflatex $(PACKAGE).dtx
diff --git a/Master/texmf-dist/source/latex/texvc/texvc.dtx b/Master/texmf-dist/source/latex/texvc/texvc.dtx
index 429a1a5e6e1..7309d0266f7 100644
--- a/Master/texmf-dist/source/latex/texvc/texvc.dtx
+++ b/Master/texmf-dist/source/latex/texvc/texvc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2015 by Moritz Schubotz
+% Copyright (C) 2015-2018 by Moritz Schubotz
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{texvc}
%<*package>
-[2018/03/04 v1.1 Bugfixes]
+[2020/02/09 v1.2 Document deprecations]
%</package>
%<package>
%<package>\RequirePackage{amsmath}
@@ -42,7 +42,7 @@
%<package>
%<*driver>
\documentclass{ltxdoc}
-\usepackage{texvc}[2018/03/04]
+\usepackage{texvc}[2020/02/09]
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -75,19 +75,21 @@
%
% \changes{v1.0}{2015/11/09}{Initial version}
% \changes{v1.1}{2018/03/04}{Fix bug with varcoppa, document usage of or}
+% \changes{v1.2}{2020/02/09}{Document deprecations}
% \GetFileInfo{texvc.sty}
-%
+% \newcommand{\deprecated}{\emph{This command is deprecated.}}
% \DoNotIndex{\newcommand,\newenvironment}
%
% \title{The \textsf{texvc} package\thanks{This document
% corresponds to \textsf{texvc}~\fileversion,
% dated \filedate.}}
-% \author{Moritz Schubotz \\ \texttt{moritz.schubotz@uni-konstanz.de}}
-%
+% \author{Moritz Schubotz \\ \texttt{moritz.schubotz@fiz-karlsruhe.de}}
+% \date{\filedate}
+%
% \maketitle
%
% \begin{abstract}
-% This package provides all\footnote{The command \texttt{\textbackslash or} is only availible if custom code is copied into your \LaTeX-file. See page \pageref{cmd.or} for details.} LaTeX command availible in MediaWiki.
+% This package provides all\footnote{The command \texttt{\textbackslash or} is only available if custom code is copied into your \LaTeX-file. See page \pageref{cmd.or} for details.} LaTeX command available in MediaWiki.
% This includes several packages like amsmath, and adds some specific
% commands such as \texttt{\textbackslash Reals}.
% \end{abstract}
@@ -95,7 +97,7 @@
% \section{Provided Macros}
%
% \subsection{Arrows}
-% The first group of MediaWiki coustom command (other\_delimiters2) defines short hand notations for some arrorws.
+% The first group of MediaWiki custom command (other\_delimiters2) defines short hand notations for some arrows.
%
% \DescribeMacro{\darr} Short hand notation for arrow $\downarrow.$
%
@@ -122,12 +124,12 @@
%
% \subsection{Literals}
%
-% The second group of MediaWiki coustom commands (other\_litereals3) defines short hand notations for some literals.
+% The second group of MediaWiki custom commands (other\_litereals3) defines short hand notations for some literals.
%
-% \DescribeMacro{\C} Short hand notation for literal $\mathbb{C}.$
+% \DescribeMacro{\C} Short hand notation for literal $\mathbb{C}.$ \deprecated
%
%
-% \DescribeMacro{\H} Short hand notation for literal $\mathbb{H}.$
+% \DescribeMacro{\H} Short hand notation for literal $\mathbb{H}.$ \deprecated
%
%
% \DescribeMacro{\N} Short hand notation for literal $\mathbb{N}.$
@@ -151,10 +153,10 @@
% \DescribeMacro{\Alpha} Short hand notation for literal $\mathrm{A}.$
%
%
-% \DescribeMacro{\and} Short hand notation for literal $\land.$
+% \DescribeMacro{\and} Short hand notation for literal $\land.$ \deprecated
%
%
-% \DescribeMacro{\ang} Short hand notation for literal $\angle.$
+% \DescribeMacro{\ang} Short hand notation for literal $\angle.$ \deprecated
%
%
% \DescribeMacro{\Beta} Short hand notation for literal $\mathrm{B}.$
@@ -277,10 +279,10 @@
% \DescribeMacro{\Omicron} Short hand notation for literal $\mathrm{O}.$
%
%
-% \DescribeMacro{\or} Short hand notation for literal $\lor.$
+% \DescribeMacro{\or} Short hand notation for literal $\lor.$ \deprecated
%
%
-% \DescribeMacro{\part} Short hand notation for literal $\partial.$
+% \DescribeMacro{\part} Short hand notation for literal $\partial.$ \deprecated
%
%
% \DescribeMacro{\plusmn} Short hand notation for literal $\pm.$
@@ -342,7 +344,21 @@
%
% \DescribeMacro{\Zeta} Short hand notation for literal $\mathrm{Z}.$
%
-%
+% \section{Deprecations}
+% According to the decision of \emph{Wikimedia Community User Group Math}\footnote{\url{https://meta.wikimedia.org/w/index.php?oldid=19705444}} the following macros have been deprecated\footnote{See \url{https://phabricator.wikimedia.org/T197842} for the discussion.}:
+% \begin{enumerate}
+% \item \verb|$|
+% \item \verb|%|
+% \item \verb|\and|
+% \item \verb|\or|
+% \item \verb|\part|
+% \item \verb|\ang|
+% \item \verb|\C|
+% \item \verb|\H|
+% \item \verb|\bold|
+% \item \verb|\Bbb|
+% \end{enumerate}
+% The commands 1,2,4,9,10 have never been part of this package, but were available from within Wikipedia.
% \StopEventually{}
%
% \section{Implementation}
diff --git a/Master/texmf-dist/source/latex/texvc/texvc.ins b/Master/texmf-dist/source/latex/texvc/texvc.ins
index 5343a6a94fb..0c12dd61eb8 100644
--- a/Master/texmf-dist/source/latex/texvc/texvc.ins
+++ b/Master/texmf-dist/source/latex/texvc/texvc.ins
@@ -1,42 +1,42 @@
-%%
-%% Copyright (C) 2015 by Moritz Schubotz
-%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any later
-%% version. The latest version of this license is in:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-\input docstrip.tex
-\keepsilent
-\usedir{tex/latex/texvc}
-\askforoverwritefalse
-\preamble
-This is a generated file.
-Copyright (C) 2015 by Moritz Schubotz
-This file may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3 of this license or (at your option) any later
-version. The latest version of this license is in:
-http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-\endpreamble
-\generate{\file{texvc.sty}{\from{texvc.dtx}{package}}}
-\Msg{*********************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the}
-\Msg{* following file into a directory searched by TeX:}
-\Msg{*}
-\Msg{* \space\space texvc.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the file texvc.dtx}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*********************************************************}
-\endbatchfile
+%%
+%% Copyright (C) 2015-2018 by Moritz Schubotz
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+\input docstrip.tex
+\keepsilent
+\usedir{tex/latex/texvc}
+\askforoverwritefalse
+\preamble
+This is a generated file.
+Copyright (C) 2015-2018 by Moritz Schubotz
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 of this license or (at your option) any later
+version. The latest version of this license is in:
+http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
+\endpreamble
+\generate{\file{texvc.sty}{\from{texvc.dtx}{package}}}
+\Msg{*********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space texvc.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file texvc.dtx}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*********************************************************}
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
index ea4ac03f229..e6f3e46ad82 100644
--- a/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
+++ b/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
@@ -14,7 +14,7 @@
%
% \iffalse
%<*driver>
-\ProvidesFile{thuthesis.dtx}[2024/05/20 7.5.1 Tsinghua University Thesis Template]
+\ProvidesFile{thuthesis.dtx}[2024/07/01 7.5.2 Tsinghua University Thesis Template]
\documentclass{ltxdoc}
\usepackage{dtx-style}
@@ -251,7 +251,7 @@
% $ bibtex thuthesis-example.aux # 生成 bbl 文件
% $ bibtex thuthesis-example-appendix-a.aux # 附录 A 的的参考文献
% $ bibtex thuthesis-example-appendix-b.aux # 附录 B 的的参考文献……
-% $ bibtex thuthesis-example-index.aux # 本科生的书面翻译对应的原文索引
+% $ bibtex thuthesis-example-index-1.aux # 本科生的书面翻译对应的原文索引
% $ xelatex thuthesis-example.tex # 解决引用
% $ xelatex thuthesis-example.tex # 生成论文 PDF
%
@@ -813,7 +813,7 @@
% }
% \end{latex}
%
-% 用户也可以逐项修改数学样式。
+% 用户也可以逐项修改数学样式,包括:
% \newcommand\dif{\mathop{}\!\mathrm{d}}
% \begin{enumerate}
% \item \DescribeOption{uppercase-greek}
@@ -885,12 +885,16 @@
% 模板作了处理,用户可以直接使用这些宏包的命令,如 \cs{bm}、\cs{mathscr}、
% \cs{uppi}。
%
-% 另外,模板还为 `math-font` 提供了传统的 Type 1 字体 \option{newtx}。
+% 另外,模板还为 |math-font| 提供了传统的 Type 1 字体 \option{newtx}。
% 该选项会调用 \pkg{newtxmath} 宏包。
% 但是,如果西文字体已经使用了 OpenType 的 Times New Roman,
% 混用 Type 1 字体可能会导致问题,尤其是使用 \pkg{siunitx} 宏包时。
% 该选项还处于测试阶段,需要谨慎使用。
%
+% \DescribeOption{eqn-paren-style}
+% 控制中文论文中,数学公式编号两边的括号样式。可选项包括:\option{full}(全角,默认) / \option{half}(半角)。
+% 在语言为英语(|language = english|)时,此选项无效,仅使用半角括号。
+%
% \subsubsection{定理环境}
% \label{sec:theorem}
% \thuthesis{} 定义了常用的数学环境:
@@ -1269,7 +1273,7 @@
% \begin{macrocode}
%<cls>\NeedsTeXFormat{LaTeX2e}[2017/04/15]
%<cls>\ProvidesClass{thuthesis}
-%<cls>[2024/05/20 7.5.1 Tsinghua University Thesis Template]
+%<cls>[2024/07/01 7.5.2 Tsinghua University Thesis Template]
% \end{macrocode}
%
% 报错
@@ -1330,7 +1334,7 @@
%<*cls>
\hyphenation{Thu-Thesis}
\def\thuthesis{ThuThesis}
-\def\version{7.5.1}
+\def\version{7.5.2}
\RequirePackage{kvdefinekeys}
\RequirePackage{kvsetkeys}
\RequirePackage{kvoptions}
@@ -1658,6 +1662,17 @@
},
default = print,
},
+% \end{macrocode}
+%
+% 数学公式编号的括号使用全角还是半角。
+% \begin{macrocode}
+ eqn-paren-style = {
+ name = eqn@paren@style,
+ choices = {
+ full,
+ half,
+ }
+ },
}
\newif\ifthu@degree@graduate
\newcommand\thu@set@graduate{%
@@ -3511,10 +3526,23 @@
% 中文模板的公式编号使用中文括号。需要修改 \pkg{amsmath} 的 \cs{tagform@}。
% 这里中文的 \cs{unskip} 是为了“|式~\eqref|”这样的写法不产生额外的空格。
% \begin{macrocode}
+\newcommand\thu@eqn@left@paren{(}
+\newcommand\thu@eqn@right@paren{)}
+\newcommand\thu@set@eqn@paren@style{%
+ \ifthu@eqn@paren@style@full
+ \renewcommand\thu@eqn@left@paren{(}%
+ \renewcommand\thu@eqn@right@paren{)}%
+ \else
+ \renewcommand\thu@eqn@left@paren{(}%
+ \renewcommand\thu@eqn@right@paren{)}%
+ \fi
+}
+\thu@set@eqn@paren@style
+\thu@option@hook{eqn-paren-style}{\thu@set@eqn@paren@style}
\newcommand\thu@put@parentheses[1]{%
\ifthu@language@chinese
\unskip
- (#1)%
+ \thu@eqn@left@paren#1\thu@eqn@right@paren
\else
(#1)%
\fi
@@ -6347,9 +6375,11 @@
% \begin{macrocode}
\newenvironment{translation-index}{}{}
\AtEndOfPackageFile*{bibunits}{
+ \newcounter{thu@translation@index}%
\renewenvironment{translation-index}{%
+ \global\advance\c@thu@translation@index\@ne
\begin{bibunit}%
- \renewcommand\@bibunitname{\jobname-index}%
+ \renewcommand\@bibunitname{\jobname-index-\arabic{thu@translation@index}}%
\renewcommand\bibname{书面翻译对应的原文索引}%
\thu@set@survey@bibheading
}{%
diff --git a/Master/texmf-dist/source/latex/typog/Makefile b/Master/texmf-dist/source/latex/typog/Makefile
index bb3c83ab24b..1b7e0b21a39 100644
--- a/Master/texmf-dist/source/latex/typog/Makefile
+++ b/Master/texmf-dist/source/latex/typog/Makefile
@@ -7,8 +7,9 @@
SHELL := /bin/sh
-LATEX := /usr/bin/env max_print_line=2147483647 pdflatex
-LATEX_FLAGS := -file-line-error -halt-on-error -interaction=nonstopmode
+LATEX_PROPER := pdflatex
+LATEX := /usr/bin/env max_print_line=2147483647 $(LATEX_PROPER)
+LATEX_FLAGS := -file-line-error -halt-on-error -interaction=nonstopmode -output-directory=.
LATEX_RERUN_TRIGGER := '^Package rerunfilecheck Warning: File [^ ]* has changed'
LATEX_WARNING := '^LaTeX (|[A-Za-z0-9_]* )Warning:'
@@ -16,6 +17,10 @@ MAKEINDEX := makeindex
MAKEINDEX_FLAGS := -q
+MAKEINFO := makeinfo
+MAKEINFO_FLAGS := --no-split
+
+
METAPOST := mpost
METAPOST_FLAGS := -file-line-error -interaction=nonstopmode -tex=latex
@@ -24,8 +29,12 @@ PODCHECKER := podchecker
PODCHECKER_FLAGS := -warnings
+define SED_VERSION_REGEXP
+^\( *\|\\ProvidesPackage{[^}]*} *\)\[\([0-9][0-9]*/[0-9][0-9]*/[0-9][0-9]*\) *v\([^ ]*\) *\([^]]*\)].*$$
+endef
+
POD2MAN := pod2man
-POD2MAN_FLAGS := $$(sed -ne 's,\\ProvidesPackage{typog}\[\([0-9][0-9]*/[0-9][0-9]*/[0-9][0-9]*\) *v\([^ ]*\) .*$$,--date=\1 --release=\2,p' < typog.sty)
+POD2MAN_FLAGS := $$(sed -ne 's,$(SED_VERSION_REGEXP),--date=\2 --release=\3,p' < typog.sty)
POD2TEXI := pod2texi
@@ -33,31 +42,32 @@ POD2TEXI_FLAGS :=
GROFF := groff
-## Codes of serif fonts that work for PDF output
+## Codes of fonts that work for PDF output as by the contents
+## of "/usr/share/groff/current/font/devpdf".
+##
+## Serif
## BM: URW Bookman L
## N: URW Century Schoolbook L
## P: URW Palladio L
## T: URW Nimbus Roman No9 L
+##
+## Sans Serif
+## A: Avantgarde
+## H: Helvetica
+##
+## Monospace
+## C: Courier
GROFF_FLAGS := -Tpdf -dpaper=a4 -fP -man -wall
-SPELLCHECK := aspell
-SPELLCHECK_FLAGS := \
- --add-tex-command='citenum p' --add-tex-command='code p' \
- --add-tex-command='Cref p' --add-tex-command='cref p' \
- --add-tex-command='cs p' \
- --add-tex-command='DescribeEnv p' --add-tex-command='DescribeMacro p' \
- --add-tex-command='marg p' --add-tex-command='meta p' \
- --add-tex-command='oarg p' \
- --lang=en_US --mode=tex
-
-
-SOURCE_FILES := LICENSE Makefile typog.dtx typog.ins
+PROJECT_NAME := typog
+SOURCE_FILES := LICENSE Makefile README.md typog.dtx typog.ins
+DOCUMENTATION_FILES := typog-example.pdf typog-grep.1.pdf typog.pdf
.PHONY: all
-all: sty pdf man
+all: sty pdf bin man
.PHONY: sty
@@ -65,7 +75,7 @@ sty: typog.sty
.PHONY: pdf
-pdf: doc ex nomt
+pdf: doc ex test
.PHONY: doc
@@ -76,69 +86,88 @@ doc: typog.pdf
ex: typog-example.pdf
-.PHONY: nomt
-nomt: typog-nomt.pdf
+.PHONY: test
+test: typog-minimal-test.pdf typog-without-microtype-test.pdf
+
+
+.PHONY: bin
+bin: typog-grep
.PHONY: man
man: typog-grep.1
-.PHONY: cpio
-cpio:
- cd ..; \
- echo $(addprefix typog/,$(SOURCE_FILES)) | \
- cpio -o | \
- gzip > "typog-$$(date +%Y-%m-%d).cpio.gz"
+export TEMPORARY_DIRECTORY
+
+
+.PHONY: dist
+dist:
+ $(eval TEMPORARY_DIRECTORY := $(shell mktemp -d))
+ trap '$(RM) -r $(TEMPORARY_DIRECTORY); exit 1' HUP INT QUIT TERM; $(MAKE) __dist
+ $(RM) -r $(TEMPORARY_DIRECTORY)
+
+
+.PHONY: __dist
+__dist: LATEX_FLAGS += -interaction=batchmode
+__dist: $(DOCUMENTATION_FILES)
+ test -d '$(TEMPORARY_DIRECTORY)'
+ test -w '$(TEMPORARY_DIRECTORY)'
+ mkdir $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)
+ cp $(SOURCE_FILES) $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)
+ mkdir $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)/docs
+ cp $(DOCUMENTATION_FILES) $(TEMPORARY_DIRECTORY)/$(PROJECT_NAME)/docs
+ tar czf $(PROJECT_NAME).tar.gz -C $(TEMPORARY_DIRECTORY) $(PROJECT_NAME)
-.PHONY: tar
-tar:
- cd ..; \
- tar czf "typog-$$(date +%Y-%m-%d).tar.gz" $(addprefix typog/,$(SOURCE_FILES))
+.PHONY: distcheck
+distcheck: LATEX_FLAGS += -interaction=batchmode
+distcheck: dist
+ $(eval TEMPORARY_DIRECTORY := $(shell mktemp -d))
+ test -d '$(TEMPORARY_DIRECTORY)'
+ test -w '$(TEMPORARY_DIRECTORY)'
+ tar xzf $(PROJECT_NAME).tar.gz -C $(TEMPORARY_DIRECTORY)
+ $(MAKE) --directory=$(TEMPORARY_DIRECTORY)/$(PROJECT_NAME) LATEX_FLAGS='$(LATEX_FLAGS)' all
+ $(RM) -r $(TEMPORARY_DIRECTORY)
+ @printf '\n\ndistcheck passed.\n'
.PHONY: clean
clean:
- $(RM) ./*.1 ./*.aux ./*.brf ./*.glg ./*.glo ./*.gls
- $(RM) ./*.hd ./*.idx ./*.ilg ./*.ind ./*.loe ./*.lof ./*.log ./*.lot
- $(RM) ./*.mps ./*.mpx ./*.out ./*.pdf ./*.toc
+ $(RM) ./*.1 ./*.aux ./*.brf ./*.dvi ./*.glg ./*.glo ./*.gls
+ $(RM) ./*.hd ./*.idx ./*.ilg ./*.ind ./*.info ./*.loe ./*.lof ./*.log ./*.lot
+ $(RM) ./*.mps ./*.mpx ./*.out ./*.pdf ./*.pl.in ./*.toc
$(RM) mptextmp.* mpxerr.tex
$(RM) README README.html RELEASE-HOWTO RELEASE-HOWTO.html
+ $(RM) typog-grep typog-grep.version.sed
+ $(RM) $(PROJECT_NAME).tar.gz
.PHONY: mostlyclean
mostlyclean: clean
+ $(RM) ./*.texi
.PHONY: maintainer-clean
maintainer-clean: mostlyclean
- $(RM) ./*.ist ./*.mp ./*.pl ./*.pod ./*.sed ./*.sty ./*.tex
+ $(RM) ./*.gst ./*.ist ./*.mp ./*.pl ./*.pod ./*.sed ./*.sty ./*.tex
.PHONY: tool-check
tool-check:
- @printf '*** LATEX = "%s"\n' '$(LATEX)'
- $(LATEX) --version
+ @printf '*** LATEX_PROPER = "%s"\n' '$(LATEX_PROPER)'
+ $(LATEX_PROPER) --version
+ @printf '\n\n*** BibTeX\n'
+ bibtex --version
@printf '\n\n*** MAKEINDEX = "%s"\n' '$(MAKEINDEX)'
- $(MAKEINDEX) < /dev/null
+ $(MAKEINDEX) < /dev/null
@printf '\n\n*** METAPOST = "%s"\n' '$(METAPOST)'
$(METAPOST) --version
@printf '\n*** POD2MAN = "%s"\n' '$(POD2MAN)'
$(POD2MAN) --help > /dev/null
@printf '\n\n*** POD2TEXI = "%s"\n' '$(POD2TEXI)'
$(POD2TEXI) --version
- @printf '\n\nTool check passed.\n'
-
-
-.PHONY: spell-check
-spell-check:
- @sed -e '\#<DISABLE-SPELL-CHECK/>#d' \
- -e '\#<DISABLE-SPELL-CHECK>#,\#</DISABLE-SPELL-CHECK>#d' < typog.dtx | \
- sed -e 's/^ *%%*//' | \
- sed -e 's/\\-//g' -e 's/|[^|]*|/ /g' | \
- $(SPELLCHECK) $(SPELLCHECK_FLAGS) list | \
- sort | uniq | fmt | sed -e 's/ / /g'
+ @printf '\n\ntool check passed.\n'
.PHONY: update-docs
@@ -151,10 +180,16 @@ Selected Phony Targets
----------------------
all: Make everything there is to make. This is the .DEFAULT_GOAL.
+bin: Build typog-grep (which is not a binary, but executable).
+
clean: Remove some products.
-cpio: In the parent directory create a cpio(1) archive of the
- project source files whose name is time-stamped.
+dist: Create a tar file of the project source files and the PDF
+ documentation files. The archive is in the form and has a
+ name that CTAN prefers.
+
+distcheck: Create a tar file of the project source files, unpack it in
+ a different location and build all targets.
doc: Build "typog.pdf" the Typog documentation.
@@ -170,12 +205,14 @@ pdf: Build doc: and gauge:.
sty: Only extract "typog.sty" from "typog.dtx". This
operation requires LaTeX (-> $(LATEX)) and nothing else.
-tar: In the parent directory create a tar(1) file of the project
- source files whose name is time-stamped.
+test: Run some tests.
tool-check: Check whether some of the required tools to build the
project are available.
+update-docs: Copy the documentation files into the "docs"
+ sub-directory.
+
Selected Implicit Rules
-----------------------
@@ -206,6 +243,7 @@ README: Convert "README.html" to plain text. Requires w3m(1).
endef
+
.PHONY: help
help:
$(info $(HELP_SCREEN))
@@ -217,10 +255,10 @@ help:
define MAKE_INDEX_AND_GLOSSARY
-sed -e '/@/d' -e 's/{\\ttfamily /{\\ttfamily\\hskip0pt\\relax /' < $*.idx > ,$*.idx; \
+sed -e '/@/d' -e 's/{\\ttfamily /{\\ttfamily\\hskip0pt\\relax /' < $*.idx > ,$*.idx; \
mv ,$*.idx $*.idx; \
-$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s typog.ist -t $*.ilg -o $*.ind $*.idx; \
-$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s gglo.ist -t $*.glg -o $*.gls $*.glo
+$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s $*.ist -t $*.ilg -o $*.ind $*.idx; \
+$(MAKEINDEX) $(MAKEINDEX_FLAGS) -s $*.gst -t $*.glg -o $*.gls $*.glo
endef
define GREP_LATEX_WARNINGS
@@ -253,7 +291,13 @@ endef
%-1.mps %-2.mps %-3.mps %-4.mps: %.mp
- $(METAPOST) -s 'outputtemplate="%j-%c.mps"' $(METAPOST_FLAGS) $<
+ $(METAPOST) -s 'outputtemplate="%j-%c.mps"' $(METAPOST_FLAGS) $< || { \
+ printf '=== $*.log ===\n'; \
+ cat $*.log; \
+ printf '\n\n=== mpxerr.log ===\n'; \
+ cat mpxerr.log; \
+ false; \
+ } 1>&2
%.1: %.pod
@@ -263,6 +307,15 @@ endef
%.1.pdf: %.1
$(GROFF) $(GROFF_FLAGS) ./$< > $@
+%.texi: %.pod
+ $(POD2TEXI) $(POD2TEXI_FLAGS) --output=$@ ./$<
+
+%.info: %.texi
+ $(MAKEINFO) $(MAKEINFO_FLAGS) --output=$@ $<
+
+%.info.pdf: %.texi
+ $(MAKEINFO) $(MAKEINFO_FLAGS) --pdf --output=$@ $<
+
%.tex: %.pod | teximan2latex.sed
$(POD2TEXI) $(POD2TEXI_FLAGS) ./$< | sed -f teximan2latex.sed > $@
@@ -276,12 +329,11 @@ endef
crooked-paragraphs.mp slant-angle.mp smooth-parshapes.mp title.mp \
teximan2latex.sed \
-typog-grep.pl typog-grep typog-grep.pod \
-typog.sty typog.ist typog-example.tex typog-nomt.tex: \
+typog-grep.pl.in typog-grep.pod \
+typog.sty typog.ist typog-example.tex \
+typog-minimal-test.tex typog-without-microtype-test.tex: \
typog.ins typog.dtx
$(LATEX) $(LATEX_FLAGS) $<
- chmod 755 typog-grep.pl
- ln -sf typog-grep.pl typog-grep
crooked-paragraphs-1.mps crooked-paragraphs-2.mps \
@@ -300,3 +352,14 @@ typog.pdf: typog.dtx \
smooth-parshapes-1.mps smooth-parshapes-2.mps smooth-parshapes-3.mps \
typog-grep.tex \
| typog.sty
+
+
+typog-grep.pl: typog-grep.pl.in typog.sty
+ sed -ne 's,$(SED_VERSION_REGEXP),s#@DATE@#\2#g\ns#@RELEASE@#\3#g\ns#@TITLE@#\4#g,p' \
+ < typog.sty \
+ > typog-grep.version.sed
+ sed -f typog-grep.version.sed < $< > $@
+ chmod 755 $@
+
+typog-grep: typog-grep.pl
+ ln -sf $< $@
diff --git a/Master/texmf-dist/source/latex/typog/typog.dtx b/Master/texmf-dist/source/latex/typog/typog.dtx
index 0f2176206a2..3037f502fad 100644
--- a/Master/texmf-dist/source/latex/typog/typog.dtx
+++ b/Master/texmf-dist/source/latex/typog/typog.dtx
@@ -3,11 +3,11 @@
% Copyright (C) 2024 by Ch. L. Spiel
%
% This work may be distributed and/or modified under the conditions
-% of the LaTeX Project Public License, either version 1.3 of this
+% of the LaTeX Project Public License, either version 1.3c of this
% license or (at your option) any later version. The latest version
% of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
+% https://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2003/12/01 or later.
%
% \fi
@@ -26,7 +26,6 @@
\PassOptionsToClass{a4paper}{article}
\PassOptionsToPackage{hyperfootnotes=false}{hyperref}
-\PassOptionsToPackage{charter, scale=1.06}{newtxmath}
\PassOptionsToPackage{dvipsnames}{xcolor}
\usepackage{amsmath}
@@ -42,40 +41,43 @@
\usepackage{fullwidth}
\usepackage{hypdoc}
\usepackage{hyphenat}
-\usepackage[shrink=10, stretch=10]{microtype}
+\usepackage[kerning=true, shrink=10, stretch=10, verbose=true]{microtype}
\usepackage{multirow}
\usepackage{needspace}
-\usepackage{placeins}
+\usepackage[section]{placeins}
\usepackage{ragged2e}
\usepackage{setspace}
\usepackage{sidecap}
\usepackage{tabularx}
\usepackage{tcolorbox}
\usepackage{titlesec}\renewcommand*{\bottomtitlespace}{.15\textheight}%nobottomtitles*
-\usepackage[debug, raise*=.05em]{typog}
+\usepackage[debug, raise*=.05em,
+ uppercaselabelitemadjustments={.0125em, .075em, -.1em, .0125em},
+ lowercaselabelitemadjustments={-.075em, 0pt, -.2em, -.075em}]{typog}
\usepackage{xcolor}
\usepackage[default, lining, proportional, regular, semibold]{sourceserifpro}
\usepackage[lining, proportional, regular, semibold]{sourcesanspro}
\usepackage[lining, regular]{sourcecodepro}
-\usepackage[xcharter]{newtxmath}
+\usepackage[scaled=1.08, uprightscript, xcharter]{newtxmath}
\setbaselineskip{12.5pt}
+
\makeatletter
\def\@get@fontclan#1-#2\relax{#1}
\newcommand*{\fontclan}{\expandafter\@get@fontclan\f@family\relax}
\makeatother
-\newcommand*{\proportionalliningfigures}{\fontfamily{\fontclan-LF}\selectfont}
-\newcommand*{\proportionaloldstylefigures}{\fontfamily{\fontclan-OsF}\selectfont}
-\newcommand*{\tabularliningfigures}{\fontfamily{\fontclan-TLF}\selectfont}
-\newcommand*{\tabularoldstylefigures}{\fontfamily{\fontclan-TOsF}\selectfont}
+\DeclareRobustCommand{\proportionalliningfigures}{\fontfamily{\fontclan-LF}\selectfont}
+\DeclareRobustCommand{\proportionaloldstylefigures}{\fontfamily{\fontclan-OsF}\selectfont}
+\DeclareRobustCommand{\tabularliningfigures}{\fontfamily{\fontclan-TLF}\selectfont}
+\DeclareRobustCommand{\tabularoldstylefigures}{\fontfamily{\fontclan-TOsF}\selectfont}
-\newcommand*{\textdenominator}[1]{{\fontfamily{\fontclan-Dnom}\selectfont #1}}
-\newcommand*{\textinferior}[1]{{\fontfamily{\fontclan-Inf}\selectfont #1}}
-\newcommand*{\textnumerator}[1]{{\fontfamily{\fontclan-Numr}\selectfont #1}}
-\newcommand*{\textsuperior}[1]{{\fontfamily{\fontclan-Sup}\selectfont #1}}
+\DeclareRobustCommand{\textdenominator}[1]{{\fontfamily{\fontclan-Dnom}\selectfont #1}}
+\DeclareRobustCommand{\textinferior}[1]{{\fontfamily{\fontclan-Inf}\selectfont #1}}
+\DeclareRobustCommand{\textnumerator}[1]{{\fontfamily{\fontclan-Numr}\selectfont #1}}
+\DeclareRobustCommand{\textsuperior}[1]{{\fontfamily{\fontclan-Sup}\selectfont #1}}
\newcommand*{\nativetextfraction}[2]
{\mbox{\textnumerator{#1}\textfractionsolidus\textdenominator{#2}}}
@@ -85,21 +87,23 @@
\newenvironment*{tabfigures}
{\edef\rmdefault{\fontclan-T\sourceserifpro@figurestyle}\rm\ignorespaces}
{\ignorespacesafterend}
-
-\newcommand*{\elseries}{\def\mdseries@rm{el}\def\mdseries@sf{el}\def\mdseries@tt{el}}
-\newcommand*{\textel}[1]{{\elseries\textmd{#1}}}
-\newcommand*{\lseries}{\def\mdseries@rm{l}\def\mdseries@sf{l}\def\mdseries@tt{l}}
-\newcommand*{\textl}[1]{{\lseries\textmd{#1}}}
-%%--\newcommand*{\mdseries}{\def\mdseries@rm{m}\def\mdseries@sf{m}\def\mdseries@tt{m}}
-%%--\newcommand*{\textmd}[1]{{\mdseries\textmd{#1}}}
-\newcommand*{\sbseries}{\def\bfseries@rm{sb}\def\bfseries@sf{sb}\def\bfseries@tt{sb}}
-\newcommand*{\textsb}[1]{{\sbseries\textbf{#1}}}
-\newcommand*{\bseries}{\def\bfseries@rm{b}\def\bfseries@sf{b}\def\bfseries@tt{b}}
-\newcommand*{\textb}[1]{{\bseries\textbf{#1}}}
-\newcommand*{\ebseries}{\def\bfseries@rm{k}\def\bfseries@sf{eb}\def\bfseries@tt{k}}
-\newcommand*{\texteb}[1]{{\ebseries\textbf{#1}}}
\makeatother
+\DeclareRobustCommand{\elseries}{\fontseries{el}\selectfont}
+\DeclareTextFontCommand{\textel}{\elseries}
+\DeclareRobustCommand{\lseries}{\fontseries{l}\selectfont}
+\DeclareTextFontCommand{\textl}{\lseries}
+%%--\DeclareRobustCommand{\mdseries}{\fontseries{m}\selectfont}
+%%--\DeclareTextFontCommand{\textmd}{\mdseries}
+\DeclareRobustCommand{\sbseries}{\fontseries{sb}\selectfont}
+\DeclareTextFontCommand{\textsb}{\sbseries}
+\DeclareRobustCommand{\bseries}{\fontseries{b}\selectfont}
+\DeclareTextFontCommand{\textb}{\bseries}
+\DeclareRobustCommand{\ebseries}{\fontseries{eb}\selectfont}
+\DeclareTextFontCommand{\texteb}{\ebseries}
+\DeclareRobustCommand{\ubseries}{\fontseries{k}\selectfont}
+\DeclareTextFontCommand{\textub}{\ubseries}
+
\usepackage{cleveref}
@@ -112,7 +116,7 @@
citecolor = blue,
colorlinks = true,
linkcolor = blue,
- linktocpage = false,
+ linktocpage = true,
pdfauthor={Dr. Christoph L. Spiel},
pdfcreationdate={\pdffiledate},
pdfkeywords={LaTeX, typography, ligature, italic-correction, paragraph justification, baselineskip, sloppy, ragged},
@@ -124,9 +128,94 @@
}
+\SetExtraKerning[context=drop-left-sidebearing, name=source-code-normal, unit=space]
+ {font={T1/SourceCodePro-LF/m/n/44, T1/SourceCodePro-TLF/m/n/44}}
+ {
+ 1={-150,},
+ 2={-120,},
+ 3={-120,},
+ 4={-40,},
+ A={-100,},
+ B={-170,}
+ }
+
+\newlength{\sectiontocindent}
+\newlength{\sectionnumberwidth}
+\newlength{\subsectiontocindent}
+\newlength{\subsectionnumberwidth}
+\newlength{\subsubsectiontocindent}
+\newlength{\subsubsectionnumberwidth}
+
+\setlength{\sectiontocindent}{0pt}
+\setlength{\sectionnumberwidth}{40pt}
+\setlength{\subsectiontocindent}{40pt}
+\setlength{\subsectionnumberwidth}{25pt}
+\setlength{\subsubsectiontocindent}{65pt}
+\setlength{\subsubsectionnumberwidth}{30pt}
+
\makeatletter
-\renewcommand*{\@dotsep}{10000} % suppress leaders
-\patchcmd{\@dottedtocline}{\normalfont}{\bfseries}{\relax}{\PatchingFailed}
+\renewcommand*{\l@section}[2]
+ {\ifnum \c@tocdepth >\z@
+ \addpenalty\@secpenalty
+ \addvspace{1.0em \@plus\p@}%
+ \setlength{\@tempdima}{\sectionnumberwidth}%
+ \begingroup
+ \def\numberline##1{\hb@xt@\@tempdima{%
+ \tt\lseries
+ \fontsize{44}{0}\selectfont
+ \microtypecontext{kerning=drop-left-sidebearing}%
+ \iffalse\raisebox{-30pt}[0pt][0pt]{\rule{0.1pt}{40pt}}\fi
+ \textcolor{customred3}{##1}%
+ \hfil}}%
+ \parindent \z@
+ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode
+ \advance\leftskip\@tempdima
+ \hskip -\leftskip
+ \bfseries
+ \iffalse
+ \nobreak\hfil
+ \nobreak\hb@xt@\@pnumwidth{\hss #2\kern-\p@\kern\p@}%
+ \else
+ {\sffamily\large #1}\quad
+ {#2}\hfil\hbox{}
+ \fi
+ \par
+ \endgroup
+ \fi}
+
+\renewcommand*{\@dottedtocline}[5]
+ {\ifnum #1>\c@tocdepth
+ \else
+ \vskip \z@ \@plus.2\p@
+ \begingroup
+ \leftskip #2\relax
+ \rightskip \@tocrmarg
+ \parfillskip -\rightskip
+ \parindent #2\relax\@afterindenttrue
+ \interlinepenalty\@M
+ \leavevmode
+ \@tempdima #3\relax
+ \advance\leftskip \@tempdima
+ \null\nobreak
+ \hskip -\leftskip
+ {#4}\nobreak
+ \iffalse
+ \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill
+ \nobreak\hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5\kern-\p@\kern\p@}%
+ \else
+ \hbox{\quad\normalfont\bfseries #5}\nobreak\hfill\hbox{}%
+ \fi
+ \par
+ \endgroup
+ \fi}
+
+\renewcommand*{\l@subsection}{\@dottedtocline{2}{\subsectiontocindent}{\subsectionnumberwidth}}
+\renewcommand*{\l@subsubsection}{\@dottedtocline{3}{\subsubsectiontocindent}{\subsubsectionnumberwidth}}
+\newrobustcmd*{\tocsquashedsubsections}
+ {\def\l@subsection{\@dottedtocline{2}{0pt}{\subsectionnumberwidth}}%
+ \def\l@subsubsection{\@dottedtocline{3}{0pt}{\subsubsectionnumberwidth}}}
\makeatother
@@ -171,7 +260,6 @@
leftmargin=!
}
-
\SetEnumitemKey{nestedinspecialsection}{
leftmargin=10pt
}
@@ -191,13 +279,15 @@
\fancypagestyle{pagenumberonly}{
+ \fancyhf{}
\fancyhead[L]{}
\fancyhead[R]{\thepage}
}
-\pagestyle{fancy}
-\fancyhf{}
-\fancyhead[L]{\rightmark}
-\fancyhead[R]{\thepage}
+\fancypagestyle{fancy}{
+ \fancyhf{}
+ \fancyhead[L]{\rightmark}
+ \fancyhead[R]{\thepage}
+}
\newcommand*{\resetfancyhead}
{\fancyhead[L]{\textsf{\textsc{\textls[20]{\nouppercase\rightmark}}}}}
@@ -239,8 +329,8 @@
\setlength{\skip\footins}{25pt}
-\setlength{\overfullrule}{3pt}
-\renewcommand*{\sidecaptionsep}{16pt}
+\setlength{\overfullrule}{0pt}
+\renewcommand*{\sidecaptionsep}{25pt}
@@ -272,13 +362,17 @@
\newcommand*{\citenum}[1]{\@nameuse{b@#1}}
\makeatother
-\def\code#1{\texttt{#1}}
+\renewcommand*{\code}[1]{\texttt{#1}}
+
+\newcommand*{\codelineindicator}{\mbox{\small$\mathscr{l}$}}
\newrobustcmd*{\command}[1]{\mbox{\textbf{#1}}}
+\newcommand*{\detoxindex}[1]{\index{\detokenize{#1}}}
+
\newcommand*{\doublequotes}[1]{\doubleguillemetright\kern-.03333em #1\doubleguillemetleft}
-\newcommand*{\dumpmacro}[1]{\texttt{\detokenize\expandafter{#1}}}
+\newcommand*{\dumpmacro}[1]{\texttt{\detokenize\expandafter{#1}\unskip}}
\newcommand*{\filesystem}[1]{\mbox{\textit{#1\/}}}
@@ -287,6 +381,12 @@
\newcommand*{\foreignphrase}[1]{\textsl{#1}}
+\makeatletter
+\newcommand*{\formatdimen}{\@ifstar{\@typog@rem@pt}{\@typog@strip@pt}}
+\newcommand*{\@typog@rem@pt}[1]{\dimen0=\dimexpr#1\relax\strip@pt\dimen0\,pt}
+\newcommand*{\@typog@strip@pt}[1]{\expandafter\strip@pt#1\relax\,pt}
+\makeatother
+
\newcommand*{\formatskip}[3]{#1\genfrac{}{}{0pt}{}{{+}#2}{{-}#3}}
\makeatletter
@@ -294,19 +394,46 @@
\renewcommand*{\fps@table}{htbp}
\makeatother
+\apptocmd{\GlossaryParms}
+ {\RaggedRight\normalsize}
+ {\relax}
+ {\AppendingFailed}
+
+\let\oldhdpindex=\hdpindex
+\renewcommand*{\hdpindex}[2]{\textbf{\oldhdpindex{#1}{#2}}}
+
+\let\oldhdclindex=\hdclindex
+\renewcommand*{\hdclindex}[2]
+ {\ifstrequal{#2}{code}
+ {\oldhdclindex{#1}{codeidx}}
+ {\oldhdclindex{#1}{#2}}}
+
\newcommand*{\hollowrectangle}[2]
{\setlength{\fboxrule}{.5pt}%
\setlength{\fboxsep}{0pt}%
\framebox{\rule{#1}{0pt}\rule{0pt}{#2}}}
\newcommand*{\hollowsquare}[1]{\hollowrectangle{#1}{#1}}
+\apptocmd{\IndexParms}
+ {\RaggedRight\small}
+ {\relax}
+ {\AppendingFailed}
\makeatletter
+\ExplSyntaxOn
\apptocmd{\index@prologue}
- {\marginnote{In the Index page ranges are stuck together with
- \hyperref[syn:figuredash]{\cs{figuredash*}}.}}
+ {\legacy_if:nTF {codeline@index}
+ {We\space prefix\space all\space references\space
+ to\space code\space lines\space with~\singlequotes{\codelineindicator}.}
+ {}}
{\relax}
{\AppendingFailed}
+
+\newcommand*{\linenumberdecoration}
+ {\legacy_if:nTF {codeline@index}
+ {\codelineindicator}
+ {}}
+\ExplSyntaxOff
\makeatother
\newcommand*{\logmacro}[1]
@@ -348,11 +475,27 @@
\AtBeginDocument{\setlength{\emreference}{\fontdimen6\font}}
\newrobustcmd*{\milliem}[1]
{\ifdim #1=0pt
- #1%
+ 0\,pt%
\else
\nativetextfraction{\the\numexpr\dimexpr (#1) * 1000 / \emreference}{1000}\:em%
\fi}
+\let\originalmulticols=\multicols
+\let\endoriginalmulticols=\endmulticols
+\RenewDocumentEnvironment{multicols}{m o o}
+ {\ifnum #1=1
+ \IfNoValueTF{#2}{\relax}{#2}%
+ \else
+ \IfNoValueTF{#2}
+ {\originalmulticols{#1}}
+ {\originalmulticols{#1}[#2]}%
+ \fi}
+ {\ifnum #1=1
+ \relax
+ \else
+ \endoriginalmulticols
+ \fi}
+
\newcommand*{\needtocspace}[1][3]
{\addtocontents{toc}{\protect\needspace{#1\baselineskip}}}
@@ -455,7 +598,7 @@
\newenvironment*{specialcodesection}[1]
{\Needspace{4\baselineskip}%
\begin{tcolorbox}[colback=white, colframe=\markercolor,
- bottomrule=0pt, leftrule=5pt, rightrule=0pt, toprule=0pt]
+ bottomrule=.5pt, leftrule=5pt, rightrule=.5pt, toprule=.5pt]
\sf\typogsetupsf
\begin{list}
{\specialcodesectionheading{#1}}
@@ -498,11 +641,37 @@
\begin{minipage}{\floatcaptionwidth}}
{\end{minipage}}
\newcommand*{\tablenotemark}[1]{\smash{\textsuperscript{#1}}}
+\newcommand*{\tablenotesymbol}[1]{% Bringhurst's "traditional order" (p69) from 1 to 6
+ \ifcase#1\relax
+ #1% 0
+ \or \textasteriskcentered% 1
+ \or \textdagger% 2
+ \or \textdaggerdbl% 3
+ \or \textsection% 4
+ \or \textbardbl% 5
+ \or \textsection% 6
+ \or \textasteriskcentered\textasteriskcentered%7
+ \or \textdagger\textdagger%8
+ \or \textdaggerdbl\textdaggerdbl%9
+ \else
+ #1
+ \fi
+}
\newcommand*{\termparbox}[1]{\parbox[t]{\linewidth}{#1\bottomstrut}}
\newcommand*{\thousandsseparator}{\mbox{,}}
+\ExplSyntaxOn
+\newcommand*{\titlecase}[1]{\text_titlecase:n {#1}}
+\ExplSyntaxOff
+
+\newcommand*{\toccontinuesonnextpage}
+ {\addtocontents{toc}{\par
+ \bigskip
+ \hfill\textit{Table of Contents continued on next page.}\par
+ \protect\clearpage}}
+
\newcommand*{\topstrut}{\rule{0pt}{1.3em}}
\newcommand*{\typogsetuprm}
@@ -514,11 +683,16 @@
{\typogsetup{raise*=.06667em,
raiseguillemets=.05em}}
+\newcommand*{\unmarkedfntext}[1]
+ {{\def\thefootnote{}\footnote{#1}%
+ \addtocounter{footnote}{-1}}}
+
+\newcommand*{\userman}[1]{\textbf{\hyperpage{#1}}}%%-- https://github.com/ho-tex/hypdoc/issues/11
+
\newcommand*{\visualpar}{\textcolor{\markercolor}{\P}\linebreak[1]\enspace}
\newenvironment*{whittyquote}
{\begin{flushright}
- \renewcommand*{\propername}[1]{\mbox{##1}}%
\sf\typogsetupsf}
{\end{flushright}}
@@ -532,7 +706,6 @@
\end{minipage}
\end{maxipage}}
-
\NewDocElement[macrolike = true,
idxtype = dim.,
idxgroup = dimensions,
@@ -547,6 +720,20 @@
{EnumItemKey}{enumitemkey}
\pretocmd{\DescribeEnumItemKey}{\needspace{25pt}}{\relax}{\PrependingFailed}
+\NewDocElement[macrolike = true,
+ idxtype = skip,
+ idxgroup = \LaTeX{} length (skip),
+ printtype = \textit{skip}]
+ {LaTeXSkip}{lskip}
+\pretocmd{\DescribeLaTeXSkip}{\needspace{25pt}}{\relax}{\PrependingFailed}
+
+\NewDocElement[macrolike = true,
+ idxtype = counter,
+ idxgroup = \protect\TeX{} counters,
+ printtype = \textit{counter}]
+ {TeXCounter}{tcounter}
+\pretocmd{\DescribeTeXCounter}{\needspace{25pt}}{\relax}{\PrependingFailed}
+
\hyphenation{% https://hyphenateit.com/en-us
Double-guillemet-left
@@ -585,6 +772,8 @@
line-width
loose-ness
loose-spacing
+ lower-case-adjust-label-items
+ lower-case-label-item-adjustments
make-at-letter
make-at-other
mar-gin-al
@@ -612,6 +801,7 @@
set-leading
set-leading-percentage
short-inter-text
+ shrink-limits
single-guillemet-left
single-guillemet-right
single-quotes
@@ -625,6 +815,7 @@
smooth-ragged-right-shape-septuplet
smooth-ragged-right-shape-triplet
space-skip
+ stretch-limits
text-italics-correction
tight-spacing
tracing-boxes
@@ -632,6 +823,8 @@
tracking-tt-spacing
typog-get
typog-setup
+ upper-case-adjust-label-items
+ upper-case-label-item-adjustments
vtie-bot
vtie-bot-disp
vtie-bot-disp-par
@@ -648,29 +841,52 @@
\begin{document}
\typogsetuprm
+ \uppercaseadjustlabelitems{*}
\DocInput{typog.dtx}
\end{document}
%</driver>
%<*index-style>
actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
delim_r "\\figuredash*"
heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
heading_suffix "}\\nopagebreak\n"
headings_flag 1
level '>'
+line_max 65536
quote '!'
%</index-style>
+%<*changes-style>
+actual '='
+delim_0 "\\nobreak\\enspace"
+delim_1 "\\nobreak\\enspace"
+delim_2 "\\nobreak\\enspace"
+heading_prefix "\\pagebreak[3]\\smallskip\n\n{\\sffamily\\bfseries\\large "
+heading_suffix "}\\nopagebreak\n"
+headings_flag 0
+item_x1 "\\efill\n\\subitem "
+item_x2 "\\ "
+keyword "\\glossaryentry"
+level '>'
+line_max 65536
+postamble "\n\\end{theglossary}\n"
+preamble "\\begin{theglossary}\n \\makeatletter\\scan@allowedfalse"
+quote '!'
+%</changes-style>
% \fi
%
%
% \DoNotIndex{\,}
-% \DoNotIndex{\addtolength,\advance,\aftergroup,\allowdisplaybreaks,\arabic}
-% \DoNotIndex{\AtBeginDocument,\autotransfer}
-% \DoNotIndex{\baselineskip}
-% \DoNotIndex{\c,\char,\clubpenalties,\clubpenalty,\count,\cs,\csname}
+% \DoNotIndex{\\}
+% \DoNotIndex{\addtocounter,\addtolength,\advance,\aftergroup,\allowdisplaybreaks,\arabic,\arraystretch}
+% \DoNotIndex{\AfterEndPreamble,\AfterPreamble,\AtBeginDocument,\autotransfer}
+% \DoNotIndex{\baselineskip,\begin,\begingroup,\booltrue,\box}
+% \DoNotIndex{\c,\char,\clist,\clubpenalties,\clubpenalty,\count,\cs,\csname}
% \DoNotIndex{\DeclareRobustCommand,\def,\define@choicekey,\define@key,\detokenize}
% \DoNotIndex{\dim,\dimen,\dimexpr,\discretionary,\displaywidowpenalties,\displaywidowpenalty}
-% \DoNotIndex{\edef,\else,\emergencystretch,\empty,\endcsname}
+% \DoNotIndex{\edef,\else,\emergencystretch,\empty,\end,\endcsname,\endgroup}
% \DoNotIndex{\endlastlineflushrightpar}
% \DoNotIndex{\endlastlineraggedleftpar}
% \DoNotIndex{\endnofontexpand,\endnofontexpansion}
@@ -679,33 +895,37 @@ quote '!'
% \DoNotIndex{\endsmoothraggedrightshapetriplet}
% \DoNotIndex{\endtypoginspect}
% \DoNotIndex{\exhyphenpenalty,\expandafter,\ExplSyntaxOff,\ExplSyntaxOn}
-% \DoNotIndex{\fi,\finalhyphendemerits,\font,\fontdimen,\fp,\fussy,\futurelet}
+% \DoNotIndex{\fi,\finalhyphendemerits,\font,\fontdimen,\forcsvlist,\fp,\fpeval,\fussy,\futurelet}
% \DoNotIndex{\gdef,\global,\glueexpr,\@gobble}
% \DoNotIndex{\guillemotleft,\guillemotright,\guilsinglleft,\guilsinglright}
-% \DoNotIndex{\hbadness,\hfuzz,\hskip,\hspace}
+% \DoNotIndex{\hbadness,\hbox,\hfuzz,\hskip,\hspace,\ht}
% \DoNotIndex{\ignorespaces,\ignorespacesafterend}
-% \DoNotIndex{\if,\IfBooleanT,\IfBooleanTF,\ifcase,\ifdefined,\ifdim,\iffalse,\ifmmode,\ifMT@expansion}
-% \DoNotIndex{\@ifnextchar,\IfNoValueF,\IfNoValueTF,\ifnum}
+% \DoNotIndex{\if,\ifblank,\ifbool,\IfBooleanT,\IfBooleanTF,\ifcase,\ifdefined,\ifdim,\iffalse,\ifmmode}
+% \DoNotIndex{\ifMT@expansion,\@ifnextchar,\IfNoValueF,\IfNoValueTF,\ifnum,\ifodd,\ifstrequal}
% \DoNotIndex{\iftypog@microtype@loadedfalse}
% \DoNotIndex{\iftypog@microtype@preloadedfalse}
-% \DoNotIndex{\ifvmode,\ifx,\ignorespaces,\inputlineno,\int,\interlinepenalty}
+% \DoNotIndex{\ifvmode,\ifx,\ignorespaces,\inputlineno,\int,\interlinepenalty,\itemize}
% \DoNotIndex{\jobname}
% \DoNotIndex{\kern}
-% \DoNotIndex{\l,\lastlinefit,\lastlineflushrightpar,\lastlineraggedleftpar,\leftmargin,\leftskip,\let}
-% \DoNotIndex{\linepenalty,\linewidth,\@listdepth,\looseness,\lsstyle}
-% \DoNotIndex{\@M,\m@th,\mathbin,\mathord,\maxdimen,\message,\microtypecontext,\microtypesetup}
+% \DoNotIndex{\l,\labelitemi,\labelitemii,\labelitemiii,\labelitemiv}
+% \DoNotIndex{\lastlinefit,\lastlineflushrightpar,\lastlineraggedleftpar}
+% \DoNotIndex{\lefthyphenmin,\leftmargin,\leftskip,\let,\letcs}
+% \DoNotIndex{\linepenalty,\linewidth,\@listdepth,\loop,\looseness,\lsstyle}
+% \DoNotIndex{\@M,\m@th,\mathbin,\mathord,\maxdimen,\mbox,\message,\microtypecontext,\microtypesetup}
% \DoNotIndex{\@minus,\mkern,\m@ne,\mspace,\MT@letterspace@,\MT@MT,\muexpr}
-% \DoNotIndex{\@ne,\NeedsTeXFormat,\NewDocumentCommand,\NewDocumentEnvironment,\newcommand,\newenvironment}
-% \DoNotIndex{\newcounter,\newdimen,\newif,\newlength,\newmuskip}
+% \DoNotIndex{\@ne,\NeedsTeXFormat,\newbool,\NewDocumentCommand,\NewDocumentEnvironment}
+% \DoNotIndex{\newcommand,\newenvironment}
+% \DoNotIndex{\newcounter,\newdimen,\newif,\newlength,\newline,\newmuskip}
% \DoNotIndex{\nobreak,\nofontexpand,\nofontexpansion,\nr,\numexpr}
% \DoNotIndex{\or,\optarg}
% \DoNotIndex{\p@,\PackageError,\PackageWarning}
-% \DoNotIndex{\par,\parfillskip,\parindent,\parshape,\pdf@strcmp}
+% \DoNotIndex{\par,\parfillskip,\parindent,\parshape,\patchcmd,\pdf@strcmp}
% \DoNotIndex{\pdfstringdefDisableCommands}
% \DoNotIndex{\penalty,\@plus,\PopPostHook,\postdisplaypenalty,\predisplaypenalty,\prg}
% \DoNotIndex{\pretolerance,\protected,\ProvidesPackage,\PushPostHook}
-% \DoNotIndex{\raisebox,\refstepcounter,\relax,\RenewExpandableDocumentCommand,\RequirePackage,\rightskip}
-% \DoNotIndex{\setcounter,\SetEnumitemKey,\SetExpansion,\setkeys,\setlength,\setstretch}
+% \DoNotIndex{\raisebox,\refstepcounter,\relax,\RenewExpandableDocumentCommand,\repeat,\RequirePackage}
+% \DoNotIndex{\righthyphenmin,\rightskip,\rlap,\romannumeral,\rule}
+% \DoNotIndex{\setbox,\setcounter,\SetEnumitemKey,\SetExpansion,\setkeys,\setlength,\setstretch}
% \DoNotIndex{\showboxbreadth,\showboxdepth,\skip,\sloppy}
% \DoNotIndex{\smoothraggedrightpar}
% \DoNotIndex{\smoothraggedrightshapequintuplet}
@@ -715,9 +935,9 @@ quote '!'
% \DoNotIndex{\textemdash,\textendash,\textsf,\textsl,\texttimes,\textwidth,\the,\times,\tl,\tolerance}
% \DoNotIndex{\tracingnone,\tracingpages,\tracingparagraphs}
% \DoNotIndex{\typeout,\typoginspect,\typoglogo}
-% \DoNotIndex{\unless}
+% \DoNotIndex{\unhbox,\unless}
% \DoNotIndex{\val,\value,\vbadness,\vfuzz}
-% \DoNotIndex{\widowpenalties,\widowpenalty}
+% \DoNotIndex{\wd,\widowpenalties,\widowpenalty}
% \DoNotIndex{\z@,\z@skip}
%
%
@@ -828,7 +1048,8 @@ end
% \footnotesize
% \noindent
% This package is copyright \textcopyright~2024 Ch.~L.~Spiel. It may be distributed
-% and\kernedslash*or modified under the conditions of the \LaTeX{} Project Public License
+% and\kernedslash*or modified under the conditions of the
+% \href{https://www.latex-project.org/lppl.txt}{\LaTeX{} Project Public License}
% \acronym{(LPPL)}, either version~1.3c of this license or --~at your option~-- any later
% version. This work has the \acronym{LPPL} maintenance status
% \doublequotes{author-maintained}.
@@ -836,30 +1057,36 @@ end
%
%
% \clearpage
-% \thispagestyle{pagenumberonly}
-% \tableofcontents
-% \vspace{\fill}
+% \pagestyle{pagenumberonly}
%
+% \unmarkedfntext{The font sample on the title page was generated with the help of \MP{} using
+% \doublequotes{\acronym{URW}~Palladio}%
+% \detoxindex{font>typeface>URW Palladio=\acronym{URW} Palladio|userman}.}
%
-% \thispagestyle{pagenumberonly}
-% \listoftables
-% \phantomsection
-% \addcontentsline{toc}{subsection}{List of Tables}
-% \vspace{\fill}
+% \begin{nofontexpansion}
+% \begin{nocharprotrusion}
+% \tableofcontents
+% \end{nocharprotrusion}
+% \end{nofontexpansion}
%
+% \addtocontents{toc}{%
+% \protect\begin{whittyquote}
+% Hoffentlich wird es nicht so schlimm, wie es schon ist! \\
+% \capitalemdash*~\propername{Karl Valentin}
+% \protect\end{whittyquote}\par}
%
-% \begingroup
-% \footnotesize
-% \singlespacing
-% \noindent
-% The font sample on the title page was generated with the help of \MP{} using
-% \doublequotes{\acronym{URW} Palladio~L}\index{font>URW Palladio L=\acronym{URW} Palladio
-% L}.
-% \endgroup
+% \vspace{\fill}
+%
+% \begin{nofontexpansion}
+% \begin{nocharprotrusion}
+% \listoftables
+% \end{nocharprotrusion}
+% \end{nofontexpansion}
%
%
% \clearpage
% \pagenumbering{arabic}
+% \pagestyle{fancy}
% \section{Introduction}\label{sec:introduction}
%
% \begin{whittyquote}
@@ -892,7 +1119,10 @@ end
% \Cref{sec:latex-hyphenation} expands the hyphenation facilities of \LaTeX.
%
% \Cref{sec:break-ligatures,sec:manual-italic-correction,sec:extra-kerning,sec:raise-characters}
-% deal with vertically positioning glyphs in a more pleasant way.
+% deal with vertically positioning glyphs in a more pleasant way. Also in the realm of
+% vertical alignments is \cref{sec:adjust-label-items} that explains how to height-adjust the
+% labels in |itemize|~lists to perfection whether the items are followed by uppercase or by
+% lowercase letters.
%
% \Cref{sec:align-last-line,sec:fill-last-line} discuss dearly missed macros for better control
% of the last line of a paragraph.
@@ -950,15 +1180,17 @@ end
% \end{tabbing}
% \end{synopsis}
%
-% \index{package options|(}
-% The package \meta{OPTIONs} serve as configuration \meta{key}s, too. This means they can be
-% set with \hyperref[syn:typogsetup]{\code{typogsetup}} and their values can be retrieved with
-% \hyperref[syn:typogget]{\cs{typogget}}. Options that rely on package~\packagename{microtype}
-% are indicated with \doublequotes{\microtyperequiredmarker}.
+% \index{package options|(userman}
+% The package \meta{OPTIONs} also serve as configuration \meta{key}s (unless noted otherwise).
+% This means they can be set with \hyperref[syn:typogsetup]{\code{typogsetup}} and their values
+% can be retrieved with \hyperref[syn:typogget]{\cs{typogget}}. Options that rely on
+% package~\packagename{microtype} are indicated with \doublequotes{\microtyperequiredmarker}.
%
% \begin{typogsetup}{}
% \newcommand*{\indexpackageoption}[1]
-% {\index{package option>#1=\code{#1}}\index{#1=\code{#1}~(option)}\ignorespaces}
+% {\detoxindex{package option>#1=\code{#1}|userman}%
+% \detoxindex{#1=\code{#1}~(option)|userman}%
+% \ignorespaces}
% \begin{description}
% [before={\let\oldmakelabel=\makelabel
% \renewcommand{\makelabel}[1]
@@ -978,17 +1210,44 @@ end
% \item[|debug|, |nodebug|]\label{item:debug}
% \indexpackageoption{debug}
% \indexpackageoption{nodebug}
-% Write package-specific debug information to the log file. Opposite: |nodebug|. The
-% default is not to log debug information.
+% Write some package-specific debug information to the \filesystem{log}~file. Opposite:
+% |nodebug|. The default is not to record debug information.
+%
+% These two options neither can be used with \hyperref[syn:typogsetup]{\code{typogsetup}}
+% nor with \hyperref[syn:typogget]{\cs{typogget}}.
%
% \item[|ligaturekern=|\meta{dim}]\label{item:ligaturekern}
% \indexpackageoption{ligaturekern}
% Set \meta{dim} of the kern that is inserted to split a ligature in
% macro\hyperref[syn:nolig]{\cs{nolig}}. See
-% \cref{sec:break-ligatures}.\shiftedmarginnote{We access the configuration values with
-% \hyperref[syn:typogget]{\cs{typogget}}.} Default
+% \cref{sec:break-ligatures}.\shiftedmarginnote{We access all the (default) configuration
+% values with \hyperref[syn:typogget]{\cs{typogget}}.} Default
% value:~\milliem{\typogget{ligaturekern}}.
%
+% \item[|lowercaselabelitemadjustments=\{|\meta{dim1}, \meta{dim2}, \meta{dim3}, \meta{dim4}|\}|]%
+% \label{item:lowercaselabelitemadjustments}
+% \indexpackageoption{lowercaselabelitemadjustments}
+% \sinceversion{Since v0.4}
+% Vertical shifts \meta{dimN} to apply to \cs{labelitem}\meta{N}, where \meta{N} is the
+% nesting level of the |itemize|~list starting at one. An empty \meta{dimN} is equivalent
+% to~\formatdimen*{0pt}. The adjustments apply to the lowercase setting
+% (\hyperref[syn:lowercaseadjustlabelitems]{\code{\string\lowercaseadjustlabelitems}}).
+% See \cref{sec:adjust-label-items} (in particular subsection~\singlequotes{Setup} and
+% \cref{tab:labelitemadjustvalues} on \cpageref{tab:labelitemadjustvalues}) and also
+% configuration option
+% \hyperref[item:uppercaselabelitemadjustments]{\code{uppercaseadjustlabelitem}}.
+%
+% All four lengths default to~\formatdimen*{0pt}.
+%
+% \begin{important}
+% \slightlysloppy
+% \noindent
+% Configuring \code{lowercaselabelitemadjustments} (or
+% \code{uppercaselabelitemadjustments}) does \emph{not} activate the correction
+% mechanism. Use one of the macros \code{\string\lowercaseadjustlabelitems} or
+% \code{\string\uppercaseadjustlabelitems} for that purpose.
+% \end{important}
+%
% \item[|mathitalicscorrection=|\meta{dim}]\label{item:mathitalicscorrection}
% \indexpackageoption{mathitalicscorrection}
% Italics correction in math mode. See \cref{sec:manual-italic-correction} and also the
@@ -1000,10 +1259,14 @@ end
% \item[|raise*=|\meta{dim}]\label{item:raise}
% \indexpackageoption{raise*}
% Set the length by which selected characters (dash, hyphen, times, and number dash) are
-% raised. Default value:~0pt.
+% raised. Default value:~\formatdimen*{0pt}.
%
% Only the raise amounts for guillemets are unaffected by this option.
%
+% This option neither can be used with \hyperref[syn:typogsetup]{\code{typogsetup}} nor
+% with \hyperref[syn:typogget]{\cs{typogget}}, however, the specific options influenced by
+% it can.
+%
% \item[|raisecapitaldash=|\meta{dim}]\label{item:raisecapitaldash}
% \indexpackageoption{raisecapitaldash}
% Set the length that the \cs{textendash} is raised in
@@ -1093,6 +1356,30 @@ end
% \emph{not} in the document body.
%
% By default this option is unset.
+%
+% \item[|uppercaselabelitemadjustments=\{|\meta{dim1}, \meta{dim2}, \meta{dim3}, \meta{dim4}|\}|]%
+% \label{item:uppercaselabelitemadjustments}
+% \indexpackageoption{uppercaselabelitemadjustments}
+% \sinceversion{Since v0.4}
+% Vertical shifts \meta{dimN} to apply to \cs{labelitem}\meta{N}, where \meta{N} is the
+% nesting level of the |itemize|~list starting at one. An empty \meta{dimN} is equivalent
+% to~\formatdimen*{0pt}. The adjustments apply to the uppercase setting
+% (\hyperref[syn:uppercaseadjustlabelitems]{\code{\string\uppercaseadjustlabelitems}}).
+% See \cref{sec:adjust-label-items} (in particular subsection~\singlequotes{Setup} and
+% \cref{tab:labelitemadjustvalues} on \cpageref{tab:labelitemadjustvalues}) and also
+% configuration option
+% \hyperref[item:lowercaselabelitemadjustments]{\code{lowercaseadjustlabelitem}}.
+%
+% All four lengths default to~\formatdimen*{0pt}.
+%
+% \begin{important}
+% \slightlysloppy
+% \noindent
+% Configuring \code{uppercaselabelitemadjustments} (or
+% \code{lowercaselabelitemadjustments}) does \emph{not} activate the correction
+% mechanism. Use one of the macros \code{\string\uppercaseadjustlabelitems} or
+% \code{\string\lowercaseadjustlabelitems} for that purpose.
+% \end{important}
% \end{description}
% \end{typogsetup}
% \index{package options|)}
@@ -1116,12 +1403,13 @@ end
% issues a \cs{par} at its end. Environments with different name suffixes never close
% with~\cs{par}.
%
-% \bigskip
%
-% \noindent
+% \subsection{Setup and Reconfiguration}\label{sec:setup}
+%
% \DescribeEnv{typogsetup}
-% Configure\index{configuration}\index{setup} the package with the given \meta{keys}. An empty
-% argument of \code{typogsetup} resets all \meta{keys} to their default values.
+% Configure\index{configuration|userman}\index{setup|userman} the package with the given
+% \meta{keys}. An empty argument of \code{typogsetup} resets all \meta{keys} to their default
+% values.
%
% \begin{synopsis}\label{syn:typogsetup}
% \cs{begin}|{typogsetup}|\marg{keys}
@@ -1129,7 +1417,7 @@ end
% \cs{end}|{typogsetup}|
% \end{synopsis}
%
-% The package can be (re-)configured\index{reconfigure} at any point with
+% The package can be (re-)configured\index{reconfigure|userman} at any point with
% \cs{typogsetup}\marg{keys}, or --~for localized changes~-- as
%
% \begin{codeexample}
@@ -1143,6 +1431,12 @@ end
% where \meta{keys} have the same format as the package options described in
% \cref{sec:package-options}.
%
+% \begin{note}
+% Use \code{\string\PassOptionsToPackage\{\meta{keys}\}\{typog\}} to pass \meta{keys} to
+% \packagename{typog} before loading it and \code{\string\typogsetup\{\meta{keys}\}} after
+% \code{\string\usepackage\{typog\}}.
+% \end{note}
+%
% \begin{usecases}
% \cs{typogsetup} can substitute configuring the package at load-time or serve as an
% addition.~\visualpar Using the |typogsetup|~environment allows to fine-tune the parameters
@@ -1154,9 +1448,9 @@ end
%
% \noindent
% \DescribeMacro{\typogget}
-% Sometimes the user needs to access internal configuration values of
-% package~\packagename{typog}. This can be done in a safe way without resorting to code that
-% is bracketed by \cs{makeatletter}/\cs{makeatother} with the help of the following macro.
+% Sometimes the user needs to access configuration values of package~\packagename{typog}. This
+% can be done in a safe way without resorting to code that is bracketed by \cs{makeatletter}
+% and \cs{makeatother} with the help of the following macro.
%
% \begin{synopsis}\label{syn:typogget}
% \cs{typogget}\marg{key}
@@ -1177,15 +1471,47 @@ end
% \> \{\cs{raisebox}\= \{\cs{typogget}\{raisecapitaldash\}\}\{\cs{cdot}\}\}
% \end{codeexample}
%
-% The latter only is useful inside of an \code{itemize}~environment of course.
+% The latter only is useful inside of an \code{itemize}~environment of course. Compare with
+% the solution in \cref{sec:adjust-label-items} offered by \packagename{typog} since v0.4.
% \end{usecase}
%
+% \DescribeMacro{\typoggetnth}
+% \sinceversion{Since v0.4}
+% If a configuration item is associated with a list as
+% \hyperref[item:lowercaselabelitemadjustments]{\code{lowercaselabelitemadjustments}},
+% \hyperref[item:shrinklimits]{\code{shrinklimits}},
+% \hyperref[item:stretchlimits]{\code{stretchlimits}},
+% \hyperref[item:trackingttspacing]{\code{trackingttspacing}}, and
+% \hyperref[item:uppercaselabelitemadjustments]{\code{uppercaselabelitemadjustments}} are, it
+% may be convenient to fetch a particular list element of it.
+%
+% \begin{synopsis}\label{syn:typoggetnth}
+% \cs{typoggetnth}\marg{csname}\marg{key}\marg{index} \\
+% \cs{typoggetnth}\marg{dimen-register}\marg{key}\marg{index}
+% \end{synopsis}
+%
+% Retrieve the configuration value --~which is a comma-separated list~-- that is associated
+% with~\meta{key} and store the item having position~\meta{index} in \meta{dimen-register} or
+% the parameter-less, global macro~\meta{csname}. The destination \meta{dimen-register} may be
+% predefined like, e.\,g., \cs{dimen0} or user-defined. Dimensions can also be stored in a
+% macro by using the \meta{csname}~form of \cs{typoggetnth} but not \foreignphrase{vice versa}.
+%
+% Index into the list either from left-to-right with positive indices starting at~\(1\) up to
+% the length of the list, or from right-to-left with negative indices starting at~\(-1\) down
+% to the negative length.
+%
+% \begin{note}
+% Macro~\cs{typoggetnth} \emph{only} works with \meta{key}s that are associated with a list
+% of values.
+% \end{note}
+%
%
-% \subsection{Information}\label{sec:information}\index{information}
+% \subsection{Information}\label{sec:information}
+% \index{information|userman}
%
% \begin{whittyquote}
% Never forget: The visual output counts; \\
-% it must always be checked, [\dots]. \\
+% it must always be checked, [\dots\itcorr{-4}]. \\
% \marginnote{The em-dash at then end of the quote is height-adjusted with
% \hyperref[syn:capitalemdash]{\cs{capitalemdash*}}.}%
% \capitalemdash*~\propername{Udo Wermuth}~\cite{wermuth:2017a}
@@ -1196,14 +1522,14 @@ end
%
%
% \subsubsection{Font Information}\label{sec:font-information}
-% \index{font>information}
+% \index{font>information|userman}
%
% \DescribeMacro{\fontsizeinfo}
% Capture the font~size\footnote{We use \cs{fontdimen6}, the em-height as the font
-% size.}\index{font>size} and line~spacing\footnote{The line~spacing simply is
-% \cs{baselineskip}.}\index{line spacing} at the point where \cs{fontsizeinfo} \emph{is called}
-% in macro~\meta{cs-name}. Both dimensions are measured in points~(pt) and the results are
-% rounded to tenths.
+% size.}\index{font>size|userman} and line~spacing\footnote{The line~spacing simply is
+% \cs{baselineskip}.}\index{line spacing|userman} at the point where \cs{fontsizeinfo} \emph{is
+% called} in macro~\meta{cs-name}. Both dimensions are measured in points~(pt) and the results
+% are rounded to tenths.
%
% \begin{synopsis}\label{syn:fontsizeinfo}
% \cs{fontsizeinfo}\marg{cs-name}
@@ -1259,9 +1585,8 @@ end
%
% \begin{caution}
% The end-of-trace marker sometimes gets placed too early and the trace seems truncated.
-% \LaTeX{} reliably logs the requested the trace information, but the write operations for
-% trace data and \cs{immediate}\cs{write} which is used to print the end-tag are not
-% synchronized.
+% \LaTeX{} reliably logs the requested trace information, but the write operations for trace
+% data and \cs{immediate}\cs{write} which is used to print the end-tag are not synchronized.
% \end{caution}
%
%
@@ -1287,7 +1612,8 @@ end
%
% \begin{itemize}[noindent]
% \item Any text tool can be used to ferret out the tags. \propername{Emacs} users will find
-% \mbox{\code{(occur \meta{regexp})}} to be useful.
+% \mbox{\code{(occur \meta{regexp})}} to be useful.\shiftedmarginnote{This \code{itemize}
+% list demonstrates vertically adjusted label items (\cref{sec:adjust-label-items}).}
%
% \item As long as the tags are not nested \programname{sed} or \programname{perl}
% extract the information gathered by~|typoginspect|, for example:
@@ -1338,13 +1664,20 @@ end
%
% \item If more trace information is needed just add \cs{tracing\dots} calls right after
% \code{\string\begin\{typoginspect\}}
-% or~\code{\string\begin\{typoginspectpar\}}.\specialsectionendhere
+% or~\code{\string\begin\{typoginspectpar\}}.
+%
+% \item As the overhead of \cs{typoginspect} is relatively low, hairy parts of a document can
+% permanently be furnished with them, for example, the Index.
+%
+% \item Any labeled part can treat their ids to \meta{id}. Think of \cs{caption}s or any
+% theorem-like environment and their associated, unique \cs{label}s.\specialsectionendhere
% \end{itemize}
% \end{tips}
%
%
% \phantomsection
-% \paragraph{Investigating the badness of a paragraph.}\label{sec:investigating-paragraph-badness}\index{paragraph>badness}
+% \paragraph{Investigating the badness of a paragraph.}\label{sec:investigating-paragraph-badness}
+% \index{paragraph>badness|userman}
%
% It is generally unnecessary to determine the \emph{exact} classification of a paragraph's
% badness~\cite[p.~97n]{knuth:1986}, though the curious user can switch on logging of
@@ -1386,9 +1719,9 @@ end
% \begin{enumerate}[beginpenalty=10000, nosep]
% \item The shortfall~\sample{s} and
% \item glue~\sample{a} or~\sample{g}.\footnote{The author is unaware of any descriptions
-% of \code{s}, \code{a}, or~\code{g}. The interested reader is referred to the source
-% code, e.\,g., \filesystem{pdftex.web}; search for \code{print("\textvisiblespace s=")}.
-% In the weaved documentation the first relevant section is~\S1851.}
+% of \sample{s}, \sample{a}, or~\sample{g} and the interested reader is referred to the
+% source code, e.\,g., \filesystem{pdftex.web}; search for \code{print("\textvisiblespace
+% s=")}. In the weaved documentation the first relevant section is~\S1851.}
% \end{enumerate}
% \item The best\footnote{\singlequotes{Best} means the minimum-demerits path in the graph of
% the feasible breakpoints, which has been constructed for the paragraph.} way to get
@@ -1404,13 +1737,13 @@ end
% as parenthesized values (units are thousandths of the current font's~em) like, e.\,g.,
%
% \begin{codeexample}
-% \textbackslash T1/erewhon-LF/m/n/9/@/@ (-13) \dots
+% \textbackslash T1/erewhon-LF/m/n/9/@/@ (-13) \dots
% \end{codeexample}
%
% or
%
% \begin{codeexample}
-% \textbackslash T1/erewhon-LF/m/n/9/@/@/10ls (+7) \dots
+% \textbackslash T1/erewhon-LF/m/n/9/@/@/10ls (+7) \dots
% \end{codeexample}
%
% An \sample{ls} appended to the font name specification indicates that
@@ -1419,7 +1752,9 @@ end
% \end{note}
%
%
-% \paragraph{Investigating page-breaks.}\index{page break}
+% \phantomsection
+% \paragraph{Investigating page-breaks.}
+% \index{page break|userman}
%
% Use \code{\cs{tracingpages}=1} or the \hyperref[syn:typoginspect]{typoginspect}~environment
% to switch on tracing of \TeX's page-break
@@ -1486,7 +1821,7 @@ end
%
%
% \subsection{Hyphenation}\label{sec:latex-hyphenation}
-% \index{hyphenation}
+% \index{hyphenation|userman}
%
% \TeX's and thus \LaTeX's hyphenation algorithm is highly sophisticated, yet the document
% author sometimes lacks convenient macros to solve seemingly trivial typographic tasks. For
@@ -1500,8 +1835,8 @@ end
% \cs{allowhyphenation}
% \end{synopsis}
%
-% Macro~\cs{allowhyphenation}\index{hyphenation>re-enable automatic} re-enables automatic
-% hyphenation after \TeX{} has turned it off, for example, in the innocuous case of a
+% Macro~\cs{allowhyphenation}\index{hyphenation>re-enable automatic|userman} re-enables
+% automatic hyphenation after \TeX{} has turned it off, for example, in the innocuous case of a
% hyphenated compound.
%
% The admittedly simple rules when \TeX{} auto-hyphenates and when not give rise to so many
@@ -1636,7 +1971,7 @@ end
% Whenever using \cs{-}, the short-hand form of \cs{discretionary\{-\}\{\}\{\}}, authors
% writing in a foreign language should reconsider whether it really beats \cs{hyphenation} or
% \cs{babelhyphenation}\footnote{\cs{babelhyphenation} is the multi-lingual extension of \TeX's
-% \cs{hyphenation} and it is defined in package~\packagename{babel}~\cite{package:babel}}. in
+% \cs{hyphenation} and it is defined in package~\packagename{babel}~\cite{package:babel}.} in
% the particular situation. However, sometimes \cs{-} actually \emph{is} the way to go.
%
% Let us assume we mark up proper names with
@@ -1662,6 +1997,12 @@ end
% which are impossible to encode with \cs{hyphenation} or~\cs{babelhyphenation} as these expect
% only letters and dashes as their arguments with spaces separating the words.
%
+% \index{hyphenation>first word|userman}
+% \index{hyphenation>hskip=\cs{hskip}|userman}
+% \TeX{} never hyphenates the initial word in a paragraph and \cs{allowhyphenation} cannot help
+% in this case. Start the paragraph with \cs{hskip~0pt} to enable hyphenation even for the
+% first word.
+%
% \begin{tip}[Typewriter Fonts]
% Sometimes it is desired to get a hyphenatable typewriter font. \LaTeX{} suppresses any
% hyphenation for fonts in \cs{ttfamily} by un-defining their \cs{hyphenchar}s. If these are
@@ -1686,8 +2027,8 @@ end
% \cs{breakpoint*}
% \end{synopsis}
%
-% The starred form inserts an empty discretionary,\index{hyphenation>empty discretionary} which
-% disables automatic hyphenation. The unstarred form inserts an empty discretionary and
+% The starred form inserts an empty discretionary,\index{hyphenation>empty discretionary|userman}
+% which disables automatic hyphenation. The unstarred form inserts an empty discretionary and
% immediately re-enables automatic hyphenation.
%
% The difference between \cs{breakpoint} and the \LaTeX{} macro~\cs{allowbreak} is not only
@@ -1729,7 +2070,7 @@ end
%
%
% \subsection{Disable\kernedslash Break Ligatures}\label{sec:break-ligatures}
-% \index{ligature}
+% \index{ligature|userman}
%
% \DescribeMacro{\nolig*}
% Break a ligature without introducing a hyphenation opportunity.
@@ -1739,8 +2080,8 @@ end
% \end{synopsis}
%
% Inserting \cs{nolig*} disables a ligature at the given point by a kern. Set the size of the
-% kern\index{kerning>ligature} with \hyperref[item:ligaturekern]{|ligaturekern|} or override
-% this value with \meta{kerning} as thousandths of the current font's~em.
+% kern\index{kerning>ligature|userman} with \hyperref[item:ligaturekern]{\code{ligaturekern}} or
+% override this value with \meta{kerning} as thousandths of the current font's~em.
%
% \begin{usecases}
% \cs{nolig*} can be useful in headings, where additional hyphenation points are
@@ -1762,12 +2103,12 @@ end
% introduces a hyphenation opportunity with
% penalty~\hyperref[item:breakpenalty]{|breakpenalty|}.
%
-% \begin{important}[\packagename{hyperref} bookmarks]\index{hyperref=\packagename{hyperref} (package)}
+% \begin{important}[\packagename{hyperref} bookmarks]\index{hyperref=\packagename{hyperref} (package)|userman}
% If a \cs{nolig} --~whether starred or un-starred~-- occurs in an argument that is processed
% with package~\packagename{hyperref} for inclusion into the document's
-% \acronym{PDF}-bookmarks\index{PDF=\acronym{PDF}}\index{bookmark} an additional argument is
-% necessary to parse the macro. This argument either is \cs{relax} or~the empty
-% group~(\code{\{\}}).
+% \acronym{PDF}-bookmarks\index{PDF=\acronym{PDF}|userman}\index{bookmark|userman} an
+% additional argument is necessary to parse the macro. This argument either is \cs{relax}
+% or~the empty group~(\code{\{\}}).
%
% \begin{synopsis}
% \begin{tabbing}
@@ -1944,14 +2285,14 @@ end
%
%
% \subsection{Apply Extra Kerning}\label{sec:extra-kerning}
-% \index{kerning>extra}
+% \index{kerning>extra|userman}
%
% Package \packagename{typog} supplies two sets of macros to kern some of the punctuation
% symbols. One is for forward slashes the other, more extensive one, for hyphens.
%
%
% \subsubsection{Slash}\label{sec:slash-with-kern}
-% \index{kerning>forward slash}
+% \index{kerning>forward slash|userman}
%
% \DescribeMacro{\kernedslash}
% \DescribeMacro{\kernedslash*}
@@ -1980,7 +2321,7 @@ end
%
%
% \subsubsection{Hyphen}\label{sec:hyphen-with-kern}
-% \index{kerning>hyphen}
+% \index{kerning>hyphen|userman}
%
% \DescribeMacro{\kernedhyphen}
% \DescribeMacro{\kernedhyphen*}
@@ -2027,7 +2368,7 @@ end
%
%
% \subsection{Raise Selected Characters}\label{sec:raise-characters}
-% \index{raised character}
+% \index{raised character|userman}
%
% Usually all hyphens and dashes of a font are designed to join lowercase letters. This holds
% also true for most of our \cs{labelitem}\meta{N} markers, bullets, stars, and even fancy
@@ -2036,10 +2377,10 @@ end
% arises if |itemize|~list markers precede an uppercase letter, a lining numeral, or a big
% mathematical operator.
%
-% We introduce a set of macros for the most common cases that allow typsetting these characters
-% at a user definable, adjusted height above the baseline. Users can base their own
-% definitions of raised characters on their associated dimensions.\footnote{Also compare with
-% Ex.~12 in Ref.~\citenum{wermuth:2023} for an attempt to automate vertical alignment.}
+% We introduce a set of macros for the most common cases that typeset these characters at a
+% user definable, adjusted height above the baseline. Users can base their own definitions of
+% raised characters on their associated dimensions.\footnote{Also compare with Ex.~12 in
+% Ref.~\citenum{wermuth:2023} for an attempt to automate vertical alignment.}
%
% \begin{caution}
% The height adjustment disables a font's built-in kerning.
@@ -2051,7 +2392,7 @@ end
%
%
% \subsubsection{Capital Hyphen}\label{sec:capital-hyphen}
-% \index{raised character>hyphen}
+% \index{raised character>hyphen|userman}
%
% \DescribeMacro{\capitalhyphen}
% \DescribeMacro{\capitalhyphen*}
@@ -2081,7 +2422,7 @@ end
%
%
% \subsubsection{Capital Dash}\label{sec:capital-dash}
-% \index{raised character>en-dash}
+% \index{raised character>en-dash|userman}
%
% \DescribeMacro{\capitalendash}
% \DescribeMacro{\capitalendash*}
@@ -2127,7 +2468,7 @@ end
%
%
% \subsubsection{Number Dash (Figure Dash)}\label{sec:number-dash}
-% \index{raised character>number dash}
+% \index{raised character>number dash|userman}
%
% \DescribeMacro{\figuredash}
% \DescribeMacro{\figuredash*}
@@ -2152,49 +2493,63 @@ end
% The actual amount the en-dash gets raised in \cs{figuredash} is determined by
% \hyperref[item:raisefiguredash]{|raisefiguredash|}.
%
-% Values of .05em to .1em are typical for fonts that need this kind of correction and~.1em is a
-% good starting point. \Cref{tab:raisefiguredash} summarizes some findings.
+% Values of .05\,em to .1\,em are typical for fonts that need this kind of correction
+% and~.1\,em is a good starting point. \Cref{tab:raisefiguredash} summarizes some findings.
%
% \begin{table}
% \centering
% \caption[Suggested raise amounts for \cs{figuredash}]%
-% {Suggested values for raising the en-dash between lining numerals of some selected
-% fonts.}
+% {Suggested values for raising \cs{figuredash}, which actually is an en-dash,
+% between lining numerals of some selected fonts in multiples of~1\,em.}
% \label{tab:raisefiguredash}
%
+% \newcommand*{\fbbmark}{\tablenotemark{\tablenotesymbol{1}}}
+%
% \begin{tabfigures}
-% \begin{tabular}{@{}l>{\RaggedRight}p{20em}@{}}
+% \begin{tabularx}{\linewidth}{@{}>{\RaggedRight}Xl@{}}
% \toprule
-% Raise & Font Name \\
-% em & \\
+% Font & Raise \\
% \midrule
-% 0 & Alegreya\index{font>Alegreya}, Arvo\index{font>Arvo},
-% Bitter\index{font>Bitter}, Clara\index{font>Clara},
-% \acronym{EB}~Garamond\index{font>EB Garamond=\acronym{EB} Garamond},
-% Gentium\index{font>Gentium},
-% Ibarra Real Nova\index{font>Ibarra Real Nova},
-% \acronym{Inria}~Serif\index{font>Inria Serif=\acronym{Inria} Serif},
-% Libertine\index{font>Libertine}, Libertinus\index{font>Libertinus},
-% Merriweather\index{font>Merriweather},
-% \acronym{PT}~Serif\index{font>PT Serif=\acronym{PT} Serif},
-% Roboto Slab\index{font>Roboto Slab}, Spectral\index{font>Spectral},
-% \acronym{STIX}\index{font>STIX=\acronym{STIX}}, and many more \\
-% .05 & fbb\index{font>fbb}, Source Serif Pro\index{font>Source Serif Pro} \\
-% .0667 & Libre Baskerville\index{font>Libre Baskerville},
-% Crimson Pro\index{font>Crimson Pro},
-% Erewhon\index{font>Erewhon}, Droid Serif\index{font>Droid Serif} \\
-% .1 & \acronym{GFS}~Artemisia\index{font>GFS Artemisia=\acronym{GFS} Artemisia},
-% Libre Caslon\index{font>Libre Caslon},
-% Coelacanth\index{font>Coelacanth}, Crimson Pro\index{font>Crimson Pro},
-% Crimson Text\index{font>Crimson Text},
-% \TeX{} Gyre~Pagella\index{font>TeX Gyre Pagella=\TeX{} Gyre Pagella},
-% Quattrocento\index{font>},
-% \acronym{TX}~Fonts\index{font>TX Fonts=\acronym{TX} Fonts},
-% \acronym{ADF}~Venturis\index{font>ADF Venturis=\acronym{ADF} Venturis},
-% and many more \\
+% Alegreya\detoxindex{font>typeface>Alegreya|userman}, Arvo\detoxindex{font>typeface>Arvo|userman},
+% Bitter\detoxindex{font>typeface>Bitter|userman}, Clara\detoxindex{font>typeface>Clara|userman},
+% \acronym{EB}~Garamond\detoxindex{font>typeface>EB Garamond=\acronym{EB} Garamond|userman},
+% Gentium\detoxindex{font>typeface>Gentium|userman},
+% Ibarra Real Nova\detoxindex{font>typeface>Ibarra Real Nova|userman},
+% \acronym{Inria}~Serif\detoxindex{font>typeface>Inria Serif=\acronym{Inria} Serif|userman},
+% Libertine\detoxindex{font>typeface>Libertine|userman},
+% Libertinus\detoxindex{font>typeface>Libertinus Serif|userman},
+% Merriweather\detoxindex{font>typeface>Merriweather|userman},
+% \acronym{PT}~Serif\detoxindex{font>typeface>PT Serif=\acronym{PT} Serif|userman},
+% Roboto Slab\detoxindex{font>typeface>Roboto Slab|userman},
+% Spectral\detoxindex{font>typeface>Spectral|userman},
+% \acronym{STIX}\detoxindex{font>typeface>STIX=\acronym{STIX}|userman}, and many more &
+% .0 \\
+% fbb\fbbmark\detoxindex{font>typeface>fbb|userman},
+% Source Serif Pro\detoxindex{font>typeface>Source Serif Pro|userman} &
+% .05 \\
+% Libre Baskerville\detoxindex{font>typeface>Libre Baskerville|userman},
+% Crimson Pro\detoxindex{font>typeface>Crimson Pro|userman},
+% Erewhon\detoxindex{font>typeface>Erewhon|userman},
+% Droid Serif\detoxindex{font>typeface>Droid Serif|userman} &
+% .0667 \\
+% \acronym{GFS}~Artemisia\detoxindex{font>typeface>GFS Artemisia=\acronym{GFS} Artemisia|userman},
+% Libre Caslon\detoxindex{font>typeface>Libre Caslon|userman},
+% Coelacanth\detoxindex{font>typeface>Coelacanth|userman},
+% Crimson Pro\detoxindex{font>typeface>Crimson Pro|userman},
+% Crimson Text\detoxindex{font>typeface>Crimson Text|userman},
+% \TeX{} Gyre~Pagella\detoxindex{font>typeface>TeX Gyre Pagella=\TeX{} Gyre Pagella|userman},
+% Quattrocento\detoxindex{font>typeface>Quattrocento|userman},
+% \acronym{TX}~Fonts\detoxindex{font>typeface>TX Fonts=\acronym{TX} Fonts|userman},
+% \acronym{ADF}~Venturis\detoxindex{font>typeface>ADF Venturis=\acronym{ADF} Venturis|userman},
+% and many more &
+% .1 \\
% \bottomrule
-% \end{tabular}
+% \end{tabularx}
% \end{tabfigures}
+%
+% \begin{tablenotes}
+% \fbbmark\enspace Free Bembo.
+% \end{tablenotes}
% \end{table}
%
% Other macros may be redefined with \cs{figuredash} for a consistent appearance of the copy,
@@ -2210,7 +2565,7 @@ end
%
% \subsubsection[Multiplication Sign]%
% {Multiplication Sign -- Times~\sample{\texttimes}}\label{sec:mult-sign}
-% \index{raised character>multiplication sign}
+% \index{raised character>multiplication sign|userman}
%
% \DescribeMacro{\capitaltimes}
% The \cs{capitaltimes}~macro is a variation of the
@@ -2232,17 +2587,19 @@ end
%
%
% \subsubsection{Guillemets}\label{sec:guillemets}
-% \index{raised character>guillemets}
+% \index{raised character>guillemets|userman}
%
% Another possible typographic problem this package addresses is that both sets --~single and
% double quotes~-- of guillemets may suffer from a too small distance to the baseline.
%
% For the implementation \packagename{typog} relies on the T1\footnote{Font
-% encoding~T1\index{font>encoding} can be forced via \cs{usepackage}|[T1]\{fontenc\}| in the
-% document preamble.}~font encoding not on package~\packagename{babel}.
+% encoding~T1\detoxindex{font>encoding|userman} can be forced via
+% \cs{usepackage}|[T1]\{fontenc\}| in the document preamble.}~font encoding not on
+% package~\packagename{babel}.
%
%
% \paragraph{Lowercase Versions.}
+%
% \DescribeMacro{\singleguillemetleft}
% \DescribeMacro{\singleguillemetright}
% \DescribeMacro{\doubleguillemetleft}
@@ -2280,33 +2637,34 @@ end
% or lining numerals is \cs{Singleguillemetleft} and \cs{Singleguillemetright} and
% \cs{Doubleguillemetleft} and \cs{doubleguillemetright}. Mnemonic: These macros start with an
% uppercase letter. Their height above the baseline is adjusted with
-% \hyperref[item:raisecapitalguillemets]{|raisecapitalguillemets|}. Values of .025em to .075em
-% are typical for fonts that need this kind of correction. \Cref{tab:raiseguillemets}
+% \hyperref[item:raisecapitalguillemets]{|raisecapitalguillemets|}. Values of .025\,em to
+% .075\,em are typical for fonts that need this kind of correction. \Cref{tab:raiseguillemets}
% summarizes some findings.
%
% \begin{table}
% \centering
% \caption[Suggested raise amounts for guillemets]%
-% {Suggested values for raising guillemets of some selected fonts.}
+% {Suggested values for raising guillemets of some selected fonts in multiples
+% of~1\,em.}
% \label{tab:raiseguillemets}
%
% \begin{tabfigures}
-% \begin{tabular}{@{}cc>{\RaggedRight}p{20em}@{}}
+% \def~{\hphantom{0}}
+% \begin{tabular}{@{}>{\RaggedRight}p{.5\textwidth}cc@{}}
% \toprule
-% \multicolumn{2}{@{}c}{Raise} & Font Name \\
-% Lowercase & Uppercase & \\
-% em & em & \\
+% Font & Uppercase & Lowercase \\
% \midrule
-% 0 & .05\hphantom{00} &
-% \acronym{EB}~Garamond\index{font>EB Garamond=\acronym{EB} Garamond},
-% Libertinus\index{font>Libertinus},
-% Merriweather\index{font>Merriweather}, and many more \\
-% .025 & .05\hphantom{00} & Gentium\index{font>Gentium} \\
-% .04\hphantom{0} & .0667 &
-% \acronym{ADF}~Baskervald\index{font>ADF Baskervald=\acronym{ADF} Baskervald} \\
-% .05\hphantom{0} & .0625 &
-% \acronym{GFS}~Artemisia\index{font>GFS Artemisia=\acronym{GFS} Artemisia},
-% \acronym{GFS}~Didot\index{font>GFS Didot=\acronym{GFS} Didot} \\
+% \acronym{EB} Garamond\detoxindex{font>typeface>EB Garamond=\acronym{EB} Garamond|userman},
+% Libertinus\index{font>typeface>Libertinus Serif|userman},
+% Merriweather\index{font>typeface>Merriweather|userman}, and many more &
+% .05~~ & .0~~ \\
+% Gentium\index{font>typeface>Gentium|userman} &
+% .05~~ & .025 \\
+% \acronym{GFS} Artemisia\detoxindex{font>typeface>GFS Artemisia=\acronym{GFS} Artemisia|userman},
+% \acronym{GFS} Didot\detoxindex{font>typeface>GFS Didot=\acronym{GFS} Didot|userman} &
+% .0625 & .05~ \\
+% \acronym{ADF} Baskervald\index{font>typeface>ADF Baskervald=\acronym{ADF} Baskervald|userman} &
+% .0667 & .04~ \\
% \bottomrule
% \end{tabular}
% \end{tabfigures}
@@ -2322,7 +2680,8 @@ end
% \cs{let}\cs{sq}=\cs{singlequotes}
% \end{codeexample}
%
-% and similar definitions for \cs{Singlequotes}, \cs{doublequotes}, and~\cs{Doublequotes}.
+% \noindent
+% and similar definitions for \cs{Singlequotes}, \cs{doublequotes}, and \cs{Doublequotes}.
%
% Users working according to the French typesetting conventions will want to add extra
% spacing between the guillemets and the macro argument already in these macros.
@@ -2334,7 +2693,7 @@ end
%
%
% \paragraph{Interaction with package~\packagename{csquotes}.}
-% \index{csquotes=\packagename{csquotes} (package)}
+% \index{csquotes=\packagename{csquotes} (package)|userman}
%
% The users of package~\packagename{csquotes}
% can hook up the guillemets as defined by \packagename{typog}
@@ -2367,21 +2726,374 @@ end
% \end{futuredirection}
%
%
+% \subsection[Vertically Adjust Label Items]
+% {Vertically Adjust Label Items of
+% Environment \code{itemize}}\label{sec:adjust-label-items}
+% \index{label items|userman}
+%
+% \begin{whittyquote}
+% Perfection of planned layout \\
+% is archieved only by institutions \\
+% on the point of collapse. \\
+% \capitalemdash*~\propername{Cyril Northcote Parkinson}
+% \end{whittyquote}
+%
+% \noindent
+% The symbols that \LaTeX{} uses to distinguish the items of |itemize|~lists do not always
+% align well in the vertical direction with the following text. Sometimes the label is too
+% low, especially if followed by an uppercase (initial) letter. In rare occasions the label is
+% placed too far above the baseline. If any label has been taken from a math-font vertical
+% alignment with the text font is almost purely accidental.\footnote{The exception being
+% mathematics typeset as text via package~\packagename{mathastext}~\cite{package:mathastext}.}
+%
+% \hangindent=2\parindent
+% \hangafter=-3
+% \noindent
+% \DescribeMacro{\uppercaseadjustlabelitems}
+% \DescribeMacro{\lowercaseadjustlabelitems}
+% \DescribeMacro{\noadjustlabelitems}
+% \sinceversion{All three since v0.4}
+% Package~\packagename{typog} lets the user vertically align the \code{itemize}~labels for
+% subsequent uppercase or lowercase letters, where the designations~\singlequotes{uppercase}
+% and \singlequotes{lowercase} are just names for two four-tuples of lengths (technically:
+% |dimen|s) to shift the labels up or down.
+%
+% \begin{synopsis}
+% \label{syn:lowercaseadjustlabelitems}
+% \label{syn:noadjustlabelitems}
+% \label{syn:uppercaseadjustlabelitems}
+% \cs{uppercaseadjustlabelitems}\marg{levels-to-adjust} \\
+% \cs{lowercaseadjustlabelitems}\marg{levels-to-adjust} \\
+% \cs{noadjustlabelitems}\marg{levels-to-adjust}
+% \end{synopsis}
+%
+% Apply uppercase adjustment, lowercase adjustment or no adjustment to the labels in
+% |itemize|~environments at the \meta{levels-to-adjust}. The adjustment values themselves,
+% this is the vertical shifts are configured with
+% options~\hyperref[item:uppercaselabelitemadjustments]{\code{uppercaselabelitemadjustments}}
+% and~\hyperref[item:lowercaselabelitemadjustments]{\code{lowercaselabelitemadjustments}}.
+% They are doubly font dependent: on the one hand the font where the label itself comes from
+% and on the other hand the font of the copy.
+%
+% The argument \meta{levels-to-adjust} is a --~possibly empty~-- comma separated list of the
+% levels the respective adjustments are to be applied to. The levels themselves are given as
+% \emph{decimal} numbers, this is, 1, 2, 3, 4 or the special value~\sample{*} which stands for
+% all four levels. An empty argument list also has a special meaning. Used within any
+% \code{itemize}~environment it automatically applies the adjustment to exactly this level.
+%
+% \begin{example}
+% \begin{typogsetup}{uppercaselabelitemadjustments={.1em}}
+% With the flexible syntax the following settings are possible.
+%
+% \renewcommand*{\labelitemi}{{\small$\rhd$}}%
+% \begin{itemize}\uppercaseadjustlabelitems{}
+% \item Correct all |itemize| labels for uppercase letters.
+%
+% \begin{codeexample}
+% \cs{uppercaseadjustlabelitems}\{*\}
+% \end{codeexample}
+%
+% \item Adjust nesting levels~1, 2, and~3 for uppercase letters and level~4 for lowercase.
+%
+% \begin{codeexample}
+% \cs{lowercaseadjustlabelitems}\{4\} \\
+% \cs{uppercaseadjustlabelitems}\{2,3,1\}
+% \end{codeexample}
+%
+% \item Within an |itemize|~environment just turn off any correction for this level whatever
+% it may be.
+%
+% \begin{codeexample}
+% \cs{begin}\{itemize\} \\
+% \cs{noadjustlabelitems}\{\} \\
+% \cs{item} \dots \\
+% \cs{end}\{itemize\}
+% \end{codeexample}
+%
+% \item Override \cs{labelitemi} with a right-pointing triangle and adjust its vertical
+% position inside of a \code{typogsetup}~environment.
+%
+% \begin{codeexample}
+% \cs{begin}\=\{typogsetup\} \\
+% \>\{uppercaselabelitemadjustments=\{.1em\}\} \\
+% 12\=34567890 \kill
+% \>\cs{renewcommand*}\{\cs{labelitemi}\}\{\{\cs{small}\$\cs{rhd}\$\}\} \\
+% \>\cs{begin}\{itemize\} \\
+% \>\cs{uppercaseadjustlabelitems}\{\} \\
+% \>\cs{item} \dots \\
+% \>\cs{end}\{itemize\} \\
+% \cs{end}\{typogsetup\}
+% \end{codeexample}
+% \end{itemize}
+%
+% The observant reader will have noticed that the itemized list in this emphasized section
+% uses the code of the last example.
+% \end{typogsetup}
+% \end{example}
+%
+%
+% \paragraph{Setup.}
+%
+% To assist the user in finding the desired adjustments of the labels of \packagename{typog}
+% provides macros that help setting up
+% \hyperref[item:lowercaselabelitemadjustments]{\code{lowercaselabelitemadjustments}} and
+% \hyperref[item:uppercaselabelitemadjustments]{\code{uppercaselabelitemadjustments}}. Their
+% intended uses are in the draft phase of a document or in non-printed sections of the text.
+%
+% The macros assume a \singlequotes{correct} height that they derive from the measured height
+% of a sample text scaled by a user-defined factor, which defaults
+% to~\nativetextfraction{1}{2}.\footnote{The default factor of~.5 hearkens back to
+% \propername{Strizver's} suggestion that \doublequotes{[b]ullets should be centered on either
+% the cap~height or x-height of the neighboring text, \dots.}~\cite[p.~220]{strizver:2014}.}
+% The then correct height gets indicated by a thin horizontal line parallel to the baseline.
+% Thus, at sufficiently high magnifications it is possible to judge whether a label gets
+% typeset too high or too low with respect to this reference line.
+%
+% \begin{note}
+% The macros use the actual height of a given sample~text. So, a lowercase~sample should not
+% contain any letters with ascenders.
+%
+% Swashes whether upper- or lowercase always need special attention.
+% \end{note}
+%
+% \DescribeMacro{\typogadjuststairs}
+% \sinceversion{Since v0.4}
+% To get a quick overview how the four \code{itemize}~labels align vertically
+% \cs{typogadjuststairs} draws them at user-defined steps, typically
+% \nativetextfraction{1}{4}\,pt, \nativetextfraction{1}{3}\,pt, or
+% \nativetextfraction{1}{2}\,pt. It ignores any existing adjustments and in that way can be
+% utilized as a first configuration step or, for a small \meta{step-size} and a high
+% \meta{number-of-steps}, for an easy refinement.
+%
+% \begin{synopsis}
+% \begin{tabbing}
+% \label{syn:typogadjuststairs}
+% \cs{typogadjuststairs}\=[\meta{scale-factor}=.5] \\
+% \>\marg{step-size}\marg{number-of-steps} \\
+% \>\marg{sample}
+% \end{tabbing}
+% \end{synopsis}
+%
+% Generate stairs of \meta{number-of-steps} vertically shifted label items; use the next odd
+% number, if \meta{number-of-steps} is even. Draw a reference hairline at \meta{scale-factor}
+% times the height of \meta{sample}, where \meta{scale-factor} defaults to~.5. The stairs
+% start at a vertical shift of
+% \begin{gather*}
+% -\frac{\text{\meta{number-of-steps}} - 1}{2} \times \text{\meta{step-size}} \\
+% \intertext{and repeat up}
+% \frac{\text{\meta{number-of-steps}} - 1}{2} \times \text{\meta{step-size}}.
+% \end{gather*}
+%
+% \noindent
+% The central step --~which is always surrounded by a bit more space~-- shows the neutral
+% alignment, this is~0\,pt. \cs{typogadjuststairs} never prints the contents of \meta{sample}.
+%
+% \begin{example}
+% Play ball!
+%
+% \begin{center}
+% \typogadjuststairs{.25pt}{9}{ABC}
+% \end{center}
+%
+% This is the result of \code{\string\typogadjuststairs\{.25pt\}\{9\}\{ABC\}} with the
+% document's definitions of \cs{labelitem}\meta{N}. The fifth label~item in each line is the
+% uncorrected one.
+% \end{example}
+%
+% \hangindent=2\parindent
+% \hangafter=-3
+% \noindent
+% \DescribeMacro{\typoguppercaseadjustcheck}
+% \DescribeMacro{\typoglowercaseadjustcheck}
+% \sinceversion{Both since v0.4}
+% For a quick and easy check how the four label items vertically align \emph{as configured} use
+% \code{\string\typoguppercaseadjustcheck} and \code{\string\typoglowercaseadjustcheck}.
+% Experienced users with a keen eye for type can apply these macros even in the initial setup.
+% An accurate determination of \code{uppercaselabelitemadjustments} and
+% \code{lowercaselabelitemadjustments} is preferably done at a high magnification (400\% to
+% 600\% on a 100\,dpi screen) with a representative sample of initial letters.
+%
+% \begin{synopsis}
+% \label{syn:typoguppercaseadjustcheck}
+% \label{syn:typoglowercaseadjustcheck}
+% \cs{typoguppercaseadjustcheck}[\meta{scale-factor}=.5]\marg{sample} \\
+% \cs{typoglowercaseadjustcheck}[\meta{scale-factor}=.5]\marg{sample}
+% \end{synopsis}
+%
+% Typeset all four label items adjusted for uppercase or for lowercase with an indicator line
+% at \meta{scale-factor} times the \meta{sample}'s actual height. The default
+% \meta{scale-factor} is~.5. Both macros refer to the currently configured values for the
+% uppercase or lowercase adjustments but they are independent of any settings done with
+% \cs{uppercaseadjustlabelitems}, \cs{lowercaseadjustlabelitems}, or \cs{noadjustlabelitems}.
+% Again, \meta{sample} does not get printed.
+%
+% \begin{example}
+% Uppercase check with \code{\string\typoguppercaseadjustcheck\{ABCXYZ\}}:
+%
+% \centering
+% ABGH\typoguppercaseadjustcheck{ABCXYZ}QWYZ,\enspace
+% 0123\typoguppercaseadjustcheck{ABCXYZ}4567
+%
+% \justifying
+% \noindent
+% and similarly for lowercase: \code{\string\typoglowercaseadjustcheck\{acexyz\}}:
+%
+% \centering
+% ace\typoglowercaseadjustcheck{acexyz}mno,\enspace
+% bdf\typoglowercaseadjustcheck{acexyz}gjy,\enspace
+% {\proportionaloldstylefigures 0123\typoglowercaseadjustcheck{acexyz}4567,}
+%
+% \justifying
+% \noindent
+% where we have bracketed the macro calls with selected uppercase and lowercase letters, or
+% suitable figures.
+% \end{example}
+%
+% In \Cref{tab:labelitemadjustvalues} on \cpageref{tab:labelitemadjustvalues} we collected some
+% suggestions for adjustment values in the \emph{default} case when the label items are not
+% redefined by the user and expand like
+%
+% \begin{center}
+% \def\arraystretch{1}
+% \begin{tabular}{@{}l@{\enspace\(\vdash\)\enspace}l@{}}
+% \cs{labelitemi} & \dumpmacro{\labelitemi}, \\
+% \cs{labelitemii} & \dumpmacro{\labelitemii}, \\
+% \cs{labelitemiii} & \dumpmacro{\labelitemiii}, and \\
+% \cs{labelitemiv} & \dumpmacro{\labelitemiv}.
+% \end{tabular}
+% \end{center}
+%
+% \noindent
+% They display as \sample{\labelitemi}, \sample{\labelitemii}, \sample{\labelitemiii}, and
+% \sample{\labelitemiv}, respectively.
+%
+% \begin{table}
+% \centering
+% \caption[Label item adjustment suggestions]%
+% {Some suggested values for the vertical adjustments of label items. The table
+% assumes that the default definitions (of class~\packagename{article}) for
+% \cs{labelitem}\meta{N} are in effect. The \code{itemize}-list levels~\code{i},
+% \code{ii}, \code{iii} and~\code{iv} are referred to with \(N = 1, 2, 3, 4\). All
+% lengths are given as printer points~(pt) and refer to a document font size of
+% \formatdimen*{10pt}.}
+% \label{tab:labelitemadjustvalues}
+%
+% \newcommand*{\etbbmark}{\tablenotemark{\tablenotesymbol{1}}}
+% \newcommand*{\xchartermark}{\tablenotemark{\tablenotesymbol{2}}}
+% \newcommand*{\kpmark}{\tablenotemark{\tablenotesymbol{3}}}
+% \newcommand*{\palladiomark}{\tablenotemark{\tablenotesymbol{4}}}
+% \newcommand*{\utopiamark}{\tablenotemark{\tablenotesymbol{5}}}
+%
+% \begin{tabfigures}
+% \def~{\hphantom{0}}
+% \def\mc#1{#1~~~}
+% \noindent
+% \makebox[0pt]{%
+% \begin{tabular}{@{}l*{4}{r}@{\qquad}*{4}{r}@{}}
+% \toprule
+% Font Name &
+% \multicolumn{4}{c}{Uppercase Adjustments} & \multicolumn{4}{c@{}}{Lowercase Adjustments} \\
+% {} &
+% \mc{1} & \mc{2} & \mc{3} & \mc{4} &
+% \mc{1} & \mc{2} & \mc{3} & \mc{4} \\
+% \midrule
+% \acronym{ADF} Accanthis\detoxindex{font>typeface>ADF Venturis=\acronym{ADF} Accanthis|userman} &
+% .5~~ & 1.5~~ & \textminus1.5~~ & 1.125 &
+% \textminus.75~ & .25~ & \textminus2.75~ & \textminus.125 \\
+% \acronym{ADF} Venturis\detoxindex{font>typeface>ADF Venturis=\acronym{ADF} Venturis|userman} &
+% .0~~ & 1.0~~ & .75~ & 1.0~~ &
+% \textminus.75~ & .0~~ & \textminus.25~ & .0~~ \\
+% \acronym{CM} Roman\detoxindex{font>typeface>CM Roman=\acronym{CM} Roman|userman} &
+% 1.0~~ & .75~ & 1.0~~ & 1.0~~ &
+% \textminus.25~ & \textminus.5~~ & \textminus.25~ & \textminus.25~ \\
+% Domitian\detoxindex{font>typeface>Domitian|userman} &
+% .25~ & 1.0~~ & .75~ & 1.0~~ &
+% \textminus1.0~~ & .0~~ & \textminus.325 & \textminus.25~ \\
+% Cochineal\detoxindex{font>typeface>Cochineal|userman} &
+% 1.0~~ & 1.0~~ & 1.0~~ & 1.0~~ &
+% \textminus.125 & \textminus.125 & \textminus.125 & \textminus.125 \\
+% \acronym{EB} Garamond\detoxindex{font>typeface>EB Garamond=\acronym{EB} Garamond|userman} &
+% .0~~ & 1.25~ & \textminus.875 & 1.325 &
+% \textminus1.5~~ & .0~~ & \textminus2.0~~ & 0.125 \\
+% etbb\etbbmark\detoxindex{font>typeface>etbb|userman} &
+% .25~ & 1.0~~ & 1.125 & .5~~ &
+% \textminus1.0~~ & \textminus.0~~ & \textminus.0~~ & \textminus.5~~ \\
+% Extended Charter\xchartermark\detoxindex{font>typeface>Extended Charter|userman} &
+% \textminus.25~ & 1.0~~ & 1.75 & .125 &
+% \textminus1.125 & .0~~ & .875 & \textminus.875 \\
+% Gentium\detoxindex{font>typeface>Gentium|userman} &
+% .0~~ & .75~ & .0~~ & .0~~ &
+% \textminus.5~~ & \textminus.25~ & \textminus.75~ & \textminus1.0~~ \\
+% \acronym{GFS} Bodoni\detoxindex{font>typeface>GFS Bodoni=\acronym{GFS} Bodoni|userman} &
+% \textminus.25~ & .625 & 1.0~~ & 1.125 &
+% \textminus1.25~ & \textminus.625 & \textminus.5~~ & \textminus.25~ \\
+% \acronym{GFS} Didot\detoxindex{font>typeface>GFS Didot=\acronym{GFS} Didot|userman} &
+% \textminus1.5~~ & .75~ & 1.0~~ & 1.25~ &
+% \textminus2.75~ & \textminus.25~ & \textminus.25~ & .25~ \\
+% \acronym{IBM} Plex Serif\detoxindex{font>typeface>IBM Plex Serif=\acronym{IBM} Plex Serif|userman} &
+% .5~~ & .5~~ & \textminus1.325 & .5~~ &
+% \textminus.25~ & \textminus.25~ & \textminus2.25~ & \textminus.25~ \\
+% \acronym{KP} Serif\kpmark\detoxindex{font>typeface>KP Serif=\acronym{KP} Serif|userman} &
+% .0~~ & 1.0~~ & 1.25~ & .75~ &
+% \textminus1.0~~ & .0~~ & .0~~ & \textminus.5~~ \\
+% Libertinus Serif\detoxindex{font>typeface>Libertinus Serif|userman} &
+% 1.0~~ & .75~ & 1.125 & .75~ &
+% .0~~ & \textminus.325 & .0~~ & \textminus.25~ \\
+% \acronym{ML} Modern\detoxindex{font>typeface>ML Modern=\acronym{ML} Modern|userman} &
+% 1.25~ & .75~ & 1.0~~ & .125 &
+% .0~~ & \textminus.5~~ & \textminus.25~ & \textminus.125 \\
+% Source Serif Pro\detoxindex{font>typeface>Source Serif Pro|userman} &
+% .125 & .75~ & \textminus1.0~~ & .125 &
+% \textminus.75~ & .0~~ & \textminus2.0~~ & \textminus.75~ \\
+% Spectral\detoxindex{font>typeface>Spectral|userman} &
+% .625 & .625 & \textminus1.5~~ & .625 &
+% \textminus.25~ & \textminus.25~ & \textminus2.5~~ & \textminus.25~ \\
+% \acronym{STIX}\detoxindex{font>typeface>STIX=\acronym{STIX}|userman} &
+% 1.0~~ & 1.0~~ & .75~ & 1.0~~ &
+% .0~~ & .0~~ & .0~~ & .0~~ \\
+% \acronym{URW} Palladio\palladiomark\detoxindex{font>typeface>URW Palladio=\acronym{URW} Palladio|userman} &
+% .25~ & 1.125 & 1.0~~ & 1.0~~ &
+% \textminus1.0~~ & \textminus.125 & \textminus.125 & \textminus.125 \\
+% Utopia Regular\utopiamark\detoxindex{font>typeface>Utopia Regular|userman} &
+% .0~~ & 1.0~~ & .75~ & 1.0~~ &
+% \textminus.75~ & .0~~ & \textminus.25~ & .0~~ \\
+% \bottomrule
+% \end{tabular}}
+% \end{tabfigures}
+%
+% \begin{tablenotes}
+% \etbbmark\enspace \propername{Edward Tufte}'s Bembo in package~\packagename{ETbb}. Note
+% the two initial capital letters in the filename.
+%
+% \xchartermark\enspace Found in package \packagename{XCharter}. Again note the two
+% initial capitals in the filename.
+%
+% \kpmark\enspace In package \packagename{kpfonts}.
+%
+% \palladiomark\enspace Contained in package~\packagename{mathpazo}.
+%
+% \utopiamark\enspace Utopia is available through package~\packagename{fourier} or
+% package~\packagename{mathdesign}. In the latter case pass option~\code{adobe-utopia} to
+% the package.
+% \end{tablenotes}
+% \end{table}
+%
+%
% \subsection[Align Last Line]
% {Align Last Line of a Paragraph}\label{sec:align-last-line}
-% \index{paragraph>align last line}
+% \index{paragraph>align last line|userman}
%
% The usual algorithms of \LaTeX{} typeset the last line of a paragraph flush with the left
% margin unless |center|, |raggedleft| or |Centering|, |FlushRight|
% (package~\packagename{ragged2e}~\cite{package:ragged2e}) are in effect. For an instructive
% discussion consult Ch.~17, \doublequotes{Paragraph End}, of Ref.~\citenum{eijkhout:2007}.
-% The following environments allow to adjust the last lines of paragraphs in different ways.
+% The following environments adjust the last lines of paragraphs in different ways.
%
% \DescribeEnv{lastlineraggedleftpar}
% \DescribeEnv{lastlineflushrightpar}
-% The environment |lastlineraggedleftpar|\index{paragraph>align last line>flush right} adjusts
-% the various skips such that the last lines of the paragraphs gets typeset flush with the
-% right margin.
+% The environment \code{lastlineraggedleftpar}\index{paragraph>align last line>flush right|userman}
+% adjusts the various skips such that the last lines of the paragraphs gets typeset flush with
+% the right margin.
%
% \begin{synopsis}\label{syn:lastlineraggedleftpar}\label{syn:lastlineflushrightpar}
% \cs{begin}|{lastlineraggedleftpar}| \\
@@ -2393,8 +3105,9 @@ end
% The name |lastlineflushrightpar| is an alias for~\code{lastlineraggedleftpar}.
%
% \DescribeEnv{lastlinecenteredpar}
-% Center\index{paragraph>align last line>centered} the last lines of the paragraphs enclosed by
-% this environment.\footnote{Also compare the approach taken in Ref.~\citenum{wermuth:2018}.}
+% Center\index{paragraph>align last line>centered|userman} the last lines of the paragraphs
+% enclosed by this environment.\footnote{Also compare the approach taken in
+% Ref.~\citenum{wermuth:2018}.}
%
% \begin{synopsis}\label{syn:lastlinecenteredpar}
% \cs{begin}|{lastlinecenteredpar}| \\
@@ -2412,7 +3125,7 @@ end
% \needtocspace
% \subsection[Fill Last Line]
% {Fill Last Line of a Paragraph}\label{sec:fill-last-line}
-% \index{paragraph>fill last line}
+% \index{paragraph>fill last line|userman}
%
% The problem of when and how to \singlequotes{fill} the last line of a paragraph is quite
% intricate. We first define the problem then we proceed to general purpose functions and we
@@ -2421,7 +3134,7 @@ end
%
% \subsubsection{Problem Definition}
%
-% Depending on the value of \cs{parindent}, either zero or nonzero, there may be the desire to
+% Depending on the value of \cs{parindent}, either zero or nonzero, there may be the need to
% control the length of the last line of a paragraph.
%
% \iffalse
@@ -2562,7 +3275,7 @@ end
% \includegraphics{crooked-paragraphs-3.mps}
% \end{center}
% \end{minipage}\footnotetext{Package~\packagename{parskip} defines \cs{parskip}
-% as \mbox{6pt plus 2pt} for a base size of~10pt.}
+% as \mbox{6\,pt plus 2\,pt} for a base size of~10\,pt.}
%
% \medskip
% \begin{minipage}{\linewidth}
@@ -2576,7 +3289,7 @@ end
%
% The suggestions for the gap-width vary from two~em to twice the width of a
% \singlequotes{typical} \cs{parindent}\footnote{% For example, \LaTeX's class
-% \packagename{article} uses a \cs{parindent} of~25pt.} for the gap~\cite{carlisle:1996}.
+% \packagename{article} uses a \cs{parindent} of~25\,pt.} for the gap~\cite{carlisle:1996}.
% \end{enumerate}
%
% \begin{tip}
@@ -2598,9 +3311,10 @@ end
% them should have certain advantageous properties.
%
% \begin{itemize}
-% \item Technically, the paragraphs need to contain enough glue (see
-% e.\,g.~\cref{sec:sloppy-paragraphs}) to achieve a low badness such that the desired
-% paragraph end is deemed feasible by \TeX.
+% \item Technically, the paragraphs need to contain enough glue (see for example
+% \cref{sec:sloppy-paragraphs}) to achieve a low badness such that the desired paragraph
+% end is deemed feasible by \TeX.\shiftedmarginnote{This \code{itemize} list demonstrates
+% vertically adjusted label items (\cref{sec:adjust-label-items}).}
%
% \item Aesthetically, the paragraphs must be long enough to absorb the change in last-line
% fill level otherwise their gray-values visibly deviate from the
@@ -2618,18 +3332,21 @@ end
% \item End-of-paragraph intervention.\label{enum:end-of-paragraph-intervention}
%
% \begin{enumerate}[notopsep]
-% \item Tie~\sample{\texttt{\char126}}\label{enum:tie-last-words}\index{paragraph>fill last line>tie}
+% \item Tie~\sample{\texttt{\char126}}\label{enum:tie-last-words}
+% \index{paragraph>fill last line>tie|userman}
%
% Tie the last words.
%
% The problem with the tie may be a hyphenation of one of the words that participates in
% the tie. The next item avoids this disadvantage.
%
-% \item \cs{mbox}\label{enum:mbox-last-words}\index{paragraph>fill last line>mbox=\cs{mbox}}
+% \item \cs{mbox}\label{enum:mbox-last-words}
+% \index{paragraph>fill last line>mbox=\cs{mbox}|userman}
%
% Join the last words or inline equation at the end of the paragraph with an~\cs{mbox}.
%
-% \item \cs{linebreak}\label{enum:linebreak}\index{paragraph>fill last line>linebreak=\cs{linebreak}}
+% \item \cs{linebreak}\label{enum:linebreak}
+% \index{paragraph>fill last line>linebreak=\cs{linebreak}|userman}
%
% Add a \cs{linebreak} to the back part of the paragraph (approximately where the
% \cs{mbox} of item~\ref{enum:mbox-last-words} would start) in a way that the last line
@@ -2646,7 +3363,8 @@ end
% \item Uniform paragraph change.\label{enum:uniform-paragraph-change}
%
% \begin{enumerate}[notopsep]
-% \item Vary spacing.\label{enum:vary-spacing}\index{font>spacing}
+% \item Vary spacing.\label{enum:vary-spacing}
+% \index{font>spacing|userman}
%
% Modify the inter-word spacing, for example, with the macros introduced in
% \cref{sec:looser-tighter-spacing}.
@@ -2655,13 +3373,15 @@ end
% or~\hyperref[syn:tightspacing]{|tightspacing|}.
% Increase the spacing~\meta{level} until the last line gets the desired length.
%
-% \item Vary font tracking.\label{enum:vary-font-tracking}\index{font>tracking}
+% \item Vary font tracking.\label{enum:vary-font-tracking}
+% \index{font>tracking|userman}
%
% Enclose the paragraph in a \hyperref[syn:setfonttracking]{\code{setfonttracking}}~group.
% See \cref{sec:tracking-control}. Increase or decrease the tracking in steps of
% \nativetextfraction{1}{1000}\,em until the last line looks good.
%
-% \item Vary font expansion.\label{enum:vary-font-expansion}\index{font>expansion}
+% \item Vary font expansion.\label{enum:vary-font-expansion}
+% \index{font>expansion|userman}
%
% Enclose the paragraph in a \hyperref[syn:setfontexpand]{\code{setfontexpand}}~group. See
% \cref{sec:font-expansion-control}.
@@ -2688,15 +3408,17 @@ end
%
% \DescribeEnv{shortenpar}
% \DescribeEnv{prolongpar}
-% The two environments |shortenpar|\index{paragraph>fill last
-% line>shortenpar=\code{shortenpar}} and |prolongpar|\index{paragraph>fill last
-% line>prolongpar=\code{prolongpar}} can be employed in quite general situations when a
+% The two environments
+% \code{shortenpar}\index{paragraph>fill last line>shortenpar=\code{shortenpar}|userman}
+% and \code{prolongpar}\index{paragraph>fill last line>prolongpar=\code{prolongpar}|userman}
+% can be employed in quite general situations when a
% paragraph should be typeset one line longer or shorter, e.\,g., to avoid a
-% widow~line\footnote{The last line of a paragraph becomes a \singlequotes{widow}\index{forlorn
-% line>widow} (ger.~\foreignphrase{Hurenkind}) if it starts the following page or column.} or
-% a club~line\footnote{The first line of a paragraph is called
-% \singlequotes{club}\index{forlorn line>club} or~\singlequotes{orphan}\index{forlorn
-% line>orphan} (ger.~\foreignphrase{Schusterjunge}) if it appears at the bottom of the page or
+% widow~line\footnote{The last line of a paragraph becomes a
+% \singlequotes{widow}\detoxindex{forlorn line>widow|userman} (ger.~\foreignphrase{Hurenkind}) if it
+% starts the following page or column.} or a club~line\footnote{The first line of a paragraph
+% is called \singlequotes{club}\detoxindex{forlorn line>club|userman}
+% or~\singlequotes{orphan}\detoxindex{forlorn line>orphan|userman}
+% (ger.~\foreignphrase{Schusterjunge}) if it appears at the bottom of the page or
% column.}~[\citenum{knuth:1986}, p.~104 and~\citenum{mittelbach:2018c}]. (See also
% \cref{sec:vtie-paragraph} for special functions to avoid clubs or widows.)
% \singlequotes{Accidentally}, they also change the length of the last line of the paragraph.
@@ -2730,7 +3452,8 @@ end
% parameter change.
%
% \DescribeEnv{covernextindentpar}
-% Environment |covernextindentpar|\index{paragraph>fill last line>covernextindentpar=\code{covernextindentpar}}
+% Environment \code{covernextindentpar}%
+% \index{paragraph>fill last line>covernextindentpar=\code{covernextindentpar}|userman}
% can be helpful for \hyperref[item:o1]{case~O1}, i.\,e., a too short last line.
%
% \begin{synopsis}\label{syn:covernextindentpar}
@@ -2747,9 +3470,10 @@ end
% (if \(\cs{parindent} = 0\)), or \meta{dim} if called with an optional argument.
%
% \DescribeEnv{openlastlinepar}
-% The next environment, |openlastlinepar|,\index{paragraph>fill last
-% line>openlastlinepar=\code{openlastlinepar}} takes care of \hyperref[item:o2]{case~O2},
-% i.\,e., a last line in a paragraph that is almost full or completely filled.
+% The next environment, \code{openlastlinepar},%
+% \index{paragraph>fill last line>openlastlinepar=\code{openlastlinepar}|userman}
+% takes care of \hyperref[item:o2]{case~O2}, i.\,e., a last line in a paragraph that is almost
+% full or completely filled.
%
% \begin{synopsis}\label{syn:openlastlinepar}
% \cs{begin}|{openlastlinepar}|\oarg{dim} \\
@@ -2769,13 +3493,15 @@ end
% last line is avoided, but the result may be of \hyperref[item:o1]{type~O1} nonetheless.
%
%
+% \toccontinuesonnextpage
% \needtocspace
% \Needspace{150pt}
-% \subsection{Spacing}\label{sec:spacing-control}\index{font>spacing}
+% \subsection{Spacing}\label{sec:spacing-control}
+% \index{font>spacing|userman}
%
% \begin{whittyquote}
-% 90~\% of design is typography. \\
-% And the other 90~\% is whitespace. \\
+% 90\% of design is typography. \\
+% And the other 90\% is whitespace. \\
% \capitalemdash*~\propername{Jeffrey Zeldman}
% \end{whittyquote}
%
@@ -2785,7 +3511,9 @@ end
% \cref{sec:microtype-frontend}.
%
%
-% \subsubsection[Looser\kernedslash Tighter]{Looser or Tighter Spacing}\label{sec:looser-tighter-spacing}\index{font>spacing>loose}\index{font>spacing>tight}
+% \subsubsection[Looser\kernedslash Tighter]{Looser or Tighter Spacing}\label{sec:looser-tighter-spacing}
+% \index{font>spacing>loose|userman}
+% \index{font>spacing>tight|userman}
%
%
% \begin{whittyquote}
@@ -2822,7 +3550,7 @@ end
%
% \begin{SCtable}[10]
% \caption[Spacing changes made by \code{loosespacing}]%
-% {Adjustments made by environment |loosespacing| to \cs{spaceskip}.
+% {Adjustments made by environment \code{loosespacing} to \cs{spaceskip}.
% The mapping of \meta{level} to the exact skip definitions are
% \(1 \mapsto \formatskip{1.05}{.5}{.1}\),
% \(2 \mapsto \formatskip{1.1}{.5}{.1}\),
@@ -2836,7 +3564,7 @@ end
% \def~{\hphantom{0}}%
% \begin{tabular}{@{}ccl@{}}
% \toprule
-% \meta{level} & Adjustment & Comment \\
+% \meta{level} & Adjustment & Note \\
% {} & \% & \\
% \midrule
% 0 & n/a & neutral \\
@@ -2861,29 +3589,29 @@ end
% \cref{tab:tightspacing}.
%
% \begin{SCtable}[10]
+% \def~{\hphantom{0}}
% \caption[Spacing changes made by \code{tightspacing}]%
-% {Adjustments made by environment |tightspacing| to \cs{spaceskip}.
+% {Adjustments made by environment \code{tightspacing} to \cs{spaceskip}.
% The mapping of \meta{level} to the exact skip definitions are
-% \(1 \mapsto \formatskip{.9875}{.0125}{.5\hphantom{000}}\)\!,
-% \(2 \mapsto \formatskip{.975}{.025}{.5\hphantom{00}}\)\!,
-% \(3 \mapsto \formatskip{.95}{.05}{.5\hphantom{0}}\)\!, and
+% \(1 \mapsto \formatskip{.9875}{.0125}{.5~~~}\)\!,
+% \(2 \mapsto \formatskip{.975}{.025}{.5~~}\)\!,
+% \(3 \mapsto \formatskip{.95}{.05}{.5~}\)\!, and
% \(\ge 4 \mapsto \formatskip{.9}{.1}{.5}\),
% where all factors scale with \cs{dimen2},
% the current font's space-width.}
% \label{tab:tightspacing}
%
% \begin{tabfigures}
-% \def~{\hphantom{0}}%
% \begin{tabular}{@{}ccl@{}}
% \toprule
-% \meta{level} & Adjustment & Comment \\
+% \meta{level} & Adjustment & Note \\
% {} & \% & \\
% \midrule
% 0 & n/a & neutral \\
-% 1 & ~{-}1.25 & default \\
-% 2 & ~{-}2.5~ & \\
-% 3 & ~{-}5\hphantom{.00} & \\
-% \(\ge\)\:4 & -10\hphantom{.00} & \\
+% 1 & ~\textminus 1.25 & default \\
+% 2 & ~\textminus 2.5~ & \\
+% 3 & ~\textminus 5\hphantom{.}~~ & \\
+% \(\ge\)\:4 & \textminus 10\hphantom{.}~~ & \\
% \bottomrule
% \end{tabular}
% \end{tabfigures}
@@ -2902,7 +3630,8 @@ end
% \end{usecases}
%
%
-% \subsubsection{Wide Space}\label{sec:wide-space}\index{wide space}
+% \subsubsection{Wide Space}\label{sec:wide-space}
+% \index{wide space|userman}
%
% The \cs{widespace} macro and its companion \cs{narrowspace} derive their appearances from
% several of the current font's \cs{fontdimen}\meta{number}s. \TeX{} addresses the latter by
@@ -2914,10 +3643,11 @@ end
%
% \begin{SCtable}
% \caption[\cs{fontdimen}\meta{number} parameters]
-% {The first column~\sample{\#} states the index of the \cs{fontdimen} parameter:
-% \meta{number}. Column~2 presents short descriptions of the
-% \cs{fontdimen}\meta{number} parameters. As examples, the values for the current
-% font are shown in column~3; they are normalized to the quad-size.\bottomstrut}
+% {All \TeX{} font parameters normalized to the font's quad-size. The first
+% column~\sample{\#} states the index of the \cs{fontdimen} parameter:
+% \meta{number}. Column~2 presents short descriptions of
+% \cs{fontdimen}\meta{number}. As examples, the values for the current font are
+% shown in column~3.\bottomstrut}
% \label{tab:fontdimen}
%
% \begin{tabfigures}
@@ -2931,7 +3661,6 @@ end
% \begin{tabular}{@{}lll@{}}
% \toprule
% \# & Description & Value \\
-% {} & & \multicolumn{1}{c}{\%} \\
% \midrule
% 1 & Slant per 1\,pt height & ~~\relativefontdimen1\topstrut \\
% 2 & Interword space width & ~\relativefontdimen2 \\
@@ -2990,7 +3719,8 @@ end
% \end{usecase}
%
%
-% \subsubsection{Narrow Space}\label{sec:narrow-space}\index{narrow space}
+% \subsubsection{Narrow Space}\label{sec:narrow-space}
+% \index{narrow space|userman}
%
% \DescribeMacro{\narrowspace}
% \DescribeMacro{\narrowspace*}
@@ -3033,25 +3763,25 @@ end
% \centering
% \caption[Comparison of some space sizes]
% {Exemplary comparison of standard \cs{space} versus \cs{narrowspace} and
-% \cs{widespace}. All values are relative to the size of the current font's quad
-% size. \cs{narrowspace} and \cs{widespace} use the package's defaults.~\visualpar
-% The upper values in the Width-column for \cs{narrowspace}, and \cs{widespace}
-% refer to the \(\cs{fontdimen7} \not= 0\) case and the lower ones to the
-% \(\cs{fontdimen7} = 0\) code-path.}
+% \cs{widespace}. All values are relative to the size of the current font's
+% quad-size and shown as a percentage of it. \cs{narrowspace} and \cs{widespace}
+% use the package's defaults.~\visualpar The upper values in the
+% \singlequotes{Width}~column for \cs{narrowspace} and \cs{widespace} refer to the
+% \(\cs{fontdimen7} \not= 0\) case and the lower ones to the \(\cs{fontdimen7} = 0\)
+% code-path.}
% \label{tab:space-sizes}
%
% \begin{tabfigures}
-% \def~{\hphantom{0}}%
+% \def~{\hphantom{0}}
% \ExplSyntaxOn
% \def\relativedimen#1{\fp_eval:n {round (1000 * (#1) / \the\fontdimen6\font) / 10}}
% \def\relativefontdimen#1{\relativedimen{\the\fontdimen#1\font}}
% \ExplSyntaxOff
% \def\nrows{1.75}
%
-% \begin{tabular}{@{}llll@{}}
+% \begin{tabular}{@{}l*{3}{r}@{}}
% \toprule
-% Name & Width & Stretch & Shrink \\
-% {} & \% & \% & \% \\
+% Macro & Width & Stretch & Shrink \\
% \midrule
% \multirow{\nrows}{*}{\cs{narrowspace}} &
% \relativedimen{\the\fontdimen2\font - \narrowspacestrength * \the\fontdimen7\font} &
@@ -3071,7 +3801,7 @@ end
%
%
% \subsection{\packagename{Microtype} Front\capitalhyphen End}\label{sec:microtype-frontend}
-% \index{microtype=\packagename{microtype} (package)}
+% \index{microtype=\packagename{microtype} (package)|userman}
%
% The functionalities are just front-ends of selected macros in
% package~\packagename{microtype} -- welcome syntactic sugar.
@@ -3091,7 +3821,8 @@ end
% \end{important}
%
%
-% \subsubsection{Tracking}\label{sec:tracking-control}\index{font>tracking}
+% \subsubsection{Tracking}\label{sec:tracking-control}
+% \index{font>tracking|userman}
%
% \begin{caution}
% The tracking changes may interfere with implicit changes of tracking declared with
@@ -3136,7 +3867,7 @@ end
% \end{codeexample}
%
% If the argument of option~\code{trackingttspacing} is omitted the outer spacing defaults to
-% \makeatletter\mbox{\typog@trackingttspacing}\makeatother.
+% \makeatletter\mbox{\typog@config@trackingttspacing}\makeatother.
%
% \begin{usecases}
% Nudge line breaks or hyphenation points.~\visualpar Avoid clashes of descenders and
@@ -3145,7 +3876,8 @@ end
% \end{usecases}
%
%
-% \subsubsection{Font Expansion}\label{sec:font-expansion-control}\index{font>expansion}
+% \subsubsection{Font Expansion}\label{sec:font-expansion-control}
+% \index{font>expansion|userman}
%
% \DescribeEnv{setfontshrink}
% \DescribeEnv{setfontstretch}
@@ -3153,10 +3885,10 @@ end
% component, i.\,e., shrinkability and stretchability, respectively.
%
% \begin{synopsis}\label{syn:setfontshrink}\label{syn:setfontstretch}
-% \cs{begin}|{setfontshrink}|\marg{level}
+% \cs{begin}|{setfontshrink}|\oarg{level}
% \dots{}
% \cs{end}|{setfontshrink}| \\
-% \cs{begin}|{setfontstretch}|\marg{level}
+% \cs{begin}|{setfontstretch}|\oarg{level}
% \dots{}
% \cs{end}|{setfontstretch}|
% \end{synopsis}
@@ -3165,20 +3897,20 @@ end
% summarize the values for |stretch| and |shrink| in these environments.
%
% \begin{SCtable}
-% \caption[Shrink values of \code{setfontshrink}]%
+% \caption[Shrink values of \code{setfontshrink}]
% {\slightlysloppy[2] Preconfigured values for |shrink| inside of
-% environment~\code{setfontshrink}. Note that all |stretch| values are zero, so the fonts
-% only can shrink.}
+% environment~\code{setfontshrink} as \nativetextfraction{1}{1000}\,em. Note that all
+% |stretch| values are zero, so the fonts only can shrink.}
% \label{tab:setfontshrink-values}
%
% \begin{tabfigures}
+% \def~{\hphantom{0}}
% \begin{tabular}{@{}cccl@{}}
% \toprule
-% \meta{level} & |stretch| & |shrink| & Comment \\
-% {} & \nativetextfraction{1}{1000}\,em & \nativetextfraction{1}{1000}\,em & \\
+% \meta{level} & |stretch| & |shrink| & Note \\
% \midrule
% 0 & n/a & n/a & no operation \\
-% 1 & 0 & \hphantom{0}\makeatletter\typog@shrink@i\makeatother & default \\
+% 1 & 0 & ~\makeatletter\typog@shrink@i\makeatother & default \\
% 2 & 0 & \makeatletter\typog@shrink@ii\makeatother & \\
% 3 & 0 & \makeatletter\typog@shrink@iii\makeatother & \\
% \bottomrule
@@ -3188,20 +3920,20 @@ end
%
% \begin{SCtable}
% \centering
-% \caption[Stretch values of \code{setfontstretch}]%
+% \caption[Stretch values of \code{setfontstretch}]
% {\slightlysloppy[2] Preconfigured values for |stretch| inside of
-% environment~\code{setfontstretch}. Note that all |shrink| values are zero, so the fonts
-% only can stretch.}
+% environment~\code{setfontstretch} as \nativetextfraction{1}{1000}\,em. Note that all
+% |shrink| values are zero, so the fonts only can stretch.}
% \label{tab:setfontstretch-values}
%
% \begin{tabfigures}
+% \def~{\hphantom{0}}
% \begin{tabular}{@{}cccl@{}}
% \toprule
% \meta{level} & |stretch| & |shrink| \\
-% {} & \nativetextfraction{1}{1000}\,em & \nativetextfraction{1}{1000}\,em & \\
% \midrule
% 0 & n/a & n/a & no operation \\
-% 1 & \hphantom{0}\makeatletter\typog@stretch@i\makeatother & 0 & default \\
+% 1 & ~\makeatletter\typog@stretch@i\makeatother & 0 & default \\
% 2 & \makeatletter\typog@stretch@ii\makeatother & 0 & \\
% 3 & \makeatletter\typog@stretch@iii\makeatother & 0 & \\
% \bottomrule
@@ -3224,7 +3956,7 @@ end
% Manipulate both, |stretch| and |shrink|~values at the same time.
%
% \begin{synopsis}\label{syn:setfontexpand}
-% \cs{begin}|{setfontexpand}|\marg{level}
+% \cs{begin}|{setfontexpand}|\oarg{level}
% \dots{}
% \cs{end}|{setfontexpand}|
% \end{synopsis}
@@ -3232,20 +3964,20 @@ end
% \Cref{tab:setfontexpand-values} gives an overview of the values associated with \meta{level}.
%
% \begin{SCtable}
-% \caption[Shrink and stretch values of \code{setfontexpand}]%
+% \caption[Shrink and stretch values of \code{setfontexpand}]
% {\slightlysloppy[2] Preconfigured values for |shrink| and |stretch| inside of
-% environment~\code{setfontexpand}. Note that both |shrink| and |stretch| values are
-% nonzero, so the fonts can shrink or expand.}
+% environment~\code{setfontexpand} as \nativetextfraction{1}{1000}\,em. Note that both
+% |shrink| and |stretch| values are nonzero, so the fonts can shrink or expand.}
% \label{tab:setfontexpand-values}
%
% \begin{tabfigures}
+% \def~{\hphantom{0}}
% \begin{tabular}{@{}cccl@{}}
% \toprule
-% \meta{level} & |stretch| & |shrink| & Comment \\
-% {} & \nativetextfraction{1}{1000}\,em & \nativetextfraction{1}{1000}\,em & \\
+% \meta{level} & |stretch| & |shrink| & Note \\
% \midrule
% 0 & n/a & n/a & no operation \\
-% 1 & \hphantom{0}\makeatletter\typog@stretch@i\makeatother & \hphantom{0}\makeatletter\typog@stretch@i\makeatother & default \\
+% 1 & ~\makeatletter\typog@stretch@i\makeatother & ~\makeatletter\typog@stretch@i\makeatother & default \\
% 2 & \makeatletter\typog@stretch@ii\makeatother & \makeatletter\typog@stretch@ii\makeatother & \\
% 3 & \makeatletter\typog@stretch@iii\makeatother & \makeatletter\typog@stretch@iii\makeatother & \\
% \bottomrule
@@ -3302,7 +4034,8 @@ end
% \end{usecases}
%
%
-% \subsubsection{Character Protrusion}\label{sec:protrusion}\index{font>protrusion}
+% \subsubsection{Character Protrusion}\label{sec:protrusion}
+% \index{font>protrusion|userman}
%
% \DescribeEnv{nocharprotrusion}
% Disable the \packagename{microtype} feature~\singlequotes{protrusion} inside of the
@@ -3320,8 +4053,8 @@ end
% \end{usecases}
%
%
-% \FloatBarrier
-% \subsection{Sloppy Paragraphs}\label{sec:sloppy-paragraphs}\index{paragraph>sloppy}
+% \subsection{Sloppy Paragraphs}\label{sec:sloppy-paragraphs}
+% \index{paragraph>sloppy|userman}
%
% Experienced \LaTeX{} users know that \cs{sloppy} is more of a problem by itself and not
% really a viable solution of the \doublequotes{overfull~box} syndrome.
@@ -3357,21 +4090,22 @@ end
%
% \begin{suspendshortverb}
% \begin{tabfigures}
+% \def~{\hphantom{0}}
% \begin{tabular}{@{}ccccl@{}}
% \toprule
-% \meta{sloppiness} & \cs{toler-} & \cs{hfuzz} & \cs{emergency-} & Comment \\
+% \meta{sloppiness} & \cs{toler-} & \cs{hfuzz} & \cs{emergency-} & Note \\
% {} & \code{ance} & \cs{vfuzz} & \code{stretch}~\(G\) & \\
% {} & & pt & em & \\
% \midrule
-% 0 & \hphantom{0}200\hphantom{\tolerancemark} & .1\hphantom{0} & 0\hphantom{.000\scaledmark} & \TeX: \verb+\fussy+ \\
-% 1 & \hphantom{0}330\tolerancemark & .15 & \hphantom{0}.375\scaledmark & default \\
-% 2 & \hphantom{0}530\tolerancemark & .2\hphantom{0} & \hphantom{0}.75\scaledmark\hphantom{0} & \\
-% 3 & \hphantom{0}870\tolerancemark & .25 & 1.125\scaledmark & \\
-% 4 & 1410\tolerancemark & .3\hphantom{0} & 1.5\scaledmark\hphantom{00} & \\
+% 0 & ~200\hphantom{\tolerancemark} & .1~ & 0\hphantom{.000\scaledmark} & \TeX: \verb+\fussy+ \\
+% 1 & ~330\tolerancemark & .15 & ~.375\scaledmark & default \\
+% 2 & ~530\tolerancemark & .2~ & ~.75\scaledmark~ & \\
+% 3 & ~870\tolerancemark & .25 & 1.125\scaledmark & \\
+% 4 & 1410\tolerancemark & .3~ & 1.5\scaledmark~~ & \\
% 5 & 2310\tolerancemark & .35 & 1.875\scaledmark & \\
-% 6 & 3760\tolerancemark & .4\hphantom{0} & 2.25\scaledmark\hphantom{0} & \\
+% 6 & 3760\tolerancemark & .4~ & 2.25\scaledmark~ & \\
% 7 & 6130\tolerancemark & .45 & 2.625\scaledmark & \\
-% \(\ge\)\:8 & 9999\hphantom{\tolerancemark} & .5\hphantom{0} & 3\hphantom{.000\scaledmark} & \TeX: \verb+\sloppy+ \\
+% \(\ge\)\:8 & 9999\hphantom{\tolerancemark} & .5~ & 3\hphantom{.000\scaledmark} & \TeX: \verb+\sloppy+ \\
% \bottomrule
% \end{tabular}
% \end{tabfigures}
@@ -3403,8 +4137,8 @@ end
% \end{usecases}
%
%
-% \FloatBarrier
-% \subsection{Vertically Partially-Tied Paragraphs}\label{sec:vtie-paragraph}\index{paragraph>vertically tied}
+% \subsection{Vertically Partially-Tied Paragraphs}\label{sec:vtie-paragraph}
+% \index{paragraph>vertically tied|userman}
%
% \LaTeX{} provides several macros and environments to tie material vertically~-- most
% prominently |samepage| and |minipage|.\footnote{A valuable complement to these is
@@ -3421,7 +4155,7 @@ end
%
% \DescribeMacro{\vtietop}
% \DescribeEnv{vtietoppar}
-% Avoid a club\index{forlorn line>club} line in each partial paragraph.
+% Avoid a club\index{forlorn line>club|userman} line in each partial paragraph.
%
% \begin{synopsis}\label{syn:vtietop}\label{syn:vtietoppar}
% \cs{vtietop}\oarg{number-of-lines} \\[\smallskipamount]
@@ -3436,16 +4170,17 @@ end
%
% \begin{usecases}
% String together the first paragraph right after a sectioning command.~\visualpar Tie the
-% first line of an itemized, enumerated, or a description list\index{list} with the paragraph
-% following~\cs{item}.
+% first line of an itemized, enumerated, or a description list\index{list|userman} with the
+% paragraph following~\cs{item}.
% \end{usecases}
%
% \noindent
% \DescribeMacro{\splicevtietop}
-% Inside of a \code{list} a one-off solution simply concatenates \cs{item}[\dots]\cs{vtietop}
-% to fuse the line with the \code{item\#}, the representation of the \code{enum\#}, or the
-% description term with the first paragraph. For a systematic use prefer \cs{splicevtietop}
-% and apply it as the first thing in the \code{list}~body.
+% Inside of a \code{list} a one-off solution simply concatenates
+% \cs{item}[\dots\itcorr{-5}]\cs{vtietop} to fuse the line with the \code{item\#}, the
+% representation of the \code{enum\#}, or the description term with the first paragraph. For a
+% systematic use prefer \cs{splicevtietop} and apply it as the first thing in the
+% \code{list}~body.
%
% \begin{synopsis}\label{syn:splicevtietop}
% \cs{splicevtietop}\oarg{number-of-lines}
@@ -3492,7 +4227,7 @@ end
% \noindent
% \DescribeMacro{\vtiebot}
% \DescribeEnv{vtiebotpar}
-% Avoid a widow\index{forlorn line>widow} line in each partial paragraph.
+% Avoid a widow\index{forlorn line>widow|userman} line in each partial paragraph.
%
% \begin{synopsis}\label{syn:vtiebot}\label{syn:vtiebotpar}
% \cs{vtiebot}\oarg{number-of-lines} \\[\smallskipamount]
@@ -3507,7 +4242,8 @@ end
%
% \noindent
% \DescribeEnv{vtiebotdisp}
-% Avoid a display widow\index{forlorn line>display widow} line in each partial paragraph.
+% Avoid a display widow\index{forlorn line>display widow|userman} line in each partial
+% paragraph.
%
% \begin{synopsis}\label{syn:vtiebotdisp}\label{syn:vtiebotdisppar}
% \cs{begin}|vtiebotdisp|\oarg{before-disp-number-of-lines} \\
@@ -3579,15 +4315,16 @@ end
%
% \begin{typoginspectpar}{partial-paragraphs}
% \setlength{\smoothraggedrightragwidth}{8pt}
-% \paragraph{Partial Paragraphs And Counting Lines.} The top-of-paragraph ties, \cs{vtietop}
-% and \code{vtietoppar} count \meta{number\hyp{}of\hyp{}lines} from the beginning of every
-% partial paragraph. Each displayed math in the paragraph resets the count. The
-% bottom-paragraph ties, \cs{vtiebot}, \code{vtiebotpar}, \cs{vtiebotdisp}, and
-% \code{vtiebotdisppar} count backward from the end of each partial paragraph. Again, each
-% displayed math in the paragraph resets the count. According to \TeX's rules, a displayed
-% math formula always is counted as \emph{three} lines no matter its contents.
-% \Cref{tab:partial-paragraph-line-counts} summarizes these rules with the help of an
-% example.
+% \paragraph{Partial Paragraphs And Counting Lines.}
+%
+% The top-of-paragraph ties, \cs{vtietop} and \code{vtietoppar} count
+% \meta{number\hyp{}of\hyp{}lines} from the beginning of every partial paragraph. Each
+% displayed math in the paragraph resets the count. The bottom-paragraph ties, \cs{vtiebot},
+% \code{vtiebotpar}, \cs{vtiebotdisp}, and \code{vtiebotdisppar} count backward from the end
+% of each partial paragraph. Again, each displayed math in the paragraph resets the count.
+% According to \TeX's rules, a displayed math formula always is counted as \emph{three} lines
+% no matter its contents. \Cref{tab:partial-paragraph-line-counts} summarizes these rules
+% with the help of an example.
% \end{typoginspectpar}
%
% \begin{table}
@@ -3655,11 +4392,11 @@ end
% \end{usecases}
%
%
-% \FloatBarrier
-% \subsection{Breakable Displayed Equations}\label{sec:breakable-display}\index{page break}
+% \subsection{Breakable Displayed Equations}\label{sec:breakable-display}
+% \index{page break|userman}
%
% \DescribeEnv{breakabledisplay}
-% Package~\packagename{amsmath}\index{amsmath=\packagename{amsmath} (package)} offers
+% Package~\packagename{amsmath}\index{amsmath=\packagename{amsmath} (package)|userman} offers
% \cs{allowdisplaybreaks} to render displayed equations breakable at each of their lines.
% Environment~\cs{breakabledisplay} is a wrapper around it which limits the macro's influence
% to the environment. Furthermore, the default \meta{level} of \code{breakabledisplay} is~3
@@ -3688,16 +4425,17 @@ end
% \newcommand*{\clubmark}{\tablenotemark{\dag}}
%
% \begin{tabfigures}
+% \def~{\hphantom{0}}
% \begin{tabular}{@{}ccl@{}}
% \toprule
-% \meta{level} & \cs{interdisplay-} & Comment \\
+% \meta{level} & \cs{interdisplay-} & Note \\
% {} & \code{linepenalty} & \\
% \midrule
% 0 & 10000 & no operation \\
-% 1 & \hphantom{0}9999 & \\
-% 2 & \hphantom{0}6999 & \\
-% 3 & \hphantom{0}2999 & default \\
-% 4 & \hphantom{0000}0\rlap{\clubmark} & \\
+% 1 & ~9999 & \\
+% 2 & ~6999 & \\
+% 3 & ~2999 & default \\
+% 4 & ~~~~0\rlap{\clubmark} & \\
% \bottomrule
% \end{tabular}
% \end{tabfigures}
@@ -3738,7 +4476,6 @@ end
% \end{usecases}
%
%
-% \FloatBarrier
% \clearpage
% \subsection{\packagename{Setspace} Front-End}\label{sec:setspace-frontend}
%
@@ -3747,11 +4484,11 @@ end
% interface of \cs{setstretch} though is unintuitive as it asks for an obscure
% factor.\fontsizeinfo{setspacefontsizeinfo}\marginnote{In the copy of this document gets
% typeset with~\setspacefontsizeinfo*.} The \LaTeX{} user however prefers to keep her eyes on
-% the ball and set the line skip\index{baseline skip} directly (e.\,g.~12.5pt) or the lines'
-% leading\index{leading} to a length or percentage of the font's size.\footnote{To find out
-% about the current font's size and the \cs{baselineskip} in printable form check out
-% \cref{sec:font-information} on \cpageref{sec:font-information}.} This is where the following
-% macros go to bat.
+% the ball and set the line skip\index{baseline skip|userman} directly (e.\,g.~12.5\,pt) or the
+% lines' leading\index{leading|userman} to a length or percentage of the font's
+% size.\footnote{To find out about the current font's size and the \cs{baselineskip} in
+% printable form check out \cref{sec:font-information} on \cpageref{sec:font-information}.}
+% This is where the following macros go to bat.
%
% \begin{important}
% All macros that are introduced in this section rely on macro~\cs{setstretch}. So
@@ -3785,24 +4522,25 @@ end
% will be used in the computation.
%
% \begin{example}
-% Let us assume we want to lighten the gray value of the copy a tad with a \cs{baselineskip}
-% increased (from e.g.~12pt) to~12.5pt. To this end we say:
+% \begin{itemize}[notopsep]
+% \item Let us assume we want to lighten the gray value of the copy a tad with the
+% \cs{baselineskip} increased from 12\,pt to~12.5\,pt. To this end we say:
%
% \begin{codeexample}
-% \cs{setbaselineskip}\{12.5pt\}\specialsectionendhere
+% \cs{setbaselineskip}\{12.5\,pt\}
% \end{codeexample}
-% \end{example}
%
-% \begin{tip}
-% To set the \cs{baselineskip} relative to the current value use
+% \item In a generic part of the document, where the actual \cs{baselineskip} is not known,
+% we can refer to its current value and rescale it:
%
% \begin{codeexample}
-% \cs{setbaselineskip}\{\meta{factor}\cs{baselineskip}\}
+% \cs{setbaselineskip}\{\cs{baselineskip} * 12.5 / 12\}
% \end{codeexample}
%
-% \noindent
-% where \meta{factor} is a floating-point number.
-% \end{tip}
+% Care should be taken if code like the above is implicitly or explicitly
+% repeated, because it results in a geometric series.\specialsectionendhere
+% \end{itemize}
+% \end{example}
%
% \DescribeMacro{\resetbaselineskip}
% \sinceversion{Since v0.3}
@@ -3816,6 +4554,9 @@ end
% notion of what is a single-line \cs{baselineskip}.
%
%
+% \hangindent=2\parindent
+% \hangafter=-2
+% \noindent
% \DescribeMacro{\setbaselineskippercentage}
% \sinceversion{Since v0.3}
% Set the \cs{baselineskip} with a relative value calculated as a percentage of the current
@@ -3828,14 +4569,14 @@ end
% Set \cs{baselineskip} to \(\cs{typogfontsize} \times \meta{baselineskip-percentage} / 100\).
%
% \begin{example}
-% We modify the previous example and assume a font design size of 10pt, but now write
+% We modify the previous example and assume a font design size of 10\,pt, but now write
%
% \begin{codeexample}
% \cs{setbaselineskippercentage}\{125\}
% \end{codeexample}
%
% \noindent
-% which sets \cs{baselineskip} to \(10\text{pt} \times 125 / 100 = 12.5\text{pt}\).
+% which sets \cs{baselineskip} to \(10\text{\,pt} \times 125 / 100 = 12.5\text{\,pt}\).
% \end{example}
%
% \DescribeMacro{\setleading}
@@ -3850,7 +4591,7 @@ end
% \meta{leading} can be negative, e.\,g.~to set solid.
%
% \begin{example}
-% Another solution of the previous example, given a font design size of 10pt is to write
+% Another solution of the previous example, given a font design size of 10\,pt is to write
%
% \begin{codeexample}
% \cs{setleading}\{2.5pt\}
@@ -3872,14 +4613,14 @@ end
% Set \cs{baselineskip} to \(\cs{typogfontsize} \times (1 + \meta{leading-percentage} / 100)\).
%
% \begin{example}
-% We modify the previous example and again assume a font design size of 10pt, but now write
+% We modify the previous example and again assume a font design size of 10\,pt, but now write
%
% \begin{codeexample}
% \cs{setleadingpercentage}\{25\}
% \end{codeexample}
%
% \noindent
-% which sets \cs{baselineskip} to \(10\text{pt} \times (1 + 25 / 100) = 12.5\text{pt}\).
+% which sets \cs{baselineskip} to \(10\text{\,pt} \times (1 + 25 / 100) = 12.5\text{\,pt}\).
% \end{example}
%
% \smallskip
@@ -3949,9 +4690,9 @@ end
% \end{tip}
%
%
-% \FloatBarrier
% \clearpage
-% \subsection{Smooth Ragged}\label{sec:smooth-ragged}\index{ragged right}
+% \subsection{Smooth Ragged}\label{sec:smooth-ragged}
+% \index{ragged right|userman}
%
% \begin{whittyquote}
% The attention someone gives \\
@@ -3964,25 +4705,30 @@ end
% \noindent
% Package \packagename{typog} implements a novel approach to typeset ragged paragraphs.
% Instead of setting the glue inside of a paragraph to zero and letting the line-widths vary
-% accordingly~\cite{wermuth:2020} we prescribe the line-widths with the \cs{parshape}~primitive
-% and leave alone the stretchability or shrinkability of the glue.
+% accordingly~\cite{wermuth:2020} we prescribe the line-widths with \TeX's
+% \cs{parshape}~primitive and leave alone the stretchability or shrinkability of the glue.
%
-% \begin{slightlysloppypar}
-% \hangindent=5.5em\hangafter=-5
+% \begin{caution}
+% None of the following environments work inside of lists.
+% \end{caution}
+%
+% \begin{slightlysloppypar}[2]
+% \hangindent=3.5\parindent
+% \hangafter=-6
+% \noindent
% \DescribeEnv{smoothraggedrightshapetriplet}
% \DescribeEnv{smoothraggedrightshapequintuplet}
% \DescribeEnv{smoothraggedrightshapeseptuplet}
-% We introduce three environments that allow for setting three, five, or seven different
-% line-lengths: \code{smoothraggedrightshapetriplet},
-% \code{smoothraggedrightshapequintuplet}, and \code{smoothraggedrightshapeseptuplet}; they
-% work for paragraphs up to
+% We introduce three environments that set three, five, or seven different line-lengths
+% (which \TeX{} of course will repeat for paragraphs longer than three, five, or seven
+% lines): \code{smoothraggedrightshapetriplet}, \code{smoothraggedrightshapequintuplet}, and
+% \code{smoothraggedrightshapeseptuplet}; they work for paragraph lengths up to
% \makeatletter
-% \typog@triplet@max@lines, \typog@quintuplet@max@lines, or \typog@septuplet@max@lines~lines,
+% \typog@triplet@max@lines, \typog@quintuplet@max@lines, and \typog@septuplet@max@lines~lines,
% \makeatother
% respectively.
% \end{slightlysloppypar}
%
-%
% \begin{maxipage}
% \begin{synopsis}\label{syn:smoothraggedrightshapetriplet}\label{syn:smoothraggedrightshapequintuplet}\label{syn:smoothraggedrightshapeseptuplet}
% \cs{begin}|{smoothraggedrightshapetriplet}|\oarg{option\dots}\marg{width1}\marg{width2}\marg{width3} \\
@@ -4224,23 +4970,47 @@ end
% The default generator is |triplet|.
%
% \item[\cs{smoothraggedrightleftskip}=\meta{dim}]
-% Value for |leftskip| to pass to the generator. Default:~0pt.
+% Value for |leftskip| to pass to the generator. Default:~0\,pt.
%
% \item[\cs{smoothraggedrightparindent}=\meta{dim}]
-% Value for |parindent| to pass to the generator. Default:~0pt.
+% Value for |parindent| to pass to the generator. Default:~0\,pt.
%
% \item[\cs{smoothraggedrightragwidth}=\meta{dim}]
-% Value for the width of the ragged right margin. Default:~2em.
+% Value for the width of the ragged right margin. Default:~2\,em.
% \end{description}
%
+% \begin{samepage}
+% \def\smoothraggedrightgenerator{quintuplet}
+% \setlength{\smoothraggedrightragwidth}{7pt}
+% \begin{nocharprotrusion}\fussy
+% \begin{smoothraggedright}
+% Throughout this manual we have demonstrated how \code{smoothraggedright} environments
+% work for very narrow columns namely inside of the document's margins: all maginal notes
+% were typeset inside of \cs{smoothraggedright} environments (quintuplet generator,
+% 1.5\,em rag width, at footnote~size in addition using
+% environments~\code{slightlysloppy} and \code{loosespacing}). Here, we utilize it with
+% the \smoothraggedrightgenerator~generator and a rag-width of only
+% \the\smoothraggedrightragwidth{} in a paragraph that is \the\linewidth~wide and
+% averages around twelve words per line. There is much more glue to adapt to the
+% line-ends and thus the desired rag is archieved far easier. The sloppyness is minimal,
+% this is, \cs{fussy} is in effect and character protrusion into the margins is switched
+% off. A limitation of the current implementation is that it is ineffective inside of lists.
+% Therefore, this paragraph has not been wrapped inside of an \singlequotes{example}, because
+% all examples are coded as lists.
+% \end{smoothraggedright}
+% \end{nocharprotrusion}
+% \end{samepage}
+%
% \begin{usecases}
% Replacement for \cs{RaggedRight}~\cite{package:ragged2e}.~\visualpar Design alternative for
% fully justified paragraphs if used with a small rag-width.
% \end{usecases}
%
-%
-% \addtocontents{toc}{\par\bigskip\hfill\textit{Table of Contents continued on next page.}}
-% \addtocontents{toc}{\clearpage}
+% \begin{futuredirection}
+% Translate the code to \packagename{l3galley} which is part of the
+% \packagename{l3experimental}~package~\cite{package:l3experimental}. Galley~code is
+% supposed to work inside of lists, too.
+% \end{futuredirection}
%
%
% \sectionfinish
@@ -4250,7 +5020,7 @@ end
% Many other packages help with getting better output from \LaTeX. Here is a list --~in
% alphabetical order~-- of the ones the author considers particularly valuable.
%
-% \sbox{\listlabelbox}{\packagename{microtype}}
+% \sbox{\listlabelbox}{\packagename{enumitem}}
% \begin{description}[font=\normalfont, labelsep*=1em, labelwidth=\wd\listlabelbox, leftmargin=!]
% \item[\packagename{enumitem}]
% Flexible and consistent definition of all basic \LaTeX-list types plus inline
@@ -4268,6 +5038,9 @@ end
% Fine control of spacing, tracking, sidebearings, character protrusion into the margins,
% font expansion, and much more~\cite{package:microtype}.
%
+% See \Cref{sec:microtype-frontend} for a front-end to \packagename{microtype} offered by
+% this package.
+%
% See also \propername{Khirevich's} discussion~\cite{khirevich:2013}.
%
% \item[\packagename{ragged2e}]
@@ -4275,8 +5048,11 @@ end
% |center|~\cite{package:ragged2e}.
%
% \item[\packagename{setspace}]
-% Consistently set the document's line-spacing, i.\,e.,
+% Consistently set the line-spacing of a document, i.\,e., control
% \cs{baselineskip}~\cite{package:setspace}.
+%
+% See \Cref{sec:setspace-frontend} for a front-end to \packagename{setspace} offered by this
+% package.
% \end{description}
%
%
@@ -4291,26 +5067,34 @@ end
%
% The companion program \programname{typog-grep} for analyzing the output of
% \hyperref[syn:typoginspect]{\code{typoginspect}} and
-% \hyperref[syn:typoginspect]{\code{typoginspectpar}} has its own manual page. We reproduce
-% it here for completeness of the documentation.
+% \hyperref[syn:typoginspect]{\code{typoginspectpar}} has its own manual page. We
+% reproduce it here for completeness of the documentation.
%
+% \addtocontents{toc}{\protect\setcounter{tocdepth}{0}}
% \begin{suspendshortverb}
% \setlength{\parindent}{0pt}
% \setlength{\parskip}{6.0pt plus 2.0pt minus .5pt}
-% \input typog-grep
+% \input{typog-grep.tex}
% \end{suspendshortverb}
+% \addtocontents{toc}{\protect\setcounter{tocdepth}{2}}
%
% \sectionfinish
% \clearpage
-% \phantomsection
-% \resetfancyhead
-% \addcontentsline{toc}{section}{Change History}
-% \PrintChanges
+% \begingroup
+% \setcounter{GlossaryColumns}{1}
+% \phantomsection
+% \label{sec:changes}
+% \resetfancyhead
+% \addtocontents{toc}{\bigskip}
+% \addcontentsline{toc}{section}{\numberline{}Change History}
+% \PrintChanges
+% \endgroup
%
% \sectionfinish
% \clearpage
% \phantomsection
-% \addcontentsline{toc}{section}{References}
+% \addtocontents{toc}{\medskip}
+% \addcontentsline{toc}{section}{\numberline{}References}
% \begin{RaggedRight}
% \begin{thebibliography}{88}
% \bibitem{abrahams:2020}
@@ -4354,6 +5138,12 @@ end
% 1998,
% \biburl{https://mirrors.ctan.org/systems/doc/etex/etex_man.pdf}.
%
+% \bibitem{package:mathastext}
+% \bibauthor{Burnol, Jean-François}.
+% \bibtitle{Package~\packagename{mathastext}}.
+% 2023,
+% \biburl{https://ctan.org/pkg/mathastext}.
+%
% \bibitem{carlisle:1996}
% \bibauthor{Carlisle, David}.
% \bibtitle{Russian Paragraph Shapes}.
@@ -4399,6 +5189,12 @@ end
% Addison Wesley, Reading\kernedslash MA,
% 1986.
%
+% \bibitem{package:l3experimental}
+% \bibauthor{The \LaTeX\ Project}.
+% \bibtitle{Package~\packagename{l3experimental}}.
+% 2024,
+% \biburl{https://ctan.org/pkg/l3experimental}.
+%
% \bibitem{package:layout}
% \bibauthor{McPherson, Kent}.
% \bibtitle{Package~\packagename{layout}}.
@@ -4450,6 +5246,13 @@ end
% TUGboat, 11(1), 69\figuredash85, 1990,
% \biburl{http://www.tug.org/TUGboat/Articles/tb11-1/tb27salomon.pdf}.
%
+% \bibitem{strizver:2014}
+% \bibauthor{Strizver, Ilene}.
+% \bibtitle{Type rules!: the designer's guide to professional typography},
+% 4\textsuperior{th}~ed.
+% John Wiley~\& Sons, Hoboken\kernedslash NJ,
+% 2014.
+%
% \bibitem{package:setspace}
% \bibauthor{Tobin, Geoffrey,} and \bibauthor{Robin Fairbairns}.
% \bibtitle{Package~\packagename{setspace}}.
@@ -4526,23 +5329,35 @@ end
% \end{RaggedRight}
%
% \sectionfinish
+%
+%
% \clearpage
-% \begin{RaggedRight}
+% \begingroup
% \setcounter{IndexColumns}{2}
% \setlength{\columnsep}{30pt}
% \label{sec:index}
% \phantomsection
-% \addcontentsline{toc}{section}{Index}
+% \addtocontents{toc}{\medskip}
+% \addcontentsline{toc}{section}{\numberline{}Index}
+% \raggedcolumns
+% \def\codeidx##1{\linenumberdecoration\textbf{##1}}
+% \def\main##1{\linenumberdecoration\underbar{\textbf{##1}}}
+% \def\usage##1{\textit{\textbf{##1}}}
% \PrintIndex
-% \end{RaggedRight}
+% \endgroup
% }
%
-%
% \sectionfinish
+%
+%
% \clearpage
% \appendix
% \section{Package Code}\label{sec:package-code}
-% \addtocontents{toc}{\begingroup\small}
+% \addtocontents{toc}{\protect\begin{list}{}{\leftmargin=\subsectiontocindent\parsep=0pt}}
+% \addtocontents{toc}{\protect\item}
+% \addtocontents{toc}{\RaggedRight}
+% \addtocontents{toc}{\small}
+% \addtocontents{toc}{\tocsquashedsubsections}
% \addtocontents{toc}{\protect\begin{multicols}{2}}
% \addtocontents{toc}{\protect\raggedcolumns}
%
@@ -4555,7 +5370,7 @@ end
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{typog}
- [2024/05/07 v0.3 TypoGraphic extensions]
+ [2024/07/08 v0.4 TypoGraphic extensions]
\RequirePackage{etoolbox}
\RequirePackage{everyhook}
@@ -4592,17 +5407,34 @@ end
% \end{macro}
%
% \begin{macro}{\typog@typeout}
+% Our information printer.
+% Just adds a prefix so that we can tease apart the \filesystem{log} later.
+%
+% \begin{macrocode}
+\newcommand*{\typog@typeout}[1]{\typeout{typog: #1}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typog@typeout}
% Our debug information printer.
%
% \begin{macrocode}
-\newcommand*{\typog@typeout}[1]
- {\iftypog@debug
- \typeout{typog: #1}%
- \fi}
+\newcommand*{\typog@debug@typeout}[1]{\iftypog@debug\typog@typeout{#1}\fi}
% \end{macrocode}
% \end{macro}
%
+% \begin{tcounter}{typog@@iteration}
+% We want our own counter (currently for keeping track of iterations) that does not get
+% trampled underfoot too easily.
+%
+% \begin{macrocode}
+\newcounter{typog@@iteration}
+
+% \end{macrocode}
+% \end{tcounter}
+%
% \begin{macro}{\typog@trim@spaces}
% Pull \cs{tl\_trim\_spaces} into the \singlequotes{classic} namespace.
%
@@ -4693,69 +5525,149 @@ end
%
% Our own state\dots
%
-% \begin{macro}{\typog@mathitalicscorrection}
+% \begin{macro}{\typog@config@mathitalicscorrection}
% \begin{macrocode}
-\newmuskip\typog@mathitalicscorrection
+\newmuskip\typog@config@mathitalicscorrection
+
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@textitalicscorrection}
+% Actual \cs{labelitem}\meta{N} corrections.
+%
+% \begin{ldimen}{\typog@adjust@labelitemi}
+% \begin{macrocode}
+\newdimen{\typog@adjust@labelitemi}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@labelitemii}
+% \begin{macrocode}
+\newdimen{\typog@adjust@labelitemii}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@labelitemiii}
+% \begin{macrocode}
+\newdimen{\typog@adjust@labelitemiii}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@labelitemiv}
+% \begin{macrocode}
+\newdimen{\typog@adjust@labelitemiv}
+% \end{macrocode}
+% \end{ldimen}
+%
+% Configuration constants for \cs{labelitem}\meta{N} corrections.
+%
+% \begin{ldimen}{\typog@adjust@lowercase@labelitemi}
+% \begin{macrocode}
+\newdimen{\typog@adjust@lowercase@labelitemi}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@lowercase@labelitemii}
+% \begin{macrocode}
+\newdimen{\typog@adjust@lowercase@labelitemii}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@lowercase@labelitemiii}
+% \begin{macrocode}
+\newdimen{\typog@adjust@lowercase@labelitemiii}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@lowercase@labelitemiv}
+% \begin{macrocode}
+\newdimen{\typog@adjust@lowercase@labelitemiv}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@uppercase@labelitemi}
+% \begin{macrocode}
+\newdimen{\typog@adjust@uppercase@labelitemi}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@uppercase@labelitemii}
+% \begin{macrocode}
+\newdimen{\typog@adjust@uppercase@labelitemii}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@uppercase@labelitemiii}
% \begin{macrocode}
-\newlength{\typog@textitalicscorrection}
+\newdimen{\typog@adjust@uppercase@labelitemiii}
+% \end{macrocode}
+% \end{ldimen}
+%
+% \begin{ldimen}{\typog@adjust@uppercase@labelitemiv}
+% \begin{macrocode}
+\newdimen{\typog@adjust@uppercase@labelitemiv}
+
+% \end{macrocode}
+% \end{ldimen}
+%
+% Other lengths\dots
+%
+% \begin{macro}{\typog@config@textitalicscorrection}
+% \begin{macrocode}
+\newlength{\typog@config@textitalicscorrection}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@ligaturekern}
+% \begin{macro}{\typog@config@ligaturekern}
% \begin{macrocode}
-\newlength{\typog@ligaturekern}
+\newlength{\typog@config@ligaturekern}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@raisecapitaldash}
+% \begin{macro}{\typog@config@raisecapitaldash}
% \begin{macrocode}
-\newlength{\typog@raisecapitaldash}
+\newlength{\typog@config@raisecapitaldash}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@raisecapitalguillemets}
+% \begin{macro}{\typog@config@raisecapitalguillemets}
% \begin{macrocode}
-\newlength{\typog@raisecapitalguillemets}
+\newlength{\typog@config@raisecapitalguillemets}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@raisecapitalhyphen}
+% \begin{macro}{\typog@config@raisecapitalhyphen}
% \begin{macrocode}
-\newlength{\typog@raisecapitalhyphen}
+\newlength{\typog@config@raisecapitalhyphen}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@raisecapitaltimes}
+% \begin{macro}{\typog@config@raisecapitaltimes}
% \begin{macrocode}
-\newlength{\typog@raisecapitaltimes}
+\newlength{\typog@config@raisecapitaltimes}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@raiseguillemets}
+% \begin{macro}{\typog@config@raiseguillemets}
% \begin{macrocode}
-\newlength{\typog@raiseguillemets}
+\newlength{\typog@config@raiseguillemets}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@raisefiguredash}
+% \begin{macro}{\typog@config@raisefiguredash}
% \begin{macrocode}
-\newlength{\typog@raisefiguredash}
+\newlength{\typog@config@raisefiguredash}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@slashkern}
+% \begin{macro}{\typog@config@slashkern}
% \begin{macrocode}
-\newlength{\typog@slashkern}
+\newlength{\typog@config@slashkern}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@breakpenalty}
+% \begin{macro}{\typog@config@breakpenalty}
% \begin{macrocode}
-\newcommand*{\typog@breakpenalty}{\exhyphenpenalty}
+\newcommand*{\typog@config@breakpenalty}{\exhyphenpenalty}
% \end{macrocode}
% \end{macro}
%
@@ -4771,9 +5683,9 @@ end
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\typog@trackingttspacing}
+% \begin{macro}{\typog@config@trackingttspacing}
% \begin{macrocode}
-\newcommand*{\typog@trackingttspacing}{300, 90, 60}
+\newcommand*{\typog@config@trackingttspacing}{300, 90, 60}
% \end{macrocode}
% \end{macro}
%
@@ -4871,77 +5783,99 @@ end
\newcommand*{\typog@set@shrink@limits}
{\edef\typog@@star{*}%
- \edef\typog@@limit{\typog@triple@get@i{\typog@shrinklimits}}%
+ \edef\typog@@limit{\typog@triple@get@i{\typog@config@shrinklimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@shrink@i{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@ii{\typog@shrinklimits}}%
+ \edef\typog@@limit{\typog@triple@get@ii{\typog@config@shrinklimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@shrink@ii{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@iii{\typog@shrinklimits}}%
+ \edef\typog@@limit{\typog@triple@get@iii{\typog@config@shrinklimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@shrink@iii{\number\typog@@limit}\fi}
\newcommand*{\typog@set@stretch@limits}
{\edef\typog@@star{*}%
- \edef\typog@@limit{\typog@triple@get@i{\typog@stretchlimits}}%
+ \edef\typog@@limit{\typog@triple@get@i{\typog@config@stretchlimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@stretch@i{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@ii{\typog@stretchlimits}}%
+ \edef\typog@@limit{\typog@triple@get@ii{\typog@config@stretchlimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@stretch@ii{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@iii{\typog@stretchlimits}}%
+ \edef\typog@@limit{\typog@triple@get@iii{\typog@config@stretchlimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@stretch@iii{\number\typog@@limit}\fi}
\DeclareOptionX<typog>{breakpenalty}%
- {\renewcommand*{\typog@breakpenalty}{#1}}
+ {\renewcommand*{\typog@config@breakpenalty}{#1}}
\DeclareOptionX<typog>{debug}{\typog@debugtrue}
\DeclareOptionX<typog>{mathitalicscorrection}[.4mu]%
- {\typog@mathitalicscorrection=#1\relax}%
+ {\typog@config@mathitalicscorrection=#1\relax}%
\DeclareOptionX<typog>{nodebug}{\typog@debugfalse}
\DeclareOptionX<typog>{textitalicscorrection}[.02em]%
- {\setlength{\typog@textitalicscorrection}{#1}}
+ {\setlength{\typog@config@textitalicscorrection}{#1}}
\DeclareOptionX<typog>{ligaturekern}[.033333em]%
- {\setlength{\typog@ligaturekern}{#1}}
+ {\setlength{\typog@config@ligaturekern}{#1}}
+\DeclareOptionX<typog>{lowercaselabelitemadjustments}%
+ {\typog@debug@typeout{lowercaselabelitemadjustments={#1}}
+ \def\typog@@do##1{\addtocounter{typog@@iteration}{1}
+ \global\setlength{\csname typog@adjust@lowercase@labelitem\romannumeral\thetypog@@iteration\endcsname}{##1}}
+ \setcounter{typog@@iteration}{0}
+ \forcsvlist{\typog@@do}{#1}}
+\newcommand*{\typog@config@lowercaselabelitemadjustments}
+ {\the\typog@adjust@lowercase@labelitemi,\space
+ \the\typog@adjust@lowercase@labelitemii,\space
+ \the\typog@adjust@lowercase@labelitemiii,\space
+ \the\typog@adjust@lowercase@labelitemiv}
\DeclareOptionX<typog>{raisecapitaldash}[\z@]%
- {\setlength{\typog@raisecapitaldash}{#1}}
+ {\setlength{\typog@config@raisecapitaldash}{#1}}
\DeclareOptionX<typog>{raisecapitalguillemets}[\z@]%
- {\setlength{\typog@raisecapitalguillemets}{#1}}
+ {\setlength{\typog@config@raisecapitalguillemets}{#1}}
\DeclareOptionX<typog>{raisecapitalhyphen}[\z@]%
- {\setlength{\typog@raisecapitalhyphen}{#1}}
+ {\setlength{\typog@config@raisecapitalhyphen}{#1}}
\DeclareOptionX<typog>{raisecapitaltimes}[\z@]%
- {\setlength{\typog@raisecapitaltimes}{#1}}
+ {\setlength{\typog@config@raisecapitaltimes}{#1}}
\DeclareOptionX<typog>{raiseguillemets}[\z@]%
- {\setlength{\typog@raiseguillemets}{#1}}
+ {\setlength{\typog@config@raiseguillemets}{#1}}
\DeclareOptionX<typog>{raisefiguredash}[\z@]%
- {\setlength{\typog@raisefiguredash}{#1}}
+ {\setlength{\typog@config@raisefiguredash}{#1}}
\DeclareOptionX<typog>{raise*}[\z@]%
- {\setlength{\typog@raisecapitaldash}{#1}%
- \setlength{\typog@raisecapitalhyphen}{#1}%
- \setlength{\typog@raisecapitaltimes}{#1}%
- \setlength{\typog@raisefiguredash}{#1}}
+ {\setlength{\typog@config@raisecapitaldash}{#1}%
+ \setlength{\typog@config@raisecapitalhyphen}{#1}%
+ \setlength{\typog@config@raisecapitaltimes}{#1}%
+ \setlength{\typog@config@raisefiguredash}{#1}}
\DeclareOptionX<typog>{shrinklimits}%
[\typog@default@shrink@i, \typog@default@shrink@ii, \typog@default@shrink@iii]%
{\typog@require@preloaded@microtype
\ifx\@onlypreamble\@notprerr
\PackageWarning{typog}{option `shrinklimits' can only be used in the preamble}%
\else
- \edef\typog@shrinklimits{#1}%
+ \edef\typog@config@shrinklimits{#1}%
\typog@set@shrink@limits
\fi}
\DeclareOptionX<typog>{slashkern}[.05em]%
- {\setlength{\typog@slashkern}{#1}}
+ {\setlength{\typog@config@slashkern}{#1}}
\DeclareOptionX<typog>{stretchlimits}%
[\typog@default@stretch@i, \typog@default@stretch@ii, \typog@default@stretch@iii]%
{\typog@require@preloaded@microtype
\ifx\@onlypreamble\@notprerr
\PackageWarning{typog}{option `stretchlimits' can only be used in the preamble}%
\else
- \edef\typog@stretchlimits{#1}%
+ \edef\typog@config@stretchlimits{#1}%
\typog@set@stretch@limits
\fi}
-\DeclareOptionX<typog>{trackingttspacing}[\typog@trackingttspacing]%
+\DeclareOptionX<typog>{trackingttspacing}[\typog@config@trackingttspacing]%
{\typog@require@preloaded@microtype
\ifx\@onlypreamble\@notprerr
\PackageWarning{typog}{option `trackingttspacing' can only be used in the preamble}%
\else
- \typog@typeout{trackingttspacing=#1}%
+ \typog@debug@typeout{trackingttspacing=#1}%
\SetTracking[outer spacing={#1}]{encoding=*, family=tt*}{0}%
\fi}
+\DeclareOptionX<typog>{uppercaselabelitemadjustments}%
+ {\typog@debug@typeout{uppercaselabelitemadjustments={#1}}
+ \def\typog@@do##1{\addtocounter{typog@@iteration}{1}
+ \setlength{\csname typog@adjust@uppercase@labelitem\romannumeral\thetypog@@iteration\endcsname}{##1}}
+ \setcounter{typog@@iteration}{0}
+ \forcsvlist{\typog@@do}{#1}}
+\newcommand*{\typog@config@uppercaselabelitemadjustments}
+ {\the\typog@adjust@uppercase@labelitemi,\space
+ \the\typog@adjust@uppercase@labelitemii,\space
+ \the\typog@adjust@uppercase@labelitemiii,\space
+ \the\typog@adjust@uppercase@labelitemiv}
\newcommand*{\typog@initialize@options}
{\ExecuteOptionsX<typog>{
@@ -4963,7 +5897,7 @@ end
% \fi
%
%
-% \subsection*{Setup}
+% \subsection{Setup and Reconfiguration}
%
% \begin{environment}{typogsetup}
% An empty argument list resets all initialized values to their defaults.
@@ -4982,8 +5916,42 @@ end
% \end{environment}
%
% \begin{macro}{\typogget}
+% Access the package's configuration (name-)space.
+%
% \begin{macrocode}
-\NewDocumentCommand{\typogget}{m}{\csname typog@#1\endcsname}
+\NewDocumentCommand{\typogget}{m}{\csname typog@config@#1\endcsname}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typoggetnth}
+% \changes{v0.4}{2024-05-15}{New macro.}
+% Access the \(n\)\textsuperscript{th} element of a comma-separated, list-like configuration
+% item's value.
+%
+% \begin{macrocode}
+\ExplSyntaxOn
+\cs_generate_variant:Nn \seq_set_split:Nnn {Nne}
+\cs_new:Npn \typog_get_nth_csname:cnn #1#2#3
+ {
+ \seq_set_split:Nne \l_tmpa_seq {,} {\cs:w typog@config@#2 \cs_end:}
+ \cs_gset:cpn {#1} {\seq_item:Nn \l_tmpa_seq {#3}}
+ }
+\cs_new:Npn \typog_get_nth_dimen:nnn #1#2#3
+ {
+ \seq_set_split:Nne \l_tmpa_seq {,} {\cs:w typog@config@#2 \cs_end:}
+ \dim_set:Nn {#1} {\seq_item:Nn \l_tmpa_seq {#3}}
+ }
+\NewDocumentCommand{\typoggetnth}{m m m}{
+ \token_if_dim_register:NTF {#1}
+ {
+ \typog_get_nth_dimen:nnn {#1} {#2} {#3}
+ }
+ {
+ \typog_get_nth_csname:cnn {#1} {#2} {#3}
+ }
+}
+\ExplSyntaxOff
% \end{macrocode}
% \end{macro}
@@ -5065,6 +6033,7 @@ end
%
% \begin{macrocode}
\newcounter{typog@inspect@count}
+
% \end{macrocode}
% \end{macro}
%
@@ -5085,11 +6054,16 @@ end
\edef\typog@@arg{#2}%
\ifx\typog@@arg\empty
\stepcounter{typog@inspect@count}%
- \edef\typog@@id{\typog@default@inspect@id@prefix\arabic{typog@inspect@count}}%
+ \edef\typog@@id{\typog@default@inspect@id@prefix
+ \arabic{typog@inspect@count}}%
\else
\edef\typog@@id{\typog@trim@spaces{\typog@@arg}}%
\fi
- \typeout{<typog-inspect id="\typog@@id" job="\jobname" line="\the\inputlineno" page="\the\value{page}">}%
+ \typeout{<typog-inspect\space
+ id="\typog@@id"\space
+ job="\jobname"\space
+ line="\the\inputlineno"\space
+ page="\the\value{page}">}%
% \end{macrocode}
%
% Set both badness thresholds to absurdly low values as to activate \TeX's reports.
@@ -5210,7 +6184,7 @@ end
% \begin{macro}{\nolig}
% \begin{macrocode}
\NewDocumentCommand{\nolig}{s o}
- {\dimen0=\IfNoValueTF{#2}{\typog@ligaturekern}{#2\typog@dim@unit}%
+ {\dimen0=\IfNoValueTF{#2}{\typog@config@ligaturekern}{#2\typog@dim@unit}%
\IfBooleanTF{#1}%
{\kern\dimen0\ignorespaces}%
{\discretionary{\typog@hyphen}{}{\kern\dimen0}%
@@ -5249,7 +6223,7 @@ end
%
% \begin{macrocode}
\newcommand*{\typog@itcorr@text@unconditional}[1]
- {\kern#1\typog@textitalicscorrection}
+ {\kern#1\typog@config@textitalicscorrection}
% \end{macrocode}
% \end{macro}
%
@@ -5275,7 +6249,7 @@ end
%
% \begin{macrocode}
\newcommand*{\typog@itcorr@math}[1]
- {\mkern#1\typog@mathitalicscorrection}
+ {\mkern#1\typog@config@mathitalicscorrection}
% \end{macrocode}
% \end{macro}
%
@@ -5326,11 +6300,11 @@ end
%
% \begin{macrocode}
\NewDocumentCommand{\kernedslash}{s}
- {\hspace*{\typog@slashkern}%
+ {\hspace*{\typog@config@slashkern}%
\typog@forwardslash
\IfBooleanTF{#1}%
- {\hspace*{\typog@slashkern}\ignorespaces}%
- {\typog@breakpoint\typog@allowhyphenation\hspace*{\typog@slashkern}}}
+ {\hspace*{\typog@config@slashkern}\ignorespaces}%
+ {\typog@breakpoint\typog@allowhyphenation\hspace*{\typog@config@slashkern}}}
% \end{macrocode}
%
% \acronym{PDF}-substitute definition
@@ -5358,7 +6332,7 @@ end
\def\typog@@optarg{#2}%
\hspace*{#3\typog@dim@unit}%
\raisebox{\ifx\typog@@optarg\typog@@auto
- \typog@raisecapitalhyphen
+ \typog@config@raisecapitalhyphen
\else
\typog@@optarg\typog@dim@unit
\fi}{\typog@hyphen}%
@@ -5428,7 +6402,7 @@ end
%
% \begin{macrocode}
\newcommand*{\typog@breakpoint}
- {\penalty\typog@breakpenalty}
+ {\penalty\typog@config@breakpenalty}
% \end{macrocode}
% \end{macro}
%
@@ -5439,7 +6413,7 @@ end
%
% \begin{macrocode}
\NewDocumentCommand{\capitalhyphen}{s}
- {\raisebox{\typog@raisecapitalhyphen}{\typog@hyphen}%
+ {\raisebox{\typog@config@raisecapitalhyphen}{\typog@hyphen}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -5473,7 +6447,7 @@ end
%
% \begin{macrocode}
\NewDocumentCommand{\capitalendash}{s}
- {\raisebox{\typog@raisecapitaldash}{\textendash}%
+ {\raisebox{\typog@config@raisecapitaldash}{\textendash}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -5503,7 +6477,7 @@ end
%
% \begin{macrocode}
\NewDocumentCommand{\capitalemdash}{s}
- {\raisebox{\typog@raisecapitaldash}{\textemdash}%
+ {\raisebox{\typog@config@raisecapitaldash}{\textemdash}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -5531,7 +6505,7 @@ end
%
% \begin{macrocode}
\NewDocumentCommand{\figuredash}{s}
- {\raisebox{\typog@raisefiguredash}{\textendash}%
+ {\raisebox{\typog@config@raisefiguredash}{\textendash}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -5550,9 +6524,9 @@ end
% \begin{macrocode}
\NewDocumentCommand{\capitaltimes}{}
{\ifmmode
- \mathbin{\raisebox{\typog@raisecapitaltimes}{$\m@th\times$}}%
+ \mathbin{\raisebox{\typog@config@raisecapitaltimes}{$\m@th\times$}}%
\else
- \raisebox{\typog@raisecapitaltimes}{\texttimes}%
+ \raisebox{\typog@config@raisecapitaltimes}{\texttimes}%
\fi}
% \end{macrocode}
%
@@ -5571,7 +6545,7 @@ end
% \begin{macrocode}
\NewDocumentCommand{\singleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raiseguillemets}{\guilsinglleft}}
+ \raisebox{\typog@config@raiseguillemets}{\guilsinglleft}}
% \end{macrocode}
%
% \acronym{PDF}-substitute definition
@@ -5584,7 +6558,7 @@ end
% \begin{macro}{\singleguillemetright}
% \begin{macrocode}
\NewDocumentCommand{\singleguillemetright}{}
- {\raisebox{\typog@raiseguillemets}{\guilsinglright}%
+ {\raisebox{\typog@config@raiseguillemets}{\guilsinglright}%
\typog@allowhyphenation}
% \end{macrocode}
%
@@ -5599,7 +6573,7 @@ end
% \begin{macrocode}
\NewDocumentCommand{\doubleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raiseguillemets}{\guillemotleft}}
+ \raisebox{\typog@config@raiseguillemets}{\guillemotleft}}
% \end{macrocode}
%
% \acronym{PDF}-substitute definition
@@ -5612,7 +6586,7 @@ end
% \begin{macro}{\doubleguillemetright}
% \begin{macrocode}
\NewDocumentCommand{\doubleguillemetright}{}
- {\raisebox{\typog@raiseguillemets}{\guillemotright}%
+ {\raisebox{\typog@config@raiseguillemets}{\guillemotright}%
\typog@allowhyphenation}
% \end{macrocode}
%
@@ -5627,7 +6601,7 @@ end
% \begin{macrocode}
\NewDocumentCommand{\Singleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raisecapitalguillemets}{\guilsinglleft}}
+ \raisebox{\typog@config@raisecapitalguillemets}{\guilsinglleft}}
% \end{macrocode}
%
% \acronym{PDF}-substitute definition
@@ -5640,7 +6614,7 @@ end
% \begin{macro}{\Singleguillemetright}
% \begin{macrocode}
\NewDocumentCommand{\Singleguillemetright}{}
- {\raisebox{\typog@raisecapitalguillemets}{\guilsinglright}%
+ {\raisebox{\typog@config@raisecapitalguillemets}{\guilsinglright}%
\typog@allowhyphenation}
% \end{macrocode}
%
@@ -5655,7 +6629,7 @@ end
% \begin{macrocode}
\NewDocumentCommand{\Doubleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raisecapitalguillemets}{\guillemotleft}}
+ \raisebox{\typog@config@raisecapitalguillemets}{\guillemotleft}}
% \end{macrocode}
%
% \acronym{PDF}-substitute definition
@@ -5668,7 +6642,7 @@ end
% \begin{macro}{\Doubleguillemetright}
% \begin{macrocode}
\NewDocumentCommand{\Doubleguillemetright}{}
- {\raisebox{\typog@raisecapitalguillemets}{\guillemotright}%
+ {\raisebox{\typog@config@raisecapitalguillemets}{\guillemotright}%
\typog@allowhyphenation}
% \end{macrocode}
%
@@ -5681,6 +6655,457 @@ end
% \end{macro}
%
%
+% \subsection{Vert. Adjust Label Items}
+%
+% \begin{macro}{\@typog@uppercase@adjust@labelitem}
+% Handle all possible requests for uppercase label item correction.
+% Patch |itemize|~environments.
+%
+% \begin{macrocode}
+\newcommand*{\@typog@uppercase@adjust@labelitem}[1]
+ {\@typog@maybe@patch@itemize
+ \ifstrequal{#1}{*}
+ {\setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@uppercase@labelitemi}
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@uppercase@labelitemii}
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@uppercase@labelitemiii}
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@uppercase@labelitemiv}}
+ {\ifcase #1% 0
+ \relax % outside of any itemize environment
+ \or % 1
+ \setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@uppercase@labelitemi}
+ \or % 2
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@uppercase@labelitemii}
+ \or % 3
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@uppercase@labelitemiii}
+ \or % 4
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@uppercase@labelitemiv}
+ \else
+ \PackageError{typog}
+ {Itemize level out of range}
+ {Valid levels are 1, 2, 3, 4, and *}
+ \fi}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@typog@lowercase@adjust@labelitem}
+% Handle all possible requests for lowercase label item correction.
+% Patch |itemize|~environments.
+%
+% \begin{macrocode}
+\newcommand*{\@typog@lowercase@adjust@labelitem}[1]
+ {\@typog@maybe@patch@itemize
+ \ifstrequal{#1}{*}
+ {\setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@lowercase@labelitemi}
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@lowercase@labelitemii}
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@lowercase@labelitemiii}
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@lowercase@labelitemiv}}
+ {\ifcase #1% 0
+ \relax % outside of any itemize environment
+ \or % 1
+ \setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@lowercase@labelitemi}
+ \or % 2
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@lowercase@labelitemii}
+ \or % 3
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@lowercase@labelitemiii}
+ \or % 4
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@lowercase@labelitemiv}
+ \else
+ \PackageError{typog}
+ {Itemize level out of range}
+ {Valid levels are 1, 2, 3, 4, and *}
+ \fi}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@typog@noadjust@labelitem}
+% Neutralize all label item corrections.
+% This function \emph{does not} request patching any |itemize|~environment!
+%
+% \begin{macrocode}
+\newcommand*{\@typog@noadjust@labelitem}[1]
+ {\ifstrequal{#1}{*}
+ {\setlength{\typog@adjust@labelitemi}{\z@}
+ \setlength{\typog@adjust@labelitemii}{\z@}
+ \setlength{\typog@adjust@labelitemiii}{\z@}
+ \setlength{\typog@adjust@labelitemiv}{\z@}}
+ {\ifcase #1% 0
+ \relax % outside of any itemize environment
+ \or % 1
+ \setlength{\typog@adjust@labelitemi}{\z@}
+ \or % 2
+ \setlength{\typog@adjust@labelitemii}{\z@}
+ \or % 3
+ \setlength{\typog@adjust@labelitemiii}{\z@}
+ \or % 4
+ \setlength{\typog@adjust@labelitemiv}{\z@}
+ \else
+ \PackageError{typog}
+ {Itemize level out of range}
+ {Valid levels are 1, 2, 3, 4, and *}
+ \fi}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\uppercaseadjustlabelitems}
+% \changes{v0.4}{2024-05-14}{New macro.}
+% User macro that handles lists and the treats the empty list specially. We wrap the code
+% into \cs{AfterPreamble} because it may be called in the document's preamble where we don't
+% know whether package~\packagename{enumitem} already has been loaded and we can patch its
+% variant of \code{itemize}.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\uppercaseadjustlabelitems}{m}
+ {\AfterPreamble{%
+ \ifblank{#1}
+ {\@typog@uppercase@adjust@labelitem{\@itemdepth}}
+ {\forcsvlist{\@typog@uppercase@adjust@labelitem}{#1}}%
+ \ignorespaces}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\lowercaseadjustlabelitems}
+% \changes{v0.4}{2024-05-14}{New macro.}
+% User macro that handles lists and the treats the empty list specially.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\lowercaseadjustlabelitems}{m}
+ {\AfterPreamble{%
+ \ifblank{#1}
+ {\@typog@lowercase@adjust@labelitem{\@itemdepth}}
+ {\forcsvlist{\@typog@lowercase@adjust@labelitem}{#1}}%
+ \ignorespaces}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\noadjustlabelitems}
+% \changes{v0.4}{2024-05-14}{New macro.}
+% User macro that handles lists and the treats the empty list specially.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\noadjustlabelitems}{m}
+ {\ifblank{#1}
+ {\@typog@noadjust@labelitem{\@itemdepth}}
+ {\forcsvlist{\@typog@noadjust@labelitem}{#1}}%
+ \ignorespaces}
+
+% \end{macrocode}
+% \end{macro}
+%
+% Now we get to the dirty part. All the above definitions do not get called until we hack the
+% existing |itemize|-environments, either the one of plain~\LaTeX{} or the one modified by
+% package~\packagename{enumitem}.
+%
+% Here comes the result of \code{latexdef -c article -s itemize}, which was used to derive the
+% patch code:
+%
+% \begin{verbatim}
+% \def\itemize{%
+% \ifnum \@itemdepth > \thr@@
+% \@toodeep
+% \else
+% \advance\@itemdepth\@ne
+% \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+% \expandafter
+% \list
+% \csname\@itemitem\endcsname
+% {\def\makelabel##1{\hss\llap{##1}}}%
+% \fi}\end{verbatim}
+%
+% \begin{macro}{\@typog@itemize@patch}
+% This is the additional code we inject into plain \LaTeX's or
+% package~\packagename{enumitem}'s \cs{itemize}.
+%
+% \begin{macrocode}
+\newcommand*{\@typog@itemize@patch}
+% \end{macrocode}
+%
+% Save the original definition of \cs{@itemitem} for chain-calling it later on.
+%
+% \begin{macrocode}
+ {\letcs{\@typog@old@itemitem}{\@itemitem}
+% \end{macrocode}
+%
+% Sneak in our own macro's name.
+%
+% \begin{macrocode}
+ \edef\@itemitem{@typog@labelitem\romannumeral\the\@itemdepth}
+% \end{macrocode}
+%
+% Redefine under the original macro's name so that our code gets called and the old code
+% (\cs{@typog@old@itemitem}) is expanded.
+%
+% \begin{macrocode}
+ \expandafter\def\csname\@itemitem\endcsname
+ {\raisebox{\csname typog@adjust@labelitem\romannumeral\the\@itemdepth\endcsname}
+ {\@typog@old@itemitem}}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% If package~\packagename{enumitem} has been loaded, we use the \emph{same} patch. Here comes
+% the result of \code{latexdef -c article -p enumitem -s enit@itemize@i} that explains, why no
+% change is required:
+%
+% \begin{verbatim}
+% \def\enit@itemize@i#1#2#3#4{%
+% \ifnum #1 > #3 \relax
+% \enit@toodeep
+% \else
+% \enit@prelist\@ne{#1}{#2}%
+% \edef\@itemitem{label#2\romannumeral#1}%
+% \expandafter
+% \enit@list
+% \csname\@itemitem\endcsname
+% {\let\enit@calc\z@
+% \def\makelabel##1{\enit@align{\enit@format{##1}}}%
+% \enit@preset{#2}{#1}{#4}%
+% \enit@calcleft
+% \enit@before
+% \enit@negwidth}%
+% \enit@keyfirst
+% \fi}\end{verbatim}
+%
+% \begin{macro}{\@typog@patch@itemize}
+% Unconditionally apply the patches that are just \emph{single} macro calls to disturb the
+% original macros as little as possible. If we detect \packagename{enumitem} to be present
+% we modify its definition of \code{itemize} otherwise we wrestle \LaTeX's macro.
+%
+% \begin{macrocode}
+\newcommand*{\@typog@patch@itemize}
+ {\ifdefined\enit@itemize@i
+ \patchcmd{\enit@itemize@i}
+ {\expandafter}
+ {\@typog@itemize@patch\expandafter}
+ {\typog@debug@typeout{patching enumitem \string\enit@itemize@i\space succeeded}}
+ {\PackageError{typog}
+ {Patching enumitem macro \string\enit@itemize@i\space failed}
+ {}}
+ \else
+ \patchcmd{\itemize}
+ {\expandafter}
+ {\@typog@itemize@patch\expandafter}
+ {\typog@debug@typeout{patching \string\itemize\space succeeded}}
+ {\PackageError{typog}
+ {Patching plain LaTeX macro \string\itemize\space failed}
+ {}}
+ \fi}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@typog@maybe@patch@itemize}
+% Apply the patches only once.
+%
+% \begin{macrocode}
+\newbool{@typog@itemize@has@been@patched}
+\newcommand*{\@typog@maybe@patch@itemize}
+ {\ifbool{@typog@itemize@has@been@patched}
+ {\relax}
+ {\@typog@patch@itemize
+ \booltrue{@typog@itemize@has@been@patched}}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% Here come our convenience macros to simplify an accurate setup of the label adjustments.
+%
+% \begin{macro}{\typog@hairline@width}
+% Line width of the horizontal reference lines in our convenience macros.
+%
+% \begin{macrocode}
+\newcommand*{\typog@hairline@width}{.125pt}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typogadjuststairsfor}
+% The arguments are:
+% \#1: \meta{scale-factor},
+% \#2: \meta{step-size},
+% \#3: \meta{number-of-steps},
+% \#4: \meta{sample}, and
+% \#5: \cs{labelitem}\meta{N}.
+%
+% Generate an ascending stairs of argument~\#5.
+%
+% \begin{macrocode}
+\newcommand*{\typogadjuststairsfor}[5]
+% \end{macrocode}
+%
+% Store (half of) the space between two samples in \cs{dimen0}.
+%
+% \begin{macrocode}
+ {\dimen0=1pt%
+% \end{macrocode}
+%
+% Load the \meta{number-of-steps} and ensure that it is odd.
+%
+% \begin{macrocode}
+ \count0=#3\relax
+ \unless\ifodd\count0
+ \advance\count0 by 1%
+ \fi
+% \end{macrocode}
+%
+% Set the iteration counter.
+%
+% \begin{macrocode}
+ \setcounter{typog@@iteration}{1}%
+% \end{macrocode}
+%
+% Put the \meta{sample} into a box so that we can measure it with \cs{ht}.
+%
+% \begin{macrocode}
+ \setbox0=\hbox{#4}%
+% \end{macrocode}
+%
+% Box~1 is the accumulator for the raised samples.
+%
+% \begin{macrocode}
+ \setbox1=\hbox{}%
+% \end{macrocode}
+%
+% Build the stairs.
+%
+% \begin{macrocode}
+ \loop
+ \ifnum\thetypog@@iteration=\numexpr\count0 / 2\relax
+ \dimen1=2\dimen0
+ \else
+ \dimen1=\dimen0
+ \fi
+ \dimen2=\dimexpr#2 * (\thetypog@@iteration - \count0 / 2)\relax
+ \setbox1=\hbox{\unhbox1\raisebox{\dimen2}{\kern\dimen1 #5\kern\dimen1}}%
+ \addtocounter{typog@@iteration}{1}%
+ \unless\ifnum\thetypog@@iteration>\count0
+ \repeat
+% \end{macrocode}
+%
+% Merge the stairs with a hairline at \#1 times the height of \meta{sample}.
+% Answer just a single box.
+%
+% \begin{macrocode}
+ \mbox{\rlap{\raisebox{\fpeval{#1}\ht0}{\rule{\wd1}{\typog@hairline@width}}}\box1}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typogadjuststairs}
+% \changes{v0.4}{2024-05-14}{New macro.}
+% The arguments are:
+% \#1: \meta{scale-factor},
+% \#2: \meta{step-size},
+% \#3: \meta{number-of-steps}, and
+% \#4: \meta{sample}.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\typogadjuststairs}{O{.5} m m m}
+ {\begingroup
+ \unless\ifdim #2>\z@
+ \PackageError{typog}
+ {\string\typogadjuststairs\space non-positive step-size}
+ {step-size must be a positive dimension}%
+ \fi
+ \ifnum #3<1
+ \PackageError{typog}
+ {\string\typogadjuststairs\space too few number-of-steps}
+ {number-of-steps must at least be 1}%
+ \fi
+ \ifblank{#4}
+ {\PackageError{typog}
+ {sample must not be empty}
+ {supply either some uppercase or some lowercase letters}}
+ {}%
+ \def\arraystretch{1}%
+ \begin{tabular}{@{}c@{}}
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemi} \\
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemii} \\
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemiii} \\
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemiv}
+ \end{tabular}
+ \endgroup}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typog@uppercase@adjusted@labelitems}
+% Return all four labelitems in a horizontal box after they have been adjusted with the
+% uppercase-constants set.
+%
+% \begin{macrocode}
+\newcommand*{\typog@uppercase@adjusted@labelitems}
+ {\hbox{\raisebox{\typog@adjust@uppercase@labelitemi}{\labelitemi}%
+ \raisebox{\typog@adjust@uppercase@labelitemii}{\labelitemii}%
+ \raisebox{\typog@adjust@uppercase@labelitemiii}{\labelitemiii}%
+ \raisebox{\typog@adjust@uppercase@labelitemiv}{\labelitemiv}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typoguppercaseadjustcheck}
+% \changes{v0.4}{2024-05-14}{New macro.}
+% We stuff the user's sample text into a box only to measure its height. We typeset all four
+% labels and draw a hairline at half the height of the sample right through it.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\typoguppercaseadjustcheck}{O{.5} m}
+ {\setbox0=\hbox{#2}%
+ \setbox1=\typog@uppercase@adjusted@labelitems
+ \mbox{\rlap{\raisebox{\fpeval{#1}\ht0}
+ {\rule{\wd1}{\typog@hairline@width}}}%
+ \box1}}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typog@lowercase@adjusted@labelitems}
+% Return all four labelitems in a horizontal box after they have been adjusted with the
+% lowercase-constants set.
+%
+% \begin{macrocode}
+\newcommand*{\typog@lowercase@adjusted@labelitems}
+ {\hbox{\raisebox{\typog@adjust@lowercase@labelitemi}{\labelitemi}%
+ \raisebox{\typog@adjust@lowercase@labelitemii}{\labelitemii}%
+ \raisebox{\typog@adjust@lowercase@labelitemiii}{\labelitemiii}%
+ \raisebox{\typog@adjust@lowercase@labelitemiv}{\labelitemiv}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\typoglowercaseadjustcheck}
+% \changes{v0.4}{2024-05-14}{New macro.}
+% Same code as \cs{typoguppercaseadjustcheck} for lowercase.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\typoglowercaseadjustcheck}{O{.5} m}
+ {\setbox0=\hbox{#2}%
+ \setbox1=\typog@lowercase@adjusted@labelitems
+ \mbox{\rlap{\raisebox{\fpeval{#1}\ht0}
+ {\rule{\wd1}{\typog@hairline@width}}}%
+ \box1}}
+
+% \end{macrocode}
+% \end{macro}
+%
+%
% \subsection[Align Last Line]{Align Last Line of a Paragraph}
%
% The code of environment |lastlineraggedleftpar|
@@ -5955,7 +7380,7 @@ end
% \end{environment}
%
%
-% \subsection{Microtype Front\capitalhyphen End}
+% \subsection{\packagename{Microtype} Front\capitalhyphen End}
%
% \subsubsection*{Tracking}
%
@@ -6296,7 +7721,7 @@ end
% \item[Initialize.] \code{load("list\_functions")\$}
% \item[\cs{tolerance}:] \code{logspace(log10(200), log10(9999), 9), numer;}
% \item[\cs{emergencystretch}:] \code{linspace(0, 3, 9), numer;}
-% \item[\cs{hfuzz}:] \code{linspace(0.1, 0.5, 9);}
+% \item[\cs{hfuzz}:] \code{linspace(.1, .5, 9);}
% \end{description}
% \end{implementationnote}
%
@@ -6338,7 +7763,7 @@ end
\NewDocumentCommand{\vtietop}{O{3}}
{\setcounter{typog@mean@penalty}
{\typog@geometric@mean{\@M}{\clubpenalty}}%
- \typog@typeout{vtietop: penalties \the\@M--\the\value{typog@mean@penalty}--\the\clubpenalty}%
+ \typog@debug@typeout{vtietop: penalties \the\@M--\the\value{typog@mean@penalty}--\the\clubpenalty}%
\unless\ifnum\clubpenalty<\@M
\PackageWarning{typog}{vtietop: clubpenalty=\the\clubpenalty\space>= 10000}%
\fi
@@ -6426,7 +7851,7 @@ end
\NewDocumentCommand{\vtiebot}{O{3}}
{\setcounter{typog@mean@penalty}
{\typog@geometric@mean{\@M}{\widowpenalty}}%
- \typog@typeout{vtiebot: penalties \the\@M--\the\value{typog@mean@penalty}--\the\widowpenalty}%
+ \typog@debug@typeout{vtiebot: penalties \the\@M--\the\value{typog@mean@penalty}--\the\widowpenalty}%
\unless\ifnum\widowpenalty<\@M
\PackageWarning{typog}{vtiebot: widowpenalty=\the\widowpenalty\space>= 10000}%
\fi
@@ -6494,7 +7919,7 @@ end
\NewDocumentCommand{\typog@vtiebotdisp}{m}
{\setcounter{typog@mean@penalty}
{\typog@geometric@mean{\@M}{\displaywidowpenalty}}%
- \typog@typeout{vtiebotdisp: penalties \the\@M--\the\value{typog@mean@penalty}--\the\displaywidowpenalty}%
+ \typog@debug@typeout{vtiebotdisp: penalties \the\@M--\the\value{typog@mean@penalty}--\the\displaywidowpenalty}%
\unless\ifnum\displaywidowpenalty<\@M
\PackageWarning{typog}{vtiebotdisp: displaywidowpenalty=\the\displaywidowpenalty\space>= 10000}%
\fi
@@ -6588,7 +8013,7 @@ end
% \end{environment}
%
%
-% \subsection{Setspace Front-End}
+% \subsection{\packagename{Setspace} Front-End}
%
% \begin{macro}{\typog@iter@limit}
% The maximum number of iterations we perform before bailing out with an error. Can be
@@ -6631,9 +8056,9 @@ end
% \begin{macrocode}
\dim_set:Nn \l_tmpa_dim {\glueexpr #1}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
initial\space baselineskip:\space \the\baselineskip}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
target\space baselineskip:\space \dim_use:N \l_tmpa_dim}
\dim_compare:nNnTF {\baselineskip} > {\c_zero_dim}
@@ -6686,10 +8111,10 @@ end
{}
}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
final\space \string\setstretch\space argument:\space
\fp_use:N \l_tmpa_fp}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
final\space baselineskip:\space \the\baselineskip}
}
@@ -6756,7 +8181,7 @@ end
% \begin{macrocode}
\AfterEndPreamble{
\dim_set:Nn \typogfontsize {\fontdimen6\font}
- \typog@typeout{\string\typogfontsize =
+ \typog@debug@typeout{\string\typogfontsize =
\dim_use:N \typogfontsize\space
(at\space begin\space of\space document)}
}
@@ -6892,13 +8317,13 @@ end
\skip1=#2\relax
\skip2=#3\relax
\skip3=#4\relax
- \typog@typeout{smoothraggedrightshapetriplet: skip0=\the\skip0}%
- \typog@typeout{smoothraggedrightshapetriplet: skip1=\the\skip1}%
- \typog@typeout{smoothraggedrightshapetriplet: skip2=\the\skip2}%
- \typog@typeout{smoothraggedrightshapetriplet: skip3=\the\skip3}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip0=\the\skip0}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip1=\the\skip1}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip2=\the\skip2}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip3=\the\skip3}%
\unless\ifnum\typog@mod{\typog@triplet@max@lines}{3}=0
\PackageError{typog}
- {Line number of triplet generator %
+ {Line number of triplet generator\space
(\typog@triplet@max@lines) not divisible by 3}
{}
\fi
@@ -6943,15 +8368,15 @@ end
\skip3=#4\relax
\skip4=#5\relax
\skip5=#6\relax
- \typog@typeout{smoothraggedrightshapequintuplet: skip0=\the\skip0}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip1=\the\skip1}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip2=\the\skip2}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip3=\the\skip3}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip4=\the\skip4}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip5=\the\skip5}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip0=\the\skip0}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip1=\the\skip1}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip2=\the\skip2}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip3=\the\skip3}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip4=\the\skip4}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip5=\the\skip5}%
\unless\ifnum\typog@mod{\typog@quintuplet@max@lines}{5}=0
\PackageError{typog}
- {Line number of quintuplet generator %
+ {Line number of quintuplet generator\space
(\typog@quintuplet@max@lines) not divisible by 5}
{}
\fi
@@ -6998,17 +8423,17 @@ end
\skip5=#6\relax
\skip6=#7\relax
\skip7=#8\relax
- \typog@typeout{smoothraggedrightshapeseptuplet: skip0=\the\skip0}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip1=\the\skip1}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip2=\the\skip2}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip3=\the\skip3}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip4=\the\skip4}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip5=\the\skip5}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip6=\the\skip6}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip7=\the\skip7}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip0=\the\skip0}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip1=\the\skip1}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip2=\the\skip2}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip3=\the\skip3}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip4=\the\skip4}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip5=\the\skip5}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip6=\the\skip6}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip7=\the\skip7}%
\unless\ifnum\typog@mod{\typog@septuplet@max@lines}{7}=0
\PackageError{typog}
- {Line number of septuplet generator %
+ {Line number of septuplet generator\space
(\typog@septuplet@max@lines) not divisible by 7}
{}
\fi
@@ -7115,7 +8540,7 @@ end
% |generator=triplet| produces a \doublequotes{short line -- long line -- middle length line}~sequence.
% \begin{macrocode}
\typog@fuzzwidth=.25\smoothraggedrightragwidth
- \typog@typeout{smoothraggedright: generator=triplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
+ \typog@debug@typeout{smoothraggedright: generator=triplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
\smoothraggedrightshapetriplet[leftskip=\typog@@smoothraggedrightleftskip,
parindent=\glueexpr\smoothraggedrightparindent + \parindent,
#1]%
@@ -7130,7 +8555,7 @@ end
% |generator=quintuplet|.
% \begin{macrocode}
\typog@fuzzwidth=.125\smoothraggedrightragwidth
- \typog@typeout{smoothraggedright: generator=quintuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
+ \typog@debug@typeout{smoothraggedright: generator=quintuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
\smoothraggedrightshapequintuplet[leftskip=\typog@@smoothraggedrightleftskip,
parindent=\glueexpr\smoothraggedrightparindent + \parindent,
#1]%
@@ -7153,7 +8578,7 @@ end
%
% \begin{macrocode}
\typog@fuzzwidth=.08333\smoothraggedrightragwidth
- \typog@typeout{smoothraggedright: generator=septuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
+ \typog@debug@typeout{smoothraggedright: generator=septuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
\smoothraggedrightshapeseptuplet[leftskip=\typog@@smoothraggedrightleftskip,
parindent=\glueexpr\smoothraggedrightparindent + \parindent,
#1]%
@@ -7198,7 +8623,7 @@ end
%
%
% \addtocontents{toc}{\protect\end{multicols}}
-% \addtocontents{toc}{\endgroup}
+% \addtocontents{toc}{\protect\end{list}}
%
%
% \Finale
@@ -7220,10 +8645,14 @@ end
\usepackage{fullwidth}
\usepackage{hyphenat}
\usepackage{mathtools}
-\usepackage[activate=true, verbose=true]{microtype}
+\usepackage[activate=true, verbose=false]{microtype}
\usepackage{ragged2e}
\usepackage[nobottomtitles*]{titlesec}\renewcommand*{\bottomtitlespace}{.2\textheight}
-\usepackage[debug, trackingttspacing]{typog}
+\usepackage{trace}
+\usepackage[debug,
+ trackingttspacing,
+ uppercaselabelitemadjustments={0pt, .1em, .15em, .1em},
+ lowercaselabelitemadjustments={-.0667em, 0pt, .1em, 0pt}]{typog}
\usepackage{xcolor}
\usepackage[loosest, proportional, scaled=1.064]{erewhon}
@@ -7234,49 +8663,42 @@ end
\def\xsfdefault{\relax}
-{
- \def\examplefont{6}
-
- \ifcase\examplefont % 0 -- document's default sans-serif font (e.g., ecrm1000)
- \gdef\examplefontname{default}
- \global\let\xsf=\sf
- \global\let\xsfdefault=\sfdefault
- \or % 1 -- Nunito
- \gdef\examplefontname{Nunito}
- \usepackage{nunito}
- \xdef\xsfdefault{\rmdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 2 -- OpenSans
- \gdef\examplefontname{OpenSans}
- \usepackage[defaultsans]{opensans}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 3 -- Noto Sans
- \gdef\examplefontname{OpenSans}
- \usepackage[sfdefault]{noto}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 4 -- Roboto
- \gdef\examplefontname{Roboto}
- \usepackage[sfdefault]{roboto}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 5 -- Montserrat
- \gdef\examplefontname{Montserrat Alternate}
- \usepackage[alternates]{montserrat}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \or % 6 -- Inter
- \gdef\examplefontname{Inter}
- \usepackage[sfdefault]{inter}
- \xdef\xsfdefault{\sfdefault}
- \gdef\xsf{\let\sfdefault=\xsfdefault\sf}
- \else
- \SelectedUnknownExampleFont
- \fi
- \typeout{typog-example: font for examples: `\xsfdefault'}%
-}
+\def\examplefont{6}
+
+\ifcase\examplefont % 0 -- document's default sans-serif font (e.g., ecrm1000)
+ \def\examplefontname{default}
+ \let\xsf=\sf
+ \let\xsfdefault=\sfdefault
+\or % 1 -- Nunito
+ \def\examplefontname{Nunito}
+ \def\xsfdefault{Nunito-TOsF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 2 -- OpenSans
+ \def\examplefontname{OpenSans}
+ \def\xsfdefault{opensans-TLF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 3 -- Noto Sans
+ \def\examplefontname{Noto Sans}
+ \def\xsfdefault{NotoSans-TLF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 4 -- Roboto
+ \def\examplefontname{Roboto}
+ \def\xsfdefault{Roboto-LF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 5 -- Montserrat
+ \def\examplefontname{Montserrat Alternates}
+ \def\xsfdefault{MontserratAlternates-LF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\or % 6 -- Inter
+ \def\examplefontname{Inter}
+ \def\xsfdefault{Inter-LF}
+ \def\xsf{\let\sfdefault=\xsfdefault\sf}
+\else
+ \SelectedUnknownExampleFont
+\fi
+
+\typeout{typog-example: font for examples: `\xsfdefault'}%
\usepackage{hyperref}
@@ -7388,7 +8810,6 @@ end
concentrate all the badness in one place, making one truly unsightly line instead of
two moderately bad ones, because a single ``write-off'' produces fewest total
demerits according to the rules.}
- %There is a much better way to get the desired effect:~[\dots]
\newcommand*{\texbooktolerancesamplecredits}
{\medskip\noindent
\textsl{The sample text was taken from The~\TeX{}book~\cite[p.~107]{knuth:1986}.}}
@@ -7396,7 +8817,7 @@ end
\newcommand*{\texbookparfillskipsample}
{We still haven't discussed the special trick that allows the final line of a paragraph
to be shorter than the others. Just before \TeX{} begins to choose breakpoints,
- it does two important things: [\dots]}
+ it does two important things: [\dots\itcorr{-4}]}
\newcommand*{\texbooklongparfillskipsample}
{We still haven't discussed the special trick that allows the final line of a paragraph
to be shorter than the others. Just before \TeX{} begins to choose breakpoints,
@@ -7404,7 +8825,7 @@ end
that glue is discarded. (The reason is that a blank space often gets into a token list just
before \code{\char92par} or just before \code{\char36\char36}, and this blank space should not be
part of the paragraph.) (2)~Three or more items are put at the end of the
- current horizontal list~[\dots]}
+ current horizontal list~[\dots\itcorr{-4}]}
\newcommand*{\texbookparfillskipsamplecredits}
{\medskip\noindent
\textsl{The sample text was taken from The~\TeX{}book~\cite[p.~99n]{knuth:1986}.}}
@@ -7458,7 +8879,7 @@ end
\setcounter{tocdepth}{1}
-\setlength{\overfullrule}{3pt}
+\setlength{\overfullrule}{0pt}
\hbadness=-1
@@ -7575,7 +8996,76 @@ in the official documentation of package~\packagename{typog}.
\noindent
Unless otherwise noted the font used in the examples is \singlequotes{\examplefontname}.
-\bigskip
+
+\section{Setup and Reconfiguration}
+
+\noindent
+\code{\char`\\ typogget}
+
+\begin{list}{}{}
+ \newcommand*{\expandsto}{$\mathbin{\mapsto}$}
+\item \code{breakpenalty} \expandsto{} \the\typogget{breakpenalty}
+\item \code{ligaturekern} \expandsto{} \milliem{\typogget{ligaturekern}}
+\item \code{lowercaselabelitemadjustments} \expandsto{} \typogget{lowercaselabelitemadjustments}
+\item \code{mathitalicscorrection} \expandsto{} \the\typogget{mathitalicscorrection}
+\item \code{raisecapitaldash} \expandsto{} \the\typogget{raisecapitaldash}
+\item \code{raisecapitalguillemets} \expandsto{} \the\typogget{raisecapitalguillemets}
+\item \code{raisecapitalhyphen} \expandsto{} \the\typogget{raisecapitalhyphen}
+\item \code{raisecapitaltimes} \expandsto{} \the\typogget{raisecapitaltimes}
+\item \code{raisefiguredash} \expandsto{} \the\typogget{raisefiguredash}
+\item \code{raiseguillemets} \expandsto{} \the\typogget{raiseguillemets}
+\item \code{shrinklimits} \expandsto{} \typogget{shrinklimits}
+\item \code{slashkern} \expandsto{} \the\typogget{slashkern}
+\item \code{stretchlimits} \expandsto{} \typogget{stretchlimits}
+\item \code{textitalicscorrection} \expandsto{} \the\typogget{textitalicscorrection}
+\item \code{trackingttspacing} \expandsto{} \typogget{trackingttspacing}
+\item \code{uppercaselabelitemadjustments} \expandsto{} \typogget{uppercaselabelitemadjustments}
+\end{list}
+
+\begingroup
+ \dimen0=\typogget{raisecapitaldash}%
+ \setbox0=\hbox to \typogget{ligaturekern} {}%
+\endgroup
+
+\noindent
+\code{\char`\\ typoggetnth}
+
+\begin{list}{}{}
+\item
+ Elements of \code{lowercaselabelitemadjustments}:
+ (1)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{1}\the\dimen0,
+ (2)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{2}\the\dimen0,
+ (3)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{3}\the\dimen0, and
+ (4)~\typoggetnth{\dimen0}{lowercaselabelitemadjustments}{4}\the\dimen0.
+
+ Same elements now accessed from the right-hand-side, i.\,e.~with negative indices:
+ (\textminus4)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-4}\nth,
+ (\textminus3)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-3}\nth,
+ (\textminus2)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-2}\nth, and
+ (\textminus1)~\typoggetnth{nth}{lowercaselabelitemadjustments}{-1}\nth.
+
+\item Elements of \code{shrinklimits}:
+ (1)~\typoggetnth{nth}{shrinklimits}{1}\nth,
+ (2)~\typoggetnth{nth}{shrinklimits}{2}\nth, and
+ (3)~\typoggetnth{nth}{shrinklimits}{3}\nth.
+
+\item Elements of \code{stretchlimits}:
+ (1)~\typoggetnth{nth}{stretchlimits}{1}\nth,
+ (2)~\typoggetnth{nth}{stretchlimits}{2}\nth, and
+ (3)~\typoggetnth{nth}{stretchlimits}{3}\nth.
+
+\item Elements of \code{trackingttspacing}:
+ (1)~\typoggetnth{nth}{trackingttspacing}{1}\nth,
+ (2)~\typoggetnth{nth}{trackingttspacing}{2}\nth, and
+ (3)~\typoggetnth{nth}{trackingttspacing}{3}\nth.
+
+\item Elements of \code{uppercaselabelitemadjustments}:
+ (1)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{1}\the\dimen0,
+ (2)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{2}\the\dimen0,
+ (3)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{3}\the\dimen0, and
+ (4)~\typoggetnth{\dimen0}{uppercaselabelitemadjustments}{4}\the\dimen0.
+\end{list}
+
\section{Information}
@@ -8068,6 +9558,82 @@ We again compare the default implementation with the adjusted one.
\end{quote}
+\section{Label Items}
+
+The current configurations for the uppercase and lowercase adjustments are
+\{\typogget{uppercaselabelitemadjustments}\} and \{\typogget{lowercaselabelitemadjustments}\},
+respectively.
+
+\begin{center}
+ \makeatletter
+ \noindent
+ A\raisebox{\typog@adjust@uppercase@labelitemi}{\labelitemi}%
+ B\raisebox{\typog@adjust@uppercase@labelitemii}{\labelitemii}%
+ E\raisebox{\typog@adjust@uppercase@labelitemiii}{\labelitemiii}%
+ G\raisebox{\typog@adjust@uppercase@labelitemiv}{\labelitemiv}H \\
+ a\raisebox{\typog@adjust@lowercase@labelitemi}{\labelitemi}%
+ b\raisebox{\typog@adjust@lowercase@labelitemii}{\labelitemii}%
+ c\raisebox{\typog@adjust@lowercase@labelitemiii}{\labelitemiii}%
+ e\raisebox{\typog@adjust@lowercase@labelitemiv}{\labelitemiv}g
+ \makeatother
+\end{center}
+
+For the following nested lists we adjust levels one and three for uppercase and levels two and
+four for lowercase.
+
+\begingroup
+ \uppercaseadjustlabelitems{1,3}
+ \lowercaseadjustlabelitems{2,4}
+ \setlength{\itemsep}{0pt}
+ \setlength{\parsep}{0pt}
+ \setlength{\topsep}{0pt}
+ \begin{itemize}
+ \item A
+ \item B
+ \item C
+ \begin{itemize}
+ \item d
+ \item e
+ \item f
+ \begin{itemize}
+ \item G
+ \item H
+ \item I
+ \begin{itemize}
+ \item j
+ \item k
+ \item l
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+\endgroup
+\noadjustlabelitems{*}% not necessary, but we want to exercise the macro
+
+The left example shows the result of \code{\string\typogadjuststairs\{.25pt\}\{11\}\{ABC\}} and
+the one on the right hand side just uses the same parameters except for the sample~\sample{ace},
+this is, only lowercase letters.
+
+\begin{center}
+ \begin{minipage}[t]{12em}
+ \centering
+ \typogadjuststairs{.25pt}{11}{ABC}
+ \end{minipage}
+ \begin{minipage}[t]{12em}
+ \centering
+ \typogadjuststairs{.25pt}{11}{ace}
+ \end{minipage}
+\end{center}
+
+For this document the calls
+\code{\string\typoguppercaseadjustcheck\{ABC\-DEF\-GHI\-JKL\-MNO\-PQR\-STU\-VWX\-YZ\}} and
+\code{\string\typoglowercaseadjustcheck\{ace\-gmn\-opq\-rsu\-vwx\-yz\}} yield
+\sample{\typoguppercaseadjustcheck{ABCDEFGHIJKLMNOPQRSTUVWXYZ}} and
+\sample{\typoglowercaseadjustcheck{acegmnopqrsuvwxyz}}, where the adjustments in effect are
+\code{\{\typogget{uppercaselabelitemadjustments}\}} and
+\code{\{\typogget{lowercaselabelitemadjustments}\}}, respectively.
+
+
\clearpage
\section{Align Last Line}
@@ -8292,7 +9858,7 @@ consult \propername{David Carlisle's} excellent post on \propername{StackExchang
\begin{center}
\setlength{\overfullrule}{0pt}
- \newcommand*{\spacesampletext}[1]{some#1text#1with#1spaces\rule{0.1pt}{1em}}
+ \newcommand*{\spacesampletext}[1]{some#1text#1with#1spaces\rule{.1pt}{1em}}
\newsavebox{\narrowspacesample}
\sbox{\narrowspacesample}{\spacesampletext{\narrowspace}}
\newsavebox{\widespacesample}
@@ -8707,7 +10273,7 @@ New settings: \baselinesetsize.
\newcommand*{\relbls}{130}
\paragraph{\code{\string\setbaselineskippercentage\{\relbls\}}}
-\setbaselineskippercentage{1 + 2 + .3333 * 100 + 100 * 0.6667}% float expression
+\setbaselineskippercentage{1 + 2 + .3333 * 100 + 100 * .6667}% float expression
\setbaselineskippercentage{\relbls}
\fontsizeinfo{baselinesetsize}
New settings: \baselinesetsize.
@@ -8840,7 +10406,7 @@ visually: \rule{.1pt}{.8em}\kern\parindent\rule{.1pt}{.8em};
%
%
% \iffalse
-%<*nomicrotype>
+%<*without-microtype>
\documentclass[]{article}
@@ -8853,7 +10419,9 @@ visually: \rule{.1pt}{.8em}\kern\parindent\rule{.1pt}{.8em};
{\singleguillemetright}
{\singleguillemetleft}
-\usepackage[]{typog}
+\usepackage[uppercaselabelitemadjustments={.1em, .075em, .1em, .1em},
+ lowercaselabelitemadjustments={-.025em, -.05em, -.025em, -.025em}]
+ {typog}
\newcommand*{\packagename}[1]{\mbox{\textsf{#1}}}
@@ -8868,7 +10436,9 @@ visually: \rule{.1pt}{.8em}\kern\parindent\rule{.1pt}{.8em};
\bigskip
-\noindent
+
+\section*{No Microtype}
+
This example \LaTeX-document uses package~\packagename{typog}
\emph{without} package~\packagename{microtype}.
@@ -8876,6 +10446,38 @@ We want \packagename{typog} to be as usable as possible even without
the nice features that \packagename{microtype} offers.
After all \packagename{typog} is just a front-end for it.
+
+\section*{No EnumItem}
+
+We intentionally do not load package~\packagename{enumitem}, either.
+So, we can test whether \packagename{typog} correctly patches the
+plain \LaTeX{} definition if environment~\texttt{itemize}.
+
+The vertical alignment of the label items was setup for
+uppercase (ABC\typoguppercaseadjustcheck{ABCXYZ}XYZ) and for
+lowercase (ace\typoglowercaseadjustcheck{acexyz}xyz), though
+this is not necessary for the test.
+
+\uppercaseadjustlabelitems{*}
+\begin{itemize}
+\item Level i
+\item Sublist \dots
+ \begin{itemize}
+ \item Level ii
+ \item Sublist \dots
+ \begin{itemize}
+ \item Level iii
+ \item Sublist \dots
+ \begin{itemize}
+ \item Level iv
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+\end{itemize}
+
+
+\section*{CSQuotes}
+
As we are testing a special configuration here anyhow,
we hook up our quotes with package~csquotes
to check whether they interact ok.
@@ -8883,7 +10485,28 @@ to check whether they interact ok.
\enquote{This is the outer part of the phrase
which contains the \enquote{inner part}.}}
\end{document}
-%</nomicrotype>
+%</without-microtype>
+% \fi
+%
+%
+%
+% \iffalse
+%<*minimal-test>
+\documentclass{minimal}
+
+\usepackage{typog}
+
+\newcommand*{\raiseamount}{0.5pt}
+
+\begin{document}
+\begin{typogsetup}{raise*=\raiseamount}
+ Em-dash raised by \the\typogget{raisecapitaldash} (expected: \raiseamount).
+\end{typogsetup}
+
+\fontsizeinfo{typoinfo}
+Document class ``minimal'' sets up font size and line spacing as~\typoinfo.
+\end{document}
+%</minimal-test>
% \fi
%
%
@@ -8902,35 +10525,49 @@ to check whether they interact ok.
/@menu/,/@end menu/d
## Convert sectioning macros to our own hierarchy.
-s/^@chapter \(.*\)$/\\subsection*{\\textls[40]{\1}}/
-s/^@section \(.*\)$/\\subsubsection*{\1}/
+s/^@chapter \(.*\)$/\\subsection{\\titlecase{\1}\\label{\1}}/
+s/^@section \(.*\)$/\\subsubsection{\\titlecase{\1}}\\label{\1}/
## Make `@asis' list resemble the Texinfo format.
s/@table @asis/\\begin{list}{}{\\itemindent=-20pt\\leftmargin=20pt}/
s/@end table/\\end{list}/
+## We substitute our maxipage environment for @display.
+s/@display/\\begin{maxipage}/
+s/@end display/\\end{maxipage}/
+
+## Translate `@example' environments.
+s/@example/\\begin{quote}\\tt\\obeylines/
+s/@end example/\\end{quote}\n\n/
+
## Indenting by four spaces generates a `verbatim' environment.
s/@verbatim/\\begin{verbatim}/
s/@end verbatim/\\end{verbatim}/
-## We substitute @display for our maxipage environment.
-s/@display/\\begin{maxipage}/
-s/@end display/\\end{maxipage}/
-
## The argument format of the URL macro is different.
s/@url{\([^,]*\), \([^}]*\)}/\\href{\1}{\2}/g
## Use our own markup.
s/\.\.\./\\dots{}/g
s/LaTeX/\\LaTeX{}/g
-s/@file/\\textit/g
+s/@file/\\emph/g
s/@strong/\\textbf/g
+s/@var/\\emph/g
s/[w]{/mbox{/g
+## Translate some Texinfo macros.
+s/@backslashchar/\\char`\\\\/g
+s/@lbracechar/\\{/g
+s/@noindent/\\noindent/g
+s/@rbracechar/\\}/g
+
## Quote some special characters.
s/%/\\%/g
s/_/\\_/g
+## Add space around alternative-indicators.
+s/[|]/\\,|\\,/g
+
## Adapt to how a man-page is typeset.
## En-dashes in front of long options really suck!
s/--/-\\nolig*-/g
@@ -8944,7 +10581,7 @@ s/@@/@/g
s/\\jobname/\\textbackslash jobname/g
## Make qualified Perl names breakable.
-s/::/::\\discretionary{}{}{}/g
+s/::/::\\breakpoint*/g
%</teximan2latex>
% \fi
%
@@ -8960,6 +10597,7 @@ use strict;
use warnings;
use Data::Dumper ();
+use Encode ();
use English;
use File::Basename ();
use Getopt::Long;
@@ -9011,32 +10649,32 @@ sub limit_string_length {
## We set all colors to `undef' and fill them later with the values
## of the actual configuration.
my $highlight_patterns = {
- PARTIAL_LINE => {
- FONT_SPEC => [qr#
- \\
- (?: OMS | OMX | OT1 | T1 | TS1 | U )
- (?: /[^/]+ ){5} / \S+ \s
- (?: \([+-]\d+\) )?
- #x, undef],
- MATH => [qr#
- \$
- \\
- (?: LMS | OML )
- (?: /[^/]+ ){5} / \S+ \s
- (?: \([+-]\d+\) )?
- .*?
- \$
- #x, undef]
- },
- WHOLE_LINE => {
- FILL_STATE => [qr#^(?:Under|Over)full \\hbox .*$#, undef],
- FIRST_VBOX => [qr#^%%#, undef],
- HORIZONTAL_BREAKPOINT => [qr#^@@\d+:.*$#, undef],
- HORIZONTAL_BREAK_CANDIDATE => [qr#^@[\\ ].*$#, undef],
- LINE_BREAK_PASS => [qr#^@[a-z]+?pass#, undef],
- TIGHTNESS => [qr#^(?:Loose|Tight) \\hbox .*$#, undef],
- VERTICAL_BREAKPOINT => [qr#^% t=\d+.*$#, undef]
- }
+ PARTIAL_LINE => {
+ FONT_SPEC => [qr#
+ \\
+ (?: OMS | OMX | OT1 | T1 | TS1 | U )
+ (?: /[^/]+ ){5} / \S+ \s
+ (?: \([+-]\d+\) )?
+ #x, undef],
+ MATH => [qr#
+ \$
+ \\
+ (?: LMS | OML )
+ (?: /[^/]+ ){5} / \S+ \s
+ (?: \([+-]\d+\) )?
+ .*?
+ \$
+ #x, undef]
+ },
+ WHOLE_LINE => {
+ FILL_STATE => [qr#^(?:Under|Over)full \\hbox .*$#, undef],
+ FIRST_VBOX => [qr#^%%#, undef],
+ HORIZONTAL_BREAKPOINT => [qr#^@@\d+:.*$#, undef],
+ HORIZONTAL_BREAK_CANDIDATE => [qr#^@[\\ ].*$#, undef],
+ LINE_BREAK_PASS => [qr#^@[a-z]+?pass#, undef],
+ TIGHTNESS => [qr#^(?:Loose|Tight) \\hbox .*$#, undef],
+ VERTICAL_BREAKPOINT => [qr#^% t=\d+.*$#, undef]
+ }
};
@@ -9048,7 +10686,7 @@ sub colorize_line {
return Term::ANSIColor::colored($line, $pattern_color_pair->[1])
if $line =~ $pattern_color_pair->[0];
}
- return $line if $line =~ m#^\.#; # we do not paint box contents yet
+ return $line if $line =~ m#^\.#; # we do not paint box contents yet
$line =~ s#$highlight_patterns->{PARTIAL_LINE}->{MATH}->[0]
#Term::ANSIColor::colored($MATCH, $highlight_patterns->{PARTIAL_LINE}->{MATH}->[1])
@@ -9074,13 +10712,30 @@ my $open_tag_regexp =
>#x;
+sub find_encoder {
+ my $encoding = shift;
+
+ my $encoder;
+
+ if ($encoding) {
+ $encoder = Encode::find_encoding($encoding);
+ if (!$encoder) {
+ issue_warning("encoding @{[quote_literal($encoding)]} unknown; proceeding without decoder");
+ }
+ }
+
+ return $encoder;
+}
+
+
sub grep_log_file {
my ($options, $configuration, $file, $filename, $id_regexp) = @_;
+ my $encoder = find_encoder($options->{ENCODING});
my $job_name;
- my $line_number = 0; # line number in the log file we are inspecting, i.e., $filename
+ my $line_number = 0; # line number in the log file we are inspecting, i.e., $filename
my $match_count = 0;
- my $source_line_number; # line number in TeX file the log refers to, i.e., "$job_name.tex"
+ my $source_line_number; # line number in TeX file the log refers to, i.e., "$job_name.tex"
my $page_number;
my $regexp_modifier = $options->{IGNORE_CASE} ? 'i' : '';
my $id_value;
@@ -9094,6 +10749,8 @@ sub grep_log_file {
chomp $line;
$line_number++;
+ $line = Encode::encode_utf8($encoder->decode($line, Encode::FB_CROAK)) if $encoder;
+
if ($line =~ $close_tag_regexp) {
fail_with_error("$filename: $line_number: mismatched open/close tags") unless @nesting_levels;
pop @nesting_levels;
@@ -9175,19 +10832,25 @@ sub grep_log_file {
}
}
}
+
+ return $match_count;
}
sub show_ids_in_file {
my ($options, $configuration, $file, $filename, $id_regexp) = @_;
+ my $encoder = find_encoder($options->{ENCODING});
my $line_number = 0;
+ my $match_count = 0;
my @nesting_levels;
while (my $line = readline $file) {
chomp $line;
$line_number++;
+ $line = Encode::encode_utf8($encoder->decode($line, Encode::FB_CROAK)) if $encoder;
+
if ($line =~ $close_tag_regexp) {
fail_with_error("$filename: $line_number: mismatched open/close tags") unless @nesting_levels;
pop @nesting_levels;
@@ -9200,6 +10863,7 @@ sub show_ids_in_file {
my $page_number = $+{page_match};
++$MATCH_COUNT;
+ ++$match_count;
push @nesting_levels, 1;
if ($options->{LOG_LINE_NUMBER}) {
@@ -9239,6 +10903,8 @@ sub show_ids_in_file {
print ' ' x $indent, $id_value, "\n";
}
}
+
+ return $match_count;
}
@@ -9256,7 +10922,7 @@ sub open_file_for_reading {
fail_with_error("cannot open @{[quote_filesystem($filename)]}: $OS_ERROR");
}
- $file;
+ return $file;
}
@@ -9272,9 +10938,9 @@ sub grep_or_show {
my ($options, $configuration, $file, $filename, $id_regexp) = @_;
if ($options->{SHOW_ALL_IDS}) {
- show_ids_in_file($options, $configuration, $file, $filename, $id_regexp);
+ return show_ids_in_file($options, $configuration, $file, $filename, $id_regexp);
} else {
- grep_log_file($options, $configuration, $file, $filename, $id_regexp);
+ return grep_log_file($options, $configuration, $file, $filename, $id_regexp);
}
}
@@ -9282,6 +10948,8 @@ sub grep_or_show {
sub scan_files {
my ($options, $configuration, $id_regexp, $log_filenames) = @_;
+ my $match_count = 0;
+
if (@$log_filenames) {
foreach my $log_filename (@$log_filenames) {
$log_filename = 'stdin' if $log_filename eq '-';
@@ -9294,15 +10962,17 @@ sub scan_files {
print $filename_header;
}
my $file = open_file_for_reading($log_filename);
- grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
+ $match_count += grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
close_file($file, $log_filename);
}
} else {
my $log_filename = 'stdin';
my $file = open_file_for_reading($log_filename);
- grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
+ $match_count = grep_or_show($options, $configuration, $file, $log_filename, $id_regexp);
close_file($file, $log_filename);
}
+
+ return $match_count;
}
@@ -9319,10 +10989,12 @@ sub redirect_and_scan_files {
my $stdout = select $pager;
$pager->autoflush;
- scan_files($options, $configuration, $id_regexp, $log_filenames);
+ my $match_count = scan_files($options, $configuration, $id_regexp, $log_filenames);
close $pager or issue_warning "error occurred while closing the pager (pid: $pid) pipe: $OS_ERROR";
select $stdout;
+
+ return $match_count;
}
@@ -9431,6 +11103,7 @@ sub setup_configuation {
my $default_options = {
COLORIZE_MODE => 'auto',
DEBUG => 0,
+ ENCODING => undef,
ID => 0,
IGNORE_CASE => 0,
JOB_NAME => 0,
@@ -9452,6 +11125,7 @@ Options
--colour [WHEN] use color to highlight specific log contents
WHEN is 'always', 'never', or 'auto'
-C, --config KEY=VALUE set configuration KEY to VALUE
+ -E, --encoding ENCODING set character ENCODING of LOG-FILE
-i, --[no-]id print matching id with output lines
-y, --[no-]ignore-case ignore case distinctions in patterns and data
-j, --[no-]job-name print \\jobname with output lines
@@ -9461,10 +11135,12 @@ Options
-P, --[no-]pager redirect output to pager
-w, --[no-]word-regexp match only whole words
- -a, --all, --any show all IDs in LOG-FILE
+ -a, --all, --any discover all IDs in LOG-FILE
+
--debug turn on debug output
-h, --help display this help and exit
--show-config show default configuration and exit
+ --show-encodings show all known encodings and exit
-V, --version show version information and exit
HELP_TEXT
@@ -9473,6 +11149,17 @@ HELP_TEXT
}
+sub show_encodings {
+ my @all_encodings = Encode->encodings(':all');
+
+ foreach my $encoding (@all_encodings) {
+ print "$encoding\n";
+ }
+
+ exit 0;
+}
+
+
sub show_configuration {
my $format_string_value = sub {quote_literal($default_configuration->{$_[0]})};
@@ -9508,10 +11195,10 @@ FIXED_CONFIGURATION_TEXT
sub show_version {
print <<VERSION_TEXT;
-typog-grep 0.1
+typog-grep @RELEASE@
Copyright (C) 2024 by Ch. L. Spiel
-License LPPL: LaTeX Project Public License version 1.3 or later
+License LPPL: LaTeX Project Public License version 1.3c or later
VERSION_TEXT
exit 0;
@@ -9527,6 +11214,7 @@ sub get_options {
'color|colour=s' => \$options->{COLORIZE_MODE},
'C|configuration=s' => sub{setup_configuation($_[1], $configuration)},
'debug+' => \$DEBUG,
+ 'E|encoding=s' => \$options->{ENCODING},
'h|help' => \&show_help,
'i|id!' => \$options->{ID},
'y|ignore-case!' => \$options->{IGNORE_CASE},
@@ -9535,13 +11223,18 @@ sub get_options {
'N|log-line-number!' => \$options->{LOG_LINE_NUMBER},
'p|page-number!' => \$options->{PAGE_NUMBER},
'P|pager!' => \$options->{REQUEST_PAGER},
+ 'show-encodings' => \&show_encodings,
'show-config' => \&show_configuration,
'V|version' => \&show_version,
'w|word-regexp!' => \$options->{WORD_REGEXP}) or
- fail_with_error('problems while parsing options');
+ fail_with_error('problems while parsing options');
- fail_with_error("unknown colorize mode @{[quote_literal($options->{COLORIZE_MODE})]}")
- unless $options->{COLORIZE_MODE} =~ m/^(?:always|auto|never)$/i
+ if ($options->{COLORIZE_MODE}) {
+ fail_with_error("unknown colorize mode @{[quote_literal($options->{COLORIZE_MODE})]}")
+ unless $options->{COLORIZE_MODE} =~ m/^(?:always|auto|never)$/i;
+ } else {
+ $options->{COLORIZE_MODE} = 'auto';
+ }
}
@@ -9565,14 +11258,27 @@ sub do_colorize {
sub main {
$OUTPUT_IS_REDIRECTED = -t STDOUT ? 0 : 1;
- my $options = {%$default_options};
my $configuration = {%$default_configuration};
+ my $options = {%$default_options};
+ debug_print(Data::Dumper::Dumper(['Default Configuration', $configuration]));
+ debug_print(Data::Dumper::Dumper(['Default Options', $options]));
+
+ my $user_options = {};
+ my $user_configuration = {};
+ get_options($user_options, $user_configuration);
+ debug_print(Data::Dumper::Dumper(['User Configuration', $user_configuration]));
+ debug_print(Data::Dumper::Dumper(['User Options', $user_options]));
+ while (my ($key, $value) = each %$user_options) {
+ $options->{$key} = $value if $value;
+ }
+ while (my ($key, $value) = each %$user_configuration) {
+ $configuration->{$key} = $value if $value;
+ }
+ debug_print(Data::Dumper::Dumper(['Final Configuration', $configuration]));
+ debug_print(Data::Dumper::Dumper(['Final Options', $options]));
- get_options($options, $configuration);
$options->{COLORIZE_OUTPUT} = do_colorize($options->{COLORIZE_MODE});
initialize_highlighting_from_configuration($configuration);
- debug_print(Data::Dumper::Dumper($configuration));
- debug_print(Data::Dumper::Dumper($options));
my $id_regexp;
if ($options->{SHOW_ALL_IDS}) {
@@ -9584,17 +11290,18 @@ sub main {
$id_regexp = shift @ARGV;
}
- if ($options->{REQUEST_PAGER} && $OUTPUT_IS_REDIRECTED) {
+ if ($user_options->{REQUEST_PAGER} && $OUTPUT_IS_REDIRECTED) {
issue_warning("option @{[quote_literal('--pager')]} ignored because output is redirected");
}
my $use_pager = $options->{REQUEST_PAGER} && !$OUTPUT_IS_REDIRECTED;
+ my $match_count;
if ($use_pager) {
- redirect_and_scan_files($options, $configuration, $id_regexp, \@ARGV);
+ $match_count = redirect_and_scan_files($options, $configuration, $id_regexp, \@ARGV);
} else {
- scan_files($options, $configuration, $id_regexp, \@ARGV);
+ $match_count = scan_files($options, $configuration, $id_regexp, \@ARGV);
}
- exit ($MATCH_COUNT == 0);
+ exit ($match_count == 0);
}
@@ -9615,7 +11322,7 @@ main();
=head1 NAME
-typog-grep - grep for typog-inspect elements in LaTeX log files
+typog-grep - specialized grep for typog-inspect elements in LaTeX log files
=head1 SYNOPSIS
@@ -9628,9 +11335,70 @@ typog-grep - grep for typog-inspect elements in LaTeX log files
=back
-The first form shows all C<E<lt>typog-inspect id="I<ID>" ...E<gt>> elements in F<LOG-FILE>.
+The first form, ``discovery mode'', shows all I<ID>s of
+
+=begin text
+
+<typog-inspect id="ID" ...>
+
+=end text
+
+=begin man
+
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" ...>
+.EE
+.RE
+
+=end man
+
+=begin texinfo
+
+@example
+<typog-inspect id="@var{ID}" ...>
+@end example
+@noindent
+
+=end texinfo
+
+Z<>
+elements in F<LOG-FILE>.
+
+The second form shows the contents, I<LOG-DATA>, of the elements
-The second form shows the contents of C<E<lt>typog-inspect id="I<ID>" ...E<gt>> elements
+=begin text
+
+<typog-inspect id="ID" ...>
+LOG-DATA
+</typog-inspect>
+
+=end text
+
+=begin man
+
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" ...>
+\fILOG-DATA\fP
+</typog-inspect>
+.EE
+.RE
+
+=end man
+
+=begin texinfo
+
+@example
+<typog-inspect id="@var{ID}" ...>
+@var{LOG-DATA}
+</typog-inspect>
+@end example
+@noindent
+
+=end texinfo
+
+Z<>
whose I<ID>s match I<REGEXP> in F<LOG-FILE>.
If no F<LOG-FILE> is given read from F<stdin>.
@@ -9639,57 +11407,101 @@ The S<filename C<->> is synonymous to F<stdin>.
=head1 DESCRIPTION
-B<typog-grep> is a tailored post-processor for LaTeX log files
-and the C<typoginspect> environment as provided by S<package typog>.
+B<typog-grep> is a tailored post-processor for LaTeX S<F<log> files>
+and the C<typoginspect> environment as provided by the S<LaTeX package typog>.
It shares more with the venerable
L<B<sgrep>|https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html>
than with S<POSIX L<B<grep>|https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html>>.
-The LaTeX user brackets her text in
+In the LaTeX source file the user brackets her text or code
+in a C<typoginspect> environment:
+
+=begin text
+
+\begin{typoginspect}{ID}
+ TEXT-OR-CODE-TO-INVESTIGATE
+\end{typoginspect}
+
+=end text
+
+=begin man
+
+.RS
+.EX
+\ebegin{typoginspect}{\fI\,ID\/\fP}
+\fITEXT-OR-CODE-TO-INVESTIGATE\fP
+\eend{typoginspect}
+.EE
+.RE
- \begin{typoginspect}{ID}
- Text and code to investigate
- \end{typoginspect}
+=end man
+
+=begin texinfo
+
+@example
+@backslashchar{}begin@lbracechar{}typoginspect@rbracechar{}@lbracechar{}@var{ID}@rbracechar{}
+@var{TEXT-OR-CODE-TO-INVESTIGATE}
+@backslashchar{}end@lbracechar{}typoginspect@rbracechar{}
+@end example
+@noindent
+
+=end texinfo
+Z<>
where I<ID> is used to identify one or more bracketed snippets.
I<ID> does not have to be unique.
The I<REGEXP> mechanism makes it easy to select groups of related I<ID>s
if they are named accordingly.
-In F<LOG-FILE> the environment shows up, packed with tracing information, as
+In F<LOG-FILE> the result of the environment shows up,
+packed with tracing information, as
-=begin texinfo
+=begin text
-@display
-@relax
+<typog-inspect id="ID" job="JOB-NAME" line="LINE-NUMBER" page="PAGE-NUMBER">
+ LOG-DATA
+</typog-inspect>
-=end texinfo
+=end text
+
+=begin man
- <typog-inspect id="ID" job="JOB-NAME" line="LINE-NUMBER" page="PAGE-NUMBER">
- Trace Data
- </typog-inspect>
+.RS
+.EX
+<typog-inspect id="\fI\,ID\/\fP" job="\fI\,JOB-NAME\/\fP" line="\fI\,LINE-NUMBER\/\fP" page="\fI\,PAGE-NUMBER\/\fP">
+\fILOG-DATA\fP
+</typog-inspect>
+.EE
+.RE
+
+=end man
=begin texinfo
-@end display
-@relax
+@example
+<typog-inspect id="@var{ID}" job="@var{JOB-NAME}" line="@var{LINE-NUMBER}" page="@var{PAGE-NUMBER}">
+@var{LOG-DATA}
+</typog-inspect>
+@end example
+@noindent
=end texinfo
+Z<>
where all the capital-letter sequences are meta-variables
and in particular
I<JOB-NAME> is the expansion of C<\jobname>,
I<LINE-NUMBER> is the LaTeX source file line number
of the beginning of the C<typoginspect> environment,
and I<PAGE-NUMBER> is the page where
-the output of S<C<Text and code to investigate>> occurs.
+the output of S<C<TEXT-OR-CODE-TO-INVESTIGATE>> occurs.
B<typog-grep> reveals the contents of F<LOG-FILE>
between C<E<lt>typog-inspect id="I<ID>" ...E<gt>>
-and C<E<lt>/typog-inspectE<gt>> excluding the XML-tags.
+and C<E<lt>/typog-inspectE<gt>> excluding the XML-tags themselves.
Access the I<JOB-NAME>, I<LINE-NUMBER>, and I<PAGE-NUMBER>
with the commandline options
-B<--job-name>, B<--line-number>, and B<--page-number>, respectively.
+B<--job-name>, B<--line-number>, and B<--page-number>, respectively.
Use B<--id> to show the name of the IDs that matched I<REGEXP>.
C<typoginspect> environments can be nested.
@@ -9707,11 +11519,18 @@ The list of options is sorted by the names of the long options.
=item B<-a>, B<--all>, B<--any>
ID-discovery mode:
-Show all C<typog-inspect> elements independent of any matching patterns.
+Discover all C<typog-inspect> elements independent of any matching patterns
+and print their I<ID>s.
+The results are printed in their order of occurrence in the respective F<LOG-FILE>s.
+Pipe the output into B<sort> to get alphabetically ordered I<ID>s.
+
+Augment with options
+B<--job-name>, B<--line-number>, B<--log-line-number>, or S<B<--page-number>>
+for more information.
=item B<--color>, B<colour> I<WHEN>
-Colorize specific log contents for the matching ids.
+Colorize specific log contents for the matching I<ID>s.
The S<argument I<WHEN>> determines when to apply color:
C<always>, C<never>, S<or C<auto>>.
The setting C<auto> checks whether standard output has been redirected.
@@ -9720,29 +11539,45 @@ This is the default.
=item B<-C>, B<--config> I<KEY>=I<VALUE>[:I<KEY>=I<VALUE>[:...]]
Set one or more configuration I<KEY> to I<VALUE> pairs.
-See S<Sec. CONFIGURATION> below for a description of all available configuration items.
-Use option B<--show-config> to display the default configuration.
+See section L</CONFIGURATION> for a description
+of all available configuration items.
+Use S<option B<--show-config>> to display the default configuration.
=item B<--debug>
Turn on debug output on F<stderr>.
+=item B<-E>, B<--encoding> I<ENCODING>
+
+Set the I<ENCODING> of F<LOG-FILE> for the translation to UTF-8.
+The default is unset.
+
+Use this option to get rid of pesky
+S<"E<lt>I<HEX-DIGITS>E<gt>" escapes> on UTF-8 terminals.
+See S<option B<--show-encodings>> for the known encodings and
+Encode::Supported for a summary of all encodings.
+See also S<section L</Some Common Encodings>>.
+
+Apply L<B<iconv>|https://pubs.opengroup.org/onlinepubs/9699919799/utilities/iconv.html>
+(POSIX) or L<B<recode>|https://github.com/rrthomas/recode/> (GNU) on F<LOG-FILE>
+before this tool to avoid having to use S<option B<--encoding>>.
+
=item B<-h>, B<--help>
Display brief help then exit.
=item B<-i>, B<--[no-]id>
-Print the actual id name that matched I<REGEXP>.
-Control the appearance of the matching id with configuration S<item C<id-heading>>.
+Print the actual ID-name that matched I<REGEXP>.
+Control the appearance of the matching I<ID> with configuration S<item C<id-heading>>.
=item B<-y>, B<--[no-]ignore-case>
-Match ids while ignoring case distinctions in patterns and data.
+Match I<ID>s while ignoring case distinctions in patterns and data.
=item B<-j>, B<--[no-]job-name>
-Print the C<\jobname> that B<tex> associated with the input file.
+Print the C<\jobname> that B<latex> associated with the input file.
=item B<-n>, B<--[no-]line-number>
@@ -9766,6 +11601,10 @@ Redirect output from F<stdout> to the configured pager.
Show the default configuration and exit.
+=item B<--show-encodings>
+
+Show all known encodings and exit.
+
=item B<-V>, B<--version>
Show version information and exit.
@@ -9789,26 +11628,26 @@ S<Default: C<%s:>.>
=item C<id-heading>=C<0>E<verbar>C<1>
-Choose between printing the matching ids with S<option B<--id>>:
+Choose between printing the matching I<ID>s with S<option B<--id>>:
S<Inline (C<0>)> or heading before the matching data (C<1>).
S<Default: C<0>.>
=item C<id-heading-format>=I<FORMAT>
-Control the I<FORMAT> for printing matching ids in heading-mode,
+Control the I<FORMAT> for printing matching I<ID>s in heading-mode,
where I<FORMAT> is passed to Perl's C<printf>.
S<Default: C<--E<gt> %s E<lt>-->.>
=item C<id-indent>=I<INDENT>
Indentation of nested typog-inspect tags.
-Only used in ``discovery'' mode (first form), i.e., if B<--all> is active.
+Only used in ``discovery mode'' (first form), i.e., if S<B<--all>> is active.
S<Default: 8.>
=item C<id-max-length>=I<MAXIMUM-LENGTH>
-Set the maximum length of a matching id for printing.
-It a matching id exceeds this length it will be truncated
+Set the maximum length of a matching I<ID> for printing.
+It a matching I<ID> exceeds this length it will be truncated
and the last three characters (short of I<MAXIMUM-LENGTH>) will be replaced by dots.
S<Default: 40.>
@@ -9874,11 +11713,11 @@ Color of lines with horizontal S<breakpoints C<@@>>.
=item C<id-color>
-Color of matching ids when printed inline.
+Color of matching I<ID>s when printed inline.
=item C<id-heading-color>
-Color of matching ids when printed in heading form.
+Color of matching I<ID>s when printed in heading form.
=item C<line-break-pass-color>
@@ -9947,15 +11786,93 @@ C<bold>, C<dark>, C<italic>, C<underline>, C<reverse>
=back
+=head2 Some Common Encodings
+
+The following list shows some encodings
+that are suitable for S<option B<--encoding>>.
+
+=over 4
+
+=item Latin-1, Western European
+
+C<iso-8859-1>, C<cp850>, C<cp860>, C<cp1252>
+
+=item Latin-2, Central European
+
+C<iso-8859-2>, C<cp852>, C<cp1250>
+
+=item Latin-3, South European (Esperanto, Maltese)
+
+C<iso-8859-3>
+
+=item Latin-4, North European (Baltics)
+
+C<iso-8859-4>
+
+=item Cyrillics
+
+C<iso-8859-5>, C<cp855>, C<cp866> (Ukrainian), C<cp1251>
+
+=item Arabic
+
+C<iso-8859-6>, C<cp864>, C<cp1006> (Farsi), C<cp1256>
+
+=item Greek
+
+C<iso-8859-7>, C<cp737>, C<cp1253>
+
+=item Hebrew
+
+C<iso-8859-8>, C<cp862>, C<cp1255>
+
+=item Turkish
+
+C<iso-8859-9>, C<cp857>, C<cp1254>
+
+=item Nordic
+
+C<iso-8859-10>, C<cp865>, C<cp861> (Icelandic)
+
+=item Thai
+
+C<iso-8859-11>, C<cp874>
+
+=item Baltic
+
+C<iso-8859-13>, C<cp775>, C<cp1257>
+
+=item Celtic
+
+C<iso-8859-14>
+
+=item Latin-9 (sometimes called Latin0)
+
+C<iso-8859-15>
+
+=item Latin-10
+
+C<iso-8859-16>
+
+=back
+
+
=head1 EXIT STATUS
The exit status is 0 if at least one I<ID> matched I<REGEXP>,
1 if no I<ID> matched I<REGEXP>, and 2 if an error occurred.
+=head1 CAVEATS
+
+The end tag C<< </typog-inspect> >> sometimes gets placed too early in the output and the trace
+I<seems> truncated. However, LaTeX reliably logs the requested the trace information, but the
+write operations for trace data and the code which is used to print the S<end tag> are not
+synchronized.
+
+
=head1 SEE ALSO
-B<grep>(1), B<printf>(3), B<Term::ANSIColor>(pm)
+B<grep>(1), B<printf>(3), B<Encode::Supported>(pm), B<Term::ANSIColor>(pm)
=cut
diff --git a/Master/texmf-dist/source/latex/typog/typog.ins b/Master/texmf-dist/source/latex/typog/typog.ins
index 06378d86bbe..23c8b333664 100644
--- a/Master/texmf-dist/source/latex/typog/typog.ins
+++ b/Master/texmf-dist/source/latex/typog/typog.ins
@@ -1,11 +1,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
@@ -23,11 +23,11 @@ This is a generated file.
Copyright (C) 2024 by Ch. L. Spiel
This work may be distributed and/or modified under the conditions
-of the LaTeX Project Public License, either version 1.3 of this
+of the LaTeX Project Public License, either version 1.3c of this
license or (at your option) any later version. The latest version
of this license is in
- http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX
+ https://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
version 2003/12/01 or later.
This work has the LPPL maintenance status `maintained'.
@@ -37,7 +37,9 @@ The Current Maintainer of this work is Ch. L. Spiel.
This work consists of the files typog.dtx and typog.ins
and the derived files typog.sty, slant-angle.mp,
crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-typog-example.tex, typog-nomt.tex, typog-grep.pl,
+typog-example.tex, typog-minimal-test.tex,
+typog-without-microtype-test.tex
+typog-grep.pl.in, typog-grep.pl,
typog-grep.pod, and teximan2latex.sed.
@@ -48,20 +50,22 @@ typog-grep.pod, and teximan2latex.sed.
\generate{\file{typog.sty}{\from{\source}{package}}
\file{typog-example.tex}{\from{\source}{example}}
- \file{typog-nomt.tex}{\from{\source}{nomicrotype}}
- \file{typog.ist}{\from{\source}{index-style}}}
+ \file{typog-minimal-test.tex}{\from{\source}{minimal-test}}
+ \file{typog-without-microtype-test.tex}{\from{\source}{without-microtype}}}
\nopostamble
-\generate{\file{title.mp}{\from{\source}{title}}
+\generate{\file{crooked-paragraphs.mp}{\from{\source}{crookedparagraphs}}
\file{slant-angle.mp}{\from{\source}{slantangle}}
- \file{crooked-paragraphs.mp}{\from{\source}{crookedparagraphs}}
- \file{smooth-parshapes.mp}{\from{\source}{smoothparshapes}}}
+ \file{smooth-parshapes.mp}{\from{\source}{smoothparshapes}}
+ \file{title.mp}{\from{\source}{title}}
+ \file{typog.gst}{\from{\source}{changes-style}}
+ \file{typog.ist}{\from{\source}{index-style}}}
\nopreamble
\generate{\file{teximan2latex.sed}{\from{\source}{teximan2latex}}
- \file{typog-grep.pl}{\from{\source}{typog-grep}}
+ \file{typog-grep.pl.in}{\from{\source}{typog-grep}}
\file{typog-grep.pod}{\from{\source}{typog-grep-documentation}}}
diff --git a/Master/texmf-dist/source/latex/ulthese/ulthese.dtx b/Master/texmf-dist/source/latex/ulthese/ulthese.dtx
index 0d790808812..58da90e888d 100644
--- a/Master/texmf-dist/source/latex/ulthese/ulthese.dtx
+++ b/Master/texmf-dist/source/latex/ulthese/ulthese.dtx
@@ -1,340 +1,490 @@
-% \iffalse meta-comment
+% \iffalse meta-comment -*- mode: doctex -*-
%
-% Copyright (C) 2021 Universite Laval
+% Thesis class for Universite Laval
+%
+% Copyright (C) 2012-2024 Universite Laval
%
% This file may be distributed and/or modified under the conditions
% of the LaTeX Project Public License, either version 1.3c of this
% license or (at your option) any later version. The latest version
% of this license is in:
%
-% http://www.latex-project.org/lppl.txt
-%
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2006/05/20 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Universite Laval
-% <ulthese-dev@bibl.ulaval.ca>.
-%
-% This work consists of the files ulthese.dtx and ulthese.ins
-% and the derived files listed in the README.md file.
+% https://www.latex-project.org/lppl.txt
%
+% The Current Maintainer of this work is Vincent Goulet for
+% Universite Laval <ulthese-dev@bibl.ulaval.ca>.
% \fi
%
% \iffalse
%<*dtx>
\ProvidesFile{ulthese.dtx}
%</dtx>
-%<class>\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+%<class>\NeedsTeXFormat{LaTeX2e}[2021/06/01]
%<class>\ProvidesClass{ulthese}%
%<*class>
- [2021/08/09 v5.3a Universite Laval thesis and memoir class]
+ [2024/07/02 v6.0 Thesis class for Universite Laval]
%</class>
%<*driver>
-\documentclass[11pt,english,french]{ltxdoc}
- \usepackage[utf8]{inputenc}
- \usepackage[T1]{fontenc}
- \usepackage{natbib}
+\documentclass[article,oneside,11pt,x11names,english,french]{memoir}
\usepackage{babel}
\usepackage[autolanguage]{numprint}
- \usepackage{microtype}
- \usepackage[scaled=0.92]{helvet}
- \usepackage[scaled=1.02]{inconsolata}
- \usepackage[sc]{mathpazo}
- \usepackage{fontawesome}
+ \usepackage[round,semicolon,authoryear,sectionbib]{natbib}
\usepackage{metalogo}
- \usepackage{tabularx,booktabs,caption}
+ \usepackage{enumitem}
+ \usepackage{relsize}
+ \usepackage{awesomebox}
+
+ %% Le chargement de doc.sty cause des conflits avec memoir. Il faut:
+ %%
+ %% - annuler la définition de l'environnement 'glossary' de memoir;
+ %% - remettre en place les définitions standards des commandes pour
+ %% le glossaire sur lesquelles se base doc.sty (nécessaire aussi
+ %% pour l'index, mais il n'est pas utilisé).
+ \let\theglossary\relax % avoid conflict with doc.sty
+ \let\endtheglossary\relax % avoid conflict with doc.sty
+ \makeatletter
+ \def\makeglossary{%
+ \newwrite\@glossaryfile
+ \immediate\openout\@glossaryfile=\jobname.glo
+ \def\glossary{\@bsphack\begingroup
+ \@sanitize
+ \@wrglossary}\typeout
+ {Writing glossary file \jobname.glo }%
+ \let\makeglossary\@empty
+ }
+ \@onlypreamble\makeglossary
+ \def\@wrglossary#1{%
+ \protected@write\@glossaryfile{}%
+ {\string\glossaryentry{#1}{\thepage}}%
+ \endgroup
+ \@esphack}
+ \def\glossary{\@bsphack\begingroup\@sanitize\@index}
+ \@twosidefalse\@mparswitchfalse % turn off twoside option
+ \makeatother
+ \usepackage{doc}
+ \def\changes#1#2#3{\glossary{#1>#3}} % simplification
\DisableCrossrefs
\CodelineNumbered
\RecordChanges
- \GlossaryPrologue{\section*{Historique des versions}%
- \addcontentsline{toc}{section}{Historique des versions}}
+ %\OnlyDescription
+ \DontCheckModules
+
+ %% Polices de caractères
+ \iftutex
+ \usepackage[babel=true]{microtype}
+ \usepackage{fontspec}
+ \usepackage{unicode-math}
+ \setmainfont{STIXTwoText}
+ [
+ Extension = .otf,
+ UprightFont = *-Regular,
+ BoldFont = *-SemiBold,
+ ItalicFont = *-Italic,
+ BoldItalicFont = *-SemiBoldItalic,
+ Numbers = {Proportional,OldStyle},
+ Scale = 1,
+ Ligatures = TeX
+ ]
+ \setsecheadstyle{\normalfont\Large\sffamily\bfseries\raggedright}
+ \setsubsecheadstyle{\normalfont\large\sffamily\bfseries\raggedright}
+ \setsubsubsecheadstyle{\normalfont\sffamily\bfseries\raggedright}
+ \else
+ \usepackage[babel=true]{microtype}
+ \usepackage[utf8]{inputenc}
+ \usepackage[T1]{fontenc}
+ \usepackage[stix2]{newtxmath}
+ \fi
+ \usepackage[book,medium,proportional,oldstyle,scale=0.92]{FiraSans}
+ \usepackage[medium,lining,scale=0.90]{FiraMono}
%% Couleurs
\usepackage{xcolor}
- \definecolor{link}{rgb}{0,0.4,0.6} % ~RoyalBlue de dvips
- \definecolor{url}{rgb}{0.6,0,0} % rouge foncé
- \definecolor{citation}{rgb}{0,0.5,0} % vert foncé
-
- %% Liste description alignée à gauche
- \usepackage{enumitem}
- \setlist[description]{leftmargin=*,align=left}
-
- %% Environnement pour remarques
- \usepackage{amsthm}
- \theoremstyle{definition}
- \newtheorem*{rem}{Remarque}
+ \definecolor{link}{rgb}{0,0.4,0.6} % liens internes
+ \definecolor{url}{rgb}{0.6,0,0} % liens externes
+ \definecolor{citation}{rgb}{0,0.5,0} % citations
%% Hyperliens
- \usepackage{hyperref}
- \hypersetup{%
- pdfauthor = {Faculté des études supérieures et postdoctorales},
- pdftitle = {Guide de l'utilisateur de la classe ulthese},
- colorlinks = {true},
- linktocpage = {true},
- urlcolor = {url},
- linkcolor = {link},
- citecolor = {citation},
- pdfpagemode = {UseOutlines},
- pdfstartview = {Fit},
- bookmarksopen = {true},
- bookmarksnumbered = {true},
- bookmarksdepth = {subsubsection}}
- \addto\extrasfrench{%
- \def\appendixautorefname{annexe}%
- \def\tableautorefname{tableau}%
- \def\subsectionautorefname{section}%
+ \AtEndPreamble{%
+ \usepackage{bookmark} % charge hyperref
+ \hypersetup{%
+ pdftitle = {Guide d'utilisation de la classe ulthese},
+ pdfauthor = {Faculté des études supérieures et postdoctorales},
+ colorlinks = {true},
+ urlcolor = {url},
+ linkcolor = {link},
+ citecolor = {citation}}
+ \bookmarksetup{%
+ open = true,
+ depth = 3,
+ numbered = true}
+ \addto\extrasfrench{%
+ \def\subsectionautorefname{section}%
+ }
}
%% Paramétrage de babel
- \frenchbsetup{%
- StandardItemizeEnv=true, % listes standards
+ \frenchsetup{%
+ SmallCapsFigTabCaptions=false, % pas de petites capitales
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % « et » sont les guillemets
}
- \def\frenchtablename{{\scshape Tab.}}
+ \renewcommand*\frenchtablename{Tab.}
+ \renewcommand*\frenchfigurename{Fig.}
+ \renewcommand*\generalname{Général} % mot clé du glossaire
+
+ %% Désactiver le niveau des chapitres de memoir
+ \let\chapter\relax
+ \counterwithout{section}{chapter}
+
+ %% Utiliser une numérotation des sections à trois niveaux
+ \setsecnumdepth{subsubsection}
+ \maxsecnumdepth{subsubsection}
+
+ % Les annexes sont des sections, ici. Redéfinir la
+ % commande \appendix comme dans la classe article.
+ \makeatletter
+ \renewcommand*\appendix{\par
+ \setcounter{section}{0}
+ \gdef\thesection{\@Alph\c@section}}
+ \makeatother
+
+ %% Aligner à gauche l'environnement description
+ \setlist[description]{leftmargin=*,align=left}
+
+ %% Configurer le glossaire
+ \addto\extrasfrench{%
+ \def\glossaryname{Historique des versions}}
+ \GlossaryPrologue{\section*{\glossaryname}%
+ \addcontentsline{toc}{section}{\glossaryname}}
+ \setcounter{GlossaryColumns}{2}
+ \setlength{\GlossaryMin}{5cm}
- %% Commandes de mise en forme spéciales
- \newcommand{\class}[1]{\textsf{#1}}
- \newcommand{\pkg}[1]{\textbf{#1}}
+ %% Nouvel environnement de type \DescribeMacro pour les options de
+ %% la classe
+ \NewDocElement[envlike,notoplevel,printtype=\emph{option}]{Option}{option}
- %% Commandes pour les liens vers la documentation
- \newcommand{\link}[2]{\href{#1}{#2~\raisebox{-0.2ex}{\faExternalLink}}}
- \newcommand{\doc}[2][documentation]{\link{#2}{#1}}
+ %% Commandes sémantiques additionnelles
+ \let\class\textsf
+ \let\pkg\textbf
+ \makeatletter
+ \renewcommand\code{\bgroup\@makeother\_\@makeother\~\@makeother\$\code@}
+ \def\code@#1{{\normalfont\ttfamily\hyphenchar\font=-1 #1}\egroup}
+ \makeatother
+ \newcommand*\ulthesename{ulthese}
+ \newcommand*\ulclass{\class{\ulthesename}}
+ \newcommand*\btx{\textsc{Bib}\TeX}
- %% Francisation d'un mot clé de l'historique des commandes
- \def\generalname{Général}
+ %% Redéfinir \year pour utiliser l'information de \filedate plutôt
+ %% que la date de compilation
+ \def\parsedate#1/#2/#3\relax{\def\year{#1}}
+
+ %% Convertir la date en format ISO
+ \def\isodate#1/#2/#3\relax{#1-#2-#3}
+
+ \MakeShortVerb{\|}
\begin{document}
\DocInput{ulthese.dtx}
\end{document}
%</driver>
% \fi
-% \CheckSum{914}
% \DoNotIndex{\',\^,\`,\ ,\ae}
% \DoNotIndex{\RequirePackage,\ExecuteOptions,\ProcessOptions}
% \DoNotIndex{\newcommand,\newcommand*}
% \DoNotIndex{\setlength}
+% \changes{6.0}{2024-05-22}{Prise en compte des règles de présentation
+% entrées en vigueur à l'automne 2023 qui n'exigent plus une
+% bibliographie par chapitre pour les thèses et mémoire par
+% intégration d'articles.}
+% \changes{6.0}{2024-05-22}{Suppression des options
+% \texttt{bibchapitre} et \texttt{bibsection}.}
+% \changes{6.0}{2024-07-02}{Ajout du grade de maître en travail
+% social.}
+% \changes{6.0}{2024-07-02}{Retrait du grade de maître en
+% physiothérapie.}
+% \changes{6.0}{2024-05-24}{Utilisation du codage de caractères UTF-8
+% par défaut dans la classe. Modification des gabarits en
+% conséquence.}
+% \changes{6.0}{2024-06-17}{Révision exhaustive de la documentation.}
% \changes{4.4}{2017-05-16}{Prise en charge des bibliographies
-% multiples pour les thèses et mémoires par articles.}
+% multiples pour les thèses et mémoires par articles.}
+% \changes{4.4}{2017-05-15}{Ajout de l'option \texttt{bibchapitre}.}
+% \changes{4.4}{2017-05-15}{Ajout de l'option \texttt{bibsection}.}
% \changes{4.4}{2017-05-16}{Documentation révisée, principalement ce
-% qui touche à la préparation de la bibliographie.}
+% qui touche à la préparation de la bibliographie.}
% \changes{4.3}{2017-03-01}{Nouvelles options pour les titres de
-% docteur en musique, maître en architecture, maître en
-% ergothérapie, maître en physiothérapie et maître en
-% psychoéducation.}
-% \changes{4.3}{2017-03-01}{Modifications à la composition des sigles de
-% grades.}
+% docteur en musique, maître en architecture, maître en ergothérapie,
+% maître en physiothérapie et maître en psychoéducation.}
+% \changes{4.3}{2017-03-01}{Modifications à la composition des sigles
+% de grades.}
% \changes{4.3}{2017-03-01}{Vérification de la compatibilité entre le
-% grade et les options multifacultaire, cotutelle, bidiplomation et
-% extension.}
+% grade et les options \texttt{multifacultaire}, \texttt{cotutelle},
+% \texttt{bidiplomation} et \texttt{extension}.}
% \changes{4.3}{2017-03-01}{Améliorations à la documentation.}
-% \changes{4.2}{2016-03-29}{Ajout de l'option «examen».}
+% \changes{4.2}{2016-03-29}{Ajout de l'option \texttt{examen}.}
% \changes{4.1}{2016-02-13}{Paquetage geometry déclaré incompatible
-% avec la classe.}
-% \changes{4.0}{2015-06-12}{Nouvelles règles de présentation matérielle
-% de la FESP: recto seulement, page frontispice.}
-% \changes{3.1}{2014-05-23}{Prise en charge de la maîtrise en bidiplomation.}
+% avec la classe.}
+% \changes{4.0}{2015-06-12}{Nouvelles règles de présentation
+% matérielle de la FESP: recto seulement, page frontispice.}
+% \changes{3.1}{2014-05-23}{Prise en charge de la maîtrise en
+% bidiplomation.}
% \changes{3.0a}{2014-03-24}{Modifications et corrections à la
-% documentation, notamment relativement à la configuration de natbib.}
+% documentation, notamment relativement à la configuration de
+% \textbf{natbib}.}
% \changes{3.0}{2014-01-06}{Déclaration du grade en option de la
-% classe.}
-% \changes{3.0}{2014-01-06}{Moteur XeLaTeX supporté.}
-% \changes{3.0}{2014-01-06}{Ajout de l'option nobabel.}
+% classe.}
+% \changes{3.0}{2014-01-06}{Moteur {\XeLaTeX} supporté.}
+% \changes{3.0}{2014-01-06}{Ajout de l'option \texttt{nobabel}.}
% \changes{2.1}{2013-01-16}{Utilisation transparente de la police
-% Helvetica pour la page de titre.}
+% Helvetica pour la page de titre.}
% \changes{2.0}{2013-01-13}{Traitement automatique des longs titres.}
% \changes{1.0b}{2012-11-11}{Ajouts et corrections mineures dans la
-% documentation.}
+% documentation.}
% \changes{1.0a}{2012-10-17}{Précisions dans la documentation.}
% \changes{1.0}{2012-09-30}{Version initiale.}
% \GetFileInfo{ulthese.dtx}
-% \title{\class{ulthese}: la classe pour les thèses et mémoires de
-% l'Université Laval\thanks{Ce document décrit la classe
-% \class{ulthese}~\fileversion, datée du \filedate.}}
+%
+% \title{Guide d'utilisation de la classe {\ulclass} \\ pour les thèses et
+% mémoires \\ de l'Université Laval}
% \author{Faculté des études supérieures et postdoctorales\thanks{%
% Cette classe et sa documentation ont été rédigées par Vincent
% Goulet~(Faculté des sciences et de génie) avec la collaboration de
% Koassi D'Almeida~(Faculté des études supérieures et postdoctorales) et
-% de Pierre Lasou~(Bibliothèque).}}
-% \date{}
+% Pierre Lasou~(Bibliothèque).}}
+% \date{Version {\fileversion} du {\expandafter\isodate\filedate\relax}}
% \maketitle
%
% \section{Introduction}
%
-% La classe \class{ulthese} permet de composer avec {\LaTeX} ou
-% {\XeLaTeX} des thèses et mémoires immédiatement conformes aux règles
-% générales de présentation matérielle de la Faculté des études
-% supérieures et postdoctorales (FESP) de l'Université Laval. Ces
-% règles définissent principalement la présentation des pages de titre
-% des thèses et mémoires ainsi que la disposition du texte sur la
-% page. La classe en elle-même est donc relativement simple.
-%
-% Cependant, \class{ulthese} est basée sur la classe \class{memoir}
-% \citep{memoir}, une extension de la classe standard \class{book}
-% facilitant à plusieurs égards la préparation de documents d'allure
-% professionnelle dans {\LaTeX}. La classe \class{memoir} incorpore
-% d'office plus de 30 des paquetages les plus populaires\footnote{%
-% Consulter la section~18.24 de la documentation de \class{memoir}
-% pour la liste ou encore le journal de la compilation (\emph{log})
-% d'un document utilisant la classe \class{ulthese}.}. %
-% L'intégralité des fonctionnalités de \class{memoir} se retrouve donc
-% dans \class{ulthese}.
-%
-% La classe \class{memoir} fait partie des distributions {\LaTeX}
-% modernes; elle devrait donc être installée et disponible sur votre
-% système. Elle est livrée avec une %
-% \doc{http://texdoc.net/pkg/memoir} %
-% exhaustive: le guide de l'utilisateur fait près de 600~pages!
-% N'hésitez pas à vous y référer pour réaliser une mise en page
-% particulière.
-%
-% L'autre compagnon naturel de la présente documentation est
-% \doc[Rédaction avec {\LaTeX}]{http://texdoc.net/pkg/formation-latex-ul} ^^A
-% \citep{formation-latex-ul}, la formation {\LaTeX} de l'Université Laval.
-% Vous y trouverez des informations additionnelles sur l'utilisation des
-% classes \class{ulthese} et \class{memoir}.
+% La classe {\ulclass} permet de composer des thèses et mémoires
+% immédiatement conformes aux règles générales et complémentaires de
+% présentation de la Faculté des études supérieures et postdoctorales
+% (FESP) de l'Université Laval. Ces règles définissent principalement
+% la présentation des pages de titre des thèses et mémoires, ainsi que
+% la disposition du texte sur la page.
+%
+% La composition d'un manuscript avec la classe {\ulclass} requiert une
+% distribution {\TeX} récente et à jour. Nous recommandons les
+% distributions %
+% \href{https://tug.org/texlive}{{\TeX}~Live}~---%
+% ou sa variante pour macOS %
+% \href{https://tug.org/mactex}{Mac{\TeX}}~--- %
+% et %
+% \href{https://miktex.org}{MiK{\TeX}}. %
+% Vous pouvez également avoir recours à une plateforme de rédaction en
+% ligne comme %
+% \href{https://overleaf.com}{Overleaf}; %
+% leurs distributions {\TeX} satisfont généralement les conditions
+% ci-dessus.
+%
+% La classe {\ulclass} fait partie des distributions {\TeX} standards via
+% le paquetage %
+% \href{https://ctan.org/pkg/ulthese}{\pkg{ulthese}}. %
+% Dans la mesure où votre distribution est
+% à jour, vous devriez pouvoir l'utiliser sans autre intervention.
+%
+% Le compagnon naturel de la présente documentation est \emph{Rédaction
+% avec {\LaTeX}}, la formation {\LaTeX} de l'Université Laval. Vous y
+% trouverez sans doute une foule d'informations utiles pour la
+% préparation de votre thèse ou de votre mémoire. L'ouvrage fait
+% lui aussi partie des distributions {\TeX} standards, via le
+% paquetage %
+% \href{https://ctan.org/pkg/formation-latex-ul}{\pkg{formation-latex-ul}}. %
%
% \section{Démarrage rapide (pour les impatients)}
% \label{sec:utilisation:rapide}
%
-% La classe est livrée avec les distributions {\TeX}~Live, Mac{\TeX} et
-% MiK{\TeX}. Si vous utilisez l'une ou l'autre de ces distributions et
-% qu'elle est à jour\footnote{%
-% Validez à l'aide de l'assistant de mise à jour de votre
-% distribution.}, %
-% vous devriez pouvoir utiliser \class{ulthese} sans autre
-% intervention.
-%
-% Il est recommandé de segmenter tout document d'une certaine ampleur
-% dans des fichiers |.tex| distincts pour chaque partie ---
-% habituellement un fichier par chapitre. Le document complet est alors
-% composé à l'aide d'un fichier maître qui contient le préambule
-% {\LaTeX} et un ensemble de commandes \cmd{\include} pour réunir les
-% parties dans un tout.
+% La classe {\ulclass} est livrée avec un ensemble de gabarits sur
+% lesquels se baser pour le document maître de divers types de thèses
+% et de mémoires (standard, par articles, en cotutelle, en
+% bidiplomation), ainsi que pour les parties les plus usuelles
+% (résumés français et anglais, remerciements, avant-propos,
+% introduction, chapitres, conclusion, annexe). Les noms des fichiers
+% devraient permettre de facilement identifier leur contenu. Dans la
+% distribution {\TeX}~Live, les gabarits sont classés avec la
+% documentation.
%
-% La classe \class{ulthese} est livrée avec un ensemble de gabarits sur
-% lesquels se baser pour:
-% \begin{itemize}
-% \item le document maître de divers types de thèses et de mémoires
-% (standard, par articles, en cotutelle, en bidiplomation);
-% \item les fichiers des parties les plus usuelles (résumés français
-% et anglais, avant-propos, introduction, chapitres, conclusion,
-% etc.).
-% \end{itemize}
-% Les noms des fichiers devraient permettre de facilement identifier
-% leur contenu (c'est là une bonne pratique: le nom |rappels.tex|
-% parle de lui-même et résiste mieux aux changements à l'ordre des
-% chapitres que |chapitre1.tex|).
+% Pour débuter rapidement la rédaction de votre manuscrit, copiez les
+% gabarits appropriés dans votre dossier de travail et suivez les
+% directives qui s'y trouvent. Nous recommandons de compiler votre
+% manuscript avec {\XeLaTeX}.
%
-% Dans {\TeX}~Live, les gabarits sont classés avec la documentation de
-% la classe. Pour les utiliser, copiez les fichiers appropriés dans votre
-% dossier de travail.
+% La classe utilise le codage de caractères
+% \href{https://fr.wikipedia.org/wiki/UTF-8}{UTF-8}. Vous devez donc
+% obligatoirement utiliser ce type codage quand un fichier contient
+% des caractères non-ASCII (comme des lettres accentuées).
%
-% Pour débuter la rédaction, renommez le gabarit de document maître
-% approprié d'après votre numéro de dossier. Par exemple, l'étudiante
-% dont le numéro de dossier est 111555555 et qui entame la rédaction
-% d'une thèse par articles renommera le fichier
-% \begin{quote}
-% |gabarit-doctorat-articles.tex|
-% \end{quote}
-% en
-% \begin{quote}
-% |111555555.tex|.
-% \end{quote}
+% Le reste de ce guide contient les informations détaillées sur les
+% caractéristiques et fonctionnalités de la classe.
%
-% Les gabarits comportent des commentaires succincts pour vous guider
-% dans la préparation de votre document. La \autoref{sec:gabarits}
-% fournit les informations détaillées.
+% \changes{5.3a}{2021-08-09}{Ajout à la documentation de la
+% disponibilité d'une archive pour les personnes qui ne disposent pas
+% d'une installation de {\TeX} locale.}
+% \tipbox{Si vous n'avez pas accès aux gabarits parce qu'ils ne sont
+% pas inclus dans votre distribution ou parce que vous utilisez une
+% plateforme de rédaction en ligne, poursuivez votre lecture à la
+% \autoref{sec:installation}.}
%
% \section{Installation}
+% \label{sec:installation}
%
-% Cette section explique comment installer la classe \class{ulthese}
+% Cette section explique comment installer la classe {\ulclass}
% si elle n'est pas disponible sur votre système ou si la version
% n'est pas à jour.
%
-% La classe est distribuée sous forme d'une archive |ulthese.zip| via
-% le réseau de sites \emph{Comprehensive {\TeX} Archive Network} (CTAN):
+% La classe {\ulclass} est distribuée dans le paquetage %
+% \href{https://ctan.org/pkg/ulthese}{\pkg{ulthese}} %
+% via le réseau de sites \emph{Comprehensive {\TeX} Archive Network}
+% (CTAN). Celui-ci fait partie des distributions {\TeX} standards telles
+% que {TeX}~Live, Mac{\TeX} et MiK{\TeX}. Nous recommandons fortement
+% d'installer ou de mettre à jour \pkg{ulthese} à l'aide du
+% gestionnaire de paquetages de votre distribution {\TeX}. Par
+% exemple, avec {\TeX}~Live, vous pouvez effectuer ces opérations dans
+% l'assistant graphique, ou encore avec l'une ou l'autre des commandes
+% ci-dessous:
% \begin{quote}
-% \url{https://www.ctan.org/pkg/ulthese}
+% \code{tlmgr install ulthese}
+% \end{quote}
+% ou
+% \begin{quote}
+% \code{tlmgr update ulthese}
% \end{quote}
%
-% L'installation de la classe consiste à créer le fichier
-% |ulthese.cls| et les gabarits |.tex| à partir du code source
-% documenté se trouvant dans le fichier |ulthese.dtx|. Il est
-% recommandé de simplement créer ces fichiers dans le dossier de
-% travail de la thèse ou du mémoire.
-%
-% Pour procéder à l'installation, décompressez l'archive |ulthese.zip|
-% dans votre dossier de travail, puis compilez avec {\LaTeX} le fichier
-% |ulthese.ins| en exécutant la commande suivante depuis une invite
-% de commande:
+% S'il vous est impossible d'installer des paquetages ou de mettre à
+% jour la distribution {\TeX}~--- notamment si vous utilisez une
+% plateforme de rédaction en ligne~--- vous pouvez procéder à une
+% installation simplifiée de la classe dont la portée sera limitée à
+% votre projet. Pour ce faire, téléchargez l'archive %
% \begin{quote}
-% |latex ulthese.ins|
+% \code{ulthese-installation-projet.zip}
% \end{quote}
-% Vous pouvez aussi ouvrir le fichier |ulthese.ins| dans votre éditeur
-% de texte favori et lancer depuis celui-ci la compilation avec
-% {\LaTeX}, pdf{\LaTeX}, {\XeLaTeX} ou un autre moteur {\TeX}.
+% depuis le
+% \href{https://gitlab.com/vigou3/ulthese/-/releases}{dépôt du projet ulthese}
+% et décompressez celle-ci dans le répertoire de votre document. Vous
+% disposerez alors de tous les fichiers essentiels de la classe à
+% l'intérieur de ce projet.
%
-% \changes{5.3a}{2021-08-09}{Ajout à la documentation de la
-% disponibilité d'une archive pour les personnes qui ne disposent
-% pas d'une installation de {\TeX} locale.}
-% \begin{rem}
-% Si vous ne disposez pas d'une version de {\TeX} sur votre poste de
-% travail --- vraisemblablement parce que vous utilisez une
-% plateforme de rédaction en ligne --- téléchargez
-% l'archive |ulthese-sans-tex-local.zip| depuis le
-% \link{https://gitlab.com/vigou3/ulthese/-/releases}{dépôt du
-% projet}. Celle-ci contient tous les fichiers
-% normalement créés lors de l'installation de la classe.
-% \end{rem}
+% Si votre expertise {\TeX} vous pousse à préférer une installation
+% manuelle avec accès à l'intégralité du code source de la classe,
+% consultez les instructions qui se trouvent dans le fichier
+% \code{README.md} du paquetage.
%
% \section{Utilisation}
+% \label{sec:utilisation}
+%
+% La classe {\ulclass} est basée sur la classe %
+% \href{https://ctan.org/pkg/memoir}{\class{memoir}}, %
+% une extension de la classe standard \class{book} facilitant à
+% plusieurs égards la préparation de documents d'allure
+% professionnelle dans {\LaTeX}. L'intégralité des fonctionnalités de
+% \class{memoir} se retrouve donc dans {\ulclass}.
+%
+% La classe \class{memoir} fait partie des distributions {\TeX}
+% récentes; elle devrait donc être installée et disponible sur votre
+% système. La classe est livrée avec une documentation exhaustive: le
+% guide de l'utilisateur fait près de 600~pages! N'hésitez pas à vous
+% y référer pour réaliser une mise en page particulière.
+%
+% La classe {\ulclass} est compatible avec le moteur pdf{\LaTeX}.
+% Cependant, pour faciliter la gestion du codage des fichiers et des
+% polices de caractères, nous recommandons de compiler votre
+% manuscript avec le plus moderne moteur {\XeLaTeX}.
+%
+% \subsection{Gabarits}
+% \label{sec:utilisation:gabarits}
+%
+% La classe est livrée avec un ensemble de gabarits sur lesquels vous
+% baser pour:
+% \begin{itemize}
+% \item le document maître de divers types de thèses et de mémoires
+% (standard, par articles, en cotutelle, en bidiplomation);
+% \item les fichiers des parties les plus usuelles (résumés français
+% et anglais, remerciements, avant-propos, introduction, chapitres,
+% conclusion, annexe).
+% \end{itemize}
+% Vous pourriez devoir combiner les caractéristiques de deux gabarits
+% de document maître, par exemple pour une thèse en cotutelle par
+% articles.
+%
+% Les gabarits vous incitent à adopter le mode d'organisation des
+% fichiers de tout document d'une certaine ampleur, soit: un fichier
+% |.tex| par partie; un fichier maître contenant le préambule {\LaTeX}
+% et un ensemble de commandes \cmdprint{\include} pour réunir les
+% parties dans un tout.
+%
+% Si vous utilisez la version de la classe fournie avec votre
+% distribution {\TeX}, les gabarits peuvent être classés avec la
+% documentation (c'est le cas dans {\TeX}~Live). Si vous avez plutôt
+% effectué une installation locale de la classe, ou si vous l'avez
+% installée manuellement, les gabarits se trouvent dans votre
+% dossier de travail.
%
-% La classe est compatible avec les moteurs {\LaTeX} traditionnels
-% ainsi qu'avec le plus récent moteur {\XeLaTeX}.
+% Nous recommandons fortement de rédiger votre manuscript à partir des
+% gabarits. Il peut aussi s'avérer utile de suivre un gabarit en lisant
+% la présente section.
+%
+% \tipbox{Il n'y a pas de gabarit spécifique pour un examen de
+% doctorat, pour un essai de maîtrise, pour un projet de recherche ou
+% pour un rapport de stage. Utilisez un gabarit de thèse ou de
+% maîtrise avec l'une ou l'autre des options |examen|, |essai|,
+% |projet| ou |stage|.}
+%
+% \changes{6.0}{2024-05-24}{Documentation: nouvelle section sur le
+% codage de caractères du code source.}
+% \subsection{Codage de caractères du code source}
+% \label{sec:utilisation:codage}
+%
+% La classe utilise le codage de caractères
+% \href{https://fr.wikipedia.org/wiki/UTF-8}{UTF-8}
+% tant avec pdf{\LaTeX} qu'avec {\XeLaTeX}. Les fichiers
+% contenant du texte avec des accents ou tout autre symbole non-ASCII
+% doivent donc obligatoirement être enregistrés dans ce codage de
+% caractères\footnote{%
+% L'UTF-8 n'étant pas le codage par défaut sous Windows, portez une
+% attention toute particulière à ce point si vous utilisez ce système
+% d'exploitation.}.
+%
+% \subsection{Déclaration de la classe et options}
+% \label{sec:utilisation:options}
%
% On charge la classe avec la commande
% \begin{quote}
-% |\documentclass|\oarg{options}|{ulthese}|
+% |\documentclass|\oarg{options}|{ulthese}|
% \end{quote}
% Les marges, l'interligne et la numérotation des pages sont adaptées
-% aux règles de présentation matérielle de la FESP. Les sections
-% suivantes décrivent les options et les commandes définies par la
-% classe.
+% aux règles de présentation de la FESP. La classe ne crée pas de page
+% de titre par défaut\footnote{%
+% Depuis la version 5.0 de la classe.}, %
+% sa production étant prise en charge par la FESP pour les thèses et
+% les mémoires. Si vous utilisez la classe pour un document qui
+% nécessite une page de titre, un examen de doctorat, un essai de
+% maitre
%
% \changes{5.0}{2018-04-24}{La classe ne crée plus de page de titre
-% suite à une nouvelle directive de la FESP.}
-% \begin{rem}
-% Depuis la version 5.0, la classe ne crée plus de page de titre
-% par défaut, sa production étant désormais prise en charge par la
-% FESP. Néanmoins, les fonctionnalités de composition d'une page
-% de titre demeurent disponibles dans la classe. Les commandes
-% pertinentes sont regroupées à l'\autoref{sec:pagetitre}.
-% \end{rem}
-%
-% \subsection{Options de la classe}
-% \label{sec:utilisation:options}
+% suite à une nouvelle directive de la FESP.}
+% \tipbox{Les fonctionnalités de composition d'une page de titre
+% demeurent disponibles dans la classe. Si votre document en nécessite
+% une, consultez l'\autoref{sec:pagetitre}.}
%
% Cette section passe en revue les \meta{options} que l'on peut
% spécifier au chargement de la classe. Les commandes mentionnées
% ci-dessous font quant à elles l'objet de la
% \autoref{sec:utilisation:commandes}.
%
-% \begin{DescribeMacro}{PhD,MSc,MA, ...}
-% Identifie le type de grade; consulter le \autoref{tab:grades} pour
-% la liste complète des options et les grades correspondants. La
-% déclaration d'un type de grade est obligatoire, sauf en cas de
-% l'utilisation de l'option |projet| (voir ci-dessous).
-% \end{DescribeMacro}
+% \begin{DescribeOption}{PhD,MSc,MA, ...}
+% Les options telles que |PhD|, |MSc| ou |MA| identifient le type de
+% grade; le \autoref{tab:grades} fournit la liste complète des
+% options et les grades correspondants. La déclaration d'un type de
+% grade est obligatoire, sauf en cas de l'utilisation de l'option
+% |projet| (voir ci-dessous).
+% \end{DescribeOption}
%
% \begin{table}[t]
% \centering
% \caption{Options de la classe pour la déclaration du grade et libellés
% correspondants}
% \label{tab:grades}
-% \begin{tabularx}{0.85\linewidth}{lX}
+% \begin{tabularx}{0.9\linewidth}{l>{\raggedright\arraybackslash}X}
% \toprule
% Option & Nom du grade (sigle) \\
% \midrule
@@ -355,145 +505,138 @@
% |MArch|
% & Maître en architecture
% (M.~Arch.) \\
-% |MA|
-% & Maître ès arts (M.A.) \\
% |LLM|
% & Maître en droit (LL.~M.) \\
% |MErg|
% & Maître en ergothérapie (M.~Erg.) \\
% |MMus|
% & Maître en musique (M.~Mus.) \\
-% |MPht|
-% & Maître en physiothérapie (M.~Pht.) \\
-% |MSc|
-% & Maître ès sciences (M.~Sc.) \\
+% |MPsEd|
+% & Maître en psychoéducation (M.~Ps.~éd.) \\
% |MScGeogr|
% & Maître en sciences géographiques (M.~Sc.~géogr.) \\
% |MServSoc|
% & Maître en service social (M.~Serv.~soc.) \\
-% |MPsEd|
-% & Maître en psychoéducation (M.~Ps.~éd.) \\
+% |MTravSoc|
+% & Maître en travail social (M.~Trav.~soc.) \\
+% |MA|
+% & Maître ès arts (M.A.) \\
+% |MSc|
+% & Maître ès sciences (M.~Sc.) \\
% \bottomrule
% \end{tabularx}
% \end{table}
%
-% \begin{DescribeMacro}{cotutelle}
-% Identifie une thèse effectuée en cotutelle avec une autre
-% université. Valide uniquement avec un grade de doctorat.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{bidiplomation}
-% Identifie un mémoire effectué en bidiplomation avec une autre
-% université. Valide uniquement avec un grade de maîtrise.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{examen}
-% Identifie un examen de doctorat. Cette option permet d'utiliser la
-% classe pour la rédaction d'un examen de doctorat respectant les
-% règles de présentation matérielle de la FESP. Elle a pour effet de
-% changer l'appellation «Thèse» sur la page de titre pour «Examen
-% de doctorat». Elle supprime également la page frontispice.
+% \begin{DescribeOption}{cotutelle}
+% L'option |cotutelle| identifie une thèse effectuée en cotutelle
+% avec une autre université. Valide uniquement avec un grade de
+% doctorat.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{bidiplomation}
+% L'option |bidiplomation| identifie un mémoire effectué en
+% bidiplomation avec une autre université. Valide uniquement avec un
+% grade de maîtrise.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{examen}
+% L'option |examen| identifie un examen de doctorat. Elle permet
+% d'utiliser la classe pour la rédaction d'un examen de doctorat
+% respectant les règles de présentation de la FESP. L'option a pour
+% effet de changer l'appellation «Thèse» sur la page de titre pour
+% «Examen de doctorat». Elle supprime également la page frontispice.
% L'option n'est compatible qu'avec l'une des options de grade de
% doctorat.
-% \end{DescribeMacro}
-%
-% \changes{5.0}{2018-05-09}{Ajout d'une option «essai» pour les
-% maîtrises analogue à «examen» pour les doctorats.}
-% \changes{5.2}{2019-05-06}{L'option «essai» n'empêche plus
-% l'utilisation d'une page frontispice.}
-% \begin{DescribeMacro}{essai}
-% Identifie un essai de maîtrise. Cette option permet d'utiliser la
-% classe pour la rédaction d'un essai de maîtrise respectant les
-% règles de présentation matérielle de la FESP. Elle a pour effet de
-% changer l'appellation «Maîtrise» sur la page de titre pour
-% «Essai». L'option n'est compatible qu'avec l'une des options de
+% \end{DescribeOption}
+%
+% \changes{5.0}{2018-05-09}{Ajout d'une option \texttt{essai} pour les
+% maîtrises analogue à \texttt{examen} pour les doctorats.}
+% \changes{5.2}{2019-05-06}{L'option \texttt{essai} n'empêche plus
+% l'utilisation d'une page frontispice.}
+% \begin{DescribeOption}{essai}
+% L'option |essai| identifie un essai de maîtrise. Elle permet
+% d'utiliser la classe pour la rédaction d'un essai de maîtrise
+% respectant les règles de présentation de la FESP. L'option a pour
+% effet de changer l'appellation «Maîtrise» sur la page de titre
+% pour «Essai». Elle n'est compatible qu'avec l'une des options de
% grade de maîtrise. Pour un essai de maîtrise, l'utilisation
% simultanée de l'option |article| de la classe \class{memoir} peut
% s'avérer tout indiquée.
-% \end{DescribeMacro}
-%
-% \changes{5.2}{2019-05-06}{Ajout d'une option «projet» pour les
-% cours de projet de recherche.}
-% \begin{DescribeMacro}{projet}
-% Identifie un projet de recherche. Cette option permet d'utiliser
-% la classe pour la rédaction d'un rapport de projet de recherche
-% respectant les règles de présentation matérielle de la FESP. Elle
-% a pour effet d'inscrire l'appellation «Projet de recherche» sur la
-% page de titre et de supprimer la mention du grade. L'utilisation
-% de cette option rend d'ailleurs non obligatoire la déclaration de
-% grade qui, si elle est présente, est simplement ignorée. Comme
-% pour un essai de maîtrise, l'utilisation simultanée de l'option
-% |article| de la classe \class{memoir} peut s'avérer tout indiquée
-% avec les cette option.
-% \end{DescribeMacro}
-%
-% \changes{5.3}{2019-11-29}{Ajout d'une option «stage» pour les
-% rapports de stage.}
-% \begin{DescribeMacro}{stage}
-% Identifie un rapport de stage. L'effet de cette option est
-% identique à celui de l'option |projet| à deux exceptions près:
-% l'inscription sur la page de titre est «Rapport de stage» et la
-% page frontispice est supprimée.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{10pt,11pt,12pt}
-% Sélectionne une taille de police de 10, 11 ou 12~points. Par
-% défaut la classe utilise une police de 11~points. Ces options
-% n'ont aucun effet sur la taille des polices des pages de titre.
-% \end{DescribeMacro}
-%
-% \changes{4.4}{2017-05-15}{Ajout de l'option bibchapitre.}
-% \changes{4.4}{2017-05-15}{Ajout de l'option bibsection.}
-% \begin{DescribeMacro}{bibchapitre}
-% \begin{DescribeMacro}{bibsection}
-% Permettent de composer une bibliographie distincte après chaque
-% fichier inséré dans le document avec \cmd{\include},
-% habituellement un chapitre; voir la
-% \autoref{sec:bibliographie:multiples}. Ces options sont
-% principalement utiles pour les thèses et mémoires par articles.
-% La bibliographie se présente sous la forme d'un chapitre non
-% numéroté avec |bibchapitre|, et sous la forme d'une section
-% numérotée avec |bibsection|.
-% \end{DescribeMacro}
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{nonatbib}
-% Empêche le chargement du paquetage \pkg{natbib}. La paquetage est
-% normalement chargé par la classe; voir la
+% \end{DescribeOption}
+%
+% \changes{5.2}{2019-05-06}{Ajout d'une option \texttt{projet} pour
+% les cours de projet de recherche.}
+% \begin{DescribeOption}{projet}
+% L'option |projet| identifie un projet de recherche. Elle permet
+% d'utiliser la classe pour la rédaction d'un rapport de projet de
+% recherche respectant les règles de présentation de la FESP.
+% L'option a pour effet d'inscrire l'appellation «Projet de
+% recherche» sur la page de titre et de supprimer la mention du
+% grade. Son utilisation rend d'ailleurs non obligatoire la
+% déclaration de grade qui, si elle est présente, est simplement
+% ignorée. Comme pour un essai de maîtrise, l'utilisation simultanée
+% de l'option |article| de la classe \class{memoir} peut s'avérer
+% tout indiquée avec cette option.
+% \end{DescribeOption}
+%
+% \changes{5.3}{2019-11-29}{Ajout d'une option \texttt{stage} pour les
+% rapports de stage.}
+% \begin{DescribeOption}{stage}
+% L'option |stage| identifie un rapport de stage. L'effet de cette
+% option est identique à celui de l'option |projet| à deux
+% exceptions près: l'inscription sur la page de titre est «Rapport
+% de stage» et la page frontispice est supprimée.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{10pt,11pt,12pt}
+% Les options |10pt|, |11pt| et |12pt| sélectionnent une taille de
+% police de 10, 11 ou 12~points. Par défaut la classe utilise une
+% police de 11~points. Ces options n'ont aucun effet sur la taille
+% des polices des pages de titre.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{nonatbib}
+% L'option |nonatbib| empêche le chargement du paquetage %
+% \href{https://ctan.org/pkg/natbib}{\pkg{natbib}}. %
+% Celui-ci est normalement chargé par la classe; voir la
% \autoref{sec:bibliographie}. L'option |nonatbib| permet d'empêcher
-% le chargement pour modifier les options du paquetage ou en cas de
-% conflit avec un autre paquetage de mise en forme de la
-% bibliographie.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{nobabel}
-% Empêche le chargement du paquetage \pkg{babel}. La classe utilise
-% par défaut ce paquetage pour le traitement des langues dans le
-% document; voir la \autoref{sec:langues}. L'option |nobabel| permet
-% d'empêcher son chargement si un autre paquetage devait être
-% utilisé --- on pense ici principalement à \pkg{polyglossia} pour
-% un document produit avec le moteur {\XeLaTeX}.
-% \end{DescribeMacro}
-%
-% \changes{5.1}{2018-09-30}{Ajout de l'option nohyperref.}
-% \begin{DescribeMacro}{nohyperref}
-% Empêche le chargement du paquetage \pkg{hyperref}. L'interaction
-% de ce paquetage avec les autres est parfois --- voire souvent ---
-% délicate. La classe se charge de le charger en tout dernier tel
-% que généralement recommandé. L'option |nohyperref| permet
-% d'empêcher son chargement s'il est absolument nécessaire de
+% son chargement pour vous permettre de modifier les options du
+% paquetage ou en cas de conflit avec un autre paquetage de mise en
+% forme de la bibliographie.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{nobabel}
+% L'option |nobabel| empêche le chargement du paquetage %
+% \href{https://ctan.org/pkg/babel}{\pkg{babel}}. %
+% La classe utilise par défaut ce paquetage pour le traitement des
+% langues dans le document; voir la \autoref{sec:langues}. L'option
+% |nobabel| permet d'empêcher son chargement si un autre paquetage
+% devait être utilisé~--- on pense ici principalement à %
+% \href{https://ctan.org/pkg/polyglossia}{\pkg{polyglossia}} %
+% pour un document produit avec le moteur {\XeLaTeX}.
+% \end{DescribeOption}
+%
+% \changes{5.1}{2018-09-30}{Ajout de l'option \texttt{nohyperref}.}
+% \begin{DescribeOption}{nohyperref}
+% L'option |nohyperref| empêche le chargement du paquetage %
+% \href{https://ctan.org/pkg/hyperref}{\pkg{hyperref}}. %
+% L'interaction de ce paquetage avec les autres est parfois~---
+% voire souvent~--- délicate. La classe tâche de le charger en tout
+% dernier, tel que généralement recommandé. L'option |nohyperref|
+% permet d'empêcher son chargement s'il est absolument nécessaire de
% charger d'autres paquetages avant \pkg{hyperref}. Si vous utilisez
% cette option, vous devez obligatoirement charger \pkg{hyperref}
% dans le préambule du document.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{english, french, ...}
-% Déclare les langues utilisées dans le document. Ces options sont
-% transférées au paquetage \pkg{babel} (dans la mesure où |nobabel|
-% n'est pas spécifié, bien entendu). Le libellé des langues devrait
-% donc correspondre aux options de \pkg{babel}. La dernière langue
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{english, french, ...}
+% Les options telles que |english|, |french| ou autres déclarent les
+% langues utilisées dans le document. Ces options sont transférées
+% au paquetage \pkg{babel} (dans la mesure où |nobabel| n'est pas
+% spécifié, bien entendu). Le libellé des langues devrait donc
+% correspondre aux options de \pkg{babel}. La dernière langue
% spécifiée est la langue active par défaut dans le document.
-% \end{DescribeMacro}
+% \end{DescribeOption}
%
% Toute autre option sera passée à la classe \class{memoir} dont,
% entre autres, le format du papier. Le format lettre nord-américain
@@ -505,14 +648,14 @@
% \subsection{Commandes de la classe}
% \label{sec:utilisation:commandes}
%
-% La classe \class{ulthese} définit quelques nouvelles commandes
+% La classe {\ulclass} définit quelques nouvelles commandes
% servant principalement à créer la page frontispice et des éléments
% des pages liminaires. Le sommaire des commandes se trouve dans le
% \autoref{tab:commandes} et les descriptions détaillées, ci-dessous.
%
% \begin{table}[t]
% \centering
-% \caption{Sommaire des commandes de la classe \class{ulthese}.
+% \caption{Sommaire des commandes de la classe {\ulclass}.
% Celles marquées d'une étoile $^\star$ sont obligatoires.}
% \label{tab:commandes}
% \begin{tabularx}{\linewidth}{lX}
@@ -533,12 +676,13 @@
% \end{table}
%
% \begin{DescribeMacro}{\titre}
-% Titre principal de la thèse ou du mémoire. Ne pas utiliser la
-% commande \cmd{\title} de {\LaTeX} pour ce faire.
+% La commande \cmdprint{\titre} sert à spécifier le titre principal
+% du manuscrit. Vous ne devez pas utiliser la commande \cmd{\title}
+% de {\LaTeX} pour ce faire.
%
-% Vous devez couper manuellement avec |\\| ou \cmd{\newline} un
-% titre très long. Par exemple, la déclaration d'un titre d'une
-% seule ligne est:
+% Coupez manuellement avec {\bs\bs} ou \cmd{\newline} un titre très
+% long. Par exemple, la déclaration d'un titre d'une seule ligne
+% est:
% \begin{quote}
% |\titre{Ceci est un titre d'une seule ligne}|
% \end{quote}
@@ -550,48 +694,51 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\soustitre}
-% Sous-titre de la thèse ou du mémoire, le cas échéant. Les remarques
-% sur un long titre principal s'appliquent également au sous-titre.
+% La commande \cmdprint{\soustitre} sert à spécifier le sous-titre
+% du manuscrit, le cas échéant. Les remarques sur un long titre
+% principal s'appliquent également au sous-titre.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\auteur}
-% Nom complet de l'auteur de la thèse ou du mémoire, sous la forme
-% |Prénom Nom| avec seulement des majuscules initiales. Ne pas
-% utiliser la commande \cmd{\author} de {\LaTeX} pour le nom de
-% l'auteur.
+% La commande \cmdprint{\auteur} permet de saisir le nom complet de
+% l'auteur de la thèse ou du mémoire, sous la forme |Prénom Nom|
+% avec seulement des majuscules initiales. N'utilisez pas la
+% commande \cmd{\author} de {\LaTeX} pour le nom de l'auteur.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\programme}
-% Nom complet officiel du programme d'études comme «Doctorat en
-% informatique» ou «Maîtrise en mathématiques». Si le programme
-% comporte une majeure, séparer sa mention de celle du programme
-% principal par un tiret demi-quadratin (obtenu avec |--|).
+% La commande \cmdprint{\programme} sert à spécifier le nom complet
+% officiel du programme d'études comme «Doctorat en informatique» ou
+% «Maîtrise en mathématiques». Si le programme comporte une majeure,
+% séparez sa mention de celle du programme principal par un tiret
+% demi-quadratin (obtenu avec |--|).
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\direction}
-% Nom complet du directeur ou de la directrice de recherche, sous la
-% forme |Prénom Nom| avec seulement des majuscules initiales, suivi
-% d'une virgule et de la mention «directeur de recherche» ou
-% «directrice de recherche».
+% La commande \cmdprint{\direction} sert à spécifier le nom complet
+% du directeur ou de la directrice de recherche, sous la forme
+% |Prénom Nom| avec seulement des majuscules initiales, suivi d'une
+% virgule et de la mention «directeur de recherche» ou «directrice
+% de recherche».
%
% Les thèses en cotutelle comportent un directeur ou une directrice
% de recherche et un directeur ou une directrice de cotutelle.
-% Séparer chaque mention par |\\|, comme ceci:
+% Séparez chaque mention par {\bs\bs}, comme ceci:
% \begin{quote}
% |\direction{Prénom Nom, directrice de recherche \\| \\
% | Prénom Nom, directeur de cotutelle}|
% \end{quote}
%
% De même, les maîtrises en bidiplomation comptent deux directeurs
-% ou directrices de recherche. Séparer chaque mention tel que
+% ou directrices de recherche. Séparez chaque mention tel que
% mentionné ci-dessus.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\codirection}
-% Comme la commande \cmd{\direction}, mais pour le ou les
-% codirecteurs de recherche, s'il y a lieu. Lorsqu'il y a plus d'un
-% codirecteur de recherche, séparer chaque mention par |\\|, comme
-% ceci:
+% La commande \cmdprint{\codirection} joue le même rôle que la
+% commande \cmdprint{\direction}, mais pour le ou les codirecteurs
+% de recherche, s'il y a lieu. Lorsqu'il y a plus d'un codirecteur
+% de recherche, séparez chaque mention par {\bs\bs}, comme ceci:
% \begin{quote}
% |\codirection{Prénom Nom, directrice de recherche \\| \\
% | Prénom Nom, directeur de recherche}|
@@ -599,27 +746,30 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\frontispice}
-% Création de la page frontispice. De toutes les commandes
-% ci-dessus, c'est la seule qui doit se trouver dans le corps du
-% document plutôt que dans le préambule.
+% La commande \cmdprint{\frontispice} crée la page frontispice à
+% l'endroit où elle apparait dans le code source. De toutes les
+% commandes ci-dessus, c'est la seule qui doit se trouver dans le
+% corps du document plutôt que dans le préambule.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\dedicace}
-% Ajout d'une dédicace («À mes parents», «À Camille») à la thèse ou
-% au mémoire. La dédicace est disposée seule sur une page liminaire,
-% à une dizaine de lignes de la marge du haut et alignée à droite.
-% Par défaut, elle est composée en italique.
+% La commande \cmdprint{\dedicace} permet d'insérer une dédicace («À
+% mes parents», «À Camille») à l'endroit où elle apparait dans le
+% code source. La dédicace est disposée seule sur une page
+% liminaire, à une dizaine de lignes de la marge du haut et alignée
+% à droite. Par défaut, elle est composée en italique.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\epigraphe}
-% Ajout d'une épigraphe au début du document. Comme la dédicace,
-% l'épigraphe est disposée seule sur une page liminaire, à une
-% dizaine de lignes de la marge du haut et alignée à droite. La
-% commande accepte deux arguments, soit le texte de la citation et
-% son auteur ou la source, dans l'ordre.
-%
-% Pour ajouter une épigraphe au début d'un ou plusieurs chapitres,
-% utiliser directement la commande \cmd{\epigraph} de
+% La commande \cmdprint{\epigraphe} permet d'insérer une épigraphe
+% au début du document. Comme la dédicace, l'épigraphe est disposée
+% seule sur une page liminaire, à une dizaine de lignes de la marge
+% du haut et alignée à droite. La commande accepte deux arguments,
+% soit le texte de la citation et son auteur ou la source, dans
+% l'ordre.
+%
+% Pour ajouter une épigraphe au début d'un ou de plusieurs
+% chapitres, utilisez directement la commande \cmd{\epigraph} de
% \class{memoir}, sur laquelle \cmd{\dedicace} et \cmd{\epigraphe}
% sont d'ailleurs basées.
% \end{DescribeMacro}
@@ -640,8 +790,8 @@
% L'environnement |quotation|, quant à lui, doit être utilisé pour
% les citations «longues», celles qui peuvent s'étendre sur plus de
% cinq lignes ou, surtout, plus d'un paragraphe. Dans la classe, le
-% texte est alors toujours placé en retrait de 10~mm, mais également
-% à interligne simple. De plus, un espace vertical sépare les
+% texte est alors toujours placé en retrait de 10~mm, mais aussi à
+% interligne simple. De plus, un espace vertical sépare les
% paragraphes, le cas échéant, afin de bien les distinguer les uns
% des autres.
% \end{DescribeEnv}
@@ -658,8 +808,9 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\SingleSpacing}
-% Si ce devait être nécessaire ailleurs dans le document, la
-% commande \cmd{\SingleSpacing} permet de passer à l'interligne simple.
+% Si ce devait être nécessaire ailleurs dans le document, vous
+% pouvez avoir recours à la commande \cmd{\SingleSpacing} pour
+% passer à l'interligne simple.
% \end{DescribeMacro}
%
% \subsection{Hyperliens}
@@ -680,58 +831,44 @@
% \subsection{Autres paquetages chargés}
% \label{sec:paquetages}
%
-% Outre \class{memoir}, la classe \class{ulthese} charge quelques
-% paquetages qui peuvent aussi vous être utiles. Il n'est donc pas
-% nécessaire de charger de nouveau les paquetages suivants:
-% \begin{description}
-% \item[\normalfont\pkg{babel}] \citep{babel} gestion des documents
-% rédigés dans une ou plusieurs langues autres que l'anglais (si
-% l'option |nobabel| de la classe est absente; voir aussi la
-% \autoref{sec:langues});
-% \item[\normalfont\pkg{numprint}] \citep{numprint} requis par la
-% commande \cmd{\nombre} de \pkg{babel}; le paquetage est donc
-% chargé uniquement si \pkg{babel} l'est. Permet de composer
-% automatiquement des nombres avec un séparateur toutes les trois
-% positions (une espace en français);
-% \item[\normalfont\pkg{natbib}] \citep{natbib} gestion de la
-% bibliographie (si l'option |nonatbib| de la classe est absente;
-% voir aussi la \autoref{sec:bibliographie});
-% \item[\normalfont\pkg{chapterbib}] \citep{chapterbib} gestion de
-% bibliographies multiples (si l'une ou l'autre des options
-% |bibchapitre| ou |bibsection| est spécifiée;
-% voir aussi la \autoref{sec:bibliographie:multiples});
-% \item[\normalfont\pkg{hyperref}] \citep{hyperref} permet de
-% transformer toutes les références en hyperliens cliquables lorsque
-% le document est produit avec pdf{\LaTeX} ou {\XeLaTeX} (si
-% l'option |nohyperref| est spécifiée, vous devez obligatoirement
-% charger le paquetage vous-même);
-% \item[\normalfont\pkg{etoolbox}] \citep{etoolbox} outils
-% additionnels pour la conception de classes et de paquetages
-% (utilisé pour le chargement de \pkg{hyperref});
-% \item[\normalfont\pkg{fontspec}] \citep{fontspec} gestion des
-% polices OpenType sous {\XeLaTeX} (chargé avec ce moteur
-% seulement);
-% \item[\normalfont\pkg{graphicx}] \citep{graphicx} insertion et
-% manipulation de graphiques;
-% \item[\normalfont\pkg{xcolor}] \citep{xcolor} gestion des couleurs
-% dans le document, notamment celle des hyperliens;
-% \item[\normalfont\pkg{textcomp}] multitude de symboles spéciaux,
-% dont un beau symbole de copyright, \textcopyright.
-% \end{description}
-% L'\autoref{sec:meo} sur la mise en œuvre de la classe fournit
-% plus de détails sur la liste des paquetages chargés et les raisons
-% pour lesquelles ils sont requis dans la classe.
+% \changes{6.0}{2024-06-17}{Documentation: simplification de la
+% section sur les autres paquetages chargés par la classe.}
+% La classe {\ulclass} charge par défaut les paquetages suivants qui
+% peuvent vous être utiles: %
+% \href{https://ctan.org/pkg/babel}{\pkg{babel}} (voir aussi la \autoref{sec:langues}) %
+% \href{https://ctan.org/pkg/fontspec}{\pkg{fontspec}}, %
+% \href{https://ctan.org/pkg/graphicx}{\pkg{graphicx}}, %
+% \href{https://ctan.org/pkg/hyperref}{\pkg{hyperref}}, %
+% \href{https://ctan.org/pkg/microtype}{\pkg{microtype}}, %
+% \href{https://ctan.org/pkg/natbib}{\pkg{natbib}} (voir aussi la
+% \autoref{sec:bibliographie}), %
+% \href{https://ctan.org/pkg/numprint}{\pkg{numprint}}, %
+% \href{https://ctan.org/pkg/xcolor}{\pkg{xcolor}}. %
+% Tel que mentionné précédemment, la classe est basée sur
+% \class{memoir} qui, elle-même, incorpore d'office une trentaine de
+% paquetages\footnote{%
+% Consultez la section~18.24 de la documentation de \class{memoir}
+% pour la liste, ou encore le journal de la compilation (\emph{log})
+% d'un document utilisant la classe {\ulclass}.}. %
+% L'intégralité des fonctionnalités de \class{memoir} se retrouve donc
+% dans {\ulclass}.
+%
+% L'\autoref{sec:meo} sur la mise en œuvre de la classe fournit la
+% liste détaillée des paquetages chargés et les raisons pour
+% lesquelles ils sont requis dans la classe.
%
% \subsection{Paquetage incompatible}
% \label{sec:incompatible}
%
-% Le paquetage \pkg{geometry} est incompatible avec la classe à cause
-% de sa mauvaise interaction avec \class{memoir}. Son chargement dans
-% le préambule du document cause une erreur lors de la compilation.
+% Le paquetage %
+% \href{https://ctan.org/pkg/geometry}{\pkg{geometry}} %
+% est incompatible avec la classe à cause de sa mauvaise interaction
+% avec \class{memoir}. Son chargement dans le préambule du document
+% cause une erreur lors de la compilation.
%
% \section{Thèses et mémoires par articles}
% \changes{5.0}{2018-06-08}{Ajout d'une section spécifique sur les
-% thèses et mémoires par articles.}
+% thèses et mémoires par articles.}
%
% La rédaction de la thèse ou du mémoire par articles est une pratique
% qui gagne en popularité. Elle consiste à remplacer le corps
@@ -741,167 +878,54 @@
% du mémoire (le cas échéant) y apparaissent sous forme de
% sections numérotées.
%
-% L'autre caractéristique qui distingue la thèse et le mémoire par
-% articles des versions standards, c'est la nécessité d'utiliser une
-% bibliographie distincte pour chacun des chapitres. Les options de la
-% classe |bibchapitre| et |bibsection| permettent de réaliser cette
-% mise en forme particulière. La \autoref{sec:bibliographie:multiples}
-% explique comment en tirer profit.
-%
% Des gabarits de document maître et de chapitre fournissent la
% structure de base pour la thèse et le mémoire par articles. Vous
% pouvez, au besoin, combiner les caractéristiques de ces gabarits à
-% celles de la thèse en cotutelle ou du mémoire en bidiplomation. La
-% \autoref{sec:gabarits} fournit les détails sur les gabarits.
+% celles de la thèse en cotutelle ou du mémoire en bidiplomation.
%
-% \section{Français et autres langues}
-% \label{sec:langues}
-%
-% Une complication additionnelle si vous rédigez dans une langue autre
-% que l'anglais consiste à adapter {\LaTeX} à votre langue, qu'il
-% s'agisse des mots clés, de la typographie ou de la césure des mots.
-% La solution standard à ce problème provient du paquetage
-% \pkg{babel}. Celui-ci permet de combiner plusieurs langues dans un
-% même document et de passer de l'une à l'autre facilement. Il est
-% chargé par défaut par la classe \class{ulthese}.
-%
-% Aucune langue n'est spécifiée dans la classe. Vous aurez sans doute
-% recours à l'anglais et au français, ne serait-ce que pour les deux
-% résumés demandés par la FESP. Vous devez spécifier les langues
-% utilisées dans le document en options à la classe, tel que mentionné
-% à la \autoref{sec:utilisation:options}. La \emph{dernière} langue
-% spécifiée devient par défaut la langue active du document.
-%
-% \begin{DescribeMacro}{\selectlanguage}
-% La commande \cmd{\selectlanguage} de \pkg{babel} permet de passer de
-% la langue courante à la langue spécifiée en argument.
-% \end{DescribeMacro}
-%
-% \begin{DescribeEnv}{otherlanguage}
-% L'environnement |otherlanguage| de \pkg{babel} permet de faire
-% la même chose que la commande \cmd{\selectlanguage}, sauf que le
-% changement de langue est local à l'environnement --- utile pour
-% les brefs changements de langue.
-% \end{DescribeEnv}
-%
-% Si vous n'êtes pas autrement familier avec le paquetage
-% \pkg{babel}, consultez sa %
-% \doc{http://texdoc.net/pkg/babel/}. %
-% Celle-ci est éclatée en un
-% document principal, pour le cœur du paquetage et plusieurs
-% autres pour les fonctionnalités propres à une langue: %
-% \doc[anglais]{http://texdoc.net/pkg/babel-english}, %
-% \doc[français]{http://texdoc.net/pkg/babel-french}, %
-% etc. Consultez au moins les documents consacrés aux
-% langues utilisées dans votre thèse ou mémoire. Le plus simple
-% consiste sans doute à consulter en ligne sur CTAN les
-% \link{https://mirrors.ctan.org/tex-archive/macros/latex/required/babel/contrib/}{%
-% documents spécifiques par langue}.
-% \changes{4.4}{2017-05-14}{Correction d'une url vers la documentation
-% de babel.}
-%
-% \begin{DescribeMacro}{\nombre}
-% Le paquetage \pkg{numprint} étant chargé dans la classe avec
-% \pkg{babel}, vous pouvez utiliser la commande \cmd{\nombre} pour
-% formater automatiquement les nombres. Par exemple, le résultat de
-% |\nombre{123456789}| est \nombre{123456789}.
-% \end{DescribeMacro}
-%
-% Les utilisateurs de {\XeLaTeX} qui souhaiteraient plutôt utiliser le
-% plus récent paquetage \pkg{polyglossia} \citep{polyglossia} peuvent
-% empêcher le chargement de \pkg{babel} avec l'option |nobabel| de la
-% classe. Ils devront toutefois charger et configurer
-% \pkg{polyglossia} eux-mêmes dans l'entête de leur document. Ce
-% paquetage est moins évolué que \pkg{babel} pour la typographie
-% française.
+% \tipbox{À l'automne~2023, la FESP a retiré l'exigence de produire
+% une bibliographie par chapitre pour les thèses et mémoires par
+% articles. La thèse ou le mémoire doit désormais contenir une seule
+% bibliographie regroupant l’ensemble des références du document.}
%
% \section{Bibliographie}
% \label{sec:bibliographie}
+% \changes{6.0}{2024-05-22}{Documentation: suppression de la section
+% sur les bibliographies multiples.}
+% \changes{6.0}{2024-06-19}{Documentation: inversion des sections sur
+% la bibliographie et sur la rédaction en français.}
%
% \begin{DescribeMacro}{\bibliography}
-% Tel qu'expliqué au chapitre~8 de \citet{formation-latex-ul},
-% il est fortement recommandé d'utiliser {\BibTeX} pour la
+% Il est fortement recommandé d'utiliser {\BibTeX} pour la
% préparation de la bibliographie d'un document. Celle-ci est
% insérée dans le document à l'endroit où apparait la commande
% \cmd{\bibliography} dans le code source. Cette commande prend en
-% arguments les noms des bases de données bibliographiques séparés
+% arguments les noms des bases de données bibliographiques, séparés
% par des virgules.
% \end{DescribeMacro}
%
% \subsection{Mise en forme des citations}
% \label{sec:bibliographie:options}
%
-% Dans la classe \class{ulthese}, la mise en forme des citations est
-% confiée au paquetage \pkg{natbib} (à moins que l'option |nonatbib|
-% ne soit spécifiée). Le paquetage est chargé avec les options par
-% défaut, soit |round|, |semicolon| et |authoryear|. Pour spécifier
-% d'autres options, vous avez deux possibilités:
-% \begin{enumerate}
-% \item utiliser l'option |nonatbib| de la classe et ensuite charger
-% explicitement \pkg{natbib} avec ses options;
-% \item
-% \begin{DescribeMacro}{\setcitestyle}
-% utiliser la commande \cmd{\setcitestyle} pour passer de
-% nouvelles options à \pkg{natbib}.
-% \end{DescribeMacro}
-% \end{enumerate}
+% \begin{DescribeMacro}{\setcitestyle}
+% Dans la classe {\ulclass}, la mise en forme des citations est
+% confiée au paquetage %
+% \href{https://ctan.org/pkg/natbib}{\pkg{natbib}} %
+% (à moins que l'option |nonatbib| ne soit spécifiée). Le paquetage
+% est chargé avec les options par défaut, soit |round|, |semicolon|
+% et |authoryear|. Pour spécifier d'autres options utilisez la
+% commande \cmd{\setcitestyle} pour passer de nouvelles options à
+% \pkg{natbib}.
+% \end{DescribeMacro}
%
% Par exemple, pour utiliser un style de citation numérique où le
-% numéro de la référence se trouve entre crochets, vous pouvez
-% procéder de l'une ou l'autre des deux manières suivantes:
-% \begin{quote}
-% |\documentclass[nonatbib]{ulthese}| \\
-% |\usepackage[numbers,square]{natbib}| \\
-% |...| \\
-% |\bibliographystyle{plain-fr}|
-% \end{quote}
-% ou
+% numéro de la référence se trouve entre crochets, insérez la commande
+% suivante dans le préambule:
% \begin{quote}
-% |\documentclass{ulthese}| \\
-% |...| \\
-% |\setcitestyle{numbers,square}| \\
-% |\bibliographystyle{plain-fr}|
+% |\setcitestyle{numbers,square}|
% \end{quote}
%
-% Consultez la %
-% \doc{http://texdoc.net/pkg/natbib/} %
-% de \pkg{natbib} pour les détails.
-%
-% \subsection{Bibliographies multiples}
-% \label{sec:bibliographie:multiples}
-%
-% L'ajout de |bibchapitre| ou de |bibsection| dans les options de la
-% classe permet de générer une bibliographie distincte pour chaque
-% chapitre, une chose particulièrement utile pour les thèses et
-% mémoire par articles.
-%
-% La classe fait appel au paquetage \pkg{chapterbib}
-% \citep{chapterbib} pour composer des bibliographies multiples. La
-% \doc{http://texdoc.net/pkg/chapterbib/} du paquetage
-% explique la procédure à suivre pour obtenir une bibliographie par
-% chapitre avec {\BibTeX}. En résumé:
-% \begin{enumerate}
-% \item chaque chapitre comportant sa propre bibliographie doit
-% absolument être inséré dans le document principal avec la commande
-% \cmd{\include} \citep[section~3.5]{formation-latex-ul};
-% \item chaque fichier visé doit contenir une commande
-% \cmd{\bibliographystyle} (\autoref{sec:bibliographie:style}) et
-% une commande \cmd{\bibliography};
-% \item on obtient les diverses bibliographies en compilant avec
-% {\BibTeX} les fichiers individuels, et non le document maître.
-% \end{enumerate}
-%
-% La plupart des auteurs préféreront sans doute l'effet de l'option
-% |bibsection|, où la bibliographie apparait comme une section normale
-% à la fin d'un chapitre. Lorsque \pkg{babel} est chargé, la section
-% sera numérotée. Pour supprimer la numérotation, insérer dans le
-% préambule du document la commande
-% \begin{quote}
-% |\addto\extras|\meta{langue}|{\renewcommand{\bibsection}{%| \\
-% | \section*{\bibname}\prebibhook}}|
-% \end{quote}
-% où \meta{langue} est la langue par défaut du document
-% (\autoref{sec:langues}).
+% Consultez la documentation de \pkg{natbib} pour plus de détails.
%
% \subsection{Style de la bibliographie}
% \label{sec:bibliographie:style}
@@ -909,423 +933,142 @@
% \begin{DescribeMacro}{\bibliographystyle}
% Le format général de la bibliographie est contrôlé par un
% \emph{style} choisi avec la commande \cmd{\bibliographystyle} dans
-% le préambule du document ou dans les fichiers de chaque chapitre
-% dans une thèse ou un mémoire par articles. Les styles standards de
-% {\LaTeX} sont |plain|, |unsrt|, |alpha| et |abbrv|.
+% le préambule du document. Les styles standards de {\LaTeX} sont
+% |plain|, |unsrt|, |alpha| et |abbrv|.
% \end{DescribeMacro}
%
-% Le paquetage \pkg{natbib} chargé par défaut par la classe supporte
-% le style de citation auteur-année fréquemment employé en sciences
-% naturelles, plusieurs commandes de citation, un grand nombre de
-% styles de bibliographie ainsi que des entrées spécifiques pour les
-% numéros ISBN et les URL. Le paquetage fournit des styles de
-% bibliographie |plainnat|, |unsrtnat| et |abbrvnat| similaires aux
-% styles standards, mais plus complets. Il existe des
-% \link{https://mirrors.ctan.org/biblio/bibtex/contrib/bib-fr/}{versions
-% francisées} de ces styles (et de quelques autres) dans CTAN.
-%
-% Le paquetage \pkg{francais-bst} \citep{francais-bst} fournit une
-% feuille de style compatible avec \pkg{natbib} permettant de composer
-% des bibliographies auteur-année respectant les normes de typographie
-% française proposées dans \cite{Malo:1996}. Pour utiliser ce style,
-% spécifier dans le préambule du document LaTeX
-% \begin{quote}
-% |\bibliographystyle{francais}|
-% \end{quote}
+% Le paquetage \pkg{natbib} prend en charge le style de citation
+% auteur-année fréquemment employé en sciences naturelles, plusieurs
+% commandes de citation, un grand nombre de styles de bibliographie,
+% ainsi que des entrées spécifiques pour les numéros ISBN et les
+% adresses URL. Le paquetage fournit des styles de bibliographie
+% |plainnat|, |unsrtnat| et |abbrvnat| similaires aux styles
+% standards, mais plus complets. Il existe des %
+% \href{https://ctan.org/pkg/bib-fr}{versions francisées} %
+% de ces styles (et de quelques autres) dans CTAN.
+%
+% Les styles \code{francais} et \code{francaissc} du paquetage %
+% \href{https://ctan.org/pkg/francais-bst}{\pkg{francais-bst}} %
+% permettent de composer des bibliographies auteur-année respectant
+% les normes de typographie française. Ils sont compatibles avec
+% \pkg{natbib} et plus modernes que les styles mentionnés ci-dessus.
%
% Autrement, la FESP n'a pas d'exigences particulières quant à la
% présentation de la bibliographie (présentation du titre, des auteurs
% et autres informations bibliographiques).
%
-% \section{Police de caractères du document}
-% \label{sec:police}
-%
-% Les documents {\LaTeX} sont facilement reconnaissables par leur
-% police de caractères par défaut, {\fontfamily{cmr}\selectfont
-% Computer Modern}. Avec toute distribution {\LaTeX} moderne, il est
-% maintenant simple d'utiliser l'une ou l'autre des polices PostScript
-% standards. D'ailleurs la classe \class{ulthese} utilise la police
-% sans empattements \textsf{Helvetica} pour composer les pages de
-% titre.
-%
-% La FESP permet l'utilisation des polices Times, Palatino (la police
-% du présent document) et Lucida~Bright dans les thèse et mémoires.
-% \citet[section~10.2]{formation-latex-ul} explique comment utiliser ces
-% polices dans votre document.
-%
-% \section{Gabarits}
-% \label{sec:gabarits}
-%
-% Afin de vous épauler dans la préparation de votre manuscrit, la
-% classe \class{ulthese} est livrée avec un ensemble de gabarits. Tout
-% d'abord, pour le document maître de différents types de thèses et de
-% mémoires:
-% \begin{itemize}[noitemsep]
-% \item |gabarit-doctorat.tex|;
-% \item |gabarit-doctorat-articles.tex|;
-% \item |gabarit-doctorat-cotutelle.tex|;
-% \item |gabarit-maitrise.tex|;
-% \item |gabarit-maitrise-articles.tex|;
-% \item |gabarit-maitrise-bidiplomation.tex|.
-% \end{itemize}
-% Ensuite, pour quelques parties d'un document:
-% \begin{itemize}[noitemsep]
-% \item |resume.tex|;
-% \item |abstract.tex|;
-% \item |remerciements.tex|;
-% \item |avantpropos.tex|;
-% \item |introduction.tex|;
-% \item |chapitre1.tex|;
-% \item |chapitre1-articles.tex|;
-% \item |chapitre2.tex|;
-% \item |chapitre2-articles.tex|;
-% \item |conclusion.tex|;
-% \item |annexe.tex|.
-% \end{itemize}
-% Vous pourriez devoir combiner les caractéristiques de deux gabarits
-% de document maître comme, par exemple, pour une thèse en cotutelle
-% par articles.
-%
-% Les gabarits comportent des commentaires succincts pour vous guider
-% dans leur utilisation. Les sections suivantes fournissent des
-% détails additionnels, et ce, dans l'ordre où les commandes
-% apparaissent dans les fichiers.
-%
-% \begin{rem}
-% Il n'y a pas de gabarit spécifique pour un examen de doctorat,
-% pour un essai de maîtrise, pour un projet de recherche ou pour un
-% rapport de stage. Utilisez un gabarit de thèse ou de maîtrise et
-% inscrivez l'option |examen|, |essai|, |projet| ou |stage| dans la
-% commande \cmd{\documentclass}.
-% \end{rem}
-%
-% \subsection{Encodage des fichiers}
-%
-% Composer en {\LaTeX} de longs textes dans une langue ayant recours
-% aux signes diacritiques devient rapidement pénible si l'on utilise
-% des commandes telles que |\'e|, |\`a| ou |\"o| pour entrer des lettres
-% accentuées. Afin de pouvoir plutôt entrer directement |é|, |à| ou
-% |ö|, {\LaTeX} doit être configuré pour reconnaître les lettres
-% accentuées. C'est le rôle du paquetage \pkg{inputenc}
-% \citep{inputenc}.
-%
-% Il existe plusieurs manières différentes d'encoder --- ou
-% d'enregistrer --- les lettres accentuées et autres caractères
-% spéciaux (comme, par exemple, le symbole de l'euro) dans un
-% ordinateur. La méthode la plus répandue et celle standard sur les
-% versions récentes des systèmes d'exploitation Linux et macOS est
-% l'UTF-8 de la norme
-% \link{https://fr.wikipedia.org/wiki/Unicode}{Unicode}. Les gabarits
-% sont livrés dans ce type d'encodage.
-%
-% La déclaration
-% \begin{quote}
-% |\usepackage[utf8]{inputenc}|
-% \end{quote}
-% dans le préambule assure que {\LaTeX} traitera correctement des
-% fichiers source encodés en UTF-8.
-%
-% La norme Unicode n'est pas aussi uniformément supportée par Windows.
-% Selon l'éditeur de texte employé et la version du système
-% d'exploitation, il peut être nécessaire d'utiliser les normes
-% d'encodage %
-% \link{https://fr.wikipedia.org/wiki/ISO_8859-1}{ISO~8859-1} %
-% (ou Latin-1; option |latin1| de \pkg{inputenc}), %
-% \link{https://fr.wikipedia.org/wiki/ISO_8859-15}{ISO~8859-15} %
-% (ou Latin-9; option |latin9|) ou %
-% \link{https://fr.wikipedia.org/wiki/Windows-1252}{Windows-1252} %
-% (options |cp1252| ou |ansinew|).
-%
-% La situation est plus simple avec {\XeLaTeX} puisqu'il gère
-% nativement Unicode. Le paquetage \pkg{inputenc} est non seulement
-% inutile, mais incompatible avec {\XeLaTeX}. C'est pourquoi, dans les
-% gabarits, \pkg{inputenc} est chargé seulement lorsque {\XeTeX}
-% n'est pas le moteur employé pour compiler le document.
-%
-% \subsection{Paquetages additionnels}
-%
-% Tel qu'expliqué à la \autoref{sec:paquetages}, la classe charge déjà
-% quelques paquetages. Cependant, il est fort probable que vous devrez
-% en charger d'autres pour composer votre document. Les gabarits
-% prévoient un endroit pour le chargement de paquetages additionnels.
-%
-% Si vous utilisez un paquetage non standard dans les distributions
-% courantes (\TeX~Live, Mac\TeX, MiK\TeX), vous devez le fournir avec
-% le code source de votre document lors du dépôt final.
-%
-% \subsection{Changement de police de caractères}
-%
-% Les gabarits comportent des déclarations types pour utiliser les
-% polices Palatino ou Times sous {\LaTeX} ou, sous {\XeLaTeX}, leurs
-% équivalents Pagella et Termes du projet
-% \link{https://www.gust.org.pl/projects/e-foundry/tex-gyre/}{TeX~Gyre}.
-%
-% \subsection{Options de \pkg{babel}}
-%
-% \begin{DescribeMacro}{\frenchbsetup}
-% La commande \cmd{\frenchbsetup} de \pkg{babel} permet de contrôler
-% certains ajustements typographiques apportés par le paquetage en
-% mode français. Consultez la documentation de \pkg{babel} pour la
-% liste des options de configuration disponibles.
-% \end{DescribeMacro}
-%
-% Les concepteurs de la classe \class{ulthese} proposent trois
-% ajustements dans les gabarits:
-% \begin{enumerate}
-% \item l'option |StandardItemizeEnv=true| évite que le mode français de
-% \pkg{babel} ne diminue l'espacement vertical dans les listes;
-% \item l'option |ThinSpaceInFrenchNumbers=true| fait en sorte qu'une espace fine
-% sera utilisée comme séparateur des milliers dans les nombres plutôt
-% qu'une espace pleine;
-% \item les options |og=«| et |fg=»| déclarent que les caractères « et
-% » utilisés dans le code source représentent les guillemets ouvrant
-% et fermant, respectivement. Cela évite de devoir utiliser les
-% commandes \cmd{\og} et \cmd{\fg} de \pkg{babel} tout en bénéficiant de
-% l'ajutement automatique des espaces autour des symboles.
-% \end{enumerate}
-% Vous devez évidemment désactiver ces ajustements si l'option
-% |nobabel| est spécifiée au chargement de la classe.
+% \section{Français et autres langues}
+% \label{sec:langues}
%
-% \subsection{Style de la bibliographie}
-% \label{sec:bibliographystyle}
-%
-% Tel qu'expliqué à la \autoref{sec:bibliographie:style}, la commande
-% \cmd{\bibliographystyle} permet de définir le mode de citation dans
-% le texte et la présentation des notices bibliographiques. Cette
-% commande devrait figurer dans les fichiers des chapitres
-% individuels dans une thèse ou un mémoire par articles.
-%
-% \subsection{Déclarations de la page frontispice}
-%
-% Les gabarits comportent toutes les déclarations nécessaires pour
-% composer la page frontispice des divers types de thèse ou de
-% mémoires. Vous devez remplacer les éléments se trouvant entre
-% crochets |< >| en respectant la forme indiquée. Assurez-vous de
-% supprimer les caractères |<| et |>| afin qu'ils n'apparaissent pas
-% sur la page frontispice de votre document.
-%
-% \subsection{Pages liminaires}
-%
-% \begin{DescribeMacro}{\frontmatter}
-% La commande \cmd{\frontmatter} déclare que {\LaTeX} doit considérer le
-% matériel qui suit comme des pages liminaires. En pratique, cela
-% résulte essentiellement en une numérotation des pages en chiffres
-% romains.
-% \end{DescribeMacro}
+% Une complication additionnelle si vous rédigez dans une langue autre
+% que l'anglais consiste à adapter {\LaTeX} à votre langue, qu'il
+% s'agisse des mots clés, de la typographie ou de la césure des mots.
+% La solution standard à ce problème provient du paquetage %
+% \href{https://ctan.org/pkg/babel}{\pkg{babel}}. %
+% Celui-ci permet de combiner plusieurs langues dans un même document
+% et de passer de l'une à l'autre facilement. Il est chargé par défaut
+% par la classe {\ulclass}.
%
-% Les normes de présentation de la FESP édictent que les thèses et
-% mémoires devraient comporter les pages liminaires suivantes, dans
-% l'ordre:
-% \begin{enumerate}[noitemsep]
-% \item page frontispice (obligatoire);
-% \item résumé en français (obligatoire);
-% \item résumé en anglais (recommandé, mais non obligatoire);
-% \item table des matières (obligatoire);
-% \item liste des tableaux;
-% \item liste des figures;
-% \item liste des abbréviations et des sigles;
-% \item dédicace;
-% \item épigraphe;
-% \item remerciements;
-% \item avant-propos (obligatoire dans le cas d'une thèse ou d'un
-% mémoire par articles).
-% \end{enumerate}
-%
-% Les commandes
-% \begin{quote}
-% \cmd{\frontispice} \\
-% \cmd{\tableofcontents} \\
-% \cmd{\listoftables} \\
-% \cmd{\listoffigures} \\
-% \cmd{\dedicace}\marg{texte} \\
-% \cmd{\epigraphe}\marg{texte}\marg{auteur}
-% \end{quote}
-% permettent de générer les pages correspondantes. Seules les deux
-% dernières commandes admettent des arguments.
-%
-% \begin{rem}
-% L'examen de doctorat, l'essai de maîtrise, le rapport de projet de
-% recherche et le rapport de stage comportent une page de titre.
-% Vous devez ajouter dans les gabarits les commandes nécessaires
-% pour la production de la page de titre (\autoref{sec:pagetitre})
-% et supprimer les autres pages liminaires. Rappelons que l'option
-% de classe |examen| a pour effet de supprimer la page frontispice.
-% \end{rem}
-%
-% \begin{DescribeMacro}{\chapter*}
-% Les résumés, la liste des abbréviations et des sigles, les
-% remerciements et l'avant-propos sont composés comme des chapitres
-% normaux, mais sans être numérotés. Il faut donc définir ces éléments
-% avec la commande \cmd{\chapter*}.
-% \end{DescribeMacro}
+% Aucune langue n'est spécifiée dans la classe. Vous aurez sans doute
+% recours à l'anglais et au français, ne serait-ce que pour les deux
+% résumés demandés par la FESP. Vous devez spécifier les langues
+% utilisées dans le document en options à la classe, tel que mentionné
+% à la \autoref{sec:utilisation:options}. La \emph{dernière} langue
+% spécifiée devient par défaut la langue active du document.
%
-% \begin{DescribeMacro}{\label}
-% La commande \cmd{\label} permet d'utiliser le système de renvois
-% automatiques de {\LaTeX} \citep[section~3.4]{formation-latex-ul}.
-% Les étiquettes des chapitres non numérotés sont déjà configurées
-% pour l'ajout de ces chapitres dans la table des matières (voir
-% ci-dessous). Nous recommandons fortement de définir vos propres
-% étiquettes pour les chapitres normaux.
+% \begin{DescribeMacro}{\selectlanguage}
+% La commande \cmd{\selectlanguage} de \pkg{babel} permet de passer de
+% la langue courante à la langue spécifiée en argument.
% \end{DescribeMacro}
%
-% \begin{DescribeMacro}{\phantomsection}
-% \begin{DescribeMacro}{\addcontentsline}
-% \begin{DescribeMacro}{\nameref}
-% Les chapitres déclarés avec la commande \cmd{\chapter*}
-% n'apparaissent pas dans la table des matières. Comme les
-% normes de présentation de la FESP exigent que toutes les pages
-% liminaires y figurent, nous faisons suivre les commandes
-% \cmd{\chapter*}\marg{Titre} et \cmd{\label}\marg{nom} des
-% commandes
-% \end{DescribeMacro}
-% \end{DescribeMacro}
-% \end{DescribeMacro}
-% \begin{quote}
-% |\phantomsection\addcontentsline{toc}{chapter}{%| \\
-% | \nameref|\marg{nom}|}|
-% \end{quote}
-% Celles-ci ajoutent à la table des matières (|toc|) une section de
-% niveau |chapter| dont le titre est celui du chapitre auquel
-% correspond l'étiquette \meta{nom}. La commande \cmd{\phantomsection}
-% est rendue nécessaire (ou recommandée) par le paquetage
-% \pkg{hyperref}.
+% \begin{DescribeEnv}{otherlanguage}
+% L'environnement |otherlanguage| de \pkg{babel} permet de faire la
+% même chose que la commande \cmd{\selectlanguage}, sauf que le
+% changement de langue est local à l'environnement, ce qui peut
+% s'avérer utile pour les brefs changements de langue.
+% \end{DescribeEnv}
%
-% \subsection{Corps du document}
+% Si vous n'êtes pas autrement familier avec le paquetage \pkg{babel},
+% consultez sa documentation. Celle-ci est éclatée en un document
+% principal pour le cœur du paquetage et plusieurs autres pour les
+% fonctionnalités propres à une langue. Consultez au moins les
+% documents consacrés aux langues utilisées dans votre thèse ou
+% mémoire. Le plus simple consiste sans doute à consulter en ligne sur
+% CTAN les
+% \href{https://ctan.org/pkg/babel-contrib/}{documents spécifiques par langue}.
+% \changes{4.4}{2017-05-14}{Correction d'une url vers la documentation
+% de \textbf{babel}.}
%
-% \begin{DescribeMacro}{\mainmatter}
-% La commande \cmd{\mainmatter} délimite le début du corps du document. La
-% numérotation des pages passe en chiffres arabes.
+% \begin{DescribeMacro}{\nombre}
+% Le paquetage %
+% \href{https://ctan.org/pkg/numprint}{\pkg{numprint}} %
+% étant chargé dans la classe avec \pkg{babel}, vous pouvez utiliser
+% la commande \cmd{\nombre} pour formater automatiquement les
+% nombres. Par exemple, le résultat de |\nombre{123456789}| est
+% \nombre{123456789}.
% \end{DescribeMacro}
%
-% Le corps du document devrait normalement compter une introduction (non
-% numérotée), un développement divisé en chapitres (numérotés) et une
-% conclusion (non numérotée).
-%
-% \subsection{Annexes}
-%
-% \begin{DescribeMacro}{\appendix}
-% Si la thèse ou le mémoire comporte une ou plusieurs annexes,
-% composer celles-ci comme des chapitres normaux insérés dans le
-% document maître après la commande \cmd{\appendix}. Cette commande a
-% pour effet de passer d'un mode de numération numérique (1, 1.1, 2, 2.1,
-% \dots) à un mode alphanumérique (A, A.1, B, B.1, \dots).
-% \end{DescribeMacro}
+% Si vous souhaitez plutôt utiliser le plus récent paquetage %
+% \href{https://ctan.org/pkg/polyglossia}{\pkg{polyglossia}} %
+% avec {\XeLaTeX}, vous devez empêcher le chargement de \pkg{babel}
+% avec l'option |nobabel| de la classe, puis charger et configurer
+% \pkg{polyglossia} vous-même dans l'entête de votre document. Ce
+% paquetage est moins évolué que \pkg{babel} pour la typographie
+% française.
%
-% \subsection{Bibliographie}
+% \section{Police de caractères du document}
+% \label{sec:police}
+% \changes{6.0}{2024-06-17}{Documentation: révision de la section sur
+% les polices de caractères suite aux modifications apportées aux
+% règles de présentation de la FESP.}
%
-% La bibliographie figure normalement à la toute fin du document, sous
-% forme de chapitre non numéroté. Tel qu'expliqué à la
-% \autoref{sec:bibliographie:multiples}, la commande
-% \cmd{\bibliography} doit plutôt se trouver dans les fichiers des
-% chapitres dans une thèse ou un mémoire par articles.
+% Les documents {\LaTeX} sont facilement reconnaissables par leur
+% police de caractères par défaut: %
+% {\iftutex\fontfamily{lmr}\else\fontfamily{cmr}\fi\selectfont
+% Computer Modern}. %
+% Si vous le souhaitez, il est aujourd'hui assez simple de produire
+% des documents {\LaTeX} utilisant d'autres polices. L'approche
+% recommandée consiste à utiliser une police OpenType ou TrueType
+% présente sur votre système avec le moteur {\XeLaTeX}. Autrement,
+% vous pouvez charger l'une ou l'autre des polices PostScript
+% standards compatibles avec le moteur pdf{\LaTeX} en ayant recours au
+% paquetage %
+% \href{https://ctan.org/pkg/psnfss}{\pkg{psnfss}}. %
+% Dans tous les cas, assurez-vous de respecter les règles de
+% présentation de la FESP en matière de polices de caractères.
+%
+% La Bibliothèque de l’Université Laval détient une licence
+% d’utilisation des polices de très grande qualité %
+% \href{https://tug.org/store/lucida}{Lucida Bright}. %
+% Vous pouvez vous procurer gratuitement une copie des polices en
+% écrivant à %
+% \href{mailto:lucida@bibl.ulaval.ca}{lucida@bibl.ulaval.ca}.
+%
+% À titre indicatif, le présent document est composé avec les polices
+% OpenType %
+% \href{https://ctan.org/pkg/stix2-otf}{STIX~Two} %
+% pour le texte et %
+% \href{https://ctan.org/pkg/fira}{Fira} %
+% pour les éléments décoratifs (notamment \textsf{Fira Sans} pour les
+% titres de sections et \texttt{Fira Mono} pour le code informatique).
+%
+% \changes{6.0}{2024-05-25}{Documentation: suppression de la section
+% portant sur l'explication détaillée des gabarits. En échange,
+% ceux-ci comportent des commentaires additionnels.}
%
% \section{Commentaires, suggestions et aide}
% \changes{5.0}{2018-08-09}{Code source du projet déplacé de GitHub
-% vers GitLab.}
+% vers GitLab.}
+% \changes{6.0}{2024-06-18}{Documentation: retrait du wiki thèse
+% (fermé) et des archives de la liste ulthese-aide (peu utiles).}
%
-% Le \link{https://gitlab.com/vigou3/ulthese/}{dépôt du projet} dans
+% Le \href{https://gitlab.com/vigou3/ulthese/}{dépôt du projet} dans
% GitLab demeure le meilleur endroit pour rapporter des bogues ou pour
-% proposer des améliorations à la classe \class{ulthese}.
-%
-% Pour obtenir de l'aide additionnelle sur l'utilisation de la classe
-% --- et non sur celle de {\LaTeX} en général --- consultez d'abord:
-% \begin{enumerate}
-% \item le \link{http://www.theses.ulaval.ca/wiki/}{WikiThèse} de
-% l'Université Laval, en particulier la
-% \link{http://www.theses.ulaval.ca/wiki/index.php?title=FAQ}{Foire aux questions};
-% \item les
-% \link{http://listes.ulaval.ca/listserv/archives/ulthese-aide.html}{archives}
-% de la liste de distribution \texttt{ulthese-aide}.
-% \end{enumerate}
-% Si la réponse à votre question ne se trouve ni dans le wiki, ni dans
-% les archives, alors écrivez à l'adresse
-% \href{mailto:ulthese-aide@listes.ulaval.ca}{\url{ulthese-aide@listes.ulaval.ca}}.
-%
-% \StopEventually{
-% \begin{thebibliography}{15}
-% \addcontentsline{toc}{section}{Références}
-% \bibitem[{Arseneau(2010)}]{chapterbib}
-% Arseneau, D. 2010,
-% {\selectlanguage{english}\emph{chapterbib. Multiple
-% bibliographies in {\LaTeX}}}.
-% URL~\url{https://www.ctan.org/pkg/chapterbib/}.
-%
-% \bibitem[{Braams et Bezos(2016)}]{babel}
-% Braams, J. et J.~Bezos. 2016,
-% {\selectlanguage{english}\emph{Babel}}.
-% URL~\url{https://www.ctan.org/pkg/babel/}.
-%
-% \bibitem[{Carlisle et {The \LaTeX3\ Project}(2016)}]{graphicx}
-% Carlisle, D. et {The \LaTeX3\ Project}. 2016,
-% {\selectlanguage{english}\emph{Packages in the `graphics'
-% Bundle}}. URL~\url{https://www.ctan.org/pkg/graphics/}.
-%
-% \bibitem[{Charette(2015)}]{polyglossia}
-% Charette, F. 2015, {\selectlanguage{english}\emph{Polyglossia:
-% An Alternative to Babel for {\XeLaTeX} and {\LuaLaTeX}}}.
-% URL~\url{https://www.ctan.org/pkg/polyglossia/}, current
-% maintainer Arthur Reutenauer.
-%
-% \bibitem[{Daly(2010)}]{natbib}
-% Daly, P.~W. 2010, {\selectlanguage{english}\emph{Natural
-% Sciences Citations and References}}.
-% URL~\url{https://www.ctan.org/pkg/natbib/}.
-%
-% \bibitem[{Goulet(2013)}]{francais-bst}
-% Goulet, V. 2013, {\selectlanguage{french}«Paquetage
-% francais-bst»},
-% URL~\url{https://www.ctan.org/pkg/francais-bst/}.
-%
-% \bibitem[{Goulet(2020)}]{formation-latex-ul}
-% Goulet, V. 2020, {\selectlanguage{french}\emph{Rédaction avec
-% {\LaTeX}}}, document libre sous contrat Creative Commons.
-% URL~\url{httpss://ctan.org/pkg/formation-latex-ul}.
-%
-% \bibitem[{Harders(2012)}]{numprint}
-% Harders, H. 2012, {\selectlanguage{english}\emph{The
-% numprint package}}.
-% URL~\url{https://www.ctan.org/pkg/numprint/}.
-%
-% \bibitem[{Jeffrey et Mittelbach(2015)}]{inputenc}
-% Jeffrey, A. et F.~Mittelbach. 2015,
-% {\selectlanguage{english}\emph{inputenc.sty}}.
-% URL~\url{https://www.ctan.org/pkg/inputenc/}.
-%
-% \bibitem[{Kern(2016)}]{xcolor}
-% Kern, D.~U. 2016, {\selectlanguage{english}\emph{Extending
-% {\LaTeX}’s color facilities: the xcolor package}}.
-% URL~\url{https://www.ctan.org/pkg/xcolor/}.
-%
-% \bibitem[{Lehman et Wright(2018)}]{etoolbox}
-% Lehman, P. et J.~Wright. 2018,
-% {\selectlanguage{english}\emph{The etoolbox package}}.
-% URL~\url{https://www.ctan.org/pkg/etoolbox/}.
-%
-% \bibitem[{Malo(1996)}]{Malo:1996}
-% Malo, M. 1996, {\selectlanguage{french}\emph{Guide de la
-% communication écrite au cégep, à l'université et en
-% entreprise}}, Québec Amérique. ISBN~978-2-8903-7875-9.
-%
-% \bibitem[{Rahtz et Oberdiek(2017)}]{hyperref}
-% Rahtz, S. et H.~Oberdiek. 2017,
-% {\selectlanguage{english}\emph{Hypertext marks in {\LaTeX}: a
-% manual for hyperref}}.
-% URL~\url{https://www.ctan.org/pkg/hyperref/}.
-%
-% \bibitem[{Robertson et Hosny(2017)}]{fontspec}
-% Robertson, W. et K.~Hosny. 2017,
-% {\selectlanguage{english}\emph{The fontspec package: Font
-% selection for {\XeLaTeX} and {\LuaLaTeX}}}.
-% URL~\url{https://www.ctan.org/pkg/fontspec/}.
-%
-% \bibitem[{Wilson(2016)}]{memoir}
-% Wilson, P. 2016, {\selectlanguage{english}\emph{The Memoir Class
-% for Configurable Typesetting}}, 8{\ieme} éd., The Herries Press.
-% URL~\url{https://www.ctan.org/pkg/memoir/}, maintained by Lars
-% Madsen.
-% \end{thebibliography}
-% \PrintChanges
-% }
+% proposer des améliorations à la classe {\ulclass}.
+%
+% Pour de l'aide additionnelle sur l'utilisation de la classe~--- et
+% non sur celle de {\LaTeX} en général~--- écrivez à l'adresse %
+% \href{mailto:ulthese-aide@listes.ulaval.ca}{ulthese-aide@listes.ulaval.ca}.
%
% \appendix
%
@@ -1343,44 +1086,47 @@
% la \autoref{sec:utilisation:options} lorsque l'on souhaite créer une
% page de titre.
%
-% \begin{DescribeMacro}{multifacultaire}
-% Identifie une thèse multifacultaire. Valide uniquement avec un
-% grade de doctorat. Cette déclaration requiert ensuite d'utiliser
-% la commande \cmd{\faculteUL}.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{extensionUdeS}
-% Identifie une thèse réalisée en extension à l'Université de
-% Sherbrooke. Valide uniquement avec un grade de doctorat. Cette
-% déclaration requiert ensuite d'utiliser les commandes
-% \cmd{\faculteUL} et \cmd{\faculteUdeS}.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{extensionUQO}
-% Identifie une thèse réalisée en extension à l'Université du
-% Québec en Outaouais (UQO). Valide uniquement avec un grade de doctorat.
-% Cette déclaration requiert ensuite d'utiliser les commandes
-% \cmd{\faculteUL} et \cmd{\faculteUQO}.
-% \end{DescribeMacro}
-%
-% \begin{DescribeMacro}{extensionUQAC}
-% Identifie un mémoire réalisé en extension à l'Université du Québec
-% à Chicoutimi (UQAC). Valide uniquement avec un grade de maîtrise.
-% Cette déclaration requiert ensuite d'utiliser les commandes
-% \cmd{\faculteUL} et \cmd{\faculteUQAC}.
-% \end{DescribeMacro}
+% \begin{DescribeOption}{multifacultaire}
+% L'option |multifacultaire| identifie une thèse
+% multifacultaire. Valide uniquement avec un grade de doctorat.
+% Cette déclaration requiert ensuite d'utiliser la commande
+% \cmd{\faculteUL}.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{extensionUdeS}
+% L'option |extensionUdeS| identifie une thèse réalisée en extension
+% à l'Université de Sherbrooke. Valide uniquement avec un grade de
+% doctorat. Cette déclaration requiert ensuite d'utiliser les
+% commandes \cmd{\faculteUL} et \cmd{\faculteUdeS}.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{extensionUQO}
+% L'option |extensionUQO| identifie une thèse réalisée en extension
+% à l'Université du Québec en Outaouais (UQO). Valide uniquement
+% avec un grade de doctorat. Cette déclaration requiert ensuite
+% d'utiliser les commandes \cmd{\faculteUL} et \cmd{\faculteUQO}.
+% \end{DescribeOption}
+%
+% \begin{DescribeOption}{extensionUQAC}
+% L'option |extensionUQAC| identifie un mémoire réalisé en extension
+% à l'Université du Québec à Chicoutimi (UQAC). Valide uniquement
+% avec un grade de maîtrise. Cette déclaration requiert ensuite
+% d'utiliser les commandes \cmd{\faculteUL} et \cmd{\faculteUQAC}.
+% \end{DescribeOption}
%
% Ensuite, la composition d'une page de titre peut nécessiter
% d'utiliser les commandes ci-dessous en plus de celles de la
% \autoref{sec:utilisation:commandes}.
%
% \begin{DescribeMacro}{\annee}
-% Année du dépôt final de la thèse ou du mémoire.
+% La commande \cmdprint{\annee} spécifie l'année du dépôt final de
+% la thèse ou du mémoire.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\univcotutelle}
-% Nom, ville et pays de l'université de cotutelle, déclarés sous la
-% forme
+% Pour les thèses en cotutelle, la commande
+% \cmdprint{\univcotutelle} permet de saisir le nom, la ville et le
+% pays de l'université de cotutelle, sous la forme
% \begin{quote}
% |\univcotutelle{Nom de l'université \\ Ville, Pays}|
% \end{quote}
@@ -1389,8 +1135,9 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\gradecotutelle}
-% Grade conféré par l'université de cotutelle, déclaré
-% sous la forme
+% Pour les thèses en cotutelle, la commande
+% \cmdprint{\gradecotutelle} spécifie le grade conféré par
+% l'université de cotutelle, sous la forme
% \begin{quote}
% |\gradecotutelle{Nom du grade (sigle)}|
% \end{quote}
@@ -1399,8 +1146,9 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\univbidiplomation}
-% Nom, ville et pays de l'université de bidiplomation, déclarés sous
-% la forme
+% Pour les mémoires en bidiplomation, la commande
+% \cmdprint{\univbidiplomation} permet de saisir le nom, la ville et
+% le pays de l'université de bidiplomation, sous la forme
% \begin{quote}
% |\univbidiplomation{Nom de l'université \\ Ville, Pays}|
% \end{quote}
@@ -1409,8 +1157,9 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\gradebidiplomation}
-% Grade conféré par l'université de bidiplomation, déclaré sous la
-% forme
+% Pour les mémoires en bidiplomation, la commande
+% \cmdprint{\gradebidiplomation} spécifie le grade conféré par
+% l'université de bidiplomation, sous la forme
% \begin{quote}
% |\gradebidiplomation{Nom du grade (sigle)}|
% \end{quote}
@@ -1419,7 +1168,8 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\faculteUL}
-% La commande a deux usages:
+% La commande \cmdprint{\faculteUL} sert à saisir deux types
+% d'informations:
% \begin{enumerate}
% \item noms des facultés pour les thèses et mémoires
% multifacultaires, séparés par des commandes |\\|;
@@ -1433,35 +1183,37 @@
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\faculteUdeS}
-% Nom de la faculté de l'Université de Sherbrooke hébergeant la
-% thèse en extension. Cette commande prend effet seulement lorsque
-% la classe est chargée avec l'option |extensionUdeS|.
+% La commande \cmdprint{\faculteUdeS} spécifie le nom de la faculté
+% de l'Université de Sherbrooke hébergeant la thèse en extension.
+% Cette commande prend effet seulement lorsque la classe est chargée
+% avec l'option |extensionUdeS|.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\faculteUQO}
-% Nom de la faculté de l'Université du Québec en Outaouais
-% hébergeant la thèse en extension. Cette commande prend effet
-% seulement lorsque la classe est chargée avec l'option
-% |extensionUQO|.
+% La commande \cmdprint{\faculteUQO} spécifie le nom de la faculté
+% de l'Université du Québec en Outaouais hébergeant la thèse en
+% extension. Cette commande prend effet seulement lorsque la classe
+% est chargée avec l'option |extensionUQO|.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\faculteUQAC}
-% Nom de la faculté de l'Université du Québec à Chicoutimi
-% hébergeant le mémoire en extension. Cette commande prend effet
-% seulement lorsque la classe est chargée avec l'option
-% |extensionUQAC|.
+% La commande \cmdprint{\faculteUQAC} spécifie le nom de la faculté
+% de l'Université du Québec à Chicoutimi hébergeant le mémoire en
+% extension. Cette commande prend effet seulement lorsque la classe
+% est chargée avec l'option |extensionUQAC|.
% \end{DescribeMacro}
%
% \begin{DescribeMacro}{\pagetitre}
-% Création de la page de titre. Ne pas utiliser la commande
-% \cmd{\pagetitle} de {\LaTeX} pour ce faire. De toutes les
+% La commande \cmdprint{\pagetitre} crée la page de titre à
+% l'endroit où elle apparait dans le code source. N'utilisez pas la
+% commande \cmd{\titlepage} de {\LaTeX} pour ce faire. De toutes les
% commandes ci-dessus, c'est la seule qui doit se trouver dans le
% corps du document plutôt que dans le préambule.
% \end{DescribeMacro}
%
+% \MaybeStop{\PrintChanges}
%
-% ^^A Début du code de la classe
-%
+% ^^A >>>>> Début du code de la classe
% \section{Mise en œuvre}
% \label{sec:meo}
%
@@ -1470,37 +1222,30 @@
% explorer comment la classe est programmée.
%
% \subsection{Tests et valeurs booléennes}
-% \changes{4.4}{2017-06-01}{Tests et valeurs booléennes réalisés sans ifthen.}
+% \changes{4.4}{2017-06-01}{Tests et valeurs booléennes réalisés sans
+% \textbf{ifthen}.}
%
-% Le paquetage \pkg{ifxetex} permet de tester si un document est
-% compilé avec \XeTeX.
-% \begin{macrocode}
-%<*class>
-\RequirePackage{ifxetex}
-% \end{macrocode}
% Nous définissons ici toutes les valeurs booléennes requises par la
% classe.
% \begin{macrocode}
+%<*class>
\newif\ifUL@babel \UL@babeltrue % charger babel?
\newif\ifUL@natbib \UL@natbibtrue % charger natbib?
\newif\ifUL@hyperref \UL@hyperreftrue % charger hyperref?
-\newif\ifUL@chapterbib \UL@chapterbibfalse % charger chapterbib?
-\newif\ifUL@sectionbib \UL@sectionbibfalse % option sectionbib de chapterbib?
-\newif\ifUL@isthesis % programme est une thèse?
-\newif\ifUL@iscotutelle \UL@iscotutellefalse % thèse en cotutelle?
+\newif\ifUL@isthesis % programme est une these?
+\newif\ifUL@iscotutelle \UL@iscotutellefalse % these en cotutelle?
\newif\ifUL@isexam \UL@isexamfalse % examen de doctorat?
-\newif\ifUL@isessay \UL@isessayfalse % essai de maîtrise?
+\newif\ifUL@isessay \UL@isessayfalse % essai de maitrise?
\newif\ifUL@isresearch \UL@isresearchfalse % projet de recherche?
\newif\ifUL@isworkterm \UL@isworktermfalse % rapport de stage?
\newif\ifUL@hassubtitle \UL@hassubtitlefalse % document a un sous-titre?
-\newif\ifUL@hastitlepage \UL@hastitlepagefalse % page titre utilisée?
+\newif\ifUL@hastitlepage \UL@hastitlepagefalse % page titre utilisee?
% \end{macrocode}
%
% \subsection{Options de la classe}
%
% Les grandes catégories d'options propres à la classe sont: la
-% possibilité d'empêcher le chargement du paquetage \pkg{natbib};
-% l'activation des bibliographies par chapitre ou par section; la
+% possibilité d'empêcher le chargement du paquetage \pkg{natbib}; la
% possibilité d'empêcher le chargement du paquetage \pkg{babel}; la
% possibilité d'empêcher le chargement du paquetage \pkg{hyperref}; la
% taille de la police de caractères en points; le type de grade; la
@@ -1516,21 +1261,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{bibchapitre}
-% \begin{macro}{bibsection}
-% L'option |bibchapitre| entraine le chargement du paquetage
-% \pkg{chapterbib} qui permet de composer des bibliographies
-% multiples dans un document, habituellement une par
-% chapitre. Avec l'option |bibsection|, la bibliographie se
-% présente sous la forme d'une section plutôt que d'un chapitre.
-% La seconde option implique la première.
-% \begin{macrocode}
-\DeclareOption{bibchapitre}{\UL@chapterbibtrue}
-\DeclareOption{bibsection}{\UL@chapterbibtrue\UL@sectionbibtrue}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \begin{macro}{nobabel}
% L'option |nobabel| permet d'empêcher la classe de charger le
% paquetage \pkg{babel}. Cette option peut s'avérer utile pour
@@ -1618,10 +1348,6 @@
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
\newcommand*{\UL@degree}{Ma\^itre en architecture (M.~Arch.)}}
-\DeclareOption{MA}{%
- \UL@isthesisfalse
- \renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre \`es arts (M.A.)}}
\DeclareOption{LLM}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
@@ -1634,14 +1360,10 @@
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
\newcommand*{\UL@degree}{Ma\^itre en musique (M.~Mus.)}}
-\DeclareOption{MPht}{%
- \UL@isthesisfalse
- \renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre en physioth\'erapie (M.~Pht.)}}
-\DeclareOption{MSc}{%
+\DeclareOption{MPsEd}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre \`es sciences (M.~Sc.)}}
+ \newcommand*{\UL@degree}{Ma\^itre en psycho\'education (M.~Ps.~\'ed.)}}
\DeclareOption{MScGeogr}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
@@ -1650,10 +1372,18 @@
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
\newcommand*{\UL@degree}{Ma\^itre en service social (M.~Serv.~soc.)}}
-\DeclareOption{MPsEd}{%
+\DeclareOption{MTravSoc}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre en psycho\'education (M.~Ps.~\'ed.)}}
+ \newcommand*{\UL@degree}{Ma\^itre en travail social (M.~Trav.~soc.)}}
+\DeclareOption{MA}{%
+ \UL@isthesisfalse
+ \renewcommand*{\UL@typenum}{0}
+ \newcommand*{\UL@degree}{Ma\^itre \`es arts (M.A.)}}
+\DeclareOption{MSc}{%
+ \UL@isthesisfalse
+ \renewcommand*{\UL@typenum}{0}
+ \newcommand*{\UL@degree}{Ma\^itre \`es sciences (M.~Sc.)}}
\DeclareOption{multifacultaire}{%
\ifUL@isthesis
\renewcommand*{\UL@typenum}{1}
@@ -1761,7 +1491,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Chargement de la classe \class{memoir}}
+% \subsection{Chargement de la classe \texorpdfstring{\class{memoir}}{memoir}}
%
% Toutes les options de la classe sont passées à \class{memoir}. Le
% format de papier et la taille de police par défaut sont, dans
@@ -1787,51 +1517,50 @@
% \end{macrocode}
%
% \subsection{Paquetages requis}
-% \changes{5.0}{2018-06-10}{Le paquetage unicode-math n'est plus
-% chargé par défaut par la classe.}
-% \changes{5.0}{2018-08-11}{Le paquetage hyperref est désormais chargé
-% dans la classe plutôt que dans les gabarits. Requiert le paquetage
-% etoolbox.}
+% \changes{5.0}{2018-06-10}{Le paquetage \textbf{unicode-math} n'est
+% plus chargé par défaut par la classe.}
+% \changes{5.0}{2018-08-11}{Le paquetage \textbf{hyperref} est
+% désormais chargé dans la classe plutôt que dans les gabarits.
+% Requiert le paquetage etoolbox.}
%
% La classe s'efforce de charger un minimum de paquetages afin d'éviter
% les conflits potentiels.
%
-% {\XeLaTeX} requiert le paquetage \pkg{fontspec} pour le traitement
-% des polices. Sous {\LaTeX}, il est aujourd'hui préférable d'utiliser
-% les polices T1.
+% \changes{6.0}{2024-05-24}{Mise en œuvre: paquetage \textbf{inputenc} ^^A
+% désormais chargé avec l'option \texttt{utf8} lorsque la compilation
+% est effectuée par pdf{\LaTeX}.}
+% Le code source doit obligatoirement être enregistré dans le codage
+% UTF-8. Avec pdf{\LaTeX}, cela requiert le paquetage \pkg{inputenc}.
+%
+% \changes{6.0}{2024-05-24}{Mise en œuvre: paquetage
+% \textbf{microtype} désormais chargé par la classe avec
+% \textbf{fontspec} ou \textbf{fontenc}.}
+% \changes{6.0}{2024-05-24}{Mise en œuvre: option \texttt{Ligatures} ^^A
+% plus définie par défaut pour les polices OpenType.}
+% La classe charge également les paquetages minimalement nécessaires
+% pour la gestion des polices de caractères, soit \pkg{fontspec} avec
+% les moteurs modernes et \pkg{fontenc} avec pdf{\LaTeX}.
% \begin{macrocode}
-\ifxetex
+\iftutex
+ \RequirePackage[babel=true]{microtype}
\RequirePackage{fontspec}
- \defaultfontfeatures{Ligatures=TeX}
\else
+ \RequirePackage[babel=true]{microtype}
+ \RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}
\fi
% \end{macrocode}
%
-% Les paquetages \pkg{natbib} et \pkg{chapterbib} doivent être chargés
-% avant \pkg{babel} pour bien fonctionner, le cas échéant. Tel que
-% précisé dans la documentation de \pkg{natbib}, l'option |sectionbib|
-% est passée à ce paquetage lorsqu'il est chargé, ou à
-% \pkg{chapterbib} autrement.
+% Le paquetage \pkg{natbib} doit être chargé avant \pkg{babel} pour
+% bien fonctionner, le cas échéant.
% \begin{macrocode}
\ifUL@natbib
- \ifUL@sectionbib
- \PassOptionsToPackage{sectionbib}{natbib}
- \fi
\RequirePackage[round,semicolon,authoryear]{natbib}
\fi
-\ifUL@chapterbib
- \ifUL@sectionbib
- \ifUL@natbib\else
- \PassOptionsToPackage{sectionbib}{chapterbib}
- \fi
- \fi
- \RequirePackage{chapterbib}
-\fi
% \end{macrocode}
%
% Le support pour les langues autres que l'anglais est offert par le
-% paquetage \pkg{babel} --- à moins que l'option |nobabel| n'ait
+% paquetage \pkg{babel}~--- à moins que l'option |nobabel| n'ait
% été spécifiée au chargement de la classe. Les langues sont passées
% en option de la classe, et non du paquetage. Le paquetage
% \pkg{numprint} est requis par \pkg{babel} pour la définition
@@ -1844,14 +1573,16 @@
% \end{macrocode}
%
% Le paquetage obligatoire \pkg{hyperref} est chargé en tout dernier
-% avec la commande \cmd{\AtEndPreamble} du paquetage \pkg{etoolbox}.
-% Si l'option |nohyperref| a été spécifiée, la classe vérifie que le
-% paquetage a été chargé. La configuration de base de la classe fait
-% en sorte que tous les liens sont signalés par la couleur
-% |ULlinkcolor| définie à la \autoref{sec:couleurs}.
+% avec la commande \cmd{\AtEndPreamble} du paquetage \pkg{etoolbox}
+% (chargé par \class{memoir}). Si l'option |nohyperref| a été
+% spécifiée, la classe vérifie que le paquetage a été chargé. La
+% configuration de base de la classe fait en sorte que tous les liens
+% sont signalés par la couleur |ULlinkcolor| définie à la
+% \autoref{sec:couleurs}.
+% \changes{6.0}{2024-06-17}{Mise en œuvre: chargement explicite de
+% \textbf{etoolbox} retiré, car le paquetage est chargé par memoir.}
% \begin{macrocode}
\ifUL@hyperref
- \RequirePackage{etoolbox}
\AtEndPreamble{\RequirePackage{hyperref}}
\else
\AtBeginDocument{%
@@ -1870,11 +1601,8 @@
\RequirePackage{xcolor}
% \end{macrocode}
%
-% La commande \cmd{\textcopyright} utilisée sur la page de titre requiert le
-% paquetage \pkg{textcomp} pour obtenir un beau signe de copyright.
-% \begin{macrocode}
-\RequirePackage{textcomp}
-% \end{macrocode}
+% \changes{6.0}{2024-06-17}{Mise en œuvre: paquetage \textbf{textcomp} ^^A
+% retiré, car non nécessaire.}
%
% \subsection{Paquetage incompatible}
%
@@ -1926,7 +1654,7 @@
% \subsection{Interligne}
%
% L'espacement entre les lignes est d'un interligne et demi.
-% L'espacement «double» entre les paragraphes est fixé à
+% L'espacement double entre les paragraphes est fixé à
% |0.5\baselineskip| afin d'en arriver à une disposition agréable à
% l'œil. Le retrait de première ligne est supprimé puisque plus
% nécessaire suite à l'ajout de l'espacement entre les paragraphes.
@@ -1968,11 +1696,15 @@
% utilisées dans la classe sont toutes quelques points inférieures à
% celles des gabarits Word.}%
% et les graisses présentées au \autoref{tab:polices}. La
-% déclaration |\fontencoding{T1}| est nécessaire avec {\XeLaTeX} pour
-% explicitement charger la même police que sous {\LaTeX}.
+% déclaration |\fontencoding{T1}| est nécessaire avec les moteurs
+% modernes pour explicitement charger la même police qu'avec
+% pdf{\LaTeX}.
%
% \begin{table}
% \centering
+% \caption{Tailles et graisses de la police Helvetica des éléments
+% de la page de titre}
+% \label{tab:polices}
% \begin{tabular}{ll}
% \toprule
% Élément & Police \\
@@ -1984,9 +1716,6 @@
% Autres éléments & 12~points normal \\
% \bottomrule
% \end{tabular}
-% \caption{Tailles et graisses de la police Helvetica des éléments
-% de la page de titre}
-% \label{tab:polices}
% \end{table}
%
% \begin{macrocode}
@@ -2435,22 +2164,30 @@
\setsecnumdepth{subsection}
%</class>
% \end{macrocode}
-% ^^A Fin du code de la classe
+% ^^A <<<<< Fin du code de la classe
%
-% ^^A Il faut placer ces notes de changement relatives aux gabarits
+% ^^A Les notes de versions relatives aux gabarits doivent se trouver
% ^^A avant \Finale
% \changes{5.0}{2018-06-08}{Gabarits: meilleure indication du texte à
-% remplacer.}
+% remplacer.}
% \changes{5.0}{2018-06-08}{Gabarits: bonification de la structure
-% d'un chapitre de thèse ou de mémoire par articles.}
+% d'un chapitre de thèse ou de mémoire par articles.}
% \changes{5.0}{2018-04-25}{Gabarits: ajout d'étiquettes et de renvois
-% dans les gabarits des parties du document.}
+% dans les gabarits des parties du document.}
% \changes{5.0}{2018-04-25}{Gabarits: automatisation de l'ajout
-% d'entrées dans la table des matières à l'aide d'étiquettes et de
-% renvois.}
+% d'entrées dans la table des matières à l'aide d'étiquettes et de
+% renvois.}
% \changes{4.4}{2017-05-16}{Gabarits: nouveau gabarit pour une thèse
-% par articles.}
+% par articles.}
% \changes{4.2}{2016-03-29}{Gabarits: nouvelles options de babel.}
+% \changes{6.0}{2024-05-22}{Gabarits: gabarits pour une thèse par
+% articles révisés suite aux changements aux règles de présentation.}
+% \changes{6.0}{2024-05-22}{Gabarits: meilleure sélection automatique
+% des paquetages pour les polices et pour le codage selon le moteur
+% {\TeX}.}
+% \changes{6.0}{2024-06-20}{Gabarits: seul l'exemple de changement
+% pour les polices STIX Two est maintenant fourni, et ce, dans une
+% version qui fonctionne avec les polices livrées avec TeX Live.}
%
% \Finale
%
@@ -2473,60 +2210,57 @@
%% description détaillée de la classe, de ce gabarit et des options
%% disponibles.
%%
+%% Vous devez obligatoirement enregistrer tout fichier contenant des
+%% caractères non-ASCII (comme des lettres accentuées) dans le codage
+%% de caractères UTF-8.
+%%
%% [Ne pas hésiter à supprimer les commentaires après les avoir lus.]
%%
%% Déclaration de la classe avec le type de grade
%<phd>%% [l'un de LLD, DMus, DPsy, DThP, PhD]
-%<m>%% [l'un de MATDR, MArch, MA, LLM, MErg, MMus, MPht, MSc, MScGeogr,
-%<m>%% MServSoc, MPsEd]
+%<m>%% [l'un de MATDR, MArch, LLM, MErg, MMus, MPsEd, MScGeogr,
+%<m>%% MServSoc, MTravSoc, MA, MSc]
%% et les langues les plus courantes. Le français sera la langue par
-%<!articles>%% défaut du document.
-%<articles>%% défaut du document. L'option 'bibsection' permet de créer des
-%<articles>%% bibliographies par chapitre présentées sous forme de section
-%<articles>%% numérotée.
-%<phd&standard>\documentclass[PhD,english,french]{ulthese}
-%<phd&articles>\documentclass[PhD,bibsection,english,french]{ulthese}
+%% défaut du document.
+%<phd&(standard|articles)>\documentclass[PhD,english,french]{ulthese}
%<phd&cotutelle>\documentclass[PhD,cotutelle,english,french]{ulthese}
-%<m&standard>\documentclass[MSc,english,french]{ulthese}
-%<m&articles>\documentclass[MSc,bibsection,english,french]{ulthese}
+%<m&(standard|articles)>\documentclass[MSc,english,french]{ulthese}
%<m&bidiplomation>\documentclass[MA,bidiplomation,english,french]{ulthese}
- %% Encodage utilisé pour les caractères accentués dans les fichiers
- %% source du document. Les gabarits sont encodés en UTF-8. Inutile
- %% avec XeLaTeX, qui gère Unicode nativement.
- \ifxetex\else \usepackage[utf8]{inputenc} \fi
-
%% Charger ici les autres paquetages nécessaires pour le document.
%% Quelques exemples; décommenter au besoin.
%\usepackage{amsmath} % recommandé pour les mathématiques
%\usepackage{icomma} % gestion de la virgule dans les nombres
- %% Utilisation d'une autre police de caractères pour le document.
- %% - Sous LaTeX
- %\usepackage{mathpazo} % texte et mathématiques en Palatino
- %\usepackage{mathptmx} % texte et mathématiques en Times
- %% - Sous XeLaTeX
- %\setmainfont{TeX Gyre Pagella} % texte en Pagella (Palatino)
- %\setmathfont{TeX Gyre Pagella Math} % mathématiques en Pagella (Palatino)
- %\setmainfont{TeX Gyre Termes} % texte en Termes (Times)
- %\setmathfont{TeX Gyre Termes Math} % mathématiques en Termes (Times)
+ %% Utilisation d'une autre police de caractères pour le document
+ %% (exemple pour les polices STIX Two incluses dans TeX Live).
+ %% - Avec pdfLaTeX
+ %\usepackage{stix2}
+ %% - Avec XeLaTeX
+ %\setmainfont{STIXTwoText}
+ %[
+ % Extension = .otf,
+ % UprightFont = *-Regular,
+ % BoldFont = *-SemiBold,
+ % ItalicFont = *-Italic,
+ % BoldItalicFont = *-SemiBoldItalic,
+ %]
+ %\setmathfont{STIXTwoMath-Regular}
+ %[
+ % Extension = .otf,
+ %]
%% Options de mise en forme du mode français de babel. Consulter la
- %% documentation du paquetage babel pour les options disponibles.
- %% Désactiver (effacer ou mettre en commentaire) si l'option
- %% 'nobabel' est spécifiée au chargement de la classe.
- \frenchbsetup{%
+ %% documentation du paquetage babel-french pour les options
+ %% disponibles. Désactiver (effacer ou mettre en commentaire) si
+ %% l'option 'nobabel' est spécifiée au chargement de la classe.
+ \frenchsetup{%
StandardItemizeEnv=true, % format standard des listes
ThinSpaceInFrenchNumbers=true, % espace fine dans les nombres
og=«, fg=» % caractères « et » sont les guillemets
}
-%<!articles> %% Style de la bibliographie.
-%<!articles> \bibliographystyle{}
-%<articles> %% Suppression du numéro de section de la bibliographie. Utilisation
-%<articles> %% de \extrasfrench parce que c'est la dernière langue déclarée dans
-%<articles> %% \documentclass, ci-dessus.
-%<articles> %\addto\extrasfrench{%
-%<articles> % \renewcommand{\bibsection}{\section*{\bibname}\prebibhook}}
+ %% Style de la bibliographie.
+ \bibliographystyle{}
%% Composition de la page frontispice. Remplacer les éléments entre < >.
%% Supprimer les caractères < >. Couper un long titre ou un long
@@ -2561,19 +2295,19 @@
\frontmatter % pages liminaires
-\frontispice % production de la page frontispice
+\frontispice % page frontispice (obligatoire)
-\include{resume} % résumé français
-\include{abstract} % résumé anglais
+\include{resume} % résumé français (obligatoire)
+\include{abstract} % résumé anglais (optionnel)
\cleardoublepage
-\tableofcontents % production de la TdM
+\tableofcontents % table des matières (obligatoire)
\cleardoublepage
-\listoftables % production de la liste des tableaux
+\listoftables % liste des tableaux
\cleardoublepage
-\listoffigures % production de la liste des figures
+\listoffigures % liste des figures
\cleardoublepage
\dedicace{<Dédicace si désiré>}
@@ -2583,7 +2317,8 @@
\cleardoublepage
\include{remerciements} % remerciements
-\include{avantpropos} % avant-propos
+%<!articles>\include{avantpropos} % avant-propos (optionnel)
+%<articles>\include{avantpropos} % avant-propos (obligatoire)
\mainmatter % corps du document
@@ -2598,8 +2333,7 @@
\include{annexe} % annexe A
-%<!articles>\bibliography{} % production de la bibliographie
-%<!articles>
+\bibliography{} % production de la bibliographie
\end{document}
%</gabarit>
%
@@ -2637,8 +2371,8 @@
\label{chap-avantpropos} % étiquette pour renvois
\phantomsection\addcontentsline{toc}{chapter}{\nameref{chap-avantpropos}} % inclure dans TdM
-<Texte de l'avant-propos. Obligatoire dans une thèse ou un mémoire par
-articles.>
+<Texte de l'avant-propos. Obligatoire seulement pour une thèse ou un
+mémoire par intégration d'articles.>
%</avantpropos>
%
%<*introduction>
@@ -2669,8 +2403,6 @@ normal, sauf qu'elle n'est pas numérotée.>
%<articles>
<Texte du chapitre ou de l'article.>
%<articles>
-%<articles>\bibliographystyle{} % style de la bibliographie
-%<articles>\bibliography{} % production de la bibliographie
%</chapitre>
%
%<*conclusion>
diff --git a/Master/texmf-dist/source/latex/ulthese/ulthese.ins b/Master/texmf-dist/source/latex/ulthese/ulthese.ins
index 7987a0f368c..59e03576625 100644
--- a/Master/texmf-dist/source/latex/ulthese/ulthese.ins
+++ b/Master/texmf-dist/source/latex/ulthese/ulthese.ins
@@ -1,44 +1,34 @@
-%%
-%% Copyright (C) 2017 Universite Laval
-%%
-%% This file may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3c of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2006/05/20 or later.
-%%
+%% Procédure d'installation de la classe ulthese.cls et des gabarits à
+%% partir de ulthese.dtx
\input docstrip.tex
\keepsilent
\askforoverwritefalse
+\nopostamble
\preamble
This is a generated file.
-Copyright (C) 2017 Universite Laval
+Copyright (C) 2012-2024 Universite Laval
This file may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.3c of this
license or (at your option) any later version. The latest version
of this license is in:
- http://www.latex-project.org/lppl.txt
+ https://www.latex-project.org/lppl.txt
and version 1.3c or later is part of all distributions of LaTeX
version 2006/05/20 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is Universite Laval
-<ulthese-dev@bibl.ulaval.ca>.
+The Current Maintainer of this work is Vincent Goulet for
+Universite Laval <ulthese-dev@bibl.ulaval.ca>.
-This work consists of the files ulthese.dtx and ulthese.ins and the
-derived files listed in the README.md file.
+This work consists of the files ulthese.dtx, ulthese.ins, and the
+derived files listed in the file README.md.
\endpreamble
@@ -83,17 +73,18 @@ derived files listed in the README.md file.
\obeyspaces
\Msg{*************************************************************}
\Msg{* *}
-\Msg{* La classe ulthese est maintenant prete a l'emploi. *}
+\Msg{* La classe ulthese est maintenant prête à l'emploi! *}
\Msg{* *}
-\Msg{* Utiliser un gabarit comme base pour votre fichier maitre. *}
-\Msg{* Vous pouvez effacer les gabarits inutiles. Composer le *}
-\Msg{* document dans des fichiers .tex distincts; quelques *}
-\Msg{* gabarits sont fournis avec la classe. *}
+\Msg{* Utilisez un des gabarits fournis avec la classe comme *}
+\Msg{* base pour votre fichier maitre. Vous pouvez effacer les *}
+\Msg{* gabarits inutiles. Composez le document dans des fichiers *}
+\Msg{* .tex distincts; quelques gabarits sont aussi fournis avec *}
+\Msg{* la classe. *}
\Msg{* *}
\Msg{* Pour produire la documentation de la classe, compiler le *}
-\Msg{* fichier ulthese.dtx avec LaTeX. *}
+\Msg{* fichier ulthese.dtx avec XeLaTeX. *}
\Msg{* *}
-\Msg{* Bonne redaction! *}
+\Msg{* Bonne rédaction! *}
\Msg{* *}
\Msg{*************************************************************}
diff --git a/Master/texmf-dist/source/luatex/luamplib/Makefile b/Master/texmf-dist/source/luatex/luamplib/Makefile
index 87f04f727e0..a0a22826754 100644
--- a/Master/texmf-dist/source/luatex/luamplib/Makefile
+++ b/Master/texmf-dist/source/luatex/luamplib/Makefile
@@ -40,6 +40,7 @@ world: all ctan
%.pdf: %.dtx
@$(DOLATEX)
@if( grep rerunfilecheck $(NAME).log |grep 'has changed' > /dev/null ); then $(DOLATEX); fi
+ @if( grep 'Rerun to get' $(NAME).log > /dev/null ); then $(DOLATEX); fi
$(UNPACKED): $(DTX)
luatex -interaction=batchmode $< >/dev/null
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index fd6afd4e657..44500e957cc 100644
--- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
+++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
@@ -2,8 +2,8 @@
%
% Copyright (C) 2008-2024 by Hans Hagen, Taco Hoekwater, Elie Roux,
% Manuel Pégourié-Gonnard, Philipp Gesang and Kim Dohyun.
-% Currently maintained by the LuaLaTeX development team.
-% Support: <lualatex-dev@tug.org>
+% Currently maintained by Kim Dohyun.
+% Support: <https://github.com/lualatex/luamplib>
%
% This work is under the GPL v2.0 license.
%
@@ -85,7 +85,7 @@ See source file '\inFileName' for licencing and contact information.
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luamplib.drv}%
- [2024/06/21 v2.32.3 Interface for using the mplib library]%
+ [2024/07/17 v2.34.0 Interface for using the mplib library]%
\documentclass{ltxdoc}
\usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
\usepackage[x11names]{xcolor}
@@ -151,9 +151,9 @@ See source file '\inFileName' for licencing and contact information.
%
% \title{The \textsf{luamplib} package}
% \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\
-% Maintainer: LuaLaTeX Maintainers ---
-% Support: \email{lualatex-dev@tug.org}}
-% \date{2024/06/21 v2.32.3}
+% Current Maintainer: Kim Dohyun\\
+% Support: \url{https://github.com/lualatex/luamplib}}
+% \date{2024/07/17 v2.34.0}
%
% \maketitle
%
@@ -163,111 +163,145 @@ See source file '\inFileName' for licencing and contact information.
%
% \section{Documentation}
%
-% This packages aims at providing a simple way to typeset directly metapost
-% code in a document with \LuaTeX. \LuaTeX\ is built with the lua
-% \texttt{mplib} library, that runs metapost code. This package is basically a
-% wrapper (in Lua) for the Lua \texttt{mplib} functions and some \TeX\
-% functions to have the output of the \texttt{mplib} functions in the pdf.
-%
-% In the past,
-% the package required PDF mode in order to output something.
-% Starting with version 2.7 it works in DVI mode as well, though
-% DVIPDFMx is the only DVI tool currently supported.
-%
-% The metapost figures are put in a \TeX\ \texttt{hbox} with dimensions
-% adjusted to the metapost code.
+% This package aims at providing a simple way to typeset directly metapost
+% code in a document with \LuaTeX. \LuaTeX\ is built with the Lua
+% \textsf{mplib} library, that runs metapost code. This package is basically a
+% wrapper for the Lua \textsf{mplib} functions and some \TeX\
+% functions to have the output of the \textsf{mplib} functions in the pdf.
%
% Using this package is easy: in Plain, type your metapost code between the
% macros \cs{mplibcode} and \cs{endmplibcode}, and in \LaTeX\ in the
% \texttt{mplibcode} environment.
%
-% The code is from the \texttt{luatex-mplib.lua} and \texttt{luatex-mplib.tex} files
-% from \ConTeXt, they have been adapted to \LaTeX\ and Plain by Elie Roux and
-% Philipp Gesang, new functionalities have been added by Kim Dohyun.
-% The changes are:
+% The resulting metapost figures are put in a \TeX\ \texttt{hbox} with dimensions
+% adjusted to the metapost code.
+%
+% The code of luamplib is basically from the |luatex-mplib.lua| and |luatex-mplib.tex| files
+% from \ConTeXt. They have been adapted to \LaTeX\ and Plain by Elie Roux and
+% Philipp Gesang and new functionalities have been added by Kim Dohyun.
+% The most notable changes are:
%
% \begin{itemize}
-% \item a \LaTeX\ environment
-% \item all \TeX\ macros start by |mplib|
-% \item use of our own function for errors, warnings and informations
% \item possibility to use |btex ... etex| to typeset \TeX\ code.
-% |textext()| is a more versatile macro equivalent to |TEX()| from TEX.mp.
-% |TEX()| is also allowed and is a synomym of |textext()|.\par\smallskip
-% \textsc{n.b.} Since v2.5, |btex ... etex| input from external |mp| files
-% will also be processed by \textsf{luamplib}.\par\smallskip
-% \textsc{n.b.} Since v2.20, |verbatimtex ... etex| from external |mp| files
-% will be also processed by \textsf{luamplib}. Warning: This is a change
-% from previous version.
+% |textext()| is a more versatile macro equivalent to |TEX()| from \textsf{TEX.mp}.
+% |TEX()| is also allowed and is a synonym of |textext()|.
+% The argument of
+% \textsf{mplib}'s primitive |maketext| will also be processed by the same routine.
+%
+% \item possibility to use |verbatimtex ... etex|, though it's behavior cannot
+% be the same as the stand-alone \textsf{mpost}.
+% Of course you cannot include \cs{documentclass}, \cs{usepackage} etc.
+% When these \TeX\ commands are found in |verbatimtex ... etex|, the entire code will be
+% ignored.
+% The treatment of |verbatimtex| command has changed a lot since v2.20;
+% see below regarding \cs{mpliblegacybehavior}.
+%
+% \item in the past,
+% the package required PDF mode in order to have some output.
+% Starting with version 2.7 it works in DVI mode as well, though
+% DVIPDFMx is the only DVI tool currently supported.
% \end{itemize}
%
-% Some more changes and cautions are:
+% It seems to be convenient to divide the explanations of some more changes and cautions
+% into three parts: \TeX, MetaPost, and Lua interfaces.
+%
+% \subsection{\TeX}
%
% \paragraph{\cs{mplibforcehmode}}
-% When this macro is declared, every mplibcode figure box will be
+% When this macro is declared, every metapost figure box will be
% typeset in horizontal mode, so \cs{centering}, \cs{raggedleft} etc
% will have effects. |\mplibnoforcehmode|, being default, reverts this
-% setting. (Actually these commands redefine |\prependtomplibbox|. You
-% can define this command with anything suitable before a box.)
+% setting. (Actually these commands redefine |\prependtomplibbox|; you
+% can redefine this command with anything suitable before a box.)
%
-% \paragraph{\cs{mpfig} \ldots\ \cs{endmpfig}}
-% Since v2.29 we provide unexpandable \TeX\ macros |\mpfig ... \endmpfig| and its starred version
-% |\mpfig* ... \endmpfig| to save typing toil.
-% The first is roughly the same as follows:
-% \begin{verbatim}
-% \begin{mplibcode}[@mpfig]
-% beginfig(0)
-% token list declared by \everymplib[@mpfig]
-% ...
-% token list declared by \everyendmplib[@mpfig]
-% endfig;
-% \end{mplibcode}
-% \end{verbatim}
-% and the starred version is roughly the same as follows:
-% \begin{verbatim}
-% \begin{mplibcode}[@mpfig]
-% ...
+% \paragraph{\cs{everymplib\{...\}}, \cs{everyendmplib\{...\}}}
+% \cs{everymplib} and \cs{everyendmplib} redefine
+% the lua table containing metapost code
+% which will
+% be automatically inserted at the beginning and ending of each metapost code chunk.
+%\begin{verbatim}
+% \everymplib{ beginfig(0); }
+% \everyendmplib{ endfig; }
+% \begin{mplibcode}
+% % beginfig/endfig not needed
+% draw fullcircle scaled 1cm;
% \end{mplibcode}
-% \end{verbatim}
-% In these macros |\mpliblegacybehavior{disable}| (see below)
-% is forcibly declared.
-% And as both share the same instance name, metapost codes are inherited among them.
-% A simple example:
-% \begin{verbatim}
-% \mpfig* input boxes \endmpfig
-% \everymplib[@mpfig]{ drawoptions(withcolor .5[red,white]); }
-% \mpfig circleit.a(btex Box 1 etex); drawboxed(a); \endmpfig
-% \end{verbatim}
-% The instance name (default: |@mpfig|) can be changed by redefining
-% \cs{mpfiginstancename}, after which a new MPlib instance will start and
-% code inheritance too will begin anew. |\let\mpfiginstancename\empty| will
-% prevent code inheritance if |\mplibcodeinherit{true}| (see below) is not declared.\footnote{%
-% As for user setting values, |enable|, |true|, |yes| are identical, and
-% |disable|, |false|, |no| are identical.}
-%
-% \paragraph{\cs{mpliblegacybehavior\{enable\}}}
-% By default, |\mpliblegacybehavior{enable}| is already declared,
-% in which case
-% a |verbatimtex ... etex| that comes just before |beginfig()|
-% is not ignored, but the \TeX\ code will be inserted before the
-% following mplib hbox. Using this command,
-% each mplib box can be freely moved horizontally and/or vertically.
-% Also, a box number might be assigned to mplib box, allowing it to be
-% reused later (see test files).
-% \begin{verbatim}
+%\end{verbatim}
+%
+% \paragraph{\cs{mplibsetformat\{plain\char"7C metafun\}}}
+% There are (basically) two formats for metapost: \emph{plain} and
+% \emph{metafun}. By default, the \emph{plain} format is used, but you can set
+% the format to be used by future figures at any time using
+% |\mplibsetformat{|\emph{<format name>}|}|.
+%
+% \textsc{n.b.} As \emph{metafun} is such a complicated format,
+% we cannot support all the functionalities producing special effects provided by \emph{metafun}.
+% At least, however, transparency (actually opacity), transparency group, and shading (gradient colors)
+% are fully supported,
+% and outlinetext is supported by our own alternative |mpliboutlinetext| (see below \S\,1.2).
+%
+% \leavevmode\llap{\textcolor{red}{☞}\kern1.2\parindent}\relax
+% Among these, transparency is so simple that you can apply it to an object,
+% even with the \emph{plain} format,
+% just by appending |withprescript "tr_transparency=|\emph{<number>}|"| to the sentence.
+% ($0 \le \hbox{\emph{<number>}} \le 1$)
+%
+% As for transparency group, the current \emph{metafun} document \S\,8.8 is not correct.
+% The true syntax is:
+%\begin{verbatim}
+% draw <picture>|<path> asgroup <string>
+%\end{verbatim}
+% where \emph{<string>} should be |""| (empty), |"isolated"|, |"knockout"|, or |"isolated,knockout"|.
+% Beware that currently many of the PDF rendering applications, except Adobe Acrobat Reader,
+% cannot properly render the isolated or knockout effect.
+%
+% One thing worth mentioning about shading is:
+% when a color expression is given in string type,
+% it is regarded by luamplib as
+% a color expression of \TeX\ side.
+% For instance, when |withshadecolors("orange", 2/3red)| is given, the first color |"orange"| will be
+% interpreted as an \textsf{xcolor}'s or \textsf{l3color}'s expression.
+%
+% \paragraph{\cs{mplibnumbersystem\{scaled\char"7C double\char"7C decimal\}}}
+% Users can choose |numbersystem| option.
+% The default value is |scaled|, which can be changed
+% by declaring \cs{mplibnumbersystem\{double\}} or
+% \cs{mplibnumbersystem\{decimal\}}.
+%
+% \paragraph{\cs{mplibshowlog\{enable\char"7C disable\}}}
+% Default: |disable|.
+% When |\mplibshowlog{enable}|\footnote{As for user's setting,
+% |enable|, |true| and |yes| are identical;
+% |disable|, |false| and |no| are identical.} is declared, log messages returned by
+% the metapost process will be printed to the |.log| file.
+% This is the \TeX{} side interface for |luamplib.showlog|.
+%
+% \paragraph{\cs{mpliblegacybehavior\{enable\char"7C disable\}}}
+% By default, |\mpliblegacybehavior{enable}|
+% is already declared for backward compatibility,
+% in which case \TeX\ code in
+% |verbatimtex| |...| |etex| that comes just before |beginfig()|
+% will be inserted before the
+% following metapost figure box. In this way,
+% each figure box can be freely moved horizontally or vertically.
+% Also, a box number can be assigned to a figure box, allowing it to be
+% reused later.
+%\begin{verbatim}
% \mplibcode
% verbatimtex \moveright 3cm etex; beginfig(0); ... endfig;
% verbatimtex \leavevmode etex; beginfig(1); ... endfig;
% verbatimtex \leavevmode\lower 1ex etex; beginfig(2); ... endfig;
% verbatimtex \endgraf\moveright 1cm etex; beginfig(3); ... endfig;
% \endmplibcode
-% \end{verbatim}
+%\end{verbatim}
% \textsc{n.b.} \cs{endgraf} should be used instead of \cs{par} inside
% |verbatimtex ... etex|.
%
-% By contrast, \TeX\ code in |VerbatimTeX(...)| or |verbatimtex ... etex|
+% On the other hand, \TeX\ code in |verbatimtex ... etex|
% between |beginfig()| and |endfig| will be inserted
-% after flushing out the mplib figure.
-% \begin{verbatim}
+% after flushing out the metapost figure.
+% As shown in the example below, |VerbatimTeX()| is a synonym of |verbatimtex| |...| |etex|.
+%\begin{verbatim}
% \mplibcode
% D := sqrt(2)**7;
% beginfig(0);
@@ -276,15 +310,15 @@ See source file '\inFileName' for licencing and contact information.
% endfig;
% \endmplibcode
% diameter: \Dia bp.
-% \end{verbatim}
+%\end{verbatim}
%
-% \paragraph{\cs{mpliblegacybehavior\{disable\}}}
-% If |\mpliblegacybehavior{disabled}| is declared by user, any
-% |verbatimtex ... etex| will be executed, along with |btex ... etex|,
+% By contrast,
+% when |\mpliblegacybehavior{disabled}| is declared, any
+% |verbatimtex| |...| |etex| will be executed, along with |btex| |...| |etex|,
% sequentially one by one.
% So, some \TeX\ code in |verbatimtex ... etex| will have effects on
-% |btex ... etex| codes that follows.
-% \begin{verbatim}
+% following |btex| |...| |etex| codes.
+%\begin{verbatim}
% \begin{mplibcode}
% beginfig(0);
% draw btex ABC etex;
@@ -293,114 +327,72 @@ See source file '\inFileName' for licencing and contact information.
% draw btex GHI etex shifted (2cm,0); % bold face
% endfig;
% \end{mplibcode}
-% \end{verbatim}
+%\end{verbatim}
%
-% \paragraph{\cs{everymplib}, \cs{everyendmplib}}
-% Since v2.3, new macros \cs{everymplib} and \cs{everyendmplib} redefine
-% the lua table containing MetaPost code
-% which will
-% be automatically inserted at the beginning and ending of each |mplibcode|.
-% \begin{verbatim}
-% \everymplib{ beginfig(0); }
-% \everyendmplib{ endfig; }
-% \mplibcode % beginfig/endfig not needed
-% draw fullcircle scaled 1cm;
-% \endmplibcode
-% \end{verbatim}
-%
-% \paragraph{\cs{mpdim}}
-% Since v2.3, \cs{mpdim} and other raw \TeX\ commands are allowed
-% inside mplib code. This feature is inpired by gmp.sty authored by
-% Enrico Gregorio. Please refer the manual of gmp package for details.
-% \begin{verbatim}
-% \begin{mplibcode}
-% draw origin--(.6\mpdim{\linewidth},0) withpen pencircle scaled 4
-% dashed evenly scaled 4 withcolor \mpcolor{orange};
-% \end{mplibcode}
-% \end{verbatim}
-% \textsc{n.b.} Users should not use the protected variant of
-% |btex ... etex| as provided by gmp package. As \textsf{luamplib}
-% automatically protects \TeX\ code inbetween, \cs{btex} is not supported
-% here.
-%
-% \paragraph{\cs{mpcolor}}
-% With \cs{mpcolor} command, color names or expressions of
-% \textsf{color}/\textsf{xcolor} packages can be used inside mplibcode
-% enviroment (after |withcolor| operator),
-% though \textsf{luamplib} does not automatically load these
-% packages. See the example code above. For spot colors,
-% \textsf{colorspace}, \textsf{spotcolor}
-% (in PDF mode) and \textsf{xespotcolor} (in DVI mode) packages are supported
-% as well.
-%
-% From v2.26.1, \textsf{l3color} is also supported by the command
-% \cs{mpcolor\{color expression\}}, including spot colors.
-%
-% \paragraph{\cs{mplibnumbersystem}}
-% Users can choose |numbersystem| option since v2.4.
-% The default value |scaled| can be changed to |double| or |decimal|
-% by declaring |\mplibnumbersystem{double}| or |\mplibnumbersystem{decimal}|.
-% For details see
-% \url{http://github.com/lualatex/luamplib/issues/21}.
-%
-% \paragraph{\cs{mplibtextextlabel}}
-% Starting with v2.6, |\mplibtextextlabel{enable}| enables
-% string labels typeset via |textext()| instead of |infont| operator.
+% \paragraph{\cs{mplibtextextlabel\{enable\char"7C disable\}}}
+% Default: |disable|.
+% |\mplibtextextlabel{enable}| enables
+% the labels typeset via |textext| instead of |infont| operator.
% So, |label("my text",origin)| thereafter is exactly the same as
-% |label(textext("my text"),origin)|. \textsc{n.b.} In the background,
-% \textsf{luamplib} redefines |infont| operator so that the right side
-% argument (the font part) is totally ignored. Every string label
-% therefore will be typeset with current \TeX\ font.
+% |label(textext("my text"),origin)|.
+%
+% \textsc{n.b.} In the background,
+% luamplib redefines |infont| operator so that the right side
+% argument (the font part) is totally ignored. Therefore the left side arguemnt
+% will be typeset with the current \TeX\ font.
% Also take care of |char| operator in the left side argument,
% as this might bring unpermitted characters into \TeX.
%
-% \paragraph{\cs{mplibcodeinherit}}
-% Starting with v2.9, |\mplibcodeinherit{enable}| enables the inheritance
-% of variables, constants, and macros defined by previous |mplibcode| chunks.
-% On the contrary, the default value |\mplibcodeinherit{disable}| will make
-% each code chunks being treated as an independent instance, and never
+% \paragraph{\cs{mplibcodeinherit\{enable\char"7C disable\}}}
+% Default: |disable|.
+% |\mplibcodeinherit{enable}| enables the inheritance
+% of variables, constants, and macros defined by previous metapost code chunks.
+% On the contrary, |\mplibcodeinherit{disable}| will make
+% each code chunk being treated as an independent instance, never
% affected by previous code chunks.
%
-% \paragraph{Separate instances for \LaTeX{} and plain \TeX}
-% v2.22 has added the support for several named MetaPost instances
+% \paragraph{Separate MetaPost instances}
+% luamplib v2.22 has added the support for several named metapost instances
% in \LaTeX{} |mplibcode| environment.
-% (And since v2.29 plain \TeX\ users can use this functionality as well.)
-% Syntax is like so:
-% \begin{verbatim}
+% Plain \TeX\ users also can use this functionality.
+% The syntax for \LaTeX\ is:
+%\begin{verbatim}
% \begin{mplibcode}[instanceName]
% % some mp code
% \end{mplibcode}
-% \end{verbatim}
-% Behaviour is as follows.
+%\end{verbatim}
+% The behavior is as follows.
% \begin{itemize}
% \item All the variables and functions are shared
% only among all the environments belonging to the same instance.
-% \item |\mplibcodeinherit| only affects environments
+% \item \cs{mplibcodeinherit} only affects environments
% with no instance name set (since if a name is set,
% the code is intended to be reused at some point).
-% \item From v2.27, |btex ... etex| boxes are also shared and do not
-% require |\mplibglobaltextext|.
+% \item |btex ... etex| boxes are also shared and do not
+% require \cs{mplibglobaltextext}.
% \item When an instance names is set,
-% respective |\currentmpinstancename| is set.
+% respective \cs{currentmpinstancename} is set as well.
% \end{itemize}
-% In parellel with this functionality, v2.23 and after supports
+% In parellel with this functionality, we support
% optional argument of instance name for \cs{everymplib} and
% \cs{everyendmplib}, affecting only those |mplibcode| environments
% of the same name.
% Unnamed \cs{everymplib} affects not only those instances with no name,
% but also those with name but with no corresponding \cs{everymplib}.
-% Syntax is:
-% \begin{verbatim}
+% The syntax is:
+%\begin{verbatim}
% \everymplib[instanceName]{...}
% \everyendmplib[instanceName]{...}
-% \end{verbatim}
+%\end{verbatim}
%
-% \paragraph{\cs{mplibglobaltextext}}
-% Formerly, to inherit |btex ... etex| boxes as well as metapost variables,
+% \paragraph{\cs{mplibglobaltextext\{enable\char"7C disable\}}}
+% Default: |disable|.
+% Formerly, to inherit |btex| |...| |etex| boxes as well as other metapost macros, variables and constants,
% it was necessary to declare \cs{mplibglobaltextext\{enable\}} in advance.
% But from v2.27, this is implicitly enabled when \cs{mplibcodeinherit}
-% is |true|.
-% \begin{verbatim}
+% is enabled.
+% This optional command still remains mostly for backward compatibility.
+%\begin{verbatim}
% \mplibcodeinherit{enable}
% %\mplibglobaltextext{enable}
% \everymplib{ beginfig(0);} \everyendmplib{ endfig;}
@@ -412,38 +404,90 @@ See source file '\inFileName' for licencing and contact information.
% \mplibcode
% currentpicture := pic scaled 2;
% \endmplibcode
-% \end{verbatim}
-% Generally speaking, it is recommended to turn |mplibglobaltextext|
-% always on, because it has the advantage of reusing metapost pictures
-% among code chunks.
-% But everything has its downside: it will waste more memory resources.
-%
-% \paragraph{\cs{mplibverbatim}}
-% Starting with v2.11, users can issue |\mplibverbatim{enable}|, after which
+%\end{verbatim}
+%
+% \paragraph{\cs{mplibverbatim\{enable\char"7C disable\}}}
+% Default: |disable|.
+% Users can issue |\mplibverbatim{enable}|, after which
% the contents of mplibcode environment will be read verbatim. As a result,
-% except for |\mpdim| and |\mpcolor|, all other \TeX\ commands outside
-% |btex ... etex| or |verbatimtex ... etex| are not expanded and will be fed
-% literally into the mplib process.
+% except for |\mpdim| and |\mpcolor| (see below), all other \TeX\ commands outside of the
+% |btex| or |verbatimtex| |...| |etex| are not expanded and will be fed
+% literally to the \textsf{mplib} library.
+%
+% \paragraph{\cs{mpdim\{...\}}}
+% Besides other \TeX\ commands, \cs{mpdim} is specially allowed
+% in the mplibcode environment. This feature is inpired by \textsf{gmp} package authored by
+% Enrico Gregorio. Please refer to the manual of \textsf{gmp} package for details.
+%\begin{verbatim}
+% \begin{mplibcode}
+% beginfig(1)
+% draw origin--(.6\mpdim{\linewidth},0) withpen pencircle scaled 4
+% dashed evenly scaled 4 withcolor \mpcolor{orange};
+% endfig;
+% \end{mplibcode}
+%\end{verbatim}
%
-% \paragraph{\cs{mplibshowlog}}
-% When |\mplibshowlog{enable}| is declared, log messages returned by
-% |mplib| instance will be printed into the |.log| file.
-% |\mplibshowlog{disable}| will revert this functionality.
-% This is a \TeX{} side interface for |luamplib.showlog|. (v2.20.8)
+% \paragraph{\cs{mpcolor[...]\{...\}}}
+% With \cs{mpcolor} command, color names or expressions of
+% \textsf{color}, \textsf{xcolor} and \textsf{l3color} module/packages can be used in the mplibcode
+% enviroment (after |withcolor| operator).
+% See the example above.
+% The optional |[...]| means the option of \textsf{xcolor}'s \cs{color} command.
+% For spot colors, \textsf{l3color} (in PDF/DVI mode),
+% \textsf{colorspace}, \textsf{spotcolor}
+% (in PDF mode) and \textsf{xespotcolor} (in DVI mode) packages are supported
+% as well.
+%
+% \paragraph{\cs{mpfig} \ldots\ \cs{endmpfig}}
+% Besides the |mplibcode| environment (for \LaTeX) and
+% \cs{mplibcode ...} \cs{endmplibcode} (for Plain),
+% we also provide unexpandable \TeX\ macros |\mpfig ... \endmpfig| and its starred version
+% |\mpfig* ... \endmpfig| to save typing toil.
+% The former is roughly the same as follows:
+%\begin{verbatim}
+% \begin{mplibcode}[@mpfig]
+% beginfig(0)
+% token list declared by \everymplib[@mpfig]
+% ...
+% token list declared by \everyendmplib[@mpfig]
+% endfig;
+% \end{mplibcode}
+%\end{verbatim}
+% and the starred version is roughly the same as follows:
+%\begin{verbatim}
+% \begin{mplibcode}[@mpfig]
+% ...
+% \end{mplibcode}
+%\end{verbatim}
+% In these macros |\mpliblegacybehavior{disable}|
+% is forcibly declared.
+% Again, as both share the same instance name, metapost codes are inherited among them.
+% A simple example:
+%\begin{verbatim}
+% \everymplib[@mpfig]{ drawoptions(withcolor .5[red,white]); }
+% \mpfig* input boxes \endmpfig
+% \mpfig
+% circleit.a(btex Box 1 etex); drawboxed(a);
+% \endmpfig
+%\end{verbatim}
+% The instance name (default: |@mpfig|) can be changed by redefining
+% \cs{mpfiginstancename}, after which a new mplib instance will start and
+% code inheritance too will begin anew. |\let\mpfiginstancename\empty| will
+% prevent code inheritance if |\mplibcodeinherit{true}| is not declared.
%
% \paragraph{About cache files}
-% To support |btex ... etex| in external |.mp| files, \textsf{luamplib}
-% inspects the content of each and every |.mp| input files and makes caches
-% if nececcsary, before returning their paths to \LuaTeX's mplib library.
-% This would make the compilation time longer wastefully, as most |.mp| files
-% do not contain |btex ... etex| command. So \textsf{luamplib} provides
-% macros as follows, so that users can give instruction about files
+% To support |btex ... etex| in external |.mp| files, luamplib
+% inspects the content of each and every |.mp| file and makes caches
+% if nececcsary, before returning their paths to \LuaTeX's \textsf{mplib} library.
+% This could waste the compilation time, as most |.mp| files
+% do not contain |btex ... etex| commands. So luamplib provides
+% macros as follows, so that users can give instructions about files
% that do not require this functionality.
% \begin{itemize}
% \item |\mplibmakenocache{<filename>[,<filename>,...]}|
% \item |\mplibcancelnocache{<filename>[,<filename>,...]}|
% \end{itemize}
-% where |<filename>| is a file name excluding |.mp| extension.
+% where |<filename>| is a filename excluding |.mp| extension.
% Note that |.mp| files under |$TEXMFMAIN/metapost/base| and
% |$TEXMFMAIN/metapost/context/base| are already registered by default.
%
@@ -451,64 +495,94 @@ See source file '\inFileName' for licencing and contact information.
% if it's not available (mostly not writable),
% in the directory where output files are saved:
% to be specific, |$TEXMF_OUTPUT_DIRECTORY/luamplib_cache|,
-% |./luamplib_cache|, |$TEXMFOUTPUT/luamplib_cache|, and |.| in this order.
-% (|$TEXMF_OUTPUT_DIRECTORY| is normally the value of |--output-directory|
-% command-line option.)
-% This behavior however can be changed by the command
+% |./luamplib_cache|, |$TEXMFOUTPUT/luamplib_cache|, and |.|, in this order.
+% |$TEXMF_OUTPUT_DIRECTORY| is normally the value of |--output-directory|
+% command-line option.
+%
+% Users can change this behavior by the command
% |\mplibcachedir{<directory path>}|, where tilde (|~|) is interpreted
% as the user's home directory (on a windows machine as well).
% As backslashes (|\|) should be escaped by users, it would be easier to use
% slashes (|/|) instead.
%
-% \paragraph{\texttt{mplibtexcolor}, \texttt{mplibrgbtexcolor}}
-% |mplibtexcolor| is a metapost operator that converts a \TeX\ color expression
-% to a MetaPost color expression. For instance:
-% \begin{verbatim}
+% \paragraph{About figure box metric}
+% Notice that, after each figure is processed, the macro \cs{MPwidth} stores
+% the width value of the latest figure; \cs{MPheight}, the height value.
+% Incidentally, also note that \cs{MPllx}, \cs{MPlly}, \cs{MPurx}, and
+% \cs{MPury} store the bounding box information of the latest figure
+% without the unit |bp|.
+%
+% \paragraph{luamplib.cfg}
+% At the end of package loading, luamplib searches
+% |luamplib.cfg| and, if found, reads the file in automatically.
+% Frequently used settings such as \cs{everymplib}, \cs{mplibforcehmode}
+% or \cs{mplibcodeinherit} are suitable for going into this file.
+%
+% \subsection{MetaPost}
+%
+% \paragraph{\texttt{mplibdimen(...)}, \texttt{mplibcolor(...)}}
+% These are MetaPost interfaces for the \TeX\ commands \cs{mpdim} and \cs{mpcolor}. For example,
+% |mplibdimen("\linewidth")| is basically the same as |\mpdim{\linewidth}|, and
+% |mplibcolor("red!50")| is basically the same as |\mpcolor{red!50}|.
+% The difference is that these metapost operators can also be used in external |.mp| files,
+% which cannot have \TeX\ commands outside of the |btex| or |verbatimtex| |...| |etex|.
+%
+% \paragraph{\texttt{mplibtexcolor ...}, \texttt{mplibrgbtexcolor ...}}
+% |mplibtexcolor|, which accepts a string argument, is a metapost operator that converts a \TeX\ color expression
+% to a MetaPost color expression, that can be used anywhere color expression is expected
+% as well as after the |withcolor| operator.
+% For instance:
+%\begin{verbatim}
% color col;
% col := mplibtexcolor "olive!50";
-% \end{verbatim}
-% The result may vary in its color model (gray/rgb/cmyk)
+%\end{verbatim}
+% But the result may vary in its color model (gray/rgb/cmyk)
% according to the given \TeX\ color. (Spot colors are forced to
% cmyk model, so this operator is not recommended for spot colors.)
% Therefore the example shown above would raise a metapost error:
% |cmykcolor col;| should have been declared.
-% By contrast, |mplibrgbtexcolor| always returns rgb model expressions.
+% By contrast, |mplibrgbtexcolor| \emph{<string>} always returns rgb model expressions.
%
-% \paragraph{\texttt{mplibgraphictext}}
-% For some amusement, luamplib provides its own metapost operator
-% |mplibgraphictext|, the effect of which is similar to that of
-% \ConTeXt's |graphictext|. However syntax is somewhat different.
-% \begin{verbatim}
+% \paragraph{\texttt{mplibgraphictext ...}}
+% |mplibgraphictext| is a metapost operator, the effect of which is similar to that of
+% \ConTeXt's |graphictext| or our own |mpliboutlinetext| (see below).
+% However the syntax is somewhat different.
+%\begin{verbatim}
% mplibgraphictext "Funny"
% fakebold 2.3 % fontspec option
% drawcolor .7blue fillcolor "red!50" % color expressions
-% \end{verbatim}
+%\end{verbatim}
% |fakebold|, |drawcolor| and |fillcolor| are optional;
% default values are |2|, |"black"| and |"white"| respectively.
-% When color expressions are given as string, they are regarded as
-% xcolor's or l3color's expressions (this is the same with shading colors).
-% From v2.30, |scale| option is deprecated and is now a synonym of |scaled|.
+% When the color expressions are given in string type, they are regarded as
+% \textsf{xcolor}'s or \textsf{l3color}'s expressions.
% All from |mplibgraphictext| to the end of sentence will compose an
% anonymous |picture|, which can be drawn or assigned to a variable.
% Incidentally, |withdrawcolor| and |withfillcolor| are synonyms of
% |drawcolor| and |fillcolor|, hopefully to be compatible with |graphictext|.
-% \textsc{n.b.} Because luamplib's current implementation is quite different
-% from the \ConTeXt's, there are some limitations such that you can't
-% apply shading (gradient colors) to the text (But see below).
-% In DVI mode, |unicode-math| package is needed for math formula graphictext,
+%
+% \textsc{n.b.}
+% In some cases, |mplibgraphictext| will produce better results than \ConTeXt\
+% or even than our own |mpliboutlinetext|,
+% especially when processing complicated \TeX\ code
+% such as the vertical writing in Chinese or Japanese.
+% However, because the implementation is quite different from others,
+% there are some limitations such that you can't
+% apply shading (gradient colors) to the text. Again,
+% in DVI mode, \textsf{unicode-math} package is needed for math formula,
% as we cannot embolden type1 fonts in DVI mode.
%
-% \paragraph{\texttt{mplibglyph}, \texttt{mplibdrawglyph}}
+% \paragraph{\texttt{mplibglyph ... of ...}}
% From v2.30, we provide a new metapost operator |mplibglyph|, which returns a metapost picture
% containing outline paths of a glyph in opentype, truetype or type1 fonts.
% When a type1 font is specified, metapost primitive |glyph| will be called.
-% \begin{verbatim}
+%\begin{verbatim}
% mplibglyph 50 of \fontid\font % slot 50 of current font
% mplibglyph "Q" of "TU/TeXGyrePagella(0)/m/n/10" % font csname
% mplibglyph "Q" of "texgyrepagella-regular.otf" % raw filename
% mplibglyph "Q" of "Times.ttc(2)" % subfont number
% mplibglyph "Q" of "SourceHanSansK-VF.otf[Regular]" % instance name
-% \end{verbatim}
+%\end{verbatim}
% Both arguments before and after of ``|of|'' can be either a number or a string.
% Number arguments are regarded as a glyph slot (GID) and a font id number, repectively.
% String argument at the left side is regarded as a glyph name in the font or a unicode character.
@@ -518,36 +592,48 @@ See source file '\inFileName' for licencing and contact information.
% subfont number (starting from zero) of a TTC font; a string within brackets denotes
% an instance name of a variable font.
%
-% The returned picture will be quite similar to the result of |glyph| primitive in its structure.
-% So, metapost's |draw| command will fill the inner path of the picture with background color.
-% In contrast, |mplibdrawglyph| command fills the paths according to the Nonzero Winding
-% Number Rule. As a result, for instance, the area surrounded by inner path of ``O''
+% \paragraph{\texttt{mplibdrawglyph ...}}
+% The picture returned by |mplibglyph| will be quite similar to the result of |glyph| primitive in its structure.
+% So, metapost's |draw| command will fill the inner path of the picture with the background color.
+% In contrast, |mplibdrawglyph| \emph{<picture>} command fills the paths according to the nonzero winding
+% number rule. As a result, for instance, the area surrounded by inner path of ``O''
% will remain transparent.
%
-% \paragraph{\texttt{mpliboutlinetext}}
-% From v2.31, we provide a new metapost operator |mpliboutlinetext|, which mimicks
+% \leavevmode\llap{\textcolor{red}{☞}\kern1.2\parindent}\relax
+% To apply the nonzero winding number rule to a picture containg paths,
+% luamplib appends |withpostscript| |"collect"|
+% to the paths except the last one in the picture.
+% If you want the even-odd rule instead, you can, even with \emph{plain} format,
+% additionally declare |withpostscript| |"evenodd"| to the last path in the picture.
+%
+% \paragraph{\texttt{mpliboutlinetext (...)}}
+% From v2.31, a new metapost operator |mpliboutlinetext| is available, which mimicks
% metafun's |outlinetext|. So the syntax is the same as metafun's. See the metafun
-% manual \textsection\,8.7 (|texdoc metafun|). A simple example:
-% \begin{verbatim}
+% manual \S\,8.7 (|texdoc metafun|). A simple example:
+%\begin{verbatim}
% draw mpliboutlinetext.b ("$\sqrt{2+\alpha}$")
% (withcolor \mpcolor{red!50})
% (withpen pencircle scaled .2 withcolor red)
% scaled 2 ;
-% \end{verbatim}
-% After the process of |mpliboutlinetext|, |mpliboutlinepic[]|
+%\end{verbatim}
+% After the process, |mpliboutlinepic[]|
% and |mpliboutlinenum| will be preserved as global variables;
% |mpliboutlinepic[1]| \ldots{} |mpliboutlinepic[mpliboutlinenum]|
% will be an array of images each of which containing a glyph or a rule.
+%
% \textsc{n.b.} As Unicode grapheme cluster is not considered in the array, a unit that must be
% a single cluster might be separated apart.
%
-% \paragraph{\cs{mppattern} \ldots\ \cs{endmppattern}, \texttt{withpattern}}
-% |\mppattern{<name>}| \ldots\ |\endmppattern| defines a tiling pattern
+% \paragraph{\cs{mppattern\{...\}} \texttt{...} \cs{endmppattern}, \texttt{... withpattern ...}}
+% \TeX\ macros
+% |\mppattern{<name>}| \ldots\ |\endmppattern| define a tiling pattern
% associated with the |<name>|.
% MetaPost operator |withpattern|, the syntax being
-% \textit{path} |withpattern| \textit{string}, will return a metapost picture which fills
-% the given path with a tiling pattern of the |<name>|.
-% \begin{verbatim}
+% \emph{<path>} |withpattern| \emph{<string>}, will return a metapost picture which fills
+% the given path with a tiling pattern of the |<name>|
+% by replicating it horizontally and vertically.
+% An example:
+%\begin{verbatim}
% \mppattern{mypatt} % or \begin{mppattern}{mypatt}
% [ % options: see below
% xstep = 10, ystep = 12,
@@ -562,29 +648,33 @@ See source file '\inFileName' for licencing and contact information.
% \endmppattern % or \end{mppattern}
%
% \mpfig
-% fill fullcircle scaled 100 withpostscript "collect";
+% fill fullcircle scaled 100
+% withpostscript "collect" ;
% draw unitsquare shifted - center unitsquare scaled 45
% withpattern "mypatt"
% withpostscript "evenodd" ;
% \endmpfig
-% \end{verbatim}
-% The available options are:
-% \begin{center}
+%\end{verbatim}
+%
+% The available options are listed in Table~\ref{tab:mppatternoptions}.
+% \begin{table}
+% \centering
+% \caption{options for \cs{mppattern}}\label{tab:mppatternoptions}
% \begin{tabular}{lll}\hline
% Key & Value Type & Explanation\\\hline
-% |xstep| &\textit{number} & horizontal spacing between pattern cells\\
-% |ystep| &\textit{number} & vertical spacing between pattern cells\\
-% |xshift| &\textit{number} & horizontal shifting of pattern cells\\
-% |yshift| &\textit{number} & vertical shifting of pattern cells\\
-% |matrix| &\textit{table} or \textit{string} & |xx|, |yx|, |xy|, |yy| values\kern1pt* or MP transform code\\
-% |bbox| &\textit{table} or \textit{string} & |llx|, |lly|, |urx|, |ury| values\kern1pt*\\
-% |resources|&\textit{string} & PDF resources if needed\\
-% |colored| or |coloured| &\textit{boolean}& |false| for uncolored pattern. default: |true|\\\hline
+% |xstep| &\emph{number} & horizontal spacing between pattern cells\\
+% |ystep| &\emph{number} & vertical spacing between pattern cells\\
+% |xshift| &\emph{number} & horizontal shifting of pattern cells\\
+% |yshift| &\emph{number} & vertical shifting of pattern cells\\
+% |matrix| &\emph{table} or \emph{string} & |xx|, |yx|, |xy|, |yy| values\kern1pt* or MP transform code\\
+% |bbox| &\emph{table} or \emph{string} & |llx|, |lly|, |urx|, |ury| values\kern1pt*\\
+% |resources|&\emph{string} & PDF resources if needed\\
+% |colored| or |coloured| &\emph{boolean}& |false| for uncolored pattern. default: |true|\\\hline
% & & \small *\,in string type, numbers are separated by spaces\\
% \end{tabular}
-% \end{center}
+% \end{table}
%
-% For the sake of convenience, width and height values of tiling patterns will be written down
+% For the sake of convenience, the width and height values of tiling patterns will be written down
% into the log file. (depth is always zero.) Users can refer to them for option setting.
%
% As for |matrix| option, metapost code such as `|rotated 30 slanted .2|' is allowed as well
@@ -600,43 +690,104 @@ See source file '\inFileName' for licencing and contact information.
% Option |colored=false| (|coloured| is a synonym of |colored|) will generate an uncolored pattern which shall have no color at all.
% Uncolored pattern will be painted later by the color of a metapost object.
% An example:
-% \begin{verbatim}
+%\begin{verbatim}
% \begin{mppattern}{pattuncolored}
% [
% colored = false,
-% matrix = "rotated 30",
+% matrix = "slanted .3 rotated 30",
% ]
% \tiny\TeX
% \end{mppattern}
%
% \begin{mplibcode}
% beginfig(1)
-% picture tex; tex := mpliboutlinetext.p ("\bfseries \TeX");
-% i:=0;
-% for item within tex:
-% i:=i+1;
-% if i < length tex:
-% fill pathpart item scaled 10
-% withpostscript "collect";
-% else:
+% picture tex;
+% tex = mpliboutlinetext.p ("\bfseries \TeX");
+% for i=1 upto mpliboutlinenum:
+% j:=0;
+% for item within mpliboutlinepic[i]:
+% j:=j+1;
% draw pathpart item scaled 10
-% withpattern "pattuncolored"
-% withpen pencircle scaled 0.5
-% withcolor 0.7 blue % paints the pattern
-% ;
-% fi
+% if j < length mpliboutlinepic[i]:
+% withpostscript "collect"
+% else:
+% withpattern "pattuncolored"
+% withpen pencircle scaled 1/2
+% withcolor (i/4)[red,blue] % paints the pattern
+% fi;
+% endfor
% endfor
% endfig;
% \end{mplibcode}
-% \end{verbatim}
+%\end{verbatim}
+%
+% \paragraph{\texttt{... withfademethod ...}, and related macros}
+% |withfademethod| is a metapost operator which makes the color of an object gradiently transparent.
+% The syntax is \emph{<path>}\texttt{\char"7C}\emph{<picture>} |withfademethod| \emph{<string>},
+% the latter being either |"linear"| or |"circular"|.
+% Though it is similar to the |withshademethod| provided by metafun,
+% the differences are: (1) the operand of |withfademethod| can be a picture as well as a path;
+% (2) you cannot make gradient colors, but can only make gradient opacity.
+%
+% Related macros to control optional values are:
+% \begin{description}
+% \let\bfseries\relax
+% \item [|withfadeopacity (|\emph{number, number}|)|]
+% sets the starting opacity and the ending opacity, default value being |(1,0)|.
+% `|1|' denotes full color; `|0|' full transparency.
+% \item [|withfadevector (|\emph{pair, pair}|)|]
+% sets the starting and ending points. Default value in the linear mode is
+% |(llcorner p, lrcorner p)|, where |p| is the operand,
+% meaning that fading starts from the left edge and ends at the right edge.
+% Default value in the circular mode is |(center p, center p)|, which means
+% centers of both starting and ending circles are the center of the bounding box.
+% \item [|withfadecenter|] is a synonym of |withfadevector|.
+% \item [|withfaderadius (|\emph{number, number}|)|]
+% sets the radii of starting and ending circles. This is no-op in the linear mode.
+% Default value is |(0, abs(center p - urcorner p))|, meaning that fading starts from the
+% center and ends at the four corners of the bounding box.
+% \item [|withfadebbox (|\emph{pair, pair}|)|]
+% sets the bounding box of the fading area, default value being |(llcorner p, urcorner p)|.
+% Though this option is not needed in most cases, there could be cases when users want to
+% explicitly control the bounding box.
+% \end{description}
+% An example:
+%\begin{verbatim}
+% \mpfig
+% picture mill;
+% mill = btex \includegraphics[width=100bp]{mill} etex;
+% draw mill
+% withfademethod "circular"
+% withfadecenter (center mill, center mill)
+% withfaderadius (20, 50)
+% withfadeopacity (1, 0)
+% ;
+% \endmpfig
+%\end{verbatim}
+%
+% \subsection{Lua}
+%
+% \paragraph{\texttt{runscript ...}}
+% Using the primitive |runscript| \emph{<string>}, you can run a Lua code chunk from MetaPost side
+% and get some metapost code returned by Lua if you want.
+% As the functionality is provided by the \textsf{mplib} library itself,
+% luamplib does not have much to say about it.
+%
+% One thing is worth mentioning, however:
+% if you return a Lua \emph{table} to the metapost process,
+% it is automatically converted to a relevant metapost value type
+% such as pair, color, cmykcolor or transform.
+% So users can save some extra toil of converting a table to a string, though it's not a big deal.
+% For instance, |runscript "return {1,0,0}"| will give you the metapost color expression |(1,0,0)|
+% automatically.
%
% \paragraph{Lua table \texttt{luamplib.instances}}
% Users can access the Lua table containing mplib instances, |luamplib.instances|,
-% through which metapost variables are also easily accessible
-% as documented in Lua\TeX{} manual \textsection\,11.2.8.4 (|texdoc luatex|).
+% through which metapost variables are also easily accessible from Lua side,
+% as documented in Lua\TeX{} manual \S\,11.2.8.4 (|texdoc luatex|).
% The following will print |false|, |3.0|, |MetaPost| and
-% the points and the cyclicity of the path |unitsquare|, consecutively.
-% \begin{verbatim}
+% the knots and the cyclicity of the path |unitsquare|, consecutively.
+%\begin{verbatim}
% \begin{mplibcode}[instance1]
% boolean b; b = 1 > 2;
% numeric n; n = 3;
@@ -646,37 +797,46 @@ See source file '\inFileName' for licencing and contact information.
%
% \directlua{
% local instance1 = luamplib.instances.instance1
-% print( instance1:get_boolean"b" )
-% print( instance1:get_number"n" )
-% print( instance1:get_string"s" )
-% local t = instance1:get_path"p"
+% print( instance1:get_boolean "b" )
+% print( instance1:get_number "n" )
+% print( instance1:get_string "s" )
+% local t = instance1:get_path "p"
% for k,v in pairs(t) do
% print(k, type(v)=='table' and table.concat(v,' ') or v)
% end
% }
-% \end{verbatim}
-% In this way, it would not be difficult to define a paragraph shape
-% (using \cs{parshape} \TeX\ primitive) which follows an arbitrary metapost path.
-%
-% \paragraph{About figure box metrics}
-% Notice that, after each figure is processed, macro \cs{MPwidth} stores
-% the width value of latest figure; \cs{MPheight}, the height value.
-% Incidentally, also note that \cs{MPllx}, \cs{MPlly}, \cs{MPurx}, and
-% \cs{MPury} store the bounding box information of latest figure
-% without the unit |bp|.
-%
-% \paragraph{luamplib.cfg}
-% At the end of package loading, \textsf{luamplib} searches
-% |luamplib.cfg| and, if found, reads the file in automatically.
-% Frequently used settings such as \cs{everymplib}, \cs{mplibforcehmode}
-% or \cs{mplibcodeinherit} are suitable for going into this file.
-%
-% \bigskip
+%\end{verbatim}
+%
+% \paragraph{Lua function \texttt{luamplib.process\_mplibcode}}
+% Users can execute a MetaPost code chunk from Lua side by using this function:
+%\begin{verbatim}
+% luamplib.process_mplibcode (<string> metapost code, <string> instance name)
+%\end{verbatim}
+% The second argument cannot be absent, but can be an empty string (|""|) which
+% means that it has no instance name.
+%
+% Some other elements in the |luamplib| namespace, listed in Table~\ref{tab:elementsinluamplib},
+% can have effects on the process of |process_mplibcode|.
+% \begin{table}
+% \centering
+% \caption{elements in \texttt{luamplib} table (partial)}\label{tab:elementsinluamplib}
+% \begin{tabular}{lll}\hline
+% Key & Type & Related \TeX\ macro \\\hline
+% |codeinherit| & \emph{boolean} & \cs{mplibcodeinherit}\\
+% |everyendmplib| & \emph{table} & \cs{everyendmplib}\\
+% |everymplib| & \emph{table} & \cs{everymplib}\\
+% |getcachedir| & \emph{function} (\emph{<string>}) & \cs{mplibcachedir}\\
+% |globaltextext| & \emph{boolean} & \cs{mplibglobaltextext}\\
+% |legacyverbatimtex| & \emph{boolean} & \cs{mpliblegacybehavior}\\
+% |noneedtoreplace| & \emph{table} & \cs{mplibmakenocache}\\
+% |numbersystem| & \emph{string} & \cs{mplibnumbersystem}\\
+% |setformat| & \emph{function} (\emph{<string>}) & \cs{mplibsetformat}\\
+% |showlog| & \emph{boolean} & \cs{mplibshowlog}\\
+% |textextlabel| & \emph{boolean} & \cs{mplibtextextlabel}\\
+% |verbatiminput| & \emph{boolean} & \cs{mplibverbatim}\\\hline
+% \end{tabular}
+% \end{table}
%
-% There are (basically) two formats for metapost: \emph{plain} and
-% \emph{metafun}. By default, the \emph{plain} format is used, but you can set
-% the format to be used by future figures at any time using
-% \cs{mplibsetformat}\marg{format name}.
%
% \section{Implementation}
%
@@ -690,8 +850,8 @@ See source file '\inFileName' for licencing and contact information.
luatexbase.provides_module {
name = "luamplib",
- version = "2.32.3",
- date = "2024/06/21",
+ version = "2.34.0",
+ date = "2024/07/17",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -753,17 +913,11 @@ luamplib.showlog = luamplib.showlog or false
% \begin{macrocode}
local tableconcat = table.concat
local tableinsert = table.insert
+local tableunpack = table.unpack
local texsprint = tex.sprint
local texgettoks = tex.gettoks
local texgetbox = tex.getbox
local texruntoks = tex.runtoks
-% \end{macrocode}
-%
-% We don't use |tex.scantoks| anymore. See below reagrding |tex.runtoks|.
-% \begin{verbatim}
-% local texscantoks = tex.scantoks
-% \end{verbatim}
-% \begin{macrocode}
if not texruntoks then
err("Your LuaTeX version is too old. Please upgrade it to the latest")
@@ -932,7 +1086,7 @@ local function replaceinputmpfile (name,file)
local data = fh:read("*all"); fh:close()
% \end{macrocode}
-% ``|etex|'' must be followed by a space or semicolon as specified in
+% ``|etex|'' must be preceded by a space and followed by a space or semicolon as specified in
% \LuaTeX\ manual, which is not the case of standalone MetaPost though.
% \begin{macrocode}
local count,cnt = 0,0
@@ -1061,7 +1215,7 @@ local function reporterror (result, prevlog)
% \end{macrocode}
% v2.6.1: now luamplib does not disregard |show| command,
% even when |luamplib.showlog| is false. Incidentally,
-% it does not raise error but just prints an info,
+% it does not raise error nor prints an info,
% even if output has no figure.
% \begin{macrocode}
local show = log:match"\n>>? .+"
@@ -1076,6 +1230,12 @@ local function reporterror (result, prevlog)
end
end
+% \end{macrocode}
+%
+% |lualibs-os.lua| installs a randomseed. When this file is not loaded,
+% we should explicitly seed a unique integer to get random randomseed for each run.
+% \begin{macrocode}
+if not math.initialseed then math.randomseed(currenttime) end
local function luamplibload (name)
local mpx = mplib.new {
ini_version = true,
@@ -1101,7 +1261,7 @@ local function luamplibload (name)
local preamble = tableconcat{
format(preamble, replacesuffix(name,"mp")),
luamplib.preambles.mplibcode,
- luamplib.legacy_verbatimtex and luamplib.preambles.legacyverbatimtex or "",
+ luamplib.legacyverbatimtex and luamplib.preambles.legacyverbatimtex or "",
luamplib.textextlabel and luamplib.preambles.textextlabel or "",
}
local result, log
@@ -1120,15 +1280,6 @@ end
% ie |\begin{mplibcode} ... \end{mplibcode}|.
% \begin{macrocode}
local function process (data, instancename)
-% \end{macrocode}
-% The workaround of issue \#70 seems to be unnecessary, as we use
-% |make_text| now.
-% \begin{verbatim}
-% if not data:find(name_b.."beginfig%s*%([%+%-%s]*%d[%.%d%s]*%)") then
-% data = data .. "beginfig(-1);endfig;"
-% end
-% \end{verbatim}
-% \begin{macrocode}
local currfmt
if instancename and instancename ~= "" then
currfmt = instancename
@@ -1138,7 +1289,7 @@ local function process (data, instancename)
currentformat,
luamplib.numbersystem or "scaled",
tostring(luamplib.textextlabel),
- tostring(luamplib.legacy_verbatimtex),
+ tostring(luamplib.legacyverbatimtex),
}
has_instancename = false
end
@@ -1174,8 +1325,7 @@ end
local pdfmode = tex.outputmode > 0
% \end{macrocode}
%
-% |make_text| and some |run_script| uses \LuaTeX's |tex.runtoks|,
-% which made possible running \TeX\ code snippets inside |\directlua|.
+% |make_text| and some |run_script| uses \LuaTeX's |tex.runtoks|.
% \begin{macrocode}
local catlatex = luatexbase.registernumber("catcodetable@latex")
local catat11 = luatexbase.registernumber("catcodetable@atletter")
@@ -1184,14 +1334,7 @@ local catat11 = luatexbase.registernumber("catcodetable@atletter")
%
% |tex.scantoks| sometimes fail to read catcode properly, especially
% |\#|, |\&|, or |\%|. After some experiment, we dropped using it.
-% Instead, a function containing |tex.script| seems to work nicely.
-% \begin{verbatim}
-% local function run_tex_code_no_use (str, cat)
-% cat = cat or catlatex
-% texscantoks("mplibtmptoks", cat, str)
-% texruntoks("mplibtmptoks")
-% end
-% \end{verbatim}
+% Instead, a function containing |tex.sprint| seems to work nicely.
% \begin{macrocode}
local function run_tex_code (str, cat)
texruntoks(function() texsprint(cat or catlatex, str) end)
@@ -1199,13 +1342,12 @@ end
% \end{macrocode}
%
-% Prepare textext box number containers,
-% locals, globals and possibly instances.
+% Prepare textext box number containers, locals and globals.
% |localid| can be any number. They are local anyway.
% The number will be reset at the start of a new code chunk.
% Global boxes will use |\newbox| command in |tex.runtoks| process.
-% This is the same when |codeinherit| is declared as true.
-% Boxes of an instance will also be global, so that
+% This is the same when |codeinherit| is true.
+% Boxes in instances with name will also be global, so that
% their tex boxes can be shared among instances of the same name.
% \begin{macrocode}
local texboxes = { globalid = 0, localid = 4096 }
@@ -1247,7 +1389,6 @@ end
% Make |color| or |xcolor|'s color expressions usable,
% with \cs{mpcolor} or |mplibcolor|. These commands should be used
% with graphical objects.
-%
% Attempt to support l3color as well.
% \begin{macrocode}
local mplibcolorfmt = {
@@ -1436,7 +1577,7 @@ function luamplib.runscript (code)
return buffer
end
buffer = {}
- mpprint(buffer, table.unpack(res))
+ mpprint(buffer, tableunpack(res))
return tableconcat(buffer)
end
return ""
@@ -1454,7 +1595,7 @@ local function protecttexcontents (str)
:gsub("%s+", " ")
end
-luamplib.legacy_verbatimtex = true
+luamplib.legacyverbatimtex = true
function luamplib.maketext (str, what)
if str and str ~= "" then
@@ -1464,7 +1605,7 @@ function luamplib.maketext (str, what)
not str:find("\\begin%s*{document}") and
not str:find("\\documentstyle"..name_e) and
not str:find("\\usepackage"..name_e) then
- if luamplib.legacy_verbatimtex then
+ if luamplib.legacyverbatimtex then
if luamplib.in_the_fig then
return process_verbatimtex_infig(str)
else
@@ -1523,7 +1664,7 @@ luamplib.shadecolor = function (str)
if res:find" cs " or res:find"@pdf.obj" then -- spot color shade: l3 only
% \end{macrocode}
% An example of spot color shading:
-% \begin{verbatim}
+%\begin{verbatim}
% \documentclass{article}
% \usepackage{luamplib}
% \mplibsetformat{metafun}
@@ -1569,20 +1710,49 @@ luamplib.shadecolor = function (str)
% endfig;
% \end{mplibcode}
% \end{document}
-% \end{verbatim}
+%\end{verbatim}
+% another one: user-defined DeviceN colorspace
+%\begin{verbatim}
+% \DocumentMetadata{ }
+% \documentclass{article}
+% \usepackage{luamplib}
+% \mplibsetformat{metafun}
+% \ExplSyntaxOn
+% \color_model_new:nnn { pantone1215 }
+% { Separation }
+% { name = PANTONE~1215~U ,
+% alternative-model = cmyk ,
+% alternative-values = {0, 0.15, 0.51, 0}
+% }
+% \color_model_new:nnn { pantone+black }
+% { DeviceN }
+% {
+% names = {pantone1215,black}
+% }
+% \color_set:nnn{purepantone}{pantone+black}{1,0}
+% \color_set:nnn{pureblack} {pantone+black}{0,1}
+% \ExplSyntaxOff
+% \begin{document}
+% \mpfig
+% fill unitsquare xscaled \mpdim{\textwidth} yscaled 30
+% withshademethod "linear"
+% withshadecolors ("purepantone","pureblack")
+% ;
+% \endmpfig
+% \end{document}
+%\end{verbatim}
% \begin{macrocode}
run_tex_code({
[[\color_export:nnN{]], str, [[}{backend}\mplib_@tempa]],
},ccexplat)
- local name = get_macro'mplib_@tempa':match'{(.-)}{.+}'
+ local name, value = get_macro'mplib_@tempa':match'{(.-)}{(.-)}'
local t, obj = res:explode()
if pdfmode then
obj = format("%s 0 R", ltx.pdf.object_id( t[1]:sub(2,-1) ))
else
obj = t[2]
end
- local value = t[3]:match"%[(.-)%]" or t[3]
- return format('(%s) withprescript"mplib_spotcolor=%s:%s"', value,obj,name)
+ return format('(1) withprescript"mplib_spotcolor=%s:%s:%s"', value,obj,name)
end
return colorsplit(res)
end
@@ -1888,7 +2058,7 @@ function luamplib.glyph (f, c)
if not gid then return mperr"cannot get GID (glyph id)" end
local fac = 1000 / (shapedata.units or 1000)
local t = shapedata.glyphs[gid].segments
- if not t then return "image(fill fullcircle scaled 0;)" end
+ if not t then return "image()" end
for i,v in ipairs(t) do
if type(v) == "table" then
for ii,vv in ipairs(v) do
@@ -2142,7 +2312,7 @@ function luamplib.outlinetext (text)
local id = tonumber(fmt:match"mplibtexboxid=(%d+):")
local box = texgetbox(id)
local res = outline_horz({ }, box, box.head, 0, 0)
- if #res == 0 then res = { "mpliboutlinepic[1]:=image(fill fullcircle scaled 0;);" } end
+ if #res == 0 then res = { "mpliboutlinepic[1]:=image();" } end
return tableconcat(res) .. format("mpliboutlinenum:=%i;", #res)
end
@@ -2347,6 +2517,47 @@ vardef mplibtransformmatrix (text e) =
& decimal ypart t & ","
& "}");
enddef;
+primarydef p withfademethod s =
+ if picture p:
+ image(
+ draw p;
+ draw center p withprescript "mplibfadestate=stop";
+ )
+ else:
+ p withprescript "mplibfadestate=stop"
+ fi
+ withprescript "mplibfadetype=" & s
+ withprescript "mplibfadebbox=" &
+ decimal xpart llcorner p & ":" &
+ decimal ypart llcorner p & ":" &
+ decimal xpart urcorner p & ":" &
+ decimal ypart urcorner p
+enddef;
+def withfadeopacity (expr a,b) =
+ withprescript "mplibfadeopacity=" &
+ decimal a & ":" &
+ decimal b
+enddef;
+def withfadevector (expr a,b) =
+ withprescript "mplibfadevector=" &
+ decimal xpart a & ":" &
+ decimal ypart a & ":" &
+ decimal xpart b & ":" &
+ decimal ypart b
+enddef;
+let withfadecenter = withfadevector;
+def withfaderadius (expr a,b) =
+ withprescript "mplibfaderadius=" &
+ decimal a & ":" &
+ decimal b
+enddef;
+def withfadebbox (expr a,b) =
+ withprescript "mplibfadebbox=" &
+ decimal xpart a & ":" &
+ decimal ypart a & ":" &
+ decimal xpart b & ":" &
+ decimal ypart b
+enddef;
]],
legacyverbatimtex = [[
def specialVerbatimTeX (text t) = runscript("luamplibprefig{"&t&"}") enddef;
@@ -2412,7 +2623,7 @@ function luamplib.process_mplibcode (data, instancename)
% \end{macrocode}
% This is needed for legacy behavior
% \begin{macrocode}
- if luamplib.legacy_verbatimtex then
+ if luamplib.legacyverbatimtex then
luamplib.figid, tex_code_pre_mplib = 1, {}
end
@@ -2490,18 +2701,10 @@ end
% \end{macrocode}
%
-% Codes below for inserting PDF lieterals are mostly from ConTeXt general,
-% with small changes when needed.
+% pdfliterals will be stored in |figcontents| table, and written to pdf in one go
+% at the end of the flushing figure.
+% Subtable |post| is for the legacy behavior.
% \begin{macrocode}
-local function getobjects(result,figure,f)
- return figure:objects()
-end
-
-function luamplib.convert (result, flusher)
- luamplib.flush(result, flusher)
- return true -- done
-end
-
local figcontents = { post = { } }
local function put2output(a,...)
figcontents[#figcontents+1] = type(a) == "string" and format(a,...) or a
@@ -2524,96 +2727,6 @@ local function pdf_literalcode (fmt,...)
put2output{-2, format(fmt,...)}
end
-local function pdf_textfigure(font,size,text,width,height,depth)
- text = text:gsub(".",function(c)
- return format("\\hbox{\\char%i}",string.byte(c)) -- kerning happens in metapost : false
- end)
- put2output("\\mplibtextext{%s}{%f}{%s}{%s}{%s}",font,size,text,0,0)
-end
-
-local bend_tolerance = 131/65536
-
-local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
-
-local function pen_characteristics(object)
- local t = mplib.pen_info(object)
- rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
- divider = sx*sy - rx*ry
- return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
-end
-
-local function concat(px, py) -- no tx, ty here
- return (sy*px-ry*py)/divider,(sx*py-rx*px)/divider
-end
-
-local function curved(ith,pth)
- local d = pth.left_x - ith.right_x
- if abs(ith.right_x - ith.x_coord - d) <= bend_tolerance and abs(pth.x_coord - pth.left_x - d) <= bend_tolerance then
- d = pth.left_y - ith.right_y
- if abs(ith.right_y - ith.y_coord - d) <= bend_tolerance and abs(pth.y_coord - pth.left_y - d) <= bend_tolerance then
- return false
- end
- end
- return true
-end
-
-local function flushnormalpath(path,open)
- local pth, ith
- for i=1,#path do
- pth = path[i]
- if not ith then
- pdf_literalcode("%f %f m",pth.x_coord,pth.y_coord)
- elseif curved(ith,pth) then
- pdf_literalcode("%f %f %f %f %f %f c",ith.right_x,ith.right_y,pth.left_x,pth.left_y,pth.x_coord,pth.y_coord)
- else
- pdf_literalcode("%f %f l",pth.x_coord,pth.y_coord)
- end
- ith = pth
- end
- if not open then
- local one = path[1]
- if curved(pth,one) then
- pdf_literalcode("%f %f %f %f %f %f c",pth.right_x,pth.right_y,one.left_x,one.left_y,one.x_coord,one.y_coord )
- else
- pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
- end
- elseif #path == 1 then -- special case .. draw point
- local one = path[1]
- pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
- end
-end
-
-local function flushconcatpath(path,open)
- pdf_literalcode("%f %f %f %f %f %f cm", sx, rx, ry, sy, tx ,ty)
- local pth, ith
- for i=1,#path do
- pth = path[i]
- if not ith then
- pdf_literalcode("%f %f m",concat(pth.x_coord,pth.y_coord))
- elseif curved(ith,pth) then
- local a, b = concat(ith.right_x,ith.right_y)
- local c, d = concat(pth.left_x,pth.left_y)
- pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(pth.x_coord, pth.y_coord))
- else
- pdf_literalcode("%f %f l",concat(pth.x_coord, pth.y_coord))
- end
- ith = pth
- end
- if not open then
- local one = path[1]
- if curved(pth,one) then
- local a, b = concat(pth.right_x,pth.right_y)
- local c, d = concat(one.left_x,one.left_y)
- pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(one.x_coord, one.y_coord))
- else
- pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
- end
- elseif #path == 1 then -- special case .. draw point
- local one = path[1]
- pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
- end
-end
-
local function start_pdf_code()
if pdfmode then
pdf_literalcode("q")
@@ -2700,31 +2813,43 @@ pdfetcs.pgfextgs = "pgf@sys@addpdfresource@extgs@plain"
pdfetcs.pgfpattern = "pgf@sys@addpdfresource@patterns@plain"
pdfetcs.pgfcolorspace = "pgf@sys@addpdfresource@colorspaces@plain"
-local function update_pdfobjs (os)
- local on = pdfobjs[os]
+local function update_pdfobjs (os, stream)
+ local key = os
+ if stream then key = key..stream end
+ local on = pdfobjs[key]
if on then
return on,false
end
if pdfmode then
- on = pdf.immediateobj(os)
+ if stream then
+ on = pdf.immediateobj("stream",stream,os)
+ else
+ on = pdf.immediateobj(os)
+ end
else
on = pdfetcs.cnt or 1
- texsprint(format("\\special{pdf:obj @mplibpdfobj%s %s}",on,os))
+ if stream then
+ texsprint(format("\\special{pdf:stream @mplibpdfobj%s (%s) <<%s>>}",on,stream,os))
+ else
+ texsprint(format("\\special{pdf:obj @mplibpdfobj%s %s}",on,os))
+ end
pdfetcs.cnt = on + 1
end
- pdfobjs[os] = on
+ pdfobjs[key] = on
return on,true
end
+pdfetcs.resfmt = pdfmode and "%s 0 R" or "@mplibpdfobj%s"
if pdfmode then
pdfetcs.getpageres = pdf.getpageresources or function() return pdf.pageresources end
- pdfetcs.setpageres = pdf.setpageresources or function(s) pdf.pageresources = s end
- pdfetcs.initialize_resources = function (name)
+ local getpageres = pdfetcs.getpageres
+ local setpageres = pdf.setpageresources or function(s) pdf.pageresources = s end
+ local initialize_resources = function (name)
local tabname = format("%s_res",name)
pdfetcs[tabname] = { }
if luatexbase.callbacktypes.finish_pdffile then -- ltluatex
local obj = pdf.reserveobj()
- pdfetcs.setpageres(format("%s/%s %i 0 R", pdfetcs.getpageres() or "", name, obj))
+ setpageres(format("%s/%s %i 0 R", getpageres() or "", name, obj))
luatexbase.add_to_callback("finish_pdffile", function()
pdf.immediateobj(obj, format("<<%s>>", tableconcat(pdfetcs[tabname])))
end,
@@ -2734,18 +2859,18 @@ if pdfmode then
pdfetcs.fallback_update_resources = function (name, res)
local tabname = format("%s_res",name)
if not pdfetcs[tabname] then
- pdfetcs.initialize_resources(name)
+ initialize_resources(name)
end
if luatexbase.callbacktypes.finish_pdffile then
local t = pdfetcs[tabname]
t[#t+1] = res
else
- local tpr, n = pdfetcs.getpageres() or "", 0
+ local tpr, n = getpageres() or "", 0
tpr, n = tpr:gsub(format("/%s<<",name), "%1"..res)
if n == 0 then
tpr = format("%s/%s<<%s>>", tpr, name, res)
end
- pdfetcs.setpageres(tpr)
+ setpageres(tpr)
end
end
else
@@ -2755,6 +2880,7 @@ else
"\\special{pdf:obj @MPlibCS<<>>}",
"\\special{pdf:obj @MPlibPt<<>>}",
}
+ pdfetcs.resadded = { }
end
% \end{macrocode}
@@ -2768,13 +2894,10 @@ local transparancy_modes = { [0] = "Normal",
"Hue", "Saturation", "Color", "Luminosity",
"Compatible",
}
-
-local function update_tr_res(mode,opaq)
- local os = format("<</BM /%s/ca %.3f/CA %.3f/AIS false>>",mode,opaq,opaq)
- local on, new = update_pdfobjs(os)
+local function add_extgs_resources (on, new)
+ local key = format("MPlibTr%s", on)
if new then
- local key = format("MPlibTr%s", on)
- local val = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on)
+ local val = format(pdfetcs.resfmt, on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/ExtGState}{", key, "}{", val, "}"
@@ -2804,22 +2927,29 @@ local function update_tr_res(mode,opaq)
end
if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfextgs) then
texsprint"\\special{pdf:put @resources <</ExtGState @MPlibTr>>}"
+ pdfetcs.resadded.ExtGState = "@MPlibTr"
end
- return on
+ return key
end
-
local function do_preobj_TR(object,prescript)
if object.postscript == "collect" then return end
local opaq = prescript and prescript.tr_transparency
- local tron_no
if opaq then
+ local key, on, os, new
local mode = prescript.tr_alternative or 1
- mode = transparancy_modes[tonumber(mode)]
- tron_no = update_tr_res(mode, opaq)
- start_pdf_code()
- pdf_literalcode("/MPlibTr%i gs",tron_no)
+ mode = transparancy_modes[tonumber(mode)] or mode
+ for i,v in ipairs{ {mode,opaq},{"Normal",1} } do
+ mode, opaq = v[1], v[2]
+ os = format("<</BM /%s/ca %.3f/CA %.3f/AIS false>>",mode,opaq,opaq)
+ on, new = update_pdfobjs(os)
+ key = add_extgs_resources(on,new)
+ if i == 1 then
+ pdf_literalcode("/%s gs",key)
+ else
+ return format("/%s gs",key)
+ end
+ end
end
- return tron_no
end
% \end{macrocode}
@@ -2837,7 +2967,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
encode[2*i-1] = 0
encode[2*i] = 1
os = fun2fmt:format(domain,tableconcat(ca[i],' '),tableconcat(cb[i],' '))
- list[i] = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s",update_pdfobjs(os))
+ list[i] = format(pdfetcs.resfmt, update_pdfobjs(os))
end
os = tableconcat {
"<</FunctionType 3",
@@ -2849,7 +2979,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
else
os = fun2fmt:format(domain,tableconcat(ca[1],' '),tableconcat(cb[1],' '))
end
- local objref = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s",update_pdfobjs(os))
+ local objref = format(pdfetcs.resfmt, update_pdfobjs(os))
os = tableconcat {
format("<</ShadingType %i", shtype),
format("/ColorSpace %s", colorspace),
@@ -2859,8 +2989,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
}
local on, new = update_pdfobjs(os)
if new then
- local key = format("MPlibSh%s", on)
- local val = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on)
+ local key, val = format("MPlibSh%s", on), format(pdfetcs.resfmt, on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/Shading}{", key, "}{", val, "}"
@@ -2876,6 +3005,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
end
if not pdfmode and not pdfmanagement then
texsprint"\\special{pdf:put @resources <</Shading @MPlibSh>>}"
+ pdfetcs.resadded.Shading = "@MPlibSh"
end
return on
end
@@ -2957,15 +3087,14 @@ local function do_preobj_SH(object,prescript)
local script = object.prescript:explode"\13+"
for i=#script,1,-1 do
if script[i]:find"mplib_spotcolor" then
- local name, value
- objref, name = script[i]:match"=(.-):(.+)"
- value = script[i+1]:match"=(.+)"
+ local t, name, value = script[i]:explode"="[2]:explode":"
+ value, objref, name = t[1], t[2], t[3]
if not names[name] then
pos = pos+1
names[name] = pos
names[#names+1] = name
end
- local t = { }
+ t = { }
for j=1,names[name] do t[#t+1] = 0 end
t[#t+1] = value
tableinsert(#ca == #cb and ca or cb, t)
@@ -3025,7 +3154,66 @@ end
%
% Patterns
% \begin{macrocode}
-patterns = { }
+pdfetcs.patterns = { }
+local patterns = pdfetcs.patterns
+local function gather_resources (do_pattern, optres)
+ local t = { }
+ local names = {"ExtGState","ColorSpace","Shading"}
+ if do_pattern then
+ names[#names+1] = "Pattern"
+ end
+ if pdfmode then
+ if pdfmanagement then
+ for _,v in ipairs(names) do
+ local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
+ if pp and pp:find"__prop_pair" then
+ t[#t+1] = format("/%s %s 0 R", v, ltx.pdf.object_id("__pdf/Page/Resources/"..v))
+ end
+ end
+ else
+ local res = pdfetcs.getpageres() or ""
+ run_tex_code[[\mplibtmptoks\expandafter{\the\pdfvariable pageresources}]]
+ res = (res .. texgettoks'mplibtmptoks'):explode()
+ res = tableconcat(res," "):explode"/+"
+ for _,v in ipairs(res) do
+ if do_pattern or not v:find"Pattern" and not optres:find(v) then
+ t[#t+1] = "/" .. v
+ end
+ end
+ end
+ else
+ if pdfmanagement then
+ for _,v in ipairs(names) do
+ local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
+ if pp and pp:find"__prop_pair" then
+ run_tex_code {
+ "\\mplibtmptoks\\expanded{{",
+ format("/%s \\csname pdf_object_ref:n\\endcsname{__pdf/Page/Resources/%s}",v,v),
+ "}}",
+ }
+ t[#t+1] = texgettoks'mplibtmptoks'
+ end
+ end
+ elseif is_defined(pdfetcs.pgfextgs) then
+ run_tex_code ({
+ "\\mplibtmptoks\\expanded{{",
+ "\\ifpgf@sys@pdf@extgs@exists /ExtGState @pgfextgs\\fi",
+ "\\ifpgf@sys@pdf@colorspaces@exists /ColorSpace @pgfcolorspaces\\fi",
+ do_pattern and "\\ifpgf@sys@pdf@patterns@exists /Pattern @pgfpatterns \\fi" or "",
+ "}}",
+ }, catat11)
+ t[#t+1] = texgettoks'mplibtmptoks'
+ elseif do_pattern then
+ for _,v in ipairs(names) do
+ local vv = pdfetcs.resadded[v]
+ if vv then
+ t[#t+1] = format("/%s %s", v, vv)
+ end
+ end
+ end
+ end
+ return t
+end
function luamplib.registerpattern ( boxid, name, opts )
local box = texgetbox(boxid)
local wd = format("%.3f",box.width/factor)
@@ -3058,27 +3246,10 @@ function luamplib.registerpattern ( boxid, name, opts )
format("/YStep %s", opts.ystep or hd),
format("/Matrix [%s %s %s]", opts.matrix or "1 0 0 1", opts.xshift or 0, opts.yshift or 0),
}
+ local optres = opts.resources or ""
+ local t = gather_resources(false, optres)
+ optres = optres .. tableconcat(t)
if pdfmode then
- local optres, t = opts.resources or "", { }
- if pdfmanagement then
- for _,v in ipairs{"ExtGState","ColorSpace","Shading"} do
- local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
- if pp and pp:find"__prop_pair" then
- t[#t+1] = format("/%s %s 0 R", v, ltx.pdf.object_id("__pdf/Page/Resources/"..v))
- end
- end
- else
- local res = pdfetcs.getpageres() or ""
- run_tex_code[[\mplibtmptoks\expandafter{\the\pdfvariable pageresources}]]
- res = (res .. texgettoks'mplibtmptoks'):explode()
- res = tableconcat(res," "):explode"/+"
- for _,v in ipairs(res) do
- if not v:find"Pattern" and not optres:find(v) then
- t[#t+1] = "/" .. v
- end
- end
- end
- optres = optres .. tableconcat(t)
if opts.bbox then
attr[#attr+1] = format("/BBox [%s]", opts.bbox)
end
@@ -3087,29 +3258,6 @@ function luamplib.registerpattern ( boxid, name, opts )
else
local objname = "@mplibpattern"..name
local metric = format("bbox %s", opts.bbox or format("0 0 %s %s",wd,hd))
- local optres, t = opts.resources or "", { }
- if pdfmanagement then
- for _,v in ipairs{"ExtGState","ColorSpace","Shading"} do
- local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
- if pp and pp:find"__prop_pair" then
- run_tex_code {
- "\\mplibtmptoks\\expanded{{",
- format("/%s \\csname pdf_object_ref:n\\endcsname{__pdf/Page/Resources/%s}",v,v),
- "}}",
- }
- t[#t+1] = texgettoks'mplibtmptoks'
- end
- end
- elseif is_defined(pdfetcs.pgfextgs) then
- run_tex_code ({
- "\\mplibtmptoks\\expanded{{",
- "\\ifpgf@sys@pdf@extgs@exists /ExtGState @pgfextgs\\fi",
- "\\ifpgf@sys@pdf@colorspaces@exists /ColorSpace @pgfcolorspaces\\fi",
- "}}",
- }, catat11)
- t[#t+1] = texgettoks'mplibtmptoks'
- end
- optres = optres .. tableconcat(t)
texsprint {
[[\ifvmode\nointerlineskip\fi]],
format([[\hbox to0pt{\vbox to0pt{\hsize=\wd %i\vss\noindent]], boxid), -- force horiz mode?
@@ -3128,8 +3276,7 @@ end
local function pattern_colorspace (cs)
local on, new = update_pdfobjs(format("[/Pattern %s]", cs))
if new then
- local key = format("MPlibCS%i",on)
- local val = pdfmode and format("%i 0 R",on) or format("@mplibpdfobj%i",on)
+ local key, val = format("MPlibCS%i",on), format(pdfetcs.resfmt,on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/ColorSpace}{", key, "}{", val, "}"
@@ -3147,6 +3294,7 @@ local function pattern_colorspace (cs)
end
if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfcolorspace) then
texsprint"\\special{pdf:put @resources <</ColorSpace @MPlibCS>>}"
+ pdfetcs.resadded.ColorSpace = "@MPlibCS"
end
return on
end
@@ -3201,12 +3349,248 @@ local function do_preobj_PAT(object, prescript)
end
if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfpattern) then
texsprint"\\special{pdf:put @resources <</Pattern @MPlibPt>>}"
+ pdfetcs.resadded.Pattern = "@MPlibPt"
end
patt.done = true
end
% \end{macrocode}
%
+% Fading
+% \begin{macrocode}
+pdfetcs.fading = { }
+local function do_preobj_FADE (object, prescript)
+ local fd_type = prescript and prescript.mplibfadetype
+ local fd_stop = prescript and prescript.mplibfadestate
+ if not fd_type then
+ return fd_stop -- returns "stop" (if picture) or nil
+ end
+ local bbox = prescript.mplibfadebbox:explode":"
+ local dx, dy = -bbox[1], -bbox[2]
+ local vec = prescript.mplibfadevector; vec = vec and vec:explode":"
+ if not vec then
+ if fd_type == "linear" then
+ vec = {bbox[1], bbox[2], bbox[3], bbox[2]} -- left to right
+ else
+ local centerx, centery = (bbox[1]+bbox[3])/2, (bbox[2]+bbox[4])/2
+ vec = {centerx, centery, centerx, centery} -- center for both circles
+ end
+ end
+ local coords = { vec[1]+dx, vec[2]+dy, vec[3]+dx, vec[4]+dy }
+ if fd_type == "linear" then
+ coords = format("%f %f %f %f", tableunpack(coords))
+ elseif fd_type == "circular" then
+ local width, height = bbox[3]-bbox[1], bbox[4]-bbox[2]
+ local radius = (prescript.mplibfaderadius or "0:"..math.sqrt(width^2+height^2)/2):explode":"
+ tableinsert(coords, 3, radius[1])
+ tableinsert(coords, radius[2])
+ coords = format("%f %f %f %f %f %f", tableunpack(coords))
+ else
+ err("unknown fading method '%s'", fd_type)
+ end
+ bbox = format("0 0 %f %f", bbox[3]+dx, bbox[4]+dy)
+ fd_type = fd_type == "linear" and 2 or 3
+ local opaq = (prescript.mplibfadeopacity or "1:0"):explode":"
+ local on, os, new
+ on = sh_pdfpageresources(fd_type, "0 1", "/DeviceGray", {{opaq[1]}}, {{opaq[2]}}, coords, 1)
+ os = format("<</PatternType 2/Shading %s>>", format(pdfetcs.resfmt, on))
+ on = update_pdfobjs(os)
+ local streamtext = format("q /Pattern cs/MPlibFd%s scn %s re f Q", on, bbox)
+ os = format("<</Pattern<</MPlibFd%s %s>>>>", on, format(pdfetcs.resfmt, on))
+ on = update_pdfobjs(os)
+ local resources = "/Resources " .. format(pdfetcs.resfmt, on)
+ on = update_pdfobjs"<</S/Transparency/CS/DeviceGray>>"
+ local attr = tableconcat{
+ "/Subtype/Form",
+ format("/BBox[%s]", bbox),
+ format("/Matrix[1 0 0 1 %f %f]", -dx, -dy),
+ resources,
+ "/Group ", format(pdfetcs.resfmt, on),
+ }
+ on = update_pdfobjs(attr, streamtext)
+ os = "<</SMask<</S/Luminosity/G " .. format(pdfetcs.resfmt, on) .. ">>>>"
+ on, new = update_pdfobjs(os)
+ local key = add_extgs_resources(on,new)
+ start_pdf_code()
+ pdf_literalcode("/%s gs", key)
+ if fd_stop then return "standalone" end
+ return "start"
+end
+
+% \end{macrocode}
+%
+% Transparency Group
+% \begin{macrocode}
+pdfetcs.tr_group = { }
+local function do_preobj_GRP (object, prescript)
+ local grstate = prescript and prescript.gr_state
+ if not grstate then return end
+ local trgroup = pdfetcs.tr_group
+ if grstate == "start" then
+ trgroup.isolated, trgroup.knockout = false, false
+ for _,v in ipairs(prescript.gr_type:explode",+") do
+ trgroup[v] = true
+ end
+ local p = object.path
+ trgroup.bbox = {
+ math.min(p[1].x_coord, p[2].x_coord, p[3].x_coord, p[4].x_coord),
+ math.min(p[1].y_coord, p[2].y_coord, p[3].y_coord, p[4].y_coord),
+ math.max(p[1].x_coord, p[2].x_coord, p[3].x_coord, p[4].x_coord),
+ math.max(p[1].y_coord, p[2].y_coord, p[3].y_coord, p[4].y_coord),
+ }
+ put2output[[\begingroup\setbox\mplibscratchbox\hbox\bgroup]]
+ elseif grstate == "stop" then
+ local llx,lly,urx,ury = tableunpack(trgroup.bbox)
+ local grattr = format("/Group<</S/Transparency/I %s/K %s>>",trgroup.isolated,trgroup.knockout)
+ local res = tableconcat(gather_resources(true))
+ put2output(tableconcat{
+ "\\egroup",
+ format("\\wd\\mplibscratchbox %fbp", urx-llx),
+ format("\\ht\\mplibscratchbox %fbp", ury-lly),
+ "\\dp\\mplibscratchbox 0pt",
+ })
+ if pdfmode then
+ put2output(tableconcat{
+ "\\saveboxresource type 2 attr{/Type/XObject/Subtype/Form/FormType 1",
+ format("/BBox[%f %f %f %f]", llx,lly,urx,ury),
+ grattr, "} resources{", res, "}\\mplibscratchbox",
+ [[\setbox\mplibscratchbox\hbox{\useboxresource\lastsavedboxresourceindex}]],
+ [[\wd\mplibscratchbox 0pt\ht\mplibscratchbox 0pt\dp\mplibscratchbox 0pt]],
+ [[\box\mplibscratchbox\endgroup]],
+ })
+ else
+ trgroup.cnt = (trgroup.cnt or 0) + 1
+ local objname = format("@mplibtrgr%s", trgroup.cnt)
+ put2output(tableconcat{
+ "\\special{pdf:bxobj ", objname, " bbox ", format("%f %f %f %f", llx,lly,urx,ury), "}",
+ "\\unhbox\\mplibscratchbox",
+ "\\special{pdf:put @resources <<", res, ">>}",
+ "\\special{pdf:exobj <<", grattr, ">>}",
+ "\\special{pdf:uxobj ", objname, "}\\endgroup",
+ })
+ end
+ end
+ return grstate
+end
+
+local function stop_special_effects(fade,opaq,over)
+ if fade then -- fading
+ stop_pdf_code()
+ end
+ if opaq then -- opacity
+ pdf_literalcode(opaq)
+ end
+ if over then -- color
+ put2output"\\special{pdf:ec}"
+ end
+end
+
+% \end{macrocode}
+%
+% Codes below for inserting PDF lieterals are mostly from ConTeXt general,
+% with small changes when needed.
+% \begin{macrocode}
+local function getobjects(result,figure,f)
+ return figure:objects()
+end
+
+function luamplib.convert (result, flusher)
+ luamplib.flush(result, flusher)
+ return true -- done
+end
+
+local function pdf_textfigure(font,size,text,width,height,depth)
+ text = text:gsub(".",function(c)
+ return format("\\hbox{\\char%i}",string.byte(c)) -- kerning happens in metapost : false
+ end)
+ put2output("\\mplibtextext{%s}{%f}{%s}{%s}{%s}",font,size,text,0,0)
+end
+
+local bend_tolerance = 131/65536
+
+local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
+
+local function pen_characteristics(object)
+ local t = mplib.pen_info(object)
+ rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
+ divider = sx*sy - rx*ry
+ return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
+end
+
+local function concat(px, py) -- no tx, ty here
+ return (sy*px-ry*py)/divider,(sx*py-rx*px)/divider
+end
+
+local function curved(ith,pth)
+ local d = pth.left_x - ith.right_x
+ if abs(ith.right_x - ith.x_coord - d) <= bend_tolerance and abs(pth.x_coord - pth.left_x - d) <= bend_tolerance then
+ d = pth.left_y - ith.right_y
+ if abs(ith.right_y - ith.y_coord - d) <= bend_tolerance and abs(pth.y_coord - pth.left_y - d) <= bend_tolerance then
+ return false
+ end
+ end
+ return true
+end
+
+local function flushnormalpath(path,open)
+ local pth, ith
+ for i=1,#path do
+ pth = path[i]
+ if not ith then
+ pdf_literalcode("%f %f m",pth.x_coord,pth.y_coord)
+ elseif curved(ith,pth) then
+ pdf_literalcode("%f %f %f %f %f %f c",ith.right_x,ith.right_y,pth.left_x,pth.left_y,pth.x_coord,pth.y_coord)
+ else
+ pdf_literalcode("%f %f l",pth.x_coord,pth.y_coord)
+ end
+ ith = pth
+ end
+ if not open then
+ local one = path[1]
+ if curved(pth,one) then
+ pdf_literalcode("%f %f %f %f %f %f c",pth.right_x,pth.right_y,one.left_x,one.left_y,one.x_coord,one.y_coord )
+ else
+ pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
+ end
+ elseif #path == 1 then -- special case .. draw point
+ local one = path[1]
+ pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
+ end
+end
+
+local function flushconcatpath(path,open)
+ pdf_literalcode("%f %f %f %f %f %f cm", sx, rx, ry, sy, tx ,ty)
+ local pth, ith
+ for i=1,#path do
+ pth = path[i]
+ if not ith then
+ pdf_literalcode("%f %f m",concat(pth.x_coord,pth.y_coord))
+ elseif curved(ith,pth) then
+ local a, b = concat(ith.right_x,ith.right_y)
+ local c, d = concat(pth.left_x,pth.left_y)
+ pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(pth.x_coord, pth.y_coord))
+ else
+ pdf_literalcode("%f %f l",concat(pth.x_coord, pth.y_coord))
+ end
+ ith = pth
+ end
+ if not open then
+ local one = path[1]
+ if curved(pth,one) then
+ local a, b = concat(pth.right_x,pth.right_y)
+ local c, d = concat(one.left_x,one.left_y)
+ pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(one.x_coord, one.y_coord))
+ else
+ pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+ end
+ elseif #path == 1 then -- special case .. draw point
+ local one = path[1]
+ pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+ end
+end
+
+% \end{macrocode}
+%
% Finally, flush figures by inserting PDF literals.
% \begin{macrocode}
function luamplib.flush (result,flusher)
@@ -3226,11 +3610,11 @@ function luamplib.flush (result,flusher)
% luamplib silently ignores this invalid figure for those
% that do not contain |beginfig ... endfig|. (issue \#70)
% Original code of ConTeXt general was:
-% \begin{verbatim}
+%\begin{verbatim}
% -- invalid
% pdf_startfigure(fignum,0,0,0,0)
% pdf_stopfigure()
-% \end{verbatim}
+%\end{verbatim}
% \begin{macrocode}
else
% \end{macrocode}
@@ -3248,13 +3632,15 @@ function luamplib.flush (result,flusher)
local object = objects[o]
local objecttype = object.type
% \end{macrocode}
-% The following 6 lines are part of |btex...etex| patch.
+% The following 8 lines are part of |btex...etex| patch.
% Again, colors are processed at this stage.
% \begin{macrocode}
local prescript = object.prescript
prescript = prescript and script2table(prescript) -- prescript is now a table
local cr_over = do_preobj_CR(object,prescript) -- color
local tr_opaq = do_preobj_TR(object,prescript) -- opacity
+ local fading_ = do_preobj_FADE(object,prescript) -- fading
+ local trgroup = do_preobj_GRP(object,prescript) -- transparency group
if prescript and prescript.mplibtexboxid then
put_tex_boxes(object,prescript)
elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then --skip
@@ -3280,7 +3666,7 @@ function luamplib.flush (result,flusher)
pdf_literalcode("%f %f %f %f %f %f cm",ot[3],ot[4],ot[5],ot[6],ot[1],ot[2])
pdf_textfigure(object.font,object.dsize,object.text,object.width,object.height,object.depth)
stop_pdf_code()
- else
+ elseif not trgroup and fading_ ~= "stop" then
local evenodd, collect, both = false, false, false
local postscript = object.postscript
if not object.istext then
@@ -3306,10 +3692,7 @@ function luamplib.flush (result,flusher)
else
% \end{macrocode}
% Removed from ConTeXt general: color stuff.
-% Added instead : shading stuff
% \begin{macrocode}
- local shade_no = do_preobj_SH(object,prescript) -- shading
- local pattern_ = do_preobj_PAT(object,prescript) -- pattern
local ml = object.miterlimit
if ml and ml ~= miterlimit then
miterlimit = ml
@@ -3336,6 +3719,11 @@ function luamplib.flush (result,flusher)
pdf_literalcode("[] 0 d")
dashed = false
end
+% \end{macrocode}
+% Added : shading and pattern
+% \begin{macrocode}
+ local shade_no = do_preobj_SH(object,prescript) -- shading
+ local pattern_ = do_preobj_PAT(object,prescript) -- pattern
local path = object.path
local transformed, penwidth = false, 1
local open = path and path[1].left_type and path[#path].right_type
@@ -3425,18 +3813,29 @@ function luamplib.flush (result,flusher)
end
end
% \end{macrocode}
-% Added to ConTeXt general: post-object color and shading stuff.
+% Added to ConTeXt general: post-object colors and shading stuff.
+% We should beware the |q ... Q| scope.
% \begin{macrocode}
if shade_no then -- shading
pdf_literalcode("W n /MPlibSh%s sh Q",shade_no)
end
end
end
- if tr_opaq then -- opacity
- stop_pdf_code()
+ if fading_ == "start" then
+ pdfetcs.fading.specialeffects = {fading_, tr_opaq, cr_over}
+ elseif trgroup == "start" then
+ pdfetcs.tr_group.specialeffects = {fading_, tr_opaq, cr_over}
+ elseif fading_ == "stop" then
+ local se = pdfetcs.fading.specialeffects
+ if se then stop_special_effects(se[1], se[2], se[3]) end
+ elseif trgroup == "stop" then
+ local se = pdfetcs.tr_group.specialeffects
+ if se then stop_special_effects(se[1], se[2], se[3]) end
+ else
+ stop_special_effects(fading_, tr_opaq, cr_over)
end
- if cr_over then -- color
- put2output"\\special{pdf:ec}"
+ if fading_ or trgroup then -- extgs resetted
+ miterlimit, linecap, linejoin, dashed = -1, -1, -1, false
end
end
end
@@ -3495,7 +3894,7 @@ end
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2024/06/21 v2.32.3 mplib package for LuaTeX]
+ [2024/07/17 v2.34.0 mplib package for LuaTeX]
\ifx\newluafunction\@undefined
\input ltluatex
\fi
@@ -3620,16 +4019,16 @@ end
\long\def\mplibdomainmpfig#1\endmpfig{%
\endgroup
\directlua{
- local legacy = luamplib.legacy_verbatimtex
+ local legacy = luamplib.legacyverbatimtex
local everympfig = luamplib.everymplib["\mpfiginstancename"] or ""
local everyendmpfig = luamplib.everyendmplib["\mpfiginstancename"] or ""
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
luamplib.everymplib["\mpfiginstancename"] = ""
luamplib.everyendmplib["\mpfiginstancename"] = ""
luamplib.process_mplibcode(
"beginfig(0) "..everympfig.." "..[===[\unexpanded{#1}]===].." "..everyendmpfig.." endfig;",
"\mpfiginstancename")
- luamplib.legacy_verbatimtex = legacy
+ luamplib.legacyverbatimtex = legacy
luamplib.everymplib["\mpfiginstancename"] = everympfig
luamplib.everyendmplib["\mpfiginstancename"] = everyendmpfig
}%
@@ -3643,14 +4042,14 @@ end
\long\def\mplibdoprempfig#1\endmpfig{%
\endgroup
\directlua{
- local legacy = luamplib.legacy_verbatimtex
+ local legacy = luamplib.legacyverbatimtex
local everympfig = luamplib.everymplib["\mpfiginstancename"]
local everyendmpfig = luamplib.everyendmplib["\mpfiginstancename"]
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
luamplib.everymplib["\mpfiginstancename"] = ""
luamplib.everyendmplib["\mpfiginstancename"] = ""
luamplib.process_mplibcode([===[\unexpanded{#1}]===],"\mpfiginstancename")
- luamplib.legacy_verbatimtex = legacy
+ luamplib.legacyverbatimtex = legacy
luamplib.everymplib["\mpfiginstancename"] = everympfig
luamplib.everyendmplib["\mpfiginstancename"] = everyendmpfig
}%
@@ -3729,9 +4128,9 @@ end
\def\mpliblegacybehavior#1{\directlua{
local s = string.lower("#1")
if s == "enable" or s == "true" or s == "yes" then
- luamplib.legacy_verbatimtex = true
+ luamplib.legacyverbatimtex = true
else
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
end
}}
\def\mplibverbatim#1{\directlua{
@@ -3803,7 +4202,6 @@ end
%
% Allow \TeX\ dimen/color macros. Now |runscript| does the job,
% so the following lines are not needed for most cases.
-% But the macros will be expanded when they are used in another macro.
% \begin{macrocode}
\def\mpdim#1{ runscript("luamplibdimen{#1}") }
\def\mpcolor#1#{\domplibcolor{#1}}
@@ -3875,12 +4273,13 @@ end
% \end{macrocode}
%
% The followings are from ConTeXt general, mostly.
-% % We use a dedicated scratchbox.
+%
+% We use a dedicated scratchbox.
% \begin{macrocode}
\ifx\mplibscratchbox\undefined \newbox\mplibscratchbox \fi
% \end{macrocode}
%
-% We encapsulate the litterals.
+% We encapsulate the literals.
% \begin{macrocode}
\def\mplibstarttoPDF#1#2#3#4{%
\prependtomplibbox
diff --git a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
index 642d0bcd2da..790807abc7c 100644
--- a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
+++ b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `context')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex b/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex
index 35fd80f89cd..36cde2cc897 100644
--- a/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex
+++ b/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-markdown-defaults-context')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.sty b/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.sty
index 7f3827b207b..61d4f2d20c2 100644
--- a/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.sty
+++ b/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.sty
@@ -6,7 +6,7 @@
%%
%% lt3luabridge.dtx (with options: `latex-package')
%%
-%% Copyright (C) 2016-2024 Vít Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -45,8 +45,8 @@
\RequirePackage{expl3}
\ProvidesExplPackage
{lt3luabridge}%
- {2024-02-14}%
- {2.1.0}%
+ {2024-07-03}%
+ {2.2.0}%
{An expl3 package that allows you to execute Lua code in LuaTeX or any other
TeX engine that exposes the shell}
\input lt3luabridge\relax
diff --git a/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.tex b/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.tex
index 256456220e0..26d3dc6a0b9 100644
--- a/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.tex
+++ b/Master/texmf-dist/tex/generic/lt3luabridge/lt3luabridge.tex
@@ -6,7 +6,7 @@
%%
%% lt3luabridge.dtx (with options: `generic-package')
%%
-%% Copyright (C) 2016-2024 Vít Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -117,9 +117,34 @@
=
{ \c_luabridge_method_shell_int }
{
- \str_const:Nn
- \c_luabridge_default_output_dirname_str
- { . }
+ \sys_if_platform_unix:TF
+ {
+ \str_const:Nn
+ \c_luabridge_default_output_dirname_str
+ { $TEXMF_OUTPUT_DIRECTORY }
+ }
+ {
+ \sys_if_platform_windows:TF
+ {
+ \str_set:Nn
+ \l_tmpa_str
+ { TEXMF_OUTPUT_DIRECTORY }
+ \str_put_left:NV
+ \l_tmpa_str
+ \c_percent_str
+ \str_put_right:NV
+ \l_tmpa_str
+ \c_percent_str
+ \str_const:NV
+ \c_luabridge_default_output_dirname_str
+ \l_tmpa_str
+ }
+ {
+ \str_const:Nn
+ \c_luabridge_default_output_dirname_str
+ { . }
+ }
+ }
\str_const:Nx
\c_luabridge_default_helper_script_filename_str
{ \jobname.luabridge.lua }
@@ -207,9 +232,37 @@
\g_luabridge_helper_script_filename_str
\sys_get_shell:xnNTF
{
- texlua~
- \g_luabridge_output_dirname_str /
- \g_luabridge_helper_script_filename_str
+ \str_if_eq:NNTF
+ \g_luabridge_output_dirname_str
+ \c_luabridge_default_output_dirname_str
+ {
+ \sys_if_platform_windows:TF
+ {
+ if~not~defined~TEXMF_OUTPUT_DIRECTORY~(
+ texlua~
+ \g_luabridge_helper_script_filename_str
+ )~else~(
+ texlua~
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_helper_script_filename_str
+ )
+ }
+ {
+ \sys_if_platform_unix:T
+ {
+ TEXMF_OUTPUT_DIRECTORY =
+ ${TEXMF_OUTPUT_DIRECTORY:-.} \iow_newline:
+ }
+ texlua~
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_helper_script_filename_str
+ }
+ }
+ {
+ texlua~
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_helper_script_filename_str
+ }
}
{ }
#1
diff --git a/Master/texmf-dist/tex/generic/lt3luabridge/t-lt3luabridge.tex b/Master/texmf-dist/tex/generic/lt3luabridge/t-lt3luabridge.tex
index ac4eed7372b..35e6ab1e8ab 100644
--- a/Master/texmf-dist/tex/generic/lt3luabridge/t-lt3luabridge.tex
+++ b/Master/texmf-dist/tex/generic/lt3luabridge/t-lt3luabridge.tex
@@ -6,7 +6,7 @@
%%
%% lt3luabridge.dtx (with options: `context-package')
%%
-%% Copyright (C) 2016-2024 Vít Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index 9c71c07afd1..14950fd64fa 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdown.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `tex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -580,8 +580,8 @@
{ boolean }
{ true }
\ExplSyntaxOff
-\def\markdownLastModified{2024-06-20}%
-\def\markdownVersion{3.6.1-0-g5a45a922}%
+\def\markdownLastModified{2024-07-14}%
+\def\markdownVersion{3.6.2-0-g6c30af7e}%
\let\markdownBegin\relax
\let\markdownEnd\relax
\let\markinline\relax
@@ -664,38 +664,10 @@
{ inputTempFileName }
{ path }
{ \jobname.markdown.in }
-\cs_generate_variant:Nn
- \__markdown_add_plain_tex_option:nnn
- { nnV }
-\ExplSyntaxOff
-\input lt3luabridge.tex
-\ExplSyntaxOn
-\bool_if:nTF
- {
- \cs_if_exist_p:N
- \luabridge_tl_set:Nn &&
- (
- \int_compare_p:nNn
- { \g_luabridge_method_int }
- =
- { \c_luabridge_method_directlua_int } ||
- \sys_if_shell_unrestricted_p:
- )
- }
- {
- \luabridge_tl_set:Nn
- \l_tmpa_tl
- { print(os.getenv("TEXMF_OUTPUT_DIRECTORY") or ".") }
- }
- {
- \tl_set:Nn
- \l_tmpa_tl
- { . }
- }
-\__markdown_add_plain_tex_option:nnV
+\__markdown_add_plain_tex_option:nnn
{ outputDir }
{ path }
- \l_tmpa_tl
+ { . }
\__markdown_add_plain_tex_option:nnn
{ plain }
{ boolean }
@@ -740,18 +712,60 @@
\cs_new:Nn
\__markdown_define_option_command:n
{
- \__markdown_option_tl_to_csname:nN
+ \str_if_eq:nnTF
{ #1 }
- \l_tmpa_tl
- \cs_if_exist:cF
- { \l_tmpa_tl }
+ { outputDir }
+ { \__markdown_define_option_command_output_dir: }
{
- \__markdown_get_default_option_value:nN
- { #1 }
- \l_tmpa_tl
- \__markdown_set_option_value:nV
+ \__markdown_option_tl_to_csname:nN
{ #1 }
\l_tmpa_tl
+ \cs_if_exist:cF
+ { \l_tmpa_tl }
+ {
+ \__markdown_get_default_option_value:nN
+ { #1 }
+ \l_tmpa_tl
+ \__markdown_set_option_value:nV
+ { #1 }
+ \l_tmpa_tl
+ }
+ }
+ }
+\ExplSyntaxOff
+\input lt3luabridge.tex
+\ExplSyntaxOn
+\cs_new:Nn
+ \__markdown_define_option_command_output_dir:
+ {
+ \cs_if_free:NT
+ \markdownOptionOutputDir
+ {
+ \bool_if:nTF
+ {
+ \cs_if_exist_p:N
+ \luabridge_tl_set:Nn &&
+ (
+ \int_compare_p:nNn
+ { \g_luabridge_method_int }
+ =
+ { \c_luabridge_method_directlua_int } ||
+ \sys_if_shell_unrestricted_p:
+ )
+ }
+ {
+ \luabridge_tl_set:Nn
+ \l_tmpa_tl
+ { print(os.getenv("TEXMF_OUTPUT_DIRECTORY") or ".") }
+ \tl_gset:NV
+ \markdownOptionOutputDir
+ \l_tmpa_tl
+ }
+ {
+ \tl_gset:Nn
+ \markdownOptionOutputDir
+ { . }
+ }
}
}
\cs_new:Nn
@@ -3319,6 +3333,9 @@
}
}
}
+ \str_gset:NV
+ \g_luabridge_output_dirname_str
+ \markdownOptionOutputDir
\luabridge_now:e
{ #1 }
}
diff --git a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex
index dc8a90917f6..43f342936e8 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-markdown-defaults-tex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex
index 90d34446f00..dd00c00f7f4 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-tilde')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex b/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex
index 345fba99c4f..2ff137b0a8c 100644
--- a/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex
+++ b/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex
@@ -25,8 +25,8 @@
\ifx\PSTThreeDplotLoaded\endinput\else\input pst-3dplot.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
%
-\def\fileversion{2.04a}
-\def\filedate{2024/06/29}
+\def\fileversion{2.06a}
+\def\filedate{2024/07/15}
\message{`PST-diffraction v\fileversion, \filedate\space (ML,hv)}%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst@addfams{pst-diff}
@@ -40,7 +40,7 @@
\define@key[psset]{pst-diff}{s}{\def\psk@Diffraction@Slit@s{#1 }} % distance entre les fentes
\define@key[psset]{pst-diff}{lambda}{\pst@checknum{#1}\psk@Diffraction@Slit@Lambda }% en nm
\define@key[psset]{pst-diff}{f}{\pst@checknum{#1}\psk@Diffraction@Slit@F }% focus en m
-\define@key[psset]{pst-diff}{gamma}{\pst@checknum{#1}\psk@Diffraction@gamma@G }
+%\define@key[psset]{pst-diff}{gamma}{\pst@checknum{#1}\psk@Diffraction@gamma@G }
\define@key[psset]{pst-diff}{pixel}{\pst@checknum{#1}\psk@Diffraction@Slit@pixel }
\define@key[psset]{pst-diff}{colorMode}{\pst@getint{#1}\psk@Diffraction@colorMode }
% 0 black and white inverse
@@ -65,7 +65,8 @@
\psset[pst-diff]{a=0.2e-3,f=5,k=1,r=1e-3,
d=6e-3,s=12e-3,h=0.5e-3,
lambda=650,pixel=0.5,
- contrast=38,gamma=0.8,twoHole=false,twoSlit=false,colorMode=3, scale=1,
+ contrast=38,%gamma=0.8,
+ twoHole=false,twoSlit=false,colorMode=3, scale=1,
IIID=false, showFunc=false}
%
% load the pstricks-add.pro only, if not already done
@@ -82,7 +83,7 @@
/focus \psk@Diffraction@Slit@F def
/widthSlit \psk@Diffraction@Slit@A def
/heightSlit \psk@Diffraction@Slit@k widthSlit mul def
- /Gamma \psk@Diffraction@gamma@G def
+ %/Gamma \psk@Diffraction@gamma@G def
/pixel \psk@Diffraction@Slit@pixel def
/SlitSeparation \psk@Diffraction@Slit@s def
\psk@Diffraction@Slit@Lambda tx@addDict begin wavelengthToRGB Red Green Blue end
@@ -162,7 +163,7 @@
\addto@pscode{%
% les dimensions sont en mtres
/focus \psk@Diffraction@Slit@F def
- /Gamma \psk@Diffraction@gamma@G def
+ %/Gamma \psk@Diffraction@gamma@G def
/pixel \psk@Diffraction@Slit@pixel def
/contrast 1e\psk@Diffraction@Slit@contrast def
/r \psk@Diffraction@Circular@r def
@@ -253,7 +254,8 @@
/y { yPts 2845 div } bind def
/R { x dup mul y dup mul add sqrt } bind def % R en m
/m Coeff R mul def
- 1 1e38 m J1Card Facteur x mul cos dup mul mul neg exp sub
+ % 1 1e38 m J1Card Facteur x mul cos dup mul mul neg exp sub
+ 1 contrast m J1Card Facteur x mul cos dup mul mul neg exp sub % fix by Keno Wehr
dup /intensity ED
dup dup
Red mul 3 -1 roll
@@ -283,7 +285,7 @@
\ifPst@Diffraction@IIID \else
newpath
R_limite neg %1.5 mul
- cm dup moveto
+ cm dup moveto
R_limite 2 mul cm 0 rlineto
0 R_limite 2 mul cm rlineto
R_limite neg 2 mul cm 0 rlineto
@@ -294,7 +296,8 @@
R_limite -0.001 0 {
/Radius exch def
/m Coeff Radius 0.01 mul mul def
- 1 1e38 m J1Card neg exp sub
+% 1 1e38 m J1Card neg exp sub
+ 1 contrast m J1Card neg exp sub % fix by keno wehr
dup /intensity ED
dup dup
Red mul 3 -1 roll % R
@@ -396,7 +399,7 @@
% les dimensions sont en mtres
/f \psk@Diffraction@Slit@F def
/h \psk@Diffraction@Triangle@h def
- /Gamma \psk@Diffraction@gamma@G def
+ %/Gamma \psk@Diffraction@gamma@G def
/L { \psk@Diffraction@Slit@Lambda 1e-9 mul} bind def % longueur d'onde en m
/pixel \psk@Diffraction@Slit@pixel def
/k { TwoPi f L mul div } bind def
diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex
index ed3ef60a4b5..a653d76eeac 100644
--- a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex
+++ b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex
@@ -1,4 +1,4 @@
-% $Id: pst-node.tex 438 2022-01-31 17:45:26Z herbert $
+% $Id: pst-node.tex 918 2024-07-10 17:41:55Z herbert $
%%
%% BEGIN pst-node.tex
%%
@@ -18,8 +18,8 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.43}
-\def\filedate{2022/01/31}
+\def\fileversion{1.45}
+\def\filedate{2024/07/10}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1386,8 +1386,8 @@ tx@NodeDict \pst@tempg known
/dy YB YA sub def
/angle dy dx Atan def
/linelength \pst@number\pst@dimb \pst@number\psunit div def
- XA linelength angle cos mul add YA linelength angle sin mul add ){#4}%
-}
+ XA linelength angle cos mul add YA linelength angle sin mul add ){#4}}
+%
\def\psRelNode{\pst@object{psRelNode}}
\def\psRelNode@i(#1)(#2)#3#4{{% A - B - factor - node name
\use@par
@@ -1402,10 +1402,10 @@ tx@NodeDict \pst@tempg known
/AlphaStrich \psk@angleA\space def
/unit \pst@number\psyunit \pst@number\psxunit div def % yunit/xunit
%
- /dx XB XA sub def
- /dy YB YA sub \ifPst@trueAngle\space unit mul \fi\space def
- /laenge dy dup mul dx dup mul add sqrt #3 mul def
- /Alpha dy dx atan def
+ /dx__ XB XA sub def
+ /dy__ YB YA sub \ifPst@trueAngle\space unit mul \fi\space def
+ /laenge dy__ dup mul dx__ dup mul add sqrt #3 mul def
+ /Alpha dy__ dx__ atan def
/beta Alpha AlphaStrich add def
laenge beta cos mul XA add
laenge beta sin mul \ifPst@trueAngle\space unit div \fi\space YA add ){#4}%
@@ -1537,8 +1537,7 @@ tx@NodeDict \pst@tempg known
\def\trim@ #1{\trim@@ @#1 @ #1 @ @@}%
\def\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}%
\def\unbrace#1{#1}%
-\unbrace{\def\trim@@@ #1 } #2@#3{\expandafter\def%
- \expandafter #3\expandafter {#1}}%
+\unbrace{\def\trim@@@ #1 } #2@#3{\expandafter\def\expandafter #3\expandafter {#1}}%
%
\def\hasparen#1(#2\@nil{%check if expression contains a (--call with \hasparen#1(\@nil
\ifx\relax#2\relax \@parenfalse \else \@parentrue\fi}%
@@ -1577,23 +1576,28 @@ tx@NodeDict \pst@tempg known
\expandafter\testAlg\my@tempA|\@nil\my@next {#1}{#2}{#3}}
%
\def\psparnode#1#2#3{%
-% #1=t value, #2=x(t) y(t) in PS form,#3=node name,
- \pnode(!/t #1 def #2){#3}%
- \pnode(!/t #1 .001 sub def #2
- /t #1 .001 add def
- #2 3 -1 roll sub 3 1 roll sub neg
- 2 copy Pyth dup 3 1 roll div 3 1 roll div ){#3tang}}%unit tangent vector at t
+ % #1=t value, #2=x(t) y(t) in PS form, #3=node name,
+ % also returns unit tangent vector at t with node #3tang
+ \pnode(! /t #1 def #2){#3}%
+ \pnode(! /t #1 dup abs 1 lt {0.001 sub} {dup 0 gt {0.999} {1.001} ifelse mul} ifelse def
+ #2
+ /t #1 dup abs 1 lt {0.001 add} {dup 0 lt {0.999} {1.001} ifelse mul} ifelse def
+ #2
+ 3 -1 roll sub 3 1 roll exch sub 2 copy exch dup mul exch dup mul add sqrt
+ dup 3 1 roll div 3 1 roll div){#3tang}% unit tangent vector at t
+}%
%
\def\algparnode#1#2#3{%
-% #1=t value, #2=x(t) | y(t) in alg form,#3=node name,
-%\pstVerb{tx@Dict begin /t #1 def /Func (#2) AlgParser cvx def end}
-%\pnode(!Func){#3}}%
- \pstVerb{tx@Dict begin /Func (#2) AlgParser cvx def end }
- \pnode(!/t #1 def Func){#3}
- \pnode(!/t #1 .001 sub def Func
- /t #1 .001 add def
- Func 3 -1 roll sub 3 1 roll sub neg
- 2 copy Pyth dup 3 1 roll div 3 1 roll div ){#3tang}%unit tangent vector at t
+% #1=t value, #2=x(t) | y(t) in alg form, #3=node name,
+% also returns unit tangent vector at t with node #3tang
+ \pstVerb{tx@Dict begin /Func (#2) AlgParser cvx def end }%
+ \pnode(! /t #1 def Func){#3}%
+ \pnode(! /t #1 dup abs 1 lt {0.001 sub} {dup 0 gt {0.999} {1.001} ifelse mul} ifelse def
+ Func
+ /t #1 dup abs 1 lt {0.001 add}{dup 0 lt {0.999} {1.001} ifelse mul } ifelse def
+ Func
+ 3 -1 roll sub 3 1 roll exch sub 2 copy exch dup mul exch dup mul add sqrt
+ dup 3 1 roll div 3 1 roll div){#3tang}% unit tangent vector at t
}%
%
\def\nodex#1{%
@@ -1634,8 +1638,7 @@ tx@NodeDict \pst@tempg known
\nodexn{#3}{@TMP@a}%
\AplusB(#1)(@TMP@a){@TMP@B}%
\psline(@TMP@A)(@TMP@B)%
-}%
-\ignorespaces}%
+}\ignorespaces}%
%
\def\curvepnodes{\pst@object{curvepnodes}}
\def\curvepnodes@i#1#2#3#4{{%optional [plotpoints=xx]
@@ -1685,7 +1688,7 @@ tx@NodeDict \pst@tempg known
\else
\multido{\i=0+1}{\pst@cntc}{\pnode(!/x \pst@number\pst@dima\space def x #3){#4\i}%
\advance\pst@dima \pst@dimb}%
-\fi%
+\fi
\expandafter\xdef \csname \PST@root nodecount\endcsname {\the\pst@cnta}%
\ifnum\Pst@Debug>0 \typeout{Created nodes #40 .. #4\the\pst@cnta}\fi%
}\ignorespaces}%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 2f87e9895e8..66b00657b99 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -88,8 +88,8 @@
\let\pgfforeach\foreach
%
-\def\fileversion{3.19c}
-\def\filedate{2024/02/02}
+\def\fileversion{3.20}
+\def\filedate{2024/07/09}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -2609,13 +2609,13 @@
\AltClipMode
\fi
-\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
+\def\psclipbox{\@ifnextchar[{\psclipbox@}{\psclipbox@[\z@]}}
% DG modification begin - Apr. 3, 1997
% From paulus@immd5.informatik.uni-erlangen.de (Dietrich Paulus)
%\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}}
-\def\clipbox@[#1]{\pst@makebox{\clipbox@@{#1}}}
+\def\psclipbox@[#1]{\pst@makebox{\psclipbox@@{#1}}}
% DG modification end
-\def\clipbox@@#1{%
+\def\psclipbox@@#1{%
\pssetlength\pst@dimg{#1}%
\leavevmode\hbox{%
\begin@psclip%
@@ -4119,10 +4119,19 @@ pop
\def\pst@picture{\@ifnextchar[{\pst@@picture}{\pst@@picture[]}}
\def\pst@@picture[#1]{\@ifnextchar({\pst@@picture@i[#1]}{\pst@@picture@@i[#1]}}%
\def\pst@@picture@@i[#1]{%
- \gdef\pscoor{(10,10)}%
+ \def\pic@coor{(0,0)(0,0)}%
+% \gdef\pscoor{(10,10)}%
\ifPst@calcframe
\typeout{>>>Check for file \jobname-\the\numexpr\ps@imagectr+1.psaux}%
- \IfFileExists{\jobname-\the\numexpr\ps@imagectr+1.psaux}{\input{\jobname-\the\numexpr\ps@imagectr+1.psaux}}{}%
+ \IfFileExists{\jobname-\the\numexpr\ps@imagectr+1.psaux}
+ {\input{\jobname-\the\numexpr\ps@imagectr+1.psaux}%
+ \xdef\pic@coor{(0,0)\pscoor}%
+ \typeout{----->>\pic@coor}%
+ \typeout{----->>\pscoor}%
+ }
+ {%\gdef\pscoor{(10,10)}
+ %\def\pic@coor{(0,0)(0,0)(10,10)}
+ }%
% \typeout{>>>\pscoor}%
\fi
\edef\@temp{[\noexpand#1]\pscoor}%
@@ -4168,7 +4177,7 @@ pop
\ifPst@pgffunctions\pstVerb{ pgffunctions }\fi% hv 2013-04-17
}
-\def\pic@coor{(0,0)(0,0)(10,10)}
+%\def\pic@coor{(0,0)(0,0)(10,10)}
\def\endpspicture{%
\ifPst@calcframe
\ifPSTlualatex
@@ -4236,7 +4245,7 @@ pop
\advance\pst@dimd\pst@dimb
\lower\pst@dimd\box\pst@hbox
\kern\pst@dimc}%
- \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi
+ \if@star\setbox\pst@hbox=\hbox{\psclipbox@@\z@}\fi
\leavevmode
\ifPst@draft
\expandafter\ifx\csname @latexerr\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht b/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht
index 9bb9f9438bf..7f0f40d4b48 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/fontawesome5.4ht
@@ -1,5 +1,5 @@
-% fontawesome5.4ht (2021-05-06-14:39), generated from tex4ht-4ht.tex
-% Copyright 2021 TeX Users Group
+% fontawesome5.4ht (2024-07-03-13:28), generated from tex4ht-4ht.tex
+% Copyright 2021-2024 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,18 +16,19 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-05-06-14:39}
+\immediate\write-1{version 2024-07-03-13:28}
\NewConfigure{fontawesome}{2}
\ExplSyntaxOn
\cs_new_protected:Nn\temp:nn{%
+\def\:fontawesomeicon{#2}% to be used in the alt text
\a:fontawesome%
\o:fontawesome_use_icon:nn:{#1}{#2}
\b:fontawesome}
\HLet\fontawesome_use_icon:nn\temp:nn
\ExplSyntaxOff
-\Configure{fontawesome}{\Picture+{}}{\EndPicture}
+\Configure{fontawesome}{\Picture+[icon: \:fontawesomeicon]{}}{\EndPicture}
\Hinput{fontawesome5}
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 447b565a0c6..f7a5e989afd 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2024-06-21-14:18), generated from tex4ht-html4.tex
+% html4.4ht (2024-07-06-13:59), generated from tex4ht-html4.tex
% Copyright 2009-2024 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -6,18 +6,18 @@
% conditions of the LaTeX Project Public License, either
% version 1.3c of this license or (at your option) any
% later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
+% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions
% of LaTeX version 2005/12/01 or later.
%
% This work has the LPPL maintenance status "maintained".
%
% The Current Maintainer of this work
-% is the TeX4ht Project <http://tug.org/tex4ht>.
+% is the TeX4ht Project <https://tug.org/tex4ht>.
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-06-21-14:18}
+\immediate\write-1{version 2024-07-06-13:59}
\exit:ifnot{8859-6,%
CJK,%
@@ -1469,6 +1469,25 @@ switches of tex4ht.c)
{\end:itm \global\def\end:itm{\EndP\Tg</li>}\DeleteMark}
{\HCode{<li class="\getClass{li}itemize">}\afterGetClass{li}\par\ShowPar
}
+
+\:CheckOption{itemize+}\if:Option
+\ConfigureList{itemize}%
+ {\EndP\HCode{<ul \a:LRdir
+ class="\getClass{itemize}itemize\expandafter\the
+ \csname @itemdepth\endcsname">}%
+ \afterGetClass{itemize}%
+ \PushMacro\end:itm
+\global\let\end:itm=\empty}
+ {\PopMacro\end:itm \global\let\end:itm \end:itm
+\ifvmode \IgnorePar\fi
+ \EndP\HCode{</li></ul>}\ShowPar}
+ {\end:itm \global\def\end:itm{\EndP\Tg</li>}\HCode{<li class="\getClass{li}itemize"><span class="itemizeHead" aria-hidden="true">}\afterGetClass{li}}
+ {\HCode{</span>}\par\ShowPar
+}
+\Css{.itemizeHead{float: left; margin-left: -1em; width: 1em;}}
+\Css{li.itemize{list-style: none;}}
+\fi
+
\NewConfigure{itemizeClass}{2}
\Configure{itemizeClass}{}{}
\NewConfigure{liClass}{2}
diff --git a/Master/texmf-dist/tex/latex/beautybook/beautybook-EN.cls b/Master/texmf-dist/tex/latex/beautybook/beautybook-EN.cls
deleted file mode 100644
index 1aa67be4a39..00000000000
--- a/Master/texmf-dist/tex/latex/beautybook/beautybook-EN.cls
+++ /dev/null
@@ -1,1197 +0,0 @@
-%This Class is based on the default book class and options will be passed
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{beautybook-EN}[30-06-2024 V10.0 beautybook Class]
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
-\ProcessOptions\relax
-\LoadClass[twoside]{book}
-\RequirePackage[dvipsnames,svgnames,x11names,table]{xcolor}
-\RequirePackage{cncolours}
-\RequirePackage[utf8]{inputenc} % UTF-8编码
-\RequirePackage{times} % Times New Roman Font
-\RequirePackage[T1]{fontenc}
-\RequirePackage{microtype} % 字体间距调整
-\colorlet{outermarginfgcolor}{DarkCyan} % foregroundcolor 较深
-\colorlet{outermarginbgcolor}{DarkCyan!30} % backgroundcolor 较浅
-\RequirePackage{bropd} % math 自适应数学括号命令 \br{} !!!
-\RequirePackage{tikz-imagelabels} % tikz图像标注
-\RequirePackage{epigraph-keys} % 名言引用
-\RequirePackage{fitbox} % 图像自适应
-\RequirePackage{pgfornament-han}
-\RequirePackage{tikz}
-\usetikzlibrary{calc,shadows,hobby,intersections, decorations.markings, decorations.pathreplacing,spy,arrows,shapes,fadings,trees,mindmap,patterns,shapes.arrows,shapes.symbols,tikzmark,shapes.geometric,graphs, quotes, angles,decorations.pathmorphing,through,shadings,backgrounds,positioning,fit,arrows.meta,shapes.misc,decorations.shapes}
-\RequirePackage{pgfplots} %画图 %%页面样式设计核心包 %提供\pgfonlayer命令以及下列图层指令
-\pgfplotsset{compat=1.18}
-%
-\ExplSyntaxOn
-% 封面切换程序 (LaTeX3)!
-\keys_define:nn {beautybook/coverstyle}
- {
- cover-choose.choice:,
- cover-choose.value_required:n = true,
- cover-choose/cn.code:n = {\RequirePackage{stys/beautybook-cover-cn}},
- cover-choose/en.code:n = {\RequirePackage{stys/beautybook-cover-en}},
- cover-choose/enfig.code:n = {\RequirePackage{stys/beautybook-cover-enfig}},
- cover-choose/birkar.code:n = {\RequirePackage{stys/beautybook-cover-birkar}},
- %cover-choose .initial:n = en , % 设置 en 为初始值
- }
-\newtoks \l__beautybook_tmpa_toks
-\cs_new_protected:Npn \coverstyle
- {
- \tex_afterassignment:D \__beautybook_set_coverstyle:
- \l__beautybook_tmpa_toks
- }
-\cs_new:Npn \__beautybook_set_coverstyle:
- { \keys_set:nV { beautybook / coverstyle } \l__beautybook_tmpa_toks }
-% Math fonts
-\keys_define:nn {beautybook/mathstyle}
- {
- math-font.choice:,
- math-font.value_required:n = true,
- math-font/plain.code:n={},
- math-font/stix.code:n={
- \RequirePackage{stix}
- },
- math-font/mtpro2.code:n = {
- \RequirePackage{mtpro2}
- \RequirePackage{bm}
- \DeclareFontFamily{U}{nxlmi}{}
- \DeclareFontSubstitution{U}{nxlmi}{m}{it}
- \DeclareFontShape{U}{nxlmi}{m}{it}{
- <-6.3> nxlmi05
- <6.3-8.6> nxlmi07
- <8.6-> nxlmi0
- }{}
-
- \DeclareFontShape{U}{nxlmi}{b}{it}{
- <-6.3> nxlbmi05
- <6.3-8.6> nxlbmi07
- <8.6-> nxlbmi0
- }{}
- \renewcommand{\partial}{{\text{\usefont{U}{nxlmi}{m}{it}\symbol{64}}\mspace{1mu}}}
- },
- %cover-choose .initial:n = plain , % 设置 en 为初始值
- }
-\cs_new_protected:Npn \mathstyle
- {
- \tex_afterassignment:D \__beautybook_set_mathstyle:
- \l__beautybook_tmpa_toks
- }
-\cs_new:Npn \__beautybook_set_mathstyle:
- { \keys_set:nV { beautybook / mathstyle } \l__beautybook_tmpa_toks }
-\ExplSyntaxOff
-\RequirePackage{stys/beautybook-bottompage} %封底
-\RequirePackage{rotating}
-\tikzset{>=Stealth}
-\setlist{font=\upshape} % 取消所有列表默认距离 nosep,
-% 浮动环境设置
-% 默认情况下, \LaTeX{} 要求每页的文字至少占据 20%,否则该页就只单独放置一个浮动环境,
-% 而这通常不是我们想要的, 我们将这个要求降低到 5%.
-\renewcommand*{\textfraction}{0.05}
-% 有时如果多个浮动环境连续放在一起,
-% 会将它们分在几个不同页,即使它们可在同一页放
-% 得下. 我们可以通过修改 |\topfraction| 和 |\bottomfraction| 分别设置顶端和底端的浮
-% 动环境的最大比例.
-\renewcommand*{\topfraction}{0.9}
-\renewcommand*{\bottomfraction}{0.8}
-% 有时\LaTeX{}会把一个浮动环境单独放在一页,
-% 我们要求这个环境至少要占据 85% 才能单独放在一页.
-% 注意: |\floatpagefraction| 的数值必须小于 |\topfraction|.
-\renewcommand*{\floatpagefraction}{0.85}
-% 关于图片 graphicx
-% 如果图片没有指定后缀, 依次按下列顺序搜索
-\DeclareGraphicsExtensions{.pdf,.eps,.jpg,.png}
-% 设置图表搜索路径, 可以给图表文件夹取如下名字
-\graphicspath{{inner_pics/}{inner_pics/titleimages/}{figures/}{figure/}{pictures/}{picture/}{pic/}{pics/}{image/}{images/}}
-% \RequirePackage[physics]{stys/physicx}
-% \RequirePackage{stys/Symbols}
-\RequirePackage{extarrows}
-\usetikzlibrary{tikzmark}
-% \arrowname{super-script}
-% \arrowname[sub-script]{super-script}
-\RequirePackage{appendix} % 附录
-% \RequirePackage{stys/symbols}
-%
-\RequirePackage{amssymb,amsfonts,upgreek}
-\RequirePackage{makeidx}
-\RequirePackage{etoolbox} % 判断函数
-\RequirePackage{paracol}
-\RequirePackage{tikz-cd}
-\RequirePackage{imakeidx}
-\RequirePackage{anyfontsize}
-\RequirePackage{calc}
-\RequirePackage{xkeyval,ifthen}
-\RequirePackage[backgroundcolor=yellow!40!cyan!20,bordercolor=yellow!40!cyan!20,linecolor=DarkCyan]{todonotes}
-\RequirePackage{varwidth}
-\RequirePackage[colorlinks,linkcolor = purple, %%修改此处为你想要的颜色
-anchorcolor = purple, %%修改此处为你想要的颜色
-urlcolor = purple, %%修改此处为你想要的颜色
-citecolor = purple, %%修改此处为你想要的颜色
-]{hyperref}
-\setcounter{tocdepth}{3}
-\setcounter{secnumdepth}{3}%增加编号深度
-\RequirePackage{dashrule}
-\newlength\outermarginwidth
-\setlength\outermarginwidth{1.5cm}
-\newlength\covershift
-\setlength\covershift{5cm}
-\RequirePackage{caption}
-% 图注与表注格式
-\colorlet{captioncolor}{outermarginfgcolor} % 图片和表格题注文字颜色
-\makeatletter
-%%----------------------------------封面信息定义--------------------------------------------------------%%
-\newcommand\bookseries[1]{\def\@bookseries{#1}}
-\newcommand\subtitle[1]{\def\@subtitle{#1}}
-\newcommand\edition[1]{\def\@edition{#1}}
-\newcommand\presslogo[1]{\def\@presslogo{#1}}
-\newcommand\pressname[1]{\def\@pressname{#1}}
-\newcommand\coverimage[1]{\def\@coverimage{#1}}
-\newcommand\chapimage[1]{\def\@chapimage{#1}}
-%%----------------------------------封面信息定义--------------------------------------------------------%%
-\makeatother
-\RequirePackage{indentfirst}
-\RequirePackage{amsmath}
-\RequirePackage[left=2cm,right=2cm,top=.6cm,bottom=2.2cm]{geometry}
-\RequirePackage{xpatch}%修正章节编号
-\RequirePackage[automark]{scrlayer-scrpage}%页面设置宏包,隶属于koma-script文档类
-\RequirePackage{fontawesome5}
-\RequirePackage{mathrsfs}
-\RequirePackage[most]{tcolorbox}
-\tcbuselibrary{breakable, skins,theorems}%TcolorBox Library
-\RequirePackage{tabularx}
-\RequirePackage{lastpage}
-%\RequirePackage{twemojis}
-\RequirePackage{ninecolors}
-\RequirePackage{colortbl} %彩色表格
-\RequirePackage{tabularray}
-\UseTblrLibrary{amsmath}
-% 定义 +array, +matrix, +bmatrix, +Bmatrix, +pmatrix, +vmatrix, +Vmatrix 和 +cases 环境。其
-% 中,每一个环境都类似于不带 + 前缀的环境,但是就像 tblr 环境一样,使用 rowsep=2pt 默认值。
-% 除了+array 环境外,其余的每个环境都可以带一个可选项,通过该可选项,可能为环境设置内部
-% 参数。
-\UseTblrLibrary{booktabs} % 定义 \toprule、 \midrule、\bottomrule 和 \cmidrule 命令,这些命令可以直接用于 tblr环境中
-\UseTblrLibrary{diagbox} % 在tblr 环境中使用 \diagbox 和\diagboxthree 命令排版斜线表头
-\UseTblrLibrary{varwidth} % 为表格添加 measure 内部参数。当设置了 measure=vbox 后,则会使用 \vbox 测量单元格宽度。%可以使用stretch=-1 移除列表环境上下的间距, 注意,stretch=-1 选项也会移除单元格中的支架
-\RequirePackage{pgfornament}
-\RequirePackage{zhnumber}
-\RequirePackage{dashrule}
-\RequirePackage{adjustbox}
-\RequirePackage{enumitem}
-\RequirePackage{multicol}
-\RequirePackage{amsthm}
-\RequirePackage{thmtools,thm-restate}%定理环境 %定理的重写
-\RequirePackage{bclogo}
-\RequirePackage[normalem]{ulem}
-\RequirePackage{pgfplots} %画图 %%页面样式设计核心包 %提供\pgfonlayer命令以及下列图层指令
-\pgfplotsset{compat=1.18}
-\RequirePackage{graphicx}%修正minipage顶部对齐问题
-\pgfdeclarelayer{background} %背景%底层
-\pgfdeclarelayer{foreground} %上层
-\pgfdeclarelayer{top} %顶部
-\pgfdeclarelayer{bottom} %底部
-\pgfsetlayers{bottom,background,main,foreground,top}
-\newcommand{\tikzoverlay}[1]{\begin{tikzpicture}[remember picture,overlay] #1 \end{tikzpicture}}
-\RequirePackage[explicit]{titlesec}
-\RequirePackage{titletoc}
-
-\newcommand\boxednum[1]
-{
-\tcbsidebyside[sidebyside adapt=left,
-nobeforeafter,fontupper=\sffamily\large\bfseries,fontlower=\large,colframe=white,colupper=white,colback=outermarginfgcolor!90,colbacklower=gray!10,frame hidden,width =\textwidth,
-top=0mm,bottom=0mm,right=0mm,left=2mm,before skip balanced=0em,after skip balanced=0em,arc=0pt,outer arc=0pt,bicolor,sidebyside gap=6mm,boxrule=0pt,sidebyside align=center,halign=center,halign lower=left,fuzzy shadow={-0.4mm}{0.4mm}{0mm}{0.2mm}{white!50!gray},% 上
-fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
-]{% left hand side % adjust from this side
-\thecontentslabel
-}{% right hand side
-\textbf{#1} \hfill \thecontentspage
-}% end
-}
-
-\newcommand\boxednonum[1]
-{
-\begin{tcolorbox}[nobeforeafter,fontupper=\large,fontlower=\large,colframe=white,fontupper=\sffamily\bfseries,colupper=white,colback=outermarginfgcolor!90,colbacklower=gray!10,frame hidden,width = \textwidth,sidebyside gap=6mm,
-top=0mm,bottom=0mm,right=0cm,left=2mm,before skip balanced=0em,after skip balanced=0em,arc=0pt,outer arc=0pt,bicolor,sidebyside,boxrule=0pt,sidebyside align=center,halign=center,halign lower=left,lefthand width=3mm,fuzzy shadow={-0.4mm}{0.4mm}{0mm}{0.2mm}{white!50!gray},% 上
-fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
-]
-\tcblower \textbf{#1}\hfill \thecontentspage
-\end{tcolorbox}
-}
-%
-\titlecontents{chapter}[0mm]
- {\addvspace{-.5em}}
- {\contentsmargin{0pt}\boxednum}
- {\contentsmargin{0pt}\boxednonum}
- {}
- [\addvspace{-.5em}]
-%
- \titlecontents{section}
- [4.5em] % ie, 1.5em (chapter) + 2.3em
- {}
- {\hyperlink{section.\thecontentslabel}{\contentslabel{2.2em}}}
- {\hspace*{-2.2em}}
- {\titlerule*[1pc]{.}\contentspage\hspace*{1.5mm}}
-%
- \titlecontents{subsection}
- [7.3em] % ie, 1.5em (chapter) + 2.3em
- {}
- {\hyperlink{subsection.\thecontentslabel}{\contentslabel{2.7em}}}
- {\hspace*{-2.7em}}
- {\titlerule*[1pc]{.}\contentspage\hspace*{1.5mm}}
-%
- \titlecontents{subsubsection}
- [10.7em] % ie, 1.5em (chapter) + 2.3em
- {}
- {\hyperlink{subsubsection.\thecontentslabel}{\contentslabel{3.3em}}}
- {\hspace*{-3.3em}}
- {\titlerule*[1pc]{.}\contentspage\hspace*{1.5mm}}
-
-% tcolorbox中插入图片或者tikz绘图方法
-\newcommand\Figure[4]{%
- \begin{center}
- \captionsetup{type=figure} %消除 Package caption Warning: The option `hypcap=true' will be ignored for this
-%(caption) particular \caption on input line XX.警告信息
- \includegraphics[#1]{#2}
- \captionof{figure}{#3}\label{#4}
- \end{center}
-}%用法 : 用于tcolorbox中插入图片
-\newcommand\Tikz[3]{%
- \begin{center}
- \captionsetup{type=figure} %消除 Package caption Warning: The option `hypcap=true' will be ignored for this(caption) particular \caption on input line XX.警告信息
- #3 %最后一个参数为Tikz画图代码窗口
- \captionof{figure}{#1}\label{#2} %第一与第二个参数是Tikz画图的名称与标签
- \end{center}
-} %用法 : 用于tcolorbox中插入Tikz绘图
-%特殊注释矩阵
-\newcommand\coolover[2]{\mathrlap{\smash{\overbrace{\phantom{%
- \begin{matrix} #2 \end{matrix}}}^{\mbox{$#1$}}}}#2}
-
-\newcommand\coolunder[2]{\mathrlap{\smash{\underbrace{\phantom{%
- \begin{matrix} #2 \end{matrix}}}_{\mbox{$#1$}}}}#2}
-
-\newcommand\coolleftbrace[2]{%
- #1\left\{\vphantom{\begin{matrix} #2 \end{matrix}}\right.}
-
-\newcommand\coolrightbrace[2]{%
- \left.\vphantom{\begin{matrix} #1 \end{matrix}}\right\}#2}
-\definecolor{lightergray}{gray}{0.99}
-
-\newcommand*{\circled}[1]{\lower.7ex\hbox{\tikz\draw (0pt, 0pt)%
- circle (.5em) node {\makebox[1em][c]{\small #1}};}}
-\newcommand{\twicecircle}{\raisebox{.7ex}{
- \begin{tikzpicture}[remember picture,overlay]
- \draw[line width=0.6pt,black!60] (0,0) circle (3pt);
- \fill[black] (0,0) circle (1.6pt) ;
- \end{tikzpicture}}
-}
-\newcommand{\exercise}[2][\bcicosaedre]{\bigskip
-\begin{tikzpicture}[remember picture,overlay]
-\draw[line width=2pt,loosely dotted,teal] (0,0)--node[pos=0.4,rectangle,minimum height=1.5em,font=\sffamily\Large,text=black,fill=black!2,drop shadow={opacity=.3, shadow xshift=0.1cm},anchor=center,
- inner sep=1.5mm,
- anchor=west,] {$#1$ ~ #2} (\linewidth,0);
-\end{tikzpicture}\bigskip\smallskip
-}
-\RequirePackage{extarrows}
-\newcommand{\R}{\mathbb{R}}
-\newcommand{\F}{\mathcal{F}}
-\newcommand{\lan}[1]{\langle #1 \rangle}
-\newenvironment{eq}[1]{\begin{equation}\begin{aligned}#1}{\end{aligned}\end{equation}} %有编号
-\newenvironment{eq*}[1]{\begin{equation*}\begin{aligned}#1}{\end{aligned}\end{equation*}} %无编号
-% \everymath{\displaystyle}
-
-%% -------- 章节样式
-\makeatletter
-% titleimage
-\ExplSyntaxOn
-\seq_new:N \g__beautybook_chapter_oimage_seq % odd
-\seq_new:N \g__beautybook_chapter_eimage_seq % even
-\seq_new:N \g__beautybook_part_oimage_seq % odd
-\seq_new:N \g__beautybook_part_eimage_seq % even
-%
-\keys_define:nn { beautybook/titleimage }
- {
- chapteroddimage .code:n =
- \seq_gset_from_clist:Nn \g__beautybook_chapter_oimage_seq {#1} ,
- chapterevenimage .code:n =
- \seq_gset_from_clist:Nn \g__beautybook_chapter_eimage_seq {#1} ,
- partoddimage .code:n =
- \seq_gset_from_clist:Nn \g__beautybook_part_oimage_seq {#1} ,
- partevenimage .code:n =
- \seq_gset_from_clist:Nn \g__beautybook_part_eimage_seq {#1} ,
- }
-\cs_new:Npn \__beautybook_title_image:Nn #1#2 % image seq, number
- { \seq_item:Nn #1 { \int_mod:nn {#2} { \seq_count:N #1 } + 1 } } %对照表-对录入的字符串进行编号
-\cs_new:Npn \beautybook@chapterimagename %生成索契表 : 判断奇偶数页并按(章节编号)!!读取相应的列表组中的字符串
- {
- \int_if_odd:nTF { \value{page} }
- { \__beautybook_title_image:Nn \g__beautybook_chapter_oimage_seq { \value{chapter} } }
- { \__beautybook_title_image:Nn \g__beautybook_chapter_eimage_seq { \value{chapter} } }
- }
-\cs_new:Npn \beautybook@partimagename
- {
- \int_if_odd:nTF { \value{page} }
- { \__beautybook_title_image:Nn \g__beautybook_part_oimage_seq { \value{part} } }
- { \__beautybook_title_image:Nn \g__beautybook_part_eimage_seq { \value{part} } }
- }
-\cs_new_protected:Npn \titleimage #1
- { \keys_set:nn { beautybook/titleimage } {#1} }
-\ExplSyntaxOff
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\titleformat{\chapter}{\huge\bfseries\filcenter}{}{1em}{
- \makebox[0pt][l]{\def\rad{7pt}%
- \begin{tikzpicture}[remember picture, overlay]%
- \begin{pgfonlayer}{bottom}
- \ifodd\value{page}
- \shade[right color=outermarginbgcolor!30,middle color=outermarginbgcolor!50,left color=outermarginfgcolor!30] (current page.north west) rectangle ++(\paperwidth,-.2\paperheight); % background odd
- \else
- \shade[left color=outermarginbgcolor!30,middle color=outermarginbgcolor!50,right color=outermarginfgcolor!30] (current page.north west) rectangle ++(\paperwidth,-.2\paperheight); % background even
- \fi
- \fill[outermarginfgcolor,opacity=.5]([shift={(0,-4.45cm)}]current page.north west) rectangle ++(\paperwidth,-2mm); % line
- \end{pgfonlayer}
- \path[fill=outermarginfgcolor]node[append after command={
- ([xshift=-3*\rad]chapinfoofpart.north west) to[out=0,in=-180,looseness=1] ([xshift=\rad]chapinfoofpart.south west) --([xshift=-\rad]chapinfoofpart.south east) to[out=0,in=180,looseness=1] ([xshift=3*\rad]chapinfoofpart.north east) --cycle},
- text=white,font=\sffamily\large\bfseries,align=center,minimum height=1cm] (chapinfoofpart) at ([shift={(.6\linewidth,-4.95cm)}]current page.north west) {Part\ \thepart};
- \begin{pgfonlayer}{bottom}
- \fill[outermarginfgcolor!90,opacity=0.5] ([shift={(-3*\rad,0)}]chapinfoofpart.north west) to[out=180,in=0,looseness=1] +(-4*\rad,-1.2cm)--([shift={(7*\rad,-1.2cm)}]chapinfoofpart.north east) to[out=-180,in=0,looseness=1] +(-4*\rad,1.2cm); % partnumber shade
- \end{pgfonlayer}
- \ifodd\value{page}
- \begin{pgfonlayer}{top}
- \fill[outermarginfgcolor,opacity=0.7,rounded corners=5pt]node[append after command={([yshift=2cm]chapnum.north west) rectangle (chapnum.south east)},right,text=white,minimum width=2cm,align=center,font=\sffamily\bfseries] (chapnum) at ([shift={(1.5cm,-2.5cm)}]current page.north west) {\scalebox{3}{\thechapter}};
- \begin{pgfonlayer}{foreground}
- \pattern[pattern=sixpointed stars,pattern color=white,opacity=1.0,rounded corners=5pt]
- ([yshift=2cm]chapnum.north west) rectangle (chapnum.south east);
- \end{pgfonlayer}
- \fill [outermarginfgcolor,path fading=fade up,rounded corners=5pt]%
- ([yshift=2cm]chapnum.north west) rectangle (chapnum.south east);
- \node[above left,font=\sc\fontsize{22pt}{22pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north east) {\begin{varwidth}{.7\linewidth}\baselineskip=2ex #1\end{varwidth}};
- \end{pgfonlayer}
- \begin{pgfonlayer}{bottom}
- \node[right] (image) at ([shift={(-0.5cm,-2.8cm)}]current page.north west) {\includegraphics[width=7cm]{\@chapimage}};
- \end{pgfonlayer}
- \else
- \begin{pgfonlayer}{top}
- \fill[outermarginfgcolor,opacity=0.7,rounded corners=5pt]node[append after command={([yshift=2cm]chapnum.north west) rectangle (chapnum.south east)},left,text=white,minimum width=2cm,align=center,font=\sffamily\bfseries] (chapnum) at ([shift={(-1.5cm,-2.5cm)}]current page.north east) {\scalebox{3}{\thechapter}};
- \begin{pgfonlayer}{foreground}
- \pattern[pattern=sixpointed stars,pattern color=white,opacity=1.0,rounded corners=5pt]
- ([yshift=2cm]chapnum.north west) rectangle (chapnum.south east);
- \end{pgfonlayer}
- \fill [outermarginfgcolor,path fading=fade up,rounded corners=5pt]%
- ([yshift=2cm]chapnum.north west) rectangle (chapnum.south east);
- \node[above right,font=\sc\fontsize{22pt}{22pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north west) {\begin{varwidth}{.7\linewidth}\baselineskip=2ex #1\end{varwidth}};
- \end{pgfonlayer}
- \begin{pgfonlayer}{background}
- \node[left] (image) at ([shift={(0.5cm,-2.8cm)}]current page.north east) {\includegraphics[width=7cm]{\@chapimage}};
- \end{pgfonlayer}
- \fi
- \path[fill=outermarginbgcolor]node[append after command={
- ([xshift=-2*\rad]pagenumber.south west) to[out=0,in=180,looseness=1] ([xshift=\rad]pagenumber.north west) --([xshift=-\rad]pagenumber.north east) to[out=0,in=-180,looseness=1] ([xshift=2*\rad]pagenumber.south east) --cycle},
- text=outermarginfgcolor,font=\sffamily\fontsize{15}{15}\selectfont\bfseries,align=center,minimum height=0.4cm,minimum width=1.3cm,inner sep=1.5mm] (pagenumber) at ([shift={(0,0.3cm)}]current page.south) {\thepage};
- \end{tikzpicture}}
- }
-\titleformat{name=\chapter,numberless}{\bfseries\huge\filcenter}{}{1em}{
- \makebox[0pt][l]{\def\rad{7pt}%
- \begin{tikzpicture}[remember picture, overlay]%
- \begin{pgfonlayer}{bottom}
- \ifodd\value{page}
- \shade[right color=outermarginbgcolor!30,middle color=outermarginbgcolor!50,left color=outermarginfgcolor!30] (current page.north west) rectangle ++(\paperwidth,-.2\paperheight); % background odd
- \else
- \shade[left color=outermarginbgcolor!30,middle color=outermarginbgcolor!50,right color=outermarginfgcolor!30] (current page.north west) rectangle ++(\paperwidth,-.2\paperheight); % background even
- \fi
- \fill[outermarginfgcolor,opacity=.5]([shift={(0,-4.45cm)}]current page.north west) rectangle ++(\paperwidth,-2mm); % line
- \end{pgfonlayer}
- \ifodd\value{page}
- \begin{pgfonlayer}{top}
- \node[above left,font=\sc\fontsize{25pt}{25pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north east) {\begin{varwidth}{.7\linewidth}\baselineskip=2ex #1\end{varwidth}};
- \end{pgfonlayer}
- \begin{pgfonlayer}{bottom}
- \node[right] (image) at ([shift={(-0.5cm,-2.8cm)}]current page.north west) {\includegraphics[width=7cm]{\@chapimage}};
- \end{pgfonlayer}
- \else
- \begin{pgfonlayer}{top}
- \node[above right,font=\sc\fontsize{25pt}{25pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north west) {\begin{varwidth}{.7\linewidth}\baselineskip=2ex #1\end{varwidth}};
- \end{pgfonlayer}
- \begin{pgfonlayer}{background}
- \node[left] (image) at ([shift={(0.5cm,-2.8cm)}]current page.north east) {\includegraphics[width=7cm]{\@chapimage}};
- \end{pgfonlayer}
- \fi
- \path[fill=outermarginbgcolor]node[append after command={
- ([xshift=-2*\rad]pagenumber.south west) to[out=0,in=180,looseness=1] ([xshift=\rad]pagenumber.north west) --([xshift=-\rad]pagenumber.north east) to[out=0,in=-180,looseness=1] ([xshift=2*\rad]pagenumber.south east) --cycle},
- text=outermarginfgcolor,font=\sffamily\fontsize{15}{15}\selectfont\bfseries,align=center,minimum height=0.4cm,minimum width=1.3cm,inner sep=1.5mm] (pagenumber) at ([shift={(0,0.3cm)}]current page.south) {\thepage};
- \end{tikzpicture}}
-}
-\titlespacing{\chapter}{0pt}{0pt}{80pt}
-\makeatother
-% -------- Part定制
-%%定义标题文字长度%%
-\newlength{\partstarlen}
-%%设置临界长度%%
-\newlength{\criticstarlen}
-\setlength{\criticstarlen}{\textwidth}
-% 定义垂直方向的渐变
-\tikzfading[name=fade bottom to top,
- bottom color=transparent!0, % 底部完全透明
- top color=transparent!100] % 顶部不透明
-\tikzfading[name=middle, top color=transparent!90, bottom
-color=transparent!90, middle color=transparent!20]
-\makeatletter
-\newcommand\partabstract[1]{\def\@partabstract{#1}}
-\newcommand\partimage[1]{\def\@partimage{#1}}
-\titleformat{\part}
-{\normalfont\huge\filcenter}
-{}
-{20pt}
-{\settowidth{\partstarlen}{\sc\huge #1} % 计算\partabstract的长度并写入到\partstarlen中
- \begin{tikzpicture}[remember picture,overlay]
- \def\barwidth{2cm}
- \fill[outermarginbgcolor,opacity=0.6]
- (current page.north west) rectangle (current page.south east);
- \ifodd\value{page}
- \fill [outermarginfgcolor!20]%
- (current page.north east) rectangle ++(-\outermarginwidth,-\paperheight);
- \pattern [pattern=north east lines,pattern color=outermarginfgcolor!50]%
- (current page.north east) rectangle ++(-\outermarginwidth,-\paperheight);
- \fill [outermarginbgcolor!90,path fading=fade south]%
- ([yshift=1mm]current page.north east) rectangle ++(-\outermarginwidth,-.8\paperheight);
- \fill [outermarginbgcolor,path fading=fade north]%
- (current page.south east) rectangle ++(-\outermarginwidth,.8\paperheight);%
- % lines
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.north east) --++(-5pt,-0.15cm)--++(-\outermarginwidth+10pt,0) --++(-5pt,0.15cm)--cycle;
- \coordinate (anchor of headmark) at ([shift={(-1.2\outermarginwidth,-0.2cm)}]current page.north east);
- \node[below ,text=outermarginfgcolor,font=\sffamily\bfseries\fontsize{15}{20}\selectfont] (partpagenum) at ([shift={(-.5\outermarginwidth,0)}]current page.north east) {\thepage};
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.south east) --++(-5pt,0.15cm)--++(-\outermarginwidth+10pt,0) --++(-5pt,-0.15cm)--cycle; % 页码横线
- \node[] (hbar) at ($(current page.north)!0.33!(current page.south)$) {
- \begin{tikzpicture}
- %%--------------- Horizontal Line --------------------%%
- \fill[outermarginbgcolor!70]
- (0,0) rectangle ++(\paperwidth,-1cm);
- %%--------------- Horizontal Line -------------------%%
- \fill[outermarginbgcolor]
- (0,-.25cm) rectangle ++(\paperwidth,-.5cm);
- \fill[outermarginfgcolor]
- (.67\paperwidth,-.25cm) rectangle ++(4.5cm,-.5cm);
- \fill[outermarginfgcolor!20!white]
- (.67\paperwidth-1mm,-.25cm) rectangle ++(1mm,-.5cm);
- \fill[outermarginfgcolor!20!white]
- (.67\paperwidth+4.4cm,-.25cm) rectangle ++(1mm,-.5cm);
- \end{tikzpicture}
- };
- \node[above,font=\sc\huge,shift={(.33\linewidth,.5\barwidth)}] (partname) at (hbar) {Part\ \thepart};
- \node[below left,font=\sc\huge,shift={(.146\linewidth,-\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.9\linewidth}\raggedright\baselineskip=25pt #1 \end{varwidth}}; % 标题名称
- \begin{pgfonlayer}{background}
- \node[above,shift={(-.4\linewidth,-4*\barwidth)}] at (partname) {\ifdefvoid{\@partimage}{}{\includegraphics[width=1.2\linewidth]{\@partimage}}}; % 图片位置调整
- % % 应用渐变效果
-\fill[path fading=fade bottom to top, fill=nuanbai] (current page.north west) rectangle ([xshift=-\outermarginwidth]current page.south east);
- \end{pgfonlayer}
-%判断标题文字长度与临界长度的关系
-\ifdim\partstarlen<\criticstarlen
-%如果标题长度小于临界长度则使用(hbar)定位
-\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
-\else
-\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (partcontents) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
-\fi
- \else
- \fill [outermarginfgcolor!20]%
- (current page.north west) rectangle ++(\outermarginwidth,-\paperheight);
- \pattern [pattern=north west lines,pattern color=outermarginfgcolor!50]%
- (current page.north west) rectangle ++(\outermarginwidth,-\paperheight);
- \fill [outermarginbgcolor!90,path fading=fade south]%
- ([yshift=1mm]current page.north west) rectangle ++(\outermarginwidth,-.8\paperheight);
- \fill [outermarginbgcolor,path fading=fade north]%
- (current page.south west) rectangle ++(\outermarginwidth,.8\paperheight);%
- % lines
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.north west) --++(5pt,-0.15cm)--++(\outermarginwidth-10pt,0) --++(5pt,0.15cm)--cycle;
- \coordinate (anchor of headmark) at ([shift={(1.2\outermarginwidth,-0.2cm)}]current page.north west);
- \node[below ,text=outermarginfgcolor,font=\sffamily\bfseries\fontsize{15}{20}\selectfont] (partpagenum) at ([shift={(.5\outermarginwidth,0)}]current page.north west) {\thepage};
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.south west) --++(5pt,0.15cm)--++(\outermarginwidth-10pt,0) --++(5pt,-0.15cm)--cycle; % 页码横线
- \node[] (hbar) at ($(current page.north)!0.33!(current page.south)$) {
- \begin{tikzpicture}
- %%--------------- Horizontal Line --------------------%%
- \fill[outermarginbgcolor!70]
- (0,0) rectangle ++(\paperwidth,-1cm);
- %%--------------- Horizontal Line -------------------%%
- \fill[outermarginbgcolor]
- (0,-.25cm) rectangle ++(\paperwidth,-.5cm);
- \fill[outermarginfgcolor]
- (.15\paperwidth,-.25cm) rectangle ++(4.5cm,-.5cm);
- \fill[outermarginfgcolor!20!white]
- (.15\paperwidth-1mm,-.25cm) rectangle ++(1mm,-.5cm);
- \fill[outermarginfgcolor!20!white]
- (.15\paperwidth+4.5cm,-.25cm) rectangle ++(1mm,-.5cm);
- \end{tikzpicture}
- };
- \node[above,font=\sc\huge,shift={(-.31\linewidth,.5\barwidth)}] (partname) at (hbar) {Part\ \thepart};
- \node[below right,font=\sc\huge,shift={(-.125\linewidth,-\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.9\linewidth}\raggedright\baselineskip=25pt #1 \end{varwidth}}; % 标题名称
- \begin{pgfonlayer}{background}
- \node[above,shift={(.35\linewidth,-4*\barwidth)}] at (partname) {\ifdefvoid{\@partimage}{}{\includegraphics[width=1.2\linewidth]{\@partimage}}}; % 图片位置调整
- % % 应用渐变效果
- \fill[path fading=fade bottom to top, fill=nuanbai] (current page.north east) rectangle ([xshift=\outermarginwidth]current page.south west);
- \end{pgfonlayer}
-%判断标题文字长度与临界长度的关系
-\ifdim\partstarlen<\criticstarlen
-%如果标题长度小于临界长度则使用(hbar)定位
-\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
-\else
-\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (partcontents) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
-\fi
- \fi
- \end{tikzpicture}}
-\makeatother
-\assignpagestyle{\part}{empty}
-\assignpagestyle{\chapter}{empty}
-
-
-%% -- Section
-\titleformat{\section}
-{}
-{}
-{-.5em} %左右移动\thesection标签位置
-{\mysectionformat{#1}}
-
-\titleformat{name=\section,numberless}{}{}{-.5em}{\mysectionnonumformat{#1}}
-
-\newcommand{\mysectionformat}[1]{%
-\makebox[0pt][l]{\def\rad{7pt}%
-\begin{tikzpicture}[remember picture]
- \path[fill=outermarginfgcolor,drop shadow={opacity=0.3,shadow xshift=.05cm,shadow yshift=-.05cm}]node[append after command={
- ([xshift=\rad]sec.north west) to[out=180,in=0,looseness=1] ([xshift=-3*\rad]sec.south west) --([xshift=-\rad]sec.south east) to[out=0,in=180,looseness=1] ([xshift=3*\rad]sec.north east) --cycle},
- text=white,font=\sffamily\large\bfseries,align=center,inner ysep=2mm] (sec) at (0,0) {Sec\ \thesection};
- \node[text=black,font=\large,below right] (secnum) at ([shift={(0,-1mm)}]sec.north east) {\begin{varwidth}{.85\linewidth}\setlength\baselineskip{18pt}\hspace{.5cm}#1\end{varwidth}};
-\end{tikzpicture}}}%最后一个选项为 [<after code>]
-
-\newcommand{\mysectionnonumformat}[1]{%
-\makebox[0pt][l]{\def\rad{7pt}%
-\begin{tikzpicture}[remember picture]
- \path[fill=outermarginfgcolor,drop shadow={opacity=0.3,shadow xshift=.05cm,shadow yshift=-.05cm}]node[append after command={
- ([xshift=\rad]sec.north west) to[out=180,in=0,looseness=1] ([xshift=-3*\rad]sec.south west) --([xshift=-\rad]sec.south east) to[out=0,in=180,looseness=1] ([xshift=3*\rad]sec.north east) --cycle},
- text=white,font=\sffamily\large\bfseries,align=center,inner ysep=2mm] (sec) at (0,0) {Sec};
- \node[text=black,font=\large,below right] (secnum) at ([shift={(0,-1mm)}]sec.north east) {\begin{varwidth}{.85\linewidth}\setlength\baselineskip{18pt}\hspace{.5cm}#1\end{varwidth}};
-\end{tikzpicture}}}%最后一个选项为 [<after code>]
-
-\titlespacing*{\section}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
-
-%%-------------------------------- SCRLAYER-SCRPAGE -------------------------------------%%
-%% SIDE-BAR
-\newlength\chapternumbersize
-\setlength\chapternumbersize{36pt}
-\setlength{\headheight}{40pt} % 页眉高度
-\renewcommand\chaptermarkformat{}
-% define a new mark for the chapter number
-\newmarks\chapternum
-\xapptocmd\chaptermark{\marks\chapternum{\thechapter}}{}{\PatchFailed}
-\newmarks\secnum
-\xapptocmd\sectionmark{\marks\secnum{\thesection}}{}{\PatchFailed}
-
-\newcommand*\outermarginpagemark{%
-\tikzoverlay{
- \begin{pgfonlayer}{top}
- \ifodd\value{page}
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.north east) --++(-5pt,-0.15cm)--++(-\outermarginwidth+10pt,0) --++(-5pt,0.15cm)--cycle;
- \coordinate (anchor of headmark) at ([shift={(-1.2\outermarginwidth,-0.2cm)}]current page.north east);
- \node[below ,text=outermarginfgcolor,font=\sffamily\bfseries\fontsize{15}{15}\selectfont] at ([shift={(-.5\outermarginwidth,-0.15cm)}]current page.north east) {\thepage};
- \fill[outermarginfgcolor!50,rounded corners=1pt] ([shift={(0.2\outermarginwidth,0.2cm)}]anchor of headmark) --++(-5pt,-0.15cm)--++(-.45\linewidth,0) --++(-5pt,0.15cm)--cycle; % 页眉横线
- \node[below left,font=\upshape,text=outermarginfgcolor] at ([yshift=0.05cm]anchor of headmark) {\begin{varwidth}{\linewidth}\rightmark\end{varwidth}};
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.south east) --++(-5pt,0.15cm)--++(-\outermarginwidth+10pt,0) --++(-5pt,-0.15cm)--cycle; % 页码横线
- \else
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.north west) --++(5pt,-0.15cm)--++(\outermarginwidth-10pt,0) --++(5pt,0.15cm)--cycle;
- \coordinate (anchor of headmark) at ([shift={(1.2\outermarginwidth,-0.2cm)}]current page.north west);
- \node[below ,text=outermarginfgcolor,font=\sffamily\bfseries\fontsize{15}{15}\selectfont] at ([shift={(.5\outermarginwidth,-0.15cm)}]current page.north west) {\thepage};
- \fill[outermarginfgcolor!50,rounded corners=1pt] ([shift={(-0.2\outermarginwidth,0.2cm)}]anchor of headmark) --++(5pt,-0.15cm)--++(.45\linewidth,0) --++(5pt,0.15cm)--cycle; % 页眉横线
- \node[below right,font=\upshape,text=outermarginfgcolor] at ([yshift=0.05cm]anchor of headmark) {\begin{varwidth}{\linewidth}\rightmark\end{varwidth}};
- \fill[outermarginfgcolor,rounded corners=2pt] (current page.south west) --++(5pt,0.15cm)--++(\outermarginwidth-10pt,0) --++(5pt,-0.15cm)--cycle; % 页码横线
- \fi
- \end{pgfonlayer}}
-}
-\newlength\baryshift
-\setlength\baryshift{-2.5\outermarginwidth}
-\makeatletter
-% Add A Side-Bar Box For The Chapter Number
-\newcommand*\outermarginchapternumberbox{%
- \if@mainmatter
- \tikzoverlay{
- \shade[top color=outermarginfgcolor!90,bottom color=outermarginbgcolor]
- (\outermarginwidth,-.5\outermarginwidth+2mm) rectangle (0,-1.5\outermarginwidth+2mm);
- \node[anchor=center,text=white,font=\sffamily\bfseries] at (1/2*\outermarginwidth,-\outermarginwidth+2mm) {\usekomafont{chapternumber}{\botmarks\chapternum}};%
- }
- \fi
- \vfill
-}
-\makeatother
-
-\newkomafont{chapternumber}{%页边章节编号字体
- \fontsize{\chapternumbersize}{\chapternumbersize}\selectfont
-}%
-\makeatletter
-\newcommand\outermarginmark{
- \ifodd\value{page}\hfill\else\hspace*{\dimexpr\outermarginwidth*3/8\relax}\fi
- \rotatebox{90}{\parbox{\layerheight}{
- \raggedleft
- \usekomafont{outermargin}{%
- \MakeMarkcase{\ifodd\value{page}\odd@outermargin\else\even@outermargin\fi}}%
- }}%
- \ifodd\value{page}\hspace*{\dimexpr\outermarginwidth*3/8\relax}\fi%
-}
-\newcommand*\even@outermargin{}
-\newcommand*\odd@outermargin{}
-\newcommand*\evenoutermargin[1]{\renewcommand\even@outermargin{#1}}% 偶数页内容
-\newcommand*\oddoutermargin[1]{\renewcommand\odd@outermargin{#1}}% 奇数页内容
-\makeatother
-%
-\newkomafont{outermargin}{%页边章节名称字体
- \bfseries\fontsize{15}{15}\selectfont\color{outermarginfgcolor}
-}
-% declare new page style using layers
-\DeclareNewPageStyleByLayers{scth}{%
- scth.outermargin.bg.even,%
- scth.outermargin.bg.odd,%
- scth.outermargin.fg.even,%
- scth.outermargin.fg.odd,%
- scth.outermargin.pn.even,%
- scth.outermargin.pn.odd,%
- scth.outermargin.cn.even,%
- scth.outermargin.cn.odd,%
- scth.outermargin.text.even,%
- scth.outermargin.text.odd%
-}
-% define the layers for even pages
-\DeclareNewLayer[
- background, % 下层(背景)
- evenpage,
- outermargin,
- width=\outermarginwidth,
- contents={\color{outermarginbgcolor}\rule{\layerwidth}{\layerheight}} %色彩装饰条
-]{scth.outermargin.bg.even}%
-%%=============% 页边条颜色 %=======================%%
-\tikzfading[name=fade south,
- top color =transparent!0,
- bottom color=transparent!80]
-\tikzfading[name=fade north,
- top color =transparent!100,
- bottom color=transparent!0]
-%偶数页边纹理效果设置
-\newcommand{\evensidbardeepcolor}{%
-\tikzoverlay{
-\ifodd\value{page}
-\fill [outermarginfgcolor!20]%
- (current page.north east) rectangle ([xshift=-\outermarginwidth,yshift=0]current page.south east);
- \pattern [pattern=checkerboard,pattern color=outermarginfgcolor!50]%
- (current page.north east) rectangle ([xshift=-\outermarginwidth,yshift=0]current page.south east);
- \fill [outermarginbgcolor!90,path fading=fade south]%
- ([yshift=1mm]current page.north east) rectangle ([xshift=-\outermarginwidth,yshift=-.5\layerheight]current page.north east);
- \fill [outermarginbgcolor,path fading=fade north]%
- (current page.south east) rectangle ([xshift=-\outermarginwidth,yshift=.2\layerheight]current page.south east);
-\else
- \fill [outermarginfgcolor!20]%
- (current page.north west) rectangle ([xshift=\outermarginwidth,yshift=0]current page.south west);
- \pattern [pattern=checkerboard,pattern color=outermarginfgcolor!50]%
- (current page.north west) rectangle ([xshift=\outermarginwidth,yshift=0]current page.south west);
- \fill [outermarginbgcolor!90,path fading=fade south]%
- ([yshift=1mm]current page.north west) rectangle ([xshift=\outermarginwidth,yshift=-.5\layerheight]current page.north west);
- \fill [outermarginbgcolor,path fading=fade north]%
- (current page.south west) rectangle ([xshift=\outermarginwidth,yshift=.2\layerheight]current page.south west);
- \fi
-}
-}
-%%==============偶数页页边条颜色========================%%
-\DeclareNewLayer[
- foreground, %
- evenpage,
- outermargin,
- width=\outermarginwidth,
- contents=\evensidbardeepcolor %色彩装饰条
-]{scth.outermargin.fg.even}%
-%%==============偶数页页脚页码========================%%
-\DeclareNewLayer[
- foreground, %上层 (背景之上)
- evenpage,
- foot, % 页脚
- contents=\outermarginpagemark
-]{scth.outermargin.pn.even}%
-%%==============偶数页章节编号========================%%
-\DeclareNewLayer[
- foreground, %上层 (背景之上)
- evenpage,
- head, %页眉
- hoffset=0pt,
- width=\outermarginwidth,
- align=t,
- addvoffset=\dimexpr-\chapternumbersize-12pt+\headheight\relax,
- height=\chapternumbersize+\headheight,
- contents=\outermarginchapternumberbox%章节编号
-]{scth.outermargin.cn.even}%
-%%======================章节名称===================================%%
-\DeclareNewLayer[
- clone=scth.outermargin.cn.even,
- addheight=\dimexpr\headheight+\headsep+\textheight\relax,
- addvoffset=\dimexpr+2\outermarginwidth\relax,
- hoffset=-2.5pt,
- contents=\outermarginmark %
-]{scth.outermargin.text.even}%
-
-% define the layers for odd page from the settings for even pages
-\newcommand*\DeclareOddFromEven[1]{%复制自偶数页样式命令
-\DeclareNewLayer[
- clone=#1.even,
- oddpage,
- align=r,
- hoffset=\paperwidth
-]{#1.odd}%
-}
-\DeclareOddFromEven{scth.outermargin.bg}
-\DeclareOddFromEven{scth.outermargin.pn}
-\DeclareOddFromEven{scth.outermargin.cn}
-\DeclareOddFromEven{scth.outermargin.text}
-\DeclareOddFromEven{scth.outermargin.fg}
-
-% add the layers to page style scrheadings and page style plain
-\ForEachLayerOfPageStyle*{scth}{%
- \AddLayersToPageStyle{scrheadings}{#1}%
- \AddLayersToPageStyle{plain.scrheadings}{#1}%
-}
-%----------------------------------------------
-\KOMAoptions{markcase=upper} %页眉
-% for page styles scrheadings and plain
-\clearpairofpagestyles
-\ohead{}
-\cfoot{}
-\ofoot{}
-
-%%-------------------------------- SCRLAYER-SCRPAGE -------------------------------------%%
-
-%% Begin The Most Beautiful Box (STYLE : ys style) % 中国风盒子
-\makeatletter
-\definecolor{framegolden}{HTML}{455a64} % 控制外框颜色
-\definecolor{framegray}{HTML}{e0e0e0} % 控制填充颜色
-\newdimen\ys@frame@linewidth
-\newdimen\ys@frame@radius
-\newdimen\ys@frame@sep
-\def\ys@frame@fill@opacity{0.2}
-
-\pgfdeclarehorizontalshading{ys@fade@circle}{500bp}
-{color(0bp)=(pgftransparent!100); color(25bp)=(pgftransparent!100);
-color(45bp)=(pgftransparent!0); color(55bp)=(pgftransparent!0);
-color(75bp)=(pgftransparent!100); color(100bp)=(pgftransparent!100)}
-\pgfdeclarefading{ys circle}{\pgfuseshading{ys@fade@circle}}
-
-\def\ys@frame@star@list@t{%
- -0.7071\ys@frame@radius+0.2133\ys@frame@sep/%
- -0.7071\ys@frame@radius+0.2133\ys@frame@sep/%
- frame.north east,%
- 0.7071\ys@frame@radius-0.2133\ys@frame@sep/%
- -0.7071\ys@frame@radius+0.2133\ys@frame@sep/%
- frame.north west}
-\def\ys@frame@star@list@b{%
- 0.7071\ys@frame@radius-0.2133\ys@frame@sep/%
- 0.7071\ys@frame@radius-0.2133\ys@frame@sep/%
- frame.south west,%
- -0.7071\ys@frame@radius+0.2133\ys@frame@sep/%
- 0.7071\ys@frame@radius-0.2133\ys@frame@sep/%
- frame.south east}
-\edef\ys@frame@star@list{\ys@frame@star@list@t,\ys@frame@star@list@b}
-
-%region outer
-\def\ys@frame@remove@middleline#1#2{}
-\def\ys@frame@draw@middleline#1#2{%
- \clip ([xshift=-\ys@frame@linewidth,#1]frame.north west)--
- ([xshift=\ys@frame@linewidth,#1]frame.north east)--
- ([xshift=\ys@frame@linewidth,#2]frame.south east)--
- ([xshift=-\ys@frame@linewidth,#2]frame.south west)--cycle;}
-\def\ys@frame@unbrokenouter{%
- \path[draw=framegolden,fill=framegray,fill opacity=\ys@frame@fill@opacity,line width=\ys@frame@linewidth]
- ([xshift=\ys@frame@radius]frame.north west)--([xshift=-\ys@frame@radius]frame.north east)
- arc(-180:-90:\ys@frame@radius)--
- ([yshift=-\ys@frame@radius]frame.north east)--([yshift=\ys@frame@radius]frame.south east)
- arc(90:180:\ys@frame@radius)--
- ([xshift=-\ys@frame@radius]frame.south east)--([xshift=\ys@frame@radius]frame.south west)
- arc(0:90:\ys@frame@radius)--
- ([yshift=\ys@frame@radius]frame.south west)--([yshift=-\ys@frame@radius]frame.north west)
- arc(-90:0:\ys@frame@radius)--cycle;}
-\def\ys@frame@firstouter{%
- \ys@frame@remove@middleline{yshift=.5\ys@frame@linewidth}{yshift=.7\ys@frame@linewidth}%
- \path[draw=framegolden,fill=framegray,fill opacity=\ys@frame@fill@opacity,line width=\ys@frame@linewidth]
- ([xshift=\ys@frame@radius]frame.north west)--([xshift=-\ys@frame@radius]frame.north east)
- arc(-180:-90:\ys@frame@radius)--
- ([yshift=-\ys@frame@radius]frame.north east)--
- (frame.south east)--
- (frame.south west)--
- ([yshift=-\ys@frame@radius]frame.north west)
- arc(-90:0:\ys@frame@radius)--cycle;}
-\def\ys@frame@middleouter{%
- \ys@frame@remove@middleline{yshift=-.7\ys@frame@linewidth}{yshift=.7\ys@frame@linewidth}%
- \path[draw=framegolden,fill=framegray,fill opacity=\ys@frame@fill@opacity,line width=\ys@frame@linewidth]
- (frame.north west)--(frame.north east)--(frame.south east)--
- (frame.south west)--cycle;}
-\def\ys@frame@lastouter{%
- \ys@frame@remove@middleline{yshift=-.7\ys@frame@linewidth}{yshift=-.5\ys@frame@linewidth}%
- \path[draw=framegolden,fill=framegray,fill opacity=\ys@frame@fill@opacity,line width=\ys@frame@linewidth]
- (frame.north west)--(frame.north east)--
- ([yshift=\ys@frame@radius]frame.south east)
- arc(90:180:\ys@frame@radius)--
- ([xshift=-\ys@frame@radius]frame.south east)--([xshift=\ys@frame@radius]frame.south west)
- arc(0:90:\ys@frame@radius)--
- ([yshift=\ys@frame@radius]frame.south west)--
- (frame.north west)--cycle;}
-%endregion
-%region inner
-\def\ys@frame@unbrokeninner{%
-\path[draw=framegolden,line width=.5\ys@frame@linewidth,line cap=round]
-([xshift=\ys@frame@radius+2\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west)
- --([xshift=\ys@frame@radius+5\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west) --++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
- ([xshift=\ys@frame@radius+6\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west)--++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth) %第一节
- --([xshift=-\ys@frame@radius-8.828\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)--++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth)
- ([xshift=-\ys@frame@radius-7.828\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)--++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第二节
- --([xshift=-\ys@frame@radius-2\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)
- %%
-([yshift=-\ys@frame@radius-2\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.north east)
---([yshift=-\ys@frame@radius-5\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.north east) --++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
-([yshift=-\ys@frame@radius-6\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.north east)--++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth) %第一节
---([yshift=\ys@frame@radius+8.828\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.south east)--++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth)
-([yshift=\ys@frame@radius+7.828\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.south east)--++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第二节
-%
- --([yshift=\ys@frame@radius+2\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.south east)
-%
-([xshift=\ys@frame@radius+2\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west)
---([xshift=\ys@frame@radius+5\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west) --++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth)
-([xshift=\ys@frame@radius+6\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west)--++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第一节
---([xshift=-\ys@frame@radius-8.828\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)--++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
-([xshift=-\ys@frame@radius-7.828\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)--++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth) %第二节
- --([xshift=-\ys@frame@radius-2\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)
-%
-([yshift=-\ys@frame@radius-2\ys@frame@linewidth,xshift=\ys@frame@sep]frame.north west)
---([yshift=-\ys@frame@radius-5\ys@frame@linewidth,xshift=\ys@frame@sep]frame.north west) --++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth)
-([yshift=-\ys@frame@radius-6\ys@frame@linewidth,xshift=\ys@frame@sep]frame.north west)--++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第一节
---([yshift=\ys@frame@radius+8.828\ys@frame@linewidth,xshift=\ys@frame@sep]frame.south west)--++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
-([yshift=\ys@frame@radius+7.828\ys@frame@linewidth,xshift=\ys@frame@sep]frame.south west)--++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth) %第二节
- --([yshift=\ys@frame@radius+2\ys@frame@linewidth,xshift=\ys@frame@sep]frame.south west);}
-\def\ys@frame@firstinner{%
- \path[draw=framegolden,line width=.5\ys@frame@linewidth,line cap=round]
- ([xshift=\ys@frame@radius+2\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west)
- --([xshift=\ys@frame@radius+5\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west) --++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
- ([xshift=\ys@frame@radius+6\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west)--++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth) %第一节
- --([xshift=-\ys@frame@radius-8.828\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)--++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth)
- ([xshift=-\ys@frame@radius-7.828\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)--++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第二节
- --([xshift=-\ys@frame@radius-2\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)
- %%
-([yshift=-\ys@frame@radius-2\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.north east)
---([yshift=-\ys@frame@radius-5\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.north east) --++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
-([yshift=-\ys@frame@radius-6\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.north east)--++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth) %第一节
---([xshift=-\ys@frame@sep]frame.south east)
-
- ([yshift=-\ys@frame@radius-2\ys@frame@linewidth,xshift=\ys@frame@sep]frame.north west)
- --([yshift=-\ys@frame@radius-5\ys@frame@linewidth,xshift=\ys@frame@sep]frame.north west) --++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth)
- ([yshift=-\ys@frame@radius-6\ys@frame@linewidth,xshift=\ys@frame@sep]frame.north west)--++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第一节
- --([xshift=\ys@frame@sep]frame.south west);}
-\def\ys@frame@middleinner{%
- \path[draw=framegolden,line width=.5\ys@frame@linewidth,line cap=round]
- ([xshift=-\ys@frame@sep]frame.north east)--([xshift=-\ys@frame@sep]frame.south east)
- ([xshift=\ys@frame@sep]frame.north west)--([xshift=\ys@frame@sep]frame.south west);}
-\def\ys@frame@lastinner{%
- \path[draw=framegolden,line width=.5\ys@frame@linewidth,line cap=round]
- ([xshift=-\ys@frame@sep]frame.north east)
- --([yshift=\ys@frame@radius+8.828\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.south east)--++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth)
- ([yshift=\ys@frame@radius+7.828\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.south east)--++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第二节
- %
- --([yshift=\ys@frame@radius+2\ys@frame@linewidth,xshift=-\ys@frame@sep]frame.south east)
-%
- ([xshift=\ys@frame@radius+2\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west)
- --([xshift=\ys@frame@radius+5\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west) --++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth)
- ([xshift=\ys@frame@radius+6\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west)--++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth) %第一节
- --([xshift=-\ys@frame@radius-8.828\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)--++(45:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
- ([xshift=-\ys@frame@radius-7.828\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)--++(-45:2\ys@frame@linewidth)--++(45:2\ys@frame@linewidth) %第二节
- --([xshift=-\ys@frame@radius-2\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)
-%
- ([xshift=\ys@frame@sep]frame.north west)
- --([yshift=\ys@frame@radius+8.828\ys@frame@linewidth,xshift=\ys@frame@sep]frame.south west)--++(-135:2\ys@frame@linewidth)--++(-45:2\ys@frame@linewidth)
- ([yshift=\ys@frame@radius+7.828\ys@frame@linewidth,xshift=\ys@frame@sep]frame.south west)--++(-45:2\ys@frame@linewidth)--++(-135:2\ys@frame@linewidth) %第二节
- --([yshift=\ys@frame@radius+2\ys@frame@linewidth,xshift=\ys@frame@sep]frame.south west);}
-%endregion
-%region corner
-\def\ys@frame@unbrokencorner{%
- \path[draw=framegolden,line width=1.5\ys@frame@linewidth,line cap=round]
- ([xshift=\ys@frame@radius-2.7\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west)
- --([xshift=\ys@frame@sep,yshift=-\ys@frame@sep]frame.north west)
- --([xshift=\ys@frame@sep,yshift=-\ys@frame@radius+2.7\ys@frame@linewidth]frame.north west)
- ([xshift=-\ys@frame@radius+2.7\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)
- --([xshift=-\ys@frame@sep,yshift=-\ys@frame@sep]frame.north east)
- --([xshift=-\ys@frame@sep,yshift=-\ys@frame@radius+2.7\ys@frame@linewidth]frame.north east)
- ([xshift=-\ys@frame@radius+2.7\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)
- --([xshift=-\ys@frame@sep,yshift=\ys@frame@sep]frame.south east)
- --([xshift=-\ys@frame@sep,yshift=\ys@frame@radius-2.7\ys@frame@linewidth]frame.south east)
- ([xshift=\ys@frame@radius-2.7\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west)
- --([xshift=\ys@frame@sep,yshift=\ys@frame@sep]frame.south west)
- --([xshift=\ys@frame@sep,yshift=\ys@frame@radius-2.7\ys@frame@linewidth]frame.south west);}
-\def\ys@frame@firstcorner{%
- \path[draw=framegolden,line width=1.5\ys@frame@linewidth,line cap=round]
- ([xshift=\ys@frame@radius-2.7\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north west)
- --([xshift=\ys@frame@sep,yshift=-\ys@frame@sep]frame.north west)
- --([xshift=\ys@frame@sep,yshift=-\ys@frame@radius+2.7\ys@frame@linewidth]frame.north west)
- ([xshift=-\ys@frame@radius+2.7\ys@frame@linewidth,yshift=-\ys@frame@sep]frame.north east)
- --([xshift=-\ys@frame@sep,yshift=-\ys@frame@sep]frame.north east)
- --([xshift=-\ys@frame@sep,yshift=-\ys@frame@radius+2.7\ys@frame@linewidth]frame.north east);}
-\def\ys@frame@middlecorner{}
-\def\ys@frame@lastcorner{%
- \path[draw=framegolden,line width=1.5\ys@frame@linewidth,line cap=round]
- ([xshift=-\ys@frame@radius+2.7\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south east)
- --([xshift=-\ys@frame@sep,yshift=\ys@frame@sep]frame.south east)
- --([xshift=-\ys@frame@sep,yshift=\ys@frame@radius-2.7\ys@frame@linewidth]frame.south east)
- ([xshift=\ys@frame@radius-2.7\ys@frame@linewidth,yshift=\ys@frame@sep]frame.south west)
- --([xshift=\ys@frame@sep,yshift=\ys@frame@sep]frame.south west)
- --([xshift=\ys@frame@sep,yshift=\ys@frame@radius-2.7\ys@frame@linewidth]frame.south west);}
-%endregion
-\def\ys@frame@star#1#2#3{%
- \begin{scope}[shift={([xshift=#1,yshift=#2]#3)},scale=\ys@frame@ratio*0.1]
- \path[draw=framegolden,fill=white,
- line width=.7\ys@frame@linewidth,line join=round]
- (1,1)..controls(0.3,0.5) and (-0.3,0.5)..
- (-1,1)..controls(-0.5,0.3) and (-0.5,-0.3)..
- (-1,-1)..controls(-0.3,-0.5) and (0.3,-0.5)..
- (1,-1)..controls(0.5,-0.3) and (0.5,0.3)..(1,1)--cycle;
- \path[scale=0.45,fill=framegolden,line join=round]
- (1,1)..controls(0.3,0.7) and (-0.3,0.7)..
- (-1,1)..controls(-0.7,0.3) and (-0.7,-0.3)..
- (-1,-1)..controls(-0.3,-0.7) and (0.3,-0.7)..
- (1,-1)..controls(0.7,-0.3) and (0.7,0.3)..(1,1)--cycle;
- \end{scope}}
-\def\ys@frame@segmentation{%
- \draw[color=framegolden,path fading=ys circle]
- ([xshift=5\ys@frame@radius]segmentation.west) to[ornament=88]
- ([xshift=-5\ys@frame@radius]segmentation.east);}
-
-\tcbset{
- % 控制是否在断点处的线不画出来
- ys/frame/not at break/.code=\let\ys@frame@remove@middleline\ys@frame@draw@middleline,
- ys/frame/fill opacity/.store in=\ys@frame@fill@opacity,
- ys/frame/draw at break/.code=\let\ys@frame@remove@middleline\@gobbletwo,
- % 控制线宽
- ys/frame/line width/.code={\pgfmathsetlength\ys@frame@linewidth{#1}},
- ys/frame/line width=1.4pt,
- % 控制圆弧大小,应为数字,而非长度
- ys/frame/radius/.code={\pgfmathparse{#1}\let\ys@frame@ratio\pgfmathresult
- \pgfmathsetlength\ys@frame@radius{(#1)*1em}%
- \pgfmathsetlength\ys@frame@sep{(#1)*0.5ex}},
- ys/frame/radius=2,
- ys/frame/unbroken/.style={
- interior code={%
- \ys@frame@unbrokenouter % 外框
- \foreach \ii/\jj/\kk in \ys@frame@star@list {\ys@frame@star{\ii}{\jj}{\kk}} % 星
- \ys@frame@unbrokeninner % 内线
- \ys@frame@unbrokencorner % 四角
- },
- interior titled code={%
- \ys@frame@unbrokenouter % 外框
- \foreach \ii/\jj/\kk in \ys@frame@star@list {\ys@frame@star{\ii}{\jj}{\kk}} % 星
- \ys@frame@unbrokeninner % 内线
- \ys@frame@unbrokencorner % 四角
- }
- },
- ys/frame/first/.style={
- interior code={%
- \ys@frame@firstouter
- \foreach \ii/\jj/\kk in \ys@frame@star@list@t {\ys@frame@star{\ii}{\jj}{\kk}}
- \ys@frame@firstinner
- \ys@frame@firstcorner},
- interior titled code={%
- \ys@frame@firstouter
- \foreach \ii/\jj/\kk in \ys@frame@star@list@t {\ys@frame@star{\ii}{\jj}{\kk}}
- \ys@frame@firstinner
- \ys@frame@firstcorner},
- },
- ys/frame/middle/.style={
- interior code={%
- \ys@frame@middleouter
- \ys@frame@middleinner
- \ys@frame@middlecorner}
- },
- ys/frame/last/.style={
- interior code={%
- \ys@frame@lastouter
- \foreach \ii/\jj/\kk in \ys@frame@star@list@b {\ys@frame@star{\ii}{\jj}{\kk}}
- \ys@frame@lastinner
- \ys@frame@lastcorner}
- },
- ys/frame style/unbroken/.style={
- boxsep=2\ys@frame@sep,
- left={.8\ys@frame@radius},right={.8\ys@frame@radius},
- ys/frame/unbroken,title hidden,
- segmentation code=\ys@frame@segmentation
- },
- ys/frame style/first/.style={ys/frame/first,title hidden,segmentation code=\ys@frame@segmentation},
- ys/frame style/middle/.style={ys/frame/middle,segmentation code=\ys@frame@segmentation},
- ys/frame style/last/.style={ys/frame/last,segmentation code=\ys@frame@segmentation},
- ys style/.style={frame hidden,
- ys/frame style/unbroken,
- extras first={ys/frame style/first},
- extras middle={ys/frame style/middle},
- extras last={ys/frame style/last},
- },
-}
-\makeatother
-\newtcolorbox{fancybox}[1][]{enhanced,ys style,breakable,pad at break=2mm,
- ys/frame/not at break,ys/frame/fill opacity=0,#1,fontupper=\itshape}
-%% End The Most Beautiful Box
-\makeatletter
-\definecolor{CyaN}{HTML}{dbe1e5}
-\colorlet{OrangE}{yellow!20!orange}
-\colorlet{BluE}{cyan!70!blue}
-\colorlet{ReD}{red!20!orange}
-\colorlet{GreeN}{yellow!40!green}
-
-% 第一种定理
-\tcbset{my@basic@thm/.style={enhanced jigsaw, breakable,
- enlarge left by=-3.5mm, width=\textwidth+3.5mm, boxrule=0pt,
- top=2pt, bottom=2pt, left=2.5mm, frame hidden}}
-\newcommand{\@my@newtheorem@n}[1]{\ERROR}
-\newcommand{\@my@newtheorem@nn}[2]{%
- \@ifundefined{#1}{\@my@newtheorem{#1}#2}{\@my@renewtheorem{#1}#2}}
-\NewDocumentCommand{\@my@newtheorem}{ m m o +m }
- {\IfNoValueTF{#3}{\newtheorem{#1}{#2}}{\newtheorem{#1}{#2}[#3]}%
- \tcbset{my@#1@thmstyle/.style={#4}}%
- \tcolorboxenvironment{#1}{my@basic@thm, my@#1@thmstyle}}
-\NewDocumentCommand{\@my@renewtheorem}{ m m o +m }
- {\IfNoValueTF{#3}{\renewtheorem{#1}{#2}}{\renewtheorem{#1}{#2}[#3]}%
- \tcbset{my@#1@thmstyle/.style={#4}}}
-%
-% ---------------------------------------------------------------------------------- %
-% 第二种定理
-\tcbset{my@basic@tcbthm/.style={detach title,}}
-\newcommand{\@my@newtcbtheorem@n}[1]{\ERROR}
-\newcommand{\@my@newtcbtheorem@nn}[2]{%
- \@ifundefined{#1}{\@my@newtcbtheorem{#1}{#2}}{\@my@renewtcbtheorem{#1}{#2}}}
-\newcommand{\@my@newtcbtheorem}[2]{%
- \edef\my@curr@thmenvname{#1}% 它保存当前定理环境的名称
- \mytcbtheoremset{#2}%
- \NewTColorBox{#1}{ O{} O{} o }
- {my@basic@tcbthm, my@#1@tcbthmstyle, title={##2}, IfNoValueF={##3}{label={##3}}, ##1}}
-\newcommand{\@my@renewtcbtheorem}[2]{\edef\my@curr@thmenvname{#1}\mytcbtheoremset{#2}}
-
-% 键值设置
-\pgfkeys{/mytcbtheorem/.is family}
-\newcommand{\mytcbtheoremset}{\pgfqkeys{/mytcbtheorem}}
-\mytcbtheoremset{
- name/.code=\@namedef{\my@curr@thmenvname @name}{#1}, %无效
- counter/.code=\@namedef{my@\my@curr@thmenvname @counter}{#1}\newcounter{#1}[chapter], % 计数器遇到subsection就会自动归零 % https://zhuanlan.zhihu.com/p/57454848#circle=on
- the counter/.code=\@namedef{the\@nameuse{my@\my@curr@thmenvname @counter}}{#1},
- autoref name/.code=\@namedef{\@nameuse{my@\my@curr@thmenvname @counter}autorefname}{#1},
- style/.code=\tcbset{my@\my@curr@thmenvname @tcbthmstyle/.style={#1}},
- thmcolor/.code=\@namedef{\my@curr@thmenvname @thmcolor}{#1}, %无效
- lemcolor/.code=\@namedef{\my@curr@thmenvname @lemcolor}{#1}, %无效
-}
-% 存储键值 (LaTeX3)
-\ExplSyntaxOn
-\cs_new_protected:Npn \mynewtheorem
- { \keyval_parse:NNn \@my@newtheorem@n \@my@newtheorem@nn }
-\cs_new_protected:Npn \mynewtcbtheorem
- { \keyval_parse:NNn \@my@newtcbtheorem@n \@my@newtcbtheorem@nn }
-\ExplSyntaxOff
-\makeatother
-
-% 第二种定理
-\makeatletter
-%% Overlay Settings
-\newcommand{\my@theorem@overlay@unbroken}[2]{
- %%============== First ==============%%
- \fill[black!60] ([xshift=1cm,yshift=5pt]frame.north west)-- ([xshift=0.8cm,yshift=0cm]frame.north west)--([xshift=1.2cm,yshift=0cm]frame.north west)--cycle;
- \node[rectangle, text=white, drop shadow={opacity=.3, shadow xshift=0.1cm}, inner sep=1.5mm,fill=#2,
-anchor=west,rounded corners=3pt,font=\bfseries\normalsize] at ([xshift=0cm,yshift=-3.mm]frame.north west) {\hspace*{1.5em}#1.\ \ifdefvoid{\tcbtitletext}{}{(\itshape\tcbtitletext)}};
- \fill[color=#2,drop shadow={opacity=0.3,shadow xshift=.3pt}]
- ([xshift=1cm,yshift=5pt]frame.north west) {[rounded corners=3pt]--++(-1cm-5pt,0)}--++(0,-1cm-5pt)--cycle;
- \fill[color=black!60] ([xshift=-5pt,yshift=-1cm]frame.north west)--([xshift=0cm,yshift=-0.8cm]frame.north west)-- ([xshift=0cm,yshift=-1.2cm]frame.north west)--cycle;
- %%============== End ==============%%
- \fill[#2,drop shadow={opacity=0.3,shadow xshift=-0.008\linewidth,shadow yshift=0.0016\linewidth}]
- ([xshift=-0.05\linewidth,yshift=-5pt]frame.south east) {[rounded corners=3pt]--++(0.05\linewidth+5pt,0)}--++(0,0.05\linewidth+5pt)--cycle;
- \fill[black!60] ([xshift=-0.05\linewidth,yshift=-5pt]frame.south east) -- ([xshift=-0.04\linewidth,yshift=0pt]frame.south east)-- ([xshift=-0.06\linewidth,yshift=0pt]frame.south east)--cycle;
- \fill[black!60] ([xshift=5pt,yshift=0.05\linewidth]frame.south east)-- ([yshift=0.04\linewidth]frame.south east) -- ([yshift=0.06\linewidth]frame.south east)--cycle;
-}
-\newcommand{\my@theorem@overlay@first}[2]{
- \fill[black!60] ([xshift=1cm,yshift=5pt]frame.north west)-- ([xshift=0.8cm,yshift=0cm]frame.north west)--([xshift=1.2cm,yshift=0cm]frame.north west)--cycle;
- \node[rectangle, text=white, drop shadow={opacity=.3, shadow xshift=0.1cm}, inner sep=1.5mm,fill=#2, anchor=west,rounded corners=3pt,font=\bfseries\normalsize] at ([xshift=0cm,yshift=-3.mm]frame.north west) {\hspace*{1.5em}#1.\ \ifdefvoid{\tcbtitletext}{}{(\itshape\tcbtitletext)}};
- \fill[color=#2,drop shadow={opacity=0.3,shadow xshift=.3pt}]
- ([xshift=1cm,yshift=5pt]frame.north west) {[rounded corners=3pt]--++(-1cm-5pt,0)}--++(0,-1cm-5pt)--cycle;
- \fill[color=black!60] ([xshift=-5pt,yshift=-1cm]frame.north west)--([xshift=0cm,yshift=-0.8cm]frame.north west)-- ([xshift=0cm,yshift=-1.2cm]frame.north west)--cycle;
-}
-\newcommand{\my@theorem@overlay@last}[1]{
- \fill[#1,drop shadow={opacity=0.3,shadow xshift=-0.008\linewidth,shadow yshift=0.0016\linewidth}]
- ([xshift=-0.05\linewidth,yshift=-5pt]frame.south east) {[rounded corners=3pt]--++(0.05\linewidth+5pt,0)}--++(0,0.05\linewidth+5pt)--cycle;
- \fill[black!60] ([xshift=-0.05\linewidth,yshift=-5pt]frame.south east) -- ([xshift=-0.04\linewidth,yshift=0pt]frame.south east)-- ([xshift=-0.06\linewidth,yshift=0pt]frame.south east)--cycle;
- \fill[black!60] ([xshift=5pt,yshift=0.05\linewidth]frame.south east)-- ([yshift=0.04\linewidth]frame.south east) -- ([yshift=0.06\linewidth]frame.south east)--cycle;
-}
-% Second theorem style overlay settings
-\newcommand{\my@lemma@overlay@unbroken}[2]{
- %%============== First ==============%%
- \def\Rad{3.5pt}
- \def\theight{0.57cm}
- \def\rad{7pt}%
- \path[fill=#2,drop shadow={opacity=0.3,shadow xshift=.05cm,shadow yshift=-.05cm}]node[append after command={
- ([xshift=-1.5*\rad]thmname.north west) to[out=0,in=180,looseness=1] ([xshift=2.5*\rad]thmname.south west) --([xshift=-\rad]thmname.south east) to[out=0,in=180,looseness=1] ([xshift=3*\rad]thmname.north east) --cycle},
- text=white,font=\bfseries,align=center,inner ysep=1.5mm,minimum height=0.6cm,right] (thmname) at ([xshift=\rad,yshift=-.7*\rad]frame.north west) {\hspace*{10pt}#1.\ \ifdefvoid{\tcbtitletext}{}{(\itshape\tcbtitletext)}};
- \begin{pgfonlayer}{bottom}
- \fill[#2,opacity=0.5]
- ([xshift=-1.5*\rad]thmname.north west) to[out=180,in=305,looseness=1.5] +(3pt,-6pt) -| ++(12pt,0)--cycle;
- \fill[#2,opacity=0.5]
- ([xshift=3*\rad]thmname.north east) to[out=0,in=-90] +(5pt,-5pt) -| ++(-10pt,0) --cycle;
- \end{pgfonlayer}
- %%============== End ==============%%
- \def\tlen{1.5cm}
- \path[fill=#2,drop shadow={opacity=0.3,shadow xshift=.3pt}]
- ([xshift=-2*\rad,yshift=-5pt]frame.south east) coordinate (SE) to[out=0,in=180] +(4*\rad,5pt+\theight) --([shift={(-\tlen+4*\rad,5pt+\theight)}]SE) to[out=180,in=0] +(-4*\rad,-5pt-\theight) --cycle;
- \begin{pgfonlayer}{bottom}
- \fill[color=#2,opacity=0.5] ([xshift=-1.35*\tlen+\Rad,yshift=-5pt]frame.south east) to[out=180,in=90,looseness=0.7] ([xshift=-1.35*\tlen-0.5*\Rad]frame.south east) coordinate (NWl)--([xshift=2*\rad]NWl) to[out=-90,in=-180,looseness=0.7] ([xshift=-1.35*\tlen+\Rad,yshift=-5pt]frame.south east)--cycle;
- \end{pgfonlayer}
- }
-\newcommand{\my@lemma@overlay@first}[2]{
- %%============== First ==============%%
- \def\Rad{3.5pt}
- \def\theight{0.57cm}
- \def\rad{7pt}%
- \path[fill=#2,drop shadow={opacity=0.3,shadow xshift=.05cm,shadow yshift=-.05cm}]node[append after command={
- ([xshift=-1.5*\rad]thmname.north west) to[out=0,in=180,looseness=1] ([xshift=2.5*\rad]thmname.south west) --([xshift=-\rad]thmname.south east) to[out=0,in=180,looseness=1] ([xshift=3*\rad]thmname.north east) --cycle},
- text=white,font=\bfseries,align=center,inner ysep=1.5mm,minimum height=0.6cm,right] (thmname) at ([xshift=\rad,yshift=-.7*\rad]frame.north west) {\hspace*{10pt}#1.\ \ifdefvoid{\tcbtitletext}{}{(\itshape\tcbtitletext)}};
- \begin{pgfonlayer}{bottom}
- \fill[#2,opacity=0.5]
- ([xshift=-1.5*\rad]thmname.north west) to[out=180,in=305,looseness=1.5] +(3pt,-6pt) -| ++(12pt,0)--cycle;
- \fill[#2,opacity=0.5]
- ([xshift=3*\rad]thmname.north east) to[out=0,in=-90] +(5pt,-5pt) -| ++(-10pt,0) --cycle;
- \end{pgfonlayer}
- }
-\newcommand{\my@lemma@overlay@last}[1]{
- %%============== End ==============%%
- \def\Rad{3.5pt}
- \def\rad{7pt}%
- \def\theight{0.57cm}
- \def\tlen{1.5cm}
- \path[fill=#1,drop shadow={opacity=0.3,shadow xshift=.3pt}]
- ([xshift=-2*\rad,yshift=-5pt]frame.south east) coordinate (SE) to[out=0,in=180] +(4*\rad,5pt+\theight) --([shift={(-\tlen+4*\rad,5pt+\theight)}]SE) to[out=180,in=0] +(-4*\rad,-5pt-\theight) --cycle;
- \begin{pgfonlayer}{bottom}
- \fill[color=#1,opacity=0.5] ([xshift=-1.35*\tlen+\Rad,yshift=-5pt]frame.south east) to[out=180,in=90,looseness=0.7] ([xshift=-1.35*\tlen-0.5*\Rad]frame.south east) coordinate (NWl)--([xshift=2*\rad]NWl) to[out=-90,in=-180,looseness=0.7] ([xshift=-1.35*\tlen+\Rad,yshift=-5pt]frame.south east)--cycle;
- \end{pgfonlayer}
- }
-\makeatother
-%%
-
-% proof
-\newcommand{\itbf}[1]{\textit{\textbf{#1}}}
-\declaretheoremstyle[
- spaceabove=3pt,spacebelow=3pt,
- headfont=\normalfont\bfseries,
- notefont=\normalfont\bfseries,notebraces={(}{)},
- bodyfont=\normalfont,
- postheadspace=.5em,
- headpunct={.},
- qed=\color{cyan!40!black}$\blacksquare$,%\qedsymbol
-]{Proofstyle}
-\declaretheorem[style=Proofstyle,numbered=no,name={\itbf{Proof}}]{Proof}
-\renewenvironment{proof}{\begin{Proof} }{\end{Proof}}
-\declaretheorem[style=Proofstyle,numbered=no,name={\itbf{Solution}}]{solution}
-
-%%%%%%%%%%%%%%% 计数器知识 %%%%%%%%%%%%%%%%%%%%%%
-% 每次用 \newcounter{foo} 定义新计数器,内部都会定义这几个命令
-
-% \c@foo,储存计数器的值,初始值为 0
-% \thefoo,储存计数器输出时的格式,初始定义为 \arabic{foo}
-% \p@foo,储存计数器被引用时的前缀,初始定义为空
-% \cl@foo,储存「子计数器」列表(此处有简化),foo 自增时它的每个「子计数器」都会归零(详见「自动归零」一节),初始定义为空
-%% 关于计数器的自动归零
-% 如果还定义了计数器 \newcounter{bar}[foo],那么 \cl@foo 里就有了 bar
-% \@addtoreset{child}{parent} 和 \@removefromreset{child}{parent} 可以把计数器 child 移入/移出 \cl@parent
-% \counterwithin* 和 \counterwithout* 和上一条里两个命令的功能类似,但它们在执行前会检查接受的两个参数是否为已定义的计数器。不加星号的版本会修改 \thechild,详见「输出格式」一节
-% 在使用 \stepcounter{parent} 和 \refstepcounter{parent} 时,parent 自增,同时归零\cl@parent 里的「子计数器」
-% \addtocount{parent}{1} 只自增 parent,没有归零其「子计数器」的效果
-% 归零实现为「对每个子计数器,先设为 -1,然后使用 \stepcounter 自增」,这样实现的「归零」功能是递归的
-% 递归的意思是,如果还有 \newcounter{grandchild}[child],那么 \stepcounter{parent} 会将 child 和 grandchild 都归零
diff --git a/Master/texmf-dist/tex/latex/beautybook/beautybook-CN.cls b/Master/texmf-dist/tex/latex/beautybook/beautybook.cls
index 49f94464bf6..73959a7594e 100644
--- a/Master/texmf-dist/tex/latex/beautybook/beautybook-CN.cls
+++ b/Master/texmf-dist/tex/latex/beautybook/beautybook.cls
@@ -1,26 +1,43 @@
-%This Class is based on the default book class and options will be passed
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{beautybook-CN}[30-06-2024 V10.0 Beautybook Class]
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}}
-\ProcessOptions\relax
-\LoadClass[twoside,a4paper]{ctexbook}
-\RequirePackage[dvipsnames,svgnames,x11names,table]{xcolor}
-\RequirePackage{cncolours}
-\usepackage{fontspec}
-\colorlet{outermarginfgcolor}{DarkCyan} % foregroundcolor 较深
-\colorlet{outermarginbgcolor}{DarkCyan!30} % backgroundcolor 较浅
-\RequirePackage{bropd} % math 自适应数学括号命令 \br{} !!!
-\RequirePackage{tikz-imagelabels} % tikz图像标注
-\RequirePackage{epigraph-keys} % 名言引用
-\RequirePackage{fitbox} % 图像自适应
-\RequirePackage{pgfornament-han}
-\RequirePackage{tikz}
-\usetikzlibrary{calc,shadows,hobby,intersections, decorations.markings, decorations.pathreplacing,spy,arrows,shapes,fadings,trees,mindmap,patterns,shapes.arrows,shapes.symbols,tikzmark,shapes.geometric,graphs, quotes, angles,decorations.pathmorphing,through,shadings,backgrounds,positioning,fit,arrows.meta,shapes.misc,decorations.shapes}
-\RequirePackage{pgfplots} %画图 %%页面样式设计核心包 %提供\pgfonlayer命令以及下列图层指令
-\pgfplotsset{compat=1.18}
-%
+\ProvidesClass{beautybook}[02-07-2024 V10.0 beautybook Class]
+% /* -------------------------------------------------------------------------- */
+% /* 切换文类 */
+% /* -------------------------------------------------------------------------- */
+\DeclareKeys{% = \DeclareKeys[autoclass]
+ lang .choice: ,
+ lang/en .code:n = \def\beautybook@class{book} ,
+ lang/cn .code:n = \def\beautybook@class{ctexbook} ,
+ lang .initial:n = en ,
+ unknown .code:n = \beautybook@unknown ,
+}
+
+\ExplSyntaxOn
+\clist_new:N \beautybook@unknownoptions
+\cs_new_protected:Npn \beautybook@unknown
+ {
+ \bool_if:NTF \l__keys_no_value_bool
+ { % eg. 12pt, twoside
+ \clist_put_right:Nx \beautybook@unknownoptions
+ { \l_keys_key_str }
+ }
+ { % eg. zihao=4, fontset=windows
+ \clist_put_right:Nx \beautybook@unknownoptions
+ { \l_keys_key_str = { \exp_not:o \l_keys_value_tl } }
+ }
+ }
+\ExplSyntaxOff
+
+\ProcessKeyOptions % = \ProcessKeyOptions[beautybook]
+\PassOptionsToClass\beautybook@unknownoptions\beautybook@class
+%% 如果不需要过滤上面定义的 lang 等键,可以直接使用
+%% \PassOptionsToClass\@raw@classoptionslist\beautybook@class
+
+\LoadClass{\beautybook@class}
+% /* ---------------------------------- 切换文类 ---------------------------------- */
+
+
% /* -------------------------------------------------------------------------- */
-% /* 解决birkar封面不能用于a4paper问题 */
+% /* 判断 A4 paper程序 */
% /* -------------------------------------------------------------------------- */
\makeatletter
\ExplSyntaxOn
@@ -34,10 +51,24 @@
% \ifaivpaper@TF{a4paper内容}{not a4paper内容} % 这个用在想要判断a4paper的地方
\makeatother
% /* -------------------------------------------------------------------------- */
-% /* 解决birkar封面不能用于a4paper问题 */
+% /* 判断 A4 paper程序 */
+% /* -------------------------------------------------------------------------- */
+
+
+\RequirePackage[dvipsnames,svgnames,x11names,table]{xcolor}
+\RequirePackage{tikz} %%页面样式设计核心包 %提供\pgfonlayer命令
+\usetikzlibrary{cd,calc,shadows,hobby,intersections, decorations.markings, decorations.pathreplacing,spy,arrows,shapes,fadings,trees,mindmap,patterns,shapes.arrows,shapes.symbols,tikzmark,shapes.geometric,graphs, quotes, angles,decorations.pathmorphing,through,shadings,backgrounds,positioning,fit,arrows.meta,shapes.misc,decorations.shapes}
+
+% /* --------------------------------- 模板默认颜色 --------------------------------- */
+\colorlet{outermarginfgcolor}{DarkCyan} % foregroundcolor 较深的前景色
+\colorlet{outermarginbgcolor}{DarkCyan!30} % backgroundcolor 较浅的背景色
+% /* -------------------------------------------------------------------------- */
+
+% /* -------------------------------------------------------------------------- */
+% /* 封面切换程序 */
% /* -------------------------------------------------------------------------- */
+
\ExplSyntaxOn
-% 封面切换程序 (LaTeX3)!
\keys_define:nn {beautybook/coverstyle}
{
cover-choose.choice:,
@@ -81,64 +112,50 @@
{ \keys_set:nV { beautybook / mathstyle } \l__beautybook_tmpa_toks }
\ExplSyntaxOff
\RequirePackage{stys/beautybook-bottompage} %封底
-\RequirePackage{rotating}
-\tikzset{>=Stealth}
-\setlist{font=\upshape} % 取消所有列表默认距离 nosep,
-% 浮动环境设置
-% 默认情况下, \LaTeX{} 要求每页的文字至少占据 20%,否则该页就只单独放置一个浮动环境,
-% 而这通常不是我们想要的, 我们将这个要求降低到 5%.
-\renewcommand*{\textfraction}{0.05}
-% 有时如果多个浮动环境连续放在一起,
-% 会将它们分在几个不同页,即使它们可在同一页放
-% 得下. 我们可以通过修改 |\topfraction| 和 |\bottomfraction| 分别设置顶端和底端的浮
-% 动环境的最大比例.
-\renewcommand*{\topfraction}{0.9}
-\renewcommand*{\bottomfraction}{0.8}
-% 有时\LaTeX{}会把一个浮动环境单独放在一页,
-% 我们要求这个环境至少要占据 85% 才能单独放在一页.
-% 注意: |\floatpagefraction| 的数值必须小于 |\topfraction|.
-\renewcommand*{\floatpagefraction}{0.85}
+% /* -------------------------------------------------------------------------- */
+
+% /* -------------------------------------------------------------------------- */
+% /* 宏包导入 */
+% /* -------------------------------------------------------------------------- */
+\RequirePackage{cncolours,ninecolors}
+\RequirePackage{appendix} % 附录
+\RequirePackage{etoolbox} % 判断函数
+\RequirePackage{imakeidx}
+\RequirePackage{varwidth}
+\RequirePackage{caption}\colorlet{captioncolor}{outermarginfgcolor} % 图片和表格题注文字颜色
+\RequirePackage{indentfirst}
+\RequirePackage{amsmath,amsthm,mathrsfs,extarrows,bropd}
+\RequirePackage{thmtools,thm-restate}%定理环境 %定理的重写
+\RequirePackage[left=2cm,right=2cm,top=.6cm,bottom=2.2cm]{geometry}
+\RequirePackage{tabularray}
+\RequirePackage{enumitem}\setlist{font=\upshape} % 取消所有列表默认距离 nosep,
+\RequirePackage[normalem]{ulem} % 用于参考文献
% 关于图片 graphicx
+\RequirePackage{graphicx}
% 如果图片没有指定后缀, 依次按下列顺序搜索
\DeclareGraphicsExtensions{.pdf,.eps,.jpg,.png}
% 设置图表搜索路径, 可以给图表文件夹取如下名字
\graphicspath{{inner_pics/}{inner_pics/titleimages/}{figures/}{figure/}{pictures/}{picture/}{pic/}{pics/}{image/}{images/}}
-% \RequirePackage[physics]{stys/physicx}
-% \RequirePackage{stys/Symbols}
-\RequirePackage{extarrows}
-\usetikzlibrary{tikzmark}
-% \arrowname{super-script}
-% \arrowname[sub-script]{super-script}
-\RequirePackage{appendix} % 附录
-% \RequirePackage{stys/symbols}
-%
-\RequirePackage{makeidx}
-\RequirePackage{etoolbox} % 判断函数
-\RequirePackage{paracol}
-\RequirePackage{tikz-cd}
-\RequirePackage{imakeidx}
-\RequirePackage{anyfontsize}
-\RequirePackage{calc}
-\RequirePackage{xkeyval,ifthen}
-\RequirePackage[backgroundcolor=yellow!40!cyan!20,bordercolor=yellow!40!cyan!20,linecolor=DarkCyan]{todonotes}
-\RequirePackage{varwidth}
-\RequirePackage[colorlinks,linkcolor = purple, %%修改此处为你想要的颜色
-anchorcolor = purple, %%修改此处为你想要的颜色
-urlcolor = purple, %%修改此处为你想要的颜色
-citecolor = purple, %%修改此处为你想要的颜色
-]{hyperref}
-\setcounter{tocdepth}{3}
-\setcounter{secnumdepth}{3}%增加编号深度
-\RequirePackage{dashrule}
-\newlength\outermarginwidth
-\setlength\outermarginwidth{1.5cm}
-\newlength\covershift
-\setlength\covershift{5cm}
-\RequirePackage{caption}
-% 图注与表注格式
-\colorlet{captioncolor}{outermarginfgcolor} % 图片和表格题注文字颜色
+
+\RequirePackage{anyfontsize} % 消除字体大小警告
+\RequirePackage[colorlinks,linkcolor = purple,anchorcolor = purple,urlcolor = purple,citecolor= purple]{hyperref}
+% /* -------------------------------------------------------------------------- */
+
+% /* -------------------------------------------------------------------------- */
+% /* 设置pgflayers */
+% /* -------------------------------------------------------------------------- */
+\pgfdeclarelayer{background} %背景%底层
+\pgfdeclarelayer{foreground} %上层
+\pgfdeclarelayer{top} %顶部
+\pgfdeclarelayer{bottom} %底部
+\pgfsetlayers{bottom,background,main,foreground,top}
+% /* -------------------------------------------------------------------------- */
+
+% /* -------------------------------------------------------------------------- */
+% /* 设置封面元素 */
+% /* -------------------------------------------------------------------------- */
\makeatletter
-%%----------------------------------封面信息定义--------------------------------------------------------%%
+
\newcommand\bookseries[1]{\def\@bookseries{#1}}
\newcommand\subtitle[1]{\def\@subtitle{#1}}
\newcommand\edition[1]{\def\@edition{#1}}
@@ -146,52 +163,34 @@ citecolor = purple, %%修改此处为你想要的颜色
\newcommand\pressname[1]{\def\@pressname{#1}}
\newcommand\coverimage[1]{\def\@coverimage{#1}}
\newcommand\chapimage[1]{\def\@chapimage{#1}}
-%%----------------------------------封面信息定义--------------------------------------------------------%%
+
\makeatother
-\RequirePackage{indentfirst}
-\RequirePackage{amsmath}
-\RequirePackage[left=2cm,right=2cm,top=.6cm,bottom=2.2cm]{geometry}
+% /* -------------------------------------------------------------------------- */
+
+% /* -------------------------------------------------------------------------- */
+% /* 模板用到的距离标尺 */
+% /* -------------------------------------------------------------------------- */
+\newlength\outermarginwidth % 页边栏宽度
+\setlength\outermarginwidth{1.5cm}
+
+\newlength\covershift % 自定义的距离标尺
+\setlength\covershift{5cm}
+% /* -------------------------------------------------------------------------- */
+\newcommand{\tikzoverlay}[1]{\begin{tikzpicture}[remember picture,overlay] #1 \end{tikzpicture}}
+
+
+
+% /* -------------------------------------------------------------------------- */
+% /* 目录样式设置 */
+% /* -------------------------------------------------------------------------- */
\RequirePackage{xpatch}%修正章节编号
\RequirePackage[automark]{scrlayer-scrpage}%页面设置宏包,隶属于koma-script文档类
-\RequirePackage{fontawesome5}
-\RequirePackage{mathrsfs}
-\RequirePackage[most]{tcolorbox}
-\tcbuselibrary{breakable, skins,theorems}%TcolorBox Library
-\RequirePackage{tabularx}
-\RequirePackage{lastpage}
-%\RequirePackage{twemojis}
-\RequirePackage{ninecolors}
-\RequirePackage{colortbl} %彩色表格
-\RequirePackage{tabularray}
-\UseTblrLibrary{amsmath}
-% 定义 +array, +matrix, +bmatrix, +Bmatrix, +pmatrix, +vmatrix, +Vmatrix 和 +cases 环境。其
-% 中,每一个环境都类似于不带 + 前缀的环境,但是就像 tblr 环境一样,使用 rowsep=2pt 默认值。
-% 除了+array 环境外,其余的每个环境都可以带一个可选项,通过该可选项,可能为环境设置内部
-% 参数。
-\UseTblrLibrary{booktabs} % 定义 \toprule、 \midrule、\bottomrule 和 \cmidrule 命令,这些命令可以直接用于 tblr环境中
-\UseTblrLibrary{diagbox} % 在tblr 环境中使用 \diagbox 和\diagboxthree 命令排版斜线表头
-\UseTblrLibrary{varwidth} % 为表格添加 measure 内部参数。当设置了 measure=vbox 后,则会使用 \vbox 测量单元格宽度。%可以使用stretch=-1 移除列表环境上下的间距, 注意,stretch=-1 选项也会移除单元格中的支架
-\RequirePackage{pgfornament}
-\RequirePackage{zhnumber}
-\RequirePackage{dashrule}
-\RequirePackage{adjustbox}
-\RequirePackage{enumitem}
-\RequirePackage{multicol}
-\RequirePackage{amsthm}
-\RequirePackage{thmtools,thm-restate}%定理环境 %定理的重写
-\RequirePackage{bclogo}
-\RequirePackage[normalem]{ulem}
-\RequirePackage{pgfplots} %画图 %%页面样式设计核心包 %提供\pgfonlayer命令以及下列图层指令
-\pgfplotsset{compat=1.18}
-\RequirePackage{graphicx}%修正minipage顶部对齐问题
-\pgfdeclarelayer{background} %背景%底层
-\pgfdeclarelayer{foreground} %上层
-\pgfdeclarelayer{top} %顶部
-\pgfdeclarelayer{bottom} %底部
-\pgfsetlayers{bottom,background,main,foreground,top}
-\newcommand{\tikzoverlay}[1]{\begin{tikzpicture}[remember picture,overlay] #1 \end{tikzpicture}}
\RequirePackage[explicit]{titlesec}
\RequirePackage{titletoc}
+\RequirePackage[most]{tcolorbox}
+\tcbuselibrary{breakable, skins,theorems}
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}%增加编号深度
\newcommand\boxednum[1]
{
@@ -243,63 +242,16 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
{\hyperlink{subsubsection.\thecontentslabel}{\contentslabel{3.3em}}}
{\hspace*{-3.3em}}
{\titlerule*[1pc]{.}\contentspage\hspace*{1.5mm}}
+% /* -------------------------------------------------------------------------- */
-% tcolorbox中插入图片或者tikz绘图方法
-\newcommand\Figure[4]{%
- \begin{center}
- \captionsetup{type=figure} %消除 Package caption Warning: The option `hypcap=true' will be ignored for this
-%(caption) particular \caption on input line XX.警告信息
- \includegraphics[#1]{#2}
- \captionof{figure}{#3}\label{#4}
- \end{center}
-}%用法 : 用于tcolorbox中插入图片
-\newcommand\Tikz[3]{%
- \begin{center}
- \captionsetup{type=figure} %消除 Package caption Warning: The option `hypcap=true' will be ignored for this(caption) particular \caption on input line XX.警告信息
- #3 %最后一个参数为Tikz画图代码窗口
- \captionof{figure}{#1}\label{#2} %第一与第二个参数是Tikz画图的名称与标签
- \end{center}
-} %用法 : 用于tcolorbox中插入Tikz绘图
-%特殊注释矩阵
-\newcommand\coolover[2]{\mathrlap{\smash{\overbrace{\phantom{%
- \begin{matrix} #2 \end{matrix}}}^{\mbox{$#1$}}}}#2}
-
-\newcommand\coolunder[2]{\mathrlap{\smash{\underbrace{\phantom{%
- \begin{matrix} #2 \end{matrix}}}_{\mbox{$#1$}}}}#2}
-
-\newcommand\coolleftbrace[2]{%
- #1\left\{\vphantom{\begin{matrix} #2 \end{matrix}}\right.}
-
-\newcommand\coolrightbrace[2]{%
- \left.\vphantom{\begin{matrix} #1 \end{matrix}}\right\}#2}
-\definecolor{lightergray}{gray}{0.99}
-
-\newcommand*{\circled}[1]{\lower.7ex\hbox{\tikz\draw (0pt, 0pt)%
- circle (.5em) node {\makebox[1em][c]{\small #1}};}}
-\newcommand{\twicecircle}{\raisebox{.7ex}{
- \begin{tikzpicture}[remember picture,overlay]
- \draw[line width=0.6pt,black!60] (0,0) circle (3pt);
- \fill[black] (0,0) circle (1.6pt) ;
- \end{tikzpicture}}
-}
-\newcommand{\exercise}[2][\bcicosaedre]{\bigskip
-\begin{tikzpicture}[remember picture,overlay]
-\draw[line width=2pt,loosely dotted,teal] (0,0)--node[pos=0.4,rectangle,minimum height=1.5em,font=\sffamily\Large,text=black,fill=black!2,drop shadow={opacity=.3, shadow xshift=0.1cm},anchor=center,
- inner sep=1.5mm,
- anchor=west,] {$#1$ ~ #2} (\linewidth,0);
-\end{tikzpicture}\bigskip\smallskip
-}
-\RequirePackage{extarrows}
-\newcommand{\R}{\mathbb{R}}
-\newcommand{\F}{\mathcal{F}}
-\newcommand{\lan}[1]{\langle #1 \rangle}
-\newenvironment{eq}[1]{\begin{equation}\begin{aligned}#1}{\end{aligned}\end{equation}} %有编号
-\newenvironment{eq*}[1]{\begin{equation*}\begin{aligned}#1}{\end{aligned}\end{equation*}} %无编号
-% \everymath{\displaystyle}
-
-%% -------- 章节样式
+
+% /* -------------------------------------------------------------------------- */
+% /* 章节样式 */
+% /* -------------------------------------------------------------------------- */
+
+% /* ---------------------------- titleimage自动导入程序 ---------------------------- */
\makeatletter
-% titleimage
+
\ExplSyntaxOn
\seq_new:N \g__beautybook_chapter_oimage_seq % odd
\seq_new:N \g__beautybook_chapter_eimage_seq % even
@@ -334,7 +286,8 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
\cs_new_protected:Npn \titleimage #1
{ \keys_set:nn { beautybook/titleimage } {#1} }
\ExplSyntaxOff
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% /* -------------------------------- Chatper样式 ------------------------------- */
\titleformat{\chapter}{\huge\bfseries\filcenter}{}{1em}{
\makebox[0pt][l]{\def\rad{7pt}%
\begin{tikzpicture}[remember picture, overlay]%
@@ -418,8 +371,11 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
\end{tikzpicture}}
}
\titlespacing{\chapter}{0pt}{0pt}{70pt}
+
+
+% /* --------------------------------- Part定制 --------------------------------- */
\makeatother
-% -------- Part定制
+
%%定义标题文字长度%%
\newlength{\partstarlen}
%%设置临界长度%%
@@ -538,7 +494,7 @@ color=transparent!90, middle color=transparent!20]
\assignpagestyle{\chapter}{empty}
-%% -- Section
+% /* -------------------------------- Section样式 ------------------------------- */
\titleformat{\section}
{}
{}
@@ -567,9 +523,8 @@ color=transparent!90, middle color=transparent!20]
\titlespacing*{\section}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
-% /* -------------------------------------------------------------------------- */
-% /* Subsection Style */
-% /* -------------------------------------------------------------------------- */
+
+% /* ------------------------------ Subsection样式 ------------------------------ */
\usepackage{pifont}
\newcommand{\subsectionnumstyle}[2]{
\makebox[0pt][l]{\def\rad{5pt}%
@@ -610,7 +565,7 @@ color=transparent!90, middle color=transparent!20]
\end{pgfonlayer}
\end{tikzpicture}}
}
-%% -- Subsection
+
\titleformat{\subsection}
{}
{}
@@ -620,8 +575,13 @@ color=transparent!90, middle color=transparent!20]
\titleformat{name=\subsection,numberless}{}{}{-.5em}{\subsectionnonumstyle{#1}{outermarginfgcolor}}
% \titlespacing*{\subsection}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
+
+
+
%%-------------------------------- SCRLAYER-SCRPAGE -------------------------------------%%
-%% SIDE-BAR
+% /* -------------------------------------------------------------------------- */
+% /* SIDE-BAR配置 */
+% /* -------------------------------------------------------------------------- */
\newlength\chapternumbersize
\setlength\chapternumbersize{36pt}
\setlength{\headheight}{40pt} % 页眉高度
@@ -820,7 +780,12 @@ color=transparent!90, middle color=transparent!20]
%%-------------------------------- SCRLAYER-SCRPAGE -------------------------------------%%
-%% Begin The Most Beautiful Box (STYLE : ys style) % 中国风盒子
+% /* -------------------------------------------------------------------------- */
+% /* 中国风盒子 */
+% /* -------------------------------------------------------------------------- */
+
+%% Begin The Most Beautiful Box (STYLE : ys style)
+
\makeatletter
\definecolor{framegolden}{HTML}{455a64} % 控制外框颜色
\definecolor{framegray}{HTML}{e0e0e0} % 控制填充颜色
@@ -1090,15 +1055,19 @@ color(75bp)=(pgftransparent!100); color(100bp)=(pgftransparent!100)}
\makeatother
\newtcolorbox{fancybox}[1][]{enhanced,ys style,breakable,pad at break=2mm,
ys/frame/not at break,ys/frame/fill opacity=0,#1,fontupper=\itshape}
-%% End The Most Beautiful Box
+% /* -------------------------------------------------------------------------- */
+
+
+% /* -------------------------------------------------------------------------- */
+% /* 定理环境设置 */
+% /* -------------------------------------------------------------------------- */
\makeatletter
+% /* ---------------------------------- 第一种定理 --------------------------------- */
\definecolor{CyaN}{HTML}{dbe1e5}
\colorlet{OrangE}{yellow!20!orange}
\colorlet{BluE}{cyan!70!blue}
\colorlet{ReD}{red!20!orange}
\colorlet{GreeN}{yellow!40!green}
-
-% 第一种定理
\tcbset{my@basic@thm/.style={enhanced jigsaw, breakable,
enlarge left by=-3.5mm, width=\textwidth+3.5mm, boxrule=0pt,
top=2pt, bottom=2pt, left=2.5mm, frame hidden}}
@@ -1112,9 +1081,9 @@ color(75bp)=(pgftransparent!100); color(100bp)=(pgftransparent!100)}
\NewDocumentCommand{\@my@renewtheorem}{ m m o +m }
{\IfNoValueTF{#3}{\renewtheorem{#1}{#2}}{\renewtheorem{#1}{#2}[#3]}%
\tcbset{my@#1@thmstyle/.style={#4}}}
-%
+
% ---------------------------------------------------------------------------------- %
-% 第二种定理
+% /* ---------------------------------- 第二种定理 --------------------------------- */
\tcbset{my@basic@tcbthm/.style={detach title,}}
\newcommand{\@my@newtcbtheorem@n}[1]{\ERROR}
\newcommand{\@my@newtcbtheorem@nn}[2]{%
@@ -1145,10 +1114,7 @@ color(75bp)=(pgftransparent!100); color(100bp)=(pgftransparent!100)}
\cs_new_protected:Npn \mynewtcbtheorem
{ \keyval_parse:NNn \@my@newtcbtheorem@n \@my@newtcbtheorem@nn }
\ExplSyntaxOff
-\makeatother
-% 第二种定理
-\makeatletter
%% Overlay Settings
\newcommand{\my@theorem@overlay@unbroken}[2]{
%%============== First ==============%%
@@ -1244,19 +1210,6 @@ anchor=west,rounded corners=3pt,font=\bfseries\normalsize] at ([xshift=0cm,yshif
\declaretheorem[style=Proofstyle,numbered=no,name={\itbf{Proof}}]{Proof}
\renewenvironment{proof}{\begin{Proof} }{\end{Proof}}
\declaretheorem[style=Proofstyle,numbered=no,name={\itbf{Solution}}]{solution}
+% /* -------------------------------------------------------------------------- */
-%%%%%%%%%%%%%%% 计数器知识 %%%%%%%%%%%%%%%%%%%%%%
-% 每次用 \newcounter{foo} 定义新计数器,内部都会定义这几个命令
-
-% \c@foo,储存计数器的值,初始值为 0
-% \thefoo,储存计数器输出时的格式,初始定义为 \arabic{foo}
-% \p@foo,储存计数器被引用时的前缀,初始定义为空
-% \cl@foo,储存「子计数器」列表(此处有简化),foo 自增时它的每个「子计数器」都会归零(详见「自动归零」一节),初始定义为空
-%% 关于计数器的自动归零
-% 如果还定义了计数器 \newcounter{bar}[foo],那么 \cl@foo 里就有了 bar
-% \@addtoreset{child}{parent} 和 \@removefromreset{child}{parent} 可以把计数器 child 移入/移出 \cl@parent
-% \counterwithin* 和 \counterwithout* 和上一条里两个命令的功能类似,但它们在执行前会检查接受的两个参数是否为已定义的计数器。不加星号的版本会修改 \thechild,详见「输出格式」一节
-% 在使用 \stepcounter{parent} 和 \refstepcounter{parent} 时,parent 自增,同时归零\cl@parent 里的「子计数器」
-% \addtocount{parent}{1} 只自增 parent,没有归零其「子计数器」的效果
-% 归零实现为「对每个子计数器,先设为 -1,然后使用 \stepcounter 自增」,这样实现的「归零」功能是递归的
-% 递归的意思是,如果还有 \newcounter{grandchild}[child],那么 \stepcounter{parent} 会将 child 和 grandchild 都归零
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty
index 069dc61f60f..814b929bb68 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/beautybook-bottompage}[2024/06/30,v2.0]
+\ProvidesPackage{stys/beautybook-bottompage}[2024/07/01,v2.0]
\usepackage[ISBN=978-80-85955-35-4,SC0]{ean13isbn}
\makeatletter
%%----------------------------------封面信息定义--------------------------------------------------------%%
@@ -45,9 +45,9 @@
\raggedright
\sc\fontsize{20}{23}\selectfont\@bookseries}
}; %系列丛书名称
- \node[right,text=white,font=\rmfamily\Large,] at
- ([shift={(-.5cm,1.5cm)}]current page.south west) %
- {\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ \node[left,text=white,font=\rmfamily\Large,] at
+ ([shift={(5.6cm,2cm)}]current page.south west) %
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
\ifdefvoid{\@ISBNcode}{}{
\node[scale=1.5] (isbn) at ([shift={(-1.85\outermarginwidth,.5\covershift)}]current page.south east) {\@ISBNcode};%
\begin{pgfonlayer}{bottom}
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty
index 4253b6a3a0e..6668db854b5 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/beautybook-cover-birkar}[2024/06/30,v2.0]
+\ProvidesPackage{stys/beautybook-cover-birkar}[2024/07/01,v2.0]
\usepackage{anyfontsize} % 提供\fontsize{}{}\selectfont命令
\usepackage{etoolbox} %提供自定义封面选项接口
\usepackage[dvipsnames,svgnames,x11names,table]{xcolor}%颜色宏包 % Driver-independent color extensions
@@ -34,59 +34,69 @@ decorations.pathmorphing, graphs, quotes, angles, calc, through, backgrounds} %
top color=transparent!50]
\makeatletter
\newcommand{\aivcover}{
- \begin{scope}[opacity=0.8]
- \coordinate (triangleA) at ([shift={(1cm,-1.5cm)}]current page.north);
- \coordinate (triangleB) at ([shift={(-.75\linewidth,-.44\paperheight)}]triangleA);
- \coordinate (triangleC) at ([shift={(.5\linewidth,-.44\paperheight)}]triangleA);
- \draw[name path=triangle,very thick,coverfgcolor!70!white]
- (triangleA)--(triangleB)--(triangleC)--cycle;
- \draw[name path=circle,very thick,coverfgcolor!70!white]
- ([shift={(-1.65cm,-7.8cm)}]triangleA) coordinate (O) circle(6cm);
- %标注每个交点坐标
- \fill [name intersections={of=triangle and circle, name=i, total=\t}]
- [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
- \foreach \s in {1,...,\t}{(i-\s) circle (1em) node {}};
- \draw[name path=l,very thick,coverfgcolor!70!white] (i-1) -- (triangleC);
- \draw[very thick,coverfgcolor!70!white] (i-6) -- (triangleB);
- \draw[name path=l2,very thick,coverfgcolor!70!white] (i-4) -- (triangleA);
- \fill[name intersections={of=l and circle,name=j,total=\l}]
- [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
- \foreach \c in {1,...,\l}{(j-\c) circle (1em) node {}};
-
- \fill[name intersections={of=l2 and l,name=jj,total=\ll}]
- [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
- \foreach \cc in {1,...,\ll}{(jj-\cc) circle (1em) node {}};
- \end{scope}
-}
-
-\newcommand{\lettercover}{
+ \begin{tikzpicture}[remember picture,overlay]
+ \begin{pgfonlayer}{bottom}
+ \fill[coverfgcolor]
+ (current page.north west) rectangle (current page.south east);% 填充封面背景颜色 (coverbgcolor)
+ \fill[RED]
+ ([shift={(2.05cm,0)}]current page.north west) rectangle ([shift={(2.35cm,-6cm)}]current page.north west);
+ \fill[coverfgcolor!80,opacity=0.5]
+ ([shift={(0,-2cm)}]current page.north west) arc (90:-90:.3\paperheight) --cycle;
+ \fill[coverfgcolor!80,opacity=0.5]
+ ([shift={(0,-4cm)}]current page.north east) arc (90:270:.2\paperheight) --cycle;
+ \fill[coverfgcolor!80]
+ (current page.north west) rectangle ([shift={(2cm,0)}]current page.south west);
\begin{scope}[opacity=0.8]
- \coordinate (triangleA) at ([shift={(1cm,-1cm)}]current page.north);
- \coordinate (triangleB) at ([shift={(-.85\linewidth,-.46\paperheight)}]triangleA);
- \coordinate (triangleC) at ([shift={(.52\linewidth,-.46\paperheight)}]triangleA);
- \draw[name path=triangle,very thick,coverfgcolor!70!white]
- (triangleA)--(triangleB)--(triangleC)--cycle;
- \draw[name path=circle,very thick,coverfgcolor!70!white]
- ([shift={(-1.6cm,-7.3cm)}]triangleA) coordinate (O) circle(6cm);
- %标注每个交点坐标
- \fill [name intersections={of=triangle and circle, name=i, total=\t}]
- [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
- \foreach \s in {1,...,\t}{(i-\s) circle (1em) node {}};
- \draw[name path=l,very thick,coverfgcolor!70!white] (i-1) -- (triangleC);
- \draw[very thick,coverfgcolor!70!white] (i-6) -- (triangleB);
- \draw[name path=l2,very thick,coverfgcolor!70!white] (i-4) -- (triangleA);
- \fill[name intersections={of=l and circle,name=j,total=\l}]
- [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
- \foreach \c in {1,...,\l}{(j-\c) circle (1em) node {}};
-
- \fill[name intersections={of=l2 and l,name=jj,total=\ll}]
- [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
- \foreach \cc in {1,...,\ll}{(jj-\cc) circle (1em) node {}};
- \end{scope}
+ \coordinate (triangleA) at ([shift={(1cm,-1.5cm)}]current page.north);
+ \coordinate (triangleB) at ([shift={(-.75\linewidth,-.44\paperheight)}]triangleA);
+ \coordinate (triangleC) at ([shift={(.5\linewidth,-.44\paperheight)}]triangleA);
+ \draw[name path=triangle,very thick,coverfgcolor!70!white]
+ (triangleA)--(triangleB)--(triangleC)--cycle;
+ \draw[name path=circle,very thick,coverfgcolor!70!white]
+ ([shift={(-1.65cm,-7.8cm)}]triangleA) coordinate (O) circle(6cm);
+ %标注每个交点坐标
+ \fill [name intersections={of=triangle and circle, name=i, total=\t}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \s in {1,...,\t}{(i-\s) circle (1em) node {}};
+ \draw[name path=l,very thick,coverfgcolor!70!white] (i-1) -- (triangleC);
+ \draw[very thick,coverfgcolor!70!white] (i-6) -- (triangleB);
+ \draw[name path=l2,very thick,coverfgcolor!70!white] (i-4) -- (triangleA);
+ \fill[name intersections={of=l and circle,name=j,total=\l}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \c in {1,...,\l}{(j-\c) circle (1em) node {}};
+
+ \fill[name intersections={of=l2 and l,name=jj,total=\ll}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \cc in {1,...,\ll}{(jj-\cc) circle (1em) node {}};
+ \end{scope}
+ \end{pgfonlayer}
+ \begin{pgfonlayer}{foreground}
+ \fill[coverbar,opacity=.5]
+ ([yshift=2\outermarginwidth]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.2\outermarginwidth]current page.west); % 最左侧装饰矩形
+ \end{pgfonlayer}
+ \shade[left color=coverfgcolor,right color=coverfgcolor!60,opacity=.3]
+ ([xshift=\outermarginwidth,yshift=2\outermarginwidth]current page.west) rectangle (current page.south east); % 标题背景大矩形
+ \node[anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.4\covershift]current page.north) {%
+ \parbox{.8\paperwidth}{
+ \filright
+ \color{white}\sffamily\fontsize{20}{23}\selectfont\@bookseries}
+ }; %系列丛书名称
+ \node[ anchor=south,below right] (covertitles) at ([xshift=1.8\outermarginwidth-0.2cm,yshift=2.7cm]current page.west)
+ {\parbox{.8\paperwidth}{%
+ \raggedright%
+ {\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
+ \color{white}\sc\fontsize{30}{30}\selectfont
+ \ifdefvoid{\@subtitle}{}{\@subtitle}\par}
+ }};% 封面标题与副标题
+ \node[anchor=west,font=\sc\fontsize{23}{23}\selectfont,text=white] at ([shift={(-.4\paperwidth,-6cm)}]covertitles) {\@edition};
+ \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth-0.3cm,yshift=\covershift]current page.west) {\@author};
+ \node[left,text=white,font=\rmfamily\Large,] at
+ ([shift={(-2cm,2cm)}]current page.south east)
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+\end{tikzpicture}%
}
-\newcommand*\makecover{
- \thispagestyle{empty}
+\newcommand{\lettercover}{
\begin{tikzpicture}[remember picture,overlay]
\begin{pgfonlayer}{bottom}
\fill[coverfgcolor]
@@ -99,38 +109,59 @@ decorations.pathmorphing, graphs, quotes, angles, calc, through, backgrounds} %
([shift={(0,-4cm)}]current page.north east) arc (90:270:.2\paperheight) --cycle;
\fill[coverfgcolor!80]
(current page.north west) rectangle ([shift={(2cm,0)}]current page.south west);
- % /* -------------------------------------------------------------------------- */
- % /* 判断a4paper */
- % /* -------------------------------------------------------------------------- */
- \ifaivpaper@TF{\aivcover}{\lettercover}
- % /* -------------------------------------------------------------------------- */
- % /* 判断a4paper */
- % /* -------------------------------------------------------------------------- */
-\end{pgfonlayer}
-\begin{pgfonlayer}{foreground}
- \fill[coverbar,opacity=.5]
-([yshift=2\outermarginwidth]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.2\outermarginwidth]current page.west); % 最左侧装饰矩形
-\end{pgfonlayer}
-\shade[left color=coverfgcolor,right color=coverfgcolor!60,opacity=.3]
-([xshift=\outermarginwidth,yshift=2\outermarginwidth]current page.west) rectangle (current page.south east); % 标题背景大矩形
-\node[anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.4\covershift]current page.north) {%
-\parbox{.8\paperwidth}{
-\filright
-\color{white}\sffamily\fontsize{20}{23}\selectfont\@bookseries}
-}; %系列丛书名称
-\node[ anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.57\paperheight]current page.north)
-{\parbox{.8\paperwidth}{%
- \raggedright%
-{\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
- \color{white}\sffamily\fontsize{30}{30}\selectfont
- \ifdefvoid{\@subtitle}{}{\@subtitle}\par}
-}};% 封面标题与副标题
-\node[anchor=west,font=\sffamily\fontsize{23}{23}\selectfont,text=white] at ([xshift=1.8\outermarginwidth,yshift=-.6\covershift]current page.west) {\@edition};
-\node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth,yshift=\covershift]current page.west) {\@author};
-\node[left,text=white,font=\rmfamily\Large,] at
-([shift={(-1cm,2cm)}]current page.south east) %
-{\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ \begin{scope}[opacity=0.8]
+ \coordinate (triangleA) at ([shift={(1cm,-1cm)}]current page.north);
+ \coordinate (triangleB) at ([shift={(-.85\linewidth,-.46\paperheight)}]triangleA);
+ \coordinate (triangleC) at ([shift={(.52\linewidth,-.46\paperheight)}]triangleA);
+ \draw[name path=triangle,very thick,coverfgcolor!70!white]
+ (triangleA)--(triangleB)--(triangleC)--cycle;
+ \draw[name path=circle,very thick,coverfgcolor!70!white]
+ ([shift={(-1.6cm,-7.3cm)}]triangleA) coordinate (O) circle(6cm);
+ %标注每个交点坐标
+ \fill [name intersections={of=triangle and circle, name=i, total=\t}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \s in {1,...,\t}{(i-\s) circle (1em) node {}};
+ \draw[name path=l,very thick,coverfgcolor!70!white] (i-1) -- (triangleC);
+ \draw[very thick,coverfgcolor!70!white] (i-6) -- (triangleB);
+ \draw[name path=l2,very thick,coverfgcolor!70!white] (i-4) -- (triangleA);
+ \fill[name intersections={of=l and circle,name=j,total=\l}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \c in {1,...,\l}{(j-\c) circle (1em) node {}};
+
+ \fill[name intersections={of=l2 and l,name=jj,total=\ll}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \cc in {1,...,\ll}{(jj-\cc) circle (1em) node {}};
+ \end{scope}
+ \end{pgfonlayer}
+ \begin{pgfonlayer}{foreground}
+ \fill[coverbar,opacity=.5]
+ ([yshift=2\outermarginwidth]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.2\outermarginwidth]current page.west); % 最左侧装饰矩形
+ \end{pgfonlayer}
+ \shade[left color=coverfgcolor,right color=coverfgcolor!60,opacity=.3]
+ ([xshift=\outermarginwidth,yshift=2\outermarginwidth]current page.west) rectangle (current page.south east); % 标题背景大矩形
+ \node[anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.4\covershift]current page.north) {%
+ \parbox{.8\paperwidth}{
+ \filright
+ \color{white}\sffamily\fontsize{20}{23}\selectfont\@bookseries}
+ }; %系列丛书名称
+ \node[ anchor=south,below right] (covertitles) at ([xshift=1.8\outermarginwidth-0.2cm,yshift=2.7cm]current page.west)
+ {\parbox{.8\paperwidth}{%
+ \raggedright%
+ {\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
+ \color{white}\sc\fontsize{30}{30}\selectfont
+ \ifdefvoid{\@subtitle}{}{\@subtitle}\par}
+ }};% 封面标题与副标题
+ \node[anchor=west,font=\sc\fontsize{23}{23}\selectfont,text=white] at ([shift={(-.4\paperwidth,-6cm)}]covertitles) {\@edition};
+ \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth-0.3cm,yshift=\covershift]current page.west) {\@author};
+ \node[left,text=white,font=\rmfamily\Large,] at
+ ([shift={(-2cm,2cm)}]current page.south east)
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
\end{tikzpicture}%
+}
+
+\newcommand\makecover{
+ \thispagestyle{empty}
+ \ifaivpaper@TF{\aivcover}{\lettercover}
{\newpage\thispagestyle{empty}}
}
\makeatother
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty
index 176e740f6f3..399246d97ad 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/beautybook-cover-cn}[2024/06/30,v2.0]
+\ProvidesPackage{stys/beautybook-cover-cn}[2024/07/01,v2.0]
\usetikzlibrary{calc,fadings,patterns}
\usepackage{adjustbox} %修正minipage顶部对齐问题
%%%%===============================================================%%%%%
@@ -19,34 +19,31 @@
bottom color =transparent!100,
top color=transparent!50]
\makeatletter
-\newcommand*\makecover{
- %% Use the Tikz library positioning and clear the page header and footer
- \usetikzlibrary{positioning}
- \thispagestyle{empty}
+\newcommand{\aivcover}{
\begin{tikzpicture}[remember picture,overlay]
\fill[coverfgcolor!75]
(current page.north west) rectangle (current page.south east);% 填充封面背景颜色 (coverbgcolor)
- \fill[coverfgcolor!50]
- ([xshift=-3\covershift,yshift=-.4\covershift]current page.east) rectangle ([yshift=-1.35\covershift]current page.east); % 被标题背景遮挡露出一部分的装饰矩形
+ \fill[coverfgcolor!50]
+ ([xshift=-3\covershift,yshift=-.4\covershift]current page.east) rectangle ([yshift=-1.35\covershift]current page.east); % 被标题背景遮挡露出一部分的装饰矩形
\fill[coverfgcolor]
([xshift=\outermarginwidth]current page.north west) rectangle ([xshift=-\outermarginwidth,yshift=1.5\covershift]current page.south east); % 标题背景大矩形
- \fill[coverbar]
- ([yshift=.44\covershift]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.4\covershift]current page.west); % 最左侧装饰矩形
+ \fill[coverbar]
+ ([yshift=.44\covershift+0.05cm]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.4\covershift]current page.west); % 最左侧装饰矩形
\node[left] at ([xshift=-1.8cm,yshift=-1.5cm]current page.north east) {%
\parbox{3\covershift}{
\raggedleft
\color{white}\sffamily\bfseries\fontsize{18}{22}\selectfont\@bookseries}
}; %系列丛书名称
- \node[right] at ([xshift=\outermarginwidth,yshift=1.5*\covershift]current page.west)
- {\parbox{.8\paperwidth}{%
- \filright%
- \color{white}\sffamily\bfseries\fontsize{30}{30}\selectfont\@title\\[-1.2ex]
- \begin{tikzpicture}
- \draw[white,line width=1pt] (0,0) --++ (\paperwidth-3\outermarginwidth,0);
- \end{tikzpicture}\\[-.5ex]
- \color{white}\sffamily\bfseries\fontsize{30}{30}\selectfont
- \ifdefvoid{\@subtitle}{}{\@subtitle}
- }};% 封面英文书名与中文书名
+ \node[right] at ([xshift=\outermarginwidth,yshift=1.5*\covershift]current page.west)
+ {\parbox{.8\paperwidth}{%
+ \filright%
+ \color{white}\sffamily\bfseries\fontsize{30}{30}\selectfont\@title\\[-1ex]
+ \begin{tikzpicture}
+ \draw[white,line width=1pt] (0,0) --++ (\paperwidth-3\outermarginwidth,0);
+ \end{tikzpicture}\\[0ex]
+ \color{white}\sc\fontsize{30}{30}\selectfont
+ \ifdefvoid{\@subtitle}{}{\@subtitle}
+ }};% 封面英文书名与中文书名
\node[left,inner sep=0pt,outer sep=0pt] at ([xshift=1.2\outermarginwidth,yshift=1.8cm]current page.east)
{%
\adjustbox{valign=t}{
@@ -68,15 +65,77 @@
([xshift=\outermarginwidth]current page.south west) rectangle ++(1.8*\covershift,.575\paperheight);
\fill[pattern color=coverfgcolor!70,pattern=horizontal lines,opacity=0.8]
([xshift=\outermarginwidth,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
- \fill [coverfgcolor!80,path fading=fade right]%
- ([xshift=\outermarginwidth+.5\linewidth+.5cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
- \fill [coverfgcolor!80,path fading=fade left]%
+ \fill [coverfgcolor!80,path fading=fade right]%
([xshift=\outermarginwidth+.5\linewidth+.5cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
+ \fill [coverfgcolor!80,path fading=fade left]%
+ ([xshift=\outermarginwidth+.5\linewidth+.5cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
\node[left,text=white,font=\rmfamily\Large,] at
([shift={(-2cm,2cm)}]current page.south east) %
- {\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
\end{tikzpicture}%
- {\newpage\thispagestyle{empty}}}
+ }
+
+\newcommand{\lettercover}{
+ \begin{tikzpicture}[remember picture,overlay]
+ \fill[coverfgcolor!75]
+ (current page.north west) rectangle (current page.south east);% 填充封面背景颜色 (coverbgcolor)
+ \fill[coverfgcolor!50]
+ ([xshift=-3\covershift,yshift=-.4\covershift]current page.east) rectangle ([yshift=-1.2\covershift]current page.east); % 被标题背景遮挡露出一部分的装饰矩形
+ \fill[coverfgcolor]
+ ([xshift=\outermarginwidth]current page.north west) rectangle ([xshift=-\outermarginwidth,yshift=1.5\covershift]current page.south east); % 标题背景大矩形
+ \fill[coverbar]
+ ([yshift=.44\covershift-0.1cm]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.4\covershift]current page.west); % 最左侧装饰矩形
+ \node[left] at ([xshift=-1.8cm,yshift=-1.5cm]current page.north east) {%
+ \parbox{3\covershift}{
+ \raggedleft
+ \color{white}\sffamily\bfseries\fontsize{18}{22}\selectfont\@bookseries}
+ }; %系列丛书名称
+ \node[right] at ([xshift=\outermarginwidth,yshift=1.5*\covershift]current page.west)
+ {\parbox{.8\paperwidth}{%
+ \filright%
+ \color{white}\sffamily\bfseries\fontsize{30}{30}\selectfont\@title\\[-1ex]
+ \begin{tikzpicture}
+ \draw[white,line width=1pt] (0,0) --++ (\paperwidth-3\outermarginwidth,0);
+ \end{tikzpicture}\\[0ex]
+ \color{white}\sc\fontsize{30}{30}\selectfont
+ \ifdefvoid{\@subtitle}{}{\@subtitle}
+ }};% 封面英文书名与中文书名
+ \node[left,inner sep=0pt,outer sep=0pt] at ([xshift=1.2\outermarginwidth,yshift=1.8cm]current page.east)
+ {%
+ \adjustbox{valign=t}{
+ \begin{minipage}{.25\textwidth}
+ \begin{tikzpicture}
+ \foreach \x/\r in {1.2/6,.8/4} {
+ \draw[white,line width=\x pt] (0,0) circle [radius=\r pt];}
+ \fill[white] (0,0) circle [radius=2.5pt];
+ \end{tikzpicture}
+ \hspace{2pt}\color{white}\sffamily\fontsize{20}{25}\selectfont Editors
+ \end{minipage}}
+ \hfill
+ \adjustbox{valign=t}{\begin{minipage}{.45\textwidth}
+ \raggedright\color{white}\sffamily\fontsize{20}{25}\selectfont\@author
+ \end{minipage}}
+ };% 封面作者信息栏
+ \fill [path picture={ \node at (path picture bounding box.center)
+ {\includegraphics[height=1.1\linewidth,keepaspectratio]{\@coverimage}};}]
+ ([xshift=\outermarginwidth]current page.south west) rectangle ++(1.8*\covershift,.575\paperheight);
+ \fill[pattern color=coverfgcolor!70,pattern=horizontal lines,opacity=0.8]
+ ([xshift=\outermarginwidth,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
+ \fill [coverfgcolor!80,path fading=fade right]%
+ ([xshift=\outermarginwidth+.5\linewidth+.2cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
+ \fill [coverfgcolor!80,path fading=fade left]%
+ ([xshift=\outermarginwidth+.5\linewidth+.2cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
+ \node[left,text=white,font=\rmfamily\Large,] at
+ ([shift={(-2cm,2cm)}]current page.south east) %
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ \end{tikzpicture}%
+ }
+
+\newcommand\makecover{
+ \thispagestyle{empty}
+ \ifaivpaper@TF{\aivcover}{\lettercover}
+ {\newpage\thispagestyle{empty}}
+}
\makeatother
\endinput
% %%%%===============================================================%%%%%
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty
index 1c868103804..76d358c6273 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/beautybook-cover-en}[2024/06/30,v2.0]
+\ProvidesPackage{stys/beautybook-cover-en}[2024/07/01,v2.0]
\usepackage{anyfontsize} % 提供\fontsize{}{}\selectfont命令
\usepackage{etoolbox} %提供自定义封面选项接口
\usepackage[dvipsnames,svgnames,x11names,table]{xcolor}%颜色宏包 % Driver-independent color extensions
@@ -20,10 +20,66 @@
bottom color =transparent!100,
top color=transparent!50]
\makeatletter
-\newcommand*\makecover{
- %% Use the Tikz library positioning and clear the page header and footer
- \usetikzlibrary{positioning}
- \thispagestyle{empty}
+\newcommand{\aivcover}{
+ \begin{tikzpicture}[remember picture,overlay]
+ \fill[coverfgcolor]
+ (current page.north west) rectangle (current page.south east);% 填充封面背景颜色 (coverbgcolor)
+ \coordinate (start) at ($(current page.east)!0.5!(current page.north east)+(1,-1)$);
+ \coordinate (end) at (current page.north west);
+ \foreach \i in {0,0.01,...,1}
+ {
+ \coordinate (point) at ($(start)!\i!(end)$);
+ \draw[coverfgcolor!50]
+ ($(point)+(310*\i:6)$)--
+ ($(point)+(310*\i+120:6)$)--
+ ($(point)+(310*\i+240:6)$)--
+ ($(point)+(310*\i:6)$);
+ }
+ \coordinate (start) at (current page.south west);
+ \coordinate (end) at (current page.east);
+ \foreach \i in {0,0.02,...,1}
+ {
+ \coordinate (point) at ($(start)!\i!(end)$);
+ \draw[coverfgcolor!50]
+ ($(point)+(310*\i:10)$)--
+ ($(point)+(310*\i+120:10)$)--
+ ($(point)+(310*\i+240:10)$)--
+ ($(point)+(310*\i:10)$);
+ }
+ \shade[bottom color=coverfgcolor,top color=coverfgcolor!70,opacity=0.7]
+ ([xshift=.5\outermarginwidth]current page.north west) rectangle (current page.south east); % 背景大矩形
+ \shade[left color=coverfgcolor,right color=coverfgcolor!60,opacity=0.5]
+ ([xshift=\outermarginwidth,yshift=2\outermarginwidth]current page.west) rectangle (current page.south east); % 标题背景大矩形
+ \fill[coverbar!90,opacity=0.8]
+ ([yshift=2\outermarginwidth]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.2\outermarginwidth]current page.west); % 最左侧装饰矩形
+ \foreach \lx/\rx/\ry/\bc/\tc in {
+ 1/1.5/1.75/70/80,1.5/2/1.6/65/75,2/2.5/1.3/60/70,2.5/3/1/55/65,3/3.5/.7/50/60,3.5/4/1.2/60/70,4/4.5/1.9/75/85,4.5/5/1.1/55/65,5/5.5/1.2/60/70,6/6.5/1.6/65/75,6.5/7/1.3/60/70,7/7.5/1.87/70/80,7.5/8/1/55/65,8/8.5/.9/50/60,8.5/9/1.8/70/80,9/9.5/1.6/65/75,9.5/10/1.4/60/70,10/10.5/1/55/65,10.5/11/.7/50/60,11/11.5/1.3/55/65,11.5/12/1/70/80,12/12.5/1.3/65/75,12.5/13/1.6/60/70,13/13.5/1.75/55/65,13.5/14/1.6/65/75,14/14.5/1.3/60/70
+ }{
+ \shade[bottom color=coverfgcolor!\bc,top color=coverfgcolor!\tc,opacity=.5]
+ ([xshift=\lx\outermarginwidth]current page.north west) rectangle ([xshift=\rx\outermarginwidth,yshift=-\ry\covershift]current page.north west);%顶部琴键矩形
+ }
+ \node[anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.4\covershift]current page.north) {%
+ \parbox{.8\paperwidth}{
+ \filright
+ \color{white}\sffamily\fontsize{20}{23}\selectfont\@bookseries}
+ }; %系列丛书名称
+ \node[ anchor=south,below right] (covertitles) at ([xshift=1.8\outermarginwidth-0.2cm,yshift=2.7cm]current page.west)
+ {\parbox{.8\paperwidth}{%
+ \raggedright%
+ {\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
+ \color{white}\sffamily\fontsize{30}{30}\selectfont
+ \ifdefvoid{\@subtitle}{}{\@subtitle}\par}
+ }};% 封面标题与副标题
+ \node[anchor=west,font=\sc\fontsize{23}{23}\selectfont,text=white] at ([shift={(-.4\paperwidth,-6cm)}]covertitles) {\@edition};
+ \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth-0.3cm,yshift=\covershift]current page.west) {\@author};
+ \node[left,text=white,font=\rmfamily\Large,] at
+ ([shift={(-2cm,2cm)}]current page.south east) %
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ \end{tikzpicture}%
+ {\newpage\thispagestyle{empty}}
+}
+
+\newcommand{\lettercover}{
\begin{tikzpicture}[remember picture,overlay]
\fill[coverfgcolor]
(current page.north west) rectangle (current page.south east);% 填充封面背景颜色 (coverbgcolor)
@@ -66,21 +122,27 @@
\filright
\color{white}\sffamily\fontsize{20}{23}\selectfont\@bookseries}
}; %系列丛书名称
- \node[ anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.57\paperheight]current page.north)
+ \node[ anchor=south,below right] (covertitles) at ([xshift=1.8\outermarginwidth-0.2cm,yshift=2.7cm]current page.west)
{\parbox{.8\paperwidth}{%
\raggedright%
{\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
\color{white}\sffamily\fontsize{30}{30}\selectfont
\ifdefvoid{\@subtitle}{}{\@subtitle}\par}
}};% 封面标题与副标题
- \node[anchor=west,font=\sffamily\fontsize{23}{23}\selectfont,text=white] at ([xshift=1.8\outermarginwidth,yshift=-.6\covershift]current page.west) {\@edition};
- \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth,yshift=\covershift]current page.west) {\@author};
+ \node[anchor=west,font=\sc\fontsize{23}{23}\selectfont,text=white] at ([shift={(-.4\paperwidth,-6cm)}]covertitles) {\@edition};
+ \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth-0.3cm,yshift=\covershift]current page.west) {\@author};
\node[left,text=white,font=\rmfamily\Large,] at
- ([shift={(-1cm,2cm)}]current page.south east) %
- {\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ ([shift={(-2cm,2cm)}]current page.south east) %
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
\end{tikzpicture}%
{\newpage\thispagestyle{empty}}
}
+
+\newcommand\makecover{
+ \thispagestyle{empty}
+ \ifaivpaper@TF{\aivcover}{\lettercover}
+ {\newpage\thispagestyle{empty}}
+}
\makeatother
%%%%===============================================================%%%%%
%%------------------------------------------------------封面设计--------------------------------------------------------%%
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty
index e84129ddea0..9c24de8b3eb 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/beautybook-cover-enfig}[2024/06/30,v2.0]
+\ProvidesPackage{stys/beautybook-cover-enfig}[2024/07/01,v2.0]
\tikzfading[name=fade right,
right color =transparent!100,
left color=transparent!0]
@@ -13,10 +13,40 @@
bottom color =transparent!100,
top color=transparent!50]
\makeatletter
-\newcommand*\makecover{
- %% Use the Tikz library positioning and clear the page header and footer
- \usetikzlibrary{positioning}
- \thispagestyle{empty}
+\newcommand{\aivcover}{
+ \begin{tikzpicture}[remember picture,overlay]
+ \begin{pgfonlayer}{bottom}
+ \node[opacity=0.8,inner sep=0pt] at (current
+ page.center){\includegraphics[width=\paperwidth,height=\paperheight]{\@coverimage}};
+ \end{pgfonlayer}
+ \shade[left color=coverbgcolor!70,right color=coverbgcolor!50,path fading=fade right,opacity=.5]
+ ([xshift=.5\outermarginwidth]current page.north west) rectangle ([xshift=4\outermarginwidth]current page.south west); % 背景大矩形虚化
+ \shade[left color=coverfgcolor,right color=coverfgcolor!60,opacity=.8]
+ ([xshift=\outermarginwidth,yshift=2\outermarginwidth]current page.west) rectangle (current page.south east); % 标题背景大矩形
+ \fill[coverbar,opacity=0.8]
+ ([yshift=2\outermarginwidth]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.2\outermarginwidth]current page.west); % 最左侧装饰矩形
+ \node[anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.4\covershift]current page.north) {%
+ \parbox{.8\paperwidth}{
+ \filright
+ \color{white}\sc\fontsize{20}{23}\selectfont\@bookseries}
+ }; %系列丛书名称
+ \node[ anchor=south,below right] (covertitles) at ([xshift=1.8\outermarginwidth-0.2cm,yshift=2.7cm]current page.west)
+ {\parbox{.8\paperwidth}{%
+ \raggedright%
+ {\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
+ \color{white}\sc\fontsize{30}{30}\selectfont
+ \ifdefvoid{\@subtitle}{}{\@subtitle}\par}
+ }};% 封面标题与副标题
+ \node[anchor=west,font=\sc\fontsize{23}{23}\selectfont,text=white] at ([shift={(-.4\paperwidth,-6cm)}]covertitles) {\@edition};
+ \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth-0.3cm,yshift=\covershift]current page.west) {\@author};
+ \node[left,text=white,font=\rmfamily\Large,] at
+ ([shift={(-2cm,2cm)}]current page.south east) %
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ \end{tikzpicture}%
+ {\newpage\thispagestyle{empty}}
+}
+
+\newcommand{\lettercover}{
\begin{tikzpicture}[remember picture,overlay]
\begin{pgfonlayer}{bottom}
\node[opacity=0.8,inner sep=0pt] at (current
@@ -33,20 +63,26 @@
\filright
\color{white}\sc\fontsize{20}{23}\selectfont\@bookseries}
}; %系列丛书名称
- \node[ anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.55\paperheight]current page.north)
+ \node[ anchor=south,below right] (covertitles) at ([xshift=1.8\outermarginwidth-0.2cm,yshift=2.7cm]current page.west)
{\parbox{.8\paperwidth}{%
\raggedright%
{\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
\color{white}\sc\fontsize{30}{30}\selectfont
\ifdefvoid{\@subtitle}{}{\@subtitle}\par}
}};% 封面标题与副标题
- \node[anchor=west,font=\sc\fontsize{23}{23}\selectfont,text=white] at ([xshift=1.8\outermarginwidth,yshift=-.6\covershift]current page.west) {\@edition};
- \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth,yshift=\covershift]current page.west) {\@author};
+ \node[anchor=west,font=\sc\fontsize{23}{23}\selectfont,text=white] at ([shift={(-.4\paperwidth,-6cm)}]covertitles) {\@edition};
+ \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth-0.3cm,yshift=\covershift]current page.west) {\@author};
\node[left,text=white,font=\rmfamily\Large,] at
- ([shift={(-1cm,2cm)}]current page.south east) %
- {\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ ([shift={(-2cm,2cm)}]current page.south east) %
+ {\raisebox{-0.5cm}{\includegraphics[width=0.1\linewidth]{\@presslogo}}\hspace*{0ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
\end{tikzpicture}%
{\newpage\thispagestyle{empty}}
}
+
+\newcommand\makecover{
+ \thispagestyle{empty}
+ \ifaivpaper@TF{\aivcover}{\lettercover}
+ {\newpage\thispagestyle{empty}}
+}
\makeatother
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx
new file mode 100644
index 00000000000..320c493f40f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx
@@ -0,0 +1,37 @@
+% UKenglish-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{UKenglish-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist UK English localisation (JSP)]
+
+% Inherit english
+\InheritBibliographyStrings{british}
+\InheritBibliographyExtras{british}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx
new file mode 100644
index 00000000000..f20be86b76d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx
@@ -0,0 +1,37 @@
+% USenglish-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{USenglish-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist US English localisation (JSP)]
+
+% Inherit english
+\InheritBibliographyStrings{english}
+\InheritBibliographyExtras{english}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx
new file mode 100644
index 00000000000..ae889e02167
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx
@@ -0,0 +1,37 @@
+% american-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{american-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist US English localisation (JSP)]
+
+% Inherit english
+\InheritBibliographyStrings{english}
+\InheritBibliographyExtras{english}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx
new file mode 100644
index 00000000000..ae6d96e9326
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx
@@ -0,0 +1,37 @@
+% australian-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{australian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist AU English localisation (JSP)]
+
+% Inherit english
+\InheritBibliographyStrings{british}
+\InheritBibliographyExtras{british}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx
new file mode 100644
index 00000000000..0ad5c4119e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx
@@ -0,0 +1,55 @@
+% austrian-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{austrian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist Austrian localisation (JSP)]
+
+% Inherit general localization
+\InheritBibliographyExtras{austrian}
+
+% Localizations
+\DeclareBibliographyStrings{%
+ inherit = {austrian},
+ parttranslationof = {{Teil\"ubersetzung von}{Teil\"ubers\adddotspace von}},
+ with = {{mit}{mit}},
+ impactfactor = {{Impactfaktor}{JIF}},
+ openaccess:true = {{OpenAccess}{OA}},
+ openaccess:gold = {{OpenAccess (gold)}{OA (gold)}},
+ openaccess:green = {{OpenAccess (gr\"un)}{OA (gr\"un)}},
+ peerreview:sb = {{Blindbegutachtung}{Blindbeg\adddot}},
+ peerreview:db = {{Doppelblindbegutachtung}{Doppelblindbeg\adddot}},
+ peerreview:op = {{Offene Begutachtung}{Offene Beg\adddot}},
+ peerreview:co = {{Kollaborative Begutachtung}{Kollab\adddotespace Beg\adddot}},
+ peerreview:cc = {{Cascading-Begutachtung}{Cascading-Beg\adddot}},
+ peerreview:tp = {{Begutachtung durch Dritte}{Beg\adddotspace durch Dritte}},
+ peerreview:pp = {{Post-Publication-Begutachtung}{Post-Pub\adddot-Beg\adddot}},
+ peerreview:no = {{keine Begutachtung}{keine Beg\adddot}}
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx
new file mode 100644
index 00000000000..dbfe6131180
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx
@@ -0,0 +1,55 @@
+% british-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{british-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist UK English localisation (JSP)]
+
+% Inherit general localization
+\InheritBibliographyExtras{british}
+
+% Localizations
+\DeclareBibliographyStrings{%
+ inherit = {british},
+ parttranslationof = {{partial translation of}{part\adddotspace trans\adddotspace of}},
+ with = {{with}{with}},
+ impactfactor = {{impact factor}{JIF}},
+ openaccess:true = {{OpenAccess}{OA}},
+ openaccess:gold = {{OpenAccess (gold)}{OA (gold)}},
+ openaccess:green = {{OpenAccess (green)}{OA (green)}},
+ peerreview:sb = {{single blind peer review}{single blind peer rev\adddot}},
+ peerreview:db = {{double blind peer review}{double blind peer rev\adddot}},
+ peerreview:op = {{open peer review}{open peer rev\adddot}},
+ peerreview:co = {{collaborative peer review}{collab\adddotspace peer rev\adddot}},
+ peerreview:cc = {{cascading peer review}{casc\adddotspace peer rev\adddot}},
+ peerreview:tp = {{third-party peer review}{3rd-party peer rev\adddot}},
+ peerreview:pp = {{post-publication peer review}{post-pub\adddotspace peer rev\adddot}},
+ peerreview:no = {{no peer review}{no peer rev\adddot}}
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx
new file mode 100644
index 00000000000..f92334b5bae
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx
@@ -0,0 +1,37 @@
+% canadian-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{canadian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist CDN English localisation (JSP)]
+
+% Inherit english
+\InheritBibliographyStrings{english}
+\InheritBibliographyExtras{english}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx
new file mode 100644
index 00000000000..a51deb5583c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx
@@ -0,0 +1,55 @@
+% english-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{english-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist English localisation (JSP)]
+
+% Inherit general localization
+\InheritBibliographyExtras{english}
+
+% Localizations
+\DeclareBibliographyStrings{%
+ inherit = {english},
+ parttranslationof = {{partial translation of}{part\adddotspace trans\adddotspace of}},
+ with = {{with}{with}},
+ impactfactor = {{impact factor}{JIF}},
+ openaccess:true = {{OpenAccess}{OA}},
+ openaccess:gold = {{OpenAccess (gold)}{OA (gold)}},
+ openaccess:green = {{OpenAccess (green)}{OA (green)}},
+ peerreview:sb = {{single blind peer review}{single blind peer rev\adddot}},
+ peerreview:db = {{double blind peer review}{double blind peer rev\adddot}},
+ peerreview:op = {{open peer review}{open peer rev\adddot}},
+ peerreview:co = {{collaborative peer review}{collab\adddotspace peer rev\adddot}},
+ peerreview:cc = {{cascading peer review}{casc\adddotspace peer rev\adddot}},
+ peerreview:tp = {{third-party peer review}{3rd-party peer rev\adddot}},
+ peerreview:pp = {{post-publication peer review}{post-pub\adddotspace peer rev\adddot}},
+ peerreview:no = {{no peer review}{no peer rev\adddot}}
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx
new file mode 100644
index 00000000000..e49a00b8c8f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx
@@ -0,0 +1,55 @@
+% french-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{french-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist French localisation (JSP)]
+
+% Inherit general localization
+\InheritBibliographyExtras{french}
+
+% Localizations
+\DeclareBibliographyStrings{%
+ inherit = {french},
+ parttranslationof = {{traduction partielle de}{trad\adddotspace part\adddotspace de}},
+ with = {{avec}{avec}},
+ impactfactor = {{facteur d'impact}{FI}},
+ openaccess:true = {{libre acc\`es}{libre acc\`es}},
+ openaccess:gold = {{libre acc\`es (dorée)}{libre acc\`es (dorée)}},
+ openaccess:green = {{libre acc\`es (verte)}{libre acc\`es (verte)}},
+ peerreview:sb = {{\'{e}valuation par des pairs anonymis\'{e}s}{\'{e}val\adddotspace par des pairs anon\adddot}},
+ peerreview:db = {{\'{e}valuation par les pairs en double aveugle}{\'{e}val\adddotspace par les pairs en double aveugle}},
+ peerreview:op = {{\'{e}valuation par les pairs ouverte}{\'{e}val\adddotspace par les pairs ouverte}},
+ peerreview:co = {{\'{e}valuation par les pairs collaborative}{\'{e}val\adddotspace par les pairs collab\adddot}},
+ peerreview:cc = {{\'{e}valuation par les pairs en cascade}{\'{e}val\adddotspace par les pairs en cascade}},
+ peerreview:tp = {{\'{e}valuation par des pairs ext\'{e}rieurs}{\'{e}val\adddotspace par des pairs ext\adddot}},
+ peerreview:pp = {{\'{e}valuation par les pairs apr\`{e}s publication}{\'{e}val\adddotspace par les pairs apr\`{e}s pub\adddot}},
+ peerreview:no = {{pas d'\'{e}valuation par les pairs}{pas d'\'{e}val\adddotspace par les pairs}}
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx
new file mode 100644
index 00000000000..c7b4570f06b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx
@@ -0,0 +1,55 @@
+% german-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{german-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist German localisation (JSP)]
+
+% Inherit general localization
+\InheritBibliographyExtras{german}
+
+% Localizations
+\DeclareBibliographyStrings{%
+ inherit = {german},
+ parttranslationof = {{Teil\"ubersetzung von}{Teil\"ubers\adddotspace von}},
+ with = {{mit}{mit}},
+ impactfactor = {{Impactfaktor}{JIF}},
+ openaccess:true = {{OpenAccess}{OA}},
+ openaccess:gold = {{OpenAccess (gold)}{OA (gold)}},
+ openaccess:green = {{OpenAccess (gr\"un)}{OA (gr\"un)}},
+ peerreview:sb = {{Blindbegutachtung}{Blindbeg\adddot}},
+ peerreview:db = {{Doppelblindbegutachtung}{Doppelblindbeg\adddot}},
+ peerreview:op = {{Offene Begutachtung}{Offene Beg\adddot}},
+ peerreview:co = {{Kollaborative Begutachtung}{Kollab\adddotespace Beg\adddot}},
+ peerreview:cc = {{Cascading-Begutachtung}{Cascading-Beg\adddot}},
+ peerreview:tp = {{Begutachtung durch Dritte}{Beg\adddotspace durch Dritte}},
+ peerreview:pp = {{Post-Publication-Begutachtung}{Post-Pub\adddot-Beg\adddot}},
+ peerreview:no = {{keine Begutachtung}{keine Beg\adddot}}
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx
new file mode 100644
index 00000000000..85e0c9a92c7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx
@@ -0,0 +1,37 @@
+% naustrian-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{naustrian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist Austrian localisation (JSP)]
+
+% Inherit austrian
+\InheritBibliographyStrings{austrian}
+\InheritBibliographyExtras{austrian}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx
new file mode 100644
index 00000000000..4f9d872e9d8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx
@@ -0,0 +1,55 @@
+% newzealand-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{newzealand-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist NZ English localisation (JSP)]
+
+% Inherit general localization
+\InheritBibliographyExtras{newzealand}
+
+% Localizations
+\DeclareBibliographyStrings{%
+ inherit = {newzealand},
+ parttranslationof = {{partial translation of}{part\adddotspace trans\adddotspace of}},
+ with = {{with}{with}},
+ impactfactor = {{impact factor}{JIF}},
+ openaccess:true = {{OpenAccess}{OA}},
+ openaccess:gold = {{OpenAccess (gold)}{OA (gold)}},
+ openaccess:green = {{OpenAccess (green)}{OA (green)}},
+ peerreview:sb = {{single blind peer review}{single blind peer rev\adddot}},
+ peerreview:db = {{double blind peer review}{double blind peer rev\adddot}},
+ peerreview:op = {{open peer review}{open peer rev\adddot}},
+ peerreview:co = {{collaborative peer review}{collab\adddotspace peer rev\adddot}},
+ peerreview:cc = {{cascading peer review}{casc\adddotspace peer rev\adddot}},
+ peerreview:tp = {{third-party peer review}{3rd-party peer rev\adddot}},
+ peerreview:pp = {{post-publication peer review}{post-pub\adddotspace peer rev\adddot}},
+ peerreview:no = {{no peer review}{no peer rev\adddot}}
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx
new file mode 100644
index 00000000000..54f65ef3838
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx
@@ -0,0 +1,37 @@
+% ngerman-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{ngerman-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist German localisation (JSP)]
+
+% Inherit german
+\InheritBibliographyStrings{german}
+\InheritBibliographyExtras{german}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx
new file mode 100644
index 00000000000..be8a9d148ad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx
@@ -0,0 +1,37 @@
+% nswissgerman-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{nswissgerman-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist Swiss German localisation (JSP)]
+
+% Inherit swissgerman
+\InheritBibliographyStrings{swissgerman}
+\InheritBibliographyExtras{swissgerman}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx
new file mode 100644
index 00000000000..5d4be275abd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx
@@ -0,0 +1,55 @@
+% swissgerman-publist.lbx, extra localizations for biblatex-publist
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+% This work consists of the file publist.bbx
+%
+%
+% This file adds some additional localizations that are used by
+% the biblatex-publist bibliography style
+%
+% Please send suggestions and bug reports to
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
+
+\ProvidesFile{swissgerman-publist.lbx}[\bpl@rdate\space v.\bpl@version\space
+ biblatex-publist Swiss German localisation (JSP)]
+
+% Inherit general localization
+\InheritBibliographyExtras{swissgerman}
+
+% Localizations
+\DeclareBibliographyStrings{%
+ inherit = {swissgerman},
+ parttranslationof = {{Teil\"ubersetzung von}{Teil\"ubers\adddotspace von}},
+ with = {{mit}{mit}},
+ impactfactor = {{Impactfaktor}{JIF}},
+ openaccess:true = {{OpenAccess}{OA}},
+ openaccess:gold = {{OpenAccess (gold)}{OA (gold)}},
+ openaccess:green = {{OpenAccess (gr\"un)}{OA (gr\"un)}},
+ peerreview:sb = {{Blindbegutachtung}{Blindbeg\adddot}},
+ peerreview:db = {{Doppelblindbegutachtung}{Doppelblindbeg\adddot}},
+ peerreview:op = {{Offene Begutachtung}{Offene Beg\adddot}},
+ peerreview:co = {{Kollaborative Begutachtung}{Kollab\adddotespace Beg\adddot}},
+ peerreview:cc = {{Cascading-Begutachtung}{Cascading-Beg\adddot}},
+ peerreview:tp = {{Begutachtung durch Dritte}{Beg\adddotspace durch Dritte}},
+ peerreview:pp = {{Post-Publication-Begutachtung}{Post-Pub\adddot-Beg\adddot}},
+ peerreview:no = {{keine Begutachtung}{keine Beg\adddot}}
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx
index 074acd53943..371a06232b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx
@@ -25,8 +25,8 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\bpl@version{2.10}
-\def\bpl@rdate{2024/06/17}
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
\ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space
biblatex bibliography style (JSP)]
@@ -552,16 +552,31 @@
{}{\PackageWarning{biblatex-publist}{Patching refsection failed!}}
}{}
-\newcommand*\GetSectionCount[1][\empty]{%
- \edef\bpl@secno{#1}%
- \ifx\bpl@secno\empty%
- \csnumdef{bpltmprefsection}{\c@refsection}%
- \csuse{bpl@secitems:\bpltmprefsection}%
- \else%
- \csuse{bpl@secitems:#1}%
- \fi%
+% Section count. We use l3 here to split the argument and do calculations
+\ExplSyntaxOn
+
+\int_new:N \l_bpl_sec_cnt_int
+
+\NewDocumentCommand \GetSectionCount { >{\SplitList{,}} o }
+{
+ \IfNoValueTF{#1}{%
+ \csnumdef{bpltmprefsection}{\c@refsection}
+ \ifcsdef{bpl@secitems:\bpltmprefsection}{\csuse{bpl@secitems:\bpltmprefsection}}{}%
+ }{
+ \int_zero:N \l_bpl_sec_cnt_int
+ \ProcessList{#1}{\__bpl_add_section_count}
+ \int_use:N \l_bpl_sec_cnt_int
+ }
+}
+
+\cs_new:Npn \__bpl_add_section_count #1
+{
+ \cs_if_exist:cT {bpl@secitems:#1}
+ { \int_add:Nn \l_bpl_sec_cnt_int { \use:c{bpl@secitems:#1} } }
}
+\ExplSyntaxOff
+
\newcommand*\GetTotalCount{%
\csuse{bpl@items}%
}
@@ -897,7 +912,15 @@
\newrobustcmd{\mkbibdesc}[1]{%
% Print labelnumber as actual number, plus item total
- \number\numexpr\csuse{bpl@itemtotal}+#1+\csuse{bpl@shift@itemtotal}\relax%
+ \edef\bpl@current@item@no{\number\numexpr\csuse{bpl@itemtotal}+#1+\csuse{bpl@shift@itemtotal}\relax}%
+ \bpl@current@item@no%
+ % Store number in pbx file
+ \if@filesw%
+ \protected@write\bpl@bpxfile{}{%
+ \csedef{bpl@itemnumber:\thefield{entrykey}}{\bpl@current@item@no}%
+ \csedef{bpl@itemsec:\thefield{entrykey}}{\therefsection}%
+ }%
+ \fi%
}%
% Way to manually shift the numbering
@@ -1768,6 +1791,10 @@
%
% l7n
%
+
+\DeclareLanguageMappingSuffix{-publist}
+
+% publist-specific bibstrings
\NewBibliographyString{with}
\NewBibliographyString{parttranslationof}
\NewBibliographyString{impactfactor}
@@ -1782,54 +1809,6 @@
\NewBibliographyString{peerreview:tp}
\NewBibliographyString{peerreview:pp}
\NewBibliographyString{peerreview:no}
-\DefineBibliographyStrings{english}{%
- parttranslationof = {partial translation of},
- with = {with},
- impactfactor = {impact factor},
- openaccess:true = {OpenAccess},
- openaccess:gold = {OpenAccess (gold)},
- openaccess:green = {OpenAccess (green)},
- peerreview:sb = {single blind peer review},
- peerreview:db = {double blind peer review},
- peerreview:op = {open peer review},
- peerreview:co = {collaborative peer review},
- peerreview:cc = {cascading peer review},
- peerreview:tp = {third-party peer review},
- peerreview:pp = {post-publication peer review},
- peerreview:no = {no peer review}
-}
-\DefineBibliographyStrings{french}{%
- parttranslationof = {traduction partielle de},
- with = {avec},
- impactfactor = {facteur d'impact},
- openaccess:true = {libre acc\`es},
- openaccess:gold = {libre acc\`es (dorée)},
- openaccess:green = {libre acc\`es (verte)},
- peerreview:sb = {\'{e}valuation par des pairs anonymis\'{e}s},
- peerreview:db = {\'{e}valuation par les pairs en double aveugle},
- peerreview:op = {\'{e}valuation par les pairs ouverte},
- peerreview:co = {\'{e}valuation par les pairs collaborative},
- peerreview:cc = {\'{e}valuation par les pairs en cascade},
- peerreview:tp = {\'{e}valuation par des pairs ext\'{e}rieurs},
- peerreview:pp = {\'{e}valuation par les pairs apr\`{e}s publication},
- peerreview:no = {pas d'\'{e}valuation par les pairs}
-}
-\DefineBibliographyStrings{german}{%
- parttranslationof = {Teil\"ubersetzung von},
- with = {mit},
- impactfactor = {Impactfaktor},
- openaccess:true = {OpenAccess},
- openaccess:gold = {OpenAccess (gold)},
- openaccess:green = {OpenAccess (gr\"un)},
- peerreview:sb = {Blindbegutachtung},
- peerreview:db = {Doppelblindbegutachtung},
- peerreview:op = {Offene Begutachtung},
- peerreview:co = {Kollaborative Begutachtung},
- peerreview:cc = {Cascading-Begutachtung},
- peerreview:tp = {Begutachtung durch Dritte},
- peerreview:pp = {Post-Publication-Begutachtung},
- peerreview:no = {keine Begutachtung}
-}
%
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
index 78d144e32b5..8176810996a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
@@ -26,14 +26,50 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\bpl@version{2.10}
-\def\bpl@rdate{2024/06/17}
+\def\bpl@version{2.12}
+\def\bpl@rdate{2024/07/16}
\ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space
biblatex citation style (JSP)]
\RequireCitationStyle{numeric}
+\DeclareCiteCommand{\citesecitem}
+ {\defcounter{maxnames}{999}%
+ \boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{bpl:cite:secitem}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\citesecitem}
+ {\defcounter{maxnames}{999}%
+ \boolfalse{citetracker}%
+ \boolfalse{pagetracker}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{bpl:cite:secitem}%
+ \usebibmacro{bpl:cite:secitemsec}%
+ }
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
+\newbibmacro*{bpl:cite:secitem}{%
+ \ifcsdef{bpl@itemnumber:\thefield{entrykey}}%
+ {\mkbibbrackets{\csuse{bpl@itemnumber:\thefield{entrykey}}}}%
+ {\textbf{\mkbibbrackets{???}}}%
+}
+
+\newcommand*\secitemsecref[1]{%
+ \mkbibparens{\bibstring{section}\addnbspace\ref{refsection:#1}}%
+}
+
+\newbibmacro*{bpl:cite:secitemsec}{%
+ \ifcsdef{bpl@itemsec:\thefield{entrykey}}%
+ {\addspace\secitemsecref{\csuse{bpl@itemsec:\thefield{entrykey}}}}%
+ {}%
+}
+
\DeclareCiteCommand{\citeitem}
{\defcounter{maxnames}{999}%
\boolfalse{citetracker}%
@@ -55,6 +91,28 @@
\printtext[labelnumberwidth]{\mkrefdesc{\thefield{labelnumber}}}%
}
+\newcommand*\itemrangesep{\bibrangedash}
+
+\newcommand*\citeitemrange[2]{%
+ \citeitem{#1}\itemrangesep\citeitem{#2}%
+}
+
+\NewDocumentCommand\citesecitemrange{s m m}
+{%
+ \IfBooleanTF{#1}%
+ {\ifcsdef{bpl@itemsec:#2}%
+ {\ifcsdef{bpl@itemsec:#3}%
+ {\ifcsequal{bpl@itemsec:#2}{bpl@itemsec:#3}%
+ {\citesecitem{#2}\itemrangesep}%
+ {\citesecitem*{#2}\,\itemrangesep\,}%
+ \citesecitem*{#3}}%
+ {\citesecitem*{#2}\itemrangesep\citesecitem*{#3}}%
+ }%
+ {\citesecitem{#2}\itemrangesep\citesecitem*{#3}}%
+ }%
+ {\citesecitem{#2}\itemrangesep\citesecitem{#3}}%
+}
+
% Manual way to adjust numbering
\csdef{bpl@secstartshift}{0}
\newcommand*\shiftciteitem[1]{\csdef{bpl@secstartshift}{#1}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx
index 874cb3c8013..9e4b798f8c3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx
@@ -1,5 +1,5 @@
% publist.dbx, biblatex data model specification for the biblatex-publist
-% package, version 2.10 (2024/06/17).
+% package, version 2.12 (2024/07/16).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/chemformula-ru/chemformula-ru.sty b/Master/texmf-dist/tex/latex/chemformula-ru/chemformula-ru.sty
index f1df3002c11..32b6e23fa15 100644
--- a/Master/texmf-dist/tex/latex/chemformula-ru/chemformula-ru.sty
+++ b/Master/texmf-dist/tex/latex/chemformula-ru/chemformula-ru.sty
@@ -1,5 +1,5 @@
%% The chemformula-ru package eliminates an incompatibility
-%% between the chemformula package and Russian settings (russian.ldf) of the babel package.
+%% between the chemformula package and Russian settings (russian.ldf) for the babel package.
%%
%% Copyright (c) 2024 by Alexey Kuznetsov (mailtokuznetsov at gmail.com)
%%
@@ -12,21 +12,21 @@
%% version 2008/05/04 or later.
%%
-\ProvidesPackage{chemformula-ru}[2024-03-01 Using chemformula package with babel-russian]
+\ProvidesPackage{chemformula-ru}[2024-07-10 Using chemformula package with babel-russian]
\DeclareOption{cosh2ch}{\def\cosh@ch{\DeclareRobustCommand\cosh{\mathop{\operator@font ch}\nolimits}}}
\DeclareOption{ch2Ch}{\def\ch@Ch{\DeclareRobustCommand\Ch{\mathop{\operator@font ch}\nolimits}}}
+\DeclareOption*{\PassOptionsToPackage\CurrentOption{chemformula}}
\ProcessOptions\relax
+\RequirePackage{chemformula}
+
\BeforeBeginEnvironment{document}{
- \IfPackageLoadedTF{chemformula}{
- \IfPackageLoadedWithOptionsTF{babel}{russian}{
- \let\@Chem@Formula\ch \let\ch\undefined
- \AtBeginDocument{ \let\ch\@Chem@Formula
- \@ifundefined{cosh@ch}{\relax}{\cosh@ch}
- \@ifundefined{ch@Ch}{\relax}{\ch@Ch}
- }
- } { \relax }
- } { \relax }
-}
+ \let\@Chem@Formula\ch \let\ch\undefined
+ \AtBeginDocument{
+ \let\ch\@Chem@Formula
+ \@ifundefined{cosh@ch}{\relax}{\cosh@ch}
+ \@ifundefined{ch@Ch}{\relax}{\ch@Ch}
+ } }
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls b/Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls
index 7a2093a2d49..ec78eb3ab06 100644
--- a/Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls
+++ b/Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2023 Statistical Society of Canada | Société
+%% Copyright (C) 2023-2024 Statistical Society of Canada | Société
%% canadienne de statistique
%%
%% This file may be distributed and/or modified under the conditions
@@ -30,9 +30,9 @@
%% files cjs-rcs-article.cls, cjs-rcs-article-fr.tex, cjs-template.tex
%% and rcs-gabarit.tex.
%%
-\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+\NeedsTeXFormat{LaTeX2e}[2021/06/01]
\ProvidesClass{cjs-rcs-article}%
- [2023/11/29 v1.0 Article class for The Canadian Journal of
+[2024/07/14 v1.1 Article class for The Canadian Journal of
Statistics | La revue canadienne de statistique]
\newif\ifCJS@review \CJS@reviewfalse % review version?
\newif\ifCJS@supplement \CJS@supplementfalse % supplementary material?
@@ -40,6 +40,7 @@
\newif\ifCJS@final \CJS@finalfalse % final version?
\newif\ifCJS@titlingfooter \CJS@titlingfooterfalse % footer on title page?
\newif\ifCJS@journalinfo \CJS@journalinfotrue % display journal info?
+\newif\ifCJS@specialack \CJS@specialackfalse % special acknowledgement?
\newif\ifCJS@fancybreak \CJS@fancybreaktrue % display fancy break?
\newif\ifCJS@history \CJS@historyfalse % history present?
\newif\ifCJS@corrauth \CJS@corrauthfalse % corresponding author?
@@ -60,7 +61,6 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
\ProcessOptions\relax
\LoadClass[letterpaper,10pt,article,twoside]{memoir}
-\RequirePackage{iflang}
\RequirePackage[round,semicolon,authoryear,sectionbib]{natbib}
\RequirePackage{babel}
\RequirePackage[autolanguage]{numprint}
@@ -142,7 +142,7 @@
[
Extension = .otf,
Scale = 1,
- Ligatures = TeX
+ bold-style = TeX
]
\setmathfont{FiraMath-Regular}
[
@@ -193,12 +193,12 @@
No.~\CJS@issue, %
\CJS@year, %
\CJS@firstpage--\thelastpage}}}}
-\newcommand*\CJS@setheadfootfont{%
+\def\CJS@setheadfootfont{%
\firalining\fontsize{9}{13}\selectfont}
\newlength\CJS@headdivheight
\settoheight\CJS@headdivheight{\CJS@setheadfootfont 1}
\setlength\CJS@headdivheight{0.9\CJS@headdivheight}
-\newcommand*\CJS@headdivrule{%
+\def\CJS@headdivrule{%
\rule[0.05\CJS@headdivheight]{0.75\normalrulethickness}{\CJS@headdivheight}}
\newlength\CJS@pagenumwidth
\settowidth\CJS@pagenumwidth{9\qquad}
@@ -480,15 +480,38 @@
\iflanguage{french}{Futur emplacement de la déclaration de licence.}%
{Licence statement to appear here.}}
\begin{figure}[!b]
- \raisebox{0pt}[0pt][\footskip]{%
+ \raisebox{0pt}[0pt][\dimexpr\CJS@licenceht-\footskip\relax]{%
\vbox{%
\CJS@setlicencefont
\rule{\textwidth}{\normalrulethickness}
\parbox[t][\CJS@licenceht][t]{\textwidth}{%
+ \ifCJS@specialack\CJS@specialackstatement\fi
\ifCJS@final\CJS@licence \else\textit\CJS@notice \fi}}}
\end{figure}
\fi
}}
+\newcommand*\CJS@adnibyline{for the Alzheimer’s Disease Neuroimaging Initiative}
+\newcommand*\CJS@adnistatement{%
+ Data used in preparation of this article were obtained
+ from the \href{https://adni.loni.usc.edu}{Alzheimer’s Disease Neuroimaging Initiative}
+ (ADNI) database. As such, the investigators within the ADNI
+ contributed to the design and implementation of ADNI and/or provided
+ data but did not participate in the analysis or writing of this
+ report. A complete listing of ADNI investigators can be found at:
+ \url{https://adni.loni.usc.edu/wp-content/uploads/how_to_apply/ADNI_Acknowledgement_List.pdf}.}
+\newcommand*\CJS@admcbyline{for the Alzheimer’s Disease Metabolomics Consortium}
+\newcommand*\CJS@admcstatement{%
+ Data used in preparation of this article were generated by the
+ Alzheimer’s Disease Metabolomics Consortium (ADMC). As such, the
+ investigators within the ADMC provided data but did not participate
+ in analysis or writing of this report. A complete listing of ADMC
+ investigators can be found at:
+ \url{https://sites.duke.edu/adnimetab/team/}.}
+\newcommand*\ADNIacknowledgement{%
+ \specialack{\CJS@adnibyline}{\CJS@adnistatement}}
+\newcommand*\ADMCacknowledgement{%
+ \renewcommand*\CJS@specialackmark{\textsuperscript{\ensuremath{**}}}
+ \specialack{\CJS@admcbyline}{\CJS@admcstatement}}
\def\CJS@supplement{}
\def\CJS@supplementname@en{Supplementary material}
\def\CJS@supplementname@fr{Matériel additionnel}
@@ -535,10 +558,10 @@
\endgroup}
\fi
\fi}
-\newcommand*\CJS@setlicencefont{%
+\def\CJS@setlicencefont{%
\firalining\fontsize{8pt}{9pt}\selectfont}
\newlength\CJS@licenceht
-\newcommand\CJS@licencesample{%
+\def\CJS@licencesample{%
{\ccbyncnd*} 2023 The Authors. The Canadian Journal of
Statistics~{\textbar}~La revue canadienne de statistique published
by Wiley Periodicals LLC on behalf of Statistical Society of
@@ -552,38 +575,39 @@
\newcommand\CJS@measurelicence{%
\setbox\CJS@licencebox=\vbox{%
\CJS@setlicencefont
+ \ifCJS@specialack\CJS@specialackstatement\fi
\ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}
\setlength\CJS@licenceht{\dimexpr\ht\CJS@licencebox+\dp\CJS@licencebox}}
\def\CJS@licence{}
\newcommand\licence[1]{\renewcommand*\CJS@licence{#1}}
\let\license\licence
\newcommand*\ccby{\ccby@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccby@{\mbox{%
+\def\ccby@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em}}
\newcommand*\ccbysa{\ccbysa@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbysa@{\mbox{%
+\def\ccbysa@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsSa}}
\newcommand*\ccbync{\ccbync@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbync@{\mbox{%
+\def\ccbync@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNc}}
\newcommand*\ccbyncsa{\ccbyncsa@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbyncsa@{\mbox{%
+\def\ccbyncsa@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNc\kern0.1em%
\faCreativeCommonsSa}}
\newcommand*\ccbynd{\ccbynd@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbynd@{\mbox{%
+\def\ccbynd@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNd}}
\newcommand*\ccbyncnd{\ccbyncnd@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbyncnd@{\mbox{%
+\def\ccbyncnd@{\mbox{%
\faCreativeCommons\kern0.1em%
\faCreativeCommonsBy\kern0.1em%
\faCreativeCommonsNc\kern0.1em%
@@ -600,10 +624,12 @@
\let\prdist\mathcal
\fi
\iftutex
- \newcommand*\mat[1]{\symbf{#1}}
+ \let\mat\symbf
+ \let\matit\symbfit
\newcommand*\trsp{^{\mkern-1.5mu\symsfup{T}}}
\else
- \newcommand*\mat[1]{\mathbf{#1}}
+ \let\mat\mathbf
+ \let\matit\mathbfit
\newcommand*\trsp{^{\mkern-1.5mu\mathsf{T}}}
\fi
\DeclareMathOperator{\tr}{tr}
@@ -654,20 +680,23 @@
\newcommand*\Pylang{\proglang{Python}}
\newcommand*\Julialang{\proglang{Julia}}
\newcommand*\Clang{\proglang{C}}
-\newcommand*\CJS@plus{%
+\newcommand*\Cpplang{\proglang{C\CJS@plus\CJS@plus}}
+\def\CJS@plus{%
\ifx\f@family\sfdefault%
\protect\hspace{-.04em}\protect\raisebox{-.125ex}{\larger+}%
\else%
\protect\hspace{-.03em}\protect\raisebox{.25ex}{\smaller+}%
\fi}
-\newcommand*\Cpplang{\proglang{C\CJS@plus\CJS@plus}}
\let\pkg\textbf
\newcommand\code{\bgroup\@makeother\_\@makeother\~\@makeother\$\code@}
\def\code@#1{{\normalfont\ttfamily\hyphenchar\font=-1 #1}\egroup}
\renewcommand*\appendix{\par
\setcounter{section}{0}
\gdef\thesection{\@Alph\c@section}}
-\renewcommand{\@memb@bsec}{\section*{\bibname}\prebibhook}
+\renewcommand{\@memb@bsec}{%
+ \section*{\bibname}%
+ \addcontentsline{toc}{section}{\bibname}%
+ \prebibhook}
\setlocalecaption{english}{bib}{References}
\setlocalecaption{french}{bib}{Références}
\bibliographystyle{\iflanguage{french}{cjs-rcs-fr}{cjs-rcs-en}}
@@ -748,8 +777,18 @@
\hbox{\textcolor{CJSpink}{\copy\thr@@}\kern.75pt%
\textcolor{CJSred}{\copy\thr@@}\kern.75pt%
\textcolor{CJSyellow}{\copy\thr@@}\kern3pt}}
-\newcommand*\CJS@historybox{
+\def\CJS@historybox{
\par\addvspace{2\baselineskip}\noindent%
\smash{\box\CJS@historyornament \CJS@history}\par%
\vspace*{40pt}}
\AtEndDocument{\ifCJS@journalinfo\ifCJS@history\CJS@historybox\fi\fi}
+\def\CJS@specialackstatement{}
+\newcommand*\specialack[2]{%
+ \ifstrempty{#1}{}{%
+ \author{#1\CJS@specialackmark}}
+ \ifstrempty{#2}{}{%
+ \CJS@specialacktrue
+ \renewcommand*\CJS@specialackstatement{\CJS@specialackmark\,#2\medskip\newline}}}
+\def\CJS@specialackmark{\textsuperscript{\ensuremath{*}}}
+\newcommand*\specialackmark[1]{%
+ \renewcommand*\CJS@specialackmark{#1}}
diff --git a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
index 49b7ef6e9ed..092775d1da8 100644
--- a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
+++ b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
@@ -15,7 +15,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{colortbl}
- [2024/05/26 v1.0h Color table columns (DPC)]
+ [2024/07/06 v1.0i Color table columns (DPC)]
\edef\@tempa{%
\noexpand\AtEndOfPackage{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax}}
@@ -375,8 +375,12 @@
\next}
\lowercase{\def\HH@spacelet} {\futurelet\@tempb \HH@loop}
\fi}
+\ExplSyntaxOn
+\cs_if_exist:NF\tag_mc_begin:n{
+ \cs_new:Npn\tag_mc_begin:n#1{}
+ \cs_new:Npn\tag_mc_end:{}
+}
\AtBeginDocument{
- \ifx\longtable\@undefined\else
\def\LT@@hline{%
\ifx\LT@next\hline
\global\let\LT@next\@gobble
@@ -386,7 +390,10 @@
\else
\gdef\CT@LT@sep{%
\multispan\LT@cols{%
- \CT@drsc@\leaders\hrule\@height\doublerulesep\hfill}\cr}%
+ \tag_mc_begin:n{artifact}
+ \CT@drsc@\leaders\hrule\@height\doublerulesep\hfill
+ \tag_mc_end: \int_gdecr:N \g__tbl_row_int
+ }\cr}%
\fi
\else
\global\let\LT@next\empty
@@ -395,13 +402,20 @@
\fi
\ifnum0=`{\fi}%
\multispan\LT@cols
- {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr
+ {\tag_mc_begin:n{artifact}
+ \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill
+ \tag_mc_end: \int_gdecr:N \g__tbl_row_int
+ }\cr
\CT@LT@sep
\multispan\LT@cols
- {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr
+ {\tag_mc_begin:n{artifact}
+ \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill
+ \tag_mc_end: \int_gdecr:N \g__tbl_row_int
+ }\cr
\noalign{\penalty\@M}%
\LT@next}
- \fi}
+ }
+\ExplSyntaxOff
\endinput
%%
%% End of file `colortbl.sty'.
diff --git a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
index e63ea57f846..af81d0b88dd 100644
--- a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
+++ b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
@@ -3,9 +3,10 @@
% source pencil...: CC-BY-SA 4.0 https://tex.stackexchange.com/questions/504092/replicating-a-fancy-bordered-text-style-in-latex/504145#504145
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{customenvs}[2024/06/03 0.1.7 Custom classic environments]
+\ProvidesPackage{customenvs}[2024/07/13 0.1.8 Custom classic environments]
%====HISTORIQUE
+% v 0.1.8 Nutriscore
% v 0.1.7 Style perso pour les vignettes
% v 0.1.6 DisplaySkip patch + Patchs pas-tableur
% v 0.1.5 Boxes for exam title + circled numbers + Vignettes + Small simple boxes creation
@@ -1095,6 +1096,93 @@
title={\@ifpackageloaded{babel}{\NoAutoSpacing#2}{#2}\IfBooleanTF{#1}{}{$\cdot$\scalebox{0.6}[0.6]{\faCheckCircle[regular]\!\faCheckCircle[regular]}~}},left=1mm,right=1mm,boxsep=0mm]{#3}%
}
+%====Nutriscore
+\definecolor{couleurNS1}{RGB}{45,126,67}
+\definecolor{couleurNS2}{RGB}{151,186,56}
+\definecolor{couleurNS3}{RGB}{240,202,13}
+\definecolor{couleurNS4}{RGB}{213,123,26}
+\definecolor{couleurNS5}{RGB}{197,52,25}
+\tikzset{noeudNS/.style={pos=0.5,xscale=\echellexNS*\hauteurNS,yscale=\echelleyNS*\hauteurNS}}
+
+\defKV[NUTRISCORE]{%
+ Hauteur=\pgfmathsetmacro{\hauteurNS}{#1},%
+ Ratio=\pgfmathsetmacro{\ratiolargeurbandeNS}{#1},%
+ Symboles=\def\lettresNS{#1},%
+ Legende=\def\legendeNS{#1},%
+ Police=\def\fonteNS{#1},%
+ Couleurs=\def\couleursNS{#1},%
+ EchelleSymboles=\def\echellesymbNS{#1},%
+ CouleurFond=\def\coulbgNS{#1}
+}
+\setKVdefault[NUTRISCORE]{%
+ Hauteur=1,%
+ Ratio={0.6},%
+ Symboles={A,B,C,D,E},%
+ Legende={score},%
+ Police=\sffamily\bfseries,%
+ AffLegende=true,%
+ Couleurs={couleurNS1,couleurNS2,couleurNS3,couleurNS4,couleurNS5},%
+ EchelleSymboles={1.25,1.65},%
+ CouleurFond=white
+}
+
+\NewDocumentCommand\BandeauScore{ O{} D<>{} m }{%
+ \restoreKV[NUTRISCORE]%
+ \setKV[NUTRISCORE]{#1}%
+ \IfEq{#3}{}%
+ {%
+ \xdef\numcasNS{0}%
+ }%
+ {%
+ \xdef\numcasNS{#3}%
+ }%
+ \readlist\letterListNS{\lettresNS}%
+ \xdef\nbcasesNS{\letterListNSlen}%
+ \readlist\colorListNS{\couleursNS}%
+ \xdef\nbcouleursNS{\colorListNSlen}%
+ \pgfmathsetmacro{\largeurcaseNS}{\hauteurNS*\ratiolargeurbandeNS}%
+ \pgfmathsetmacro{\largeurbandeNS}{\largeurcaseNS*\nbcasesNS}%
+ \pgfmathsetmacro{\margeNS}{0.225*\largeurcaseNS/2.4}%
+ \IfSubStr{\echellesymbNS}{,}%
+ {%
+ \StrCut{\echellesymbNS}{,}{\echellexNS}{\echelleyNS}%
+ }%
+ {%
+ \xdef\echellexNS{\echellesymbNS}\xdef\echelleyNS{\echellesymbNS}%
+ }%
+ \begin{tikzpicture}[font=\fonteNS,#2]
+ %---test
+ \filldraw[white,rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,opacity=0] ({-\margeNS},{-\margeNS}) rectangle++ (\nbcasesNS*\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) ;
+ %---testfin
+ \begin{scope}
+ \clip[rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm] (0,0) rectangle (\largeurbandeNS,\hauteurNS);
+ \foreach \tmpiii in {1,...,\letterListNSlen}{%
+ \ifnum\tmpiii=\numcasNS
+ \else
+ \ifnum\tmpiii>\nbcouleursNS
+ \fill[draw=none,lightgray] ({(\tmpiii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\tmpiii]};
+ \else
+ \fill[draw=none,{\colorListNS[\tmpiii]}] ({(\tmpiii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\tmpiii]};
+ \fi
+ \fi
+ }%
+ \end{scope}
+ \xintifboolexpr{\numcasNS >=1 'and' \numcasNS <= \nbcasesNS }%
+ {%
+ \begin{scope}
+ %\clip (-\margeNS,-\margeNS) rectangle++ (\largeurbandeNS+2*\margeNS,\hauteurNS+2*\margeNS);
+ \draw[draw=\coulbgNS,rounded corners=\fpeval{7.25*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,fill={\colorListNS[#3]}] ({(\numcasNS-1)*\largeurcaseNS-\margeNS},{-\margeNS}) rectangle++ (\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) node[noeudNS,white]{\letterListNS[\numcasNS]};
+ \end{scope}
+ }%
+ {%
+ }%
+ %légende
+ \ifboolKV[NUTRISCORE]{AffLegende}%
+ {%
+ \node[above right=1pt,gray,scale=\fpeval{0.5*\hauteurNS},inner sep=1pt] at ({0.125*\margeNS},1.02*\hauteurNS) {\vphantom{QÉ}\MakeUppercase{\legendeNS}};
+ }{}%
+ \end{tikzpicture}%
+}
%%----COMMANDES EN
@@ -1932,4 +2020,91 @@
\fi
+%====BannerScore
+\definecolor{colorNS1}{RGB}{45,126,67}
+\definecolor{colorNS2}{RGB}{151,186,56}
+\definecolor{colorNS3}{RGB}{240,202,13}
+\definecolor{colorNS4}{RGB}{213,123,26}
+\definecolor{colorNS5}{RGB}{197,52,25}
+\tikzset{nodeNS/.style={pos=0.5,xscale=\echellexNS*\hauteurNS,yscale=\echelleyNS*\hauteurNS}}
+
+\defKV[NUTRISCOREEN]{%
+ Height=\pgfmathsetmacro{\hauteurNS}{#1},%
+ Ratio=\pgfmathsetmacro{\ratiolargeurbandeNS}{#1},%
+ Symbols=\def\lettresNS{#1},%
+ Legend=\def\legendeNS{#1},%
+ Font=\def\fonteNS{#1},%
+ Colors=\def\couleursNS{#1},%
+ ScaleSymbols=\def\echellesymbNS{#1},%
+ Colbg=\def\coulbgNS{#1}
+}
+\setKVdefault[NUTRISCOREEN]{%
+ Height=1,%
+ Ratio={0.6},%
+ Symbols={A,B,C,D,E},%
+ Legend={score},%
+ Font=\sffamily\bfseries,%
+ ShowLegend=true,%
+ Colors={colorNS1,colorNS2,colorNS3,colorNS4,colorNS5},%
+ ScaleSymbols={1.25,1.65},%
+ Colbg=white
+}
+
+\NewDocumentCommand\ScoreBanner{ O{} D<>{} m }{%
+ \restoreKV[NUTRISCOREEN]%
+ \setKV[NUTRISCOREEN]{#1}%
+ \IfEq{#3}{}%
+ {%
+ \xdef\numcasNS{0}%
+ }%
+ {%
+ \xdef\numcasNS{#3}%
+ }%
+ \readlist\letterListNS{\lettresNS}%
+ \xdef\nbcasesNS{\letterListNSlen}%
+ \readlist\colorListNS{\couleursNS}%
+ \xdef\nbcouleursNS{\colorListNSlen}%
+ \pgfmathsetmacro{\largeurcaseNS}{\hauteurNS*\ratiolargeurbandeNS}%
+ \pgfmathsetmacro{\largeurbandeNS}{\largeurcaseNS*\nbcasesNS}%
+ \pgfmathsetmacro{\margeNS}{0.225*\largeurcaseNS/2.4}%
+ \IfSubStr{\echellesymbNS}{,}%
+ {%
+ \StrCut{\echellesymbNS}{,}{\echellexNS}{\echelleyNS}%
+ }%
+ {%
+ \xdef\echellexNS{\echellesymbNS}\xdef\echelleyNS{\echellesymbNS}%
+ }%
+ \begin{tikzpicture}[font=\fonteNS,#2]
+ %---test
+ \filldraw[white,rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,opacity=0] ({-\margeNS},{-\margeNS}) rectangle++ (\nbcasesNS*\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) ;
+ %---testfin
+ \begin{scope}
+ \clip[rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm] (0,0) rectangle (\largeurbandeNS,\hauteurNS);
+ \foreach \iii in {1,...,\letterListNSlen}{%
+ \ifnum\iii=\numcasNS
+ \else
+ \ifnum\iii>\nbcouleursNS
+ \fill[draw=none,lightgray] ({(\iii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\iii]};
+ \else
+ \fill[draw=none,{\colorListNS[\iii]}] ({(\iii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\iii]};
+ \fi
+ \fi
+ }%
+ \end{scope}
+ \xintifboolexpr{\numcasNS >=1 'and' \numcasNS <= \nbcasesNS }%
+ {%
+ \begin{scope}
+ %\clip (-\margeNS,-\margeNS) rectangle++ (\largeurbandeNS+2*\margeNS,\hauteurNS+2*\margeNS);
+ \draw[draw=\coulbgNS,rounded corners=\fpeval{7.25*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,fill={\colorListNS[#3]}] ({(\numcasNS-1)*\largeurcaseNS-\margeNS},{-\margeNS}) rectangle++ (\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) node[noeudNS,white]{\letterListNS[#3]};
+ \end{scope}
+ }%
+ {}%
+ %légende
+ \ifboolKV[NUTRISCOREEN]{ShowLegend}%
+ {%
+ \node[above right=1pt,gray,scale=\fpeval{0.5*\hauteurNS},inner sep=1pt] at ({0.125*\margeNS},1.02*\hauteurNS) {\MakeUppercase{\legendeNS}};
+ }{}%
+ \end{tikzpicture}%
+}
+
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty b/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty
index 915d61a0d1e..6a85d60ddaa 100644
--- a/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty
+++ b/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty
@@ -9,7 +9,7 @@
% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2012/02/12]
\RequirePackage{xparse}
-\ProvidesExplPackage{dashrulex}{2024/03/25}{1.00c}
+\ProvidesExplPackage{dashrulex}{2024/07/16}{1.01}
{Draw dashed rules}
\DeclareDocumentCommand{\hdashrule}{O{0pt}O{x}mmm}
{
@@ -72,7 +72,7 @@
\int_if_even:nTF { \l__drx_vrule_counter_int }
{ \drx@step@counter@height{##1} }
{
- \kern -#4
+ \tex_kern:D -#4
\exp_args:NV
\raisebox\l__drx_vrule_height_dim{\rule{#4}{##1}}
\drx@step@counter@height{##1}
diff --git a/Master/texmf-dist/tex/latex/delimset/delimset.sty b/Master/texmf-dist/tex/latex/delimset/delimset.sty
index 3646c0d17bc..28ba8ba53e3 100644
--- a/Master/texmf-dist/tex/latex/delimset/delimset.sty
+++ b/Master/texmf-dist/tex/latex/delimset/delimset.sty
@@ -6,7 +6,7 @@
%%
%% delimset.dtx (with options: `package')
%%
-%% Copyright (C) 2016-2018 Niklas Beisert
+%% Copyright (C) 2016-2024 Niklas Beisert
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesPackage{delimset}[2018/12/30 v1.1 convenient size control for delimiter sets]
+\ProvidesPackage{delimset}[2024/07/17 v2.0 convenient size control for delimiter sets]
\RequirePackage{amsmath}
\RequirePackage{keyval}
@@ -47,106 +47,220 @@
{\bBigg@choice{\scriptscriptstyle}{0.5}{#1}{#2}}}}
\fi
-\newcommand{\bigp}{\mathpunct\big}
-\newcommand{\Bigp}{\mathpunct\Big}
-\newcommand{\biggp}{\mathpunct\bigg}
-\newcommand{\Biggp}{\mathpunct\Bigg}
-\newcommand{\bigb}{\mathbin\big}
-\newcommand{\Bigb}{\mathbin\Big}
-\newcommand{\biggb}{\mathbin\bigg}
-\newcommand{\Biggb}{\mathbin\Bigg}
+\providecommand{\bigp}{\mathpunct\big}
+\providecommand{\Bigp}{\mathpunct\Big}
+\providecommand{\biggp}{\mathpunct\bigg}
+\providecommand{\Biggp}{\mathpunct\Bigg}
+\providecommand{\bigb}{\mathbin\big}
+\providecommand{\Bigb}{\mathbin\Big}
+\providecommand{\biggb}{\mathbin\bigg}
+\providecommand{\Biggb}{\mathbin\Bigg}
+\providecommand{\bigi}{\mathinner\big}
+\providecommand{\Bigi}{\mathinner\Big}
+\providecommand{\biggi}{\mathinner\bigg}
+\providecommand{\Biggi}{\mathinner\Bigg}
+\newlength\delimsize
+\newcommand{\dlm@setvar}{\let\dlm@ifvar\@firstoftwo\delimsize1.5\big@size}
+\newcommand{\dlm@setsize}[1]{\let\dlm@ifvar\@secondoftwo%
+ \delimsize#1\big@size\advance\delimsize by\big@size\delimsize0.5\delimsize}
+\newcommand{\dlm@setabssize}[1]{\let\dlm@ifvar\@secondoftwo\delimsize#1\relax}
+\newcommand{\dlm@big@}[1]{{\mathchoice%
+ {\dlm@big@choice{\displaystyle}{1}{#1}}%
+ {\dlm@big@choice{\textstyle}{1}{#1}}%
+ {\dlm@big@choice{\scriptstyle}{0.7}{#1}}%
+ {\dlm@big@choice{\scriptscriptstyle}{0.5}{#1}}}}
+\newcommand{\dlm@big@choice}[3]{\@mathmeasure\z@{\nulldelimiterspace\z@}%
+ {#1\left#3\vcenter to#2\delimsize{}\right.}\box\z@}
+\newcommand{\kerndelim}[1]{{\delimsize#1\delimsize%
+ \mkern\muexpr1.2mu*\delimsize/\big@size\relax}}
+
+\newcommand{\dlm@big}[2]{\dlm@plain{#1}{\dlm@big@#2}}
+\newcommand{\dlm@plain}[2]{\dlm@class{#1}{\dlm@phantom{#2}}}
\newcommand{\dlm@class}[1]{\csname dlm@class@#1\endcsname}
-\newcommand{\dlm@class@}{}
-\newcommand{\dlm@class@l}{\mathopen}
-\newcommand{\dlm@class@r}{\mathclose}
-\newcommand{\dlm@class@o}{\mathopen}
-\newcommand{\dlm@class@c}{\mathclose}
-\newcommand{\dlm@class@m}{\mathrel}
-\newcommand{\dlm@class@p}{\mathpunct}
-\newcommand{\dlm@class@b}{\mathbin}
-\newcommand{\dlm@norm}[1]{\dlm@class{#1}\bBigg@{0.0}}
-\newcommand{\dlm@big}[1]{\dlm@class{#1}\big}
-\newcommand{\dlm@Big}[1]{\dlm@class{#1}\Big}
-\newcommand{\dlm@bigg}[1]{\dlm@class{#1}\bigg}
-\newcommand{\dlm@Bigg}[1]{\dlm@class{#1}\Bigg}
+\let\dlm@class@\@firstofone
+\let\dlm@class@o\mathord
+\let\dlm@class@c\mathord
+\let\dlm@class@p\mathpunct
+\let\dlm@class@i\mathinner
+\let\dlm@class@b\mathbin
+\let\dlm@class@m\mathrel
+
+\newcommand{\dlm@var@null}[1]{\if.#1\kern-\nulldelimiterspace\fi}
+\newcommand{\dlm@var@kern}[1]{\nonscript\mkern#1}
\newcommand{\dlm@var}[1]{\csname dlm@var@#1\endcsname}
-\newcommand{\dlm@var@}[1]{\middle#1}
-\newcommand{\dlm@var@l}[1]{\mathopen{}\mathclose\bgroup\left#1}
-\newcommand{\dlm@var@r}[1]{\right#1\egroup}
-\newcommand{\dlm@var@o}[1]{\mathopen{}\middle#1\mathopen{}}
-\newcommand{\dlm@var@c}[1]{\mathclose{}\middle#1\mathclose{}}
-\newcommand{\dlm@var@m}[1]{\mathrel{}\middle#1\mathrel{}}
-\newcommand{\dlm@var@p}[1]{\middle#1\mathpunct{}}
-\newcommand{\dlm@var@b}[1]{\mathbin{}{}\mkern-\medmuskip%
- \middle#1\mkern-\medmuskip{}\mathbin{}}
-
-\newcommand{\dlm@parsesize}[1]{\@ifnextchar\bgroup%
- {\dlm@parsesize@{#1}{0}}{\dlm@parsesize@{#1}}}
-\newcommand{\dlm@parsesize@}[2]{\let\dlm@arg\dlm@norm%
- \if0#2\let\dlm@arg\dlm@norm\fi%
- \if1#2\let\dlm@arg\dlm@big\fi%
- \if+#2\let\dlm@arg\dlm@big\fi%
- \if!#2\let\dlm@arg\dlm@big\fi%
- \if2#2\let\dlm@arg\dlm@Big\fi%
- \if3#2\let\dlm@arg\dlm@bigg\fi%
- \if4#2\let\dlm@arg\dlm@Bigg\fi%
- \if*#2\let\dlm@arg\dlm@var\fi%
- #1}
-
-\newcommand{\selectdelim}[2][]{\if.#1#2\else\dlm@arg{#1}#2\fi}
+\newcommand{\dlm@var@}[1]{\dlm@var@null#1\middle#1}
+\let\dlm@var@o\dlm@var@
+\let\dlm@var@c\dlm@var@
+\newcommand{\dlm@var@p}[1]{\dlm@var@#1\dlm@var@kern\thinmuskip}
+\newcommand{\dlm@var@i}[1]{\dlm@var@kern\thinmuskip%
+ \dlm@var@#1\dlm@var@kern\thinmuskip}
+\newcommand{\dlm@var@b}[1]{\dlm@var@kern\medmuskip%
+ \dlm@var@#1\dlm@var@kern\medmuskip}
+\newcommand{\dlm@var@m}[1]{\dlm@var@kern\thickmuskip%
+ \dlm@var@#1\dlm@var@kern\thickmuskip}
+
+\newcommand{\dlm@open@i}{\mathinner{}\mathclose{}\mathopen}
+\newcommand{\dlm@close@i}{\mathclose{}\mathopen{}\mathinner}
+\newcommand{\dlm@inner@oc}{\mathopen{}\mathclose}
+\newcommand{\dlm@enclose@openclose}{%
+ \let\dlm@open\mathopen\let\dlm@close\mathclose\let\dlm@inner\dlm@inner@oc}
+\newcommand{\dlm@enclose@inner}{%
+ \let\dlm@open\dlm@open@i\let\dlm@close\dlm@close@i\let\dlm@inner\mathinner}
+
+\newcommand{\dlm@inline@l}[1]{\dlm@open{#1}}
+\newcommand{\dlm@inline@r}[1]{\dlm@close{#1}}
+\newcommand{\dlm@block@l}[1]{\dlm@inner\bgroup\mathopen{#1}}
+\newcommand{\dlm@block@r}[1]{\mathclose{#1}\egroup}
+\newcommand{\dlm@enclose@inline}{%
+ \let\dlm@class@l\dlm@inline@l\let\dlm@class@r\dlm@inline@r}
+\newcommand{\dlm@enclose@block}{%
+ \let\dlm@class@l\dlm@block@l\let\dlm@class@r\dlm@block@r}
+
+\newcommand{\dlm@plain@l}[1]{\dlm@class@l{\dlm@phantom{#1}}}
+\newcommand{\dlm@plain@r}[1]{\dlm@class@r{\dlm@phantom{#1}}}
+\newcommand{\dlm@big@l}[1]{\dlm@plain@l{\dlm@big@#1}}
+\newcommand{\dlm@big@r}[1]{\dlm@plain@r{\dlm@big@#1}}
+\newcommand{\dlm@var@l}[1]{\dlm@inner\bgroup\dlm@var@null#1\left#1}
+\newcommand{\dlm@var@r}[1]{\right#1\dlm@var@null#1\egroup}
+\newcommand{\dlm@var@pl}[1]{\dlm@var@l.\mathopen{#1}}
+\newcommand{\dlm@var@pr}[1]{\mathclose{#1}\dlm@var@r.}
+
+\newcommand{\dlm@reg@save@init}[1]{%
+ \xdef#1{\delimsize\the\delimsize}\ifx\dlm@inner\mathinner%
+ \expandafter\gdef\expandafter#1\expandafter{#1\dlm@enclose@inner}\fi}
+\newcommand{\dlm@reg@save}[2]{%
+ \expandafter\dlm@reg@save@init\csname dlm@reg@init@#1\endcsname%
+ \expandafter\gdef\csname dlm@reg@sel@#1\endcsname{#2}}
+\newcommand{\dlm@reg@init}[1]{\csname dlm@reg@init@#1\endcsname}
+\newcommand{\dlm@reg@sel}[1]{\csname dlm@reg@sel@#1\endcsname}
+
+\newcommand{\parsedelimflags}{\dlm@setsize{0.6}\let\dlm@phantom\@firstofone%
+ \dlm@enclose@openclose\dlm@enclose@inline\dlm@parseflags}
+\newcommand{\dlm@parseflags}[2]{%
+ \@ifnextchar\bgroup{#1}{\dlm@parseflag{#1}{#2}}}
+\newcommand{\dlm@parseflag}[3]{\begingroup%
+ \ifcsname dlm@parseflag@\string#3\endcsname%
+ \def\dlm@do{\csname dlm@parseflag@\string#3\endcsname{#1}{#2}}\else%
+ \def\dlm@do{\PackageError{delimset}%
+ {unknown delimiter set flag `\string#3'}{}#1}%
+ \fi\expandafter\endgroup\dlm@do}
+\newcommand{\dlm@parsedef}[3]{%
+ \expandafter\def\csname dlm@parseflag@\string#1\endcsname ##1##2#2{#3}}
+
+\dlm@parsedef{!}{}{\dlm@setsize{1}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{+}{}{\dlm@setsize{1}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{0}{}{\dlm@setsize{0.6}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{1}{}{\dlm@setsize{1}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{2}{}{\dlm@setsize{2}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{3}{}{\dlm@setsize{3}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{4}{}{\dlm@setsize{4}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{^}{#3}{\dlm@setsize{#3}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{_}{#3}{\dlm@setabssize{#3}\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{*}{}{\dlm@setvar\dlm@parseflags{#1}{#2}}
+
+\dlm@parsedef{(}{}{\def\selecteddelim{0}#2}
+\dlm@parsedef{|}{}{\def\selecteddelim{1}#2}
+\dlm@parsedef{,}{}{\def\selecteddelim{1}#2}
+\dlm@parsedef{)}{}{\def\selecteddelim{9}#2}
+\dlm@parsedef{?}{#3}{\def\selecteddelim{#3}#2}
+
+\dlm@parsedef{[}{}{\dlm@reg@save{.}{#2}\def\selecteddelim{0}#2}
+\dlm@parsedef{]}{}{\dlm@reg@init{.}\def\selecteddelim{9}\dlm@reg@sel{.}}
+\dlm@parsedef{>}{#3}{\dlm@reg@save{#3}{#2}}
+\dlm@parsedef{<}{#3}{\dlm@reg@init{#3}\dlm@parseflags%
+ {\PackageError{delimset}{must select delimiter}{}}{\dlm@reg@sel{#3}}}
+
+\dlm@parsedef{.}{}{#1}
+\dlm@parsedef{:}{}{\dlm@enclose@block\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{'}{}{\dlm@enclose@openclose\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{"}{}{\dlm@enclose@inner\dlm@parseflags{#1}{#2}}
+\dlm@parsedef{-}{}{\let\dlm@phantom\phantom\dlm@parseflags{#1}{#2}}
+
+\newcommand{\selectdelim}[1][]{\begingroup\def\dlm@do{\@ifstar{\dlm@plain{#1}}%
+ {\dlm@ifvar{\dlm@var{#1}}{\dlm@big{#1}}}}%
+ \if.#1\let\dlm@do\@empty\fi\expandafter\endgroup\dlm@do}
+\newcommand{\selectdeliml}{\@ifstar%
+ {\dlm@ifvar\dlm@var@pl\dlm@plain@l}{\dlm@ifvar\dlm@var@l\dlm@big@l}}
+\newcommand{\selectdelimr}{\@ifstar%
+ {\dlm@ifvar\dlm@var@pr\dlm@plain@r}{\dlm@ifvar\dlm@var@r\dlm@big@r}}
\newcommand{\DeclareMathDelimiterSet}[1]{\expandafter\dlm@declare%
\csname dlm@dcl@\expandafter\@gobble\string#1\endcsname{#1}}
-\def\dlm@declare#1#2{\newcommand{#2}{\dlm@parsesize{#1}}\newcommand{#1}}
+\def\dlm@declare#1#2{\expandafter\dlm@declare@%
+ \csname dlm@sel@\expandafter\@gobble\string#2\endcsname{#1}{#2}}
+\def\dlm@declare@#1#2#3{\newcommand{#3}{\parsedelimflags{#2}{#1}}%
+ \providecommand{#1}{}\newcommand{#2}}
+\newcommand{\DeclareMathDelimiterSel}[3]{\expandafter\def%
+ \csname dlm@sel@\expandafter\@gobble\string#1\endcsname%
+ {\ifcase\selecteddelim#2\else#3\fi}}
+
+\newcommand{\delim}[2]{%
+ \parsedelimflags{\dlm@dcl@delim{#1}{#2}}{\dlm@sel@delim{#1}{#2}}}
+\newcommand{\dlm@dcl@delim}[3]{%
+ \selectdeliml#1{#3}\selectdelimr#2}
+\newcommand{\dlm@sel@delim}[2]{\ifcase\selecteddelim\selectdeliml#1%
+ \else\selectdelimr#2\fi}
-\newcommand{\delim}[2]
- {\dlm@parsesize{\dlm@dcl@delim{#1}{#2}}}
-\newcommand{\dlm@dcl@delim}[3]
- {\selectdelim[l]#1{#3}\selectdelim[r]#2}
+\newcommand{\delimpair}[3]{%
+ \parsedelimflags{\dlm@dcl@delimpair{#1}{#2}{#3}}%
+ {\dlm@sel@delimpair{#1}{#2}{#3}}}
+\newcommand{\dlm@dcl@delimpair}[5]{%
+ \selectdeliml#1{#4}\selectdelim#2{#5}\selectdelimr#3}
+\newcommand{\dlm@sel@delimpair}[3]{\ifcase\selecteddelim\selectdeliml#1%
+ \or\selectdelim#2\else\selectdelimr#3\fi}
-\newcommand{\delimpair}[3]
- {\dlm@parsesize{\dlm@dcl@delimpair{#1}{#2}{#3}}}
-\newcommand{\dlm@dcl@delimpair}[5]
- {\selectdelim[l]#1{#4}\selectdelim#2{#5}\selectdelim[r]#3}
+\newcommand{\delimtriple}[4]{%
+ \parsedelimflags{\dlm@dcl@delimtriple{#1}{#2}{#3}{#4}}%
+ {\dlm@sel@delimtriple{#1}{#2}{#3}{#4}}}
+\newcommand{\dlm@dcl@delimtriple}[7]{%
+ \selectdeliml#1{#5}\selectdelim#2{#6}\selectdelim#3{#7}\selectdelimr#4}
+\newcommand{\dlm@sel@delimtriple}[4]{\ifcase\selecteddelim\selectdeliml#1%
+ \or\selectdelim#2\or\selectdelim#3\else\selectdelimr#4\fi}
-\newcommand{\delimtriple}[4]
- {\dlm@parsesize{\dlm@dcl@delimtriple{#1}{#2}{#3}{#4}}}
-\newcommand{\dlm@dcl@delimtriple}[7]
- {\selectdelim[l]#1{#5}\selectdelim#2{#6}\selectdelim#3{#7}\selectdelim[r]#4}
+\newcommand{\usedelim}{\@ifnextchar]{\parsedelimflags{}{}}{\parsedelimflags%
+ {\PackageError{delimset}{must select delimiter}{}}{}<}}
\ifdlm@std
\providecommand{\brk}[1][r]{\begingroup\def\dlm@use{\delim()}%
- \if r#1 \def\dlm@use{\delim()}\fi%
- \if s#1 \def\dlm@use{\delim[]}\fi%
- \if c#1 \def\dlm@use{\delim\{\}}\fi%
- \if a#1 \def\dlm@use{\delim<>}\fi%
+ \if r#1\def\dlm@use{\delim()}\fi%
+ \if s#1\def\dlm@use{\delim[]}\fi%
+ \if c#1\def\dlm@use{\delim\{\}}\fi%
+ \if a#1\def\dlm@use{\delim<>}\fi%
\expandafter\endgroup\dlm@use}
\providecommand{\eval}[1][v]{\begingroup\def\dlm@use{\delim.\rvert}%
- \if v#1 \def\dlm@use{\delim.\rvert}\fi%
- \if s#1 \def\dlm@use{\delim[]}\fi%
+ \if v#1\def\dlm@use{\delim.\rvert}\fi%
+ \if s#1\def\dlm@use{\delim[]}\fi%
\expandafter\endgroup\dlm@use}
\providecommand{\abs}{\delim\lvert\rvert}
\providecommand{\norm}{\delim\lVert\rVert}
\fi
\ifdlm@ext
-\providecommand{\pair}{\delimpair({[.],})}
+\providecommand{\pair}{\delimpair({[p]*,})}
\providecommand{\set}{\delim\{\}}
\providecommand{\setcond}{\delimpair\{|\}}
-\providecommand{\intv}[1][c]{\begingroup\def\dlm@use{\delimpair[{[.],}]}%
- \if c#1 \def\dlm@use{\delimpair[{[.],}]}\fi%
- \if l#1 \def\dlm@use{\delimpair]{[.],}]}\fi%
- \if r#1 \def\dlm@use{\delimpair[{[.],}[}\fi%
- \if o#1 \def\dlm@use{\delimpair]{[.],}[}\fi%
+\providecommand{\intv}[1][c]{\begingroup%
+ \def\dlm@use{\delimpair[{[p]*,}]}%
+ \if c#1\def\dlm@use{\delimpair[{[p]*,}]}\fi%
+ \if l#1\def\dlm@use{\delimpair]{[p]*,}]}\fi%
+ \if r#1\def\dlm@use{\delimpair[{[p]*,}[}\fi%
+ \if o#1\def\dlm@use{\delimpair]{[p]*,}[}\fi%
\expandafter\endgroup\dlm@use}
\providecommand{\avg}{\delim<>}
\providecommand{\corr}{\delim<>}
-\providecommand{\comm}{\delimpair[{[.],}]}
-\providecommand{\acomm}{\delimpair\{{[.],}\}}
+\providecommand{\comm}{\delimpair[{[p]*,}]}
+\providecommand{\acomm}{\delimpair\{{[p]*,}\}}
\providecommand{\bra}{\delim<|}
\providecommand{\ket}{\delim|>}
\providecommand{\braket}{\delimpair<|>}
+\providecommand{\lfrac}[1][]{\begingroup%
+ \def\dlm@use{\delimpair./.}%
+ \if r#1\def\dlm@use{\delimpair(/)}\fi%
+ \if s#1\def\dlm@use{\delimpair[/]}\fi%
+ \if c#1\def\dlm@use{\delimpair\{/\}}\fi%
+ \if a#1\def\dlm@use{\delimpair</>}\fi%
+ \expandafter\endgroup\dlm@use}
\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
index dbae3ce9b8c..3387c280797 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-2023
+%% Copyright (C) 2015-2024
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2024/02/12 v1.8 Urls (qrcode) for DTK (HO,hv,rn)]
+\ProvidesPackage{dtk-url}[2024/06/26 v1.9 Urls (qrcode) for DTK (HO,hv,rn)]
\RequirePackage{url}[2006/04/12]
\RequirePackage{xcolor}
@@ -40,6 +40,8 @@
\let\URL\url
\let\CTANurl\ctanurl
+\DeclareUrlCommand\File{\urlstyle{tt}}
+
\DeclareUrlCommand\DTK@Url{%
\DTK@UrlSetup
\def\UrlLeft{}%
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index cc314c4a1ad..15507b11044 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -23,8 +23,8 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\def\DTKversion{2.10e}
-\def\DTKversiondate{2024/02/22}
+\def\DTKversion{2.10f}
+\def\DTKversiondate{2024/06/27}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
\RequirePackage{iftex}
diff --git a/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty b/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
index e45f21ee182..7a92e22048e 100644
--- a/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
+++ b/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
@@ -1,6 +1,6 @@
% The Dynkin Diagrams package.
%
-% Version 3.141 592 653 589 793 238 4
+% Version 3.141 592 653 589 793 238 46
%
% This package draws Dynkin diagrams in LaTeX
% documents, using the TikZ package.
@@ -13,7 +13,7 @@
% Released under the LaTeX Project Public License v1.3c or later, see
% http://www.latex-project.org/lppl.txt
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{dynkin-diagrams}[2023/06/02 Dynkin diagrams]
+\ProvidesPackage{dynkin-diagrams}[2024/07/05 Dynkin diagrams]
\RequirePackage{tikz}
\RequirePackage{xstring}
\RequirePackage{etoolbox}
@@ -1873,6 +1873,7 @@
}%
+
%% \dynkinQuadrupleEdge{<p>}{<q>}
%% \dynkinQuadrupleEdge*{<p>}{<q>}
%% Draws an oriented edge of valence 4 from root <p> to root <q> on the current Dynkin diagram.
@@ -2041,6 +2042,8 @@
% Is the right side of the Dynkin diagram folded?
\newif\ifdynkin@Coxeter
% Should we draw Coxeter diagrams?
+\newif\ifdynkin@Coxeter@above
+% Should we draw Coxeter diagram extra labels above or below?
\newif\ifdynkin@Kac@arrows
% Should we draw arrows following Kac?
\newif\ifdynkin@odd
@@ -2097,6 +2100,8 @@
},
Coxeter/.is if = dynkin@Coxeter,
Coxeter=false,
+ Coxeter above/.is if = dynkin@Coxeter@above,
+ Coxeter above=true,
double edges/.style = {
fold style/.style = {
draw=black,
@@ -2598,6 +2603,10 @@
{%
\global\dynkin@rank=\dynkin@string\relax%
\global\dynkin@nodes=\dynkin@string\relax%
+ \ifWitt@symbol%
+ \global\advance\dynkin@rank by -1\relax%
+ \global\advance\dynkin@nodes by -1\relax%
+ \fi
\ifdynkin@is@twisted%
\IfStrEqCase{\dynkin@series}%
{%
@@ -2800,7 +2809,6 @@
% Turn Satake codes into Dynkin diagram expressions in \dynkin@string.
\dynkin@grok@Satake@codes%
}%
-
% Expand out any digits in \dynkin@string into multiples of the various root marks.
\expand@Dynkin@Roots@Digits%
% Assign to \dynkin@roots the input string \dynkin@string with all . symbols removed,
@@ -2881,20 +2889,41 @@
\global\dynkin@rank@minus@three\the\dynkin@rank@minus@two\relax%
\global\advance\dynkin@rank@minus@three by -1\relax%
}%
+
+\newif\ifWitt@symbol
\newcount\dynkin@lenny%
%% \dynkin@grok@series
%% Interprets the dynkin@series, to see if it is extended, twisted, and what twisted series it is.
\NewDocumentCommand\dynkin@grok@series{}%
{%
- \StrLen{\dynkin@series}[\dynkin@lenny]
+ \StrLen{\dynkin@series}[\dynkin@lenny]\relax%
\ifnum\dynkin@lenny>1\relax%
\dynkin@error@series%
\fi%
+% We need to check if the series is a Witt symbol.
+ \IfSubStr{PSRQTUVW}{\dynkin@series}%
+ {%
+ \global\Witt@symboltrue%
+ \IfStrEqCase{\dynkin@series}%
+ {%
+ {P}{\global\xdef\dynkin@series{A}}%
+ {S}{\global\xdef\dynkin@series{B}}%
+ {R}{\global\xdef\dynkin@series{C}}%
+ {Q}{\global\xdef\dynkin@series{D}}%
+ {T}{\global\xdef\dynkin@series{E}}%
+ {U}{\global\xdef\dynkin@series{F}}%
+ {V}{\global\xdef\dynkin@series{G}}%
+ {W}{\global\xdef\dynkin@series{I}}%
+ }%
+ }%
+ {%
+ \global\Witt@symbolfalse%
+ }%
\edef\series{\dynkin@series}%
\IfStrEqCase{\dynkin@twisted@series}%
{%
{0}{}%
- {1}{ \global\dynkin@is@extendedtrue}%
+ {1}{\global\dynkin@is@extendedtrue}%
{2}{%
\IfSubStr{ADE}{\dynkin@series}%
{%
@@ -3459,19 +3488,6 @@
}%
[\global#5=#4\relax]%
}%
- {G}%
- {%
- \IfStrEqCase{#3}%
- {%
- {Carter}{\global#5=%
- \stringCharacterInPosition{21}{#4}%
- \relax}%
- {Dynkin}{\global#5=%
- \stringCharacterInPosition{21}{#4}%
- \relax}%
- }%
- [\global#5=#4\relax]%
- }%
}%
[\global#5=#4\relax]%
}%
@@ -3640,25 +3656,6 @@
}%
[\global#5=#3\relax]%
}%
- {G}%
- {%
- \IfStrEqCase{#4}%
- {%
- {Carter}%
- {%
- \global#5=%
- \stringCharacterInPosition{21}{#3}%
- \relax%
- }%
- {Dynkin}%
- {%
- \global#5=%
- \stringCharacterInPosition{21}{#3}%
- \relax%
- }%
- }%
- [\global#5=#3\relax]%
- }%
}%
[\global#5=#3\relax]%
}%
@@ -3777,12 +3774,14 @@
}%
{G}%
{%
- \IfStrEqCase{\dynkin@ordering}%
- {%
- {Carter}{\global\dynkin@Root@Number=\stringCharacterInPosition{21}{#1}\relax}%
- {Dynkin}{\global\dynkin@Root@Number=\stringCharacterInPosition{21}{#1}\relax}%
- }%
- [\global\dynkin@Root@Number=#1\relax]%
+ \global\dynkin@Root@Number=#1\relax%
+% \IfStrEqCase{\dynkin@ordering}%
+% {%
+% {Carter}{\global\dynkin@Root@Number=\stringCharacterInPosition{21}{#1}\relax}%
+% {Dynkin}{\global\dynkin@Root@Number=\stringCharacterInPosition{21}{#1}\relax}%
+% {Kac}{\global\dynkin@Root@Number=\stringCharacterInPosition{21}{#1}\relax}%
+% }%
+% [\global\dynkin@Root@Number=#1\relax]%
}%
}%
[\global\dynkin@Root@Number=#1\relax]%
@@ -4338,9 +4337,15 @@
\else%
\ifdynkin@Coxeter%
\Adynkin%
- \dynkinEdgeLabel%
- {\the\dynkin@rank@minus@one}%
- {\the\dynkin@rank}{4}%
+ \ifdynkin@Coxeter@above%
+ \dynkinEdgeLabel%
+ {\the\dynkin@rank@minus@one}%
+ {\the\dynkin@rank}{4}%
+ \else%
+ \dynkinEdgeLabel*%
+ {\the\dynkin@rank@minus@one}%
+ {\the\dynkin@rank}{4}%
+ \fi%
\else
% Create the roots.
\ifnum\dynkin@ply>1\relax%
@@ -4994,7 +4999,11 @@
\dynkinEdge*{SingleEdge}{1}{2}%
\dynkinEdge*{SingleEdge}{2}{3}%
\dynkinEdge*{SingleEdge}{3}{4}%
- \dynkinEdgeLabel{2}{3}{4}%
+ \ifdynkin@Coxeter@above%
+ \dynkinEdgeLabel{2}{3}{4}%
+ \else%
+ \dynkinEdgeLabel*{2}{3}{4}%
+ \fi%
\else%
\dynkinEdge*{SingleEdge}{1}{2}%
\dynkinEdge*{SingleEdge}{3}{4}%
@@ -5002,6 +5011,9 @@
\fi%
\fi%
}%
+
+\newif\ifGtwo@old@dynkin@reverse@arrows
+
%% \Gdynkin
%% Draws a G series Dynkin diagram.
\NewDocumentCommand\Gdynkin{}%
@@ -5013,14 +5025,72 @@
\dynkin@jump{1}%
\dynkinPlaceRootHere*{1}{left}{above}%
\dynkinPlaceRootRelativeTo*{2}{1}{southfold}{left}{below}%
+ \ifdynkin@reverse@arrows%
+ \global\Gtwo@old@dynkin@reverse@arrowstrue\relax%
+ \else%
+ \global\Gtwo@old@dynkin@reverse@arrowsfalse\relax%
+ \fi%
+ \IfStrEqCase{\dynkin@ordering}%
+ {%
+ {Adams}{%
+ \ifdynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \else%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \fi\relax}%
+ {Bourbaki}{%
+ \ifdynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \else%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \fi\relax}%
+ {Carter}{\relax}%
+ {Dynkin}{\relax}%
+ {Kac}{\relax}%
+ }%
+ [\relax]%
\dynkinEdge*{TripleDownRightSemiCircle}{1}{2}%
+ \ifGtwo@old@dynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \else%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \fi%
\ifdynkin@arrows%
\dynkinLeftFold*{1}{2}%
\fi%
\else%
\dynkinPlaceRootHere*{1}{below}{above}%
\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
- \dynkinTripleEdge*{1}{2}%
+ \ifdynkin@reverse@arrows%
+ \global\Gtwo@old@dynkin@reverse@arrowstrue\relax%
+ \else%
+ \global\Gtwo@old@dynkin@reverse@arrowsfalse\relax%
+ \fi%
+ \IfStrEqCase{\dynkin@ordering}%
+ {%
+ {Adams}{%
+ \ifdynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \else%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \fi\relax}%
+ {Bourbaki}{%
+ \ifdynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \else%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \fi\relax}%
+ {Carter}{\relax}%
+ {Dynkin}{\relax}%
+ {Kac}{\relax}%
+ }%
+ [\relax]%
+ \dynkinTripleEdge*{1}{2}\relax%
+ \ifGtwo@old@dynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \else%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \fi%
\fi%
\fi%
}%
@@ -5030,7 +5100,11 @@
\newcommand*{\Hdynkin}%
{%
\Adynkin%
- \dynkinEdgeLabel{1}{2}{5}%
+ \ifdynkin@Coxeter@above%
+ \dynkinEdgeLabel{1}{2}{5}%
+ \else%
+ \dynkinEdgeLabel*{1}{2}{5}%
+ \fi%
}%
%% \Idynkin
%% Draws an I series Coxeter diagram.
@@ -5038,7 +5112,11 @@
{%
\dynkin@rank=2\relax%
\Adynkin%
- \dynkinEdgeLabel{1}{2}{\dynkin@gonality}%
+ \ifdynkin@Coxeter@above%
+ \dynkinEdgeLabel{1}{2}{\dynkin@gonality}%
+ \else%
+ \dynkinEdgeLabel*{1}{2}{\dynkin@gonality}%
+ \fi%
}%
%% \extendedAdynkin
@@ -5183,9 +5261,15 @@
\dynkinEdge*{SingleEdge}%
{\the\dynkin@rank@minus@one}%
{\the\dynkin@rank}%
- \dynkinEdgeLabel%
- {\the\dynkin@rank@minus@one}%
- {\the\dynkin@rank}{4}%
+ \ifdynkin@Coxeter@above%
+ \dynkinEdgeLabel%
+ {\the\dynkin@rank@minus@one}%
+ {\the\dynkin@rank}{4}%
+ \else%
+ \dynkinEdgeLabel*%
+ {\the\dynkin@rank@minus@one}%
+ {\the\dynkin@rank}{4}%
+ \fi%
\else%
\ifnum\dynkin@ply<3\relax%
\dynkinEdge*{DoubleEdge}%
@@ -5211,7 +5295,11 @@
\Cdynkin{}%
\ifdynkin@Coxeter%
\dynkinEdge*{SingleEdge}{0}{1}%
- \dynkinEdgeLabel{0}{1}{4}%
+ \ifdynkin@Coxeter@above%
+ \dynkinEdgeLabel{0}{1}{4}%
+ \else%
+ \dynkinEdgeLabel*{0}{1}{4}%
+ \fi%
\else%
\dynkinEdge*{DoubleEdge}{0}{1}%
\fi%
@@ -5391,8 +5479,11 @@
\xdef\dynkin@gonality{6}%
\dynkinPlaceRootHere*{0}{below}{above}%
\dynkinEast%
+ \let\extended@G@old@order\dynkin@ordering%
+ \xdef\dynkin@ordering{Carter}%
\Gdynkin%
\dynkinEdge*{SingleEdge}{0}{1}%
+ \xdef\dynkin@ordering{\extended@G@old@order}%
}%
%% \extendedHdynkin
@@ -5423,7 +5514,11 @@
\dynkin@rank=1\relax%
\Adynkin%
\dynkinEdge*{SingleEdge}{0}{1}%
- \dynkinEdgeLabel{0}{1}{\infty}%
+ \ifdynkin@Coxeter@above%
+ \dynkinEdgeLabel{0}{1}{\infty}%
+ \else%
+ \dynkinEdgeLabel*{0}{1}{\infty}%
+ \fi%
}%
\newcount\dynkin@height@minus@one%
%% \twistedAdynkin
@@ -5531,6 +5626,8 @@
\fi%
\fi%
}%
+
+\newif\iftwisted@D@old@dynkin@reverse@arrows
%% \twistedDdynkin
%% Draws a twisted D series affine Dynkin diagram.
\NewDocumentCommand\twistedDdynkin{}%
@@ -5546,7 +5643,17 @@
\dynkinPlaceRootRelativeTo*{1}{0}{east}{below}{above}%
\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
\dynkinEdge*{SingleEdge}{0}{1}%
- \dynkinTripleEdge*{2}{1}%
+ \ifdynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \else%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \fi%
+ \dynkinTripleEdge*{1}{2}%
+ \ifdynkin@reverse@arrows%
+ \global\dynkin@reverse@arrowsfalse\relax%
+ \else%
+ \global\dynkin@reverse@arrowstrue\relax%
+ \fi%
\else%
\ClassError%
{Dynkin diagrams}%
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 0c8011b30f6..d8cb268a644 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/06/24}{2024cm}
+\ProvidesExplPackage{easybase}{2024/07/15}{2024cs}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -91,7 +91,11 @@
\IfNoValueTF{#1}
{\IfFileExists{#2.sty}{\RequirePackage{#2}[#3]}{}}
{\IfFileExists{#2.sty}{\RequirePackage[#1]{#2}[#3]}{}}
+ \IfFileExists{#2.sty}{}
+ {\msg_warning:nnn { easybase } { package-not-found } {#2}}
}
+\msg_new:nnn { easybase } { package-not-found }
+ { The~macro~package~'#1'~can't~be~found. }
\cs_new_protected:Npn \ebloadpackage #1
{
\int_compare:nTF { \clist_count:n {#1} <= 1 }
@@ -521,7 +525,7 @@
\UseFntSymbsList{empty}
\cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList
\cs_set_eq:NN \setfntsymbol \UseFntSymbsList
-\cs_new:Npn \eb_int_format_trans:NN #1
+\cs_new:Npn \eb_int_type_trans:NN #1
{
\str_case:nn {#1}
{
@@ -556,23 +560,38 @@
}
\cs_set_eq:NN \thedownfootnote \thefootnote
}
+\cs_generate_variant:Nn \msg_warning:nnnn { nnnV }
\cs_new_protected:Npn \eb_fnmarktext_short_label_set:Nn #1#2
{
\tl_set:Nn \l__eb_fnmarktext_short_tokens_tl {#2}
\clist_map_inline:nn
{ A,a,1,I,i,c,s }
{
- \regex_match:nnT {##1} {#2}
+ \regex_match:nnTF {##1} {#2}
{
\regex_replace_once:nnN {##1}
- { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} }
+ { \c{eb_int_type_trans:NN} ##1 \c{c@footnote} }
\l__eb_fnmarktext_short_tokens_tl
- \seq_map_break:
+ \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl
+ \clist_map_break:
+ }
+ {
+ \str_if_eq:nnT {##1} { s }
+ {
+ \str_if_eq:nnTF {#1} { \thefootnote }
+ { \str_set:Nn \l_tmpa_str { \thedownfootnote } }
+ { \str_set:Nn \l_tmpa_str { \theupfootnote } }
+ \msg_warning:nnnV { easybase } { unknown-fnt-type } {#2} \l_tmpa_str
+ }
}
}
- \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl
\cs_set_eq:NN \thedownfootnote \thefootnote
}
+\msg_new:nnn { easybase } { unknown-fnt-type }
+ {
+ The~'#1'~includes~unknown~footnote~numbering~type \\
+ in~#2.
+ }
\cs_new_protected:Npn \eb_footnote_value_handle:n #1
{
\str_case:nnF {#1}
@@ -1035,7 +1054,7 @@
{
\IfBooleanTF{##1}
{
- \use:c {#1}*{\phantomsection ##3}
+ \use:c {#1}*{##3}
\CTEX@addtocline{#1}{##2}
\tl_if_empty:oF {##4} { \CTEX@addbitocline{#1}{##4} }
\use:c { #1mark }{##2}
@@ -1057,22 +1076,22 @@
\skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
{ \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
}
-\cs_new_protected:Npn \eb_title_base_set_eq:nn #1#2
- {
- \tl_set_eq:cc { CTEX@#2@beforeskip } { CTEX@#1@beforeskip }
- \tl_set_eq:cc { CTEX@#2@afterskip } { CTEX@#1@afterskip }
- \bool_set_eq:cc { CTEX@#2@numbering } { CTEX@#1@numbering }
- \bool_set_eq:cc { CTEX@#2@fixskip } { CTEX@#1@fixskip }
- \bool_set_eq:cc { CTEX@#2@hang } { CTEX@#1@hang }
- \bool_set_eq:cc { CTEX@#2@runin } { CTEX@#1@runin }
- \cs_set_eq:cc { CTEX@#2@tocline } { CTEX@#1@tocline }
- \tl_set_eq:cc { CTEX@#2@break } { CTEX@#1@break }
- \tl_set_eq:cc { CTEX@#2@format } { CTEX@#1@format }
- \tl_set_eq:cc { CTEX@#2@nameformat } { CTEX@#1@nameformat }
- \tl_set_eq:cc { CTEX@#2@numberformat } { CTEX@#1@numberformat }
- \tl_set_eq:cc { CTEX@#2@titleformat } { CTEX@#1@titleformat }
- \tl_set_eq:cc { CTEX@#2@aftername } { CTEX@#1@aftername }
- \tl_set_eq:cc { CTEX@#2@aftertitle } { CTEX@#1@aftertitle }
+\cs_new_protected:Npn \CopyTitleFormat #1#2
+ {
+ \tl_set_eq:cc { CTEX@#1@beforeskip } { CTEX@#2@beforeskip }
+ \tl_set_eq:cc { CTEX@#1@afterskip } { CTEX@#2@afterskip }
+ \bool_set_eq:cc { CTEX@#1@numbering } { CTEX@#2@numbering }
+ \bool_set_eq:cc { CTEX@#1@fixskip } { CTEX@#2@fixskip }
+ \bool_set_eq:cc { CTEX@#1@hang } { CTEX@#2@hang }
+ \bool_set_eq:cc { CTEX@#1@runin } { CTEX@#2@runin }
+ \cs_set_eq:cc { CTEX@#1@tocline } { CTEX@#2@tocline }
+ \tl_set_eq:cc { CTEX@#1@break } { CTEX@#2@break }
+ \tl_set_eq:cc { CTEX@#1@format } { CTEX@#2@format }
+ \tl_set_eq:cc { CTEX@#1@nameformat } { CTEX@#2@nameformat }
+ \tl_set_eq:cc { CTEX@#1@numberformat } { CTEX@#2@numberformat }
+ \tl_set_eq:cc { CTEX@#1@titleformat } { CTEX@#2@titleformat }
+ \tl_set_eq:cc { CTEX@#1@aftername } { CTEX@#2@aftername }
+ \tl_set_eq:cc { CTEX@#1@aftertitle } { CTEX@#2@aftertitle }
}
\NewDocumentCommand{\NewTitleCommand}{omm}
{
@@ -1094,7 +1113,7 @@
{ \CTEXnumberline{##1}##2 }
\exp_args:Nc \providecommand { ttll@#2 }{#3}
\exp_args:Nc \providecommand { toclevel@#2 }{#3}
- \IfValueT{#1}{\eb_title_base_set_eq:nn {#1} {#2}}
+ \IfValueT{#1}{\CopyTitleFormat{#2}{#1}}
}
\NewDocumentCommand{\NewTitleEntryCommand}{O{toc}m}
{
@@ -1103,6 +1122,7 @@
\bool_if:cTF { CTEX@#2@numbering }
{ \CTEX@ifnametrue }
{ \CTEX@ifnamefalse }
+ \CTEX@makeanchor{#2*}
\addcontentsline{#1}{#2}{\use:c { CTEX@#2@tocline }{#2}{##1}}
}
}
@@ -1141,47 +1161,73 @@
\bool_new:N \l__eb_toc_notitle_bool
\newbool{bitoc}
\cs_new:Npn \ebifbitoc { \ifbool{bitoc} }
+\seq_new:N \l__eb_level_tmpa_seq
+\tl_new:N \l__eb_level_tmpa_tl
+\cs_generate_variant:Nn \regex_extract_all:nnN { no }
+\cs_generate_variant:Nn \keys_define:nn { nx }
+\cs_generate_variant:Nn \ctex_set:nn { ox }
+\cs_new_protected:Npn \eb_toc_extract_level:
+ {
+ \regex_extract_all:noN { \cC. } { \eb@toc@title@level }
+ \l__eb_level_tmpa_seq
+ \seq_get_right:NN \l__eb_level_tmpa_seq \l__eb_level_tmpa_tl
+ \tl_set:Nx \l__eb_level_tmpa_tl
+ {
+ \exp_last_unbraced:No
+ \cs_to_str:N { \l__eb_level_tmpa_tl }
+ }
+ \regex_replace_case_once:nN
+ {
+ { ^bi(.*) } { \1 }
+ { .* } { \0 }
+ }
+ \l__eb_level_tmpa_tl
+ }
\keys_define:nn { eb/tocouter }
{
- level .tl_set:N = \eb@toc@title@level,
- level .initial:n =
+ level .code:n =
+ {
+ \tl_set:Nn \eb@toc@title@level {#1}
+ \eb_toc_extract_level:
+ },
+ level .initial:e =
{
\bool_if:NTF \l__eb_class_mode_book_bool
- { \bichapter* }
- { \bisection* }
+ { \exp_not:N \bichapter* }
+ { \exp_not:N \bisection* }
},
- section .meta:n = { level = \bisection* },
- chapter .meta:n = { level = \bichapter* },
- none .code:n =
+ section .meta:n = { level = \bisection* },
+ chapter .meta:n = { level = \bichapter* },
+ none .code:n =
{
\tl_set:Nn \eb@toc@title@level
{ \par\use_none:nn }
\bool_set_true:N \l__eb_toc_notitle_bool
},
- multoc .int_set:N = \l__eb_toc_columns_int,
- multoc .default:n = 2,
- multoc .initial:n = 1,
+ multoc .int_set:N = \l__eb_toc_columns_int,
+ multoc .default:n = 2,
+ multoc .initial:n = 1,
plan .choice:,
plan .value_required:n = true,
- plan/cn .code:n =
+ plan/cn .code:n =
{
\bool_set_true:N \l__eb_toc_plan_cn_bool
\bool_set_false:N \l__eb_toc_plan_bi_bool
},
- plan/bi .code:n =
+ plan/bi .code:n =
{
\bool_set_false:N \l__eb_toc_plan_cn_bool
\bool_set_true:N \l__eb_toc_plan_bi_bool
},
- plan/both .code:n =
+ plan/both .code:n =
{
\bool_set_true:N \l__eb_toc_plan_cn_bool
\bool_set_true:N \l__eb_toc_plan_bi_bool
},
- plan .initial:n = cn,
- columns .meta:n = { multoc = {#1} },
- title .code:n = \eb_assign_toc_title:n {#1},
- bilist .code:n =
+ plan .initial:n = cn,
+ columns .meta:n = { multoc = {#1} },
+ title .code:n = \eb_assign_toc_title:n {#1},
+ bilist .code:n =
{
\tl_gset:Nn \g__eb_bilist_permute_value_tl {#1}
\str_if_eq:nnTF {#1} { mix }
@@ -1199,12 +1245,16 @@
}
}
},
- name .tl_set:N = \l__eb_print_index_name_tl,
- name .initial:n = \imki@jobname
+ name .tl_set:N = \l__eb_print_index_name_tl,
+ name .initial:n = \imki@jobname,
+ unknown .code:n =
+ {
+ \ctex_set:ox { \l__eb_level_tmpa_tl }
+ { \eb_unknown_kv_handle: }
+ },
+ unknown .default:V = \c_novalue_tl
}
-\bool_if:NTF \l__eb_class_mode_book_bool
- { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/chapter } }
- { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/section } }
+
\NewDocumentCommand{\eb_assign_toc_title:n}
{>{\SplitArgument{1}{,}}m}
{\eb_toc_assign_title_judge:nn #1}
@@ -1377,7 +1427,7 @@
{
tocformat = \IfBooleanT{#1}{\contentsmargin{0pt}},
tocindent = 0pt,
- tocrule = \IfBooleanTF{#1}{,~\thecontentspage}{\tocrule{$\cdot$}},
+ tocrule = \IfBooleanTF{#1}{,~\thecontentspage}{\cdottocrule},
toclabel =
{
\bool_if:NTF \l__eb_toc_entry_hang_bool
@@ -1448,7 +1498,7 @@
\eb@register@every@toc@option
}
\RegisterEveryTocOption{tocafter,tocindent,tocrule}
-\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}}
+\NewDocumentCommand{\tocrule}{st-O{0.6pc}d()mO{}}
{
\normalsize\normalfont
\ttl@row@i[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6
@@ -1465,6 +1515,7 @@
}
}
}
+\cs_set:Npn \cdottocrule { \tocrule{\textperiodcentered} }
\ctex_define:nn { toc }
{
lolskip .skip_set:N = \eb@toc@lol@skip,
@@ -1578,7 +1629,7 @@
{
tocformat = \addvspace{1pc}\sffamily,
tocindent = 0pt,
- tocrule = \tocrule{$\cdot$}[\bfseries],
+ tocrule = \cdottocrule[\bfseries],
tocline = \CTEXnumberline{#1}#2
},
section =
@@ -1588,8 +1639,8 @@
tocrule =
{
\bool_if:NTF \l__eb_class_mode_book_bool
- { \tocrule{$\cdot$} }
- { \tocrule{$\cdot$}[\bfseries] }
+ { \cdottocrule }
+ { \cdottocrule[\bfseries] }
}
},
subsection =
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 637ec260f2c..0e714ce9680 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -19,7 +19,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/06/24}{2024cm}
+\ProvidesExplClass{easybook}{2024/07/15}{2024cs}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 9d6f1c517ec..09f5d81cc2d 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/24}{2024cm}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/15}{2024cs}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/esami/esami.sty b/Master/texmf-dist/tex/latex/esami/esami.sty
index 12bf7613794..d1f8757d56d 100644
--- a/Master/texmf-dist/tex/latex/esami/esami.sty
+++ b/Master/texmf-dist/tex/latex/esami/esami.sty
@@ -145,6 +145,7 @@
% | PACKAGES |
% +=============================+
+\usepackage{tagpdf-base}
\usepackage{graphicx}
\usepackage{enumerate}
\usepackage[nomessages]{fp}
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
index f42afc04fbd..268c91fa3ff 100644
--- a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
+++ b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{extramarks}
- [2024/04/23 v4.2
+ [2024/07/18 v4.3
Extra marks for LaTeX]
% Copyright (C) 1994-2024 by Pieter van Oostrum <pieter@vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
index f6ef0762fcd..d138cd4a505 100644
--- a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fancyhdr}%
- [2024/04/23 v4.2
+ [2024/07/18 v4.3
Extensive control of page headers and footers]%
% Copyright (C) 1994-2024 by Pieter van Oostrum <pieter@vanoostrum.org>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,10 +129,6 @@
}%
}
\ProcessOptions*
-\newcommand\f@nch@errmsg[1]{%
- \f@nch@ifundefined{PackageError}{\errmessage{#1}}{\PackageError{fancyhdr}{#1}{}}}
-\newcommand\f@nch@warning[1]{%
- \f@nch@ifundefined{PackageWarning}{\errmessage{#1}}{\PackageWarning{fancyhdr}{#1}{}}}
\newcommand{\f@nch@forc}[3]{\expandafter\f@nchf@rc\expandafter#1\expandafter{#2}{#3}}
\newcommand{\f@nchf@rc}[3]{\def\temp@ty{#2}\ifx\@empty\temp@ty\else
\f@nch@rc#1#2\f@nch@rc{#3}\fi}
@@ -157,7 +153,7 @@
\if@twoside\else
\iff@nch@twoside\else
\if\f@nch@@eo e%
- \f@nch@warning {\string#1's `E' option without twoside option is useless.\MessageBreak
+ \PackageWarning{fancyhdr} {\string#1's `E' option without twoside option is useless.\MessageBreak
Please consider using the `twoside' option}%
\fi\fi\fi
}
@@ -166,8 +162,8 @@
\f@nch@forc\tmpf@ra{#3}%
{\expandafter\f@nch@ifin\tmpf@ra{eolcrhf,EOLCRHF}%
{}{\edef\temp@c{\temp@c\tmpf@ra}}}%
- \ifx\@empty\temp@c\else \f@nch@errmsg{Illegal char `\temp@c' in
- \string#1 argument: [#3]}%
+ \ifx\@empty\temp@c\else \PackageError{fancyhdr}{Illegal char `\temp@c' in
+ \string#1 argument: [#3]}{}%
\fi \f@nch@for\temp@c{#3}%
{\f@nch@default\f@nch@@eo{eo}\temp@c
\f@nch@fancyhf@Echeck{#1}%
@@ -183,8 +179,8 @@
\f@nch@forc\tmpf@ra{#3}%
{\expandafter\f@nch@ifin\tmpf@ra{eolrhf,EOLRHF}%
{}{\edef\temp@c{\temp@c\tmpf@ra}}}%
- \ifx\@empty\temp@c\else \f@nch@errmsg{Illegal char `\temp@c' in
- \string#1 argument: [#3]}%
+ \ifx\@empty\temp@c\else \PackageError{fancyhdr}{Illegal char `\temp@c' in
+ \string#1 argument: [#3]}{}%
\fi \f@nch@for\temp@c{#3}%
{\f@nch@default\f@nch@@eo{eo}\temp@c
\f@nch@fancyhf@Echeck{#1}%
@@ -231,9 +227,24 @@
\let\f@nch@raggedleft\raggedleft
\let\f@nch@raggedright\raggedright
\let\f@nch@centering\centering
-\let\f@nch@everypar\everypar
+\ifdefined\ExplSyntaxOn
+ \ExplSyntaxOn
+ \let\f@nch@everypar\tex_everypar:D
+ \newcommand\f@nch@resetpar{%
+ \f@nch@everypar{}%
+ \cs_set_eq:NN \par \tex_par:D
+ \cs_set_eq:NN \@@par \tex_par:D
+ \cs_set_eq:NN \endgraf \tex_par:D
+ }
+ \ExplSyntaxOff
+\else
+ \let\f@nch@everypar\everypar
+ \newcommand\f@nch@resetpar{%
+ \f@nch@everypar{}%
+ }
+\fi
\newcommand\f@nch@noUppercase[2][]{#2}
-\def\f@nch@reset{\f@nch@everypar{}\restorecr\endlinechar=13
+\def\f@nch@reset{\f@nch@resetpar\restorecr\endlinechar=13
\catcode`\\=0\catcode`\{=1\catcode`\}=2\catcode`\$=3\catcode`\&=4
\catcode`\#=6\catcode`\^=7\catcode`\_=8\catcode`\ =10\catcode`\@=11
\catcode`\:=11\catcode`\~=13\catcode`\%=14
@@ -249,10 +260,8 @@
\expandafter\def\csname MakeUppercase\space\space\space\endcsname
[####1]####2{####2}%
##1}}%
- \f@nch@ifundefined{@newbaseline} % NFSS not present; 2.09 or 2e
- {\f@nch@ifundefined{@normalsize} {\normalsize} % for ucthesis.cls
- {\@normalsize}}%
- {\@newbaseline}% NFSS (2.09) present
+ \f@nch@ifundefined{@normalsize} {\normalsize} % for ucthesis.cls
+ {\@normalsize}%
}
\newcommand*{\fancycenter}[1][1em]{%
\@ifnextchar[{\f@nch@center{#1}}{\f@nch@center{#1}[3]}%
@@ -302,7 +311,7 @@
\ifdim\ht0>#1\relax
\iff@nch@check
\dimen0=#1\advance\dimen0-\ht0
- \f@nch@warning{%
+ \PackageWarning{fancyhdr}{%
\string#1 is too small (\the#1): \MessageBreak
Make it at least \the\ht0, for example:\MessageBreak
\string\setlength{\string#1}{\the\ht0}%
@@ -476,8 +485,8 @@
\def\@makecol{\ifvoid\footins\f@nch@footnotefalse\else\f@nch@footnotetrue\fi
\let\topfloat\@toplist\let\botfloat\@botlist\latex@makecol}%
}
-\newcommand\iftopfloat[2]{\ifx\topfloat\empty #2\else #1\fi}%
-\newcommand\ifbotfloat[2]{\ifx\botfloat\empty #2\else #1\fi}%
+\newcommand\iftopfloat[2]{\ifx\topfloat\@empty #2\else #1\fi}%
+\newcommand\ifbotfloat[2]{\ifx\botfloat\@empty #2\else #1\fi}%
\newcommand\iffloatpage[2]{\if@fcolmade #1\else #2\fi}%
\newcommand\iffootnote[2]{\iff@nch@footnote #1\else #2\fi}%
\newcommand{\fancypagestyle}[1]{%
@@ -485,10 +494,10 @@
}
\long\def\f@nch@pagestyle#1[#2]#3{%
\f@nch@ifundefined{ps@#2}{%
- \f@nch@errmsg{\string\fancypagestyle: Unknown base page style `#2'}%
+ \PackageError{fancyhdr}{\string\fancypagestyle: Unknown base page style `#2'}{}%
}{%
\f@nch@ifundefined{f@nch@ps@#2-is-fancyhdr}{%
- \f@nch@errmsg{\string\fancypagestyle: Base page style `#2' is not fancyhdr-based}%
+ \PackageError{fancyhdr}{\string\fancypagestyle: Base page style `#2' is not fancyhdr-based}{}%
}%
{%
\@namedef{ps@#1}{\let\f@nch@gbl\relax\@nameuse{ps@#2}#3\relax}%
diff --git a/Master/texmf-dist/tex/latex/gelasiomath/gelasiomath.sty b/Master/texmf-dist/tex/latex/gelasiomath/gelasiomath.sty
new file mode 100644
index 00000000000..e468d793de3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/gelasiomath/gelasiomath.sty
@@ -0,0 +1,295 @@
+\NeedsTeXFormat{LaTeX2e}
+
+\def\fileversion{1.0}
+\def\filedate{2024/06/19}
+\ProvidesPackage{gelasiomath}[%
+\filedate\space v\fileversion (Michael Sharpe) Use xch small caps in gelasio text and supply matching math package]
+
+\message{`gelasiomath'v\fileversion,\space\filedate\space Load\space XCharter\space small\space caps\space as\space target\space for\space scshape\space and\space load\space newtx\space with\space appropriate\space options.\space (msharpe)}
+
+\RequirePackage{iftex,etoolbox,xkeyval,ifthen,xparse}
+\def\gelm@scale{1} % default value for scale option
+
+\DeclareOptionX{scale}{\def\gelm@scale{#1}}
+\newif\ifgelm@scosf
+\DeclareOptionX{scosf}{\gelm@scosftrue}
+%\newif\ifgelm@gelscfigs\gelm@gelscfigstrue
+%\DeclareOptionX{nogelfigs}{\gelm@gelscfigsfalse}
+
+\DeclareOptionX*{\PassOptionsToPackage{\CurrentOption}{newtx}}
+
+\ProcessOptionsX \relax
+\@tempdima=\gelm@scale\p@
+\@tempdimb=.92\@tempdima % for gelasio text scale
+\@tempdimc=.938\@tempdima % for xcharter text
+\edef\gel@scale{\strip@pt\@tempdimb}
+\edef\XCharter@scale{\strip@pt\@tempdimc}
+\usepackage[gelasio,textscale=\gel@scale,mathscale=\gelm@scale]{newtx}
+%\AtBeginDocument{%
+% \expandafter\ifx\csname Gelasio@scale\endcsname\relax
+% \edef\Gelasio@scale{1}
+% \edef\XCharter@scale{1.02}
+% \else
+% \@tempdima=\Gelasio@scale\p@
+% \@tempdima=1.02\@tempdima%
+% \edef\XCharter@scale{\strip@pt\@tempdima}
+% \fi
+%} % AtBeginDocument
+\def\gelm@scit{scit}% for testing value of \f@shape
+\def\gelm@sc{sc}% for testing value of \f@shape
+
+\iftutex
+\AtBeginDocument{%
+\def\gelm@tufig{\addfontfeatures{RawFeature = -smcp , \ifgelm@scosf Numbers = OldStyle, \fi}}
+\addfontfeatures{UprightFeatures={SmallCapsFont={XCharter-Roman}, SmallCapsFeatures={%
+\ifgelm@scosf Numbers = OldStyle ,\fi
+ Letters=SmallCaps,
+Scale=\XCharter@scale}},%
+ItalicFeatures={SmallCapsFont={XCharter-Italic}, SmallCapsFeatures={%
+\ifgelm@scosf Numbers = OldStyle ,\fi
+Letters=SmallCaps, Scale=\XCharter@scale}},%
+BoldFeatures={SmallCapsFont={XCharter-Bold}, SmallCapsFeatures={%
+\ifgelm@scosf Numbers = OldStyle ,\fi
+Letters=SmallCaps, Scale=\XCharter@scale}},%
+BoldItalicFeatures={SmallCapsFont={XCharter-BoldItalic}, SmallCapsFeatures={%
+\ifgelm@scosf Numbers = OldStyle ,\fi
+Letters=SmallCaps, Scale=\XCharter@scale}}%
+}}
+\ifgelm@scosf
+ \AtBeginDocument{%
+ \xpretocmd{\scshape}
+ {\addfontfeatures{Numbers=OldStyle}}
+ {}{}%
+ }%
+\fi
+
+\else %not tutex
+ \AtBeginDocument{%
+ \ifgelm@scosf%
+ \def\gelm@fig{OsF}
+ \else % use default settings from gelasio.sty
+ \def\gelm@fig{\gelasio@figurealign\gelasio@figurestyle}
+ \fi
+ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
+ \let\scshape\relax
+ \DeclareRobustCommand\scshape{%
+ \not@math@alphabet\scshape\relax
+ \fontfamily{XCharter-\gelm@fig}\fontshape\scdefault\selectfont}
+ %\DeclareTextCommand{\textsc}{\scshape}
+ }
+\fi
+
+%\newtoks\gel@SC % store for processed string
+%\newtoks\gel@src % store for source string
+%\def\gel@Append#1{% append #1 to token register \gel@SC
+%\toks0={#1}%
+%\edef\gel@tmpa{\noexpand\gel@SC={\the\gel@SC \the\toks0}}%
+%\gel@tmpa}
+%
+%\def\gel@Pop#1(into:)#2{%
+% \edef\gel@act{\noexpand\gel@SplitOff\the#1%
+% (gel@head:)\noexpand#2(gel@tail:)\noexpand#1}%
+% \gel@act}
+%\def\gel@SplitOff#1#2(gel@head:)#3(gel@tail:)#4{\def#3{\noexpand #1}#4={#2}}
+%
+%\def\nxt|#1#2\@nil{%
+%\toks0={#2}\edef\param{\the\toks0}%
+%\ifx\param\@empty%
+% \textsc{\the\gel@SC} % done
+%\else% continue parsing for capital letters
+% \ifthenelse{\isblank
+% \ifcat A#1 % #1 is letter
+% \if#1\uppercase{#1}%
+% \gel@Append{\textulc{#1}}%
+% \else
+% \gel@Append{#1}%
+% \fi
+% \else % not a letter
+% \gel@Append{#1}%
+% \fi
+% \nxt|#2\@nil%
+%\fi}
+%
+%\def\textSC#1{\gel@SC={}\nxt|#1\@nil}
+\def\textSC#1{\textsc{\capsescape{#1}}}
+\iftutex%
+ \def\textULC#1{{\gelasio\gelm@tufig%
+ \ifthenelse{\equal{\f@shape}{\gelm@scit}}{%shape is scit
+ \itshape}{% not so
+ \ifthenelse{\equal{\f@shape}{\gelm@sc}}{% shape is sc
+ \upshape}}%
+ \textulc{#1}}}
+
+\else
+ \def\textULC#1{{\fontfamily{Gelasio-\gelm@fig}%
+ \ifthenelse{\equal{\f@shape}{\gelm@scit}}{%shape is scit
+ \fontshape{it}}{% not so
+ \ifthenelse{\equal{\f@shape}{\gelm@sc}}{% shape is sc
+ \fontshape{n}}{}}%
+ \selectfont #1}}
+\fi
+\ExplSyntaxOn
+\NewDocumentCommand{\capsescape}{ m }
+ {
+ \gel_capsescape:n { #1 }
+ }
+
+\tl_new:N \l__gel_capsescape_input_tl
+\cs_new_protected:Npn \gel_capsescape:n #1
+ {
+ % store the string in a variable
+ \tl_set:Nn \l__gel_capsescape_input_tl {#1}
+ \regex_replace_all:nnN
+ % search for capital letters, figures and more
+ { ([A-Z\d]+|\cC.\{?[A-Z]+\}?) }
+ % replace the match with \textULC{<match>}
+ { \c{textULC}\cB\{\1\cE\} }
+ \l__gel_capsescape_input_tl
+ \tl_use:N \l__gel_capsescape_input_tl
+ }
+\ExplSyntaxOff
+
+
+% galasio.sty does not offer macros for numerators, denominators or inferiors
+\AtBeginDocument{%
+\ifgelasio@otf
+ \DeclareRobustCommand{\lfstyle}{%
+ \not@math@alphabet\lfstyle\relax
+ \addfontfeatures{Numbers={Proportional,Lining}}%
+ }
+
+ \DeclareRobustCommand{\tlfstyle}{%
+ \not@math@alphabet\tlfstyle\relax
+ \addfontfeatures{Numbers={Monospaced,Lining}}%
+ }
+ \DeclareRobustCommand{\osfstyle}{%
+ \not@math@alphabet\osfstyle\relax
+ \addfontfeatures{Numbers={Proportional,OldStyle}}%
+ }
+ \DeclareRobustCommand{\tosfstyle}{%
+ \not@math@alphabet\tosfstyle\relax
+ \addfontfeatures{Numbers={Monospaced,OldStyle}}%
+ }
+ \providecommand\nufigures{%
+ \addfontfeatures{VerticalPosition=Numerator}}
+ \providecommand\defigures{%
+ \addfontfeatures{VerticalPosition=Denominator}}
+ \providecommand\infigures{%
+ \addfontfeatures{VerticalPosition=Inferior}}
+
+ \DeclareTextFontCommand{\textnum}{\nufigures}
+ \DeclareTextFontCommand{\textde}{\defigures}
+ \DeclareTextFontCommand{\textinf}{\infigures}
+ \NewCommandCopy\textnu\textnum
+ \@ifundefined{tx@sfrSC}{}{%
+ \newcommand*{\textsmde}[1]{%
+ \setbox0=\hbox{\scalebox\tx@sfrSC{\textde{#1}}}\box0}}
+
+\else % type1 --we define \text.. by lowering \textsu
+ % missing font switches for type1
+ \DeclareRobustCommand{\lfstyle}{%
+ \not@math@alphabet\lfstyle\relax
+ \fontfamily{Gelasio-LF}\selectfont %
+ }
+ \DeclareRobustCommand{\tlfstyle}{%
+ \not@math@alphabet\tlfstyle\relax
+ \fontfamily{Gelasio-TLF}\selectfont %
+ }
+ \DeclareRobustCommand{\osfstyle}{%
+ \not@math@alphabet\osfstyle\relax
+ \fontfamily{Gelasio-OsF}\selectfont %
+ }
+ \DeclareRobustCommand{\tosfstyle}{%
+ \not@math@alphabet\tosfstyle\relax
+ \fontfamily{Gelasio-TOsF}\selectfont %
+ }
+ \newbox\tx@box
+ \newcommand*{\textde}[1]{{\setbox0=\hbox{\textsu{#1}}\setbox1=\hbox{\raise -.763ex \box0}\dp1=0pt\ht1=.977ex\box1\relax}}
+
+ \providecommand*\textnum[1]{\raisebox{.507ex}{\textde{#1}}}
+ \NewCommandCopy\textnu\textnum
+ \providecommand*\textinf[1]{\raisebox{-.237ex}{\textde{#1}}}
+ \let\textnu\textnum
+% \providecommand*\textde[1]{{\setbox0=\hbox{\textsu{#1}}%
+% \setbox1=\hbox{\lower.763ex\box0}\dp0=0pt\relax\box1\relax}}
+ %\raisebox{-.763ex}{\textsu{#1}}}
+ % the following will be used only by \textsfrac
+ \@ifundefined{tx@sfrSC}{}{%
+ \newcommand*{\textsmde}[1]{%
+ \setbox0=\hbox{\scalebox\tx@sfrSC{\textde{#1}}}\box0}%
+ }
+\fi
+\DeclareTextFontCommand{\textlf}{\lfstyle}
+\DeclareTextFontCommand{\texttlf}{\tlfstyle}
+\DeclareTextFontCommand{\textosf}{\osfstyle}
+\DeclareTextFontCommand{\texttosf}{\tosfstyle}
+} %\AtBeginDocument
+%\ifnum\ntx@id=16\relax
+%\else % create \textsmsmde for other than minion and gelasio
+%% We move the small font to the text baseline and scale it by \tx@sfrSC, for use only in the \textsfrac macro.
+%\ifnum\ntx@id=4\relax
+%\else
+% \ifnum\tx@debase=0
+% \newcommand*{\textsmde}[1]{%
+% \setbox0=\hbox{\scalebox\tx@sfrSC{\textde{#1}}}\box0}
+% \else
+% \newdimen\tx@u \newdimen\tx@v
+% \tx@u=-\tx@debase pt
+% \tx@toex{\strip@pt\tx@u}\tx@y=\tx@x
+% %\showthe\tx@y
+% \tx@v=\strip@pt\tx@y ex
+% \newcommand*{\textsmde}[1]{%
+% \setbox2=\hbox{\textde{#1}}%
+% \setbox1=\hbox{\raise \tx@v \box2}%
+% \setbox0=\hbox{\scalebox{\tx@sfrSC}{\box1}}\box0}
+% \fi %\ifnum\tx@debase=0
+%\fi %\ifnum\ntx@id=4
+%\fi %\ifnum\ntx@id=16
+\iftutex%
+ \def\gel@frslash{\symbol{"2044}}
+\else%
+ \def\gel@frslash{%
+ {\fontencoding{TS1}\selectfont\char"2F}}
+\fi
+
+\newcommand*{\geltextfrac}[3][]{% like \textfrac[1]{7}{8}
+ \mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {\textlf{#1}\kern.02em}{}%
+ \textnum{#2}% numerator
+ \StrRight{#2}{1}[\@digit@]%
+ % look for 1, 2, 3, 7, 8
+ \ifcase\@digit@% 0
+ \or%\kern.03em% 1
+ \or\kern.04em% 2
+ \or%\kern-.01em% 3
+ \or\kern.02em% 4
+ \or\kern-.01em% 5
+ \or%\kern.01em% 6
+ \or\kern-.08em% 7
+ \or\kern.01em% 8
+ \or\kern-.02em% 9
+ \fi%
+% \kern\ntx@foresolidus{\fontencoding{TS1}\selectfont\char"2F}%
+% \kern\ntx@aftsolidus%
+ \gel@frslash%
+ \StrLeft{#3}{1}[\@digit@]%
+ % look for 1, 4, 7
+ \ifcase\@digit@% 0
+ \or\kern .01em% 1
+ \or\kern .01em% 2
+ \or\kern .01em% 3
+ \or\kern -.01em% 4
+ \or%\kern -.02em% 5
+ \or%\kern-.03em% 6
+ \or\kern .06em% 7
+ \or%\kern .01em% 8
+ \or\kern .01em% 9
+ \fi%
+ \textde{#3}% denominator [#3]
+ }%mbox
+} % \geltextfrac
+\@ifundefined{textfrac}{\NewCommandCopy\textfrac\geltextfrac}%
+{\RenewCommandCopy\textfrac\geltextfrac}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/gelasiomath/ly1mingelasio.fd b/Master/texmf-dist/tex/latex/gelasiomath/ly1mingelasio.fd
new file mode 100644
index 00000000000..5a76ba9518c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/gelasiomath/ly1mingelasio.fd
@@ -0,0 +1,91 @@
+\ProvidesFile{ly1mingelasio.fd}
+ [2024/04/11 (msharpe) Font definitions for LY1/mingelasio.]
+
+\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
+\def\@textscalefactor{.92}
+%xgelasio must be reduced by factor .92 to match xheight of newtxmath
+
+
+\@ifundefined{ntxmath@scale}{\let\ntxmath@scaled\@empty}
+{\@tempdima\@textscalefactor\p@
+\@tempdima\ntxmath@scale\@tempdima
+\edef\ntxmath@scaled{s*[\strip@pt\@tempdima]}}% locally, not globally
+
+\DeclareFontFamily{LY1}{mingelasio}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{mingelasio}{m}{it}{
+ <-> \ntxmath@scaled Gelasio-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{regular}{it}{
+ <-> alias * mingelasio/m/it
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{m}{n}{
+ <-> \ntxmath@scaled Gelasio-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{regular}{n}{
+ <-> alias * mingelasio/m/n
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{m}{sl}{
+ <-> ssub * mingelasio/m/it
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{regular}{sl}{
+ <-> ssub * mingelasio/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{mingelasio}{b}{n}{
+ <-> \ntxmath@scaled Gelasio-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{bold}{n}{
+ <-> alias * mingelasio/b/n
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{b}{it}{
+ <-> \ntxmath@scaled Gelasio-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{bold}{it}{
+ <-> alias * mingelasio/b/it
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{b}{sl}{
+ <-> ssub * mingelasio/b/it
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{bold}{sl}{
+ <-> ssub * mingelasio/bold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{mingelasio}{bx}{n}{
+ <-> ssub * mingelasio/b/n
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{bx}{sl}{
+ <-> ssub * mingelasio/b/sl
+}{}
+
+\DeclareFontShape{LY1}{mingelasio}{bx}{it}{
+ <-> ssub * mingelasio/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/gelasiomath/omlzgelmi.fd b/Master/texmf-dist/tex/latex/gelasiomath/omlzgelmi.fd
new file mode 100644
index 00000000000..a9a6f612f47
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/gelasiomath/omlzgelmi.fd
@@ -0,0 +1,30 @@
+%Filename: omlzgelmi.fd
+%Created by: tex zgel-drv
+%Created using msharpe
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{omlzgelmi.fd}
+ [2024/04/08 Fontinst v1.933 font definitions for OML/zgelmi.]
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty%
+\fi
+
+
+\DeclareFontFamily{OML}{zgelmi}{\skewchar \font =127}
+
+\DeclareFontShape{OML}{zgelmi}{m}{it}{
+ <-> \ntxmath@scaled zgelmi
+}{}
+
+\DeclareFontShape{OML}{zgelmi}{b}{it}{
+ <-> \ntxmath@scaled zgelbmi
+}{}
+
+\DeclareFontShape{OML}{zgelmi}{m}{sl}{<->ssub * zgelmi/m/it}{}
+\DeclareFontShape{OML}{zgelmi}{bx}{it}{<->ssub * zgelmi/b/it}{}
+\DeclareFontShape{OML}{zgelmi}{b}{sl}{<->ssub * zgelmi/b/it}{}
+\DeclareFontShape{OML}{zgelmi}{bx}{sl}{<->ssub * zgelmi/b/sl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/gelasiomath/ot1mingelasio.fd b/Master/texmf-dist/tex/latex/gelasiomath/ot1mingelasio.fd
new file mode 100644
index 00000000000..1bfed27c98b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/gelasiomath/ot1mingelasio.fd
@@ -0,0 +1,78 @@
+\ProvidesFile{ot1mingelasio.fd}
+ [2024/04/11 (msharpe) Font definitions for OT1/mingelasio.]
+
+\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
+
+\def\@textscalefactor{.92}
+%xgelasio must be reduced by factor .92 to match xheight of newtxmath
+
+\@ifundefined{ntxmath@scale}{\let\ntxmath@scaled\@empty}
+{\@tempdima\@textscalefactor\p@
+\@tempdima\ntxmath@scale\@tempdima
+\edef\ntxmath@scaled{s*[\strip@pt\@tempdima]}}% locally, not globally
+
+\DeclareFontFamily{OT1}{mingelasio}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{mingelasio}{m}{n}{
+ <-> \ntxmath@scaled Gelasio-Regular-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{regular}{n}{
+ <-> alias * mingelasio/m/n
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{m}{it}{
+ <-> \ntxmath@scaled Gelasio-Italic-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{regular}{it}{
+ <-> alias * mingelasio/m/it
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{m}{sl}{
+ <-> ssub * mingelasio/m/it
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{regular}{sl}{
+ <-> ssub * mingelasio/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{mingelasio}{b}{n}{
+ <-> \ntxmath@scaled Gelasio-Bold-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{bold}{n}{
+ <-> alias * mingelasio/b/n
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{b}{it}{
+ <-> \ntxmath@scaled Gelasio-BoldItalic-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{bold}{it}{
+ <-> alias * mingelasio/b/it
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{b}{sl}{
+ <-> ssub * mingelasio/b/it
+}{}
+
+\DeclareFontShape{OT1}{mingelasio}{bold}{sl}{
+ <-> ssub * mingelasio/bold/it
+}{}
+
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd b/Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd
new file mode 100644
index 00000000000..da0a9da6553
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/gelasiomath/t1mingelasio.fd
@@ -0,0 +1,51 @@
+\ProvidesFile{t1minelasio.fd}
+ [2024/04/14 (msharpe) Font definitions for T1/mingelasio.]
+
+%\def\@textscalefactor{.92}
+%xgelasio must be reduced by factor .92 to match xheight of newtxmath
+
+%\@ifundefined{newtxmathscale}{\def\newtxmathscale{1}}{}
+%\@tempdima\@textscalefactor\p@
+%\@tempdima\newtxmathscale\@tempdima
+%\xdef\newtxtext@scaled{s*[\strip@pt\@tempdima]}%global, not local
+
+\DeclareFontFamily{T1}{mingelasio}{}
+%\show\ntxtext@scaled
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{mingelasio}{b}{it}{
+ <-> \ntxtext@scaled Gelasio-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{mingelasio}{b}{n}{
+ <-> \ntxtext@scaled Gelasio-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{mingelasio}{b}{sl}{
+ <-> ssub * mingelasio/b/it
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{mingelasio}{m}{n}{
+ <-> \ntxtext@scaled Gelasio-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{mingelasio}{m}{it}{
+ <-> \ntxtext@scaled Gelasio-Italic-tlf-t1
+}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{mingelasio}{bx}{n}{
+ <-> ssub * mingelasio/b/n
+}{}
+
+\DeclareFontShape{T1}{mingelasio}{bx}{it}{
+ <-> ssub * mingelasio/b/it
+}{}
+\traceoff
+\endinput
diff --git a/Master/texmf-dist/tex/latex/gelasiomath/untxmia.fd b/Master/texmf-dist/tex/latex/gelasiomath/untxmia.fd
new file mode 100644
index 00000000000..212e5b2386e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/gelasiomath/untxmia.fd
@@ -0,0 +1,139 @@
+%Filename: untxmia.fd
+%Created by: tex mia-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{untxmia.fd}
+ [2024/04/09 Fontinst v1.933 font definitions for U/ntxmia.]
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty%
+\fi
+
+\DeclareFontFamily{U}{ntxmia}{\skewchar \font =127}
+
+\iftx@libertine
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled nxlmia
+ }{}
+
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled nxlbmia
+ }{}
+\else
+ \iftx@minion
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zmnmia
+ }{}
+
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zmnbmia
+ }{}
+ \else
+ \iftx@coch
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zcochmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zcochbmia
+ }{}
+ \else
+ \iftx@ch
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zchmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zchbmia
+ }{}
+ \else
+ \iftx@stxtwo
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled ntxstx2mia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled ntxstx2bmia
+ }{}
+
+ \else
+ \iftx@ebgm
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled ntxebgmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled ntxebgbmia
+ }{}
+ \else
+ \iftx@ut
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zutmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zutbmia
+ }{}
+ \else
+ \iftx@nc
+ \iftx@fourier
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zncfmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zncfbmia
+ }{}
+ \else
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zncmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zncbmia
+ }{}
+ \fi
+ \else
+ \iftx@noto
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled notomia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled notobmia
+ }{}
+ \else
+ \iftx@notosans
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled notosansmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled notosansbmia
+ }{}
+ \else
+ \iftx@gel
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zgelmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zgelbmia
+ }{}
+ \else
+
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled ntxmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled ntxbmia
+ }{}
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+\fi
+\DeclareFontShape{U}{ntxmia}{m}{sl}{<->ssub * ntxmia/m/it}{}
+\DeclareFontShape{U}{ntxmia}{bx}{it}{<->ssub * ntxmia/b/it}{}
+\DeclareFontShape{U}{ntxmia}{b}{sl}{<->ssub * ntxmia/b/it}{}
+\DeclareFontShape{U}{ntxmia}{bx}{sl}{<->ssub * ntxmia/b/sl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/heria/heria.cls b/Master/texmf-dist/tex/latex/heria/heria.cls
index ed545f9b84e..9c581bbe329 100644
--- a/Master/texmf-dist/tex/latex/heria/heria.cls
+++ b/Master/texmf-dist/tex/latex/heria/heria.cls
@@ -8,11 +8,11 @@
%%
%% This is a generated file.
%%
-%% Copyright 2023 Tristan Miller
+%% Copyright 2023, 2024 Tristan Miller
%% Copyright 2016 John Kormylo
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{heria}
-[2023-12-04 v3.2.1.0 Class for Horizon Europe (R)IA proposals]
+[2024-07-14 v3.4.1.0 Class for Horizon Europe (R)IA proposals]
\LoadClass[11pt,a4paper]{article}
\RequirePackage[T1]{fontenc} % T1 font encoding
\RequirePackage[left=15mm,
@@ -60,6 +60,18 @@
\definecolor{footergrey}{HTML}{D8D8D8}
\definecolor{tablegrey}{HTML}{F2F2F2}
\definecolor{summaryblue}{HTML}{00B0F0}
+\gdef\@templateversion{3.4} % Default version
+\def\@supportedtemplateversions{3.2,3.3,3.4} % Supported versions
+\ExplSyntaxOn
+\NewDocumentCommand{\templateversion}{m}{%
+ \clist_if_in:NnTF {\@supportedtemplateversions} {#1}
+ {\gdef\@templateversion{#1}}
+ {\PackageError{heria}%
+ {unsupported~template~version}%
+ {Use~one~of~\@supportedtemplateversions}
+ }%
+}
+\ExplSyntaxOff
\newcommand{\callname}[1]{\gdef\@callname{#1}}%
\newcommand{\callidentifier}[1]{\gdef\@callidentifier{#1}}%
\newcommand{\calltopic}[1]{\gdef\@calltopic{#1}}%
@@ -718,7 +730,6 @@
}{%
\end{tcolorbox}%
}
-\RequirePackage{everypage}
\RequirePackage{environ}
\newcounter{abspage}% \thepage not reliab
\newcommand{\newSFPage}[1]% #1 = \theabspage
@@ -733,15 +744,17 @@
\rotatebox{90}{\parbox[c][\textwidth][c]{\textheight}{\BODY}}%
\fi
\end{figure}}
-\AddEverypageHook{% check if sideways figure on this page
- \ifdim\textwidth=\textheight
- \stepcounter{abspage}% already in landscape
- \else
- \@ifundefined{SFPage@\theabspage}{}{\global\pdfpageattr{/Rotate 0}}%
- \stepcounter{abspage}%
- \@ifundefined{SFPage@\theabspage}{}%
- {\global\pdfpageattr{/Rotate 90}}%
- \fi}
+\AddToHook{shipout/background}{% check if sideways figure on this page
+ \put(1in,-1in){%
+ \ifdim\textwidth=\textheight
+ \stepcounter{abspage}% already in landscape
+ \else
+ \@ifundefined{SFPage@\theabspage}{}{\global\pdfpageattr{/Rotate 0}}%
+ \stepcounter{abspage}%
+ \@ifundefined{SFPage@\theabspage}{}%
+ {\global\pdfpageattr{/Rotate 90}}%
+ \fi}%
+ }
\RequirePackage{newtxtext} % Use Times for main text
\RequirePackage{newtxmath} % Use Times for math
\renewcommand*\ttdefault{lmvtt} % Latin Modern Typewriter Proportional
diff --git a/Master/texmf-dist/tex/latex/heria/hi-methodology.tex b/Master/texmf-dist/tex/latex/heria/hi-methodology.tex
index 0ba1b503aab..b672aa0a834 100644
--- a/Master/texmf-dist/tex/latex/heria/hi-methodology.tex
+++ b/Master/texmf-dist/tex/latex/heria/hi-methodology.tex
@@ -31,7 +31,7 @@
environmental objectives of the EU Taxonomy Regulation.}
\item
\emph{If you plan to use, develop and/or deploy artificial
- intellingence (AI) based systems and/or techniques you must
+ intelligence (AI) based systems and/or techniques you must
demonstrate their technical robustness. AI-based systems or techniques
should be, or be developed to become:~}
diff --git a/Master/texmf-dist/tex/latex/heria/hi-workplan.tex b/Master/texmf-dist/tex/latex/heria/hi-workplan.tex
index 20070b17c37..db64e7da4eb 100644
--- a/Master/texmf-dist/tex/latex/heria/hi-workplan.tex
+++ b/Master/texmf-dist/tex/latex/heria/hi-workplan.tex
@@ -40,12 +40,33 @@ Please provide the following:
\item
\emph{Give full details. Base your account on the logical structure of
the project and the stages in which it is to be carried out.}
+\makeatletter
+\ifdim\@templateversion pt<3.4pt
\emph{The number of work packages should be proportionate to the scale
and complexity of the project.}
\item
\emph{You should give enough detail in each work package to justify
the proposed resources to be allocated and also quantified information
so that progress can be monitored, including by the Commission}
+\else
+ \emph{Each work package should be a substantial part of the work
+ plan, and the number of work packages should be proportionate to
+ the scale and complexity of the project.}
+\item \emph{Structure each work package by breaking it down into
+ tasks. If tasks are not appropriate, work packages can be
+ organised according to other criteria (e.g., according to the type
+ of work or thematically). For each task or element of the work
+ package, describe all activities to be carried out and quantify
+ them (e.g., number of protocols, tests, measurements,
+ combinations, study subjects, conferences, publications,
+ etc.). Provide enough detail to clarify who will do this work and
+ why it is needed for the project, (e.g., the level of
+ qualification and number of person-months for personnel, as well
+ as the requested equipment, consumables, meetings, etc.), to
+ justify the proposed resources and so that progress can be
+ monitored, including by the Commission.}
+\fi
+\makeatother
\item
\emph{Resources assigned to work packages should be in line with their
objectives and deliverables. You are advised to include a distinct
diff --git a/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex b/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex
index 4697c862162..1146119f66e 100644
--- a/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex
+++ b/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex
@@ -8,9 +8,15 @@
%%
%% This is a generated file.
%%
+\makeatletter
+\ifdim\@templateversion pt<3.4pt
(where appropriate, broken down into tasks), lead partner and role of
participants. Deliverables linked to each WP are listed in table 3.1c
(no need to repeat the information here).
+\else
+(where appropriate, broken down into tasks), lead partner and role of participants. For each task, quantify the amount of work. Provide enough detail to justify the resources requested and clarify why the work is needed and who will do it. Deliverables linked to each WP are listed in table 3.1c (no need to repeat the information here).
+\fi
+\makeatother
\endinput
%%
%% End of file `hi-wp-description.tex'.
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 90fda975d0d..8fdce7b068b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hdvipdfm.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for dvipdfm]
\Hy@VersionCheck{hdvipdfm.def}
\special{pdf:majorversion \Hy@pdf@majorversion}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 2e388c458bd..62c4d56cf25 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hdvips.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for dvips]
\Hy@VersionCheck{hdvips.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index dc9eb63e4dd..ba81a7bada2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hdvipson.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for dvipsone]
\Hy@VersionCheck{hdvipson.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index 9e9f0fd3145..5ff71600070 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hdviwind.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for dviwindo]
\Hy@VersionCheck{hdviwind.def}
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hluatex.def b/Master/texmf-dist/tex/latex/hyperref/hluatex.def
index 368215ec0e5..b681ab1c33d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hluatex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hluatex.def
@@ -34,10 +34,10 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hluatex.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for luaTeX]
\Hy@VersionCheck{hluatex.def}
-%% 2024-05-23 v7.01i
+%% 2024-07-10 v7.01j
%% force unicode encoding, see issue #101
%% code mostly copied from hxetex.def
\HyPsd@LoadUnicode
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 564e1a49c62..bc8b4b84fb5 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hpdftex.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for pdfTeX]
\Hy@VersionCheck{hpdftex.def}
\pdf@ifdraftmode{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index b95ece55426..a007ef5e83d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{htex4ht.cfg}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref configuration file for TeX4ht]
\IfFileExists{\jobname.cfg}{\endinput}{}
\Preamble{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
index 7fbf313910a..3b707e5232d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{htex4ht.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for TeX4ht]
\Hy@VersionCheck{htex4ht.def}
\providecommand*{\XR@ext}{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 217aaaadfec..7473dbf4b40 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{htexture.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for Textures]
\Hy@VersionCheck{htexture.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index d199e3464bc..fda74743b20 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hvtex.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for VTeX in PDF/PS mode]
\Hy@VersionCheck{hvtex.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 9f8086bd72b..ddda3f9c1a7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hvtexhtml.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for VTeX in HTML mode]
\Hy@VersionCheck{hvtexhtm.def}
\providecommand*{\XR@ext}{htm}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 2efdf7b1c83..007d5fc37e0 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hvtexmrk.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
\Hy@VersionCheck{hvtexmrk.def}
\providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index b9b74249035..a53590216eb 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hxetex.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for XeTeX]
\Hy@VersionCheck{hxetex.def}
\HyPsd@LoadUnicode
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 960b63f31c0..fd16d9ff212 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -36,7 +36,7 @@
%% File: hyperref.dtx
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\ProvidesPackage{hyperref}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -5903,6 +5903,8 @@
\Hy@temp{calculate}
\Hy@temp{onfocus}
\Hy@temp{onblur}
+\Hy@temp{onmousedown}
+\Hy@temp{onmouseup}
\Hy@temp{onenter}
\Hy@temp{onexit}
\let\Fld@calculate@sortkey\@empty
@@ -5923,8 +5925,6 @@
}%
\fi
\Hy@temp{ondblclick}
-\Hy@temp{onmousedown}
-\Hy@temp{onmouseup}
\Hy@temp{onmouseover}
\Hy@temp{onmousemove}
\Hy@temp{onmouseout}
@@ -7757,6 +7757,7 @@
\let\make@df@tag@@@\Hy@make@df@tag@@@
}{}
}{}
+\def\HyOrg@addtoreset#1#2{\expandafter\@cons\csname cl@#2\endcsname {{#1}}}
\@ifundefined{hyper@nopatch@counter}
{
\let\HyOrg@addtoreset\@addtoreset
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 797bf880919..b03da7b3665 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{hypertex.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref driver for HyperTeX specials]
\Hy@VersionCheck{hypertex.def}
\providecommand*{\XR@ext}{dvi}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index 323af89e368..e6c8822b185 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -34,7 +34,7 @@
%% File: hyperref.dtx
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\ProvidesPackage{nohyperref}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Dummy hyperref (SR)]
\let\hyper@@anchor\@gobble
\def\hyper@link#1#2#3{#3}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index 68a99aaccef..d202fd12697 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{pd1enc.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref: PDFDocEncoding definition (HO)]
\DeclareFontEncoding{PD1}{}{}
\DeclareTextAccent{\`}{PD1}{\textasciigrave}
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
index f8a881fc727..761f6527e91 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{pdfmark.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref definitions for pdfmark specials]
\Hy@VersionCheck{pdfmark.def}
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
index 62cfb0b3495..50f3e63126c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def
+++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{psdextra.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref: Additions to PDF string support]
\Hy@VersionCheck{psdextra.def}
\DeclareTextCommand{\textGamma}{PU}{\83\223}%* U+0393
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 6edb5ae80b2..5e04cf4ad2b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{puarenc.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref: Additions to puenc.def for Arabi]
\DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621
\DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def b/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def
index 18a3e21f4ff..6e983121159 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{puenc-extra.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref: PDF Unicode extra definition (HO)]
\DeclareTextCommand{\G}{PU}[1]{#1\83\017}% U+030F
\DeclareTextCompositeCommand{\G}{PU}{\@empty}{\textdoublegrave}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 820a7035565..8aedd0b78c8 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{puenc.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref: PDF Unicode definition (HO)]
\DeclareFontEncoding{PU}{}{}
\DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index b9920bead2e..e0323c4eb86 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -33,7 +33,7 @@
%%
%% File: hyperref.dtx
\ProvidesFile{puvnenc.def}
- [2024-05-23 v7.01i %
+ [2024-07-10 v7.01j %
Hyperref: Additions to puenc.def for VnTeX]
\DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103
\DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2
diff --git a/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty b/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty
index 6eb3708ccc5..25b1f757bdd 100644
--- a/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty
@@ -34,7 +34,7 @@
%% File: xr-hyper.dtx Copyright (C) 1993-2024 David Carlisle
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xr-hyper}
- [2024-05-23 v7.01i eXternal References (DPC)]
+ [2024-07-10 v7.01j eXternal References (DPC)]
\def\externaldocument{\@testopt\XR@cite{}}
\let\externalcitedocument\externaldocument
\def\XR@cite[#1]{\@testopt{\XR@[#1]}{}}
diff --git a/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls b/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls
index f5df9204692..086c55f2b01 100644
--- a/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls
+++ b/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls
@@ -6,7 +6,7 @@
% ----------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jnuexam}[2024-02-18 v2024E An exam class for Jinan University]
+\ProvidesClass{jnuexam}[2024-07-09 v2024F An exam class for Jinan University]
%% 旧版本的 LaTeX 不能识别 2022-11-01 这种日期格式
%\@ifl@t@r\fmtversion{2022-11-01}{}{
@@ -521,9 +521,10 @@
\let\doscratchpaper=\doscratchpaperone
}
-% 在旧版本 ctex 宏包中不能用 \AtEndDocument 添加含中文的内容,即不能用 \appto 而要用 \preto
+%% 此时 \AtEndDocument{...} 等价于 \AddToHook{enddocument}[jnuexam]{...}
+%% 而且默认会在 \AddToHook{enddocument}[randexam]{...} 所加的代码之后执行
\newcommand{\addscratchpaper}{
- \preto{\@enddocumenthook}{\doscratchpaper}
+ \AtEndDocument{\doscratchpaper}
}
\IfExamBoolF{plain}{\IfExamBoolF{answer}{\addscratchpaper}}
@@ -534,6 +535,7 @@
\DeclareExamTheme{final-chinese}{
\SetExamOption{chinese}
+ \SetExamBoolTrue{evaluator}
\SelectExamTranslation{chinese}
\SetExamValue{exampart}{number=\Chinese}
\SelectExamTemplate{examtitle}{final-chinese}
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
index 154c0bdf712..ccbf32b59c4 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -60,7 +59,7 @@
%% Part of the "lastpage" package
%% loads either lastpage2.09.sty for TeX 2.09 or lastpage2e.sty for LaTeX 2e
%% with code from https://groups.google.com/g/comp.text.tex/c/-Qmhj1ZI4xM
-\def\loadlastpage{\ProvidesPackage{lastpage}[2024/04/27 v2.1a lastpage: 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}
+\def\loadlastpage{\ProvidesPackage{lastpage}[2024/07/07 v2.1c lastpage: 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}
\begingroup \expandafter \ifx \csname documentclass\endcsname\relax
\endgroup \expandafter \input{lastpage209.sty}
\else \endgroup \expandafter \loadlastpage
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
index f93a6d0f1ae..feb652121fa 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty
index 50d8183d2a5..e3b40d7be58 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -59,7 +58,7 @@
%%
%% Part of the "lastpage" package
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{lastpage2e}[2024/04/27 v2.1a %
+\ProvidesPackage{lastpage2e}[2024/07/07 v2.1c %
Decide which 2e lastpage version to use (HMM)]
\@ifl@t@r\fmtversion{2023/06/01}{\RequirePackage{lastpagemodern}}{%
\RequirePackage{lastpageclassic}}
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty b/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty
index d7a4b6ce9af..88285efc2c6 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -59,7 +58,7 @@
%%
%% Part of the "lastpage" package
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{lastpageclassic}[2024/04/27 v2.1a %
+\ProvidesPackage{lastpageclassic}[2024/07/07 v2.1c %
Refers to last page's name (HMM; JPG)]
%% allows for things like "Page \thepage{} of \pageref{LastPage}"
%% to get "Page 7 of 9"
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty b/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty
index efeedd84bb3..abdec5b0852 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: lastpage
-%% Version: 2024-04-27 v2.1a
+%% Version: 2024-07-07 v2.1c
%% Info: Refers to last page's name
%%
%% Copyright (C) 2010 - 2024 by
@@ -32,10 +32,9 @@
%%
%% This package was invented by Jeffrey P. Goldberg.
%% I thought that a replacement was needed and therefore created the pageslts package,
-%% https://ctan.org/pkg/pageslts
-%% . Nevertheless, for compatibility with existing documents/packages as well as for
-%% the low amount of resources needed by the lastpage package (no new counter!),
-%% I updated this package.
+%% https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+%% documents/packages as well as for the low amount of resources needed by the
+%% lastpage package (no new counter!), I updated this package.
%% Thanks go to Jeffrey P. Goldberg for allowing me to do this.
%%
%% While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -59,7 +58,7 @@
%%
%% Part of the "lastpage" package
\NeedsTeXFormat{LaTeX2e}[2023-06-01]
-\ProvidesPackage{lastpagemodern}[2024-04-27 v2.1a %
+\ProvidesPackage{lastpagemodern}[2024-07-07 v2.1c %
Refers to last page's name (HMM; JPG)]
%% allows for things like "Page \thepage{} of \pageref{LastPage}"
%% to get "Page 7 of 9" or "Page VII of IX";
@@ -94,9 +93,43 @@
\if@nobreak\ifvmode\nobreak\fi\fi%
}
-%% similar to https://tex.stackexchange.com/a/12811/6865
-\def\lastpage@rmpage#1{\expandafter\lastpage@currentH#1\relax}
-\def\lastpage@currentH#1.#2\relax{#2}
+\newcommand{\lastpage@makeHy}{%
+ \gdef\lastpage@Hy{}%
+ \IfPackageLoadedTF{hyperref}{%
+ \ifHy@pageanchor%
+ \@ifundefined{@currentHpage}{%
+ \PackageError{lastpage}{%
+ Kernel command \string\@currentHpage\space is undefined}{%
+ Please contact the lastpage maintainer.}%
+ }{\xdef\lastpage@Hptest{Doc-Start}%
+ \ifx\lastpage@Hptest\@currentHpage\relax%
+ \gdef\lastpage@Hy{\@currentHpage}%
+ \else%
+ \edef\lastpage@Hptest{\@currentHpage}%
+ \ifx\lastpage@Hptest\empty\relax%
+ \else%
+ \gdef\lastpage@Hy{\lastpage@rmpage{\@currentHpage}}%
+ \ifx\lastpage@lastpageHy\empty\relax%
+ \PackageWarningNoLine{lastpage}{%
+ \string\@currentHpage\space is\MessageBreak%
+ \meaning\@currentHpage\MessageBreak%
+ not beginning with "page.",\MessageBreak%
+ \string\lastpage@lastpageHy\space is now let empty.}%
+ \fi%
+ \fi%
+ \fi%
+ }%
+ \fi%
+ }{}%
+ }%
+
+%% Code provided by David Carlisle at https://tex.stackexchange.com/a/721877
+\def\lastpage@rmpage#1{%
+ \expandafter\xlastpage@rmpage\expanded{#1}\xlastpage@rmpage page.%
+ \xlastpage@rmpage\xxlastpage@rmpage{#1}}
+\def\xlastpage@rmpage #1page.#2\xlastpage@rmpage#3\xxlastpage@rmpage#4{%
+ \if$\detokenize{#1}$#2%\else#4
+ \fi}
\newcommand{\lastpage@putl@bel}{%
\IfPackageLoadedTF{pageslts}{\relax}{%
@@ -125,8 +158,7 @@
}%
\protected@iwrite\@auxout{}{%
\string\gdef\string\lastpage@lastpage{\thepage}}%
- \gdef\lastpage@Hy{\IfPackageLoadedTF{hyperref}{%
- \ifHy@pageanchor\lastpage@rmpage{\@currentHpage}\fi}{}}%
+ \lastpage@makeHy%
\protected@iwrite\@auxout{}{%
\string\gdef\string\lastpage@lastpageHy{\lastpage@Hy}}%
\addtocounter{page}{+1}%
diff --git a/Master/texmf-dist/tex/latex/lete-sans-math/lete-sans-math.sty b/Master/texmf-dist/tex/latex/lete-sans-math/lete-sans-math.sty
index e6a2377fd9b..c7ab26fb3f0 100644
--- a/Master/texmf-dist/tex/latex/lete-sans-math/lete-sans-math.sty
+++ b/Master/texmf-dist/tex/latex/lete-sans-math/lete-sans-math.sty
@@ -1,9 +1,9 @@
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\def\fileversion{0.40}
-\def\filedate{2024-05-11}
+\def\fileversion{0.41}
+\def\filedate{2024-07-17}
\ProvidesPackage{lete-sans-math}[\filedate\space\fileversion]
-%Ensure luatex or xetex engine
+% Ensure luatex or xetex engine
\RequirePackage{iftex}[2019/10/24]
\RequireTUTeX
\RequirePackage{unicode-math}
@@ -63,6 +63,10 @@
\Umathchardef\mbfdotlessi = 0 0 "E043 \relax
\Umathchardef\mbfdotlessj = 0 0 "E044 \relax
\Umathchardef\mithbar = 0 0 "E048 \relax
+ \Umathchardef\mupvarg = 0 0 "E04B \relax
+ \Umathchardef\mbfvarg = 0 0 "E04C \relax
+ \Umathchardef\mitvarg = 0 0 "E04D \relax
+ \Umathchardef\mbfitvarg = 0 0 "E04E \relax
\Umathchardef\varemptyset = 0 0 "E04F \relax
\Umathchardef\BbbDelta = 0 0 "E050 \relax
\Umathchardef\BbbTheta = 0 0 "E051 \relax
diff --git a/Master/texmf-dist/tex/latex/lie-hasse/lie-hasse.sty b/Master/texmf-dist/tex/latex/lie-hasse/lie-hasse.sty
index d1050d88397..6d727c841cd 100644
--- a/Master/texmf-dist/tex/latex/lie-hasse/lie-hasse.sty
+++ b/Master/texmf-dist/tex/latex/lie-hasse/lie-hasse.sty
@@ -1,24 +1,20 @@
-% The Lie Hasse package.
+% The Lie Hasse package.
+% Version 1.01
%
-% Version 1.0
%
+% This package draws Hasse diagrams of root system posets of simple
+% Lie algebraS, in LaTeX documents, using the TikZ package.
%
-% This package draws Hasse diagrams of root system posets of simple
-% Lie algebraS, in LaTeX documents, using the TikZ package.
+% Benjamin McKay
+% b.mckay@ucc.ie
%
-% Benjamin McKay
-% b.mckay@ucc.ie
-%
-% Released under the LaTeX Project Public License v1.3c or later, see
+% Released under the LaTeX Project Public License v1.3c or later, see
% http://www.latex-project.org/lppl.txt
-%
-%
-%
-%
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{lie-hasse}[2020/02/02 Lie Hasse]
+\ProvidesPackage{lie-hasse}[2024/07/09 Lie Hasse]
\RequirePackage[rgb]{xcolor}
\RequirePackage{dynkin-diagrams}
+\RequirePackage[outline]{contour}
\usetikzlibrary{
positioning,
fadings,
@@ -26,7 +22,7 @@
%%%
%%% Application programming interface:
%%%
-
+\NewDocumentCommand\edgeQuote{m}{\contour{white}{\(#1\)}}
\newif\iflie@hasse@threeD
\lie@hasse@threeDtrue
\xdef\lie@hasse@three@D@shift{.3}%
@@ -40,14 +36,27 @@
\lie@hasse@show@heightfalse
\newif\iflie@hasse@attach@dynkin@diagram
\lie@hasse@attach@dynkin@diagramfalse
-
+\newif\iflie@hasse@show@levi
+\lie@hasse@show@levitrue
+\newif\iflie@hasse@show@unipotent@radical
+\lie@hasse@show@unipotent@radicaltrue
\pgfkeys{
/Lie Hasse diagram/.is family,
/Lie Hasse diagram,
- attach Dynkin diagram/.is if = lie@hasse@attach@dynkin@diagram,
+ attach Dynkin diagram/.is if
+ = lie@hasse@attach@dynkin@diagram,
attach Dynkin diagram/.default = false,
- edge/.style={ultra thick},
- edge quotes/.style={/Dynkin diagram/text style,auto,inner sep=2pt},
+ edge/.style = {
+ ultra thick
+ },
+ edge length/.estore in
+ = \lie@hasse@edge@length,
+ edge length = 1cm,
+ edge quotes/.style={
+ /Dynkin diagram/text style,
+ auto,
+ inner sep=2pt
+ },
compact edge/.style={},
noncompact edge/.style={opacity=0},
compact root/.code={\dynkinDrawSolidRootMark{#1}},
@@ -67,7 +76,13 @@
show widths/.default = false,
show height/.is if = lie@hasse@show@height,
show height/.default = false,
- z shift/.estore in = \lie@hasse@three@D@shift,
+ show Levi/.is if = lie@hasse@show@levi,
+ show Levi/.default = true,
+ show unipotent radical/.is if
+ = lie@hasse@show@unipotent@radical,
+ show unipotent radical/.default = true,
+ z shift/.estore in
+ = \lie@hasse@three@D@shift,
z shift/.default = .3,
top/.style={black!20,opacity=.4},
left/.style={black!20,opacity=.9},
@@ -90,13 +105,17 @@
\dynkin@integer@rank%
}%
{%
- % Turn Satake codes into Dynkin diagram expressions in \dynkin@string.
+ % Turn Satake codes into Dynkin diagram
+ % expressions in \dynkin@string.
\dynkin@grok@Satake@codes%
}%
- % Expand out any digits in \dynkin@string into multiples of the various root marks.
+ % Expand out any digits in \dynkin@string
+ % into multiples of the various root marks.
\expand@Dynkin@Roots@Digits%
- % Assign to \dynkin@roots the input string \dynkin@string with all . symbols removed,
- % so we only get the symbols representing the marks for the various roots.
+ % Assign to \dynkin@roots the input string
+ % \dynkin@string with all . symbols removed,
+ % so we only get the symbols representing
+ % the marks for the various roots.
\StrDel{\dynkin@string}{.}[\temp]%
\xdef\dynkin@roots{\temp}%
\StrLen{\dynkin@roots}[\temp]%
@@ -115,58 +134,33 @@
{%
\pgfkeys{/Lie Hasse diagram/for all roots={#1}{#2}}%
}%
+\newif\iflie@hasse@B
+\newcount\dynkin@rank@plus@one%
\NewDocumentCommand\hasse{O{}mm}%
{%
\ifdefined\filldraw%
- \IfStrEq{#1}{}%
- {%
+ \ifx#1\empty\relax%
\studyHasseDiagramOfRootSystem{#2}{#3}%
- }%
- {%
+ \else%
\studyHasseDiagramOfRootSystem[#1]{#2}{#3}%
- }%
+ \fi%
\label@item@count 0\relax%
\expandafter\forcsvlist%
- \expandafter\add@label%
+ \expandafter\lie@hasse@add@label%
\expandafter{\dynkin@label@list}%
\ifnum\dynkin@rank=1%
\dynkin{A}{1}%
\else%
+ \global\dynkin@rank@plus@one\the\dynkin@rank\relax%
+ \global\advance\dynkin@rank@plus@one by 1\relax%
\add@compact@simple@roots@to@compact@roots{}%
\IfStrEqCase{#2}%
{%%
{A}{\hasse@A}%
- {B}{\hasse@BC}%
- {C}{\hasse@BC*}%
+ {B}{\global\lie@hasse@Btrue\hasse@BC}%
+ {C}{\global\lie@hasse@Bfalse\hasse@BC}%
{D}{\hasse@D}%
- {E}%
- {%
- \ifnum\dynkin@rank=6%
- \hasse@E@six%
- \else%
- \ifnum\dynkin@rank=7%
- \hasse@E@seven%
- \else%
- \ifnum\dynkin@rank=8%
- \hasse@E@eight%
- \else
- \ifnum\dynkin@rank>8%
- \ClassError%
- {Lie Hasse}%
- {Rank of E series Hasse diagram: #3{}%
- exceeds 8; not defined yet}%
- {}%
- \fi%
- \ifnum\dynkin@rank<6%
- \ClassError%
- {Lie Hasse}%
- {Rank of E series Hasse diagram: #3{} less than 6}%
- {}%
- \fi%
- \fi%
- \fi%
- \fi%
- }%
+ {E}{\hasse@E@series}%
{F}%
{%
\ifnum\dynkin@rank=4%
@@ -194,10 +188,11 @@
{Lie Hasse}%
{Lie algebra series #2{} not A,B,C,D,E,F or G}%
{}]%
+ \forAllPositiveRoots{\draw@lie@hasse@root}%
\draw@simple@root@labels%
\fi%
\lie@hasse@write@widths{}%
- \forAllPositiveRootsInHasseDiagram{\doRootThing}%
+ \forAllPositiveRoots{\doRootThing}%
\iflie@hasse@attach@dynkin@diagram%
\attachDynkin%
\fi%
@@ -205,13 +200,42 @@
\begin{tikzpicture}\hasse[#1]{#2}{#3}\end{tikzpicture}%
\fi%
}%
+\NewDocumentCommand\hasse@E@series{}%
+{%
+ \ifnum\dynkin@rank=6%
+ \hasse@E@six%
+ \else%
+ \ifnum\dynkin@rank=7%
+ \hasse@E@seven%
+ \else%
+ \ifnum\dynkin@rank=8%
+ \hasse@E@eight%
+ \else%
+ \ifnum\dynkin@rank>8%
+ \ClassError%
+ {Lie Hasse}%
+ {Rank of E series Hasse diagram: \the\dynkin@rank{}%
+ exceeds 8; not defined yet}%
+ {}%
+ \fi%
+ \ifnum\dynkin@rank<6%
+ \ClassError%
+ {Lie Hasse}%
+ {Rank of E series Hasse diagram: \the\dynkin@rank{}%
+ less than 6; not define yet}%
+ {}%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+}%
\NewDocumentCommand\drawRootAsDynkinSum{mm}%
{%
\rootSum{#1}{#2}{\rs}%
\node at (#1;#2)
{%
\dynkin[%
- labels=\rs,%
+ expand labels=\rs,%
/Lie Hasse diagram/embedded Dynkin diagram]%
{\dynkin@series}{\the\dynkin@rank}%
};%
@@ -239,25 +263,38 @@
}%
\fi%
}%
-
-\NewDocumentCommand\backwardsGtwo{}%
+\NewDocumentCommand\hasseAttachGtwo{}%
{%
- \dynkin[label,backwards,x shift in edge lengths=-1]{G}{\dynkin@roots}%
+ \dynkin[vertical shift=0,%
+ edge length=\lie@hasse@edge@length,%
+% label,%
+% backwards,%
+% x shift in edge lengths=-1
+]{G}{\dynkin@roots}%
}%
-
\newcount\lie@hasse@E@shift%
\NewDocumentCommand\attachDynkin{}%
{%
\IfStrEqCase{\dynkin@series}{%
- {A}{\dynkin{A}{\dynkin@roots}}%
- {B}{\dynkin{B}{\dynkin@roots}}%
- {C}{\dynkin{C}{\dynkin@roots}}%
- {D}{\dynkin[y shift in edge lengths=-1.5,label]%
- {D}{\dynkin@roots}}%
+ {A}{\dynkin[vertical shift=0,%
+ edge length=\lie@hasse@edge@length]%
+ {A}{\dynkin@roots}}%
+ {B}{\dynkin[vertical shift=0,%
+ edge length=\lie@hasse@edge@length]%
+ {B}{\dynkin@roots}}%
+ {C}{\dynkin[vertical shift=0,%
+ edge length=\lie@hasse@edge@length]%
+ {C}{\dynkin@roots}}%
+ {D}{\dynkin[vertical shift=0,%
+ edge length=\lie@hasse@edge@length,%
+ y shift in edge lengths=-1.5,label]%
+ {D}{\dynkin@roots}}%
{E}%
{%%
\ifnum\dynkin@rank=6%
\dynkin[%
+ vertical shift=0,%
+ edge length=\lie@hasse@edge@length,%
upsidedown,%
labels*={1,...,6},%
y shift in edge lengths=.5]%
@@ -266,6 +303,8 @@
\lie@hasse@E@shift\the\dynkin@rank\relax%
\advance\lie@hasse@E@shift by -2\relax%
\dynkin[%
+ vertical shift=0,%
+ edge length=\lie@hasse@edge@length,%
backwards,%
upsidedown,%
label,%
@@ -274,16 +313,17 @@
{E}{\dynkin@roots}%
\fi%
}%%
- {F}{\dynkin{F}{\dynkin@roots}}%
- {G}{\backwardsGtwo{}}%
+ {F}{\dynkin[vertical shift=0,%
+ edge length=\lie@hasse@edge@length]%
+ {F}{\dynkin@roots}}%
+ {G}{\hasseAttachGtwo}%
}%
[\ClassError%
{Lie Hasse}%
- {Lie algebra series \dynkin@series{} not A,B,C,D,E,F or G when attaching Dynkin diagram}%
+ {Lie algebra series \dynkin@series{} %
+ not A,B,C,D,E,F or G when attaching Dynkin diagram}%
{}]%
}%
-
-
\newif\iflie@hasse@multiple@diagrams
\newcommand\doHasseDiagram[1]%%
{%
@@ -291,8 +331,7 @@
\ %
\fi%
\begin{tikzpicture}%
- [show background rectangle,%
- baseline=(current bounding box.east)]]%
+ [show background rectangle,baseline=(current bounding box.east)]%
\hasse#1%
\iflie@hasse@show@height%
\rootSystemHeight{\lie@hasse@height}%
@@ -327,33 +366,25 @@
}%
\begin{center}%
\expandafter\forscsvlist%
- \expandafter\doHasseDiagram%
- \expandafter{#1}%
+ \expandafter\doHasseDiagram\expandafter{#1}%
\end{center}%
}%
-
-
%%%
%%% Package internals:
%%%
-
-
\pgfdeclarelayer{Dynkin middle}
\pgfdeclarelayer{Dynkin above}
\pgfsetlayers{background,Dynkin behind,Dynkin middle,Dynkin above,main}
-
-
\newcommand*\label@list@at[1]{\csname FOOBAR-#1\endcsname}
\newcommand*\defn@label@list@entry[1]{\expandafter\def\csname FOOBAR-#1\endcsname}
\def\add@to@label@list#1#2{\global\defn@label@list@entry{#1}{#2}}%
\newcount\label@item@count%
\label@item@count 0\relax%
-\newcommand\add@label[1]%
+\newcommand\lie@hasse@add@label[1]%
{%
- \advance\label@item@count by 1\relax%
+ \global\advance\label@item@count by 1\relax%
\global\add@to@label@list{\the\label@item@count}{#1}%
}%
-
\xdef\lie@hasse@compact@roots{}%
\NewDocumentCommand\if@compact@root{mmm}%
{%
@@ -369,9 +400,8 @@
\dynkinOrder{\dynkin@series}{\the\dynkin@rank}.Carter::#1->\dynkin@ordering.%
{\current@simple@root}%
\StrChar{\dynkin@roots}{\current@simple@root}[\lie@hasse@root@marker]%
-\IfStrEq{*}{\lie@hasse@root@marker}{#2}{#3}%
+\IfStrEq{x}{\lie@hasse@root@marker}{#3}{#2}%
}%
-
\NewDocumentCommand\add@compact@root{m}%
{%
\if@compact@root{#1}%
@@ -382,53 +412,65 @@
\xdef\lie@hasse@compact@roots{\temp@lie@hasse@compact@roots{ }(#1)}%
}%
}%
-
\newcount\lie@hasse@sr%
-\newcount\drpo%
\NewDocumentCommand\add@compact@simple@roots@to@compact@roots{}%
{%
-\lie@hasse@sr 1\relax%
-\drpo\the\dynkin@rank\relax%
-\advance\drpo by 1\relax%
-\loop%
- \if@compact@simple@root{\the\lie@hasse@sr}%
- {%%
- \add@compact@root{1;\the\lie@hasse@sr}%
- }%%
- {%%
- }%%
- \advance\lie@hasse@sr by 1\relax%
-\ifnum\lie@hasse@sr<\the\drpo%
-\repeat%
+ \lie@hasse@sr 1\relax%
+ \loop%
+ \if@compact@simple@root{\the\lie@hasse@sr}%
+ {%%
+ \add@compact@root{1;\the\lie@hasse@sr}%
+ }%%
+ {%%
+ }%%
+ \advance\lie@hasse@sr by 1\relax%
+ \ifnum\lie@hasse@sr<\the\dynkin@rank@plus@one%
+ \repeat%
}%
-
-\newcount\drmo%
\newcount\lie@hasse@root@count%
\newcount\lie@hasse@root@count@b%
\newcount\max@lie@hasse@root@count%
\newcount\lie@hasse@reorder
-
\NewDocumentCommand\lie@hasse@fix@order{mm}%
{%
\dynkinOrder{\dynkin@series}{\dynkin@rank}.Carter::{#1}->\dynkin@ordering.{#2}%
}%
-
\NewDocumentCommand\draw@one@simple@root@label{mm}%
%% \draw@one@simple@root@label{r}{s}, draw at Carter number r
%% the root with text s.
{%
- \node[below,%
- label=%
- {%
- [below,%
- lie@hasse@color,%
- /Lie Hasse diagram/edge quotes]%
- \(\pgfkeys{/Dynkin diagram/label macro=#2}\)%
- }%
- ]%
- at%
- (1;#1)%
- {};%
+ \if@compact@simple@root{#1}%
+ {%
+ \iflie@hasse@show@levi%
+ \global\lie@hasse@ok@roottrue%
+ \else%
+ \global\lie@hasse@ok@rootfalse%
+ \fi%
+ }%
+ {%
+ \iflie@hasse@show@unipotent@radical%
+ \global\lie@hasse@ok@roottrue%
+ \else%
+ \global\lie@hasse@ok@rootfalse%
+ \fi%
+ }%
+ \iflie@hasse@ok@root%
+ \node[%
+ below,%
+ label=%
+ {%
+ [%
+ below,%
+ lie@hasse@color,%
+ /Lie Hasse diagram/edge quotes%
+ ]%
+ \(\pgfkeys{/Dynkin diagram/label macro={\edgeQuote{#2}}}\)%
+ }%
+ ]%
+ at%
+ (1;#1)%
+ {};%
+ \fi%
}%
\NewDocumentCommand\draw@simple@root@labels{}%
{%
@@ -471,27 +513,56 @@
\pgfmathsetmacro{\lie@hasse@huenum}{#1/\the\dynkin@rank}%
\global\definecolor{lie@hasse@color}{hsb}{\lie@hasse@huenum,1,.6}%
}%
-\NewDocumentCommand\draw@lie@hasse@root{m}%
+\NewDocumentCommand\draw@lie@hasse@root{mm}%
{%
-\if@compact@root{#1}%
-{%%
-\pgfkeys{/Lie Hasse diagram/compact root=#1}%
-}%%
-{%%
-\pgfkeys{/Lie Hasse diagram/noncompact root=#1}%
-}%%
+ \if@compact@root{#1;#2}%
+ {%%
+ \iflie@hasse@show@levi%
+ \pgfkeys{/Lie Hasse diagram/compact root={#1;#2}}%
+ \fi%
+ }%%
+ {%%
+ \iflie@hasse@show@unipotent@radical%
+ \pgfkeys{/Lie Hasse diagram/noncompact root={#1;#2}}%
+ \fi%
+ }%%
}%
-\xdef\lie@hasse@grade@a{}
-\xdef\lie@hasse@grade@b{}
-\xdef\lie@hasse@index@a{}
-\xdef\lie@hasse@index@b{}
\newcount\root@gpo%
\xdef\label@text{}%
+\newif\iflie@hasse@is@levi
+\newif\iflie@hasse@ok@root
\NewDocumentCommand\draw@lie@hasse@edge{O{}mmmm}%
%[edge label options]{from grade}{from index}{to index}{simple root}
{%
\root@gpo #2\relax%
\advance\root@gpo by 1\relax%
+ \if@compact@root{#2;#3}%
+ {%
+ \if@compact@simple@root{#5}%
+ {%
+ \global\lie@hasse@is@levitrue%
+ \add@compact@root{\the\root@gpo;#4}%
+ }%
+ {%
+ \global\lie@hasse@is@levifalse%
+ }%
+ }%
+ {%
+ \global\lie@hasse@is@levifalse%
+ }%
+ \iflie@hasse@is@levi%
+ \iflie@hasse@show@levi%
+ \global\lie@hasse@ok@roottrue%
+ \else%
+ \global\lie@hasse@ok@rootfalse%
+ \fi%
+ \else%
+ \iflie@hasse@show@unipotent@radical%
+ \global\lie@hasse@ok@roottrue%
+ \else%
+ \global\lie@hasse@ok@rootfalse%
+ \fi%
+ \fi%
\set@lie@hasse@color{#5}%
\lie@hasse@fix@order{#5}{\lie@hasse@root@count@b}%
\IfStrEq{\dynkin@label@list}{}%
@@ -505,31 +576,33 @@
}%
}%
\if@compact@simple@root{#5}%
- {%%% Compact
- \draw[%
- lie@hasse@color,%
- /Lie Hasse diagram/edge,%
- /Lie Hasse diagram/compact edge]%
- (#2;#3) --%
- node[lie@hasse@color,/Lie Hasse diagram/edge quotes,#1]%
- {\(\pgfkeys{/Dynkin diagram/label macro=\label@text}\)}%
- (\the\root@gpo;#4);%
- \IfSubStr{\lie@hasse@compact@roots}{#2;#3}%
- {%% adding to a compact
- \add@compact@root{\the\root@gpo;#4}%
- }%%
- {%%
- }%%
+ {%%% Compact simple root, i.e. edge
+ \iflie@hasse@ok@root%
+ \draw[%
+ lie@hasse@color,%
+ /Lie Hasse diagram/edge,%
+ /Lie Hasse diagram/compact edge]%
+ (#2;#3)--%
+ node[lie@hasse@color,/Lie Hasse diagram/edge quotes,#1]%
+ {\(\pgfkeys{/Dynkin diagram/label macro={\edgeQuote{\label@text}}}\)}%
+ (\the\root@gpo;#4);%
+ \fi%
+ \iflie@hasse@is@levi%
+ \fi%
}%%%
{%%% Noncompact
- \draw[%
- lie@hasse@color,%
- /Lie Hasse diagram/edge,%
- /Lie Hasse diagram/noncompact edge]%
- (#2;#3) --%
+ \iflie@hasse@ok@root%
+ \draw
+ [%
+ lie@hasse@color,%
+ /Lie Hasse diagram/edge,%
+ /Lie Hasse diagram/noncompact edge%
+ ]%
+ (#2;#3)--%
node[lie@hasse@color,/Lie Hasse diagram/edge quotes,#1]%
- {\(\pgfkeys{/Dynkin diagram/label macro=\label@text}\)}%
+ {\(\pgfkeys{/Dynkin diagram/label macro={\edgeQuote{\label@text}}}\)}%
(\the\root@gpo;#4);%
+ \fi%
}%%%
}%
\newcount\A@series@grade%
@@ -555,8 +628,8 @@
\coordinate
(\the\A@series@grade;\the\A@series@j)
at
- ({.5*\the\A@series@x*\dynkin@edge@length},
- {.25*\the\A@series@y*\dynkin@edge@length})
+ ({.5*\the\A@series@x*\lie@hasse@edge@length},
+ {.25*\the\A@series@y*\lie@hasse@edge@length})
{};%
\advance\A@series@j by 1\relax%
\advance\A@series@x by 2\relax%
@@ -569,59 +642,35 @@
\ifnum\A@series@grade<\the\max@A@series@grade%
\repeat%
}%
-\newcount\A@series@grade%
-\newcount\max@A@series@grade%
-\NewDocumentCommand\draw@A@roots{}%
-{%
- \A@series@grade 1\relax%
- \max@A@series@grade \the\dynkin@rank\relax%
- \advance\max@A@series@grade by 1\relax%
- \loop%
- \max@A@series@j\the\dynkin@rank\relax%
- \advance\max@A@series@j by -\the\A@series@grade\relax%
- \advance\max@A@series@j by 2\relax%
- \A@series@j 1\relax%
- {%
- \loop%
- \draw@lie@hasse@root%
- {\the\A@series@grade;\the\A@series@j}%
- \advance\A@series@j by 1\relax%
- \ifnum\A@series@j<\the\max@A@series@j%
- \repeat%
- }%
- \advance\A@series@grade by 1\relax%
- \ifnum\A@series@grade<\the\max@A@series@grade%
- \repeat%
-}%
\newcount\maxA@i%
\newcount\maxA@j%
\newcount\A@lbl%
-\newcount\A@i%
-\newcount\A@j%
-\newcount\A@ipo%
+\newcount\lie@hasse@i%
+\newcount\lie@hasse@j%
+\newcount\lie@hasse@ipo%
\newcount\A@rj%
\newcount\A@rjmo%
\NewDocumentCommand\draw@A@edges{}%
{%
\maxA@i\the\dynkin@rank\relax%
- \A@i 1\relax%
+ \lie@hasse@i 1\relax%
\loop%
\maxA@j \the\dynkin@rank\relax%
- \advance\maxA@j by -\the\A@i\relax%
+ \advance\maxA@j by -\the\lie@hasse@i\relax%
\advance\maxA@j by 1\relax%
\ifnum\maxA@j>-1%
- \A@j 1\relax%
+ \lie@hasse@j 1\relax%
{%
\loop%
- \A@lbl\the\A@i\relax%
- \advance\A@lbl by \the\A@j\relax%
- \A@ipo \A@i\relax%
- \advance\A@ipo by 1\relax%
+ \A@lbl\the\lie@hasse@i\relax%
+ \advance\A@lbl by \the\lie@hasse@j\relax%
+ \lie@hasse@ipo \lie@hasse@i\relax%
+ \advance\lie@hasse@ipo by 1\relax%
\draw@lie@hasse@edge[left]%
- {\the\A@i}{\the\A@j}%
- {\the\A@j}{\the\A@lbl}%
+ {\the\lie@hasse@i}{\the\lie@hasse@j}%
+ {\the\lie@hasse@j}{\the\A@lbl}%
\A@rj\the\maxA@j\relax%
- \advance\A@rj by -\the\A@j\relax%
+ \advance\A@rj by -\the\lie@hasse@j\relax%
\advance\A@rj by 1\relax%
\A@rjmo\the\A@rj\relax%
\advance\A@rjmo by -1\relax%
@@ -629,15 +678,15 @@
\advance\A@lbl by \the\dynkin@rank%
\advance\A@lbl by 1%
\draw@lie@hasse@edge[right]%
- {\the\A@i}{\the\A@rj}%
+ {\the\lie@hasse@i}{\the\A@rj}%
{\the\A@rjmo}{\the\A@lbl}%
- \advance\A@j by 1\relax%
- \ifnum\A@j<\the\maxA@j%
+ \advance\lie@hasse@j by 1\relax%
+ \ifnum\lie@hasse@j<\the\maxA@j%
\repeat%
}%
\fi%
- \advance\A@i by 1\relax%
- \ifnum\A@i<\the\maxA@i%
+ \advance\lie@hasse@i by 1\relax%
+ \ifnum\lie@hasse@i<\the\maxA@i%
\repeat%
}%
%% \hasse@A@width@at@grade{g}{\w} sets the counter \w to
@@ -653,7 +702,6 @@
{%
\place@A@roots%
\draw@A@edges%
- \draw@A@roots%
}%
%% \hasse@BC@width@at@grade{g}{\w} sets the counter \w to
%% the value of the width (number of roots) at grade g of
@@ -666,138 +714,116 @@
\global\advance#2 by 1\relax%
\global\divide#2 by 2\relax%
}%
-\newcount\tdrmt%
-\newcount\tdrmo%
+\newcount\twice@dynkin@rank@minus@one%
\newcount\max@BC@r%
\newcount\BC@r%
\newcount\BC@series@x%
\newcount\BC@series@y%
\NewDocumentCommand\place@BC@roots{}%
{%
-\drmo \the\dynkin@rank\relax%
-\advance\drmo by -1\relax%
-\tdrmt \the\drmo\relax%
-\advance\tdrmt by \the\drmo\relax%
-\tdrmo \the\tdrmt\relax%
-\advance\tdrmo 1\relax%
-\max@BC@r \the\dynkin@rank\relax%
-\advance\max@BC@r by 1\relax%
-\BC@r 1\relax%
-\loop%
- \BC@series@x \the\BC@r\relax%
- \advance\BC@series@x by -1\relax%
- \advance\BC@series@x by \the\BC@series@x\relax%
- \BC@series@y 1\relax%
- {%%
+ \twice@dynkin@rank@minus@one \the\dynkin@rank\relax%
+ \advance\twice@dynkin@rank@minus@one by \the\dynkin@rank\relax%
+ \advance\twice@dynkin@rank@minus@one by -1\relax%
+ \max@BC@r \the\dynkin@rank\relax%
+ \advance\max@BC@r by 1\relax%
+ \BC@r 1\relax%
\loop%
- \coordinate
- (\the\BC@series@y;\the\BC@r)
- at
- ({.5*\the\BC@series@x*\dynkin@edge@length},
- {.5*(\the\BC@series@y-1)*\dynkin@edge@length})
- {};%
- \advance\BC@series@y by 1\relax%
- \advance\BC@series@x by 1\relax%
- \ifnum\BC@series@x<\the\tdrmo\repeat%
- }%%
- \advance\BC@r by 1\relax%
- \ifnum\BC@r<\the\max@BC@r%
-\repeat%
+ \BC@series@x \the\BC@r\relax%
+ \advance\BC@series@x by -1\relax%
+ \advance\BC@series@x by \the\BC@series@x\relax%
+ \BC@series@y 1\relax%
+ {%%
+ \loop%
+ \coordinate
+ (\the\BC@series@y;\the\BC@r)
+ at
+ ({.5*\the\BC@series@x*\lie@hasse@edge@length},
+ {.5*(\the\BC@series@y-1)*\lie@hasse@edge@length})
+ {};%
+ \advance\BC@series@y by 1\relax%
+ \advance\BC@series@x by 1\relax%
+ \ifnum\BC@series@x<\the\twice@dynkin@rank@minus@one\repeat%
+ }%%
+ \advance\BC@r by 1\relax%
+ \ifnum\BC@r<\the\max@BC@r%
+ \repeat%
+}%
+\newcount\BC@height%
+\newcount\BC@g%
+\NewDocumentCommand\draw@BC@edges{}%
+{%
+ \rootSystemHeight{\BC@height}%
+ \ifnum\BC@height>1%
+ \BC@g 1\relax%
+ \loop%
+ \draw@BC@edges@at@grade{\the\BC@g}%
+ \global\advance\BC@g by 1\relax%
+ \ifnum\BC@g<\BC@height%
+ \repeat%
+ \fi%
}%
-\newcount\max@BC@i%
\newcount\BC@i%
-\newcount\BC@series@x%
-\newcount\BC@series@y%
+\newcount\BC@width%
+\newcount\BC@width@plus@one%
+\NewDocumentCommand\draw@BC@edges@at@grade{m}%
+{%
+ \rootSystemWidthAtGrade{#1}{\BC@width}%
+ \BC@width@plus@one \BC@width\relax%
+ \advance \BC@width@plus@one by 1\relax%
+ \BC@i 1\relax%
+ {%
+ \loop%
+ \draw@BC@edges@at@root{#1}{\the\BC@i}%
+ \global\advance\BC@i by 1\relax%
+ \ifnum\BC@i<\BC@width@plus@one\repeat%
+ }%
+}%
+\newcount\BC@height%
\newcount\BC@ii%
-\newcount\BC@series@yy%
-\newcount\BC@series@yy%
-\newcount\lbl%
+\newif\ifBC@draw%
+\newcount\lie@hasse@lbl%
\newcount\temp@lbl%
-\NewDocumentCommand\draw@BC@edges{s}%
-{%
-\tdrmo \the\dynkin@rank\relax%
-\advance\tdrmo by \the\dynkin@rank\relax%
-\advance\tdrmo by -1\relax%
-\max@BC@i \the\dynkin@rank\relax%
-\advance\max@BC@i by 1\relax%
-\BC@i 1\relax%
-\loop%
- \BC@series@x \the\BC@i\relax%
- \advance\BC@series@x by \the\BC@i\relax%
- \advance\BC@series@x by -2\relax%
- \BC@series@y 1\relax%
- {%%
- \loop%
- \ifnum\BC@i>1%
- % draw an edge upward to the left
- \BC@ii \the\BC@i\relax%
- \advance\BC@ii by -1\relax%
- \BC@series@yy \the\BC@series@y\relax%
- \advance\BC@series@yy by 1\relax%
- \draw@lie@hasse@edge[right]%
- {\the\BC@series@y}{\the\BC@i}%
- {\the\BC@ii}%
- {\the\BC@ii}%
+\NewDocumentCommand\draw@BC@edges@at@root{mm}%
+{%
+ \ifnum#2>1%
+ % draw an edge upward to the left
+ \BC@ii #2\relax%
+ \advance\BC@ii by -1\relax%
+ \draw@lie@hasse@edge[right]%
+ {#1}{#2}%
+ {\the\BC@ii}
+ {\the\BC@ii}%
+ \fi%
+ \BC@drawtrue%
+ \ifodd#1
+ \ifnum#2=\the\BC@width%
+ \global\BC@drawfalse%
\fi%
- \ifnum\BC@series@y>1%
- % draw an edge downward to the left
- \BC@series@yy \the\BC@series@y\relax%
- \advance\BC@series@yy by -1\relax%
- \lbl \the\BC@i\relax%
- \advance\lbl by \the\BC@series@y\relax%
- \advance\lbl by -1\relax%
- \ifnum\dynkin@rank<\the\lbl%
- \temp@lbl \the\lbl\relax%
- \lbl \the\dynkin@rank\relax%
- \advance\lbl by \the\dynkin@rank%
- \advance\lbl by -\the\temp@lbl%
+ \fi%
+ \ifBC@draw%
+ % draw an edge upward to the right
+ \lie@hasse@lbl #2\relax%
+ \advance\lie@hasse@lbl by #1\relax%
+ \ifnum\dynkin@rank<\the\lie@hasse@lbl%
+ \temp@lbl \the\lie@hasse@lbl\relax%
+ \lie@hasse@lbl \the\dynkin@rank\relax%
+ \advance\lie@hasse@lbl by \the\dynkin@rank%
+ \advance\lie@hasse@lbl by -\the\temp@lbl%
%% For the B series:
- \IfBooleanF{#1}{\global\advance\lbl by 1\relax}%
- \draw@lie@hasse@edge[left]%
- {\the\BC@series@yy}{\the\BC@i}%
- {\the\BC@i}%
- {\the\lbl}%
- \else%
- \draw@lie@hasse@edge[left]%
- {\the\BC@series@yy}{\the\BC@i}%
- {\the\BC@i}%
- {\the\lbl}%
+ \iflie@hasse@B%
+ \global\advance\lie@hasse@lbl by 1\relax%
\fi%
+ \draw@lie@hasse@edge[left]%
+ {#1}{#2}%
+ {#2}%
+ {\the\lie@hasse@lbl}%
+ \else%
+ \draw@lie@hasse@edge[left]%
+ {#1}{#2}%
+ {#2}%
+ {\the\lie@hasse@lbl}%
\fi%
- \advance\BC@series@y by 1\relax%
- \advance\BC@series@x by 1\relax%
- \ifnum\BC@series@x<\the\tdrmo\repeat%
- }%%
- \advance\BC@i by 1\relax%
- \ifnum\BC@i<\the\max@BC@i%
-\repeat%
-}%
-\newcount\tdrpt%
-\newcount\BC@r%
-\newcount\BC@series@y%
-\newcount\maxy%
-\NewDocumentCommand\draw@BC@roots{}%
-{%
-\tdrpt \the\dynkin@rank\relax%
-\advance\tdrpt by \the\dynkin@rank\relax%
-\advance\tdrpt by 2\relax%
-\max@BC@r \the\dynkin@rank\relax%
-\advance\max@BC@r by 1\relax%
-\BC@r 1\relax%
-\loop%
- \BC@series@y 1\relax%
- \maxy \tdrpt\relax%
- \advance\maxy -\the\BC@r\relax%
- \advance\maxy -\the\BC@r\relax%
- {%%
- \loop%
- \draw@lie@hasse@root{\the\BC@series@y;\the\BC@r}%
- \advance\BC@series@y by 1\relax%
- \ifnum\BC@series@y<\the\maxy\repeat%
- }%%
- \advance\BC@r by 1\relax%
- \ifnum\BC@r<\the\max@BC@r%
-\repeat%
+ \fi%
}%
\NewDocumentCommand\hasse@BC{s}% star for C:
{%
@@ -809,7 +835,6 @@
{%
\draw@BC@edges%
}%
- \draw@BC@roots%
}%
\NewDocumentCommand\hasse@D{}%
{%
@@ -818,51 +843,45 @@
\iflie@hasse@threeD%
\draw@D@hasse@three@D%
\fi%
- \draw@D@roots%
}%
-\newcount\drmt%
\NewDocumentCommand\draw@D@hasse@three@D{}%
{%
- \drmo \the\dynkin@rank\relax%
- \advance\drmo by -1\relax%
- \drmt \the\dynkin@rank\relax%
- \advance\drmt by -2\relax%
\begin{pgfonlayer}{Dynkin middle}%
\fill[/Lie Hasse diagram/left]
- (\the\drmt;1) --
- (\the\drmo;1) --
+ (\the\dynkin@rank@minus@two;1) --
+ (\the\dynkin@rank@minus@one;1) --
(\the\dynkin@rank;1) --
- (\the\drmo;2) --
+ (\the\dynkin@rank@minus@one;2) --
cycle;%
\fill[/Lie Hasse diagram/top]
- (\the\drmt;1) --
- (1;\the\drmt) --
- (2;\the\drmo) --
- (\the\drmo;2) --
+ (\the\dynkin@rank@minus@two;1) --
+ (1;\the\dynkin@rank@minus@two) --
+ (2;\the\dynkin@rank@minus@one) --
+ (\the\dynkin@rank@minus@one;2) --
cycle;%
\fill[/Lie Hasse diagram/top]
- (\the\drmo;2) --
+ (\the\dynkin@rank@minus@one;2) --
(\the\dynkin@rank;1) --
- (3;\the\drmo) --
- (2;\the\drmo) --
+ (3;\the\dynkin@rank@minus@one) --
+ (2;\the\dynkin@rank@minus@one) --
cycle;%
\fill[/Lie Hasse diagram/top]
- (\the\drmo;1) --
+ (\the\dynkin@rank@minus@one;1) --
(\the\dynkin@rank;1) --
- (3;\the\drmo) --
- (2;\the\drmt) --
+ (3;\the\dynkin@rank@minus@one) --
+ (2;\the\dynkin@rank@minus@two) --
cycle;%
\fill[/Lie Hasse diagram/top]
- (\the\drmt;1) --
- (\the\drmo;1) --
- (2;\the\drmt) --
- (1;\the\drmt) --
+ (\the\dynkin@rank@minus@two;1) --
+ (\the\dynkin@rank@minus@one;1) --
+ (2;\the\dynkin@rank@minus@two) --
+ (1;\the\dynkin@rank@minus@two) --
cycle;%
\fill[/Lie Hasse diagram/left]
- (1;\the\drmt) --
- (2;\the\drmt) --
- (3;\the\drmo) --
- (2;\the\drmo) --
+ (1;\the\dynkin@rank@minus@two) --
+ (2;\the\dynkin@rank@minus@two) --
+ (3;\the\dynkin@rank@minus@one) --
+ (2;\the\dynkin@rank@minus@one) --
cycle;%
\end{pgfonlayer}%
}%
@@ -883,9 +902,7 @@
\newcount\D@g%
\newcount\maxD@grd%
\newcount\D@grd%
-\newcount\maxxD%
-\newcount\iD%
-\newcount\xxD%
+\newcount\lie@hasse@D@x%
\newcount\sum@D%
\NewDocumentCommand\place@D@roots{}%
{%
@@ -918,37 +935,34 @@
\repeat%
}%
}%
-\newcount\drpo%
\NewDocumentCommand\place@D@root@at{mm}%
{%
- \xxD #1\relax%
- \advance\xxD by #2\relax%
- \advance\xxD by #2\relax%
- \advance\xxD by -3\relax%
- \drpo \the\dynkin@rank\relax%
- \advance\drpo by 1\relax%
+ \lie@hasse@D@x #1\relax%
+ \advance\lie@hasse@D@x by #2\relax%
+ \advance\lie@hasse@D@x by #2\relax%
+ \advance\lie@hasse@D@x by -3\relax%
\sum@D #1\relax%
\advance\sum@D by #2\relax%
\ifnum\sum@D=\the\dynkin@rank%
\global\def\D@root@x%
- {\the\xxD-\lie@hasse@three@D@shift}%
+ {\the\lie@hasse@D@x-\lie@hasse@three@D@shift}%
\else%
- \ifnum\sum@D=\the\drpo%
+ \ifnum\sum@D=\the\dynkin@rank@plus@one%
\ifnum#1<\the\dynkin@rank%
\global\def\D@root@x%
- {\the\xxD-2+\lie@hasse@three@D@shift}%
+ {\the\lie@hasse@D@x-2+\lie@hasse@three@D@shift}%
\else%
- \global\def\D@root@x{\the\xxD}%
+ \global\def\D@root@x{\the\lie@hasse@D@x}%
\fi%
\else%
\ifnum\sum@D<\the\dynkin@rank%
- \global\def\D@root@x{\the\xxD}%
+ \global\def\D@root@x{\the\lie@hasse@D@x}%
\else%
% if \sum@D exceeds rank+1
\ifnum#1<\the\dynkin@rank%
- \global\def\D@root@x{\the\xxD-2}%
+ \global\def\D@root@x{\the\lie@hasse@D@x-2}%
\else%
- \global\def\D@root@x{\the\xxD}%
+ \global\def\D@root@x{\the\lie@hasse@D@x}%
\fi%
\fi%
\fi%
@@ -956,7 +970,7 @@
\coordinate
(#1;#2)
at
- ({(\D@root@x)*\dynkin@edge@length/2},{(#1-1)*\dynkin@edge@length/2})
+ ({(\D@root@x)*\lie@hasse@edge@length/2},{(#1-1)*\lie@hasse@edge@length/2})
{};%
}%
\NewDocumentCommand\draw@D@edges{}%
@@ -983,7 +997,8 @@
\D@r 1\relax%
{%
\loop%
- \draw@D@edges@at{#1}{\the\D@r}{\the\max@D@roots}%
+%%% \draw@D@edges@at{#1}{\the\D@r}{\the\max@D@roots}%
+ \draw@D@edges@at{#1}{\the\D@r}%
\advance\D@r by 1\relax%
\ifnum\D@r<\the\max@D@roots@plus@one%
\repeat%
@@ -1000,10 +1015,6 @@
\newcount\hasse@D@label%
\NewDocumentCommand\draw@D@edges@at{mm}%
{%
- \drmo\the\dynkin@rank\relax%
- \advance\drmo by -1\relax%
- \drpo \the\dynkin@rank\relax%
- \advance\drpo by 1\relax%
\hasse@D@gpo#1\relax%
\advance\hasse@D@gpo by 1\relax%
\hasse@D@gpi#1\relax%
@@ -1035,7 +1046,7 @@
\xdef\hasse@D@layer{Dynkin above}%
\else%
% below or middle.
- \ifnum\hasse@D@gpi=\the\drpo%
+ \ifnum\hasse@D@gpi=\the\dynkin@rank@plus@one%
\xdef\hasse@D@layer{Dynkin behind}%
\fi%
\fi%
@@ -1045,7 +1056,7 @@
\fi%
\fi%
\ifnum\dynkin@rank>#1%
- \ifnum\hasse@D@gpi<\the\drpo%
+ \ifnum\hasse@D@gpi<\the\dynkin@rank@plus@one%
\else%
\global\advance\hasse@D@label -1\relax%
\fi%
@@ -1069,7 +1080,7 @@
\fi%
\fi%
\ifnum#1=1%
- \ifnum\drmo=#2%
+ \ifnum\dynkin@rank@minus@one=#2%
\global\hasse@Dfalse\relax%
\else%
\xdef\hasse@D@LR{right}%
@@ -1080,13 +1091,13 @@
\ifnum\hasse@D@label>\the\dynkin@rank%
\hasse@D@label -\hasse@D@label\relax%
\advance\hasse@D@label \the\dynkin@rank\relax%
- \advance\hasse@D@label \the\drmo\relax%
+ \advance\hasse@D@label \the\dynkin@rank@minus@one\relax%
\fi%
- \ifnum\drmo<#1%
+ \ifnum\dynkin@rank@minus@one<#1%
\else%
\ifnum#2=1%
\else%
- \ifnum\hasse@D@gpi<\the\drpo%
+ \ifnum\hasse@D@gpi<\the\dynkin@rank@plus@one%
\else%
\advance\hasse@D@label 1\relax%
\fi%
@@ -1099,11 +1110,11 @@
\global\advance\hasse@D@target by 1\relax%
\fi%
\else%
- \ifnum\drmo=#1%
+ \ifnum\dynkin@rank@minus@one=#1%
\global\advance\hasse@D@target by -1\relax%
\fi%
\fi%
- \ifnum\hasse@D@gpi=\the\drpo%
+ \ifnum\hasse@D@gpi=\the\dynkin@rank@plus@one%
\ifnum#2>1%
\xdef\hasse@D@layer{Dynkin behind}%
\xdef\hasse@D@LR{right}%
@@ -1112,7 +1123,7 @@
\ifnum\hasse@D@gpi=\the\dynkin@rank%
\xdef\hasse@D@layer{Dynkin above}%
\else%
- \ifnum\hasse@D@gpi=\the\drmo%
+ \ifnum\hasse@D@gpi=\the\dynkin@rank@minus@one%
\xdef\hasse@D@layer{Dynkin above}%
\else%
\xdef\hasse@D@layer{Dynkin middle}%
@@ -1129,7 +1140,7 @@
\end{pgfonlayer}%
\fi%
% % Draw any other edges.
- \ifnum\hasse@D@gpi=\the\drmo%
+ \ifnum\hasse@D@gpi=\the\dynkin@rank@minus@one%
\hasse@D@target#2\relax%
\advance\hasse@D@target by 1\relax%
\begin{pgfonlayer}{Dynkin behind}
@@ -1142,38 +1153,7 @@
}%
\newcount\maxD@grd%
\newcount\D@grd%
-\newcount\maxxD%
\newcount\sum@D%
-\NewDocumentCommand\draw@D@roots{}%
-{%
- \drmo \the\dynkin@rank\relax%
- \advance\drmo by -1\relax%
- \maxD@grd \the\dynkin@rank\relax%
- \advance\maxD@grd by \the\dynkin@rank\relax%
- \advance\maxD@grd by -2\relax%
- \D@grd 1\relax%
- \loop%
- % Construct the roots at grade \D@grd.
- \draw@D@roots@at@grade{\D@grd}%
- \advance\D@grd by 1\relax%
- \ifnum\D@grd<\the\maxD@grd%
- \repeat%
-}%
-\NewDocumentCommand\draw@D@roots@at@grade{m}%
-{%
- \hasse@D@width@at@grade{#1}{\max@D@roots}%
- \max@D@roots@plus@one \the\max@D@roots\relax%
- \advance\max@D@roots@plus@one 1\relax%
- \D@r 1\relax%
- {%
- \loop%
- \draw@lie@hasse@root{\the\D@grd;\the\D@r}%
- \advance\D@r by 1\relax%
- \ifnum\D@r<\the\max@D@roots@plus@one%
- \repeat%
- }%
-}%
-%}%
\newcount\lie@hasse@grade@no
\newcount\lie@hasse@root@no
\def\lie@hasse@XX{}
@@ -1205,14 +1185,14 @@
\coordinate
(\the\lie@hasse@grade@no;\the\lie@hasse@root@no)
at
- ({\lie@hasse@XX*\dynkin@edge@length/2},
- {(\the\lie@hasse@grade@no-1)*\dynkin@edge@length/2}) {};%
+ ({\lie@hasse@XX*\lie@hasse@edge@length/2},
+ {(\the\lie@hasse@grade@no-1)*\lie@hasse@edge@length/2}) {};%
\global\advance\lie@hasse@root@no by 1%
}%
\NewDocumentCommand\lie@hasse@place@root@list{m}%
{%
\global\lie@hasse@root@no 1\relax%
- \expandafter\forcsvlist\expandafter{\lie@hasse@place@root}{#1}%
+ \expandafter\forcsvlist\expandafter\lie@hasse@place@root{#1}%
\global\advance\lie@hasse@grade@no by 1%
}%
\NewDocumentCommand\lie@hasse@place@roots{m}%
@@ -1224,26 +1204,6 @@
}%
\expandafter\docsvlist\expandafter{#1}%
}%
-\NewDocumentCommand\lie@hasse@draw@root{m}%
-{%
- \draw@lie@hasse@root{\the\lie@hasse@grade@no;\the\lie@hasse@root@no}%
- \global\advance\lie@hasse@root@no by 1%
-}%
-\NewDocumentCommand\lie@hasse@root@draw@list{m}%
-{%
- \global\lie@hasse@root@no 1\relax%
- \expandafter\forcsvlist\expandafter{\lie@hasse@draw@root}{#1}%
- \global\advance\lie@hasse@grade@no by 1%
-}%
-\NewDocumentCommand\lie@hasse@draw@roots{m}%
-{%
- \global\lie@hasse@grade@no 1\relax%
- \renewcommand*{\do}[1]%
- {%
- \lie@hasse@root@draw@list{##1}%
- }%
- \expandafter\docsvlist\expandafter{#1}%
-}%
\newcount\lie@hasse@grade@no@plus@one%
\newcount\lie@hasse@edge@count%
\def\lie@hasse@edge@go{%
@@ -1256,7 +1216,8 @@
{%
\global\advance\lie@hasse@edge@count by 1\relax%
\begin{pgfonlayer}{Dynkin above}%
- \lie@hasse@finish@edge#1!%
+%%? \lie@hasse@finish@edge#1!%
+ \lie@hasse@finish@edge#1\relax%
\end{pgfonlayer}%
}%
\def\lie@hasse@process@edge@behind#1!%
@@ -1289,13 +1250,12 @@
\NewDocumentCommand\lie@hasse@process@edge@lists{m}%
{%
\global\lie@hasse@grade@no 1\relax%
- \expandafter\forcsvlist\expandafter{\lie@hasse@process@edge@list}{#1}%
+ \expandafter\forcsvlist\expandafter\lie@hasse@process@edge@list{#1}%
}%
\NewDocumentCommand\hasse@X{mm}%
{%
\lie@hasse@place@roots{#1}%
\lie@hasse@process@edge@lists{#2}%
- \lie@hasse@draw@roots{#1}%
}%
\NewDocumentCommand\hasse@E@six@width@at@grade{mm}%
{%
@@ -1323,7 +1283,11 @@
#2 1%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
}%
-% In the following code, edges are described by grade: in grade g, the expression i+r<j. means an edge from g;i to (g+1);j labelled by root r, with a label on the left; use > instead of < to get the right. Use a star in front to get this edge on the higher layer.
+% In the following code, edges are described by grade:
+% in grade g, the expression i+r<j. means an edge from
+% g;i to (g+1);j labelled by root r, with a label on
+% the left; use > instead of < to get the right. Use a
+% star in front to get this edge on the higher layer.
\NewDocumentCommand\hasse@E@six{}%
{%
\hasse@X%
@@ -1353,13 +1317,45 @@
}%%%
\iflie@hasse@threeD%
\begin{pgfonlayer}{Dynkin middle}%
-\fill[/Lie Hasse diagram/top] (2;1) -- (5;3) -- (2;5) -- (1;5) -- (2;4) -- (1;3) -- (2;2) -- (1;2) -- cycle;%
-\fill[/Lie Hasse diagram/top] (2;3) -- (4;1) -- (6;2) -- (4;5) -- cycle;%
-\fill[/Lie Hasse diagram/right] (1;3) -- (2;3) -- (4;5) -- (3;5) -- cycle;%
-\fill[/Lie Hasse diagram/left] (3;1) -- (4;1) -- (2;3) -- (1;3) -- cycle;%
-\fill[/Lie Hasse diagram/left] (4;3) -- (5;1) -- (6;1) -- (5;2) -- cycle;%
-\fill[/Lie Hasse diagram/right] (4;3) -- (5;2) -- (6;3) -- (5;4) -- cycle;%
-\fill[/Lie Hasse diagram/top] (5;2) -- (7;1) -- (9;1) -- (7;3) -- cycle;%
+ \fill[/Lie Hasse diagram/top]
+ (2;1) --
+ (5;3) --
+ (2;5) --
+ (1;5) --
+ (2;4) --
+ (1;3) --
+ (2;2) --
+ (1;2) -- cycle;%
+ \fill[/Lie Hasse diagram/top]
+ (2;3) --
+ (4;1) --
+ (6;2) --
+ (4;5) -- cycle;%
+ \fill[/Lie Hasse diagram/right]
+ (1;3) --
+ (2;3) --
+ (4;5) --
+ (3;5) -- cycle;%
+ \fill[/Lie Hasse diagram/left]
+ (3;1) --
+ (4;1) --
+ (2;3) --
+ (1;3) -- cycle;%
+ \fill[/Lie Hasse diagram/left]
+ (4;3) --
+ (5;1) --
+ (6;1) --
+ (5;2) -- cycle;%
+ \fill[/Lie Hasse diagram/right]
+ (4;3) --
+ (5;2) --
+ (6;3) --
+ (5;4) -- cycle;%
+ \fill[/Lie Hasse diagram/top]
+ (5;2) --
+ (7;1) --
+ (9;1) --
+ (7;3) -- cycle;%
\end{pgfonlayer}%
\fi%
}%
@@ -1399,7 +1395,6 @@
#2 1%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
}%
-
\NewDocumentCommand\hasse@E@seven{}%
{%
\hasse@X%
@@ -1457,20 +1452,64 @@
}%%%
\iflie@hasse@threeD%
\begin{pgfonlayer}{Dynkin middle}%
-\fill[/Lie Hasse diagram/top] (2;1) -- (6;3) -- (2;6) -- (1;6) -- (2;5) -- (1;4) -- (2;3) -- (1;3) --
- (2;2) -- (1;2) -- cycle;%
-\fill[/Lie Hasse diagram/top] (5;1) -- (7;3) -- (4;6) -- (2;4) -- cycle;%
-\fill[/Lie Hasse diagram/top] (7;1) -- (9;3) -- (7;5) -- (5;4) -- cycle;%
-\fill[/Lie Hasse diagram/top] (9;1) -- (12;1) -- (13;1) -- (14;1) -- (11;3) -- (7;2) -- cycle;%
-\fill[/Lie Hasse diagram/right] (1;4) -- (2;4) -- (4;6) -- (3;6) -- cycle;%
-\fill[/Lie Hasse diagram/left] (4;1) -- (5;1) -- (2;4) -- (1;4) -- cycle;%
-\fill[/Lie Hasse diagram/left] (4;4) -- (6;1) -- (8;1) -- (7;2) -- (6;2) -- (5;4) -- cycle;%
-\fill[/Lie Hasse diagram/right] (4;4) -- (5;4) -- (6;5) -- (5;6) -- cycle;%
-\fill[/Lie Hasse diagram/right] (6;2) -- (7;2) -- (9;4) -- (8;4) -- cycle;%
+ \fill[/Lie Hasse diagram/top]
+ (2;1) --
+ (6;3) --
+ (2;6) --
+ (1;6) --
+ (2;5) --
+ (1;4) --
+ (2;3) --
+ (1;3) --
+ (2;2) --
+ (1;2) -- cycle;%
+ \fill[/Lie Hasse diagram/top]
+ (5;1) --
+ (7;3) --
+ (4;6) --
+ (2;4) -- cycle;%
+ \fill[/Lie Hasse diagram/top]
+ (7;1) --
+ (9;3) --
+ (7;5) --
+ (5;4) -- cycle;%
+ \fill[/Lie Hasse diagram/top]
+ (9;1) --
+ (12;1) --
+ (13;1) --
+ (14;1) --
+ (11;3) --
+ (7;2) -- cycle;%
+ \fill[/Lie Hasse diagram/right]
+ (1;4) --
+ (2;4) --
+ (4;6) --
+ (3;6) -- cycle;%
+ \fill[/Lie Hasse diagram/left]
+ (4;1) --
+ (5;1) --
+ (2;4) --
+ (1;4) -- cycle;%
+ \fill[/Lie Hasse diagram/left]
+ (4;4) --
+ (6;1) --
+ (8;1) --
+ (7;2) --
+ (6;2) --
+ (5;4) -- cycle;%
+ \fill[/Lie Hasse diagram/right]
+ (4;4) --
+ (5;4) --
+ (6;5) --
+ (5;6) -- cycle;%
+ \fill[/Lie Hasse diagram/right]
+ (6;2) --
+ (7;2) --
+ (9;4) --
+ (8;4) -- cycle;%
\end{pgfonlayer}%
\fi%
}%
-
\NewDocumentCommand\hasse@E@eight@width@at@grade{mm}%
{%
\ifnum#1=1%
@@ -1527,7 +1566,6 @@
#2 1%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
}%
-
\NewDocumentCommand\hasse@E@eight{}%
{%
\hasse@X{%
@@ -1754,11 +1792,11 @@
{{0,2,4,6},{1,3,5},{2,3:1,4},{2:1,3,4:1},{1:1,3:1,5:1},{2:1,4:1},{1:1,3:1},{2:1},{2:2},{2:3},{2:4}}%
{% grades:
{% 1
-1+2<1,*2+3<2,*3+4<3,*2+1>1,*3+2>2,4+3>3},
+1+2<1,*2+3>2,*3+4>3,*2+1<1,*3+2<2,4+3>3},
{% 2
-*1+3<1,*2+4<3,*2+3<2,*2+1<1,3+2>3},
+*1+3<1,*2+4>3,*2+1<1,*2+3>2,3+2>3},
{% 3
-*1+3<1,1+4<2,*2+4<3,*2+1<1,3+1>2,*3+3>3},
+*1+3<1,1+4>2,*2+4>3,*2+1<1,3+1>2,*3+3>3},
{% 4
*1+2<1,*1+4<2,2+3<2,*3+1>2,*3+4>3},
{% 5
@@ -2026,8 +2064,8 @@
}%
\global\root@sum@resetfalse%
}%
-\xdef\my@root@sum{}%
-\xdef\my@fixed@root@sum{}%
+\xdef\lie@hasse@root@sum{}%
+\xdef\lie@hasse@fixed@root@sum{}%
\NewDocumentCommand\rootSum{oommm}%
{%
\IfValueT{#1}%
@@ -2053,15 +2091,15 @@
\fi%
\IfStrEqCase{\dynkin@series}%
{%
- {A}{\hasse@A@root@sum{#3}{#4}{\my@root@sum}}%
- {B}{\hasse@B@root@sum{#3}{#4}{\my@root@sum}}%
- {C}{\hasse@C@root@sum{#3}{#4}{\my@root@sum}}%
- {D}{\hasse@D@root@sum{#3}{#4}{\my@root@sum}}%
- {E}{\xdef\my@root@sum{\exceptional@root@sum{#3;#4}}}%
- {F}{\xdef\my@root@sum{\exceptional@root@sum{#3;#4}}}%
- {G}{\xdef\my@root@sum{\exceptional@root@sum{#3;#4}}}%
+ {A}{\hasse@A@root@sum{#3}{#4}{\lie@hasse@root@sum}}%
+ {B}{\hasse@B@root@sum{#3}{#4}{\lie@hasse@root@sum}}%
+ {C}{\hasse@C@root@sum{#3}{#4}{\lie@hasse@root@sum}}%
+ {D}{\hasse@D@root@sum{#3}{#4}{\lie@hasse@root@sum}}%
+ {E}{\xdef\lie@hasse@root@sum{\exceptional@root@sum{#3;#4}}}%
+ {F}{\xdef\lie@hasse@root@sum{\exceptional@root@sum{#3;#4}}}%
+ {G}{\xdef\lie@hasse@root@sum{\exceptional@root@sum{#3;#4}}}%
}%
- \StrSubstitute{\my@root@sum}{.}{,}[#5]%
+ \StrSubstitute{\lie@hasse@root@sum}{.}{,}[#5]%
}%
%% \rootSystemHeight[G][2]{\h} sets the counter \h to the height of the poset
%% of the root system G2. \rootSystemHeight{\h} uses the current root system.
@@ -2451,7 +2489,7 @@
4;1=3.1,%
5;1=3.2}%
}%
-\NewDocumentCommand\forAllPositiveRootsInHasseDiagram{m}%
+\NewDocumentCommand\forAllPositiveRoots{m}%
{%
\rootSystemHeight{\lie@hasse@height}%
\foreach \root@grady in {1,...,\the\lie@hasse@height}%
diff --git a/Master/texmf-dist/tex/latex/lni/lni.cls b/Master/texmf-dist/tex/latex/lni/lni.cls
index 90eed28073c..14eb413f8aa 100644
--- a/Master/texmf-dist/tex/latex/lni/lni.cls
+++ b/Master/texmf-dist/tex/latex/lni/lni.cls
@@ -14,7 +14,7 @@
%% --------| -----------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{lni}
- [2024/01/08 v1.8.1 Official class for submissions to the ``Lecture Notes
+ [2024/07/01 v1.9 Official class for submissions to the ``Lecture Notes
in Informatics'']
\RequirePackage{iftex}\ifluatex\else\pdfoutput=1\fi%
\def\@clearglobaloption#1{%
@@ -371,53 +371,71 @@
\renewcommand\Authsep{, }
\renewcommand\Authands{\iflanguage{ngerman}{ und }{, and }}
\renewcommand\Authand{\iflanguage{ngerman}{ und }{ and }}
-\renewcommand{\AB@authnote}[1]{$^{\text{\mbox{\normalfont\footnotesize #1}}}$}
+\NewDocumentCommand{\multiaffil}{ >{\SplitList{,}} m m m}{%
+ \gdef\@currEmail{#2}
+ \gdef\@currOrcid{#3}
+ \ProcessList{#1}{\@multiaffil}
+}
+
+\newcommand{\@multiaffil}[1]{%
+ \ifcsundef{@emailsandorcids#1}{\csgdef{@emailsandorcids#1}{}}{}%
+ \ifcsempty{@emailsandorcids#1}%
+ {\csgappto{@emailsandorcids#1}{%
+ \if\relax\@currEmail\relax\else\email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
+ {\csgappto{@emailsandorcids#1}{%
+ \if\relax\@currEmail\relax\else;\ \email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
+}
+
\renewcommand\author[4][]{%
\ifnewaffil\addtocounter{affil}{1}%
\edef\AB@thenote{\arabic{affil}}%
\fi%
\if\relax#1\relax\def\AB@note{\AB@thenote}\else\def\AB@note{#1}%
- \ifcsundef{@emailsandorcids\AB@note}{\csgdef{@emailsandorcids\AB@note}{}}{}%
\setcounter{Maxaffil}{0}\fi
\ifnum\value{authors}=0\def\@firstauthor{#2}\fi
\ifnum\value{authors}>1\relax
- \@namedef{@sep\number\c@authors}{\Authsep}\fi
+ \@namedef{@sep\number\c@authors}{\Authsep}\fi
\addtocounter{authors}{1}%
\begingroup
- \let\protect\@unexpandable@protect \let\and\AB@pand
- \def\thanks{\protect\thanks}\def\footnote{\protect\footnote}%
- \@temptokena=\expandafter{\AB@authors}%
- \@temptokenb=\expandafter{\AB@authors}%
- {\def\\{\protect\\[\@affilsep]\protect\Affilfont
- \protect\AB@resetsep}%
- \xdef\AB@author{\AB@blk@and#2}%
- \ifnewaffil\gdef\AB@las{}\gdef\AB@lasx{\protect\Authand}\gdef\AB@as{}%
- \xdef\AB@authors{\the\@temptokena\AB@blk@and}%
- \else
- \xdef\AB@authors{\the\@temptokena\AB@as\AB@au@str}%
- \global\let\AB@las\AB@lasx\gdef\AB@lasx{\protect\Authands}%
- \gdef\AB@as{\Authsep}%
- \fi
- \gdef\AB@au@str{#2}}%
- \@temptokena=\expandafter{\AB@authlist}%
- \@temptokenb=\expandafter{\@authlisthead}%
- \let\\=\authorcr
- \xdef\AB@authlist{\the\@temptokena
- \protect\@nameuse{@sep\number\c@authors}%
- \protect\Authfont#2\if\relax#4\relax\else\,\orcidlink{#4}\fi\AB@authnote{\AB@note}}%
- \xdef\@authlisthead{\the\@temptokenb
- \protect\@nameuse{@sep\number\c@authors}%
- \protect\Authfont#2}%
+ \let\protect\@unexpandable@protect \let\and\AB@pand
+ \def\thanks{\protect\thanks}\def\footnote{\protect\footnote}%
+ \@temptokena=\expandafter{\AB@authors}%
+ \@temptokenb=\expandafter{\AB@authors}%
+ {\def\\{\protect\\[\@affilsep]\protect\Affilfont
+ \protect\AB@resetsep}%
+ \xdef\AB@author{\AB@blk@and#2}%
+ \ifnewaffil\gdef\AB@las{}\gdef\AB@lasx{\protect\Authand}\gdef\AB@as{}%
+ \xdef\AB@authors{\the\@temptokena\AB@blk@and}%
+ \else
+ \xdef\AB@authors{\the\@temptokena\AB@as\AB@au@str}%
+ \global\let\AB@las\AB@lasx\gdef\AB@lasx{\protect\Authands}%
+ \gdef\AB@as{\Authsep}%
+ \fi
+ \gdef\AB@au@str{#2}}%
+ \@temptokena=\expandafter{\AB@authlist}%
+ \@temptokenb=\expandafter{\@authlisthead}%
+ \let\\=\authorcr
+ \xdef\AB@authlist{\the\@temptokena
+ \protect\@nameuse{@sep\number\c@authors}%
+ \protect\Authfont#2\if\relax#4\relax\else\,\orcidlink{#4}\fi\AB@authnote{\AB@note}}%
+ \xdef\@authlisthead{\the\@temptokenb
+ \protect\@nameuse{@sep\number\c@authors}%
+ \protect\Authfont#2}%
\endgroup
\ifnum\value{authors}>2\relax
\@namedef{@sep\number\c@authors}{\Authands}\fi
+ \ifcsundef{@emailsandorcids\AB@note}{\csgdef{@emailsandorcids\AB@note}{}}{}%
+ \sbox\z@{\@tempcnta=0#1\relax}%
+ \expandafter\ifdim\wd\z@>\z@\relax
+ \multiaffil{#1}{#3}{#4}
+ \else
+ \ifcsundef{@emailsandorcids\AB@note}{\csgdef{@emailsandorcids\AB@note}{}}{}%
\ifcsempty{@emailsandorcids\AB@note}%
{\csgappto{@emailsandorcids\AB@note}{%
- \if\relax#3\relax\else\email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}%
- }%
+ \if\relax#3\relax\else\email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}}%
{\csgappto{@emailsandorcids\AB@note}{%
\if\relax#3\relax\else;\ \email{#3}\fi\if\relax#4\relax\else,\ \orcid{#4}\fi}}%
-
+ \fi%
\newaffilfalse
}
\renewcommand\@author{%
diff --git a/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty b/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty
new file mode 100644
index 00000000000..ea33fb4fb59
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty
@@ -0,0 +1,1035 @@
+%% Copyright 2024 Jonathan Walls
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% https://www.latex-project.org/lppl/lppl-1-3c.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Jonathan Walls.
+%
+% This work consists of the files luwiantype.sty, luwiantype-doc.tex
+% and the derived file luwiantype-doc.pdf.
+%
+%
+% Version history:
+% 1.2 - updated to resolve some minor typos and command formatting
+% 1.1 - updated to comply with CTAN formatting requirements, adjustments to licensing
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{luwiantype}[2024/07/15 Luwian Hieroglyph Typing Package]
+
+%Required packages and declarations
+\usepackage{fontspec}
+\usepackage{graphicx}
+\usepackage{stackengine}
+\usepackage{moresize}
+
+%Commands for font selection and import
+\newcommand{\Luwian}{\setmainfont[ExternalLocation=Fonts/]{LuwianFont.ttf}\Large}
+\newcommand{\Lat}{\setmainfont{Charis SIL}\normalsize}
+
+%Formatting commands
+\newcommand{\badeq}{\char"2E17}
+\newcommand{\hl}{\char"2308}
+\newcommand{\hr}{\char"2309}
+\newcommand{\tsup}[1]{\textsuperscript{#1}}
+\newcommand{\tsub}[1]{\textsubscript{#1}}
+\newcommand{\boust}[1]{\reflectbox{#1}}
+\newcommand{\gstack}{\Shortunderstack}
+
+
+
+%Main sign commands
+\newcommand{\EGO}[1][]{
+ \ifx\relax#1\relax
+ {\char"14400}
+ \else \ifnum #1=2
+ {\char"14401}
+ \fi\fi
+}
+\newcommand{\LIII}{\char"14402}
+\newcommand{\MONS}[1][]{
+ \ifx\relax#1\relax
+ {\char"144EC}
+ \else \ifnum #1=2
+ {\char"14403}
+ \fi\fi
+}
+\newcommand{\LV}{\char"14404}
+\newcommand{\ADORARE}{\char"14405}
+\newcommand{\EDERE}{\char"14406}
+\newcommand{\BIBERE}{\char"14407}
+\newcommand{\AMPLECTI}{\char"14408}
+\newcommand{\CAPUT}{\char"14409}
+\newcommand{\CAPUTSCALPRUM}{\char"1440A}
+\newcommand{\LXI}{\char"1440B}
+\newcommand{\STATUA}{\char"1440C}
+\newcommand{\LXIII}{\char"1440D}
+\newcommand{\PRAE}{\char"1440E}
+\newcommand{\PARI}{\char"1440E}
+\newcommand{\DOMINA}{\char"1440F}
+\newcommand{\MAGNUSDOMINA}{\char"14410}
+\newcommand{\REX}{\char"14411}
+\newcommand{\MAGNUSREX}{\char"14412}
+\newcommand{\A}[1][]{
+ \ifx\relax#1\relax
+ {\char"145F7}
+ \else \ifnum #1=2
+ {\char"14413}
+ \fi\fi
+}
+\newcommand{\LXX}{\char"14414}
+\newcommand{\HEROS}{\char"14415}
+\newcommand{\LOQUI}{\char"14416}
+\newcommand{\LXXIII}{\char"14417}
+\newcommand{\LIS}{\char"14418}
+\newcommand{\OCULUS}{\char"14419}
+\newcommand{\FRONS}{\char"1441A}
+\newcommand{\VERSUS}{\char"1441B}
+\newcommand{\LIBARE}{\char"1441C}
+\newcommand{\FORTIS}{\char"1441D}
+\newcommand{\TA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14470}
+ \else \ifnum #1=2
+ {\char"1441E}
+ \else \ifnum #1=3
+ {\char"1442C}
+ \else \ifnum #1=6
+ {\char"1445B}
+ \fi\fi\fi\fi
+}
+\newcommand{\LXXX}{\char"1441F}
+\newcommand{\LIGARE}{\char"14420}
+\newcommand{\PUGNUSPUGNUS}{\char"14420}
+\newcommand{\BRACCHIUM}{\char"14421}
+\newcommand{\LXXXIII}{\char"14422}
+\newcommand{\POST}{\char"14423}
+\newcommand{\NA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14424}
+ \else \ifnum #1=2
+ {\char"1445D}
+ \fi\fi
+}
+\newcommand{\LITUUSNA}{\char"14425}
+\newcommand{\LXXXVII}{\char"14426}
+\newcommand{\LXXXVIII}{\char"14427}
+\newcommand{\PUGNUS}{\char"14428}
+\newcommand{\PUGNUSX}{\char"14429}
+\newcommand{\LXL}{\char"1442A}
+\newcommand{\CAPERE}[1][]{
+ \ifx\relax#1\relax
+ {\char"1442B}
+ \else \ifnum #1=2
+ {\char"1442E}
+ \fi\fi
+}
+\newcommand{\CAPEREIICAPEREII}{\char"1442D}
+\newcommand{\LXLIV}{\char"1442F}
+\newcommand{\INFANS}{\char"14430}
+\newcommand{\FILIUS}{\char"14430}
+\newcommand{\FILIA}{\char"14431}
+\newcommand{\REXINFANS}{\char"14432}
+\newcommand{\REXFILIUS}{\char"14432}
+\newcommand{\REXFILIA}{\char"14433}
+\newcommand{\MAGNUSFILIA}{\char"14434}
+\newcommand{\LXLVII}{\char"14435}
+\newcommand{\LXLVIII}{\char"14436}
+\newcommand{\ATAII}{\char"14437}
+\newcommand{\LL}{\char"14438}
+\newcommand{\LLI}{\char"14439}
+\newcommand{\MANUSCULTER}{\char"1443A}
+\newcommand{\ENSIS}{\char"1443B}
+\newcommand{\LLIV}{\char"1443C}
+\newcommand{\NI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D0}
+ \else \ifnum #1=2
+ {\char"144F5}
+ \else \ifnum #1=3
+ {\char"1443D}
+ \fi\fi\fi
+}
+\newcommand{\KA}[1][]{
+ \ifx\relax#1\relax
+ {\char"145E7}
+ \else \ifnum #1=2
+ {\char"1443E}
+ \fi\fi
+}
+\newcommand{\INFRA}{\char"1443F}
+\newcommand{\SUB}{\char"1443F}
+\newcommand{\CUM}{\char"14440}
+\newcommand{\MANUS}{\char"14441}
+\newcommand{\LLX}{\char"14442}
+\newcommand{\LLXI}{\char"14443}
+\newcommand{\LONGUS}{\char"14444}
+\newcommand{\LLXIII}{\char"14445}
+\newcommand{\LLXIV}{\char"14446}
+\newcommand{\PONERE}{\char"14447}
+\newcommand{\DARE}{\char"14448}
+\newcommand{\PI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14449}
+ \fi
+}
+\newcommand{\MANDARE}[1][]{
+ \ifx\relax#1\relax
+ {\char"1444A}
+ \else \ifnum #1=2
+ {\char"1444B}
+ \fi\fi
+}
+\newcommand{\DAREDARE}{\char"1444A}
+\newcommand{\LLXVII}{\char"1444C}
+\newcommand{\LLXVIII}{\char"1444D}
+\newcommand{\LLXIX}{\char"1444E}
+\newcommand{\SUPER}{\char"1444F}
+\newcommand{\SARAI}{\char"14555}
+\newcommand{\LLXXI}{\char"14450}
+\newcommand{\LLXXII}{\char"14451}
+\newcommand{\AUDIRE}{\char"14452}
+\newcommand{\LLXXIV}{\char"14453}
+\newcommand{\LLXXV}{\char"14454}
+\newcommand{\LLXXVI}{\char"14455}
+\newcommand{\LLXXVII}{\char"14456}
+\newcommand{\ALA}{\char"14457}
+\newcommand{\FEMINA}{\char"14458}
+\newcommand{\MATER}{\char"14458}
+\newcommand{\SARMA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14459}
+ \else \ifnum #1=2
+ {\char"1445A}
+ \fi\fi
+}
+\newcommand{\CRUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1445B}
+ \else \ifnum #1=2
+ {\char"1445D}
+ \fi\fi
+}
+\newcommand{\CRUSFLUMEN}{\char"1445C}
+\newcommand{\GENUFLECTERE}{\char"1445E}
+\newcommand{\CRUSCRUS}{\char"1445F}
+\newcommand{\LLXXXVII}{\char"14460}
+\newcommand{\LLXXXVIII}{\char"14461}
+\newcommand{\TU}[1][]{
+ \ifx\relax#1\relax
+ {\char"14462}
+ \else \ifnum #1=2
+ {\char"1456C}
+ \else \ifnum #1=3
+ {\char"1456D}
+ \else \ifnum #1=4
+ {\char"14506}
+ \fi\fi\fi\fi
+}
+\newcommand{\PES}[1][]{
+ \ifx\relax#1\relax
+ {\char"14463}
+ \else \ifnum #1=2
+ {\char"14466}
+ \fi\fi
+}
+\newcommand{\TI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14463}
+ \else \ifnum #1=2
+ {\char"1461F}
+ \else \ifnum #1=3
+ {\char"14644}
+ \fi\fi\fi
+}
+\newcommand{\PESSCALAROTAE}{\char"14464}
+\newcommand{\LXCII}{\char"14465}
+\newcommand{\LXCIV}{\char"14467}
+\newcommand{\PESIIPESII}{\char"14468}
+\newcommand{\PESIIPES}{\char"14469}
+\newcommand{\LEO}[1][]{
+ \ifx\relax#1\relax
+ {\char"1446A}
+ \else \ifnum #1=2
+ {\char"1446B}
+ \fi\fi
+}
+\newcommand{\BESTIA}{\char"1446A}
+\newcommand{\CANIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1446C}
+ \else \ifnum #1=2
+ {\char"1446D}
+ \fi\fi
+}
+\newcommand{\EQUUS}{\char"1446E}
+\newcommand{\ASINUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1446F}
+ \else \ifnum #1=2
+ {\char"14471}
+ \fi\fi
+}
+\newcommand{\ASINUSIIA}{\char"14472}
+\newcommand{\CERVUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14473}
+ \else \ifnum #1=2
+ {\char"14474}
+ \else \ifnum #1=3
+ {\char"14475}
+ \fi\fi\fi
+}
+\newcommand{\RU}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D1}
+ \else \ifnum #1=2
+ {\char"14473}
+ \fi\fi
+}
+\newcommand{\CAPRA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14476}
+ \else \ifnum #1=2
+ {\char"14478}
+ \fi\fi
+}
+\newcommand{\SA}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D4}
+ \else \ifnum #1=2
+ {\char"145E6}
+ \else \ifnum #1=3
+ {\char"14477}
+ \else \ifnum #1=4
+ {\char"145C6}
+ \else \ifnum #1=5
+ {\char"1456E}
+ \else \ifnum #1=6
+ {\char"14500}
+ \else \ifnum #1=7
+ {\char"14563}
+ \else \ifnum #1=8
+ {\char"145AD}
+ \fi\fi\fi\fi\fi\fi\fi\fi
+}
+\newcommand{\CAPRAIIA}{\char"14479}
+\newcommand{\BOS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1447A}
+ \else \ifnum #1=2
+ {\char"1447C}
+ \fi\fi
+}
+\newcommand{\U}{\char"1447B}
+\newcommand{\LCVI}{\char"1447D}
+\newcommand{\BOSMI}{\char"1447E}
+\newcommand{\MU}{\char"1447F}
+\newcommand{\MUWA}{\char"14480}
+\newcommand{\BOSIIMI}{\char"14481}
+\newcommand{\CORNU}{\char"14482}
+\newcommand{\SU}[1][]{
+ \ifx\relax#1\relax
+ {\char"145A2}
+ \else \ifnum #1=2
+ {\char"14482}
+ \else \ifnum #1=3
+ {\char"145F5}
+ \fi\fi\fi
+}
+\newcommand{\VITELLUS}{\char"14483}
+\newcommand{\OVIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14484}
+ \else \ifnum #1=2
+ {\char"14486}
+ \else \ifnum #1=3
+ {\char"14487}
+ \fi\fi\fi
+}
+\newcommand{\MA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14485}
+ \else \ifnum #1=2
+ {\char"14598}
+ \else \ifnum #1=3
+ {\char"14556}
+ \fi\fi\fi
+}
+\newcommand{\LINGERE}{\char"14488}
+\newcommand{\ZA}[1][]{
+ \ifx\relax#1\relax
+ {\char"145AA}
+ \else \ifnum #1=2
+ {\char"14579}
+ \else \ifnum #1=3
+ {\char"1457C}
+ \else \ifnum #1=4
+ {\char"14488}
+ \fi\fi\fi\fi
+}
+\newcommand{\LCXIII}{\char"14489}
+\newcommand{\LITUUSU}{\char"1448A}
+\newcommand{\LEPUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1448B}
+ \else \ifnum #1=2
+ {\char"1448C}
+ \fi\fi
+}
+\newcommand{\TAPA}{\char"1448C}
+\newcommand{\LCXVI}{\char"1448D}
+\newcommand{\LCXVII}{\char"1448E}
+\newcommand{\LCXVIII}{\char"1448F}
+\newcommand{\LCXIX}{\char"14490}
+\newcommand{\GRYLLUS}{\char"14491}
+\newcommand{\SPHINX}{\char"14492}
+\newcommand{\LCXXII}{\char"14493}
+\newcommand{\LCXXIII}{\char"14494}
+\newcommand{\LCXXIV}{\char"14495}
+\newcommand{\LI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14539}
+ \else \ifnum #1=2
+ {\char"14496}
+ \else \ifnum #1=3
+ {\char"14547}
+ \fi\fi\fi
+}
+\newcommand{\UNGULA}{\char"14497}
+\newcommand{\LCXXVI}{\char"14498}
+\newcommand{\LCXXVII}{\char"14499}
+\newcommand{\AVIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1449A}
+ \else \ifnum #1=2
+ {\char"1449E}
+ \else \ifnum #1=3
+ {\char"1449C}
+ \else \ifnum #1=4
+ {\char"1449F}
+ \else \ifnum #1=5
+ {\char"1449D}
+ \fi\fi\fi\fi\fi
+}
+\newcommand{\ZI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145A9}
+ \else \ifnum #1=2
+ {\char"14560}
+ \else \ifnum #1=3
+ {\char"1457B}
+ \else \ifnum #1=4
+ {\char"1449A}
+ \fi\fi\fi\fi
+}
+\newcommand{\LCXXIX}{\char"1449B}
+\newcommand{\AQUILA}{\char"1449F}
+\newcommand{\ARAI}{\char"144A0}
+\newcommand{\AVISX}{\char"144A1}
+\newcommand{\LCXXXVA}{\char"144A2}
+\newcommand{\LCXXXVI}{\char"144A3}
+\newcommand{\LIBATIO}{\char"144A4}
+\newcommand{\PISCIS}{\char"144A5}
+\newcommand{\LCXXXIX}{\char"144A6}
+\newcommand{\LCXL}{\char"144A7}
+\newcommand{\LCXLI}{\char"144A8}
+\newcommand{\LXCLII}{\char"144A9}
+\newcommand{\LCXLIII}{\char"144AA}
+\newcommand{\LCXLIV}{\char"144AB}
+\newcommand{\LCXLV}{\char"144AC}
+\newcommand{\LCXLVI}{\char"144AD}
+\newcommand{\LCXLVII}{\char"144AE}
+\newcommand{\JANUS}{\char"144AF}
+\newcommand{\LCXLIX}{\char"144B0}
+\newcommand{\LCL}{\char"144B1}
+\newcommand{\TELIPINU}{\char"144B2}
+\newcommand{\LCLII}{\char"144B3}
+\newcommand{\NU}[1][]{
+ \ifx\relax#1\relax
+ {\char"144B4}
+ \else \ifnum #1=2
+ {\char"145BF}
+ \fi\fi
+}
+\newcommand{\LCLIV}{\char"144B5}
+\newcommand{\LCLV}{\char"144B6}
+\newcommand{\LCLVI}{\char"144B7}
+\newcommand{\LCLVII}{\char"144B8}
+\newcommand{\LCLVIII}{\char"144B9}
+\newcommand{\LCLIX}{\char"144BA}
+\newcommand{\VITIS}{\char"144BB}
+\newcommand{\WIYA}{\char"144BB}
+\newcommand{\LCLXI}{\char"144BC}
+\newcommand{\LCLXII}{\char"144BD}
+\newcommand{\LCLXIII}{\char"144BE}
+\newcommand{\LCLXIV}{\char"144BF}
+\newcommand{\BONUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"144C0}
+ \else \ifnum #1=2
+ {\char"145A2}
+ \fi\fi
+}
+\newcommand{\WAI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145EC}
+ \else \ifnum #1=2
+ {\char"144C1}
+ \else \ifnum #1=3
+ {\char"144C0}
+ \else \ifnum #1=4
+ {\char"144EC}
+ \else \ifnum #1=5
+ {\char"144E9}
+ \else \ifnum #1=6
+ {\char"144E4}
+ \else \ifnum #1=7
+ {\char"14541}
+ \else \ifnum #1=9
+ {\char"1453B}
+ \fi\fi\fi\fi\fi\fi\fi\fi
+}
+\newcommand{\LCLXVII}{\char"144C2}
+\newcommand{\LCLXVIII}{\char"144C3}
+\newcommand{\LCLXIX}{\char"144C4}
+\newcommand{\LCLXX}{\char"144C5}
+\newcommand{\LCLXXI}{\char"144C6}
+\newcommand{\TAI}[1][]{
+ \ifx\relax#1\relax
+ {\char"}
+ \else \ifnum #1=4
+ {\char"14566}
+ \else \ifnum #1=5
+ {\char"144C7}
+ \fi\fi\fi
+}
+\newcommand{\LAI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14566}
+ \else \ifnum #1=2
+ {\char"144C7}
+ \fi\fi
+}
+\newcommand{\HASTARIUS}{\char"144C8}
+\newcommand{\SI}[1][]{
+ \ifx\relax#1\relax
+ {\char"144C9}
+ \else \ifnum #1=2
+ {\char"145FE}
+ \fi\fi
+}
+\newcommand{\LINGUA}{\char"144CA}
+\newcommand{\LA}{\char"144CA}
+\newcommand{\LALA}{\char"144CB}
+\newcommand{\LINGUACLAVUS}{\char"144CC}
+\newcommand{\LARAA}{\char"144CD}
+\newcommand{\HORDEUM}{\char"144CE}
+\newcommand{\HWIX}{\char"144CE}
+\newcommand{\LCLXXX}{\char"144CF}
+\newcommand{\PANIS}{\char"144D0}
+\newcommand{\PAX}{\char"144D0}
+\newcommand{\CAELUM}{\char"144D1}
+\newcommand{\LCLXXXIII}{\char"144D2}
+\newcommand{\LCLXXXIV}{\char"144D3}
+\newcommand{\LCLXXXV}{\char"144D4}
+\newcommand{\LCLXXXVI}{\char"144D5}
+\newcommand{\LCLXXXVII}{\char"144D6}
+\newcommand{\LCLXXXVIII}{\char"144D7}
+\newcommand{\LCLXXXIX}{\char"144D8}
+\newcommand{\SOL}[1][]{
+ \ifx\relax#1\relax
+ {\char"144DA}
+ \else \ifnum #1=2
+ {\char"144D9}
+ \fi\fi
+}
+\newcommand{\ORIENS}{\char"144DB}
+\newcommand{\LUNA}{\char"144DC}
+\newcommand{\LCXCIV}{\char"144DD}
+\newcommand{\LCXCV}{\char"144DE}
+\newcommand{\HATTI}{\char"144DF}
+\newcommand{\HA}[1][]{
+ \ifx\relax#1\relax
+ {\char"144F7}
+ \else \ifnum #1=2
+ {\char"144DF}
+ \fi\fi
+}
+\newcommand{\HATTILI}{\char"144E0}
+\newcommand{\HATTUSILI}{\char"144E0}
+\newcommand{\HAIILI}{\char"144E0}
+\newcommand{\LCXCVIII}{\char"144E1}
+\newcommand{\TONITRUS}{\char"144E2}
+\newcommand{\FULGUR}{\char"144E3}
+\newcommand{\TERRA}{\char"144E4}
+\newcommand{\LOCUS}{\char"144E4}
+\newcommand{\VIATERRASCALPRUM}{\char"144E5}
+\newcommand{\VIATERRAPLUSSCALPRUM}{\char"144E6}
+\newcommand{\DEUSVIATERRA}{\char"144E7}
+\newcommand{\LCCIII}{\char"144E8}
+\newcommand{\LCCV}{\char"144EA}
+\newcommand{\LCCVI}{\char"144EB}
+\newcommand{\LEOMONSTULEO}{\char"144ED}
+\newcommand{\LCCVIII}{\char"144EE}
+\newcommand{\I}[1][]{
+ \ifx\relax#1\relax
+ {\char"144EF}
+ \else \ifnum #1=2
+ {\char"14550}
+ \fi\fi
+}
+\newcommand{\IRAI}{\char"144F0}
+\newcommand{\RII}{\char"144F0}
+\newcommand{\IA}[1][]{
+ \ifx\relax#1\relax
+ {\char"144F1}
+ \else \ifnum #1=2
+ {\char"14551}
+ \else \ifnum #1=3
+ {\char"145AC}
+ \fi\fi\fi
+}
+\newcommand{\LCCXI}{\char"144F2}
+\newcommand{\FLUMEN}{\char"144F3}
+\newcommand{\LCCXIII}{\char"144F4}
+\newcommand{\FONS}{\char"144F6}
+\newcommand{\FINES}{\char"144F8}
+\newcommand{\FINESHA}{\char"144F9}
+\newcommand{\ARHA}{\char"144F9}
+\newcommand{\LCCXVII}{\char"144FA}
+\newcommand{\LCCXVIII}{\char"144FB}
+\newcommand{\LCCXIX}{\char"144FC}
+\newcommand{\LCCXX}{\char"144FD}
+\newcommand{\VIA}{\char"144FE}
+\newcommand{\LCCXXII}{\char"144FF}
+\newcommand{\LCCXXIV}{\char"14501}
+\newcommand{\URBS}{\char"14502}
+\newcommand{\ISHUWA}{\char"14503}
+\newcommand{\URBSRAILI}{\char"14504}
+\newcommand{\URBSLI}{\char"14505}
+\newcommand{\MURSILI}{\char"14505}
+\newcommand{\REGIO}{\char"14506}
+\newcommand{\MIIIREGIO}{\char"14507}
+\newcommand{\LCCXXX}{\char"14508}
+\newcommand{\CASTRUM}{\char"14509}
+\newcommand{\LCCXXXII}{\char"1450A}
+\newcommand{\LCCXXXIII}{\char"1450B}
+\newcommand{\LCCXXXIV}{\char"1450C}
+\newcommand{\TURRIS}{\char"1450D}
+\newcommand{\LCCXXXV}{\char"1450D}
+\newcommand{\MURUS}{\char"1450E}
+\newcommand{\LCCXXXVI}{\char"1450E}
+\newcommand{\PORTA}[1][]{
+ \ifx\relax#1\relax
+ {\char"1450F}
+ \else \ifnum #1=2
+ {\char"14511}
+ \fi\fi
+}
+\newcommand{\LCCXXXVIII}{\char"14510}
+\newcommand{\LCCXL}{\char"14512}
+\newcommand{\KIX}{\char"14513}
+\newcommand{\LCCXLII}{\char"14514}
+\newcommand{\CUBITUM}{\char"14515}
+\newcommand{\AEDIFICIUM}{\char"14516}
+\newcommand{\VACUUS}{\char"14517}
+\newcommand{\AEDIFICIUMMINUS}{\char"14517}
+\newcommand{\AEDIFICARE}{\char"14518}
+\newcommand{\AEDIFICIUMPONERE}{\char"14518}
+\newcommand{\DOMUS}{\char"14519}
+\newcommand{\DELERE}{\char"1451A}
+\newcommand{\DOMUSMINUS}{\char"1451A}
+\newcommand{\DEUSDOMUS}{\char"1451B}
+\newcommand{\MAGNUSDOMUS}{\char"1451C}
+\newcommand{\DOMUSX}{\char"1451D}
+\newcommand{\DOMUSSCALA}{\char"1451E}
+\newcommand{\LCCLII}{\char"1451F}
+\newcommand{\EUNUCHUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14611}
+ \else \ifnum #1=2
+ {\char"14520}
+ \fi\fi
+}
+\newcommand{\HORREUM}{\char"14521}
+\newcommand{\LCCLVI}{\char"14522}
+\newcommand{\ARGENTUM}{\char"14523}
+\newcommand{\LCCLVIII}{\char"14524}
+\newcommand{\LCCLIX}{\char"14525}
+\newcommand{\LCCLX}{\char"14526}
+\newcommand{\LCCLXI}{\char"14527}
+\newcommand{\LCCLXII}{\char"14528}
+\newcommand{\LCCLXIII}{\char"14529}
+\newcommand{\PODIUM}{\char"1452A}
+\newcommand{\LCCLXV}{\char"1452B}
+\newcommand{\PESREGIO}{\char"1452C}
+\newcommand{\STELE}{\char"1452D}
+\newcommand{\LAPISSCALPRUM}{\char"1452D}
+\newcommand{\LAPIS}{\char"1452E}
+\newcommand{\SCALPRUM}{\char"1452F}
+\newcommand{\EXERCITUS}{\char"14530}
+\newcommand{\LCCLXX}{\char"14531}
+\newcommand{\LCCLXXI}{\char"14532}
+\newcommand{\SCUTUM}{\char"14533}
+\newcommand{\LCCLXXIII}{\char"14534}
+\newcommand{\LCCLXXIV}{\char"14535}
+\newcommand{\FRATER}[1][]{
+ \ifx\relax#1\relax
+ {\char"14430}
+ \else \ifnum #1=2
+ {\char"14537}
+ \fi\fi
+}
+\newcommand{\IUDEXLA}{\char"14538}
+\newcommand{\LCCLXXIX}{\char"1453A}
+\newcommand{\MALLEUS}{\char"1453B}
+\newcommand{\ASCIA}{\char"1453C}
+\newcommand{\LCCLXXXII}{\char"1453D}
+\newcommand{\TUZZI}{\char"1453E}
+\newcommand{\LCCLXXXIV}{\char"1453F}
+\newcommand{\IACULUM}{\char"14540}
+\newcommand{\ZU}[1][]{
+ \ifx\relax#1\relax
+ {\char"14540}
+ \else \ifnum #1=2
+ {\char"145F5}
+ \fi\fi
+}
+\newcommand{\ZUWA}{\char"14540}
+\newcommand{\LCCLXXXVII}{\char"14542}
+\newcommand{\CURRUS}{\char"14543}
+\newcommand{\AURIGA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14544}
+ \else \ifnum #1=2
+ {\char"14545}
+ \fi\fi
+}
+\newcommand{\HARAI}{\char"14546}
+\newcommand{\ROTA}{\char"14548}
+\newcommand{\HALAI}{\char"14548}
+\newcommand{\LCCXCIII}{\char"14549}
+\newcommand{\THRONUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1454A}
+ \else \ifnum #1=2
+ {\char"1454F}
+ \fi\fi
+}
+\newcommand{\MENSA}[1][]{
+ \ifx\relax#1\relax
+ {\char"1454A}
+ \else \ifnum #1=2
+ {\char"1454B}
+ \fi\fi
+}
+\newcommand{\SARPA}{\char"1454B}
+\newcommand{\SOLIITHRONUS}{\char"1454C}
+\newcommand{\SOLIIMENSA}{\char"1454C}
+\newcommand{\DEUSMONSSARPA}{\char"1454D}
+\newcommand{\DEUSMONSMENSA}{\char"1454D}
+\newcommand{\LCCXCVII}{\char"1454E}
+\newcommand{\SOLIUM}{\char"14550}
+\newcommand{\NEPOS}{\char"14552}
+\newcommand{\LECTUS}{\char"14553}
+\newcommand{\LCCCII}{\char"14554}
+\newcommand{\FUSUS}{\char"14557}
+\newcommand{\HI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D2}
+ \else \ifnum #1=2
+ {\char"14558}
+ \fi\fi
+}
+\newcommand{\HU}[1][]{
+ \ifx\relax#1\relax
+ {\char"14559}
+ \else \ifnum #1=2
+ {\char"14588}
+ \fi\fi
+}
+\newcommand{\LCCCVIII}{\char"1455A}
+\newcommand{\CRUX}[1][]{
+ \ifx\relax#1\relax
+ {\char"1455B}
+ \else \ifnum #1=2
+ {\char"1455C}
+ \fi\fi
+}
+\newcommand{\LCCCX}{\char"1455D}
+\newcommand{\LCCCXI}{\char"1455E}
+\newcommand{\LCCCXII}{\char"1455F}
+\newcommand{\VIR}[1][]{
+ \ifx\relax#1\relax
+ {\char"14560}
+ \else \ifnum #1=2
+ {\char"145B5}
+ \fi\fi
+}
+\newcommand{\HAX}{\char"14561}
+\newcommand{\KAR}{\char"14562}
+\newcommand{\LCCCXVII}{\char"14564}
+\newcommand{\TESHUB}{\char"14565}
+\newcommand{\LCCCXX}{\char"14567}
+\newcommand{\LCCCXXI}{\char"14568}
+\newcommand{\PURUS}{\char"14569}
+\newcommand{\LCCCXXIII}{\char"1456A}
+\newcommand{\LCCCXXIV}{\char"1456B}
+\newcommand{\SCRIBA}{\char"1456D}
+\newcommand{\SIGILLUM}{\char"1456E}
+\newcommand{\PU}[1][]{
+ \ifx\relax#1\relax
+ {\char"1456F}
+ \else \ifnum #1=2
+ {\char"145E3}
+ \fi\fi
+}
+\newcommand{\REL}{\char"14570}
+\newcommand{\KWIA}{\char"14570}
+\newcommand{\LCCCXXIXA}{\char"14571}
+\newcommand{\CAPERESCALPRUM}{\char"14572}
+\newcommand{\AVUS}{\char"14573}
+\newcommand{\NEG}[1][]{
+ \ifx\relax#1\relax
+ {\char"14574}
+ \else \ifnum #1=2
+ {\char"14575}
+ \else \ifnum #1=3
+ {\char"14576}
+ \fi\fi\fi
+}
+\newcommand{\LCCCXXXIII}{\char"14577}
+\newcommand{\PA}{\char"14578}
+\newcommand{\ANNUS}{\char"1457A}
+\newcommand{\PITHOSSCUTELLA}{\char"1457A}
+\newcommand{\PITHOS}{\char"1457E}
+\newcommand{\ZAX}{\char"1457D}
+\newcommand{\CULTER}{\char"1457F}
+\newcommand{\LCCCXXXIX}{\char"14580}
+\newcommand{\ANNUSANNUS}{\char"14581}
+\newcommand{\VAS}{\char"14582}
+\newcommand{\LCCCXLII}{\char"14583}
+\newcommand{\PITHOSA}{\char"14584}
+\newcommand{\CONTRACTUS}{\char"14585}
+\newcommand{\URCEUS}{\char"14586}
+\newcommand{\POCULUM}{\char"14587}
+\newcommand{\LCCCXLVIII}{\char"14589}
+\newcommand{\LCCCXLIX}{\char"1458A}
+\newcommand{\LCCCL}{\char"1458B}
+\newcommand{\LCCCLI}{\char"1458C}
+\newcommand{\LCCCLII}{\char"1458D}
+\newcommand{\LCCCLIII}{\char"1458E}
+\newcommand{\LCCCLIV}{\char"1458F}
+\newcommand{\LCCCLVI}{\char"14591}
+\newcommand{\LCCCLVII}{\char"14592}
+\newcommand{\DIES}{\char"14593}
+\newcommand{\LCCCLIX}{\char"14594}
+\newcommand{\LCCCLIXA}{\char"14595}
+\newcommand{\DEUS}{\char"14596}
+\newcommand{\LCCCLXI}{\char"14597}
+\newcommand{\MAGNUS}{\char"14599}
+\newcommand{\UR}{\char"14599}
+\newcommand{\UA}{\char"1459A}
+\newcommand{\MUA}{\char"1459B}
+\newcommand{\LCCCLXV}{\char"1459C}
+\newcommand{\OMNIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1459D}
+ \else \ifnum #1=2
+ {\char"145E3}
+ \fi\fi
+}
+\newcommand{\OMNISMI}{\char"1459D}
+\newcommand{\TALA}{\char"1459E}
+\newcommand{\MALUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1459F}
+ \else \ifnum #1=2
+ {\char"145A0}
+ \fi\fi
+}
+\newcommand{\VITA}{\char"145A1}
+\newcommand{\IUSTITIA}{\char"145A3}
+\newcommand{\IUDEX}{\char"145A3}
+\newcommand{\IUDEXRAI}{\char"145A4}
+\newcommand{\TARAIX}{\char"145A4}
+\newcommand{\SACERDOS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14590}
+ \else \ifnum #1=2
+ {\char"145A5}
+ \fi\fi
+}
+\newcommand{\LCCCLXXIII}{\char"145A6}
+\newcommand{\LCCCLXXIV}{\char"145A7}
+\newcommand{\LCCCLXXV}{\char"145A8}
+\newcommand{\ZIA}{\char"145A9}
+\newcommand{\LITUUS}{\char"145AB}
+\newcommand{\OCCIDENS}{\char"145AC}
+\newcommand{\ONE}{\char"145AD}
+\newcommand{\UNUS}{\char"145AD}
+\newcommand{\MINUS}{\char"145AE}
+\newcommand{\MORI}{\char"145AF}
+\newcommand{\VIRIIMINUS}{\char"145AF}
+\newcommand{\LIGNUM}{\char"145B0}
+\newcommand{\RAI}{\char"145B1}
+\newcommand{\PERS}{\char"145B2}
+\newcommand{\TWO}{\char"145B3}
+\newcommand{\WORD}{\char"145B5}
+\newcommand{\VIRIIA}{\char"145B6}
+\newcommand{\SERVUS}{\char"145B7}
+\newcommand{\MI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145BB}
+ \else \ifnum #1=2
+ {\char"145D8}
+ \else \ifnum #1=3
+ {\char"145B7}
+ \fi\fi\fi
+}
+\newcommand{\THREE}{\char"145B8}
+\newcommand{\TARAI}{\char"145B9}
+\newcommand{\DOMINUS}{\char"145BA}
+\newcommand{\FOUR}{\char"145BB}
+\newcommand{\FIVE}{\char"145BC}
+\newcommand{\EIGHT}{\char"145BD}
+\newcommand{\LCCCXCIV}{\char"145BE}
+\newcommand{\NINE}{\char"145BF}
+\newcommand{\LCCCXCVI}{\char"145C0}
+\newcommand{\TEN}{\char"145C1}
+\newcommand{\DECEM}{\char"145C1}
+\newcommand{\LCCCXCVIII}{\char"145C2}
+\newcommand{\HUNDRED}{\char"145C3}
+\newcommand{\CENTUM}{\char"145C3}
+\newcommand{\THOUSAND}{\char"145C4}
+\newcommand{\MILLE}{\char"145C4}
+\newcommand{\LCDI}{\char"145C5}
+\newcommand{\SCUTELLA}{\char"145C6}
+\newcommand{\LCDIII}{\char"145C7}
+\newcommand{\ANIMAL}{\char"145C8}
+\newcommand{\LCDV}{\char"145C9}
+\newcommand{\LCDVI}{\char"145CA}
+\newcommand{\LCDVII}{\char"145CB}
+\newcommand{\LCDVIII}{\char"145CC}
+\newcommand{\LCDIX}{\char"145CD}
+\newcommand{\LCDX}{\char"145CE}
+\newcommand{\LOGS}{\char"145CE}
+\newcommand{\LCDXA}{\char"145CF}
+\newcommand{\LOGE}{\char"145CF}
+\newcommand{\LCDXIV}{\char"145D3}
+\newcommand{\LCDXVI}{\char"145D5}
+\newcommand{\SAX}{\char"145D6}
+\newcommand{\LCDXVIII}{\char"145D7}
+\newcommand{\URHI}{\char"145D8}
+\newcommand{\LCDXX}{\char"145D9}
+\newcommand{\US}{\char"145DA}
+\newcommand{\PANISSCUTELLA}{\char"145DB}
+\newcommand{\KU}{\char"145DC}
+\newcommand{\LCDXXIV}{\char"145DD}
+\newcommand{\LCDXXV}{\char"145DE}
+\newcommand{\LCDXXVI}{\char"145DF}
+\newcommand{\LCDXXVII}{\char"145E0}
+\newcommand{\LCDXXVIII}{\char"145E1}
+\newcommand{\TANA}{\char"145E2}
+\newcommand{\LCDXXXI}{\char"145E4}
+\newcommand{\LCDXXXII}{\char"145E5}
+\newcommand{\AX}{\char"145E8}
+\newcommand{\LCDXXXVI}{\char"145E9}
+\newcommand{\LCDXXXVII}{\char"145EA}
+\newcommand{\PASTOR}{\char"145EB}
+\newcommand{\LCDXL}{\char"145ED}
+\newcommand{\LCDXLI}{\char"145EE}
+\newcommand{\LCDXLII}{\char"145EF}
+\newcommand{\LCDXLIII}{\char"145F0}
+\newcommand{\LCDXLIV}{\char"145F1}
+\newcommand{\LAIU}{\char"145F2}
+\newcommand{\KI}{\char"145F3}
+\newcommand{\NIX}{\char"145F4}
+\newcommand{\LCDXLIX}{\char"145F7}
+\newcommand{\RAA}{\char"145F8}
+\newcommand{\HURU}{\char"145F9}
+\newcommand{\LCDLII}{\char"145FA}
+\newcommand{\LCDLIII}{\char"145FB}
+\newcommand{\LCDLIV}{\char"145FC}
+\newcommand{\LAX}{\char"145FD}
+\newcommand{\LCDLVII}{\char"145FF}
+\newcommand{\LCDLVIIA}{\char"14600}
+\newcommand{\LCDLVIII}{\char"14601}
+\newcommand{\LCDLIX}{\char"14602}
+\newcommand{\LCDLX}{\char"14603}
+\newcommand{\LCDLXI}{\char"14604}
+\newcommand{\MAX}{\char"14605}
+\newcommand{\LCDLXIII}{\char"14606}
+\newcommand{\LCDLXIV}{\char"14607}
+\newcommand{\LCDLXV}{\char"14608}
+\newcommand{\LCDLXVI}{\char"14609}
+\newcommand{\LCDLXVII}{\char"1460A}
+\newcommand{\LCDLXVIII}{\char"1460B}
+\newcommand{\LCDLXIX}{\char"1460C}
+\newcommand{\TWELVE}{\char"1460D}
+\newcommand{\LCDLXXI}{\char"1460E}
+\newcommand{\LCDLXXII}{\char"1460F}
+\newcommand{\LCDLXXIII}{\char"14610}
+\newcommand{\LCDLXXV}{\char"14612}
+\newcommand{\LCDLXXVI}{\char"14613}
+\newcommand{\FLAMMAE}{\char"14614}
+\newcommand{\LCDLXXVIII}{\char"14615}
+\newcommand{\LCDLXXIX}{\char"14616}
+\newcommand{\LCDLXXX}{\char"14617}
+\newcommand{\LCDLXXXI}{\char"14618}
+\newcommand{\LCDLXXXII}{\char"14619}
+\newcommand{\LCDXXXIII}{\char"1461A}
+\newcommand{\LCDLXXXIV}{\char"1461B}
+\newcommand{\LCDLXXXV}{\char"1461C}
+\newcommand{\FALX}{\char"1461D}
+\newcommand{\LCDLXXXVII}{\char"1461E}
+\newcommand{\LCDLXXXIX}{\char"14620}
+\newcommand{\LCDXC}{\char"14621}
+\newcommand{\LCDXCI}{\char"14622}
+\newcommand{\LCDXCII}{\char"14623}
+\newcommand{\LCDXCIII}{\char"14624}
+\newcommand{\LCDXCIV}{\char"14625}
+\newcommand{\LCDXCV}{\char"14626}
+\newcommand{\LCDXCVI}{\char"14627}
+\newcommand{\LCDXCVII}{\char"14628}
+\newcommand{\LDI}{\char"14629}
+\newcommand{\LDII}{\char"1462A}
+\newcommand{\LDIII}{\char"1462B}
+\newcommand{\LDIV}{\char"1462C}
+\newcommand{\LDV}{\char"1462D}
+\newcommand{\HANA}{\char"1462E}
+\newcommand{\LDVII}{\char"1462F}
+\newcommand{\CURRERE}{\char"14630}
+\newcommand{\HWIA}{\char"14630}
+\newcommand{\LDIX}{\char"14631}
+\newcommand{\LDXI}{\char"14633}
+\newcommand{\LDXII}{\char"14634}
+\newcommand{\LDXIII}{\char"14635}
+\newcommand{\LDXIV}{\char"14636}
+\newcommand{\LDXV}{\char"14637}
+\newcommand{\LDXVI}{\char"14638}
+\newcommand{\LDXVII}{\char"14639}
+\newcommand{\LDXVIII}{\char"1463A}
+\newcommand{\LDXIX}{\char"1463B}
+\newcommand{\LDXX}{\char"1463C}
+\newcommand{\LDXXI}{\char"1463D}
+\newcommand{\LDXXII}{\char"1463E}
+\newcommand{\LDXXIII}{\char"1463F}
+\newcommand{\CORNUCAPUT}{\char"14640}
+\newcommand{\PROPHETA}{\char"14640}
+\newcommand{\PRINCEPS}{\char"14641}
+\newcommand{\GCXCV}{\char"14642}
+\newcommand{\APER}{\char"14643}
+\newcommand{\LINGUAX}{\char"14645}
+\newcommand{\LDXXX}{\char"14646}
+
+
+
+
diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index e0e1f2f3748..799e1ec279c 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `latex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -42,7 +42,6 @@
%%
%% The names of the source files used are shown above.
%%
-\RequirePackage{expl3}
\ExplSyntaxOn
\tl_const:Nn \c__markdown_option_layer_latex_tl { latex }
\cs_generate_variant:Nn
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
index a6ebbd6f1d9..fbe93b2844b 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-dot')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
index a962d1d8cd0..d6c2a7566a0 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-graphicx-http')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
index fca6079c579..f90017e073b 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-markdown-defaults-latex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls b/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls
index b48703d7456..9990a07a884 100644
--- a/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls
+++ b/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls
@@ -4,11 +4,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% This file provides the mitthesis LaTeX class for formatting theses according to
-%% MIT Libraries' requirements as of 2023.
+%% MIT Libraries' requirements as of 2024.
%%
%% This file's version and date:
- \def\versionno{1.11}
- \def\versiondate{2023/11/02\space}
+ \def\versionno{1.13}
+ \def\versiondate{2024/07/03\space}
%%
%% Author: John H. Lienhard, V
%% Department of Mechanical Engineering
@@ -25,7 +25,7 @@
%%
%% LICENSE:
%%
-%% Copyright (c) 2023 John H. Lienhard
+%% Copyright (c) 2024 John H. Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -57,34 +57,24 @@
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% compare version to date; \If... added to latex 2020/10/01
\providecommand\IfPackageAtLeastTF{\@ifpackagelater}% compare version to date; \If... added to latex 2020/10/01
-\providecommand\IfPackageLoadedTF{\@ifpackageloaded}% \If...added to latex 2021/11/15
+\providecommand\IfPDFManagementActiveTF{\@secondoftwo}% \If... added to latex 2021/07/23
+\providecommand\IfPackageLoadedTF{\@ifpackageloaded}% \If... added to latex 2021/11/15
+\providecommand\ClassNoteNoLine[2]{\typeout{^^JClass Note #1: #2.^^J}}% log & terminal note... added to latex 2021/11/15
\IfFormatAtLeastTF{2020/10/01}{%
- \typeout{^^JYour LaTeX format is dated \fmtversion. LaTeX distributions from 2022/11/01 or later are strongly recommended for best results^^J}
+ \ClassNoteNoLine{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX distributions from 2022/11/01 or later are strongly recommended for best results}
}{%
\ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. Formats dated 2022/11/01 or later are strongly recommended for this class. Older formats may generate errors}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. You can try to click past the errors for now...}%
}
-% check whether pdfmanagement (\DocumentMetadata) has been loaded (if not, fall back to hyperxmp)
+% check whether pdfmanagement (\DocumentMetadata) has been loaded (if not, fall back to hyperxmp and bookmark packages after loading hyperref)
\newif\ifmit@pdfmanagement
-\ExplSyntaxOn
- \msg_new:nnn { \ClassName } { loading_hyperxmp } { pdfmanagement\ is\ not\ active.\ Will\ load\ hyperxmp\ instead. }
- % As of 2021/07/23 we could instead use \IfPDFManagementActiveTF{true code}{false code}
- \IfFormatAtLeastTF{2020/10/01}{
- \bool_if:nTF
- {
- \bool_lazy_and_p:nn
- { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
- { \pdfmanagement_if_active_p: }
- }
- { \mit@pdfmanagementtrue }
- { \mit@pdfmanagementfalse
- \msg_warning:nn { \ClassName } { loading_hyperxmp }
- }
- }{ \mit@pdfmanagementfalse
- \msg_warning:nn { \ClassName } { loading_hyperxmp }
- }
-\ExplSyntaxOff
+\IfPDFManagementActiveTF{
+ \mit@pdfmanagementtrue
+}{
+ \mit@pdfmanagementfalse
+ \ClassWarningNoLine{\ClassName}{pdfmanagement is not active. Will load hyperxmp and bookmark packages instead}
+}
% Enable pre-2020/10 formats to access essential macros later moved into LaTeX kernel
\ifdefined\NewDocumentCommand\else
@@ -163,19 +153,35 @@
%%%%%%%%%%%%% Patch table of contents, list of figures, and list of tables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage{etoolbox}% provides \patchcmd
-
-% We'd like these sections to have pdf bookmarks and to have the two lists appear in the table of contents
+% We'd like these sections to have pdf bookmarks and to have the two lists appear in the table of contents and have
+% pdf bookmarks. This is not automatic for \chapter*, which is the format of toc, lof, and lot.
-\patchcmd{\tableofcontents}{\@starttoc{toc}}{\pdfbookmark[0]{Table of Contents}{toc}\@starttoc{toc}}{}{}
-\patchcmd{\listoffigures}{\chapter*{\listfigurename}}{\chapter*{\listfigurename}\addcontentsline{toc}{chapter}{\listfigurename}}{}{}
-\patchcmd{\listoftables}{\chapter*{\listtablename}}{\chapter*{\listtablename}\addcontentsline{toc}{chapter}{\listtablename}}{}{}
+\RequirePackage{etoolbox}% provides \patchcmd
+\patchcmd{\tableofcontents}{\contentsname}{\pdfbookmark[0]{Table of Contents}{toc}\contentsname}{}{} % placement matters.
+\patchcmd{\listoffigures}{\chapter*{\listfigurename}}{\chapter*{\phantomsection\listfigurename}\addcontentsline{toc}{frontmatter}{\listfigurename}}{}{}
+\patchcmd{\listoftables}{\chapter*{\listtablename}}{\chapter*{\phantomsection\listtablename}\addcontentsline{toc}{frontmatter}{\listtablename}}{}{}
+
+\NewCommandCopy\l@frontmatter\l@chapter
+\NewCommandCopy\l@backmatter\l@chapter
+\providecommand*{\toclevel@frontmatter}{0}% prevent warning, see hyperref manual Sec. 13.3
+\providecommand*{\toclevel@backmatter}{0}
+%% if you want different formatting for front/back matter, change here (cf. report.cls). This approach preserves tagging hooks.
+\AtBeginDocument{
+ \patchcmd{\l@frontmatter}{\bfseries}{\itshape}{}{}
+ \patchcmd{\l@frontmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{}
+ \patchcmd{\l@frontmatter}{1.0em}{3pt}{}{}
+ \patchcmd{\l@backmatter}{\bfseries}{\itshape}{}{}
+ \patchcmd{\l@backmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{}
+}
%%%%%%%%%%%%% Geometry, mathtools, graphics, design, fonts, hyperrefs, bookmarks, footnotes %%%%%%%%%%%%%%%%%%%
-%\RequirePackage[letterpaper,top=1in,bottom=0.97136in,left=1in,right=1in,marginparwidth=50pt,headsep=12pt,footskip=0.47136in]{geometry} % bottom margin allows 45\baselineskip in \textheight
-\RequirePackage[letterpaper,top=1in,bottom=1in,left=1in,right=1in,marginparwidth=50pt,headsep=12pt,footskip=0.5in,heightrounded]{geometry} % 44\baselineskip = \texteheight - \topskip = 650.0pt - 12pt with rounded height
+%\RequirePackage[letterpaper,top=1in,bottom=0.97136in,left=1in,right=1in,marginparwidth=50pt,headsep=12pt,footskip=0.47136in]{geometry}
+% bottom margin allows 45\baselineskip in \textheight
+
+\RequirePackage[letterpaper,top=1in,bottom=1in,left=1in,right=1in,marginparwidth=50pt,headsep=12pt,footskip=0.5in,heightrounded]{geometry}
+% 44\baselineskip = \texteheight - \topskip = 650.0pt - 12pt with rounded height
\RequirePackage{mathtools}% loads and extends amsmath; must load before hyperref and unicode-math
@@ -198,16 +204,17 @@
https://ctan.org/tex-archive/macros/latex/contrib/mitthesis/MIT-thesis-template.}%
}%
\else
- \RequirePackage[hyperref,dvipsnames,svgnames,x11names]{xcolor}
+ \RequirePackage[dvipsnames,svgnames,x11names]{xcolor}
%
\RequirePackage{caption,subcaption}
%
\RequirePackage{titlesec}
% these titlesec commands just automate the bold math in some headings (rest follows default styles)
% NOT every font includes a bold math version, so you may need to use other math macros in the headings to get bold math <==
- \titleformat{\section}{\mathversion{bold}\normalfont\Large\bfseries}{\thesection }{1em}{}
+ % Predefined fontsets for which bold math exists are: CMR, Fira, Libertinus, Lucida, newtx
+ \titleformat{\section}{\mathversion{bold}\normalfont\Large\bfseries}{\thesection}{1em}{}
\titleformat{\subsection}{\mathversion{bold}\normalfont\large\bfseries}{\thesubsection}{1em}{}
- \titleformat{\subsubsection}{\mathversion{bold}\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{}
+ \titleformat{\subsubsection}{\mathversion{bold}\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{}
%
\AtBeginDocument{
\hypersetup{
@@ -226,21 +233,21 @@
\RequirePackage{iftex}[2019/11/07]% provides \ifpdftex, etc.
-\typeout{^^JFontset key is \mit@fontset.^^J}
+\ClassNoteNoLine{\ClassName}{Fontset key is \mit@fontset}
\IfFileExists{fontsets/\ClassName-\mit@fontset.tex}{% 2023/07/03
\input{fontsets/\ClassName-\mit@fontset.tex}
}{%
- \ClassWarning{\ClassName}{^^JFontset file \ClassName-\mit@fontset.tex or subdirectory fontsets not found, will look for \mit@fontset.tex in your working directory.}
+ \ClassWarning{\ClassName}{Fontset file \ClassName-\mit@fontset.tex or subdirectory fontsets not found, will look for \mit@fontset.tex in your working directory}
\IfFileExists{\mit@fontset.tex}{% 2023/08/30
\input{\mit@fontset.tex}
}{
- \ClassWarning{\ClassName}{^^JFontset file \mit@fontset.tex not found, using default fonts. You may need to place the fontset file into your working directory.}
+ \ClassWarning{\ClassName}{Fontset file \mit@fontset.tex not found, using default fonts. You may need to place the fontset file into your working directory}
\ifpdftex
- \typeout{^^JLoading Computer Modern text and math fonts (default for pdftex).^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Computer Modern text and math fonts (default for pdftex)}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading Latin Modern text and math fonts (default for unicode engines).^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Latin Modern text and math fonts (default for unicode engines)}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
% Unicode-math loads fontspec package, but default fonts are not selected by fontspec in this case.
@@ -251,15 +258,18 @@
%%%%%%%%%%%% Hyperref %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage[psdextra]{hyperref}
-% the new pdf-management scheme loads the bookmarks package internally.
% authors should use hypersetup to set details, in root .tex file
\urlstyle{same} % this changes font for \url to the current text font
-\providecommand\hrefurl[2]{\href{#1}{#2}}% in case \DocumentMetadata has not been loaded
\RequirePackage{doi} % create macro for hyperlinking doi numbers
+%% In case \DocumentMetadata was not loaded
+\providecommand\hrefurl[2]{\href{#1}{#2}}
+
+% pdfmanagement loads bookmarks package internally
\ifmit@pdfmanagement\else
\RequirePackage{hyperxmp}
+ \RequirePackage{bookmark}
\fi
% the user can alter these choices in the preamble, or by
@@ -289,7 +299,7 @@
\pdfstringdefDisableCommands{%
\def\bm#1#{\relax}%
}
-%%% Let's disable \( and \) in pdf bookmarks
+%% Let's disable \( and \) in pdf bookmarks
\pdfstringdefDisableCommands{%
\def\({\relax}%
\def\){\relax}%
@@ -312,10 +322,22 @@
\def\footnote#1{}%
}
+%%% Here's a more cumbersome removal of the warning for $ (math shift) in pdfbookmarks.
+%%% Not implementing this by default, since novice authors may benefit from the warning.
+%%% https://tex.stackexchange.com/a/620360/119566
+%\let\oldHyPsd@CatcodeWarning\HyPsd@CatcodeWarning
+%\renewcommand{\HyPsd@CatcodeWarning}[1]{%
+% \ifnum\pdfstrcmp{#1}{math shift}=0 % If 'math shift' is present, do nothing
+% \else
+% \oldHyPsd@CatcodeWarning{#1}% % else, keep usual warning.
+% \fi
+%}
\ExplSyntaxOn
%\debug_on:n {all}
+\prop_gput:Nnn \g_msg_module_type_prop { \ClassName } { Class }
+
%%%%%%%%%% Commas between successive footnotes %%%
\cs_new:Npn \__mitthesis_NoteComma:n { \peek_meaning:NT \footnote {\textsuperscript{\mdseries,}} }
@@ -339,18 +361,19 @@
\tl_gremove_all:No \g__dd_month_tl { \space }
\tl_gremove_all:No \g__dd_year_tl { \space }
\str_case_e:nnF
-% { \str_casefold:e { \tl_to_str:N \g__dd_month_tl } } % not def'd until 2022/10/16
+% { \str_casefold:e { \tl_to_str:N \g__dd_month_tl } } % command not def'd until 2022/10/16
{ \str_lowercase:f { \tl_to_str:N \g__dd_month_tl } }
{ {february}{} {may}{} {june}{} {september}{}}
{ \msg_error:nnn { \ClassName } { wrong_month } {#1} }
}
\msg_new:nnnn { \ClassName } { wrong_month } {The\ degree\ month\ must\ be\ one\ of\ February,\ May,\ June,\ or\ September.} {You\ cannot\ use\ #1\ as\ the\ degree\ month.}
-\cs_generate_variant:Nn \text_titlecase:n {o,V}
+\cs_generate_variant:Nn \text_titlecase_first:n {V}
+\cs_generate_variant:Nn \text_titlecase_all:n {V}
\NewDocumentCommand\DegreeDate{mm}{% {month}{year}
\__dd_setdates:nn {#1}{#2}
- \cs_new:Npn \DegreeMonth { \text_titlecase:V { \g__dd_month_tl } }
- \cs_new:Npn \DegreeYear { \text_titlecase:V { \g__dd_year_tl } }
+ \cs_new:Npn \DegreeMonth { \text_titlecase_first:V { \str_lowercase:f \g__dd_month_tl } }
+ \cs_new:Npn \DegreeYear { \text_expand:n { \g__dd_year_tl } }% edited 2024/06/24
}
\msg_new:nnnn { \ClassName } { no_degree_date } {Missing\ degree\ date!}{
You\ MUST\ issue\ the\ \DegreeDate{month}{year}\ command\ between\ \string\begin{document}\ and\ \string\maketitle.}
@@ -516,7 +539,6 @@
\seq_new:N \g_supervisor_title_seq
\int_gzero_new:N \g_supervisor_supervisorcnt_int
-
\NewDocumentCommand\Supervisor{mm}{
\tl_if_blank:nTF{#1}{
\msg_error:nn { \ClassName } { blank_supervisor }
@@ -535,10 +557,22 @@
\cs_new_protected:Nn \__supervisor_data_add:nn
{
\int_gincr:N \g_supervisor_supervisorcnt_int
- \seq_gput_right:cx { g_supervisor_name_seq } { \tl_trim_spaces:n {#1} }
+ \seq_gput_right:cx { g_supervisor_name_seq } { \tl_trim_spaces:n {#1} }
\seq_gput_right:cx { g_supervisor_title_seq } { \tl_trim_spaces:n {#2} }
}
+\tl_new:N \g_titlepage_supervisor_designation_tl
+\tl_new:N \g_abstract_supervisor_designation_tl
+\tl_gset:Nn \g_titlepage_supervisor_designation_tl {Thesis\ Supervisor}
+\tl_gset:Nn \g_abstract_supervisor_designation_tl {Thesis\ supervisor}% style from MIT Libraries
+
+% If for some reason you need to change "Thesis Supervisor" to a different string (say, "Doctoral Advisor")
+% This construction removes leading and trailing spaces and lowercases the string.
+% Commands in output modules handle titlecasing.
+\NewDocumentCommand\SupervisorDesignation{ m } {
+ \tl_gset:Nn \g_titlepage_supervisor_designation_tl { \str_lowercase:f { \tl_trim_spaces:n {#1} } }
+ \tl_gset:Nn \g_abstract_supervisor_designation_tl { \str_lowercase:f { \tl_trim_spaces:n {#1} } }
+ }
\cs_new:Nn \__supervisor_abstractblock: {
\int_zero_new:N \l__supervisor_supervisorno_int
@@ -549,11 +583,13 @@
\msg_error:nn { \ClassName } { no_supervisor }
}
{\int_until_do:nNnn { \l__supervisor_supervisorno_int } = { \g_supervisor_supervisorcnt_int } {
- Thesis\ supervisor:\space \seq_item:cn { g_supervisor_name_seq } { \l__supervisor_supervisorno_int }\par
+ \text_titlecase_first:V { \g_abstract_supervisor_designation_tl } :\space
+ \seq_item:cn { g_supervisor_name_seq } { \l__supervisor_supervisorno_int }\par
Title:\space \seq_item:cn { g_supervisor_title_seq } { \l__supervisor_supervisorno_int }\par\medskip
\int_incr:N \l__supervisor_supervisorno_int
}
- Thesis\ supervisor:\space \seq_item:cn { g_supervisor_name_seq } { \l__supervisor_supervisorno_int }\par
+ \text_titlecase_first:V { \g_abstract_supervisor_designation_tl } :\space
+ \seq_item:cn { g_supervisor_name_seq } { \l__supervisor_supervisorno_int }\par
Title:\space \seq_item:cn { g_supervisor_title_seq } { \l__supervisor_supervisorno_int }\ignorespaces
}
}
@@ -607,36 +643,56 @@
%%%%%%%%%% End Acceptor Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%% Degree Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%% Degree Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% extensive edits 2024/06/25
\seq_new:N \g_degree_name_seq
\seq_new:N \g_degree_department_seq
\int_gzero_new:N \g_degree_degreecnt_int
-\int_gzero_new:N \g__degree_degreeflag_int
+\int_gzero_new:N \g_degree_deptcnt_int
\NewDocumentCommand\Degree{mm}
{
- \tl_if_blank:nTF {#1} {
- \msg_error:nn { \ClassName } { blank_degree }
- }{
- \__degree_data_add:nn { #1 } { #2 }
- }
- \tl_if_blank:nT {#2} {
- \int_gset_eq:NN \g__degree_degreeflag_int \g_degree_degreecnt_int
- \msg_warning:nnx { \ClassName } { blank_degree_dep } { \int_to_arabic:n { \g__degree_degreeflag_int } }
- \tl_if_blank:nT {#1} { \int_gincr:N \g__degree_degreeflag_int }% in case both are blank
- }
+ \int_compare:nNnTF { \g_degree_deptcnt_int } = {0} {
+ \tl_if_blank:nTF {#1} {
+ \msg_error:nn { \ClassName } { no_degree_name }
+ }{
+ \__degree_data_add:nn { #1 } { #2 }
+ \int_gincr:N \g_degree_degreecnt_int
+ }
+ \tl_if_blank:nT {#2} {
+ \msg_error:nn { \ClassName } { no_degree_dep }
+ }{
+ \int_gincr:N \g_degree_deptcnt_int
+ }
+ }{
+ \tl_if_blank:nTF {#1} {
+ \msg_warning:nn { \ClassName } { blank_degree }
+ }{
+ \__degree_data_add:nn { #1 } { #2 }
+ \int_gincr:N \g_degree_degreecnt_int
+ }
+ \tl_if_blank:nTF {#2} {
+ \msg_warning:nn { \ClassName } { blank_degree_dep }
+ }{
+ \int_gincr:N \g_degree_deptcnt_int
+ \tl_if_blank:nT {#1} { % in case department is blank
+ \__degree_data_add:nn { #1 } { #2 }
+ }
+ }
+ }
}
+
\cs_new_protected:Nn \__degree_data_add:nn
{
- \int_gincr:N \g_degree_degreecnt_int
\seq_gput_right:cx { g_degree_name_seq } { \tl_trim_spaces:n {#1} }
\seq_gput_right:cx { g_degree_department_seq } { \tl_trim_spaces:n {#2} }
}
-\msg_new:nnnn { \ClassName } { blank_degree } {Missing\ degree\ name,\ check\ for\ blank\ in\ \Degree\ command.}
- {You\ MUST\ provide\ a\ degree\ name\ using\ the\ \Degree{name}{department}\ command.}
-\msg_new:nnnn { \ClassName } { blank_degree_dep } {Missing\ degree\ department\ for\ Degree\ command\ number\
- #1.\ Will\ treat\ as\ a\ duplicate\ of\ previous\ department.}{}
+\msg_new:nnnn { \ClassName } { no_degree_name } {Missing\ degree\ name,\ check\ for\ blank\ in\ \Degree\ command.}
+ {You\ MUST\ provide\ at\ least\ one\ degree\ name\ using\ the\ \Degree{name}{department}\ command.}
+\msg_new:nnnn { \ClassName } { no_degree_dep } {Missing\ degree\ department\ for\ Degree\ command.}
+ {You\ MUST\ provide\ at\ least\ one\ department\ name\ using\ the\ \Degree{name}{department}\ command.}
+\msg_new:nnnn { \ClassName } { blank_degree } {Missing\ degree\ name\ in\ second\ Degree\ command.\ Will\ treat\ as\ two\ departments\ issuing\ one\ degree.}{}
+\msg_new:nnnn { \ClassName } { blank_degree_dep } {Missing\ degree\ department\ in\ second\ \ Degree\ command.\ Will\ treat\ as\ one\ department\ issuing\ two\ degrees.}{}
\int_zero_new:N \l__degree_degreeno_int
\int_zero_new:N \l__degree_departmentno_int
@@ -651,20 +707,18 @@
\int_incr:N \l__degree_departmentno_int
\cs_new:Nx \__degree_prevdept: {\seq_item:cn { g_degree_department_seq } { \l__degree_departmentno_int } }
\cs_new:Nn \__degree_currdept: {}
- \mbox {Submitted\ to\ the\ } \mbox {\__degree_prevdept:}
- \int_until_do:nNnn { \l__degree_departmentno_int } = { \g_degree_degreecnt_int } {
+% \mbox {Submitted\ to\ the\ } \mbox {\__degree_prevdept:}
+ {Submitted\ to\ the\ \__degree_prevdept:}
+ \int_until_do:nNnn { \l__degree_departmentno_int } = { \g_degree_deptcnt_int } {
\int_incr:N \l__degree_departmentno_int
\cs_set:Nx \__degree_currdept: {\seq_item:cn { g_degree_department_seq } { \l__degree_departmentno_int } }
- \int_compare:nNnTF { \l__degree_departmentno_int } = {\g__degree_degreeflag_int } { \scan_stop: }
- {
- \mbox {\ and\ the}\linebreak
- \mbox {\__degree_currdept: }
- }
- }
+ \mbox {\ and}\linebreak
+ \mbox {the\ \__degree_currdept: }
+ }
\linebreak \mbox {in\ partial\ fulfillment\ of\ the\ requirements\ for\ the\
\int_compare:nNnTF { \g_degree_degreecnt_int } > {1} {degrees} {degree}
\ of}
- \par%\medskip, removed 2023/10/25 to work better with four block layout of title page
+ \par
\int_until_do:nNnn { \l__degree_degreeno_int } = { \g_degree_degreecnt_int } {
\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par and\par
\int_incr:N \l__degree_degreeno_int
@@ -681,16 +735,14 @@
\int_set:Nn \l__degree_departmentno_int {1}
\cs_set:Nx \__degree_prevdept: {\seq_item:cn { g_degree_department_seq } { \l__degree_departmentno_int } }
\cs_set:Nn \__degree_currdept: {}
- \mbox {Submitted\ to\ the\ }\mbox{\__degree_prevdept:}
- \int_until_do:nNnn { \l__degree_departmentno_int } = { \g_degree_degreecnt_int } {
- \int_incr:N \l__degree_departmentno_int
+% \mbox {Submitted\ to\ the\ }\mbox {\__degree_prevdept:} % changed 2024/4/20
+ {Submitted\ to\ the\ \__degree_prevdept:}
+ \int_until_do:nNnn { \l__degree_departmentno_int } = { \g_degree_deptcnt_int } {
+ \int_incr:N \l__degree_departmentno_int
\cs_set:Nx \__degree_currdept: {\seq_item:cn { g_degree_department_seq } { \l__degree_departmentno_int } }
- \int_compare:nNnTF { \g__degree_degreeflag_int } = { \g_degree_degreecnt_int } { \scan_stop: }
- {
- \mbox {\ and\ the}\linebreak
- \mbox { \__degree_currdept: }
- }
- }
+ \mbox {\ and}\linebreak
+ \mbox {the\ \__degree_currdept: }
+ }
\linebreak \mbox{on\ \g_dd_thesisdate_tl\ in\ partial\ fulfillment\ of\ the\ requirements\ for\ the\
\int_compare:nNnTF { \g_degree_degreecnt_int } > {1} {degrees} {degree}
\ of}
@@ -749,7 +801,9 @@
\int_do_while:nNnn { \g__signature_supno_int } < { \g_supervisor_supervisorcnt_int } {
\int_gincr:N \g__signature_supno_int
Certified\ by: \> \seq_item:cn { g_supervisor_name_seq } { \g__signature_supno_int } \\
- \> \seq_item:cn { g_supervisor_title_seq } { \g__signature_supno_int },\ Thesis\ Supervisor\\[1em]
+ \> \seq_item:cn { g_supervisor_title_seq } { \g__signature_supno_int },\
+ \text_titlecase_all:V { \g_titlepage_supervisor_designation_tl }\\[1em]
+ %\ Thesis\ Supervisor\\[1em]
}
\int_compare:nNnF { \g_acceptor_acceptorcnt_int } = {0} {
\int_do_while:nNnn { \g__signature_accno_int } < { \g_acceptor_acceptorcnt_int } {
@@ -908,8 +962,10 @@
{\centering \vbox_to_ht:nn { \vsize }% to prevent signature block from breaking across page
{
\setlength{\parskip}{7.5pt plus 1pt minus 1pt}% edited all vertical space on this page 2023/10/25
- \setlength{\parindent}{0pt}
- {\Large\textbf{\g_mitthesis_title_tl}\phantomsection\addcontentsline{toc}{chapter}{Title\ page}\par} % revise for tagging in future
+ \setlength{\parindent}{0pt}\pdfbookmark[0]{Title\ page}{titlepage}
+ {\Large\textbf{\g_mitthesis_title_tl}
+ %\phantomsection\addcontentsline{toc}{chapter}{Title\ page}
+ \par}
\__titlepage_blockskip:nn {12}{1.5}% new idea
\__author_block:
\__titlepage_blockskip:nn {12}{1.5}
@@ -937,14 +993,17 @@
%%%%%%%%%% Abstract page Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% to change abstract name, follow either of these approaches in your preamble:
+% to change abstract name (e.g., to "Summary"), follow either approach in your preamble:
% \RenewExpandableDocumentCommand\abstractname{}{Summary}
% \renewcommand\abstractname{Summary}
\RenewDocumentEnvironment{abstract}{+b}{
\newpage
\begin{center}
- {\large{\textbf{\g_mitthesis_title_tl}}\phantomsection\addcontentsline{toc}{chapter}{\abstractname}\par} % revise for tagging as LaTeX evolves further
+ \pdfbookmark[0]{Abstract}{abstract}
+ {\large{\textbf{\g_mitthesis_title_tl}}
+ %\phantomsection\addcontentsline{toc}{chapter}{\abstractname}
+ \par}
\setlength{\parskip}{0.5\baselineskip plus 2pt minus 2pt}
\__author_abstractblock:
\par
@@ -992,11 +1051,12 @@
% Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns.
% Second optional argument can be used to rename the environment, e.g., to List of Symbols.
% Third optional argument selects section-level or chapter-level style for the nomenclature list.
+\newcounter{dummy}% for tagging code
\NewDocumentEnvironment{nomenclature}{O{2em} O{\nomname} O{section}}{%
\setlength\columnsep{2em}
\setlength{\nomenwidth}{#1}
\csname #3\endcsname *{#2}% this level will vary amongst users!
- \phantomsection\addcontentsline{toc}{#3}{#2}% tagged pdf may not capture both of these ... 2023/10/18
+ \refstepcounter{dummy}\addcontentsline{toc}{#3}{#2}% \refstepcounter is a hack until tagging code evolves more
\raggedright
\begin{list}{}{%
\setlength{\itemsep}{0pt}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index 44b9e359144..20cedc8b615 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -1,5 +1,5 @@
%% start of file `moderncv.cls'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{moderncv}[2022-02-21 v2.3.1 modern curriculum vitae and letter document class]
+\ProvidesClass{moderncv}[2024-07-18 v2.4.1 modern curriculum vitae and letter document class]
%-------------------------------------------------------------------------------
@@ -103,7 +103,8 @@
\urlstyle{tt}
\AtEndPreamble{
\pagenumbering{arabic}% has to be issued before loading hyperref, as to set \thepage and hence to avoid hyperref issuing a warning and setting pdfpagelabels=false
- \RequirePackage[unicode]{hyperref}% unicode is required for unicode pdf metadata
+ \PassOptionsToPackage{unicode}{hyperref}
+ \RequirePackage{hyperref}
\hypersetup{
breaklinks,
pdfborder = 0 0 0,
@@ -114,10 +115,16 @@
bookmarksopen = true,
bookmarksdepth= 2,% to show sections and subsections
pdfauthor = {\@firstname{}~\@lastname{}},
- pdftitle = {\@firstname{}~\@lastname{}\notblank{\@title}{ -- \@title}{}},
+ pdftitle =
+ {\@firstname{}~\@lastname{}\expandafter\notblank\expandafter{\@title}{ -- \@title}{}}, %\notblank does not expand argument automatically
pdfsubject = {R\'{e}sum\'{e} of \@firstname{}~\@lastname{}},
pdfkeywords = {\@firstname{}~\@lastname{}, curriculum vit\ae{}, r\'{e}sum\'{e}}}}
+% pdftex not using pdfmanagement-testphase requires T1 font encoding in order to handle links containing special characters somewhat properly
+\ifpdftex
+ \IfPDFManagementActiveTF{}{\RequirePackage[T1]{fontenc}}
+\fi
+
% graphics
\RequirePackage{graphicx}
@@ -138,9 +145,9 @@
\@ifundefined{r@lastpage}{}{%
\ifthenelse{\pageref{lastpage}>1}{%
\newlength{\pagenumberwidth}%
- \settowidth{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}%
+ \settowidth{\pagenumberwidth}{\color{color2}\pagenumberfont\strut\thepage/\pageref{lastpage}}%
\fancypagestyle{plain}{%
- \fancyfoot[r]{\parbox[b]{\pagenumberwidth}{\color{color2}\pagenumberfont\strut\thepage/\pageref{lastpage}}}}% the parbox is required to ensure alignment with a possible center footer (e.g., as in the casual style)
+ \fancyfoot[r]{\parbox[b]{\pagenumberwidth}{\color{color2}\pagenumberfont\strut\thepage/\protect\NoHyper\pageref{lastpage}\protect\endNoHyper}}}% the parbox is required to ensure alignment with a possible center footer (e.g., as in the casual style)
\pagestyle{plain}}{}}\fi}%
\AtEndDocument{\label{lastpage}}}
\pagestyle{plain}
@@ -231,8 +238,9 @@
\newcommand*{\email}[1]{\def\@email{#1}}
% defines one's home page (optional)
-% usage: \homepage{<url>}
-\newcommand*{\homepage}[1]{\def\@homepage{#1}}
+% usage: \homepage[<optional protocol>]{<url>}
+% where <optional protocol> should be either "https" (default) or "http"
+\NewDocumentCommand{\homepage}{O{https}m}{\def\@homepageprotocol{#1}\def\@homepage{#2}}
% adds a fixed/mobile/fax number to one's personal information (optional)
% usage: \phone[<optional type>]{<number>}
@@ -247,11 +255,41 @@
% http://latex.org/forum/viewtopic.php?t=12239
\def\SplitMyMacro#1/#2{#2}
-
-
+
+
% adds a social link to one's personal information (optional)
% usage: \social[<optional type>][<optional url>]{<account name>}
-% where <optional type> should be either "linkedin", "xing", "twitter", "github", "gitlab", "bitbucket" or "skype"
+% where <optional type> should be either:
+% - "linkedin"
+% - "xing"
+% - "twitter"
+% - "mastodon"
+% - "github"
+% - "gitlab"
+% - "stackoverflow"
+% - "bitbucket"
+% - "skype"
+% - "orcid"
+% - "researchgate"
+% - "researcherid"
+% - "telegram"
+% - "whatsapp"
+% - "signal"
+% - "matrix"
+% - "googlescholar"
+% - "codeberg"
+% - "discord"
+% - "twitch"
+% - "youtube"
+% - "tiktok"
+% - "instagram"
+% - "soundcloud"
+% - "steam
+% - "xbox"
+% - "playstation"
+% - "battlenet"
+% - "arxiv"
+% - "inspire"
\collectionnew{socials}
\NewDocumentCommand{\social}{O{}O{}m}{%
\ifthenelse{\equal{#2}{}}%
@@ -259,6 +297,7 @@
\ifthenelse{\equal{#1}{linkedin}} {\collectionadd[linkedin]{socials} {\protect\httpslink[#3]{www.linkedin.com/in/#3}}} {}%
\ifthenelse{\equal{#1}{xing}} {\collectionadd[xing]{socials} {\protect\httpslink[#3]{www.xing.com/profile/#3}}} {}%
\ifthenelse{\equal{#1}{twitter}} {\collectionadd[twitter]{socials} {\protect\httpslink[#3]{twitter.com/#3}}} {}%
+ \ifthenelse{\equal{#1}{mastodon}} {\collectionadd[mastodon]{socials} {\protect\httpslink[#3]{#3}}} {}%
\ifthenelse{\equal{#1}{github}} {\collectionadd[github]{socials} {\protect\httpslink[#3]{github.com/#3}}} {}%
\ifthenelse{\equal{#1}{gitlab}} {\collectionadd[gitlab]{socials} {\protect\httpslink[#3]{gitlab.com/#3}}} {}%
\ifthenelse{\equal{#1}{stackoverflow}}{\collectionadd[stackoverflow]{socials}{\protect\httpslink[#3]{stackoverflow.com/users/#3}}} {}%
@@ -271,7 +310,20 @@
\ifthenelse{\equal{#1}{whatsapp}} {\collectionadd[whatsapp]{socials} {\protect\httpslink[#3]{wa.me/#3}}} {}%
\ifthenelse{\equal{#1}{signal}} {\collectionadd[signal]{socials} {#3}} {}%
\ifthenelse{\equal{#1}{matrix}} {\collectionadd[matrix]{socials} {\httpslink[#3]{matrix.to/\#/#3}}} {}%
- \ifthenelse{\equal{#1}{googlescholar}}{\collectionadd[googlescholar]{socials}{\protect\httpslink[#3]{scholar.google.com/citations?user=#3}}} {}% {}%
+ \ifthenelse{\equal{#1}{googlescholar}}{\collectionadd[googlescholar]{socials}{\protect\httpslink[#3]{scholar.google.com/citations?user=#3}}} {}%
+ \ifthenelse{\equal{#1}{codeberg}} {\collectionadd[codeberg]{socials} {\protect\httpslink[#3]{codeberg.org/#3}}} {}%
+ \ifthenelse{\equal{#1}{discord}} {\collectionadd[discord]{socials} {#3}} {}%
+ \ifthenelse{\equal{#1}{twitch}} {\collectionadd[twitch]{socials} {\protect\httpslink[#3]{twitch.tv/#3}}} {}%
+ \ifthenelse{\equal{#1}{youtube}} {\collectionadd[youtube]{socials} {\protect\httpslink[#3]{youtube.com/#3}}} {}%
+ \ifthenelse{\equal{#1}{tiktok}} {\collectionadd[tiktok]{socials} {\protect\httpslink[#3]{tiktok.com/@#3}}} {}%
+ \ifthenelse{\equal{#1}{instagram}} {\collectionadd[instagram]{socials} {\protect\httpslink[#3]{instagram.com/#3}}} {}%
+ \ifthenelse{\equal{#1}{soundcloud}} {\collectionadd[soundcloud]{socials} {\protect\httpslink[#3]{soundcloud.com/#3}}} {}%
+ \ifthenelse{\equal{#1}{steam}} {\collectionadd[steam]{socials} {\protect\httpslink[#3]{steamcommunity.com/id/#3}}} {}%
+ \ifthenelse{\equal{#1}{xbox}} {\collectionadd[xbox]{socials} {\protect\httpslink[#3]{account.xbox.com/profile?gamertag=#3}}} {}%
+ \ifthenelse{\equal{#1}{playstation}} {\collectionadd[playstation]{socials} {#3}} {}%
+ \ifthenelse{\equal{#1}{battlenet}} {\collectionadd[battlenet]{socials} {#3}} {}%
+ \ifthenelse{\equal{#1}{arxiv}} {\collectionadd[arxiv]{socials} {\protect\httpslink[#3]{arxiv.org/a/#3}}} {}%
+ \ifthenelse{\equal{#1}{inspire}} {\collectionadd[inspire]{socials} {\protect\httpslink[#3]{inspirehep.net/authoris/#3}}} {}%
}
{\collectionadd[#1]{socials}{\protect\httpslink[#3]{#2}}}}%
@@ -312,6 +364,7 @@
\newcommand*{\linkedinsocialsymbol} {}
\newcommand*{\xingsocialsymbol} {}
\newcommand*{\twittersocialsymbol} {}
+\newcommand*{\mastodonsocialsymbol} {}
\newcommand*{\githubsocialsymbol} {}
\newcommand*{\gitlabsocialsymbol} {}
\newcommand*{\stackoverflowsocialsymbol}{}
@@ -325,6 +378,19 @@
\newcommand*{\whatsappsocialsymbol} {}
\newcommand*{\matrixsocialsymbol} {}
\newcommand*{\signalsocialsymbol} {}
+\newcommand*{\codebergsocialsymbol} {}
+\newcommand*{\discordsocialsymbol} {}
+\newcommand*{\twitchsocialsymbol} {}
+\newcommand*{\youtubesocialsymbol} {}
+\newcommand*{\tiktoksocialsymbol} {}
+\newcommand*{\instagramsocialsymbol} {}
+\newcommand*{\soundcloudsocialsymbol} {}
+\newcommand*{\steamsocialsymbol} {}
+\newcommand*{\xboxsocialsymbol} {}
+\newcommand*{\playstationsocialsymbol} {}
+\newcommand*{\battlenetsocialsymbol} {}
+\newcommand*{\arxivsocialsymbol} {}
+\newcommand*{\inspiresocialsymbol} {}
% other
%------
@@ -441,6 +507,8 @@
% styles
\newcommand*{\namestyle}[1]{{\namefont#1}}
+\NewDocumentCommand{\firstnamestyle}{+m}{{\namefont#1}}
+\NewDocumentCommand{\lastnamestyle}{+m}{{\namefont#1}}
\newcommand*{\titlestyle}[1]{{\titlefont#1}}
\newcommand*{\addressstyle}[1]{{\addressfont#1}}
\newcommand*{\quotestyle}[1]{{\quotefont#1}}
@@ -492,12 +560,16 @@
% usage: \cvdoubleitem[spacing]{header1}{text1}{header2}{text2}
\newcommand*{\cvdoubleitem}[5][.25em]{}
+% makes a resume line 3 headers and their corresponding text
+% usage: \cvtripleitem[spacing]{header1}{text1}{header2}{text2}{header3}{text3}
+\newcommand*{\cvtripleitem}[7][.1em]{}
+
% makes a resume line with a list item
-% usage: \cvlistitem[label]{item}
+% usage: \cvlistitem[spacing]{item}
\newcommand*{\cvlistitem}[2][\listitemsymbol]{}
% makes a resume line with 2 list items
-% usage: \cvlistdoubleitem[label]{item1}{item2}
+% usage: \cvlistdoubleitem[spacing]{item1}{item2}
\newcommand*{\cvlistdoubleitem}[3][\listitemsymbol]{}
% makes a typical resume job / education entry
@@ -510,25 +582,39 @@
% makes a generic hyperlink
% usage: \link[optional text]{link}
-\newcommand*{\link}[2][]{%
- \ifthenelse{\equal{#1}{}}%
- {\href{#2}{#2}}%
- {\href{#2}{#1}}}
+% uses pdfmanagement-testphase when available, which provides url encoding of special characters
+\NewDocumentCommand{\link}{O{}m}{%
+ \IfPDFManagementActiveTF{%
+ \ifthenelse{\equal{#1}{}}%
+ {\hrefurl[urlencode]{#2}{#2}}%
+ {\hrefurl[urlencode]{#2}{#1}}}{%
+ \ifthenelse{\equal{#1}{}}%
+ {\href{#2}{#2}}%
+ {\href{#2}{#1}}}}
% makes a http hyperlink
% usage: \httplink[optional text]{link}
-\newcommand*{\httplink}[2][]{%
- \ifthenelse{\equal{#1}{}}%
- {\href{http://#2}{#2}}%
- {\href{http://#2}{#1}}}
-
+% uses pdfmanagement-testphase when available, which provides url encoding of special characters
+\NewDocumentCommand{\httplink}{O{}m}{%
+ \IfPDFManagementActiveTF{%
+ \ifthenelse{\equal{#1}{}}%
+ {\hrefurl[urlencode]{http://#2}{#2}}%
+ {\hrefurl[urlencode]{http://#2}{#1}}}{%
+ \ifthenelse{\equal{#1}{}}%
+ {\href{http://#2}{#2}}%
+ {\href{http://#2}{#1}}}}
% makes an https hyperlink
% usage: \httpslink[optional text]{link}
-\newcommand*{\httpslink}[2][]{%
- \ifthenelse{\equal{#1}{}}%
- {\href{https://#2}{#2}}%
- {\href{https://#2}{#1}}}
+% uses pdfmanagement-testphase when available, which provides url encoding of special characters
+\NewDocumentCommand{\httpslink}{O{}m}{%
+ \IfPDFManagementActiveTF{%
+ \ifthenelse{\equal{#1}{}}%
+ {\hrefurl[urlencode]{https://#2}{#2}}%
+ {\hrefurl[urlencode]{https://#2}{#1}}}{%
+ \ifthenelse{\equal{#1}{}}%
+ {\href{https://#2}{#2}}%
+ {\href{https://#2}{#1}}}}
% makes an email hyperlink
% usage: \emaillink[optional text]{link}
@@ -712,8 +798,10 @@
% elements
\newcommand*{\recipient}[2]{\def\@recipientname{#1}\def\@recipientaddress{#2}}
\renewcommand*{\date}[1]{\def\@date{#1}}\date{\today}
+\newcommand*{\subject}[1]{\def\@subject{#1}}
\newcommand*{\opening}[1]{\def\@opening{#1}}
\newcommand*{\closing}[1]{\def\@closing{#1}}
+\newcommand*{\signature}[2]{\def\@signature{\includegraphics[scale=#1]{#2}}}
\newcommand*{\enclosure}[2][]{%
% if an optional argument is provided, use it to redefine \enclname
\ifthenelse{\equal{#1}{}}{}{\renewcommand*{\enclname}{#1}}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty
index 02ac2e3aa54..d3db954fef9 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyi.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyi}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 1]
+\ProvidesPackage{moderncvbodyi}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 1]
%-------------------------------------------------------------------------------
% required packages
%-------------------------------------------------------------------------------
-% provides the commands for the skillmatrix as well as the command
+% provides the commands for the skillmatrix as well as the command
% \recompute@cvskillmatrix@lengths
\RequirePackage[moderncvbodyi]{moderncvskillmatrix}
@@ -29,9 +29,9 @@
\renewcommand*{\hintfont}{}
% styles
-\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{sectioncolor}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{subsectioncolor}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{hintstylecolor}{#1}}}
%-------------------------------------------------------------------------------
@@ -44,11 +44,14 @@
\@initializelength{\maincolumnwidth}
% used by \cvdoubleitem
\@initializelength{\doubleitemcolumnwidth}
+% used by \cvtripleitem
+\@initializelength{\tripleitemcolumnwidth}
% used by \cvlistitem
\@initializelength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol}
\@initializelength{\listitemcolumnwidth}
% used by \cvlistdoubleitem
\@initializelength{\listdoubleitemcolumnwidth}
+\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
% default moderncv \photo (change the definition such that by default the photo and its box align with the section bars
\RenewDocumentCommand{\photo}{O{\hintscolumnwidth-0.8pt-2\fboxsep}O{0.4pt}m}{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}%
@@ -59,6 +62,8 @@
\setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
\setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\hintscolumnwidth-\separatorcolumnwidth-\separatorcolumnwidth}%
\setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\hintscolumnwidth-3\separatorcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
\setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
\setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
\recompute@cvskillmatrix@lengths
@@ -73,7 +78,7 @@
\par\addvspace{2.5ex}%
\phantomsection{}% reset the anchor for hyperrefs
\addcontentsline{toc}{section}{#2}%
- \cvitem[0ex]{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}{\strut\sectionstyle{#2}}%
+ \cvitem[0ex]{\strut\raggedleft\raisebox{\baseletterheight}{\color{bodyrulecolor}\rule{\hintscolumnwidth}{0.95ex}}}{\strut\sectionstyle{#2}}%
\par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading
\RenewDocumentCommand{\subsection}{sm}{%
@@ -97,15 +102,28 @@
\hspace*{\separatorcolumnwidth}%
\begin{minipage}[t]{\doubleitemcolumnwidth}#5\end{minipage}}}
+\renewcommand*{\cvtripleitem}[7][.1em]{%
+ \cvitem[#1]{#2}{%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#4}\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#5\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#6}\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#7\end{minipage}}}
+
+
\renewcommand*{\cvlistitem}[2][.25em]{%
- \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemcolumnwidth}#2\end{minipage}}}
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}}}
\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
- \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
\hfill% fill of \separatorcolumnwidth
\ifthenelse{\equal{#3}{}}%
{}%
- {\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
+ {\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
\renewcommand*{\cventry}[7][.25em]{%
\cvitem[#1]{#2}{%
@@ -162,13 +180,14 @@
\recomputecvlengths%
\setlength{\parskip}{6\p@}}
-\renewcommand*{\makeletterclosing}{
- \@closing\\[3em]%
+\renewcommand*{\makeletterclosing}{%
+ \@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
+ \ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
{\bfseries\@firstname~\@lastname}%
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfil%
- {\color{color2}\itshape\enclname: \@enclosure}}%
+ {\color{letterclosingcolor}\itshape\enclname: \@enclosure}}%
\vfil}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty
index 02ac2e3aa54..d3db954fef9 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyi.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyi}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 1]
+\ProvidesPackage{moderncvbodyi}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 1]
%-------------------------------------------------------------------------------
% required packages
%-------------------------------------------------------------------------------
-% provides the commands for the skillmatrix as well as the command
+% provides the commands for the skillmatrix as well as the command
% \recompute@cvskillmatrix@lengths
\RequirePackage[moderncvbodyi]{moderncvskillmatrix}
@@ -29,9 +29,9 @@
\renewcommand*{\hintfont}{}
% styles
-\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{sectioncolor}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{subsectioncolor}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{hintstylecolor}{#1}}}
%-------------------------------------------------------------------------------
@@ -44,11 +44,14 @@
\@initializelength{\maincolumnwidth}
% used by \cvdoubleitem
\@initializelength{\doubleitemcolumnwidth}
+% used by \cvtripleitem
+\@initializelength{\tripleitemcolumnwidth}
% used by \cvlistitem
\@initializelength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol}
\@initializelength{\listitemcolumnwidth}
% used by \cvlistdoubleitem
\@initializelength{\listdoubleitemcolumnwidth}
+\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
% default moderncv \photo (change the definition such that by default the photo and its box align with the section bars
\RenewDocumentCommand{\photo}{O{\hintscolumnwidth-0.8pt-2\fboxsep}O{0.4pt}m}{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}%
@@ -59,6 +62,8 @@
\setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
\setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\hintscolumnwidth-\separatorcolumnwidth-\separatorcolumnwidth}%
\setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\hintscolumnwidth-3\separatorcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
\setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
\setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
\recompute@cvskillmatrix@lengths
@@ -73,7 +78,7 @@
\par\addvspace{2.5ex}%
\phantomsection{}% reset the anchor for hyperrefs
\addcontentsline{toc}{section}{#2}%
- \cvitem[0ex]{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}{\strut\sectionstyle{#2}}%
+ \cvitem[0ex]{\strut\raggedleft\raisebox{\baseletterheight}{\color{bodyrulecolor}\rule{\hintscolumnwidth}{0.95ex}}}{\strut\sectionstyle{#2}}%
\par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading
\RenewDocumentCommand{\subsection}{sm}{%
@@ -97,15 +102,28 @@
\hspace*{\separatorcolumnwidth}%
\begin{minipage}[t]{\doubleitemcolumnwidth}#5\end{minipage}}}
+\renewcommand*{\cvtripleitem}[7][.1em]{%
+ \cvitem[#1]{#2}{%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#4}\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#5\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#6}\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#7\end{minipage}}}
+
+
\renewcommand*{\cvlistitem}[2][.25em]{%
- \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemcolumnwidth}#2\end{minipage}}}
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}}}
\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
- \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
\hfill% fill of \separatorcolumnwidth
\ifthenelse{\equal{#3}{}}%
{}%
- {\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
+ {\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
\renewcommand*{\cventry}[7][.25em]{%
\cvitem[#1]{#2}{%
@@ -162,13 +180,14 @@
\recomputecvlengths%
\setlength{\parskip}{6\p@}}
-\renewcommand*{\makeletterclosing}{
- \@closing\\[3em]%
+\renewcommand*{\makeletterclosing}{%
+ \@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
+ \ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
{\bfseries\@firstname~\@lastname}%
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfil%
- {\color{color2}\itshape\enclname: \@enclosure}}%
+ {\color{letterclosingcolor}\itshape\enclname: \@enclosure}}%
\vfil}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty
index 003f9f3e1b0..37d8d132009 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyiii.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyiii}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 3]
+\ProvidesPackage{moderncvbodyiii}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 3]
% rules type options: "fullrules", "shortrules", "mixedrules" (default) or "norules"
\@initializeif{\if@fullrules}\@fullrulesfalse
@@ -37,7 +37,7 @@
%-------------------------------------------------------------------------------
% required packages
%-------------------------------------------------------------------------------
-% provides the commands for the skillmatrix as well as the command
+% provides the commands for the skillmatrix as well as the command
% \recompute@cvskillmatrix@lengths
\RequirePackage[moderncvbodyiii]{moderncvskillmatrix}
@@ -61,16 +61,16 @@
\renewcommand*{\sectionstyle}[1]{{%
\if@center\centering\else%
\if@right\raggedleft\fi\fi%
- \sectionfont\textcolor{color1}{#1}%
+ \sectionfont\textcolor{sectioncolor}{#1}%
\if@shortrules\else%
\par\fi}}
\renewcommand*{\subsectionstyle}[1]{{%
\if@center\centering\else%
\if@right\raggedleft\fi\fi%
- \subsectionfont\textcolor{color1}{#1}%
+ \subsectionfont\textcolor{subsectioncolor}{#1}%
\if@shortrules\else\if@mixedrules\else%
\par\fi\fi}}
-\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{hintstylecolor}{#1}}}
%-------------------------------------------------------------------------------
@@ -83,11 +83,14 @@
\@initializelength{\maincolumnwidth}
% used by \cvdoubleitem
\@initializelength{\doubleitemcolumnwidth}
+% used by \cvtripleitem
+\@initializelength{\tripleitemcolumnwidth}
% used by \cvlistitem
\@initializelength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol}
\@initializelength{\listitemcolumnwidth}
% used by \cvlistdoubleitem
\@initializelength{\listdoubleitemcolumnwidth}
+\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
% commands
\renewcommand*{\recomputecvbodylengths}{%
@@ -96,6 +99,8 @@
\setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
\setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\separatorcolumnwidth}%
\setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\separatorcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
\setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
\setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
\recompute@cvskillmatrix@lengths
@@ -133,14 +138,14 @@
\newcommand*{\sectionrule}{}
\newcommand*{\subsectionrule}{}
\if@fullrules%
- \renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
- \renewcommand*{\subsectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}
+ \renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{bodyrulecolor}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
+ \renewcommand*{\subsectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{bodyrulecolor}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}
\if@shortrules%
- \renewcommand*{\sectionrule}{\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
- \renewcommand*{\subsectionrule}{\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}}
+ \renewcommand*{\sectionrule}{\leavevmode{\color{bodyrulecolor}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
+ \renewcommand*{\subsectionrule}{\leavevmode{\color{bodyrulecolor}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}}
\if@mixedrules%
- \renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{color1}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
- \renewcommand*{\subsectionrule}{\leavevmode{\color{color1}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}}
+ \renewcommand*{\sectionrule}{\par\nobreak\vspace*{-.7\baselineskip}\leavevmode{\color{bodyrulecolor}\leaders\hbox{\rule{1pt}{0.4pt}}\hfill\kern0pt}}
+ \renewcommand*{\subsectionrule}{\leavevmode{\color{bodyrulecolor}\xleaders\hbox to 0.35em{\scriptsize.}\hfill}}\fi% different subsectionrules will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible}}
\if@norules%
\renewcommand*{\sectionrule}{}
\renewcommand*{\subsectionrule}{}\fi
@@ -155,16 +160,24 @@
\begin{minipage}[t]{\doubleitemcolumnwidth}\ifstrempty{#4}{}{\hintstyle{#4}: }#5\end{minipage}%
\par\addvspace{#1}}
+\renewcommand*{\cvtripleitem}[7][.1em]{%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#4}: #5\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\ifstrempty{#6}{}{\hintstyle{#6}: }#7\end{minipage}%
+ \par\addvspace{#1}}
+
\renewcommand*{\cvlistitem}[2][.25em]{%
- \listitemsymbol\begin{minipage}[t]{\listitemcolumnwidth}#2\end{minipage}%
+ \listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
\par\addvspace{#1}}
\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
- \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
\hfill% fill of \separatorcolumnwidth
\ifstrempty{#3}%
{}%
- {\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
+ {\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
\renewcommand*{\cventry}[7][.25em]{
\begin{tabular*}{\maincolumnwidth}{l@{\extracolsep{\fill}}r}%
@@ -231,13 +244,14 @@
\recomputecvbodylengths%
\setlength{\parskip}{6\p@}}
-\renewcommand*{\makeletterclosing}{
- \@closing\\[3em]%
+\renewcommand*{\makeletterclosing}{%
+ \@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
+ \ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
{\bfseries\@firstname~\@lastname}%
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfil%
- {\color{color2}\itshape\enclname: \@enclosure}}%
+ {\color{letterclosingcolor}\itshape\enclname: \@enclosure}}%
\vfil}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty
index 9127af18e8c..0d9fe6fb877 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyiv.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyiv}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 4]
+\ProvidesPackage{moderncvbodyiv}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 4]
%-------------------------------------------------------------------------------
% required packages
%-------------------------------------------------------------------------------
-% provides the commands for the skillmatrix as well as the command
+% provides the commands for the skillmatrix as well as the command
% \recompute@cvskillmatrix@lengths
\RequirePackage[moderncvbodyiv]{moderncvskillmatrix}
@@ -29,9 +29,9 @@
\renewcommand*{\hintfont}{\bfseries}
% styles
-\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{sectioncolor}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{subsectioncolor}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{hintstylecolor}{#1}}}
%-------------------------------------------------------------------------------
@@ -49,6 +49,10 @@
\@initializelength{\listitemcolumnwidth}
% used by \cvlistdoubleitem
\@initializelength{\listdoubleitemcolumnwidth}
+% used by \cvtripleitem
+\@initializelength{\tripleitemcolumnwidth}
+\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
+
% commands
\renewcommand*{\recomputecvbodylengths}{%
@@ -57,6 +61,8 @@
\setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
\setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\separatorcolumnwidth}%
\setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\separatorcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
\setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
\setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
\recompute@cvskillmatrix@lengths
@@ -87,15 +93,23 @@
\begin{minipage}[t]{\doubleitemcolumnwidth}\ifthenelse{\equal{#4}{}}{}{\hintstyle{#4}: }#5\end{minipage}%
\par\addvspace{#1}}
+\renewcommand*{\cvtripleitem}[7][.1em]{%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#4}: #5\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\ifthenelse{\equal{#6}{}}{}{\hintstyle{#6}: }#7\end{minipage}%
+ \par\addvspace{#1}}
+
\renewcommand*{\cvlistitem}[2][.25em]{%
- \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemcolumnwidth}#2\end{minipage}}}
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}}}
\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
- \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
\hfill% fill of \separatorcolumnwidth
\ifthenelse{\equal{#3}{}}%
{}%
- {\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
+ {\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
\@initializebox{\cventryyearbox}
\@initializelength{\cventrytitleboxwidth}
@@ -170,13 +184,14 @@
\recomputecvbodylengths%
\setlength{\parskip}{6\p@}}
-\renewcommand*{\makeletterclosing}{
- \@closing\\[3em]%
+\renewcommand*{\makeletterclosing}{%
+ \@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
+ \ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
{\bfseries\@firstname~\@lastname}%
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfil%
- {\color{color2}\itshape\enclname: \@enclosure}}%
+ {\color{letterclosingcolor}\itshape\enclname: \@enclosure}}%
\vfil}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty
index 1f49692984d..f29e57786b4 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyv.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyv}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 5]
+\ProvidesPackage{moderncvbodyv}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 5]
%-------------------------------------------------------------------------------
% required packages
%-------------------------------------------------------------------------------
-% provides the commands for the skillmatrix as well as the command
+% provides the commands for the skillmatrix as well as the command
% \recompute@cvskillmatrix@lengths
\RequirePackage[moderncvbodyv]{moderncvskillmatrix}
@@ -34,9 +34,9 @@
\renewcommand*{\hintfont}{\bfseries}
% styles
-\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{sectioncolor}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{subsectioncolor}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{hintstylecolor}{#1}}}
% lengths
% used by \cvitem (and all children command)
@@ -46,6 +46,8 @@
\@initializelength{\maincolumnwidth}
% used by \cvdoubleitem
\@initializelength{\doubleitemcolumnwidth}
+% used by \cvtripleitem
+\@initializelength{\tripleitemcolumnwidth}
% used by \cvlistitem
\@initializelength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol}
\@initializelength{\listitemcolumnwidth}
@@ -53,6 +55,7 @@
% used by \cvlistdoubleitem
\@initializelength{\listdoubleitemcolumnwidth}
%\@initializelength{\listdoubleitemmaincolumnwidth}
+\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
% commands
\@initializecommand{\recomputecvbodylengths}{%
@@ -61,6 +64,8 @@
\setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
\setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\separatorcolumnwidth}%
\setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\separatorcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
\setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
\setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
\recompute@cvskillmatrix@lengths
@@ -72,7 +77,8 @@
\addvspace{2.5ex}%
\phantomsection{}% reset the anchor for hyperrefs
\addcontentsline{toc}{section}{#2}%
- \noindent\rlap{\@cvitem{\raggedleft\sectionstyle{#2}}{}}%
+ % minipage for correct spacing with multiline sections #69
+ \noindent\rlap{\@cvitem{\begin{minipage}[t][1ex]{\hintscolumnwidth}\raggedleft\sectionstyle{#2}\end{minipage}}{}}%
\nobreak\@afterheading\@aftersectiontrue\ignorespaces}
%\@initializeif{\if@aftersubsection}\@aftersubsectionfalse%
@@ -83,7 +89,8 @@
\par\ignorespaces\fi%
\phantomsection{}% reset the anchor for hyperrefs
\addcontentsline{toc}{subsection}{#2}%
- \noindent\rlap{\@cvitem{\if@aftersection\else\@moderncvstrut{4pt}{24pt}\fi\raggedleft\subsectionstyle{#2}}{}}%
+ % minipage for correct spacing with multiline subsections #69
+ \noindent\rlap{\@cvitem{\begin{minipage}[t][1ex]{\hintscolumnwidth}\if@aftersection\else\@moderncvstrut{4pt}{24pt}\fi\raggedleft\subsectionstyle{#2}\end{minipage}}{}}%
\nobreak\@afterheading\@aftersectiontrue\ignorespaces}
\renewcommand*{\cvitem}[3][.5ex]{%
@@ -99,7 +106,7 @@
% underlying command to implement \cvitem, \subsection and \section
\newcommand*{\@cvitem}[3][.5ex]{%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
\setlength\arrayrulewidth{\separatorrulewidth}%
\if@aftersection\else%
\vspace*{-\separatorrulewidth}\fi% HACK; I don't understand where the space is coming from, nor what it's exact value is :(
@@ -117,15 +124,23 @@
\hfill% fill of \separatorcolumnwidth
\begin{minipage}[t]{\doubleitemcolumnwidth}\ifthenelse{\equal{#4}{}}{}{\hintstyle{#4}: }#5\end{minipage}}}
+\renewcommand*{\cvtripleitem}[7][.1ex]{%
+ \@cvitem[#1]{}{%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#4}: #5\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\tripleitemcolumnwidth}\ifthenelse{\equal{#6}{}}{}{\hintstyle{#6}: }#7\end{minipage}}}
+
\renewcommand*{\cvlistitem}[2][.5ex]{%
- \@cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemcolumnwidth}#2\end{minipage}}}
+ \@cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}}}
\renewcommand*{\cvlistdoubleitem}[3][.5ex]{%
- \@cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
+ \@cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
\hfill% fill of \separatorcolumnwidth
\ifthenelse{\equal{#3}{}}%
{}%
- {\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
+ {\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
\@initializebox{\cventryyearbox}
\@initializelength{\cventrytitleboxwidth}
@@ -165,7 +180,7 @@
{%
\bibliographyhead{\refname}%
% \small%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
\setlength\arrayrulewidth{\separatorrulewidth}%
\noindent%
\begin{tabular}[t]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}|@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
@@ -206,13 +221,14 @@
\recomputecvbodylengths%
\setlength{\parskip}{6\p@}}
-\renewcommand*{\makeletterclosing}{
- \@closing\\[3em]%
+\renewcommand*{\makeletterclosing}{%
+ \@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
+ \ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
{\bfseries \@firstname~\@lastname}%
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfill%
- {\color{color2}\itshape\enclname: \@enclosure}}}
+ {\color{letterclosingcolor}\itshape\enclname: \@enclosure}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyvi.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyvi.sty
new file mode 100644
index 00000000000..76e1a15c3ac
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyvi.sty
@@ -0,0 +1,203 @@
+%% start of file `moderncvbodyvi.sty'.
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com).
+%% Copyright 2023 Javier Lopez-Gomez (javier.lopez.gomez@proton.me).
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License version 1.3c,
+% available at http://www.latex-project.org/lppl/.
+
+
+%-------------------------------------------------------------------------------
+% identification
+%-------------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{moderncvbodyvi}[2023/11/21 v2.0.0 modern curriculum vitae and letter body variant: 6]
+
+
+%-------------------------------------------------------------------------------
+% required packages
+%-------------------------------------------------------------------------------
+\RequirePackage{moderncvverticaltimeline}
+% No customization currently exists for `modercvbodyvi`; just reuse
+% `moderncvbodyi`. We might consider supporting a short table format (only skill
+% name and rating) in the future.
+\RequirePackage[moderncvbodyi,circle]{moderncvskillmatrix}
+
+
+%-------------------------------------------------------------------------------
+% overall body definition
+%-------------------------------------------------------------------------------
+% fonts
+\renewcommand*{\sectionfont}{\Large\upshape\bfseries}
+\renewcommand*{\subsectionfont}{\large\mdseries\upshape}
+\renewcommand*{\hintfont}{}
+
+% styles
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+
+
+%-------------------------------------------------------------------------------
+% resume body definition
+%-------------------------------------------------------------------------------
+% lengths
+% used by \cvitem (and all children command)
+\@initializelength{\hintscolumnwidth} \setlength{\hintscolumnwidth}{0.175\textwidth}
+\@initializelength{\separatorcolumnwidth} \setlength{\separatorcolumnwidth}{0.025\textwidth}
+\@initializelength{\maincolumnwidth}
+% used by \cvdoubleitem
+\@initializelength{\doubleitemcolumnwidth}
+% used by \cvtripleitem
+\@initializelength{\tripleitemcolumnwidth}
+% used by \cvlistitem
+\@initializelength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol}
+\@initializelength{\listitemcolumnwidth}
+% used by \cvlistdoubleitem
+\@initializelength{\listdoubleitemcolumnwidth}
+\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
+% default moderncv \photo (change the definition such that by default the photo and its box align with the section bars
+\RenewDocumentCommand{\photo}{O{\hintscolumnwidth-0.8pt-2\fboxsep}O{0.4pt}m}{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}%
+
+% commands
+\renewcommand*{\recomputecvbodylengths}{%
+ % body lengths
+ \setlength{\maincolumnwidth}{\textwidth-\leftskip-\rightskip-\separatorcolumnwidth-\hintscolumnwidth}%
+ \setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
+ \setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\hintscolumnwidth-\separatorcolumnwidth-\separatorcolumnwidth}%
+ \setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\hintscolumnwidth-3\separatorcolumnwidth}%
+ \setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
+ \setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
+ \setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
+ \recompute@cvskillmatrix@lengths
+ % regular lengths
+ \setlength{\parskip}{0\p@}}
+
+\@initializelength{\baseletterheight}
+\settoheight{\baseletterheight}{\sectionstyle{o}}
+\setlength{\baseletterheight}{\baseletterheight-0.95ex}
+% The optional argument can be used to place a small icon near the section name.
+% E.g. `\section[\faBookmark]{Education}`
+\RenewDocumentCommand{\section}{sO{}m}{%
+ \tl@resetchain%
+ \par\addvspace{2.5ex}%
+ \phantomsection{}% reset the anchor for hyperrefs
+ \addcontentsline{toc}{section}{#3}%
+ \strut\sectionstyle{\textcolor{color1!55!white}{{#2}\rule{.75ex}{0pt}\rule{1pt}{\heightof{#3}}}%
+ \rule{.75ex}{0pt}#3}%
+ \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading
+
+\RenewDocumentCommand{\subsection}{sm}{%
+ \par\addvspace{1ex}%
+ \phantomsection{}% reset the anchor for hyperrefs
+ \addcontentsline{toc}{subsection}{#2}%
+ \cvitem[0ex]{}{\strut\subsectionstyle{#2}}%
+ \par\nobreak\addvspace{.5ex}\@afterheading}% to avoid a pagebreak after the heading
+
+\renewcommand*{\cvitem}[3][.25em]{%
+ \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
+ \raggedleft\hintstyle{#2} &{#3}%
+ \end{tabular}%
+ \par\addvspace{#1}}
+
+\renewcommand*{\cvdoubleitem}[5][.25em]{%
+ \cvitem[#1]{#2}{%
+ \begin{minipage}[t]{\doubleitemcolumnwidth}#3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#4}\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\doubleitemcolumnwidth}#5\end{minipage}}}
+
+\renewcommand*{\cvtripleitem}[7][.1em]{%
+ \cvitem[#1]{#2}{%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#4}\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#5\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#6}\end{minipage}%
+ \hspace*{\separatorcolumnwidth}%
+ \begin{minipage}[t]{\tripleitemcolumnwidth}#7\end{minipage}}}
+
+\renewcommand*{\cvlistitem}[2][.25em]{%
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}}}
+
+\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
+ \cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \ifthenelse{\equal{#3}{}}%
+ {}%
+ {\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
+
+\renewcommand*{\cventry}[7][.25em]{%
+ \cvitem[#1]{\tl@milestone{#2}}{%
+ {\bfseries#3}%
+ \ifthenelse{\equal{#4}{}}{}{, {\slshape#4}}%
+ \ifthenelse{\equal{#5}{}}{}{, #5}%
+ \ifthenelse{\equal{#6}{}}{}{, #6}%
+ \strut%
+ \ifx&#7&%
+ \else{\newline{}\begin{minipage}[t]{\linewidth}\small#7\end{minipage}}\fi}}
+
+\@initializebox{\cvitemwithcommentbox}
+\@initializelength{\cvitemwithcommentskilllength}
+\@initializelength{\cvitemwithcommentcommentlength}
+\renewcommand*{\cvitemwithcomment}[4][.25em]{%
+ \savebox{\cvitemwithcommentbox}{{#3}}%
+ \setlength{\cvitemwithcommentskilllength}{\widthof{\usebox{\cvitemwithcommentbox}}}%
+ \setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentskilllength}%
+ \cvitem[#1]{#2}{%
+ \begin{minipage}[t]{\cvitemwithcommentskilllength}\usebox{\cvitemwithcommentbox}\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}}}
+
+\renewenvironment{thebibliography}[1]%
+ {%
+ \bibliographyhead{\refname}%
+% \small%
+ \begin{list}{\bibliographyitemlabel}%
+ {%
+ \setlength{\topsep}{0pt}%
+ \setlength{\labelwidth}{\hintscolumnwidth}%
+ \setlength{\labelsep}{\separatorcolumnwidth}%
+ \leftmargin\labelwidth%
+ \advance\leftmargin\labelsep%
+ \@openbib@code%
+ \usecounter{enumiv}%
+ \let\p@enumiv\@empty%
+ \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+ \sloppy%
+ \clubpenalty4000%\@clubpenalty \clubpenalty%
+ \widowpenalty4000%
+ \sfcode`\.\@m%
+ \sfcode `\=1000\relax}%
+ {%
+ \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
+ \end{list}}
+
+
+%-------------------------------------------------------------------------------
+% letter style definition
+%-------------------------------------------------------------------------------
+% commands
+\renewcommand*{\recomputeletterbodylengths}{%
+ \recomputecvlengths%
+ \setlength{\parskip}{6\p@}}
+
+\renewcommand*{\makeletterclosing}{
+ \@closing\ifthenelse{\isundefined{\@signature}}{\\[3em]}{\\[1em]}% shrink space when signature is set
+ \ifthenelse{\isundefined{\@signature}}{}{{\@signature\\}}
+ {\bfseries\@firstname~\@lastname}%
+ \ifthenelse{\isundefined{\@enclosure}}{}{%
+ \\%
+ \vfil%
+ {\color{color2}\itshape\enclname: \@enclosure}}%
+ \vfil}
+
+
+\endinput
+
+
+%% end of file `moderncvbodyvi.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty
index 5d3432e661e..bddc9a51776 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcollection.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcollection}[2022-02-21 v2.3.1 moderncv collections]
+\ProvidesPackage{moderncvcollection}[2024-07-18 v2.4.1 moderncv collections]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
index ea3653eacef..29ba5bd410c 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorblack.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblack}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: black]
+\ProvidesPackage{moderncvcolorblack}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: black]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0,0,0}% black
-\definecolor{color2}{rgb}{0,0,0}% black
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{black}% black
+\colorlet{color2}{black}% black
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
index b02992e1b39..779b3be956c 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorblue.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblue}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: blue]
+\ProvidesPackage{moderncvcolorblue}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: blue]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0.22,0.45,0.70}% light blue
-\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{lightblue}% light blue
+\colorlet{color2}{darkgrey}% dark grey
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty
index 775f033f233..aeeccf5ef6b 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorburgundy.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorburgundy}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: burgundy]
+\ProvidesPackage{moderncvcolorburgundy}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: burgundy]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0.596078,0,0}% burgundy: 139/255 (0.545098) or 152/255 (0.596078)
-\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{burgundy}% burgundy
+\colorlet{color2}{darkgrey}% dark grey
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorcerulean.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorcerulean.sty
new file mode 100644
index 00000000000..1f7cce83c73
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorcerulean.sty
@@ -0,0 +1,32 @@
+%% start of file `moderncvcolorcerulean.sty'.
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com).
+%% Copyright 2023 Javier Lopez-Gomez (javier.lopez.gomez@proton.me).
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License version 1.3c,
+% available at http://www.latex-project.org/lppl/.
+
+
+%-------------------------------------------------------------------------------
+% identification
+%-------------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{moderncvcolorcerulean}[2023/11/21 v2.0.0 modern curriculum vitae and letter color scheme: cerulean]
+
+
+%-------------------------------------------------------------------------------
+% color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{HTML}{0081a7}% cerulean
+\definecolor{color2}{HTML}{4d908e}% dark cyan
+\definecolor{headTL}{HTML}{00afb9}% verdigris
+\colorlet{headBR}{color1}
+\definecolor{headtext}{HTML}{ffffff}% white
+\colorlet{headhr}{color2}
+
+
+\endinput
+
+
+%% end of file `moderncvcolorcerulean.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
index 891c3290b5d..03c026ea07d 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorgreen.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgreen}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: green]
+\ProvidesPackage{moderncvcolorgreen}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: green]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0.35,0.70,0.30}% green
-\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{green}% green
+\colorlet{color2}{darkgrey}% dark grey
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
index 37d2b57749d..6bd9184c0e6 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorgrey.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgrey}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: grey]
+\ProvidesPackage{moderncvcolorgrey}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: grey]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0.55,0.55,0.55}% dark grey
-\definecolor{color2}{rgb}{0.55,0.55,0.55}% dark grey
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{darkgrey}% dark grey
+\colorlet{color2}{darkgrey}% dark grey
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
index f249fd7de9c..c4f612ab6db 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolororange.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolororange}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: orange]
+\ProvidesPackage{moderncvcolororange}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: orange]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0.95,0.55,0.15}% orange
-\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{orange}% orange
+\colorlet{color2}{darkgrey}% dark grey
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
index 22053d78493..d0110526f19 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorpurple.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorpurple}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: purple]
+\ProvidesPackage{moderncvcolorpurple}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: purple]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0.50,0.33,0.80}% purple
-\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{purple}% purple
+\colorlet{color2}{darkgrey}% dark grey
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
index 68b1335c847..bc51d4adf53 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorred.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,15 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorred}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: red]
+\ProvidesPackage{moderncvcolorred}[2024-07-18 v2.4.1 modern curriculum vitae and letter color scheme: red]
%-------------------------------------------------------------------------------
% color scheme definition
%-------------------------------------------------------------------------------
-\definecolor{color0}{rgb}{0,0,0}% black
-\definecolor{color1}{rgb}{0.95,0.20,0.20}% red
-\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+\input{moderncvcolors.tex}
+
+\colorlet{color0}{black}% black
+\colorlet{color1}{red}% red
+\colorlet{color2}{darkgrey}% dark grey
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex b/Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex
new file mode 100644
index 00000000000..7f840ff059c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex
@@ -0,0 +1,35 @@
+%-------------------------------------------------------------------------------
+% built-in colors
+%-------------------------------------------------------------------------------
+
+\definecolor{black}{RGB}{0, 0, 0}
+\definecolor{red}{rgb}{0.95, 0.20, 0.20}
+\definecolor{darkgrey}{rgb}{0.45, 0.45, 0.45}
+\definecolor{orange}{rgb}{0.95, 0.55, 0.15}
+\definecolor{burgundy}{rgb}{0.596078, 0, 0}% 139/255 (0.545098) or 152/255 (0.596078)
+\definecolor{purple}{rgb}{0.50, 0.33, 0.80}
+\definecolor{lightblue}{rgb}{0.22, 0.45, 0.70}
+\definecolor{green}{rgb}{0.35, 0.70, 0.30}
+
+%-------------------------------------------------------------------------------
+% default colors
+%-------------------------------------------------------------------------------
+
+\@ifundefined{\string\color@default-socialicon-color}{\colorlet{default-socialicon-color}{darkgrey}}{}
+
+%-------------------------------------------------------------------------------
+% colors for social icons
+%-------------------------------------------------------------------------------
+
+% \definecolor{weixin}{rgb}{.184, .533, .098}
+% \definecolor{linkedin}{HTML}{0a66c2}
+% \definecolor{orcid}{HTML}{a6ce39}
+% \definecolor{twitter}{RGB}{29, 155, 240}
+% \definecolor{facebook}{HTML}{1b74e4}
+% TODO: add more colors
+
+%-------------------------------------------------------------------------------
+% custom colors
+%-------------------------------------------------------------------------------
+
+% \definecolor{tsinghua}{HTML}{791CB5}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index fb9a8c4363d..e8e0af713ff 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcompatibility.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcompatibility}[2022-02-21 v2.3.1 modern curriculum vitae and letter compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2024-07-18 v2.4.1 modern curriculum vitae and letter compatibility patches]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty
index b28e409b541..c19651ab05b 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvdebugtools.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvdebugtools}[2022-02-21 v2.3.1 modern curriculum vitae and letter debug tools]
+\ProvidesPackage{moderncvdebugtools}[2024-07-18 v2.4.1 modern curriculum vitae and letter debug tools]
%-------------------------------------------------------------------------------
@@ -32,7 +32,7 @@
\begin{tikzpicture}[remember picture,overlay]
\begin{pgfonlayer}{background}
\coordinate (a\thedebugrule);
- \draw[red,thin,#1]
+ \draw[red,thin,#1]
([xshift=#2]a\thedebugrule|-current page.north) -- ([xshift=#2]a\thedebugrule|-current page.south);
\end{pgfonlayer}
\end{tikzpicture}}
@@ -42,7 +42,7 @@
\begin{tikzpicture}[remember picture,overlay]
\begin{pgfonlayer}{background}
\coordinate (b\thedebugrule);
- \draw[red,thin,#1]
+ \draw[red,thin,#1]
([yshift=#2]b\thedebugrule-|current page.west) -- ([yshift=#2]b\thedebugrule-|current page.east);
\end{pgfonlayer}
\end{tikzpicture}}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty
index 370365848fc..f1de51a44ef 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvfooti.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvfooti}[2022-02-21 v2.3.1 modern curriculum vitae and letter footer variant: 1]
+\ProvidesPackage{moderncvfooti}[2024-07-18 v2.4.1 modern curriculum vitae and letter footer variant: 1]
%-------------------------------------------------------------------------------
@@ -79,7 +79,7 @@
\fancyfoot[c]{%
\parbox[b]{\footwidth}{%
\centering%
- \color{color2}\addressfont%
+ \color{addresscolor}\addressfont%
\vspace{\baselineskip}% forces a white line to ensure space between main text and footer (as footer height can't be known in advance)
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtofoot[]{\addresssymbol\@addressstreet}%
\ifthenelse{\equal{\@addresscity}{}}{}{\addtofoot[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
@@ -89,7 +89,8 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\addtofoot{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@email}}{}{\addtofoot{\emailsymbol\emaillink{\@email}}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\addtofoot{\homepagesymbol\httpslink{\@homepage}}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\addtofoot{\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\addtofoot{\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\addtofoot{\@extrainfo}}%
@@ -109,7 +110,7 @@
\fancyfoot[c]{%
\parbox[b]{\footwidth}{%
\centering%
- \addressfont\color{color2}%
+ \addressfont\color{addresscolor}%
\vspace{\baselineskip}% forces a white line to ensure space between main text and footer (as footer height can't be known in advance)
\vspace{-\baselineskip}% to cancel out the extra vertical space taken by the name (below) and ensure perfect alignment of letter and cv footers
\strut{\bfseries\upshape\@firstname~\@lastname}\\% the \strut is required to ensure the line is exactly \baselineskip tall
@@ -121,7 +122,8 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\addtofoot{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@email}}{}{\addtofoot{\emailsymbol\emaillink{\@email}}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\addtofoot{\homepagesymbol\httpslink{\@homepage}}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\addtofoot{\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\addtofoot{\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\addtofoot{\@extrainfo}}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty
index 087cf776e20..9dfb35a06c1 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadi.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadi}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 1]
+\ProvidesPackage{moderncvheadi}[2024-07-18 v2.4.1 modern curriculum vitae and letter header variant: 1]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
@@ -23,6 +23,11 @@
\@initializeif{\if@right}\@rightfalse
\DeclareOption{right} {\@leftfalse\@righttrue}
+% top options: align header elements by their top instead of their bottom
+% default: bottom
+\@initializeif{\if@top}\@topfalse
+\DeclareOption{top}{\@toptrue}
+
\DeclareOption*{}% avoid choking on unknown options
\ExecuteOptions{details,left}
\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
@@ -43,10 +48,12 @@
\renewcommand*{\quotefont}{\large\slshape}
% styles
-\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
-\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
-\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{namecolor}{#1}}}
+\renewcommand*{\firstnamestyle}[1]{{\namefont\textcolor{firstnamecolor}{#1}}}
+\renewcommand*{\lastnamestyle}[1]{{\namefont\textcolor{lastnamecolor}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{titlecolor}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{addresscolor}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{quotecolor}{#1}}}
%-------------------------------------------------------------------------------
@@ -72,7 +79,7 @@
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\protected@edef\socialsdetails{\socialsdetails\protect\makenewline\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}%
\savebox{\makecvheaddetailsbox}{%
- \addressfont\color{color2}%
+ \addressfont\color{addresscolor}%
\if@left\begin{tabular}[b]{@{}r@{}}\fi%
\if@right\begin{tabular}[b]{@{}l@{}}\fi%
\ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
@@ -81,7 +88,8 @@
\ifthenelse{\isundefined{\@born}}{}{\makenewline\bornsymbol\@born}%
\phonesdetails% needs to be pre-rendered as loops and tabulars seem to conflict
\ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httpslink{\@homepage}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}%
\socialsdetails% needs to be pre-rendered as loops and tabulars seem to conflict
\ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}%
\end{tabular}
@@ -94,7 +102,7 @@
{%
\if@left%
\hspace*{\separatorcolumnwidth}\fi%
- \color{color1}%
+ \color{pictureframecolor}%
\setlength{\fboxrule}{\@photoframewidth}%
\ifdim\@photoframewidth=0pt%
\setlength{\fboxsep}{0pt}\fi%
@@ -112,9 +120,14 @@
\begin{minipage}[b]{\makecvheadnamewidth}%
\if@left\raggedright\fi%
\if@right\raggedleft\fi%
- \namestyle{\@firstname\ \@lastname}%
+ \firstnamestyle{\@firstname}~\lastnamestyle{\@lastname}%
\ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
\end{minipage}}%
+ % raise boxes if top option is set
+ \if@top%
+ \savebox{\makecvheadnamebox}{\raisebox{-\height+\baselineskip}{\usebox{\makecvheadnamebox}}}%
+ \savebox{\makecvheaddetailsbox}{\raisebox{-\height+\baselineskip}{\usebox{\makecvheaddetailsbox}}}%
+ \savebox{\makecvheadpicturebox}{\raisebox{-\height+\baselineskip}{\usebox{\makecvheadpicturebox}}}\fi%
% rendering
\if@left%
\usebox{\makecvheadnamebox}%
@@ -126,11 +139,17 @@
\rlap{\usebox{\makecvheaddetailsbox}}% \llap is used to suppress the width of the box, allowing overlap if the value of makecvheadnamewidth is forced
\hfill%
\usebox{\makecvheadnamebox}\fi%
- \\[2.5em]%
% optional quote
\ifthenelse{\isundefined{\@quote}}%
- {}%
- {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
+ {\vspace{2.5em}}%
+ {%
+ \\[2.5em]%
+ {%
+ \centering%
+ \begin{minipage}{\quotewidth}%
+ \centering%
+ \quotestyle{\@quote}%
+ \end{minipage}\\[2.5em]}}%
\par}% to avoid weird spacing bug at the first section if no blank line is left after \makecvhead
@@ -150,7 +169,7 @@
% optional detailed information
\if@details%
\raggedleft%
- \addressfont\textcolor{color2}{%
+ \addressfont\textcolor{addresscolor}{%
{\bfseries\upshape\@firstname~\@lastname}\@firstdetailselementfalse%
% optional detailed information
\ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
@@ -159,9 +178,10 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}%
\ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httpslink{\@homepage}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}\fi%
- \end{minipage}\\[1em]
+ \end{minipage}\\[2em]
% recipient block
\begin{minipage}[t]{.5\textwidth}
\raggedright%
@@ -173,6 +193,8 @@
\hfill% US style
% \\[1em]% UK style
\@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ % optional subject
+ \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[2em]}}
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty
index b699242ed46..a36c8e1af4b 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadii.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadii}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 2]
+\ProvidesPackage{moderncvheadii}[2024-07-18 v2.4.1 modern curriculum vitae and letter header variant: 2]
% details options: "details" or "nodetails" (default)
\@initializeif{\if@details}\@detailsfalse
@@ -47,10 +47,10 @@
\renewcommand*{\quotefont}{\large\slshape}
% styles
-\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
-\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
-\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{lastnamecolor}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{titlecolor}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{addresscolor}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{quotecolor}{#1}}}
% commands
\@initializecommand{\makeheaddetailssymbol}{%
@@ -110,7 +110,7 @@
\setlength\fboxrule{\@photoframewidth}%
\ifdim\@photoframewidth=0pt%
\setlength{\fboxsep}{0pt}\fi%
- {\color{color1}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}}%
+ {\color{pictureframecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}}%
% name (pre-rendering)
\@initializelength{\makecvheadpicturewidth}%
\settowidth{\makecvheadpicturewidth}{\usebox{\makecvheadpicturebox}}%
@@ -121,9 +121,9 @@
\if@right\raggedleft\fi%
\namefont%
\if@alternate% alternate design: first- and lastname in lowercase with no space in between (distinction is made by color difference)
- {\color{color2!50}\MakeLowercase\@firstname}{\color{color2}\MakeLowercase\@lastname}%
+ {\color{firstnamecolor}\MakeLowercase\@firstname}{\color{lastnamecolor}\MakeLowercase\@lastname}%
\else% default design: first- and lastname as given with a space in between
- {\color{color2!50}\@firstname} {\color{color2}\@lastname}\fi}}%
+ {\color{firstnamecolor}\@firstname} {\color{lastnamecolor}\@lastname}\fi}}%
% rendering
\if@left%
\usebox{\makecvheadnamebox}%
@@ -131,11 +131,11 @@
\if@right%
\usebox{\makecvheadpicturebox}%
\usebox{\makecvheadnamebox}\fi\\[-.35em]%
- {\color{color2!50}\rule{\textwidth}{.25ex}}%
+ {\color{headrulecolor}\rule{\textwidth}{.25ex}}%
% optional detailed information
\if@details{%
\\\null%
- \addressfont\color{color2}%
+ \addressfont\color{addresscolor}%
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtomakeheaddetails{\addresssymbol\@addressstreet}%
\ifthenelse{\equal{\@addresscity}{}}{}{\addtomakeheaddetails[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
\ifthenelse{\equal{\@addresscountry}{}}{}{\addtomakeheaddetails[~--~]{\@addresscountry}}%
@@ -144,7 +144,8 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\addtomakeheaddetails{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@email}}{}{\addtomakeheaddetails{\emailsymbol\emaillink{\@email}}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol\httpslink{\@homepage}}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\addtomakeheaddetails{\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\addtomakeheaddetails{\@extrainfo}}%
@@ -157,15 +158,18 @@
\titlestyle{\MakeLowercase\@title}%
\else%
\titlestyle{\@title}\fi%
- }\\[2.5em]%
+ }
% optional quote
\ifthenelse{\isundefined{\@quote}}%
- {}%
- {{\null\hfill%
+ {\vspace{2.5em}}%
+ {%
+ \\[2.5em]%
+ {%
+ \centering%
\begin{minipage}{\quotewidth}%
\centering%
\quotestyle{\@quote}%
- \end{minipage}\hfill\null\\[2.5em]}}%
+ \end{minipage}\\[2.5em]}}%
\par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle
@@ -189,7 +193,9 @@
% date
\hfill% US style
% \\[1em]% UK style
- \@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ \@date\\[3em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ % optional subject
+ \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[3em]}}
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty
index e4dbafd5ae8..51a3aa2444c 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadiii.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadiii}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 3]
+\ProvidesPackage{moderncvheadiii}[2024-07-18 v2.4.1 modern curriculum vitae and letter header variant: 3]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
@@ -36,10 +36,12 @@
\renewcommand*{\quotefont}{\large\slshape}
% styles
-\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
-\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}}
-\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
-\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{namecolor}{#1}}}
+\renewcommand*{\firstnamestyle}[1]{{\namefont\textcolor{firstnamecolor}{#1}}}
+\renewcommand*{\lastnamestyle}[1]{{\namefont\textcolor{lastnamecolor}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{titlecolor}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{addresscolor}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{quotecolor}{#1}}}
% commands
\@initializecommand{\makeheaddetailssymbol}{%
@@ -81,12 +83,12 @@
\parbox{\makeheaddetailswidth}{%
\centering%
% name and title
- \namestyle{\@firstname~\@lastname}%
+ \firstnamestyle{\@firstname}~\lastnamestyle{\@lastname}%
\ifthenelse{\equal{\@title}{}}{}{\titlestyle{~|~\@title}}% \isundefined doesn't work on \@title, as LaTeX itself defines \@title (before it possibly gets redefined by \title)
% optional detailed information
\if@details{%
\\%
- \addressfont\color{color2}%
+ \addressfont\color{addresscolor}%
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtomakeheaddetails{\addresssymbol\@addressstreet}%
\ifthenelse{\equal{\@addresscity}{}}{}{\addtomakeheaddetails[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
\ifthenelse{\equal{\@addresscountry}{}}{}{\addtomakeheaddetails[~--~]{\@addresscountry}}%
@@ -95,11 +97,12 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\addtomakeheaddetails{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@email}}{}{\addtomakeheaddetails{\emailsymbol\emaillink{\@email}}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol\httpslink{\@homepage}}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\addtomakeheaddetails{\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\addtomakeheaddetails{\@extrainfo}}%
- \flushmakeheaddetails}\fi}\\[2.5em]}% need to force a \par after this to avoid weird spacing bug at the first section if no blank line is left after \makehead
+ \flushmakeheaddetails}\fi}}% need to force a \par after this to avoid weird spacing bug at the first section if no blank line is left after \makehead
%-------------------------------------------------------------------------------
@@ -117,8 +120,15 @@
\makehead%
% optional quote
\ifthenelse{\isundefined{\@quote}}%
- {}%
- {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
+ {\vspace{2.5em}}%
+ {%
+ \\[2.5em]%
+ {%
+ \centering%
+ \begin{minipage}{\quotewidth}%
+ \centering%
+ \quotestyle{\@quote}%
+ \end{minipage}\\[2.5em]}}%
\par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle}
@@ -132,9 +142,25 @@
\renewcommand*{\makeletterhead}{%
% recompute lengths (in case we are switching from letter to resume, or vice versa)
\recomputeletterlengths%
- % sender block
- \makehead%
- \par%
+ % sender contact info
+ \hfill%
+ \begin{minipage}{.5\textwidth}%
+ % optional detailed information
+ \if@details%
+ \raggedleft%
+ \addressfont\textcolor{color2}{%
+ {\bfseries\upshape\@firstname~\@lastname}\@firstdetailselementfalse%
+ % optional detailed information
+ \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
+ \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty
+ \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}%
+ \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
+ \makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}%
+ \ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}%
+ \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}\fi%
+ \end{minipage}\\[2em]
% recipient block
\begin{minipage}[t]{.5\textwidth}
\raggedright%
@@ -145,7 +171,9 @@
% date
\hfill% US style
% \\[1em]% UK style
- \@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ \@date\\[3em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ % optional subject
+ \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[3em]}}
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty
index 9b59dacb9be..5a088fdb732 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadiv.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadiv}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 4]
+\ProvidesPackage{moderncvheadiv}[2024-07-18 v2.4.1 modern curriculum vitae and letter header variant: 4]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
@@ -38,10 +38,12 @@
\renewcommand*{\quotefont}{\large\itshape}
% styles
-\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
-\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
-\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{namecolor}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{titlecolor}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{addresscolor}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{quotecolor}{#1}}}
+\renewcommand*{\firstnamestyle}[1]{{\namefont\textcolor{firstnamecolor}{#1}}}
+\renewcommand*{\lastnamestyle}[1]{{\namefont\textcolor{lastnamecolor}{#1}}}
%-------------------------------------------------------------------------------
@@ -80,7 +82,7 @@
\ifthenelse{\isundefined{\@photo}}%
{}%
{%
- \color{color1}%
+ \color{pictureframecolor}%
\setlength\fboxrule{\@photoframewidth}%
\ifdim\@photoframewidth=0pt%
\setlength{\fboxsep}{0pt}\fi%
@@ -91,7 +93,7 @@
{\setlength{\makecvheadnamewidth}{\textwidth-\makecvheadpicturewidth}}%
{}%
\begin{minipage}[b]{\makecvheadnamewidth}%
- \namestyle{\@firstname\ \@lastname}%
+ \firstnamestyle{\@firstname}~\lastnamestyle{\@lastname}%
\ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
\end{minipage}%
% optional photo
@@ -103,7 +105,7 @@
% optional details
\if@details%
\makecvheadinfo{%
- \addressfont\color{color2}%
+ \addressfont\color{addresscolor}%
\ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
\ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
\ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}%
@@ -111,7 +113,8 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\makenewline\hbox to 1.0em{\csname\collectionloopkey phonesymbol\endcsname}~\collectionloopitem}%
\ifthenelse{\isundefined{\@email}}{}{\makenewline\hbox to 1.0em{\emailsymbol}~\emaillink{\@email}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\hbox to 1.0em{\homepagesymbol}~\httpslink{\@homepage}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\hbox to 1.0em{\homepagesymbol}~%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\makenewline\hbox to 1.0em{\csname\collectionloopkey socialsymbol\endcsname}~\collectionloopitem}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}\fi}
@@ -143,13 +146,15 @@
\@recipientaddress}\\[1em]%
% date
\@date\\[2em]%
+ % optional subject
+ \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[2em]}}
% opening
\@opening\\[1.5em]%
% sender contact info
\if@details%
\hspace{0pt}%
\marginpar{%
- \addressfont\textcolor{color2}{%
+ \addressfont\textcolor{addresscolor}{%
{\bfseries\@firstname~\@lastname}\@firstdetailselementfalse%
\ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
\ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
@@ -157,7 +162,8 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\makenewline\hbox to 1.0em{\csname\collectionloopkey phonesymbol\endcsname}~\collectionloopitem}%
\ifthenelse{\isundefined{\@email}}{}{\makenewline\hbox to 1.0em{\emailsymbol}~\emaillink{\@email}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\hbox to 1.0em{\homepagesymbol}~\httpslink{\@homepage}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\hbox to 1.0em{\homepagesymbol}~%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\makenewline\hbox to 1.0em{\csname\collectionloopkey socialsymbol\endcsname}~\collectionloopitem}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty
index c4d40843240..e92233ef348 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadv.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadv}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 5]
+\ProvidesPackage{moderncvheadv}[2024-07-18 v2.4.1 modern curriculum vitae and letter header variant: 5]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
@@ -37,10 +37,12 @@
\renewcommand*{\quotefont}{\large\slshape}
% styles
-\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
-\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
-\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{namecolor}{#1}}}
+\renewcommand*{\firstnamestyle}[1]{{\namefont\textcolor{firstnamecolor}{#1}}}
+\renewcommand*{\lastnamestyle}[1]{{\namefont\textcolor{lastnamecolor}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{titlecolor}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{addresscolor}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{quotecolor}{#1}}}
%-------------------------------------------------------------------------------
@@ -61,7 +63,7 @@
\ifthenelse{\isundefined{\@photo}}%
{}%
{%
- \color{color1}%
+ \color{pictureframecolor}%
\setlength{\fboxrule}{\@photoframewidth}%
\ifdim\@photoframewidth=0pt%
\setlength{\fboxsep}{0pt}\fi%
@@ -75,7 +77,7 @@
% optional details
\if@details%
\ifthenelse{\isundefined{\@photo}}{}{\\[0.5em]}%
- \addressfont\color{color2}%
+ \addressfont\color{addresscolor}%
\ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
\ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
\ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}%
@@ -83,7 +85,8 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\makenewline\csname\collectionloopkey phonesymbol\endcsname~\collectionloopitem}%
\ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol~\emaillink{\@email}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol~\httpslink{\@homepage}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol~%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\makenewline\csname\collectionloopkey socialsymbol\endcsname~\collectionloopitem}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}\fi}%
@@ -91,23 +94,32 @@
% name and optional title
\newlength{\makecvheadpictureboxskip}%
\setlength{\makecvheadpictureboxskip}{\totalheightof{\usebox{\makecvheadpicturebox}}}%
- \namestyle{\@firstname\ \@lastname}%
+ \firstnamestyle{\@firstname}~\lastnamestyle{\@lastname}%
\ifthenelse{\equal{\@title}{}}{
\ifthenelse{\isundefined{\@quote}}%
- {}%
- {\\[1.25em]\begin{minipage}{\quotewidth}\quotestyle{\@quote}\end{minipage}\\[2.5em]}
- }{
- \\[1.25em]\titlestyle{\@title}\\[2.5em]%
+ {}%
+ {%
+ \\[1.25em]%
+ \begin{minipage}{\quotewidth}%
+ \quotestyle{\@quote}%
+ \end{minipage}}%
+ }{%
+ \\[1.25em]%
+ \titlestyle{\@title}
% optional quote
\ifthenelse{\isundefined{\@quote}}%
- {}%
- {\begin{minipage}{\quotewidth}\quotestyle{\@quote}\end{minipage}\\[2.5em]}}}%
+ {\vspace{2.5em}}%
+ {%
+ \\[2.5em]%
+ \begin{minipage}{\quotewidth}%
+ \quotestyle{\@quote}
+ \end{minipage}}}}%
\par}% to avoid weird spacing bug at the first section if no blank line is left after \makecvhead
% underlying command to implement \makecvtitle, identical to \@cvitem from moderncvbodyv
\let\standarddoublebackslash\\%
\newcommand*{\@makecvtitle}[3][.5ex]{%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{headrulecolor}%
\setlength\arrayrulewidth{1.2\p@}%
\if@aftersection\else%
\vspace*{-\arrayrulewidth}\fi% HACK; I don't understand where the space is coming from, nor what it's exact value is :(
@@ -137,7 +149,7 @@
% optional detailed information
\if@details%
\raggedleft%
- \addressfont\textcolor{color2}{%
+ \addressfont\textcolor{addresscolor}{%
{\bfseries\upshape\@firstname~\@lastname}\@firstdetailselementfalse%
% optional detailed information
\ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
@@ -146,9 +158,10 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}%
\ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httpslink{\@homepage}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}\fi%
- \end{minipage}\\[1em]
+ \end{minipage}\\[2em]
% recipient block
\begin{minipage}[t]{.5\textwidth}
\raggedright%
@@ -159,7 +172,9 @@
% date
\hfill% US style
% \\[1em]% UK style
- \@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ \@date\\[3em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ % optional subject
+ \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[2em]}}
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty
index 8595901901d..ecd6dbb0411 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadvi.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadvi}[2022-02-21 v2.3.1 modern curriculum vitae and letter header: 6]
+\ProvidesPackage{moderncvheadvi}[2024-07-18 v2.4.1 modern curriculum vitae and letter header: 6]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
@@ -24,7 +24,7 @@
\DeclareOption{right} {\@leftfalse\@righttrue}
\DeclareOption*{}% avoid choking on unknown options
-\ExecuteOptions{details, left}
+\ExecuteOptions{details,left}
\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
@@ -43,20 +43,22 @@
\renewcommand*{\quotefont}{\large\slshape}
% styles
-\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
-\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}}
-\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
-\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{namecolor}{#1}}}
+\renewcommand*{\firstnamestyle}[1]{{\namefont\textcolor{firstnamecolor}{#1}}}
+\renewcommand*{\lastnamestyle}[1]{{\namefont\textcolor{lastnamecolor}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{titlecolor}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{addresscolor}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{quotecolor}{#1}}}
% commands
\@initializecommand{\makehead}{%
\setlength{\makeheaddetailswidth}{\textwidth}%
% name and title
\if@left\hfill\fi%
- \namestyle{\@firstname~\@lastname}%
+ \firstnamestyle{\@firstname}~\lastnamestyle{\@lastname}%
\ifthenelse{\equal{\@title}{}}{}{\titlestyle{~|~\@title}}\\[-.35em]% \isundefined doesn't work on \@title, as LaTeX itself defines \@title (before it possibly gets redefined by \title)
% rule
- {\color{color1}\rule{\textwidth}{.25ex}}}
+ {\color{bodyrulecolor}\rule{\textwidth}{.25ex}}}
%-------------------------------------------------------------------------------
% resume head definition
@@ -107,7 +109,7 @@
% optional detailed information
\if@details{%
\\\null%
- \addressfont\color{color2}%
+ \addressfont\color{addresscolor}%
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtomakeheaddetails{\addresssymbol\@addressstreet}%
\ifthenelse{\equal{\@addresscity}{}}{}{\addtomakeheaddetails[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
\ifthenelse{\equal{\@addresscountry}{}}{}{\addtomakeheaddetails[~--~]{\@addresscountry}}%
@@ -116,7 +118,8 @@
\collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
\addtomakeheaddetails{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@email}}{}{\addtomakeheaddetails{\emailsymbol\emaillink{\@email}}}%
- \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol\httpslink{\@homepage}}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol%
+ \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}%
\collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
\addtomakeheaddetails{\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\addtomakeheaddetails{\@extrainfo}}%
@@ -154,7 +157,9 @@
% date
\hfill% US style
% \\[1em]% UK style
- \@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ \@date\\[3em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ % optional subject
+ \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[3em]}}
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadvii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadvii.sty
new file mode 100644
index 00000000000..f0c259ec050
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadvii.sty
@@ -0,0 +1,226 @@
+%% start of file `moderncvheadvii.sty'.
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com).
+%% Copyright 2023 Javier Lopez-Gomez (javier.lopez.gomez@proton.me).
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License version 1.3c,
+% available at http://www.latex-project.org/lppl/.
+
+
+%-------------------------------------------------------------------------------
+% identification
+%-------------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{moderncvheadvii}[2023/11/21 v2.0.0 modern curriculum vitae and letter header variant: 7]
+
+% details options: "details" (default) or "nodetails"
+\@initializeif{\if@details}\@detailsfalse
+\DeclareOption{details} {\@detailstrue}
+\DeclareOption{nodetails} {\@detailsfalse}
+% QR options: "qr" (default) or "noqr". If "qr" is specified, a QR code is generated to point to the
+% homepage and placed near the details section
+\@initializeif{\if@headqr}\@headqrfalse
+\DeclareOption{qr} {\@headqrtrue}
+\DeclareOption{noqr} {\@headqrfalse}
+
+% left/right options: "left" (default) or "right"
+\@initializeif{\if@left} \@leftfalse
+\DeclareOption{left} {\@lefttrue\@rightfalse}
+\@initializeif{\if@right}\@rightfalse
+\DeclareOption{right} {\@leftfalse\@righttrue}
+
+\DeclareOption*{}% avoid choking on unknown options
+\ExecuteOptions{details,qr,left}
+\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
+
+
+%-------------------------------------------------------------------------------
+% required packages
+%-------------------------------------------------------------------------------
+\RequirePackage{qrcode}
+\RequirePackage{tikz}
+\usetikzlibrary{tikzmark,fit}
+
+
+%-------------------------------------------------------------------------------
+% overall head definition
+%-------------------------------------------------------------------------------
+\@ifundefined{\string\color@headTL}{\colorlet{headTL}{color1}}{}
+\@ifundefined{\string\color@headBR}{\colorlet{headBR}{color1}}{}
+\@ifundefined{\string\color@headtext}{\colorlet{headtext}{color2}}{}
+\@ifundefined{\string\color@headhr}{\colorlet{headhr}{color2}}{}
+
+% fonts
+\renewcommand*{\namefont}{\fontsize{30}{32}\rmfamily\mdseries\upshape}
+\renewcommand*{\titlefont}{\LARGE\mdseries\slshape}
+\renewcommand*{\addressfont}{\small\mdseries\slshape}
+\renewcommand*{\quotefont}{\large\slshape}
+
+% styles
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{headtext}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{headtext}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{headtext}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color0}{#1}}}
+
+
+%-------------------------------------------------------------------------------
+% resume head definition
+%-------------------------------------------------------------------------------
+% lengths
+\@initializelength{\quotewidth}
+\@initializelength{\makecvheadnamewidth}% optional makecvheadname width to force a certain width (if set/remains to 0pt, the width is calculated automatically)
+\renewcommand*{\recomputecvheadlengths}{%
+ \setlength{\quotewidth}{0.65\textwidth}}
+
+% commands
+\renewcommand*{\makecvhead}{%
+ % recompute lengths (in case we are switching from letter to resume, or vice versa)
+ \recomputecvlengths%
+ % optional detailed information (pre-rendering)
+ \@initializebox{\makecvheaddetailsbox}%
+ \if@details%
+ \def\phonesdetails{}%
+ \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
+ \protected@edef\phonesdetails{\phonesdetails\protect\makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}%
+ \def\socialsdetails{}%
+ \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link
+ \protected@edef\socialsdetails{\socialsdetails\protect\makenewline\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}%
+ \savebox{\makecvheaddetailsbox}{%
+ \addressfont\color{headtext}%
+ \if@left\begin{tabular}[b]{@{}r@{}}\fi%
+ \if@right\begin{tabular}[b]{@{}l@{}}\fi%
+ \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
+ \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty
+ \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}%
+ \phonesdetails% needs to be pre-rendered as loops and tabulars seem to conflict
+ \ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httplink{\@homepage}}%
+ \socialsdetails% needs to be pre-rendered as loops and tabulars seem to conflict
+ \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}%
+ \end{tabular}
+ }\fi%
+ % optional photo (pre-rendering)
+ \@initializebox{\makecvheadpicturebox}%
+ \savebox{\makecvheadpicturebox}{%
+ \ifthenelse{\isundefined{\@photo}}%
+ {}%
+ {%
+ \if@right%
+ \hspace*{\separatorcolumnwidth}\fi%
+ \begin{tikzpicture}
+ \path[top color=headBR,bottom color=headTL,shading angle=45] (0,0) circle (\dimexpr\@photowidth/2+\@photoframewidth*2);
+ \path[fill=white] (0,0) circle (\dimexpr\@photowidth/2+\@photoframewidth);
+ \begin{scope}
+ \clip (0,0) circle (\dimexpr\@photowidth/2);
+ \node[inner sep=0pt] at (0,0) {\includegraphics[width=\@photowidth]{\@photo}};
+ \end{scope}
+ \end{tikzpicture}%
+ }%
+ \if@left%
+ \hspace*{\separatorcolumnwidth}\fi}%
+ % optional QR for homepage (pre-rendering)
+ \@initializebox{\makecvheadqrbox}%
+ \if@headqr%
+ \savebox{\makecvheadqrbox}{%
+ \ifthenelse{\isundefined{\@homepage}}{}{\tikz\node[inner sep=1ex,fill=white]{\qrcode[height=1.5cm]{\@homepage}};}%
+ }\fi%
+ % name and title (pre-rendering)
+ \@initializelength{\makecvheaddetailswidth}\settowidth{\makecvheaddetailswidth}{\usebox{\makecvheaddetailsbox}}%
+ \@initializelength{\makecvheadpicturewidth}\settowidth{\makecvheadpicturewidth}{\usebox{\makecvheadpicturebox}}%
+ \ifthenelse{\lengthtest{\makecvheadnamewidth=0pt}}% check for dummy value (equivalent to \ifdim\makecvheadnamewidth=0pt)
+ {\setlength{\makecvheadnamewidth}{\textwidth-\makecvheaddetailswidth-\makecvheadpicturewidth}}%
+ {}%
+ \@initializebox{\makecvheadnamebox}%
+ \savebox{\makecvheadnamebox}{%
+ \begin{minipage}[b]{\makecvheadnamewidth}%
+ \if@left\raggedright\fi%
+ \if@right\raggedleft\fi%
+ \namestyle{\@firstname\ {\scshape\@lastname}}%
+ \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
+ \end{minipage}}%
+ % rendering
+ \begin{tikzpicture}[remember picture,overlay]
+ \node(head-bg) [top color=headTL,bottom color=headBR,shading angle=45,inner sep=0pt,
+ fit={(current page.north west)(current page.north east)(pic cs:head-end)}] {};
+ % Users may define `\@moderncvheadBackground` for additional background decoration
+ \ifthenelse{\isundefined{\@moderncvheadBackground}}{}{\@moderncvheadBackground}
+
+ \path[draw,line width=\@photoframewidth]
+ (head-bg.south west) edge[color=headhr!85!black] ([xshift=8em]head-bg.south west)
+ ([xshift=8em]head-bg.south west) edge[color=headhr] ([xshift=-8em]head-bg.south east)
+ ([xshift=-8em]head-bg.south east) edge[color=headhr!85!black] (head-bg.south east);
+ \end{tikzpicture}%
+ \if@left%
+ \usebox{\makecvheadpicturebox}%
+ \usebox{\makecvheadnamebox}%
+ \hfill%
+ \llap{\usebox{\makecvheaddetailsbox}}% \llap is used to suppress the width of the box, allowing overlap if the value of makecvheadnamewidth is forced
+ \usebox{\makecvheadqrbox}\fi%
+ \if@right%
+ \usebox{\makecvheadqrbox}%
+ \rlap{\usebox{\makecvheaddetailsbox}}% \llap is used to suppress the width of the box, allowing overlap if the value of makecvheadnamewidth is forced
+ \hfill%
+ \usebox{\makecvheadnamebox}%
+ \usebox{\makecvheadpicturebox}\fi%
+ \\[.15em]%
+ \tikzmark{head-end}\\[.15em]%
+ % optional quote
+ \ifthenelse{\isundefined{\@quote}}%
+ {}%
+ {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[.15em]}}%
+ \par}% to avoid weird spacing bug at the first section if no blank line is left after \makecvhead
+
+
+%-------------------------------------------------------------------------------
+% letter head definition
+%-------------------------------------------------------------------------------
+% lengths
+%\renewcommand*{\recomputeletterheadlengths}{}
+
+% commands
+\renewcommand*{\makeletterhead}{%
+ % recompute lengths (in case we are switching from letter to resume, or vice versa)
+ \recomputeletterlengths%
+ % sender contact info
+ \hfill%
+ \begin{minipage}{.5\textwidth}%
+ % optional detailed information
+ \if@details%
+ \raggedleft%
+ \addressfont\textcolor{color2}{%
+ {\bfseries\upshape\@firstname~\@lastname}\@firstdetailselementfalse%
+ % optional detailed information
+ \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
+ \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty
+ \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}%
+ \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number
+ \makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}%
+ \ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httplink{\@homepage}}%
+ \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}\fi%
+ \end{minipage}\\[1em]
+ % recipient block
+ \begin{minipage}[t]{.5\textwidth}
+ \raggedright%
+ \addressfont%
+ {\bfseries\upshape\@recipientname}\\%
+ \@recipientaddress%
+ \end{minipage}
+ % date
+ \hfill% US style
+% \\[1em]% UK style
+ \@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
+ % optional subject
+ \ifthenelse{\isundefined{\@subject}}{}{{\bfseries\@subject\\[3em]}}
+ % opening
+ \raggedright%
+ \@opening\\[1.5em]%
+ % ensure no extra spacing after \makelettertitle due to a possible blank line
+% \ignorespacesafterend% not working
+ \hspace{0pt}\par\vspace{-\baselineskip}\vspace{-\parskip}}
+
+
+\endinput
+
+
+%% end of file `moderncvheadvii.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty
index e1eae589aa6..cf7bbbb5365 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsacademic.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsacademic}[2022-02-21 v2.3.1 modern curriculum vitae icons: academicons]
+\ProvidesPackage{moderncviconsacademic}[2024-07-18 v2.4.1 modern curriculum vitae icons: academicons]
%-------------------------------------------------------------------------------
@@ -18,7 +18,19 @@
%-------------------------------------------------------------------------------
% Package for academic icons
\RequirePackage{academicons}
+\RequirePackage{xcolor}
+%-------------------------------------------------------------------------------
+% set colors
+%-------------------------------------------------------------------------------
+\input{moderncvcolors.tex}
+
+\providecolor{orcid}{named}{default-socialicon-color}
+\providecolor{researchgate}{named}{default-socialicon-color}
+\providecolor{researcherid}{named}{default-socialicon-color}
+\providecolor{googlescholar}{named}{default-socialicon-color}
+\providecolor{arxiv}{named}{default-socialicon-color}
+\providecolor{inspire}{named}{default-socialicon-color}
%-------------------------------------------------------------------------------
% all symbols described in moderncv.cls
@@ -39,14 +51,16 @@
%\newcommand*{\stackoverflowsocialsymbol}{}
%\newcommand*{\bitbucketsocialsymbol} {}
%\newcommand*{\skypesocialsymbol} {}
-\renewcommand*{\orcidsocialsymbol} {{\small\aiOrcid}~}
-\renewcommand*{\researchgatesocialsymbol} {{\small\aiResearchGateSquare}~} % alternative: \aiResearchGate
-\renewcommand*{\researcheridsocialsymbol} {{\small\aiResearcherIDSquare}~} % alternative: \aiResearcherID
-\renewcommand*{\googlescholarsocialsymbol}{{\small\aiGoogleScholar}~}
+\renewcommand*{\orcidsocialsymbol} {{\color{orcid}\small\aiOrcid}~}
+\renewcommand*{\researchgatesocialsymbol} {{\color{researchgate}\small\aiResearchGateSquare}~} % alternative: \aiResearchGate
+\renewcommand*{\researcheridsocialsymbol} {{\color{researcherid}\small\aiResearcherIDSquare}~} % alternative: \aiResearcherID
+\renewcommand*{\googlescholarsocialsymbol}{{\color{googlescholar}\raisebox{-1pt}{\large\aiGoogleScholar}}~}
%\newcommand*{\telegramsocialsymbol} {}
%\newcommand*{\whatsappsocialsymbol} {}
%\newcommand*{\matrixsocialsymbol} {}
%\newcommand*{\signalsocialsymbol} {}
+\renewcommand*{\arxivsocialsymbol}{{\color{arxiv}{\small\aiarXiv}}~}
+\renewcommand*{\inspiresocialsymbol}{{\color{inspire}{\small\aiInspire}}~}
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty
index 2a0ea3a23cd..a51729faa6f 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsawesome.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,13 +10,51 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsawesome}[2022-02-21 v2.3.1 modern curriculum vitae icons: awesome]
+\ProvidesPackage{moderncviconsawesome}[2024-07-18 v2.4.1 modern curriculum vitae icons: awesome]
%-------------------------------------------------------------------------------
% required packages
%-------------------------------------------------------------------------------
% Font Awesome font
\RequirePackage{fontawesome5}
+\RequirePackage{xcolor}
+
+%-------------------------------------------------------------------------------
+% set colors
+%-------------------------------------------------------------------------------
+\input{moderncvcolors.tex}
+
+\providecolor{address}{named}{default-socialicon-color}
+\providecolor{mobilephone}{named}{default-socialicon-color}
+\providecolor{fixedphone}{named}{default-socialicon-color}
+\providecolor{faxphone}{named}{default-socialicon-color}
+\providecolor{email}{named}{default-socialicon-color}
+\providecolor{homepage}{named}{default-socialicon-color}
+\providecolor{googlescholar}{named}{default-socialicon-color}
+\providecolor{linkedin}{named}{default-socialicon-color}
+\providecolor{xing}{named}{default-socialicon-color}
+\providecolor{twitter}{named}{default-socialicon-color}
+\providecolor{mastodon}{named}{default-socialicon-color}
+\providecolor{github}{named}{default-socialicon-color}
+\providecolor{gitlab}{named}{default-socialicon-color}
+\providecolor{stackoverflow}{named}{default-socialicon-color}
+\providecolor{bitbucket}{named}{default-socialicon-color}
+\providecolor{skype}{named}{default-socialicon-color}
+\providecolor{orcid}{named}{default-socialicon-color}
+\providecolor{researchgate}{named}{default-socialicon-color}
+\providecolor{telegram}{named}{default-socialicon-color}
+\providecolor{whatsapp}{named}{default-socialicon-color}
+\providecolor{discord}{named}{default-socialicon-color}
+\providecolor{twitch}{named}{default-socialicon-color}
+\providecolor{youtube}{named}{default-socialicon-color}
+\providecolor{tiktok}{named}{default-socialicon-color}
+\providecolor{instagram}{named}{default-socialicon-color}
+\providecolor{soundcloud}{named}{default-socialicon-color}
+\providecolor{steam}{named}{default-socialicon-color}
+\providecolor{xbox}{named}{default-socialicon-color}
+\providecolor{playstation}{named}{default-socialicon-color}
+\providecolor{battlenet}{named}{default-socialicon-color}
+\providecolor{born}{named}{default-socialicon-color}
%-------------------------------------------------------------------------------
% all symbols described in moderncv.cls
@@ -28,28 +66,41 @@
%\renewcommand*{\addresssymbol} {}
-\renewcommand*{\mobilephonesymbol} {{\small\faMobile*}~} % alternative: \faMobile (solid style)
-\renewcommand*{\fixedphonesymbol} {{\small\faPhone*}~} % alternative: \faPhone (reversed)
-\renewcommand*{\faxphonesymbol} {{\small\faFax}~} % alternative: \faPrint
-\renewcommand*{\emailsymbol} {{\small\faEnvelope[regular]}~} % alternative: \faInbox, \faEnvelope (solid style)
-\renewcommand*{\homepagesymbol} {{\small\faGlobeAmericas}~} % alternative: \faHome, \faGlobe, \faGlobeEurope, \faGlobeAfrica, \faGlobeAsia
-\renewcommand*{\linkedinsocialsymbol} {{\small\faLinkedinIn}~} % alternative: \faLinkedin
-\renewcommand*{\xingsocialsymbol} {{\small\faXing}~} % alternative: \faXingSquare
-\renewcommand*{\twittersocialsymbol} {{\small\faTwitter}~} % alternative: \faTwitterSquare
-\renewcommand*{\githubsocialsymbol} {{\small\faGithub}~} % alternative: \faGithubSquare, \faGithub*
-\renewcommand*{\gitlabsocialsymbol} {{\small\faGitlab}~}
-\renewcommand*{\stackoverflowsocialsymbol}{{\small\faStackOverflow}~}
-\renewcommand*{\bitbucketsocialsymbol} {{\small\faBitbucket}~}
-\renewcommand*{\skypesocialsymbol} {{\small\faSkype}~}
-\renewcommand*{\orcidsocialsymbol} {{\small\faOrcid}~}
-\renewcommand*{\researchgatesocialsymbol} {{\small\faResearchgate}~}
+\renewcommand*{\mobilephonesymbol} {{\color{mobilephone}\small\faMobile*}~} % alternative: \faMobile (solid style)
+\renewcommand*{\fixedphonesymbol} {{\color{fixedphone}\small\faPhone*}~} % alternative: \faPhone (reversed)
+\renewcommand*{\faxphonesymbol} {{\color{faxphone}\small\faFax}~} % alternative: \faPrint
+\renewcommand*{\emailsymbol} {{\color{email}\small\faEnvelope[regular]}~} % alternative: \faInbox, \faEnvelope (solid style)
+\renewcommand*{\homepagesymbol} {{\color{homepage}\small\faGlobeAmericas}~} % alternative: \faHome, \faGlobe, \faGlobeEurope, \faGlobeAfrica, \faGlobeAsia
+\renewcommand*{\linkedinsocialsymbol} {{\color{linkedin}\small\faLinkedinIn}~} % alternative: \faLinkedin
+\renewcommand*{\xingsocialsymbol} {{\color{xing}\small\faXing}~} % alternative: \faXingSquare
+\renewcommand*{\twittersocialsymbol} {{\color{twitter}\small\faTwitter}~} % alternative: \faTwitterSquare
+\renewcommand*{\mastodonsocialsymbol} {{\color{mastodon}\small\faMastodon}~}
+\renewcommand*{\githubsocialsymbol} {{\color{github}\small\faGithub}~} % alternative: \faGithubSquare, \faGithub*
+\renewcommand*{\gitlabsocialsymbol} {{\color{gitlab}\small\faGitlab}~}
+\renewcommand*{\stackoverflowsocialsymbol}{{\color{stackoverflow}\small\faStackOverflow}~}
+\renewcommand*{\bitbucketsocialsymbol} {{\color{bitbucket}\small\faBitbucket}~}
+\renewcommand*{\skypesocialsymbol} {{\color{skype}\small\faSkype}~}
+\renewcommand*{\orcidsocialsymbol} {{\color{orcid}\small\faOrcid}~}
+\renewcommand*{\researchgatesocialsymbol} {{\color{researchgate}\small\faResearchgate}~}
%\renewcommand*{\researcheridsocialsymbol} {}
%\renewcommand*{\googlescholarsocialsymbol}{}
-\renewcommand*{\telegramsocialsymbol} {{\small\faTelegram}~}
-\renewcommand*{\whatsappsocialsymbol} {{\small\faWhatsapp}~}
+\renewcommand*{\telegramsocialsymbol} {{\color{telegram}\small\faTelegram}~}
+\renewcommand*{\whatsappsocialsymbol} {{\color{whatsapp}\small\faWhatsapp}~}
+\renewcommand*{\discordsocialsymbol} {{\color{discord}\small\faDiscord}~}
+\renewcommand*{\twitchsocialsymbol} {{\color{twitch}\small\faTwitch}~}
+\renewcommand*{\youtubesocialsymbol} {{\color{youtube}\small\faYoutube}~}
+\renewcommand*{\tiktoksocialsymbol} {{\color{tiktok}\small\faTiktok}~}
+\renewcommand*{\instagramsocialsymbol} {{\color{instagram}\small\faInstagram}~}
+\renewcommand*{\soundcloudsocialsymbol} {{\color{soundcloud}\small\faSoundcloud}~}
+\renewcommand*{\steamsocialsymbol} {{\color{steam}\small\faSteam}~}
+\renewcommand*{\xboxsocialsymbol} {{\color{xbox}\small\faXbox}~}
+\renewcommand*{\playstationsocialsymbol} {{\color{playstation}\small\faPlaystation}~}
+\renewcommand*{\battlenetsocialsymbol} {{\color{battlenet}\small\faBattleNet}~}
%\renewcommand*{\signalsocialsymbol} {}
%\renewcommand*{\matrixsocialsymbol} {}
-\renewcommand*{\bornsymbol} {{\small\faAsterisk}~} % alternative: \faBabyCarriage
+% \renewcommand*{\arxivsocialsymbol} {{\color{arxiv}{\small\faarXiv}}~}
+% \renewcommand*{\inspiresocialsymbol} {{\color{inspire}{\small\faInspire}}~}
+\renewcommand*{\bornsymbol} {{\color{born}\small\faAsterisk}~} % alternative: \faBabyCarriage
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty
index 832e21035af..2dc6386d51d 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsletters.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsletters}[2022-02-21 v2.3.1 modern curriculum vitae icons: letter]
+\ProvidesPackage{moderncviconsletters}[2024-07-18 v2.4.1 modern curriculum vitae icons: letter]
%-------------------------------------------------------------------------------
% symbols definition
@@ -31,6 +31,7 @@
\renewcommand*{\linkedinsocialsymbol} {\textbf{in}~}
\renewcommand*{\xingsocialsymbol} {\textbf{xi}~}
\renewcommand*{\twittersocialsymbol} {\textbf{tw}~}
+\renewcommand*{\mastodonsocialsymbol} {\textbf{ms}~}
\renewcommand*{\githubsocialsymbol} {\textbf{gh}~}
\renewcommand*{\gitlabsocialsymbol} {\textbf{gl}~}
\renewcommand*{\stackoverflowsocialsymbol}{\textbf{so}~}
@@ -45,6 +46,18 @@
\renewcommand*{\matrixsocialsymbol} {\textbf{ma}~}
\renewcommand*{\googlescholarsocialsymbol}{\textbf{gs}~}
\renewcommand*{\bornsymbol} {\textbf{B}~}
+\renewcommand*{\codebergsocialsymbol} {\textbf{cb}~}
+\renewcommand*{\twitchsocialsymbol} {\textbf{ttv}~}
+\renewcommand*{\youtubesocialsymbol} {\textbf{yt}~}
+\renewcommand*{\tiktoksocialsymbol} {\textbf{tok}~}
+\renewcommand*{\instagramsocialsymbol} {\textbf{insta}~}
+\renewcommand*{\soundcloudsocialsymbol} {\textbf{sc}~}
+\renewcommand*{\steamsocialsymbol} {\textbf{st}~}
+\renewcommand*{\xboxsocialsymbol} {\textbf{xb}~}
+\renewcommand*{\playstationsocialsymbol} {\textbf{psn}~}
+\renewcommand*{\battlenetsocialsymbol} {\textbf{bn}~}
+\renewcommand*{\arxivsocialsymbol} {\textbf{arx}~}
+\renewcommand*{\inspiresocialsymbol} {\textbf{ins}~}
\renewcommand*{\listitemsymbol} {\labelitemi~}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty
index 0a1d8f107dc..2dbc71011ee 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsmarvosym.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsmarvosym}[2022-02-21 v2.3.1 modern curriculum vitae icons: marvosym]
+\ProvidesPackage{moderncviconsmarvosym}[2024-07-18 v2.4.1 modern curriculum vitae icons: marvosym]
%-------------------------------------------------------------------------------
% all symbols described in moderncv.cls
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconssymbols.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconssymbols.sty
index 256304380e1..b6c1fb7b1d5 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconssymbols.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconssymbols.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconssymbols.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -17,7 +17,7 @@
\RequirePackage{moderncviconsawesome}
\RequirePackage{moderncviconsacademic}
\else
- \ClassWarningNoLine{moderncv}{"academicons requires xetex/luatex to work. Using alternatives."}
+ \typeout{^^Jmoderncv: academicons requires XeTeX/LuaTeX to work. Using alternatives.^^J}
\ifpdftex
\RequirePackage{moderncviconsawesome}
\else
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty
index c3e9f40b0d4..e1a0248924d 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconstikz.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconstikz}[2022-02-21 v2.3.1 modern curriculum vitae and letter icons: tickz]
+\ProvidesPackage{moderncviconstikz}[2024-07-18 v2.4.1 modern curriculum vitae and letter icons: tickz]
%-------------------------------------------------------------------------------
@@ -218,7 +218,7 @@
\protect\begin{tikzpicture}[x=0.11em, y=0.11em, xscale=0.015, yscale=-0.015, inner sep=0pt, outer sep=0pt]
\protect\begin{scope}[shift={(507,387)}]
\protect\path[fill=color2,line width=0.057pt]
- (105.2000,24.9000) .. controls (102.1000,16.0000) and (89.5000,16.0000) ..
+ (105.2000,24.9000) .. controls (102.1000,16.0000) and (89.5000,16.0000) ..
(86.3000,24.9000) -- (29.8000,199.7000) -- (161.7000,199.7000) .. controls
(161.7000,199.7000) and (105.2000,24.9000) .. (105.2000,24.9000) -- cycle
(0.9000,287.7000) .. controls (-1.7000,295.7000) and (1.2000,304.6000) ..
@@ -327,7 +327,7 @@
\protect\raisebox{-0.12em}{
\protect\begin{tikzpicture}[y=1.8pt, x=1.8pt, yscale=-0.15, xscale=0.15, inner sep=0pt, outer sep=0pt]
\protect\begin{scope}[shift={(507,387)}]
- \protect\path[fill=color2]
+ \protect\path[fill=color2]
(0.9360,0.7320) .. controls (0.9360,10.9053) and (0.9360,21.0787) ..
(0.9360,31.2520) .. controls (1.6673,31.2520) and (2.3987,31.2520) ..
(3.1300,31.2520) .. controls (3.3452,32.0075) and (2.8778,32.0803) ..
@@ -374,7 +374,7 @@
\protect\raisebox{-0.12em}{
\protect\begin{tikzpicture}[y=0.1pt, x=0.1pt, yscale=-0.13, xscale=0.13, inner sep=0pt, outer sep=0pt]
\protect\begin{scope}[shift={(507,387)}]
- \protect\path[fill=color2]
+ \protect\path[fill=color2]
(430.1000,180.9000) -- (437.8000,211.9000) .. controls (407.6000,219.3000)
and (378.7000,231.3000) .. (352.1000,247.3000) -- (335.7000,220.0000) ..
controls (365.0000,202.3000) and (396.9000,189.1000) .. (430.1000,180.9000) --
@@ -439,6 +439,25 @@
~}
}{}\par
+\ifdefempty{\codebergsocialsymbol} {
+ \renewcommand*{\codebergsocialsymbol} {
+ \protect\raisebox{-0.12em}{
+ \protect\begin{tikzpicture}[y=0.8pt, x=0.8pt, yscale=-1.0, xscale=1.0, inner sep=0pt, outer sep=0pt]
+ \protect\begin{scope}[shift={(507, 387)}]
+ \protect\path[scale=0.265, opacity=0.500, line cap=butt, line join=miter, line width=0.779pt, miter limit=2.00]
+ (11249.8942,-1872.9296)arc(269.285:169.240:0.201313 and 0.150) --
+ (11258.5852,-1839.4433)arc(66.699:32.084:23.067) --
+ (11250.0698,-1872.8557)arc(329.460:269.346:0.201313 and 0.150) -- cycle;
+
+ \protect\path[scale=0.265, fill=color2, line width=0.426pt]
+ (11249.3743,-1883.6959)arc(269.785:180.000:23.067)arc(180.001:147.920:23.067)
+ -- (11249.1480,-1873.2412)arc(209.929:330.071:0.360097 and 0.269) --
+ (11269.0053,-1848.3766)arc(32.082:-0.002:23.067)arc(360.000:270.000:23.067)arc(270.108:269.892:23.067)
+ -- cycle;
+ \protect\end{scope}
+ \protect\end{tikzpicture}}
+ ~}
+}{}\par
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty
index 68b8db9a0aa..9f03be117a7 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty
@@ -2,30 +2,30 @@
%% Copyright 2021 David Seus (cryptointerest@posteo.de).
%
% This package provides a skill matrix template for the moderncv package.
-% Some recruiting firms require applicants to rate their skills, computer
-% skills, management tools, or similar in a table involving a graphical
-% illustration of their skill level. This package implements this idea
-% and provides the following commands to use within the moderncv
+% Some recruiting firms require applicants to rate their skills, computer
+% skills, management tools, or similar in a table involving a graphical
+% illustration of their skill level. This package implements this idea
+% and provides the following commands to use within the moderncv
% package:
-%
-%
+%
+%
% PUBLIC COMMANDS
% \cvskill{<1-5>}
% Illustrate skill level with little colored boxes.
-% By default five skill levels are predefined.
-%
-% Input:
+% By default five skill levels are predefined.
+%
+% Input:
% input_1: integer between 0 and 5
-%
-% Example usages:
+%
+% Example usages:
% \cvskill{3}
-%
-%
+%
+%
% \cvskilllegend[*][<post_padding>][<first_level>][<second_level>][<third_level>][<fourth_level>][<fifth_level>]{<name>}
% Print legend table explaining the meaning of \cvskill{1}...\cvskill{5}.
-%
+%
% Input:
-% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
+% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
% For the fancy style, the asterix has no meaning.
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2 (optional): string describing meaning of \cvskill{1}, default: <basic knowledge>
@@ -34,25 +34,25 @@
% input_5 (optional): string describing meaning of \cvskill{4}, default: <deepened expert knowledge>
% input_6 (optional): string describing meaning of \cvskill{5}, default: <expert/guru>
% input_7: string giving a name to the legend, default: <>
-%
+%
% Example usages:
% \cvskilllegend{} print default legend
% \cvskilllegend[0.5em]{Legend} print default legend, but adjust post padding and display the word ``Legend''.
% \cvskilllegend*[0.2em][Grundkenntnisse][Grundkenntnisse und eigene Erfahrung in Projekten][Umfangreiche Erfahrung in Projekten][Vertiefte Expertenkenntnisse][Experte/Guru]{Legende} Fully adjust legend to German example and including dashed lines
-%
+%
% Note:
% -The width of the columns can be adjusted by the \setcvskilllegendcolumns, see \setcvskilllegendcolumns
-% -The design of the table is such that the <second_level> entry stands in the first column but
+% -The design of the table is such that the <second_level> entry stands in the first column but
% occupies rows two and three. This has been done to accomodate english and german defaults.
% An alternative is provided by \cvskillplainlegend
-%
-%
+%
+%
% \cvskillplainlegend[*][<post_padding>][<first_level>][<second_level>][<third_level>][<fourth_level>][<fifth_level>]{<name>}
% Print alternative legend table explaining the meaning of \cvskill{1}...\cvskill{5}.
% In this legend, the first three skill levels are in one column
-%
+%
% Input:
-% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
+% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
% For the fancy style, the asterix has no meaning.
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2 (optional): string describing meaning of \cvskill{1}, default: <basic knowledge>
@@ -61,40 +61,40 @@
% input_5 (optional): string describing meaning of \cvskill{4}, default: <deepened expert knowledge>
% input_6 (optional): string describing meaning of \cvskill{5}, default: <expert/guru>
% input_7: string giving a name to the legend, default: <>
-%
+%
% Example usages:
% \cvskillplainlegend{} print default legend
% \cvskillplainlegend[0.5em]{Legend} print default legend, but adjust post padding and display the word ``Legend''.
% \cvskillplainlegend*[0.2em][Grundkenntnisse][Grundkenntnisse und eigene Erfahrung in Projekten][Umfangreiche Erfahrung in Projekten][Vertiefte Expertenkenntnisse][Experte/Guru]{Legende} Fully adjust legend to German example and including dashed lines
-%
+%
% Note:
% -The width of the columns can be adjusted by the \setcvskilllegendcolumns, see \setcvskilllegendcolumns
-%
-%
+%
+%
% \cvskillhead[<post_padding>][<Level>][<Skill>][<Years>][<Comment>]%
% add skill matrix line acting as header explaining the meaning of columns.
-%
+%
% Input:
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2 (optional): string naming the level column (2nd column), default: <Level>
% input_3 (optional): string naming the skill column (3nd column), default: <Skill>
% input_4 (optional): string naming the experience-in-years column (4th column), default: <Years>
% input_5 (optional): string naming the comment column (5th column), default: <Comment>
-%
+%
% Example usages:
% \cvskillhead print default head.
% \cvskillhead[0.5em] print default head, but adjust post padding.
% \cvskillhead[0.25em][Level][F\"ahigkeit][Jahre][Bemerkung] Fully adjust head to German example
-%
-% Note:
+%
+% Note:
% - The width of the columns can be adjusted by the \setcvskillcolumns command, see \setcvskillcolumns.
-%
-%
+%
+%
% \cvskillentry[*][<post_padding>]{<skill_cathegory>}{<0-5>}{<skill_name>}{<years_of_experience>}{<comment>}%
% add cvskill matrix row.
-%
+%
% Input:
-% asterix (optional): include horizontal (dashed) line above the entered line. This behaviour depends on the body style.
+% asterix (optional): include horizontal (dashed) line above the entered line. This behaviour depends on the body style.
% For the fancy style, the asterix has no meaning.
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2: string, naming skill cathegory, default: <>
@@ -102,98 +102,98 @@
% input_4: string, naming the skill, default: <>
% input_5: positive real number, stating the number of years of experience with this skill , default: <>
% input_6: string, explaining details w.r.t. that particual skill default: <>
-%
+%
% Example usages:
% \cvskillentry*{Language:}{3}{Python}{2}{I have done a million projects with Python}
% \cvskillentry{}{2}{Lilypond}{14}{So much sheet music! Man I'm the best!}
% \cvskillentry{}{3}{\LaTeX}{14}{Clearly I rock at \LaTeX}
% \cvskillentry*[1.5em]{OS:}{3}{Linux}{2}{I only use Archlinux}
-%
-% Note:
+%
+% Note:
% - The width of the columns can be adjusted by the \setcvskillcolumns command, see \setcvskillcolumns.
-%
-%
+%
+%
% \setcvskillcolumns[<width>][<factor>][<exp_width>]
% adjust column width of skill table
-%
-% The \cvskillentry command comes with default FIXED width definitions of the kill matrix for the columns
-% based on the author's own skill matrix. This is necessary to ensure that the entries are nicely aligned
+%
+% The \cvskillentry command comes with default FIXED width definitions of the kill matrix for the columns
+% based on the author's own skill matrix. This is necessary to ensure that the entries are nicely aligned
% and actually yield a decent looking table. The defaults depend on the style used and are chosen reasonably.
-% However, depending on the user input and the style that is used some of the columns might need adjustments.
-% The \setcvskillcolumns command provides means to influence the width of the first, the third and the fourth
+% However, depending on the user input and the style that is used some of the columns might need adjustments.
+% The \setcvskillcolumns command provides means to influence the width of the first, the third and the fourth
% skill matrix column. The second column containg the output of \cvskill remains fixed width. The last column,
% the comment column gets recalculated according to the setting of the other columns.
-%
+%
% Input
% Input_1 (optional): width smaller than \textwidth, default <\skillmatrix@hintscolumnwidth>
-% Input_2 (optional): float between 0 and 1 adjusting how much percent of the table width without
+% Input_2 (optional): float between 0 and 1 adjusting how much percent of the table width without
% the first column is used columns two, three and four. Through this parameter
% the width of the 3rd column (skill name) can be adjusted, default <\skillmatrix@columnwidth>
-% Input_3 (optional): width smaller than \textwidth, setting the width of the 4th column
+% Input_3 (optional): width smaller than \textwidth, setting the width of the 4th column
% (Years of experience), default <\cvskill@experiencewidth>
-%
+%
% Example usage
% \setcvskillcolumns[5em][][]% adjust first column. Same as \setcvskillcolumns[5em]
% \setcvskillcolumns[][0.45][]% adjust third (skill) column. Same as \setcvskillcolumns[][0.45]
% \setcvskillcolumns[][][\widthof{``Year''}]% adjust fourth (years) column.
-% \setcvskillcolumns[\widthof{``Language''}][0.48][]% adjust 1st and 3rd columns. Same as \setcvskillcolumns[\widthof{``Language''}][0.45]
+% \setcvskillcolumns[\widthof{``Language''}][0.48][]% adjust 1st and 3rd columns. Same as \setcvskillcolumns[\widthof{``Language''}][0.45]
% \setcvskillcolumns[\widthof{``Management Tools''}][0.6][3em]% ajust all at once.
-%
+%
% Note
% - For the styles 'classic' and 'casual' the first column is set to hintscolumnwidth such that
-% it aligns with the rest of the entries. A readjustment of the first column should therefor
-% be avoided. It is recomended to only use \setcvskillcolumns in the form of
+% it aligns with the rest of the entries. A readjustment of the first column should therefor
+% be avoided. It is recomended to only use \setcvskillcolumns in the form of
% \setcvskillcolumns[][<factor>][<width>], thereby leaving the defaults in place for the first column.
-%
-%
+%
+%
% \setcvskilllegendcolumns[<width>][<factor>]
% adjust column width of legend
-%
-% The \cvskilllegend command comes with default FIXED width definitions for the columns of the legend matrix
-% such that the default english and german examples look good.
-% However, depending on the user input (translation) and the style that is used some adjustment might be needed.
-% The \setcvskilllegendcolumns command provides means to influence all columns except the ones containing
+%
+% The \cvskilllegend command comes with default FIXED width definitions for the columns of the legend matrix
+% such that the default english and german examples look good.
+% However, depending on the user input (translation) and the style that is used some adjustment might be needed.
+% The \setcvskilllegendcolumns command provides means to influence all columns except the ones containing
% \cvskill commands. The second column containg the output of \cvskill remains fixed width. The last column,
% the comment column gets recalculated according to the setting of the other columns.
-%
+%
% Input
-% Input_1 (optional): length smaller than \textwidth influencing the width of the first column
-% where depending on the style the legend_string gets printed. In case the
-% string is left empty adjusting this width allows moving the legend horizontally.
+% Input_1 (optional): length smaller than \textwidth influencing the width of the first column
+% where depending on the style the legend_string gets printed. In case the
+% string is left empty adjusting this width allows moving the legend horizontally.
% Default <\skilllegend@hintscolumnwidth>
-% Input_2 (optional): float between 0 and 1 influencing the width of the left legend descritor column,
-% aka \cvskilllegend@leftdescriptorwidth. The desriptor column on the right,
+% Input_2 (optional): float between 0 and 1 influencing the width of the left legend descritor column,
+% aka \cvskilllegend@leftdescriptorwidth. The desriptor column on the right,
% \cvskilllegend@rightdescriptorwidth is influenced by the factor 1-<factor>.
% Default <\skilllegend@leftdesriptorfactor>
-%
+%
% Example usage
% \setcvskilllegendcolumns[][0.45]%% adjust left desriptor column.
% \setcvskilllegendcolumns[\widthof{``Legend''}][0.45]% adjust both left descriptor column and string column
-%
+%
% Note
-% - Due to implementation of \cvskilllegend for style 'fancy' (moderncvbodyv)
+% - Due to implementation of \cvskilllegend for style 'fancy' (moderncvbodyv)
% the first optional variable has no effect in this case.
% - For the styles 'classic' and 'casual' the first column is set to hintscolumnwidth such that
-% it aligns with the rest of the entries. A readjustment of the first column should therefor
-% be avoided. It is recomended to only use \cvskilllegend in the form of
+% it aligns with the rest of the entries. A readjustment of the first column should therefor
+% be avoided. It is recomended to only use \cvskilllegend in the form of
% \cvskilllegend[][<factor>], thereby leaving the defaults in place for the first column.
% - For style 'banking' the first column is set to align with the rest of the \cvskillentry entries
-% Therefor adjusting the first column can be used to widen the table while moving it around. If no
+% Therefor adjusting the first column can be used to widen the table while moving it around. If no
% legend string is used, setting \cvskilllegend[0em] maximises the real enstate for the legend.
-%
-%
+%
+%
% PRIVATE COMMANDS
-%
+%
% \recompute@cvskillmatrix@lengths
-% compute all lengths necessary for the skill matrix depending on
+% compute all lengths necessary for the skill matrix depending on
% the moderncv style (moderncvbody)
-%
+%
% Input: none
-%
+%
% Example usage (only internally in moderncvbody<i-v>.sty)
-% \recompute@cvskillmatrix@lengths
-%
-%
+% \recompute@cvskillmatrix@lengths
+%
+%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
% available at http://www.latex-project.org/lppl/.
@@ -203,10 +203,10 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvskillmatrix}[2022-02-21 v2.3.1 modern curriculum vitae and letter skill matrix]
+\ProvidesPackage{moderncvskillmatrix}[2024-07-18 v2.4.1 modern curriculum vitae and letter skill matrix]
-% The definitions need to be adjusted depending on which moderncvbody<i-v>.sty style is usde.
-% body type options: "moderncvbodyi" (default), "moderncvbodyii", "moderncvbodyiii", "moderncvbodyiv" or "moderncvbodyv"
+% The definitions need to be adjusted depending on which moderncvbody<i-v>.sty style is usde.
+% body type options: "moderncvbodyi" (default), "moderncvbodyii", "moderncvbodyiii", "moderncvbodyiv" or "moderncvbodyv"
\@initializeif{\if@moderncvbodyi}\@moderncvbodyifalse
\DeclareOption{moderncvbodyi}{\@moderncvbodyitrue\@moderncvbodyiifalse\@moderncvbodyiiifalse\@moderncvbodyivfalse\@moderncvbodyvfalse}
\@initializeif{\if@moderncvbodyii}\@moderncvbodyiifalse % this option is added in case moderncvbodyii gets implemented standalone
@@ -218,6 +218,10 @@
\@initializeif{\if@moderncvbodyv}\@moderncvbodyvfalse
\DeclareOption{moderncvbodyv}{\@moderncvbodyifalse\@moderncvbodyiifalse\@moderncvbodyiiifalse\@moderncvbodyivfalse\@moderncvbodyvtrue}
+% If option `circle` is specified, use circles instead of small rectangles for rating skills
+\@initializeif{\if@cvskillcircle}\@cvskillcirclefalse
+\DeclareOption{circle}{\@cvskillcircletrue}
+
\DeclareOption*{}% avoid choking on unknown options
\ExecuteOptions{moderncvbodyi}
\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
@@ -239,23 +243,29 @@
% %-------------------------------------------------------------------------------
% The code for the Skilllevel illustration with the little boxes.
% This is idea stolen from the limecv package, see https://github.com/opieters/limecv.git
-\@initializelength{\cvSkill@RectangleSize}
-\setlength{\cvSkill@RectangleSize}{1.2ex}
+\@initializelength{\cvSkill@ShapeSize}
+\if@cvskillcircle%
+ \setlength{\cvSkill@ShapeSize}{.7ex}%
+ \def\cvSkill@Shape#1{\tikz\filldraw[#1] (0, 0) circle (\cvSkill@ShapeSize);}
+\else
+ \setlength{\cvSkill@ShapeSize}{1.2ex}
+ \def\cvSkill@Shape#1{\tikz\filldraw[#1] (0, 0) rectangle (\cvSkill@ShapeSize, \cvSkill@ShapeSize);}
+\fi
\newcount\my@repeat@count
\DeclareDocumentCommand{\cvskill}{m}{%
% Illustrate skill level with little colored boxes.
-% By default five skill levels are predefined.
-%
-% Input:
+% By default five skill levels are predefined.
+%
+% Input:
% integer between 0 and 5
-% Example usage:
+% Example usage:
% \cvskill{3}
\begingroup
\my@repeat@count=\z@
- \@whilenum\my@repeat@count<#1\do{\tikz\filldraw[color1] (0, 0) rectangle (\cvSkill@RectangleSize, \cvSkill@RectangleSize);\advance%
+ \@whilenum\my@repeat@count<#1\do{\cvSkill@Shape{skillmatrixfullcolor}\advance%
\my@repeat@count\@ne\,}%
\my@repeat@count=\numexpr5-\z@\relax
- \@whilenum\my@repeat@count>#1\do{\tikz\filldraw[color2!30] (0, 0) rectangle (\cvSkill@RectangleSize, \cvSkill@RectangleSize);\advance%
+ \@whilenum\my@repeat@count>#1\do{\cvSkill@Shape{skillmatrixemptycolor}\advance%
\my@repeat@count\m@ne\,}%
\endgroup
}% end \cvskill
@@ -279,10 +289,10 @@
\@initializelength{\skilllegend@padding}
\@initializelength{\skilllegend@bodylength}
-% \separatorrulewidth is defined in moderncvbodyv.sty and we need to
+% \separatorrulewidth is defined in moderncvbodyv.sty and we need to
% define it to not throw an error in the other cases
\if@moderncvbodyv%
-%
+%
\else%
\@initializelength{\separatorrulewidth}
\setlength{\separatorrulewidth}{1ex}
@@ -292,13 +302,13 @@
%% DEFINITION \recompute@cvskillmatrix@lengths
% declare the command \recompute@cvskillmatrix@lengths empty
\DeclareDocumentCommand{\recompute@cvskillmatrix@lengths}{}{}%
-% compute all lengths necessary for the skill matrix depending on
+% compute all lengths necessary for the skill matrix depending on
% the moderncv style (moderncvbody)
-%
+%
% Input: none
-%
+%
% Example usage (only internally in moderncvbody<i-v>.sty)
-% \recompute@cvskillmatrix@lengths
+% \recompute@cvskillmatrix@lengths
% Definition of \recompute@cvskillmatrix@lengths for moderncvbodyi
\if@moderncvbodyi%
@@ -332,7 +342,7 @@
\setlength{\cvskill@descriptorwidth}{\skillmatrix@columnwidth-\cvskill@width-\cvskill@experiencewidth}%
\setlength{\skillmatrix@commentwidth}{\skillmatrix@bodylength-\skillmatrix@columnwidth-3\skillmatrix@padding}%
% lengths and definitions needed for the legends
- % note that \skillmatrix@padding also affects the appearance of legends
+ % note that \skillmatrix@padding also affects the appearance of legends
\setlength{\skilllegend@padding}{0.25ex}%
\setlength{\skilllegend@hintscolumnwidth}{\skillmatrix@hintscolumnwidth}%
\setlength{\skilllegend@bodylength}{\skillmatrix@bodylength}%
@@ -352,7 +362,7 @@
\setlength{\cvskill@descriptorwidth}{\skillmatrix@columnwidth-\cvskill@width-\cvskill@experiencewidth}
\setlength{\skillmatrix@commentwidth}{\skillmatrix@bodylength-\skillmatrix@columnwidth-3\skillmatrix@padding}%
% lengths and definitions needed for the legends
- % note that \skillmatrix@padding also affects the appearance of legends
+ % note that \skillmatrix@padding also affects the appearance of legends
\setlength{\skilllegend@padding}{0.25ex}
\setlength{\skilllegend@hintscolumnwidth}{0ex}%\skillmatrix@hintscolumnwidth
\setlength{\skilllegend@bodylength}{\maincolumnwidth}
@@ -371,7 +381,7 @@
\setlength{\cvskill@descriptorwidth}{\skillmatrix@columnwidth-\cvskill@width-\cvskill@experiencewidth}%
\setlength{\skillmatrix@commentwidth}{\skillmatrix@bodylength-\skillmatrix@columnwidth-3\skillmatrix@padding}%
% lengths and definitions needed for the legends
- % note that \skillmatrix@padding also affects the appearance of legends
+ % note that \skillmatrix@padding also affects the appearance of legends
\setlength{\skilllegend@padding}{0.25ex}%
\setlength{\skilllegend@hintscolumnwidth}{\skillmatrix@hintscolumnwidth}%
\setlength{\skilllegend@bodylength}{\maincolumnwidth}%
@@ -385,43 +395,43 @@
% \setcvskillcolumns[<width>][<factor>][<exp_width>]
\DeclareDocumentCommand{\setcvskillcolumns}{+O{\skillmatrix@hintscolumnwidth} +O{\skillmatrix@columnwidth} +O{\cvskill@experiencewidth}}{%
% adjust column width of skill table
-%
-% The \cvskillentry command comes with default FIXED width definitions of the kill matrix for the columns
-% based on the author's own skill matrix. This is necessary to ensure that the entries are nicely aligned
+%
+% The \cvskillentry command comes with default FIXED width definitions of the kill matrix for the columns
+% based on the author's own skill matrix. This is necessary to ensure that the entries are nicely aligned
% and actually yield a decent looking table. The defaults depend on the style used and are chosen reasonably.
-% However, depending on the user input and the style that is used some of the columns might need adjustments.
-% The \setcvskillcolumns command provides means to influence the width of the first, the third and the fourth
+% However, depending on the user input and the style that is used some of the columns might need adjustments.
+% The \setcvskillcolumns command provides means to influence the width of the first, the third and the fourth
% skill matrix column. The second column containg the output of \cvskill remains fixed width. The last column,
% the comment column gets recalculated according to the setting of the other columns.
-%
+%
% Input
% Input_1 (optional): width smaller than \textwidth, default <\skillmatrix@hintscolumnwidth>
-% Input_2 (optional): float between 0 and 1 adjusting how much percent of the table width without
+% Input_2 (optional): float between 0 and 1 adjusting how much percent of the table width without
% the first column is used columns two, three and four. Through this parameter
% the width of the 3rd column (skill name) can be adjusted, default <\skillmatrix@columnwidth>
-% Input_3 (optional): width smaller than \textwidth, setting the width of the 4th column
+% Input_3 (optional): width smaller than \textwidth, setting the width of the 4th column
% (Years of experience), default <\cvskill@experiencewidth>
-%
+%
% Example usage
% \setcvskillcolumns[5em][][]% adjust first column. Same as \setcvskillcolumns[5em]
% \setcvskillcolumns[][0.45][]% adjust third (skill) column. Same as \setcvskillcolumns[][0.45]
% \setcvskillcolumns[][][\widthof{``Year''}]% adjust fourth (years) column.
-% \setcvskillcolumns[\widthof{``Language''}][0.48][]% adjust 1st and 3rd columns. Same as \setcvskillcolumns[\widthof{``Language''}][0.45]
+% \setcvskillcolumns[\widthof{``Language''}][0.48][]% adjust 1st and 3rd columns. Same as \setcvskillcolumns[\widthof{``Language''}][0.45]
% \setcvskillcolumns[\widthof{``Management Tools''}][0.6][3em]% ajust all at once.
-%
+%
% Note
% - For the styles 'classic' and 'casual' the first column is set to hintscolumnwidth such that
-% it aligns with the rest of the entries. A readjustment of the first column should therefor
-% be avoided. It is recomended to only use \setcvskillcolumns in the form of
+% it aligns with the rest of the entries. A readjustment of the first column should therefor
+% be avoided. It is recomended to only use \setcvskillcolumns in the form of
% \setcvskillcolumns[][<factor>][<width>], thereby leaving the defaults in place for the first column.
-%
+%
\def\arg@new@hintscolumnwidth{#1}% <-- all these terminal % signs are necessary for the fancy style to not show weird spaces!!!
- \def\arg@new@bodyLengthFactor{#2}%
- \def\arg@new@experienceWidth{#3}%
- % Check for empty arguments. Defaults are given. Thus a call of \setcvskillcolumns
+ \def\arg@new@bodyLengthFactor{#2}%
+ \def\arg@new@experienceWidth{#3}%
+ % Check for empty arguments. Defaults are given. Thus a call of \setcvskillcolumns
% without any arguments leads to nonempty arguments \arg@new@hintscolumnwidth and
- % \def\arg@new@bodyLengthFactor{#2}. However, we need to take care of calls like
- % \setcvskillcolumns[], \setcvskillcolumns[][], \setcvskillcolumns[][][] or even
+ % \def\arg@new@bodyLengthFactor{#2}. However, we need to take care of calls like
+ % \setcvskillcolumns[], \setcvskillcolumns[][], \setcvskillcolumns[][][] or even
% \setcvskillcolumns[<somelength>][], \setcvskillcolumns[][<somefactor>] \setcvskillcolumns[][][<length>]
\ifdefempty{\arg@new@hintscolumnwidth}{%
% Case \setcvskillcolumns[], \setcvskillcolumns[][] or \setcvskillcolumns[][<somefactor>]
@@ -445,13 +455,13 @@
% \cvskill@descriptorwidth accordingly
\setlength{\cvskill@experiencewidth}{\arg@new@experienceWidth}%
\setlength{\cvskill@descriptorwidth}{\skillmatrix@columnwidth-\cvskill@width-\cvskill@experiencewidth}%
- }%
+ }%
\setlength{\cvskill@descriptorwidth}{\skillmatrix@columnwidth-\cvskill@width-\cvskill@experiencewidth}%
\setlength{\skillmatrix@commentwidth}{\skillmatrix@bodylength-\skillmatrix@columnwidth-3\skillmatrix@padding}%
}%
% Case \setcvskillcolumns[] nothing needs to be done here recalculate lengths affected by the change
- }{%
- % Case \setcvskillcolumns, \setcvskillcolumns[<width>], \setcvskillcolumns[<width>][]
+ }{%
+ % Case \setcvskillcolumns, \setcvskillcolumns[<width>], \setcvskillcolumns[<width>][]
% or \setcvskillcolumns[<width>][<somefactor>]
\setlength{\skillmatrix@hintscolumnwidth}{\arg@new@hintscolumnwidth}%
\setlength{\skillmatrix@bodylength}{\maincolumnwidth-\skillmatrix@hintscolumnwidth-\separatorcolumnwidth}%
@@ -483,41 +493,41 @@
\setlength{\skillmatrix@commentwidth}{\skillmatrix@bodylength-\skillmatrix@columnwidth-3\skillmatrix@padding}%
}%
}%
-%
+%
% \setcvskilllegendcolumns[<width>][<factor>]
\DeclareDocumentCommand{\setcvskilllegendcolumns}{+O{\skilllegend@hintscolumnwidth} +O{\skilllegend@leftdesriptorfactor}}{%
% adjust column width of legend
-%
-% The \cvskilllegend command comes with default FIXED width definitions for the columns of the legend matrix
-% such that the default english and german examples look good.
-% However, depending on the user input (translation) and the style that is used some adjustment might be needed.
-% The \setcvskilllegendcolumns command provides means to influence all columns except the ones containing
+%
+% The \cvskilllegend command comes with default FIXED width definitions for the columns of the legend matrix
+% such that the default english and german examples look good.
+% However, depending on the user input (translation) and the style that is used some adjustment might be needed.
+% The \setcvskilllegendcolumns command provides means to influence all columns except the ones containing
% \cvskill commands. The second column containg the output of \cvskill remains fixed width. The last column,
% the comment column gets recalculated according to the setting of the other columns.
-%
+%
% Input
-% Input_1 (optional): length smaller than \textwidth influencing the width of the first column
-% where depending on the style the legend_string gets printed. In case the
-% string is left empty adjusting this width allows moving the legend horizontally.
+% Input_1 (optional): length smaller than \textwidth influencing the width of the first column
+% where depending on the style the legend_string gets printed. In case the
+% string is left empty adjusting this width allows moving the legend horizontally.
% Default <\skilllegend@hintscolumnwidth>
-% Input_2 (optional): float between 0 and 1 influencing the width of the left legend descritor column,
-% aka \cvskilllegend@leftdescriptorwidth. The desriptor column on the right,
+% Input_2 (optional): float between 0 and 1 influencing the width of the left legend descritor column,
+% aka \cvskilllegend@leftdescriptorwidth. The desriptor column on the right,
% \cvskilllegend@rightdescriptorwidth is influenced by the factor 1-<factor>.
% Default <\skilllegend@leftdesriptorfactor>
-%
+%
% Example usage
% \setcvskilllegendcolumns[][0.45]%% adjust left desriptor column.
% \setcvskilllegendcolumns[\widthof{``Legend''}][0.45]% adjust both left descriptor column and string column
-%
+%
% Note
-% - Due to implementation of \cvskilllegend for style 'fancy' (moderncvbodyv)
+% - Due to implementation of \cvskilllegend for style 'fancy' (moderncvbodyv)
% the first optional variable has no effect in this case.
% - For the styles 'classic' and 'casual' the first column is set to hintscolumnwidth such that
-% it aligns with the rest of the entries. A readjustment of the first column should therefor
-% be avoided. It is recomended to only use \cvskilllegend in the form of
+% it aligns with the rest of the entries. A readjustment of the first column should therefor
+% be avoided. It is recomended to only use \cvskilllegend in the form of
% \cvskilllegend[][<factor>], thereby leaving the defaults in place for the first column.
% - For style 'banking' the first column is set to align with the rest of the \cvskillentry entries
-% Therefor adjusting the first column can be used to widen the table while moving it around. If no
+% Therefor adjusting the first column can be used to widen the table while moving it around. If no
% legend string is used, setting \cvskilllegend[0em] maximises the real enstate for the legend.
%
\def\arg@new@legend@hintscolumnwidth{#1}%
@@ -532,8 +542,8 @@
\RenewDocumentCommand{\skilllegend@leftdesriptorfactor}{}{\arg@new@legend@leftDescriptorFactor}%
}%
% % Case \setcvskilllegendcolumns[] nothing needs to be done here i.e. leave default values unaltered
- }{%
- % Case \setcvskilllegendcolumns, \setcvskilllegendcolumns[<width>], \setcvskilllegendcolumns[<width>][]
+ }{%
+ % Case \setcvskilllegendcolumns, \setcvskilllegendcolumns[<width>], \setcvskilllegendcolumns[<width>][]
% or \setcvskilllegendcolumns[<width>][<somefactor>]
\setlength{\skilllegend@hintscolumnwidth}{\arg@new@legend@hintscolumnwidth}%
\if@moderncvbodyi%
@@ -554,18 +564,18 @@
}%
}%
}%
-%
+%
% %-------------------------------------------------------------------------------
-% % \cvskilllegend
+% % \cvskilllegend
% %-------------------------------------------------------------------------------
% default legend style
% \cvskilllegend[*][<post_padding>][<first_level>][<second_level>][<third_level>][<fourth_level>][<fifth_level>]{<name>}
\NewDocumentCommand\skillLegend@FontSize{}{\scriptsize}
\DeclareDocumentCommand\cvskilllegend{s +O{} +O{} +O{} +O{} +O{} +O{} +m}{}%
% Print legend table explaining the meaning of \cvskill{1}...\cvskill{5}.
-%
+%
% Input:
-% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
+% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
% For the fancy style, the asterix has no meaning.
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2 (optional): string describing meaning of \cvskill{1}, default: <basic knowledge>
@@ -574,15 +584,15 @@
% input_5 (optional): string describing meaning of \cvskill{4}, default: <deepened expert knowledge>
% input_6 (optional): string describing meaning of \cvskill{5}, default: <expert/guru>
% input_7: string giving a name to the legend, default: <>
-%
+%
% Example usages:
% \cvskilllegend{} print default legend
% \cvskilllegend[0.5em]{Legend} print default legend, but adjust post padding and display the word ``Legend''.
% \cvskilllegend*[0.2em][Grundkenntnisse][Grundkenntnisse und eigene Erfahrung in Projekten][Umfangreiche Erfahrung in Projekten][Vertiefte Expertenkenntnisse][Experte/Guru]{Legende} Fully adjust legend to German example and including dashed lines
-%
+%
% Note:
% -The width of the columns can be adjusted by the \setcvskilllegendcolumns, see \setcvskilllegendcolumns
-% -The design of the table is such that the <second_level> entry stands in the first column but
+% -The design of the table is such that the <second_level> entry stands in the first column but
% occupies rows two and three. This has been done to accomodate english and german defaults.
% An alternative is provided by \cvskillplainlegend
@@ -596,7 +606,7 @@
\RenewDocumentCommand\cvskilllegend{s +O{.25em} +O{\skillLegend@defaultLevelOne} +O{\skillLegend@defaultLevelTwo} +O{\skillLegend@defaultLevelThree} +O{\skillLegend@defaultLevelFour} +O{\skillLegend@defaultLevelFive} +m}{%
\IfBooleanTF#1{% if a star is given, add dashed line
\begingroup%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
% calculate descriptor widths
\setlength{\cvskilllegend@leftdescriptorwidth}{\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-3\skilllegend@padding}%
\setlength{\cvskilllegend@rightdescriptorwidth}{\skilllegend@bodylength-\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-3\skilllegend@padding}%
@@ -610,7 +620,7 @@
\raggedleft\hintstyle{#8} & \cvskill{1}& & {\skillLegend@FontSize #3} & \cvskill{3}& &{\skillLegend@FontSize #5 } \\%
%
& \cvskill{2} & & \multirow{2}{\cvskilllegend@leftdescriptorwidth}{{\skillLegend@FontSize #4}} & \cvskill{4}& & {\skillLegend@FontSize #6 } \\%
- %
+ %
& & & & \cvskill{5}& & {\skillLegend@FontSize #7 }%
\end{tabular}%
\endgroup
@@ -629,7 +639,7 @@
\raggedleft\hintstyle{#8} & \cvskill{1}\, & \,{\skillLegend@FontSize #3} & \cvskill{3}\, &\,{\skillLegend@FontSize #5 } \\%
%
& \cvskill{2}\, & \,\multirow{2}{\cvskilllegend@leftdescriptorwidth}{{\skillLegend@FontSize #4}} & \cvskill{4}\, &\,{\skillLegend@FontSize #6 } \\%
- %
+ %
& & & \cvskill{5}\, &\,{\skillLegend@FontSize #7 }%
\end{tabular}%
\endgroup%
@@ -646,11 +656,11 @@
}%
\IfBooleanTF#1{% if a star is given, add dashed line
\begingroup%
- % recalculate desrciptor widths on the fly. Allows for different padding
+ % recalculate desrciptor widths on the fly. Allows for different padding
% in the stared and nonstared case
\setlength{\cvskilllegend@leftdescriptorwidth}{\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-4\skilllegend@padding}%
\setlength{\cvskilllegend@rightdescriptorwidth}{\skilllegend@bodylength-\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-4\skilllegend@padding}%
- \arrayrulecolor{color1}
+ \arrayrulecolor{bodyrulecolor}
\begin{tabular}{@{}p{\skilllegend@hintscolumnwidth}
@{\hspace{\separatorcolumnwidth}}p{\cvskill@width}@{\hspace{\skilllegend@padding}};{.6pt/1pt}%
p{2\skilllegend@padding}%
@@ -660,13 +670,13 @@
\raggedleft\hintstyle{} & \cvskill{1} & & {\skillLegend@FontSize #3} & \cvskill{3} & & {\skillLegend@FontSize #5 } \\
%
& \cvskill{2} & & \multirow{2}{\cvskilllegend@leftdescriptorwidth}{{\skillLegend@FontSize #4}} & \cvskill{4} & &{\skillLegend@FontSize #6 } \\
- %
- & & & & \cvskill{5}& & {\skillLegend@FontSize #7 }
+ %
+ & & & & \cvskill{5}& & {\skillLegend@FontSize #7 }
\end{tabular}%
\endgroup%
\par\addvspace{#2}}{
\begingroup%
- % oddly enough, we should only need to subtract 2 paddings in the descritorwidths.
+ % oddly enough, we should only need to subtract 2 paddings in the descritorwidths.
% but while testing I got overflow of text into the margin
\setlength{\cvskilllegend@leftdescriptorwidth}{\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-4\skilllegend@padding}%
\setlength{\cvskilllegend@rightdescriptorwidth}{\skilllegend@bodylength-\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-5\skilllegend@padding}%
@@ -678,8 +688,8 @@
\raggedleft\hintstyle{} & \cvskill{1} & {\skillLegend@FontSize #3} & \cvskill{3} & {\skillLegend@FontSize #5 } \\
%
& \cvskill{2} & \multirow{2}{\cvskilllegend@leftdescriptorwidth}{{\skillLegend@FontSize #4}} & \cvskill{4} &{\skillLegend@FontSize #6 } \\
- %
- & & & \cvskill{5} & {\skillLegend@FontSize #7 }
+ %
+ & & & \cvskill{5} & {\skillLegend@FontSize #7 }
\end{tabular}%
\endgroup%
\par\addvspace{#2}
@@ -697,7 +707,7 @@
}{%
\cvitem[-0.5em]{#8}{}%
}%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
\setlength\arrayrulewidth{\separatorrulewidth}%
\RenewDocumentCommand{\@starIndependentTabular}{}{%
\begingroup%
@@ -713,32 +723,32 @@
\@moderncvstrut{4pt}{16pt} & \cvskill{1}& {\skillLegend@FontSize #3} & \cvskill{3}& {\skillLegend@FontSize #5 }\\%
%
& \cvskill{2}& \multirow{2}{\cvskilllegend@leftdescriptorwidth}{{\skillLegend@FontSize #4}} & \cvskill{4}& {\skillLegend@FontSize #6 }\\%
- %
+ %
& & & \cvskill{5} & {\skillLegend@FontSize #7 }\\[#2]% the spacing needs to be inside the cell for the vertical rule to extend correctly
\end{tabular}%
\endgroup%
- \par\@aftersectionfalse\ignorespaces%
+ \par\@aftersectionfalse\ignorespaces%
}%
- % because of this weird style and the position of the parameter [#2], the dashed lines of the other version look bad. So no lines.
+ % because of this weird style and the position of the parameter [#2], the dashed lines of the other version look bad. So no lines.
\IfBooleanTF#1{%
\@starIndependentTabular%
- }{%
+ }{%
\@starIndependentTabular%
}%
}%
\fi
% %-------------------------------------------------------------------------------
-% % \cvskillplainlegend
+% % \cvskillplainlegend
% %-------------------------------------------------------------------------------
% alternative legend style
% \cvskillplainlegend[*][<post_padding>][<first_level>][<second_level>][<third_level>][<fourth_level>][<fifth_level>]{<name>}
\DeclareDocumentCommand\cvskillplainlegend{s +O{} +O{} +O{} +O{} +O{} +O{} +m}{}%
% Print alternative legend table explaining the meaning of \cvskill{1}...\cvskill{5}.
% In this legend, the first three skill levels are in one column
-%
+%
% Input:
-% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
+% asterix (optional): include vertical (dashed) lines. This behaviour depends on the body style.
% For the fancy style, the asterix has no meaning.
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2 (optional): string describing meaning of \cvskill{1}, default: <basic knowledge>
@@ -747,12 +757,12 @@
% input_5 (optional): string describing meaning of \cvskill{4}, default: <deepened expert knowledge>
% input_6 (optional): string describing meaning of \cvskill{5}, default: <expert/guru>
% input_7: string giving a name to the legend, default: <>
-%
+%
% Example usages:
% \cvskillplainlegend{} print default legend
% \cvskillplainlegend[0.5em]{Legend} print default legend, but adjust post padding and display the word ``Legend''.
% \cvskillplainlegend*[0.2em][Grundkenntnisse][Grundkenntnisse und eigene Erfahrung in Projekten][Umfangreiche Erfahrung in Projekten][Vertiefte Expertenkenntnisse][Experte/Guru]{Legende} Fully adjust legend to German example and including dashed lines
-%
+%
% Note:
% -The width of the columns can be adjusted by the \setcvskilllegendcolumns, see \setcvskilllegendcolumns
@@ -766,7 +776,7 @@
\RenewDocumentCommand\cvskillplainlegend{s +O{.25em} +O{\skillPlainLegend@defaultLevelOne} +O{\skillPlainLegend@defaultLevelTwo} +O{\skillPlainLegend@defaultLevelThree} +O{\skillPlainLegend@defaultLevelFour} +O{\skillPlainLegend@defaultLevelFive} +m}{%
\IfBooleanTF#1{% if a star is given, add dashed line
\begingroup%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
% calculate descriptor widths
\setlength{\cvskilllegend@leftdescriptorwidth}{\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-3\skilllegend@padding}%
\setlength{\cvskilllegend@rightdescriptorwidth}{\skilllegend@bodylength-\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-3\skilllegend@padding}%
@@ -780,7 +790,7 @@
\raggedleft\hintstyle{#8} & \cvskill{1}& & {\skillLegend@FontSize #3} & \cvskill{4}& &{\skillLegend@FontSize #6} \\%
%
& \cvskill{2} & & {\skillLegend@FontSize #4} & \cvskill{5}& & {\skillLegend@FontSize #7} \\%
- %
+ %
& \cvskill{3} & & {\skillLegend@FontSize #5} & & & %
\end{tabular}%
\endgroup%
@@ -799,7 +809,7 @@
\raggedleft\hintstyle{#8} & \cvskill{1} & {\skillLegend@FontSize #3} & \cvskill{4} &{\skillLegend@FontSize #6} \\%
%
& \cvskill{2} & {\skillLegend@FontSize #4} & \cvskill{5} &{\skillLegend@FontSize #7} \\%
- %
+ %
& \cvskill{3} & {\skillLegend@FontSize #5 } & & %
\end{tabular}%
\endgroup%
@@ -816,7 +826,7 @@
}%
\IfBooleanTF#1{% if a star is given, add dashed line
\begingroup%
- \arrayrulecolor{color1}
+ \arrayrulecolor{bodyrulecolor}
\setlength{\cvskilllegend@leftdescriptorwidth}{\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-6\skilllegend@padding}%
\setlength{\cvskilllegend@rightdescriptorwidth}{\skilllegend@bodylength-\skilllegend@leftdesriptorfactor\skilllegend@bodylength-\cvskill@width-\skillmatrix@padding-6\skilllegend@padding}%
\begin{tabular}{@{}p{\skilllegend@hintscolumnwidth}
@@ -828,8 +838,8 @@
\raggedleft\hintstyle{} & \cvskill{1} & & {\skillLegend@FontSize#3} & \cvskill{4} & & {\skillLegend@FontSize#6}\\%
%
& \cvskill{2} & &{\skillLegend@FontSize#4} & \cvskill{5} & &{\skillLegend@FontSize#7}\\%
- %
- & \cvskill{3} & &{\skillLegend@FontSize#5} & & &%
+ %
+ & \cvskill{3} & &{\skillLegend@FontSize#5} & & &%
\end{tabular}%
\endgroup%
\par\addvspace{#2}}{
@@ -845,7 +855,7 @@
\raggedleft\hintstyle{} & \cvskill{1} & {\skillLegend@FontSize #3} & \cvskill{4} & {\skillLegend@FontSize #6} \\
%
& \cvskill{2} & {\skillLegend@FontSize #4} & \cvskill{5} & {\skillLegend@FontSize #7} \\
- %
+ %
& \cvskill{3} & {\skillLegend@FontSize #5} & & %
\end{tabular}%
\endgroup
@@ -863,7 +873,7 @@
}{%
\cvitem[-0.5em]{#8}{}%
}%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
\setlength\arrayrulewidth{\separatorrulewidth}%
\RenewDocumentCommand{\@starIndependentTabular}{}{%
\begingroup%
@@ -879,16 +889,16 @@
\@moderncvstrut{4pt}{16pt} & \cvskill{1} & {\skillLegend@FontSize #3} & \cvskill{4} & {\skillLegend@FontSize #6}\\%
%
& \cvskill{2} & {\skillLegend@FontSize #4} & \cvskill{5} & {\skillLegend@FontSize #7}\\%
- %
+ %
& \cvskill{3} & {\skillLegend@FontSize #5} & & \\[#2]% the spacing needs to be inside the cell for the vertical rule to extend correctly
\end{tabular}%
\endgroup%
- \par\@aftersectionfalse\ignorespaces%
+ \par\@aftersectionfalse\ignorespaces%
}%
- % because of this weird style and the position of the parameter [#2], the dashed lines of the other version look bad. So no lines.
+ % because of this weird style and the position of the parameter [#2], the dashed lines of the other version look bad. So no lines.
\IfBooleanTF#1{%
\@starIndependentTabular%
- }{%
+ }{%
\@starIndependentTabular%
}%
}%
@@ -900,20 +910,20 @@
\NewDocumentCommand\cvSkillMatrix@HeadFont{}{\normalfont}
\DeclareDocumentCommand\cvskillhead{+O{} +O{} +O{} +O{} +O{}}{}%
% add skill matrix line acting as header explaining the meaning of columns.
-%
+%
% Input:
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2 (optional): string naming the level column (2nd column), default: <Level>
% input_3 (optional): string naming the skill column (3nd column), default: <Skill>
% input_4 (optional): string naming the experience-in-years column (4th column), default: <Years>
% input_5 (optional): string naming the comment column (5th column), default: <Comment>
-%
+%
% Example usages:
% \cvskillhead print default head.
% \cvskillhead[0.5em] print default head, but adjust post padding.
% \cvskillhead[0.25em][Level][F\"ahigkeit][Jahre][Bemerkung] Fully adjust head to German example
-%
-% Note:
+%
+% Note:
% - The width of the columns can be adjusted by the \setcvskillcolumns command, see \setcvskillcolumns.
\NewDocumentCommand\skillMatrix@HeaderDefaultOne{}{Level}
@@ -924,13 +934,13 @@
\RenewDocumentCommand\cvskillhead{O{.25em} +O{\skillMatrix@HeaderDefaultOne} +O{\skillMatrix@HeaderDefaultTwo} +O{\skillMatrix@HeaderDefaultThree} +O{\skillMatrix@HeaderDefaultFour}}{%
\begingroup
\renewcommand{\arraystretch}{1.25}
- \arrayrulecolor{color1}
+ \arrayrulecolor{bodyrulecolor}
\begin{tabular}{@{}p{\skillmatrix@hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}%
p{\cvskill@width}@{\hspace{\skillmatrix@padding}}%
p{\cvskill@descriptorwidth}@{\hspace{\skillmatrix@padding}}%
p{\cvskill@experiencewidth}@{\hspace{\skillmatrix@padding}}
p{\skillmatrix@commentwidth}@{}}%
- & \centering{\cvSkillMatrix@HeadFont #2} & \centering{\cvSkillMatrix@HeadFont #3} & \centering{\cvSkillMatrix@HeadFont #4} & {\cvSkillMatrix@HeadFont #5}
+ & \centering{\cvSkillMatrix@HeadFont #2} & \centering{\cvSkillMatrix@HeadFont #3} & \centering{\cvSkillMatrix@HeadFont #4} & {\cvSkillMatrix@HeadFont #5}
\end{tabular}%
\endgroup
\par\addvspace{#1}
@@ -938,7 +948,7 @@
% Definition of \cvskillhead valid moderncvbodyv
\if@moderncvbodyv%
\RenewDocumentCommand\cvskillhead{O{.25em} +O{\skillMatrix@HeaderDefaultOne} +O{\skillMatrix@HeaderDefaultTwo} +O{\skillMatrix@HeaderDefaultThree} +O{\skillMatrix@HeaderDefaultFour}}{%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
\setlength\arrayrulewidth{\separatorrulewidth}%
\vspace*{-\separatorrulewidth}% HACK; I don't understand where the space is coming from, nor what it's exact value is :(
\begingroup%
@@ -954,19 +964,19 @@
& & \centering{\cvSkillMatrix@HeadFont#2} & \centering{\cvSkillMatrix@HeadFont#3} & \centering{\cvSkillMatrix@HeadFont#4} & {\cvSkillMatrix@HeadFont#5} \\[#1]% the spacing needs to be inside the cell for the vertical rule to extend correctly
\end{tabular}%
\endgroup%
- \par\@aftersectionfalse\ignorespaces%
+ \par\@aftersectionfalse\ignorespaces%
}%
\fi
% %-------------------------------------------------------------------------------
-% % \cvskillentry
+% % \cvskillentry
% %-------------------------------------------------------------------------------
% \cvskillentry[*][<post_padding>]{<skill_cathegory>}{<0-5>}{<skill_name>}{<years_of_experience>}{<comment>}%
\DeclareDocumentCommand\cvskillentry{s +O{} +m +m +m +m +m}{}%
% add cvskill matrix row.
-%
+%
% Input:
-% asterix (optional): include horizontal (dashed) line above the entered line. This behaviour depends on the body style.
+% asterix (optional): include horizontal (dashed) line above the entered line. This behaviour depends on the body style.
% For the fancy style, the asterix has no meaning.
% input_1 (optional): padding length appended to the legend, default: <0.25em>
% input_2: string, naming skill cathegory, default: <>
@@ -974,14 +984,14 @@
% input_4: string, naming the skill, default: <>
% input_5: positive real number, stating the number of years of experience with this skill , default: <>
% input_6: string, explaining details w.r.t. that particual skill default: <>
-%
+%
% Example usages:
% \cvskillentry*{Language:}{3}{Python}{2}{I have done a million projects with Python}
% \cvskillentry{}{2}{Lilypond}{14}{So much sheet music! Man I'm the best!}
% \cvskillentry{}{3}{\LaTeX}{14}{Clearly I rock at \LaTeX}
% \cvskillentry*[1.5em]{OS:}{3}{Linux}{2}{I only use Archlinux}
-%
-% Note:
+%
+% Note:
% - The width of the columns can be adjusted by the \setcvskillcolumns command, see \setcvskillcolumns.
% Definition of \cvskillentry valid for moderncvbodyi, moderncvbodyii, moderncvbodyiii, moderncvbodyiv
@@ -990,7 +1000,7 @@
\IfBooleanTF{#1}{% If a star is seen a dotted line is drawn above the entry
\begingroup
\renewcommand{\arraystretch}{1.25}
- \arrayrulecolor{color1}
+ \arrayrulecolor{bodyrulecolor}
\begin{tabular}{@{}p{\skillmatrix@hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}%
p{\cvskill@width}@{\hspace{\skillmatrix@padding}}%
p{\cvskill@descriptorwidth}@{\hspace{\skillmatrix@padding}}%
@@ -1018,7 +1028,7 @@
\if@moderncvbodyv%
\DeclareDocumentCommand\@starIndependentMatrixEntry{}{}%
\RenewDocumentCommand\cvskillentry{s O{.25em} +m +m +m +m +m}{%
- \arrayrulecolor{color1}%
+ \arrayrulecolor{bodyrulecolor}%
\setlength\arrayrulewidth{\separatorrulewidth}%
\vspace*{-\separatorrulewidth}% HACK; I don't understand where the space is coming from, nor what it's exact value is :(
%test for the star * in the command
@@ -1038,13 +1048,13 @@
}%
\IfBooleanTF{#1}{% the star does not do anything here
\@starIndependentMatrixEntry%
- }{%
+ }{%
\@starIndependentMatrixEntry%
}%
\par\@aftersectionfalse\ignorespaces%
}%
\fi
-%
+%
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
index afc20e5399b..6398480ef98 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstylebanking.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylebanking}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: banking]
+\ProvidesPackage{moderncvstylebanking}[2024-07-18 v2.4.1 modern curriculum vitae and letter style scheme: banking]
% body rules type options: "fullrules", "shortrules", "mixedrules" (default) or "norules"
\@initializecommand{\moderncvstylebodyoptions}{}
@@ -24,6 +24,12 @@
\DeclareOption{center} {\edef\moderncvstylebodyoptions{\moderncvstylebodyoptions,center}}
\DeclareOption{right} {\edef\moderncvstylebodyoptions{\moderncvstylebodyoptions,right}}
+% head options
+\@initializecommand{\moderncvstyleheadoptions}{}
+\@initializeif{\if@datainhead}\@datainheadtrue
+\DeclareOption{details}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,details}}
+\DeclareOption{nodetails}{\@datainheadfalse\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,nodetails}}
+
% toggle use of symbol fonts.
\@initializeif{\if@symbols}\@symbolsfalse
\DeclareOption{symbols} {\@symbolstrue}
@@ -55,19 +61,45 @@
% symbols
\if@symbols
- \moderncvicons{symbols} % use symbols
+ \moderncvicons{symbols} % use symbols
\else
\moderncvicons{letters} % do not use symbols, use letters
\fi
-
+%-------------------------------------------------------------------------------
+% Colors
+%-------------------------------------------------------------------------------
+% head and footer
+\colorlet{lastnamecolor}{color1}
+\colorlet{namecolor}{lastnamecolor}
+\colorlet{headrulecolor}{lastnamecolor!50}
+\colorlet{firstnamecolor}{lastnamecolor!60}
+\colorlet{titlecolor}{color2!85}
+\colorlet{addresscolor}{color2}
+\colorlet{quotecolor}{color1}
+\colorlet{pictureframecolor}{color1}
+% body
+\colorlet{bodyrulecolor}{color1}
+\colorlet{sectioncolor}{color1}
+\colorlet{subsectioncolor}{color1}
+\colorlet{hintstylecolor}{color0}
+% letter
+\colorlet{letterclosingcolor}{color2}
+% skillmatrix
+\colorlet{skillmatrixfullcolor}{color1}
+\colorlet{skillmatrixemptycolor}{color2!30}
%-------------------------------------------------------------------------------
% header, body & footer
%-------------------------------------------------------------------------------
-\moderncvhead{3}
+\moderncvhead[\moderncvstyleheadoptions]{3}
\moderncvbody[\moderncvstylebodyoptions]{3}
+\if@datainhead
+% if data is shown in head, do not include the footer
+\else
+ \moderncvfoot{1}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
index eba5df696e8..1192c8911c5 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstylecasual.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,12 +10,18 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylecasual}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: casual]
+\ProvidesPackage{moderncvstylecasual}[2024-07-18 v2.4.1 modern curriculum vitae and letter style scheme: casual]
% head section alignment options: "left" (default) or "right"
\@initializecommand{\moderncvstyleheadoptions}{}
\DeclareOption{left} {\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,left}}
\DeclareOption{right}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,right}}
+% head options alternate, details and no details
+\DeclareOption{alternate}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,alternate}}
+\@initializeif{\if@datainhead}\@datainheadfalse
+\DeclareOption{details}{\@datainheadtrue\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,details}}
+\DeclareOption{nodetails}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,nodetails}}
+
% toggle use of symbol fonts.
\@initializeif{\if@symbols}\@symbolsfalse
@@ -23,7 +29,7 @@
\DeclareOption{nosymbols} {\@symbolsfalse}
\DeclareOption*{}% avoid choking on unknown options
-\ExecuteOptions{right,symbols}
+\ExecuteOptions{right,symbols,nodetails}
\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
%-------------------------------------------------------------------------------
@@ -42,18 +48,46 @@
% symbols
\if@symbols
- \moderncvicons{symbols} % use symbols
+ \moderncvicons{symbols} % use symbols
\else
\moderncvicons{letters} % do not use symbols, use letters
\fi
+%-------------------------------------------------------------------------------
+% Colors
+%-------------------------------------------------------------------------------
+% head and footer
+\colorlet{lastnamecolor}{color2}
+\colorlet{namecolor}{lastnamecolor}
+\colorlet{headrulecolor}{lastnamecolor!50}
+\colorlet{firstnamecolor}{lastnamecolor!50}
+\colorlet{titlecolor}{color2}
+\colorlet{addresscolor}{color2}
+\colorlet{quotecolor}{color1}
+\colorlet{pictureframecolor}{color1}
+% body
+\colorlet{bodyrulecolor}{color1}
+\colorlet{sectioncolor}{color1}
+\colorlet{subsectioncolor}{color1}
+\colorlet{hintstylecolor}{color0}
+% letter
+\colorlet{letterclosingcolor}{color2}
+% skillmatrix
+\colorlet{skillmatrixfullcolor}{color1}
+\colorlet{skillmatrixemptycolor}{color2!30}
%-------------------------------------------------------------------------------
% header, body & footer
%-------------------------------------------------------------------------------
\moderncvhead[\moderncvstyleheadoptions]{2}
\moderncvbody{1}
-\moderncvfoot{1}
+% include foot only if nodetails option is active since otherwise we have two times the information
+% on the page
+\if@datainhead
+% if data is shown in head, do not include the footer
+\else
+ \moderncvfoot{1}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
index 3018cc67a79..07950bcfa58 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstyleclassic.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,12 +10,17 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleclassic}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: classic]
+\ProvidesPackage{moderncvstyleclassic}[2024-07-18 v2.4.1 modern curriculum vitae and letter style scheme: classic]
% head section alignment options: "left" (default) or "right"
\@initializecommand{\moderncvstyleheadoptions}{}
\DeclareOption{left} {\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,left}}
\DeclareOption{right}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,right}}
+\DeclareOption{top}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,top}}
+
+\@initializeif{\if@datainhead}\@datainheadtrue
+\DeclareOption{details}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,details}}
+\DeclareOption{nodetails}{\@datainheadfalse\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,nodetails}}
% toggle use of symbol fonts.
\@initializeif{\if@symbols}\@symbolsfalse
@@ -23,7 +28,7 @@
\DeclareOption{nosymbols} {\@symbolsfalse}
\DeclareOption*{}% avoid choking on unknown options
-\ExecuteOptions{left,symbols}
+\ExecuteOptions{left,symbols,details}
\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
%-------------------------------------------------------------------------------
@@ -42,17 +47,46 @@
% symbols
\if@symbols
- \moderncvicons{symbols} % use symbols
+ \moderncvicons{symbols} % use symbols
\else
\moderncvicons{letters} % do not use symbols, use letters
\fi
+%-------------------------------------------------------------------------------
+% Colors
+%-------------------------------------------------------------------------------
+% head and footer
+\colorlet{lastnamecolor}{color2}
+\colorlet{namecolor}{lastnamecolor}
+\colorlet{headrulecolor}{lastnamecolor!50}
+\colorlet{firstnamecolor}{lastnamecolor!50}
+\colorlet{titlecolor}{color2}
+\colorlet{addresscolor}{color2}
+\colorlet{quotecolor}{color1}
+\colorlet{pictureframecolor}{color1}
+% body
+\colorlet{bodyrulecolor}{color1}
+\colorlet{sectioncolor}{color1}
+\colorlet{subsectioncolor}{color1}
+\colorlet{hintstylecolor}{color0}
+% letter
+\colorlet{letterclosingcolor}{color2}
+% skillmatrix
+\colorlet{skillmatrixfullcolor}{color1}
+\colorlet{skillmatrixemptycolor}{color2!30}
%-------------------------------------------------------------------------------
% header, body & footer
%-------------------------------------------------------------------------------
\moderncvhead[\moderncvstyleheadoptions]{1}
\moderncvbody{1}
+% include foot only if nodetails option is active since otherwise we have two times the information
+% on the page
+\if@datainhead
+% if data is shown in head, do not include the footer
+\else
+ \moderncvfoot{1}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecontemporary.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecontemporary.sty
new file mode 100644
index 00000000000..32f02ceb37f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecontemporary.sty
@@ -0,0 +1,63 @@
+%% start of file `moderncvstylecontemporary.sty'.
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com).
+%% Copyright 2023 Javier Lopez-Gomez (javier.lopez.gomez@proton.me).
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License version 1.3c,
+% available at http://www.latex-project.org/lppl/.
+
+
+%-------------------------------------------------------------------------------
+% identification
+%-------------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{moderncvstylecontemporary}[2023/11/24 v2.0.0 modern curriculum vitae and letter style scheme: contemporary]
+
+% head section alignment options: "left" (default) or "right"
+\@initializecommand{\moderncvstyleheadoptions}{}
+\DeclareOption{left} {\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,left}}
+\DeclareOption{right}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,right}}
+\DeclareOption{qr} {\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,qr}}
+\DeclareOption{noqr}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,noqr}}
+
+\DeclareOption*{}% avoid choking on unknown options
+\ExecuteOptions{left,qr}
+\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
+
+%-------------------------------------------------------------------------------
+% fonts & icons
+%-------------------------------------------------------------------------------
+% Latin Modern fonts
+%\ifxetexorluatex
+% \setmainfont{Latin Modern Roman}
+% \setsansfont{Latin Modern Sans}
+% \setmathfont{Latin Modern Math}
+%\else
+ \IfFileExists{lmodern.sty}%
+ {\RequirePackage{lmodern}}%
+ {}
+%\fi
+
+% symbols
+\providecolor{default-socialicon-color}{named}{headtext}
+\moderncvicons{symbols}
+
+%-------------------------------------------------------------------------------
+% Colors
+%-------------------------------------------------------------------------------
+% skillmatrix
+\colorlet{bodyrulecolor}{color1}
+\colorlet{skillmatrixfullcolor}{color1}
+\colorlet{skillmatrixemptycolor}{color2!30}
+
+%-------------------------------------------------------------------------------
+% header, body & footer
+%-------------------------------------------------------------------------------
+\moderncvhead[\moderncvstyleheadoptions]{7}
+\moderncvbody{6}
+
+
+\endinput
+
+
+%% end of file `moderncvstylecontemporary.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
index a86560524c0..8dcce13aa5a 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstyleempty.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleempty}[2022-02-21 v2.3.1 modern curriculum vitae scheme: empty]
+\ProvidesPackage{moderncvstyleempty}[2024-07-18 v2.4.1 modern curriculum vitae scheme: empty]
%-------------------------------------------------------------------------------
% required packages
@@ -33,11 +33,34 @@
%-------------------------------------------------------------------------------
%-------------------------------------------------------------------------------
+% Colors
+%-------------------------------------------------------------------------------
+% head and footer
+\colorlet{lastnamecolor}{color2}
+% \colorlet{namecolor}{lastnamecolor}
+\colorlet{headrulecolor}{lastnamecolor!50}
+\colorlet{firstnamecolor}{lastnamecolor!50}
+\colorlet{titlecolor}{color2}
+\colorlet{addresscolor}{color2}
+\colorlet{quotecolor}{color1}
+\colorlet{pictureframecolor}{color1}
+% body
+\colorlet{bodyrulecolor}{color1}
+\colorlet{sectioncolor}{color1}
+\colorlet{subsectioncolor}{color1}
+\colorlet{hintstylecolor}{color0}
+% letter
+\colorlet{letterclosingcolor}{color2}
+% skillmatrix
+\colorlet{skillmatrixfullcolor}{color1}
+\colorlet{skillmatrixemptycolor}{color2!30}
+
+%-------------------------------------------------------------------------------
% fonts & icons
%-------------------------------------------------------------------------------
% symbols
\if@symbols
- \moderncvicons{symbols} % use symbols
+ \moderncvicons{symbols} % use symbols
\else
\moderncvicons{letters} % do not use symbols, use letters
\fi
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty
index 56de636100a..1ad8d8732f1 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstylefancy.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylefancy}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: fancy]
+\ProvidesPackage{moderncvstylefancy}[2024-07-18 v2.4.1 modern curriculum vitae and letter style scheme: fancy]
+
+% headoptions
+\@initializecommand{\moderncvstyleheadoptions}{}
+\@initializeif{\if@datainhead}\@datainheadtrue
+\DeclareOption{details}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,details}}
+\DeclareOption{nodetails}{\@datainheadfalse\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,nodetails}}
% toggle use of symbol fonts.
\@initializeif{\if@symbols}\@symbolsfalse
@@ -18,10 +24,34 @@
\DeclareOption{nosymbols} {\@symbolsfalse}
\DeclareOption*{}% avoid choking on unknown options
-\ExecuteOptions{symbols}
+\ExecuteOptions{symbols,details}
\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
%-------------------------------------------------------------------------------
+% Colors
+%-------------------------------------------------------------------------------
+% head and footer
+\colorlet{lastnamecolor}{color1}
+\colorlet{namecolor}{lastnamecolor}
+\colorlet{headrulecolor}{color1}
+\colorlet{firstnamecolor}{lastnamecolor!50}
+\colorlet{titlecolor}{color2}
+\colorlet{addresscolor}{color2}
+\colorlet{quotecolor}{color1}
+\colorlet{pictureframecolor}{color1}
+% body
+\colorlet{bodyrulecolor}{color1}
+\colorlet{sectioncolor}{color1}
+\colorlet{subsectioncolor}{color1}
+\colorlet{hintstylecolor}{color0}
+% letter
+\colorlet{letterclosingcolor}{color2}
+% skillmatrix
+\colorlet{skillmatrixfullcolor}{color1}
+\colorlet{skillmatrixemptycolor}{color2!30}
+
+
+%-------------------------------------------------------------------------------
% fonts & icons
%-------------------------------------------------------------------------------
% EB Garamond font
@@ -38,7 +68,7 @@
% symbols
\if@symbols
- \moderncvicons{symbols} % use symbols
+ \moderncvicons{symbols} % use symbols
\else
\moderncvicons{letters} % do not use symbols, use letters
\fi
@@ -47,9 +77,16 @@
%-------------------------------------------------------------------------------
% header, body & footer
%-------------------------------------------------------------------------------
-\moderncvhead{5}
+\moderncvhead[\moderncvstyleheadoptions]{5}
\moderncvbody{5}
+% include foot only if nodetails option is active since otherwise we have two times the information
+% on the page
+\if@datainhead
+% if data is shown in head, do not include the footer
+\else
+ \moderncvfoot{1}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
index 78225e0a58c..37de3c57b32 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstyleoldstyle.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,14 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleoldstyle}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: oldstyle]
+\ProvidesPackage{moderncvstyleoldstyle}[2024-07-18 v2.4.1 modern curriculum vitae and letter style scheme: oldstyle]
+
+% headoptions
+\@initializecommand{\moderncvstyleheadoptions}{}
+\@initializeif{\if@datainhead}\@datainheadtrue
+\DeclareOption{details}{\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,details}}
+\DeclareOption{nodetails}{\@datainheadfalse\edef\moderncvstyleheadoptions{\moderncvstyleheadoptions,nodetails}}
+
% toggle use of symbol fonts.
\@initializeif{\if@symbols}\@symbolsfalse
@@ -18,7 +25,7 @@
\DeclareOption{nosymbols} {\@symbolsfalse}
\DeclareOption*{}% avoid choking on unknown options
-\ExecuteOptions{symbols}
+\ExecuteOptions{symbols,details}
\ProcessOptions*\relax% \ProcessOptions* processes the options in the order provided (i.e., with the later ones possibly overriding the former ones), while \ProcessOptions processes them in the order of the package
%-------------------------------------------------------------------------------
@@ -51,11 +58,41 @@
%-------------------------------------------------------------------------------
+% Colors
+%-------------------------------------------------------------------------------
+% head and footer
+\colorlet{lastnamecolor}{color2}
+\colorlet{namecolor}{lastnamecolor}
+\colorlet{headrulecolor}{lastnamecolor!50}
+\colorlet{firstnamecolor}{lastnamecolor!50}
+\colorlet{titlecolor}{color2}
+\colorlet{addresscolor}{color2}
+\colorlet{quotecolor}{color1}
+\colorlet{pictureframecolor}{color1}
+% body
+\colorlet{bodyrulecolor}{color1}
+\colorlet{sectioncolor}{color1}
+\colorlet{subsectioncolor}{color1}
+\colorlet{hintstylecolor}{color0}
+% letter
+\colorlet{letterclosingcolor}{color2}
+% skillmatrix
+\colorlet{skillmatrixfullcolor}{color1}
+\colorlet{skillmatrixemptycolor}{color2!30}
+
+
+%-------------------------------------------------------------------------------
% header, body & footer
%-------------------------------------------------------------------------------
-\moderncvhead{4}
+\moderncvhead[\moderncvstyleheadoptions]{4}
\moderncvbody{4}
-
+% include foot only if nodetails option is active since otherwise we have two times the information
+% on the page
+\if@datainhead
+% if data is shown in head, do not include the footer
+\else
+ \moderncvfoot{1}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvverticaltimeline.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvverticaltimeline.sty
new file mode 100644
index 00000000000..1ee94a5ef5a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvverticaltimeline.sty
@@ -0,0 +1,79 @@
+%% start of file `moderncvverticaltimeline.sty'.
+%% Copyright 2023 Javier Lopez-Gomez (javier.lopez.gomez@proton.me).
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License version 1.3c,
+% available at http://www.latex-project.org/lppl/.
+
+
+%-------------------------------------------------------------------------------
+% identification
+%-------------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{moderncvverticaltimeline}[2023/11/29 v2.0.0 modern curriculum vitae vertical timeline]
+
+
+%-------------------------------------------------------------------------------
+% required packages
+%-------------------------------------------------------------------------------
+\RequirePackage{tikz}
+
+%-------------------------------------------------------------------------------
+% vertical timeline implementation
+%-------------------------------------------------------------------------------
+\tikzset{
+ tl_milestone/.style={circle,inner sep=1.5pt,draw=color0!20,label={west:#1}},
+ tl_link/.style={thick,densely dotted,color0!20},
+}
+
+\newcounter{tl@chainidx}\setcounter{tl@chainidx}{0}
+\newcounter{tl@nodeidx}\setcounter{tl@nodeidx}{0}
+
+% Mark the end of the current chain; any `\tl@milestone` issued afterward will be on a new timeline.
+\def\tl@resetchain{%
+ \stepcounter{tl@chainidx}%
+ \setcounter{tl@nodeidx}{0}%
+}
+
+% Create a node in the current timeline and link it to the previous node; if the previous milestone
+% is on the last shipped out page, draw a line that extends until the top margin. The argument is laid out as a label (default left).
+\def\tl@milestone#1{%
+ \edef\@tl@prev{tl-\thetl@chainidx-\thetl@nodeidx}%
+ \stepcounter{tl@nodeidx}%
+ \edef\@tl@this{tl-\thetl@chainidx-\thetl@nodeidx}%
+ \tikz[remember picture,overlay] {
+ \node[tl_milestone={#1}] (\@tl@this) {};
+ \ifnum\thetl@nodeidx>1
+ \pgfpointdiff{\pgfpointanchor{\@tl@prev}{center}}{\pgfpointanchor{\@tl@this}{center}}
+ \ifnum\pgf@y>0
+ \draw[tl_link] (\@tl@this) -- ([yshift=-1em] \@tl@this |- current page.north);
+ \else
+ \draw[tl_link] (\@tl@this) -- (\@tl@prev);
+ \fi
+ \fi
+ }
+}
+
+\AddToHook{shipout/background}{%
+ % If there are follow-up milestones in the current timeline, draw a line that extends until the bottom margin
+ \edef\@tl@prev{tl-\thetl@chainidx-\number\numexpr\thetl@nodeidx-1}%
+ \edef\@tl@this{tl-\thetl@chainidx-\thetl@nodeidx}%
+ \tikz[remember picture,overlay] {
+ \ifnum\thetl@nodeidx>1
+ \pgfpointdiff{\pgfpointanchor{\@tl@prev}{center}}{\pgfpointanchor{\@tl@this}{center}}
+ \ifnum\pgf@y>0
+ \draw[tl_link] (\@tl@prev) -- ([yshift=1em] \@tl@prev |- current page.south);
+ \fi
+ \fi
+ }
+}
+
+\AtEndDocument{\tl@resetchain}
+
+\let\@old@section=\section%
+\RenewDocumentCommand{\section}{sm}{\tl@resetchain\@old@section{#1}}
+
+\endinput
+
+
+%% end of file `moderncvverticaltimeline.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty b/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
index 3739c95f92b..c5f58700004 100644
--- a/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
@@ -1,6 +1,6 @@
%% start of file `tweaklist.sty'.
%% Original by Jakob Schiotz, downloaded from http://dcwww.camd.dtu.dk/~schiotz/comp/LatexTips/tweaklist.sty; not found on ctan.
-%% Modified by Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
+%% Modified by Xavier Danaux (xdanaux@gmail.com), 2020-2024 moderncv maintainers (github.com/moderncv).
%
% The tweaklist.sty package redefines the itemize, enumerate and description packages, so that all parameters can be adjusted.
% This was done by copying the original definitions, and adding "hook commands" that are executed when entering the environment.
diff --git a/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty
index cf95d62b96b..d0e3a496e7b 100644
--- a/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty
+++ b/Master/texmf-dist/tex/latex/moloch/beamercolorthememoloch.sty
@@ -23,7 +23,7 @@
%% ---------------------------------------------------------------------------
%% Copyright 2024 Johan Larsson and contributors
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthememoloch}[2024-03-06 v0.3.0 Moloch color theme] % x-release-please-version
+\ProvidesPackage{beamercolorthememoloch}[2024-07-09 v0.4.0 Moloch color theme] % x-release-please-version
\RequirePackage{pgfopts}
\pgfkeys{
/moloch/color/block/.cd,
diff --git a/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty
index 71b52aae8d7..756958d73b8 100644
--- a/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty
+++ b/Master/texmf-dist/tex/latex/moloch/beamerfontthememoloch.sty
@@ -23,7 +23,8 @@
%% ---------------------------------------------------------------------------
%% Copyright 2024 Johan Larsson and contributors
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthememoloch}[2024-03-06 v0.3.0 Moloch font theme] % x-release-please-version
+\ProvidesPackage{beamerfontthememoloch}[2024-07-09 v0.4.0 Moloch font theme] % x-release-please-version
+\RequirePackage{etoolbox}
\RequirePackage{pgfopts}
\setbeamerfont{title}{size=\Large, series=\bfseries}
\setbeamerfont{author}{size=\small}
@@ -38,6 +39,131 @@
\setbeamerfont{caption name}{series=\bfseries}
\setbeamerfont{description item}{series=\bfseries}
\setbeamerfont{standout}{size=\Large, series=\bfseries}
+\pgfkeys{
+ /moloch/font/titleformat title/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@titleformat\@empty%
+ \setbeamerfont{title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@titleformat\@empty%
+ \setbeamerfont{title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@titleformat\lowercase%
+ \setbeamerfont{title}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat title=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@titleformat\uppercase%
+ \setbeamerfont{title}{shape=\normalfont}
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat title=allcaps can lead to problems%
+ }
+ },
+}
+\pgfkeys{
+ /moloch/font/titleformat subtitle/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@subtitleformat\@empty%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@subtitleformat\MakeLowercase%
+ \setbeamerfont{subtitle}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat subtitle=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@subtitleformat\MakeUppercase%
+ \setbeamerfont{subtitle}{shape=\normalfont}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat subtitle=allcaps can lead to problems%
+ }
+ },
+}
+\pgfkeys{
+ /moloch/font/titleformat section/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@sectiontitleformat\@empty%
+ \setbeamerfont{section title}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@sectiontitleformat\MakeLowercase%
+ \setbeamerfont{section title}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat section=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@sectiontitleformat\MakeUppercase%
+ \setbeamerfont{section title}{shape=\normalfont}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat section=allcaps can lead to problems%
+ }
+ },
+}
+\pgfkeys{
+ /moloch/font/titleformat frame/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@frametitleformat\@empty%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@frametitleformat\MakeLowercase%
+ \setbeamerfont{frametitle}{shape=\scshape}%
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat frame=allsmallcaps can lead to problems%
+ }
+ },
+ allcaps/.code={%
+ \let\moloch@frametitleformat\MakeUppercase%
+ \setbeamerfont{frametitle}{shape=\normalfont}
+ \PackageNote{beamerthememoloch}{%
+ Be aware that titleformat frame=allcaps can lead to problems%
+ }
+ },
+}
+\pgfkeys{
+ /moloch/font/.cd,
+ titleformattitle/.code=\pgfkeysalso{titleformat title=#1},
+ titleformatsubtitle/.code=\pgfkeysalso{titleformat subtitle=#1},
+ titleformatsection/.code=\pgfkeysalso{titleformat section=#1},
+ titleformatframe/.code=\pgfkeysalso{titleformat frame=#1},
+}
+\newcommand{\moloch@font@setdefaults}{
+ \pgfkeys{/moloch/font/.cd,
+ titleformat title=regular,
+ titleformat subtitle=regular,
+ titleformat section=regular,
+ titleformat frame=regular,
+ }
+}
+\def\moloch@titleformat#1{#1}
+\def\moloch@subtitleformat#1{#1}
+\def\moloch@sectiontitleformat#1{#1}
+\def\moloch@frametitleformat#1{#1}
+\moloch@font@setdefaults
+\ProcessPgfPackageOptions{/moloch/font}
\endinput
%%
%% End of file `beamerfontthememoloch.sty'.
diff --git a/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty
index c64522e8a5b..8cbc634ec02 100644
--- a/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty
+++ b/Master/texmf-dist/tex/latex/moloch/beamerinnerthememoloch.sty
@@ -23,7 +23,7 @@
%% ---------------------------------------------------------------------------
%% Copyright 2024 Johan Larsson and contributors
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthememoloch}[2024-03-06 v0.3.0 Moloch inner theme] % x-release-please-version
+\ProvidesPackage{beamerinnerthememoloch}[2024-07-09 v0.4.0 Moloch inner theme] % x-release-please-version
\RequirePackage{keyval}
\RequirePackage{calc}
\RequirePackage{pgfopts}
@@ -94,13 +94,14 @@
}
\setbeamertemplate{title}{
\raggedright%
- \inserttitle%
+ \moloch@titleformat{\inserttitle}%
\par%
\vspace*{0.2em}
}
\setbeamertemplate{subtitle}{
+ \vspace*{0.1em}
\raggedright%
- \insertsubtitle%
+ \moloch@subtitleformat{\insertsubtitle}%
\par%
\vspace*{0.2em}
}
@@ -109,6 +110,7 @@
\setbeamertemplate{title separator}{
\tikzexternaldisable%
\begin{tikzpicture}
+ \mmzUnmemoizable%
\fill[fg] (0,0) rectangle (\textwidth, \moloch@titleseparator@linewidth);
\end{tikzpicture}%
\tikzexternalenable%
@@ -134,7 +136,7 @@
\begin{center}
\usebeamercolor[fg]{section title}
\usebeamerfont{section title}
- \insertsectionhead\par
+ \moloch@sectiontitleformat{\insertsectionhead}\par
\ifx\insertsubsectionhead\@empty\else
\usebeamercolor[fg]{subsection title}
\usebeamerfont{subsection title}
@@ -148,7 +150,7 @@
\raggedright
\usebeamercolor[fg]{section title}
\usebeamerfont{section title}
- \insertsectionhead\\[-1ex]
+ \moloch@sectiontitleformat{\insertsectionhead}\\[-1ex]
\usebeamertemplate*{progress bar in section page}
\par
\ifx\insertsubsectionhead\@empty\else%
@@ -197,9 +199,10 @@
\setbeamertemplate{progress bar in section page}{
\pgfmathsetlength{\moloch@progressonsectionpage}{
\textwidth * min(1,\insertframenumber/\inserttotalframenumber)
- }
- \tikzexternaldisable
+ }%
+ \tikzexternaldisable%
\begin{tikzpicture}
+ \mmzUnmemoizable%
\fill[bg]
(0,0)
rectangle
@@ -209,7 +212,7 @@
rectangle
(\moloch@progressonsectionpage, \moloch@progressonsectionpage@linewidth);
\end{tikzpicture}
- \tikzexternalenable
+ \tikzexternalenable%
}
\def\inserttotalframenumber{100}
\setbeamertemplate{itemize item}{\(\bullet\)}
diff --git a/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty
index 311ef669812..1895dbc9402 100644
--- a/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty
+++ b/Master/texmf-dist/tex/latex/moloch/beamerouterthememoloch.sty
@@ -23,7 +23,7 @@
%% ---------------------------------------------------------------------------
%% Copyright 2024 Johan Larsson and contributors
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthememoloch}[2024-03-06 v0.3.0 Moloch outer theme] % x-release-please-version
+\ProvidesPackage{beamerouterthememoloch}[2024-07-09 v0.4.0 Moloch outer theme] % x-release-please-version
\RequirePackage{calc}
\RequirePackage{pgfopts}
\pgfkeys{
@@ -90,23 +90,42 @@
\usebeamertemplate*{page number in head/foot}\vskip4pt%
\end{beamercolorbox}%
}
+\newlength{\moloch@frametitle@padding}
+\setlength{\moloch@frametitle@padding}{2.2ex}
+\newcommand{\moloch@frametitlestrut@start}{%
+ \rule{0pt}{\moloch@frametitle@padding +%
+ \totalheightof{%
+ \ifcsdef{moloch@frametitleformat}{\moloch@frametitleformat X}{X}%
+ }%
+}%
+}
+
+\newcommand{\moloch@frametitlestrut@end}{%
+ \vphantom{\rule[-\moloch@frametitle@padding]{0pt}{\moloch@frametitle@padding}}
+}
\defbeamertemplate{frametitle}{plain}{%
\nointerlineskip%
\begin{beamercolorbox}[%
wd=\paperwidth,%
- sep=1.1ex,%
- leftskip=0.5ex,%
- rightskip=\the\glueexpr 0.5ex plus 1fill\relax,%
+ leftskip=1.6ex,%
+ rightskip=\the\glueexpr 1.6ex plus 1fill\relax,%
]{frametitle}%
\usebeamerfont{frametitle}%
- \vbox{}\vskip-0.4ex%
- \strut\insertframetitle\nolinebreak\strut\par%
+ \moloch@frametitlestrut@start%
+ \moloch@frametitleformat{\insertframetitle}%
{%
\ifx\insertframesubtitle\@empty%
\else%
- {\usebeamerfont{framesubtitle}\vspace{-0.8ex}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\strut\par}%
+ {%
+ \par%
+ \usebeamerfont{framesubtitle}%
+ \vspace{-0.8ex}%
+ \usebeamercolor[fg]{framesubtitle}%
+ \insertframesubtitle%
+ }%
\fi
}%
+ \moloch@frametitlestrut@end%
\end{beamercolorbox}%
}
\setbeamertemplate{frametitle continuation}{\romannumeral\insertcontinuationcount}
@@ -114,13 +133,14 @@
\newlength{\moloch@progressinheadfoot@linewidth}
\setlength{\moloch@progressinheadfoot@linewidth}{0.4pt}
\setbeamertemplate{progress bar in head/foot}{
- \nointerlineskip
+ \nointerlineskip%
\pgfmathsetlength{\moloch@progressinheadfoot}{%
\paperwidth * min(1,\insertframenumber/\inserttotalframenumber)%
- }
+ }%
\begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot}
- \tikzexternaldisable
+ \tikzexternaldisable%
\begin{tikzpicture}
+ \mmzUnmemoizable%
\fill[bg]
(0,0)
rectangle
@@ -130,7 +150,7 @@
rectangle
(\moloch@progressinheadfoot, \moloch@progressinheadfoot@linewidth);
\end{tikzpicture}
- \tikzexternalenable
+ \tikzexternalenable%
\end{beamercolorbox}
}
\moloch@outer@setdefaults
diff --git a/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty b/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty
index ff2a2df3b70..4f47627e301 100644
--- a/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty
+++ b/Master/texmf-dist/tex/latex/moloch/beamerthememoloch.sty
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthememoloch}[2024-03-06 v0.3.0 Moloch Beamer theme] % x-release-please-version
+\ProvidesPackage{beamerthememoloch}[2024-07-09 v0.4.0 Moloch Beamer theme] % x-release-please-version
\RequirePackage{pgfopts}
\pgfkeys{/moloch/.cd,
.search also={
@@ -31,14 +31,50 @@
/moloch/font,
}
}
+\pgfkeys{
+ /moloch/titleformat plain/.cd,
+ .is choice,
+ regular/.code={%
+ \let\moloch@plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ },
+ smallcaps/.code={%
+ \let\moloch@plaintitleformat\@empty%
+ \setbeamerfont{standout}{shape=\scshape}%
+ },
+ allsmallcaps/.code={%
+ \let\moloch@plaintitleformat\MakeLowercase%
+ \setbeamerfont{standout}{shape=\scshape}%
+ },
+ allcaps/.code={%
+ \let\moloch@plaintitleformat\MakeUppercase%
+ \setbeamerfont{standout}{shape=\normalfont}%
+ },
+}
+\pgfkeys{
+ /moloch/titleformat/.code=\pgfkeysalso{
+ font/titleformat title=#1,
+ font/titleformat subtitle=#1,
+ font/titleformat section=#1,
+ font/titleformat frame=#1,
+ titleformat plain=#1,
+ }
+}
+\newcommand{\moloch@setdefaults}{
+ \pgfkeys{/moloch/.cd,
+ titleformat plain=regular,
+ }
+}
\providecommand{\tikzexternalenable}{}
\providecommand{\tikzexternaldisable}{}
+\providecommand{\mmzUnmemoizable}{}
\useinnertheme{moloch}
\useoutertheme{moloch}
\usecolortheme{moloch}
\usefonttheme{moloch}
\newcommand{\molochset}[1]{\pgfkeys{/moloch/.cd,#1}}
\newcommand{\mreducelistspacing}{\vspace{-\topsep}}
+\moloch@setdefaults
\ProcessPgfOptions{/moloch}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/moremath/moremath.sty b/Master/texmf-dist/tex/latex/moremath/moremath.sty
new file mode 100644
index 00000000000..43c704f51d5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moremath/moremath.sty
@@ -0,0 +1,1224 @@
+%%
+%% This is file `moremath.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% moremath.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%%
+%% Copyright (C) 2024 Marcel Ilg
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%
+%% https://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status ‘maintained’.
+%%
+%% The Current Maintainer of this work is Marcel Ilg.
+%%
+%% This work consists of the files listed in MANIFEST.md.
+%%
+
+\NeedsTeXFormat{LaTeX2e}[2022-11-01]
+\ProvidesExplPackage{moremath}
+ {2024-07-15}{v0.4.0}{More Math Macros}
+\msg_new:nnn { moremath } {load / bm}
+{
+ Option~'bm'~given.\\
+ Loading~the~bm~package~\msg_line_context:.
+}
+\msg_new:nnn {moremath} { load / disabling }
+{
+ Option~'#1'~given.\\
+ Disabling~#2~\msg_line_context:.
+}
+\bool_new:N \l__moremath_predef_vector_op_bool
+\bool_new:N \l__moremath_predef_operators_bool
+\bool_new:N \l__moremath_predef_crvector_bool
+\bool_new:N \l__moremath_predef_matrix_bool
+\bool_new:N \l__moremath_predef_abs_bool
+\keys_define:nn { moremath / load }
+{
+ bm .code:n = {
+ \msg_info:nn {moremath} {load / bm}
+ \RequirePackage{bm}
+ },
+ bm .value_forbidden:n = true,
+ bm. usage:n = load,
+ no-vector .bool_set_inverse:N = \l__moremath_predef_vector_op_bool,
+ no-vector .default:n = true,
+ no-vector .initial:n = false,
+ no-vector .usage:n = load,
+ no-operators .bool_set_inverse:N = \l__moremath_predef_operators_bool,
+ no-operators .default:n = true,
+ no-operators .initial:n = false,
+ no-operators .usage:n = load,
+ no-abs-shorthands .bool_set_inverse:N = \l__moremath_predef_abs_bool,
+ no-abs-shorthands .default:n = true,
+ no-abs-shorthands .initial:n = false,
+ no-abs-shorthands .usage:n = load,
+ no-matrix .bool_set_inverse:N = \l__moremath_predef_matrix_bool,
+ no-matrix .initial:n = false,
+ no-matrix .default:n = true,
+ no-matrix .usage:n =load,
+ no-crvector .bool_set_inverse:N = \l__moremath_predef_crvector_bool,
+ no-crvector .default:n = true,
+ no-crvector .initial:n = false,
+ no-crvector .usage:n = load,
+ nopredef .multichoice:,
+ nopredef / operators .meta:nn = { moremath / load }
+ {
+ no-operators = true
+ },
+ nopredef / vector .meta:nn = { moremath / load }
+ {
+ no-vector = true
+ },
+ nopredef / abs .meta:nn = { moremath / load }
+ {
+ no-abs-shorthands = true,
+ },
+ noperdef / matrix .meta:nn = { moremath / load }
+ {
+ no-matrix = true,
+ },
+ nopredef / crvector .meta:nn = {moremath / load}
+ {
+ no-crvector = true,
+ },
+ nopredef / all .meta:nn = { moremath / load }
+ {
+ no-operators = true,
+ no-vector = true,
+ no-abs-shorthands = true
+ },
+ nopredef .usage:n = load,
+ unknown .code:n = {\PassOptionsToPackage{\CurrentOption}{mathtools}},
+ unknown .usage:n = load,
+}
+\tl_new:N \l__moremath_nabla_tl
+\bool_new:N \l__moremath_nabla_arrow_bool
+\bool_new:N \l__moremath_nabla_arrow_bold_bool
+\tl_new:N \l__moremath_grad_op_tl
+\tl_new:N \l__moremath_laplacian_symb_tl
+\bool_new:N \l__moremath_laplacian_delta_bool
+\bool_new:N \l__moremath_laplacian_arrow_bool
+\tl_new:N \l__moremath_laplacian_tl
+\tl_new:N \l__moremath_dalembert_symb_tl
+\bool_new:N \l__moremath_vcenter_bool
+\keys_define:nn { moremath }
+{
+ % Symbol to use for the nabla
+ nabla .tl_set:N = \l__moremath_nabla_tl,
+ nabla .initial:n = {\nabla},
+ nabla .value_required:n = true,
+ % shall the nabla have an arrow over it
+ arrownabla .bool_set:N = \l__moremath_nabla_arrow_bool,
+ arrownabla .default:n = {true},
+ arrownabla .initial:n = {false},
+ % shall the nabla be bold
+ boldnabla .bool_set:N = \l__moremath_nabla_bold_bool,
+ boldnabla .default:n = {true},
+ boldnabla .initial:n = {false},
+ % Symbol to use for the gradient operator
+ grad-op .tl_set:N = \l__moremath_grad_op_tl,
+ grad-op .value_required:n = true,
+ % Symbol to use for the laplacian
+ laplacian-symb .tl_set:N = \l__moremath_laplacian_symb_tl,
+ laplacian-symb .initial:n = {\l__moremath_nabla_tl},
+ % shall the Laplace operator be a delta
+ delta-laplace .bool_set:N = \l__moremath_laplacian_delta_bool,
+ delta-laplace .initial:n = {false},
+ % shall the laplace operator have an arrow over itself
+ arrowlaplace .bool_set:N = \l__moremath_laplacian_arrow_bool,
+ arrowlaplace .default:n = {true},
+ arrowlaplace .initial:n = {false},
+ % overwrite the laplace operator
+ laplacian .tl_set:N = \l__moremath_laplacian_tl,
+ laplacian .value_required:n = true,
+ dalembert-symb .tl_set:N = \l__moremath_dalembert_symb_tl,
+ dalembert-symb .initial:n = {\square},
+ vcenter .bool_set:N = \l__moremath_vcenter_bool,
+ vcenter .initial:n = true,
+ vcenter .value_required:n = true,
+}% \keys_define:nn
+\keys_define:nn { moremath / matrix }
+{
+ delimiter .tl_set:N = \l__moremath_matrix_delim_tl,
+ delimiter .initial:n = {},
+ fill .tl_set:N = \l__moremath_matrix_fill_tl,
+ fill .initial:n = {},
+ align .tl_set:N = \l__moremath_matrix_align_tl,
+ align .initial:n = {c},
+ align .value_required:n = true,
+}
+\cs_new_protected:Nn \moremath_setup:n
+{
+ \keys_set:nn {moremath} {#1}
+}
+\NewDocumentCommand \moremathsetup {m}
+{
+ \moremath_setup:n {#1}
+}
+\cs_new_protected:Nn \__moremath_load_time_setup:
+{
+ \ProcessKeyOptions[ moremath / load ]
+}
+\__moremath_load_time_setup:
+\msg_new:nnn { moremath } { load / loading-amssymb }
+{
+ Vector~calculus~commands~enabled.\\
+ Loading~amssymb~package~\msg_line_context:.
+}
+\bool_if:NT \l__moremath_predef_vector_op_bool
+{
+ \msg_info:nn { moremath } { load / loading-amssymb }
+ \RequirePackage{amssymb}
+}
+\RequirePackage{mathtools}[2004/06/05]
+\cs_new_protected_nopar:Nn \moremath_vcenter:n
+{
+ \mathpalette \__moremath_vcenter:Nn {#1}
+}
+\cs_new_protected_nopar:Nn \__moremath_vcenter:Nn
+{
+ \vcenter
+ {
+ \hbox:n
+ {
+ $
+ \mathsurround=0pt
+ #1 {#2}
+ $
+ }
+ }
+}
+\msg_new:nnn { moremath } { csname-already-defined }
+{
+ Control~sequence~' #1 '~is~already~ defined.\\
+ Skipping~definition~\msg_line_context:
+}
+\msg_new:nnnn { moremath } { vcenter / only-in-math-mode }
+{
+ Command~#1~used~outside~math~mode~\msg_line_context:.
+}
+{
+ The~command~#1~may~only~be~used~inside~math~mode.
+}
+\cs_if_free:NTF \VCenterMath
+{
+ \NewDocumentCommand \VCenterMath { m }
+ {
+ \mode_if_math:TF
+ {
+ \moremath_vcenter:n {#1}
+ }{% \mode_if_math:TF FALSE BRANCH
+ \msg_error:nnn { moremath } { vcenter / only-in-math-mode } {\VCenterMath}
+ }
+ }
+}{% \cs_if_free:NTF \VCenterMath FALSE BRANCH
+ \msg_warning:nnn { moremath } { csname-already-defined } {\VCenterMath}
+}
+\DeclarePairedDelimiter{\__moremath_inparent:w}{\lparen}{\rparen}
+\DeclarePairedDelimiter{\__moremath_inbrack:w}{\lbrack}{\rbrack}
+\DeclarePairedDelimiter{\__moremath_inbrace:w}{\lbrace}{\rbrace}
+\DeclarePairedDelimiter{\__moremath_in_vert:w}{\lvert}{\rvert}
+\DeclarePairedDelimiter{\__moremath_in_Vert:w}{\lVert}{\rVert}
+\cs_new_protected:Nn \__moremath_operator:Nnn
+{
+ #1
+ % add superscript if present
+ \tl_if_empty:nF {#2} {^{#2}}
+ % add subscript if present
+ \tl_if_empty:nF {#3} { \c_math_subscript_token {#3} }
+}
+\cs_new_protected_nopar:Nn \moremath_delim_op_noscale:NNnnn
+{
+ \__moremath_operator:Nnn #1 {#3} {#4}
+ % #2 is the paired delimiter
+ #2 {#5}
+}
+
+\cs_new_protected_nopar:Nn \moremath_delim_op_autoscale:NNnnn
+{
+ \__moremath_operator:Nnn #1 {#3} {#4}
+ % #2 is the paired delimiter
+ #2 * {#5}
+}
+\cs_new_protected_nopar:Nn \moremath_delim_op_manuscale:NNnnnn
+{
+ \__moremath_operator:Nnn #1 {#4} {#5}
+ % #2 is the paired delimiter
+ #2 [ #3 ] {#6}
+}
+\cs_generate_variant:Nn \moremath_delim_op_manuscale:NNnnnn {NNVnnn}
+\msg_new:nnn { moremath } { delimop / already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~of~delimited~operator~'#1'~\msg_line_context:.
+}
+\msg_new:nnn { moremath } { delimop / auto-manu-scale-conflict }
+{
+ Both~star~and~scale~cmd~given~to~'#1'.\\
+ Automatic~scaling~will~be~preferred,~the~size~command~will~be~
+ ignored~\msg_line_context:.
+}
+\cs_new_protected:Nn \moremath_new_delim_op_command:NNN
+{
+ \cs_if_free:NTF #1
+ {
+ \exp_args:NNe \NewDocumentCommand #1
+ { s o E{ ^ \char_generate:nn {`_} {8} }{{}{}} m }
+ {
+ \tl_if_novalue:nTF {##2}
+ {
+ % second argument empty
+ \bool_if:nTF {##1}
+ {
+ % star given
+ \moremath_delim_op_autoscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }{
+ % star not given
+ \moremath_delim_op_noscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }
+ }{
+ % second argument present
+ % star given?
+ \bool_if:nTF {##1}
+ {
+ % Warn if both star and scaling factor are present
+ \msg_warning:nnn { moremath } { delimop / auto-manu-scale-conflict }
+ {#1}
+ \moremath_delim_op_autoscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }{ % FALSE BRANCH
+ \moremath_delim_op_manuscale:NNnnnn #2 #3 {##2} {##3} {##4} {##5}
+ }
+ }
+ }
+ }{ % \cs_if_free:nTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { delimop / already-defined-skip }
+ {#1}
+ }
+}
+
+\cs_generate_variant:Nn \moremath_new_delim_op_command:NNN {cNN}
+\NewDocumentCommand\DeclareDelimitedOperator { m m m }
+{
+ \msg_redirect_name:nnn { moremath } { delimop / already-defined-skip } { error }
+ \moremath_new_delim_op_command:NNN #1 #2 #3
+ \msg_redirect_name:nnn { moremath } { delimop / already-defined-skip } {}
+}
+\cs_new_protected:Nn \__moremath_new_delim_op_cmds:nN
+{
+ \moremath_new_delim_op_command:cNN {p #1} #2 \__moremath_inparent:w
+ \moremath_new_delim_op_command:cNN {b #1} #2 \__moremath_inbrack:w
+ \moremath_new_delim_op_command:cNN {B #1} #2 \__moremath_inbrace:w
+ \moremath_new_delim_op_command:cNN {v #1} #2 \__moremath_in_vert:w
+ \moremath_new_delim_op_command:cNN {V #1} #2 \__moremath_in_Vert:w
+}
+\bool_if:NTF \l__moremath_predef_operators_bool
+{
+\__moremath_new_delim_op_cmds:nN {arccos} \arccos
+\__moremath_new_delim_op_cmds:nN {arcsin} \arcsin
+\__moremath_new_delim_op_cmds:nN {arctan} \arctan
+\__moremath_new_delim_op_cmds:nN {arg} \arg
+\__moremath_new_delim_op_cmds:nN {cos} \cos
+\__moremath_new_delim_op_cmds:nN {cosh} \cosh
+\__moremath_new_delim_op_cmds:nN {cot} \cot
+\__moremath_new_delim_op_cmds:nN {coth} \coth
+\__moremath_new_delim_op_cmds:nN {csc} \csc
+\__moremath_new_delim_op_cmds:nN {deg} \deg
+\__moremath_new_delim_op_cmds:nN {det} \det
+\__moremath_new_delim_op_cmds:nN {dim} \dim
+\__moremath_new_delim_op_cmds:nN {exp} \exp
+\__moremath_new_delim_op_cmds:nN {gcd} \gcd
+\__moremath_new_delim_op_cmds:nN {hom} \hom
+\__moremath_new_delim_op_cmds:nN {inf} \inf
+\__moremath_new_delim_op_cmds:nN {injlim} \injlim
+\__moremath_new_delim_op_cmds:nN {ker} \ker
+\__moremath_new_delim_op_cmds:nN {lg} \lg
+\__moremath_new_delim_op_cmds:nN {lim} \lim
+\__moremath_new_delim_op_cmds:nN {liminf} \liminf
+\__moremath_new_delim_op_cmds:nN {limsup} \limsup
+\__moremath_new_delim_op_cmds:nN {ln} \ln
+\__moremath_new_delim_op_cmds:nN {log} \log
+\__moremath_new_delim_op_cmds:nN {max} \max
+\__moremath_new_delim_op_cmds:nN {min} \min
+\__moremath_new_delim_op_cmds:nN {Pr} \Pr
+\__moremath_new_delim_op_cmds:nN {projlim} \projlim
+\__moremath_new_delim_op_cmds:nN {sec} \sec
+\__moremath_new_delim_op_cmds:nN {sin} \sin
+\__moremath_new_delim_op_cmds:nN {sinh} \sinh
+\__moremath_new_delim_op_cmds:nN {sup} \sup
+\__moremath_new_delim_op_cmds:nN {tan} \tan
+\__moremath_new_delim_op_cmds:nN {tanh} \tanh
+\__moremath_new_delim_op_cmds:nN {varinjlim} \varinjlim
+\__moremath_new_delim_op_cmds:nN {varprojlim} \varprojlim
+\__moremath_new_delim_op_cmds:nN {varliminf} \varliminf
+\__moremath_new_delim_op_cmds:nN {varlimsup} \varlimsup
+}{
+ \msg_info:nnnn {moremath} {load /disabling} {no-operators}
+ {
+ predefined~delimited~operator~macros
+ }
+} % End of the conditional
+\cs_new_protected_nopar:Nn \__moremath_maybe_vcenter:n
+{
+ \bool_if:NTF \l__moremath_vcenter_bool
+ {
+ \moremath_vcenter:n {#1}
+ }{
+ #1
+ }
+}
+\cs_new_protected:Nn \__moremath_gradient_operator_get:
+{
+ \tl_if_empty:NTF \l__moremath_grad_op_tl
+ {
+ \mathop
+ {
+ \bool_if:NTF \l__moremath_nabla_arrow_bool
+ {
+ \vec
+ {
+ \__moremath_maybe_vcenter:n
+ {
+ \bool_if:NT \l__moremath_nabla_bold_bool
+ {
+ \boldsymbol
+ }
+ \l__moremath_nabla_tl
+ }
+ }
+ }{
+ \bool_if:NTF \l__moremath_nabla_bold_bool
+ {
+ \__moremath_maybe_vcenter:n
+ {
+ \boldsymbol
+ \l__moremath_nabla_tl
+ }
+ }{
+ \l__moremath_nabla_tl
+ }
+ }
+ }% \mathop
+ \nolimits
+ }{
+ \l__moremath_grad_op_tl
+ }
+}
+\cs_new_protected:Nn \__moremath_laplace_operator_get:
+{
+ \tl_if_empty:NTF \l__moremath_laplacian_tl
+ {
+ \mathop
+ {
+ \bool_if:NTF \l__moremath_laplacian_delta_bool
+ {
+ \Delta
+ }{
+ \bool_if:NTF \l__moremath_laplacian_arrow_bool
+ {
+ \vec{
+ \__moremath_maybe_vcenter:n
+ {
+ \bool_if:NT \l__moremath_nabla_bold_bool {\boldsymbol}
+ \l__moremath_laplacian_symb_tl
+ }
+ }
+ }{
+ \bool_if:NTF \l__moremath_nabla_bold_bool
+ {
+ \__moremath_maybe_vcenter:n
+ {
+ \boldsymbol
+ \l__moremath_laplacian_symb_tl
+ }
+ }{
+ \l__moremath_laplacian_symb_tl
+ }
+ }
+ }
+ }\nolimits
+ \bool_if:NF \l__moremath_laplacian_delta_bool
+ {
+ \c_math_superscript_token
+ {
+ 2
+ }
+ }
+ }{
+ \l__moremath_laplacian_tl
+ }
+}
+\cs_new_protected:Nn \__moremath_dalembert_operator_get:
+{
+ \mathop
+ {
+ \l__moremath_dalembert_symb_tl
+ }% \mathop
+ \nolimits
+}
+\cs_new_protected_nopar:Nn \moremath_gradient_operator:n
+{
+ \__moremath_gradient_operator_get:
+ \tl_if_empty:nF {#1} {\c_math_subscript_token {#1}}
+}
+\cs_new_protected_nopar:Nn \moremath_laplace_operator:n
+{
+ \__moremath_laplace_operator_get:
+ \tl_if_empty:nF {#1} {\c_math_subscript_token {#1}}
+}
+\cs_new_protected_nopar:Nn \moremath_divergence_operator:n
+{
+ {
+ \moremath_gradient_operator:n {#1}
+ }
+ \cdot
+}
+
+\cs_new_protected_nopar:Nn \moremath_curl_operator:n
+{
+ {
+ \moremath_gradient_operator:n {#1}
+ }
+ \times
+}
+\cs_new_protected:Nn \moremath_dalembert_operator:n
+{
+ \__moremath_dalembert_operator_get:
+ \tl_if_empty:nF {#1}
+ {
+ \c_math_subscript_token {#1}
+ }
+}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_noscale:NNnn
+{
+ #1 {#3} #2{#4}
+}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_autoscale:NNnn
+{
+ #1 {#3} #2 * {#4}
+}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_manuscale:NNnnn
+{
+ #1 {#4} #2 [#3] {#5}
+}
+\cs_generate_variant:Nn \moremath_delim_nabla_op_manuscale:NNnnn {NNVnn}
+\cs_new_protected:Nn \__moremath_parse_kv_args:nN
+{
+ \prop_set_from_keyval:Nn \l_tmpa_prop {#1}
+
+ \prop_pop:NnNT \l_tmpa_prop {scale} #2 {}
+
+ \keys_set:ne {moremath} {\prop_to_keyval:N \l_tmpa_prop}
+}
+\msg_new:nnn { moremath } { vector-calc / scale-star-conflict }
+{
+ Both~star~and~scaling~factor~given~to~'#1'.\\
+ Automatic~scaling~will~be~preferred,~the~size~command~'#2'~will~be~
+ ignored~\msg_line_context:.
+}
+\cs_new_protected:Nn \__moremath_new_delim_nabla_doc_cmd:NNN
+{
+ \cs_if_free:NTF #1
+ {
+ \exp_args:NNe \NewDocumentCommand #1
+ {
+ s ={scale} o E{ \char_generate:nn {`_}{8} }{ {} } m
+ }
+ { % command code
+ \group_begin:
+ % optional arguments given?
+ \tl_if_novalue:nF {##2}
+ {
+ \__moremath_parse_kv_args:nN {##2} \l_tmpa_tl
+ }
+ % star given?
+ \bool_if:nTF {##1}
+ {
+ % scale factor given?
+ \tl_if_empty:NF \l_tmpa_tl
+ {
+ \msg_warning:nnnV { moremath } { vector-calc / scale-star-conflict }
+ {#1} \l_tmpa_tl
+ }
+ \moremath_delim_nabla_op_autoscale:NNnn #2 #3 {##3} {##4}
+ }{ % \bool_if:nTF {##1} FALSE BRANCH
+ % scale factor given?
+ \tl_if_empty:NTF \l_tmpa_tl
+ {
+ \moremath_delim_nabla_op_noscale:NNnn #2 #3 {##3} {##4}
+ }{ % FALSE BRANCH
+ \moremath_delim_nabla_op_manuscale:NNVnn #2 #3 \l_tmpa_tl {##3} {##4}
+ }
+ } % \bool_if:nTF {##1}
+ \group_end:
+ }
+ }{ % \cs_if_free:NTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { vector-calc / already-defined-skip } {#1}
+ } % \cs_if_free:NTF #1
+}
+\cs_generate_variant:Nn \__moremath_new_delim_nabla_doc_cmd:NNN {cNN}
+\cs_new_protected:Nn \__moremath_new_nabla_doc_cmds:nN
+{
+ \__moremath_new_delim_nabla_doc_cmd:cNN { p #1 } #2 \__moremath_inparent:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { b #1 } #2 \__moremath_inbrack:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { B #1 } #2 \__moremath_inbrace:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { v #1 } #2 \__moremath_in_vert:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { V #1 } #2 \__moremath_in_Vert:w
+}
+\bool_if:NTF \l__moremath_predef_vector_op_bool
+{
+\msg_new:nnn { moremath } { vector-calc / already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~\msg_line_context:.
+}
+\cs_if_free:NTF \grad
+{
+ \exp_args:NNe \NewDocumentCommand \grad { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_gradient_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip } {\grad}
+}
+
+\cs_if_free:NTF \divergence
+{
+ \exp_args:NNe \NewDocumentCommand \divergence
+ { !o E{ \char_generate:nn {`_} {8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_divergence_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip } {\divergence}
+}
+
+\cs_if_free:NTF \curl
+{
+ \exp_args:NNe \NewDocumentCommand \curl
+ { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_curl_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} {vector-calc / already-defined-skip} {\curl}
+}
+
+\cs_if_free:NTF \laplacian
+{
+ \exp_args:NNe \NewDocumentCommand \laplacian
+ { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_laplace_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip }
+ {\laplacian}
+}
+\cs_if_free:NTF \quabla
+{
+ \exp_args:NNe \NewDocumentCommand \quabla
+ { !o E{ \char_generate:nn {`_} { 8 } }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath } {#1}
+ }
+ \moremath_dalembert_operator:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \quabla FALSE BRANCH
+ \msg_warning:nnn { moremath } { vector-calc / already-defined-skip }
+ {\quabla}
+}
+\__moremath_new_nabla_doc_cmds:nN {grad} \moremath_gradient_operator:n
+\__moremath_new_nabla_doc_cmds:nN {div} \moremath_divergence_operator:n
+\__moremath_new_nabla_doc_cmds:nN {curl} \moremath_curl_operator:n
+\__moremath_new_nabla_doc_cmds:nN {laplacian} \moremath_laplace_operator:n
+\__moremath_new_nabla_doc_cmds:nN {quabla} \moremath_dalembert_operator:n
+}{ % IF NOT \l__moremath_predef_vector_op_bool
+ \msg_info:nnnn {moremath} { load /disabling } {no-vector}
+ {
+ predefined~vector~calculus~macros
+ }
+} % END \l__moremath_predef_vector_op_bool
+\seq_new:N \l__moremath_vector_entries_seq
+\cs_new_protected_nopar:Nn \__moremath_seq_to_column_vector:N
+{
+ \seq_use:Nn #1 {\\}
+}
+\cs_new_protected_nopar:Nn \__moremath_seq_to_row_vector:N
+{
+ \seq_use:Nn #1 {&}
+}
+\cs_new_protected_nopar:Nn \moremath_column_vector:nn
+{
+ \seq_clear:N \l__moremath_vector_entries_seq
+ \seq_set_from_clist:Nn \l__moremath_vector_entries_seq {#2}
+
+ \exp_args:NnNV \begin{#1 matrix*} [ \l__moremath_matrix_align_tl ]
+ \__moremath_seq_to_column_vector:N \l__moremath_vector_entries_seq
+ \end{#1 matrix*}
+}
+
+\cs_new_protected_nopar:Nn \moremath_row_vector:nn
+{
+ \seq_clear:N \l__moremath_vector_entries_seq
+ \seq_set_from_clist:Nn \l__moremath_vector_entries_seq {#2}
+
+ \exp_args:NnNV \begin{#1matrix*} [ \l__moremath_matrix_align_tl ]
+ \__moremath_seq_to_row_vector:N \l__moremath_vector_entries_seq
+ \end{#1matrix*}
+}
+\cs_new_protected_nopar:Nn \moremath_column_smallvector:nn
+{
+ \moremath_column_vector:nn {#1 small} {#2}
+}
+
+\cs_new_protected_nopar:Nn \moremath_row_smallvector:nn
+{
+ \moremath_row_vector:nn {#1 small} {#2}
+}
+\seq_clear_new:N \l__moremath_mat_diag_entries_seq
+\seq_clear_new:N \l__moremath_mat_row_entries_seq
+\cs_new_protected:Nn \__moremath_constr_diagmat_row:n
+{
+ \seq_clear:N \l__moremath_mat_row_entries_seq
+ \int_step_inline:nn {\seq_count:N \l__moremath_mat_diag_entries_seq}
+ {
+ \int_compare:nTF { #1 == ##1 }
+ {
+ \seq_put_right:Nx \l__moremath_mat_row_entries_seq
+ {
+ \seq_item:Nn \l__moremath_mat_diag_entries_seq { #1 }
+ }
+ }{ % false branch
+ \seq_put_right:NV \l__moremath_mat_row_entries_seq \l__moremath_matrix_fill_tl
+ } % \int_compare:nTF { #1 == ##1 }
+ }
+ \seq_use:Nn \l__moremath_mat_row_entries_seq { & } \\
+}
+
+\cs_new_protected:Nn \__moremath_constr_antidiagmat_row:n
+{
+ \seq_clear:N \l__moremath_mat_row_entries_seq
+ \int_step_inline:nn {\seq_count:N \l__moremath_mat_diag_entries_seq}
+ {
+ \int_compare:nTF { #1 == ##1 }
+ {
+ % as this is a anti diagonal matrix we put in the elements from the
+ % left so that the first entry is the right most entry
+ \seq_put_left:Nx \l__moremath_mat_row_entries_seq
+ {
+ \seq_item:Nn \l__moremath_mat_diag_entries_seq { #1 }
+ }
+ }{ % false branch
+ \seq_put_left:NV \l__moremath_mat_row_entries_seq \l__moremath_matrix_fill_tl
+ } % \int_compare:nTF { #1 == ##1 }
+ }
+ \seq_use:Nn \l__moremath_mat_row_entries_seq { & } \\
+}
+\cs_new_protected:Nn \moremath_diagonal_matrix:nn
+{
+ \seq_set_from_clist:Nn \l__moremath_mat_diag_entries_seq { #2 }
+ \exp_args:NnNV \begin{#1 matrix*} [ \l__moremath_matrix_align_tl ]
+ \int_step_function:nN { \seq_count:N \l__moremath_mat_diag_entries_seq }
+ \__moremath_constr_diagmat_row:n
+ \end{#1 matrix*}
+}
+
+\cs_new_protected:Nn \moremath_antidiagonal_matrix:nn
+{
+ \seq_set_from_clist:Nn \l__moremath_mat_diag_entries_seq { #2 }
+ \exp_args:NnNV \begin{ #1 matrix* } [ \l__moremath_matrix_align_tl ]
+ \int_step_function:nN { \seq_count:N \l__moremath_mat_diag_entries_seq }
+ \__moremath_constr_antidiagmat_row:n
+ \end{ #1 matrix* }
+}
+
+\cs_new_protected:Nn \moremath_diagonal_smallmatrix:nn
+{
+ \moremath_diagonal_matrix:nn {#1 small} {#2}
+}
+
+\cs_new_protected:Nn \moremath_antidiagonal_smallmatrix:nn
+{
+ \moremath_antidiagonal_matrix:nn {#1 small} {#2}
+}
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { n V }
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V n }
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V V }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { n V }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V n }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V V }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { n V }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V n }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V V }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { n V }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V n }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V V }
+\cs_new_protected_nopar:Nn \__moremath_generate_one_filled_clist:Nn
+{
+ \seq_clear:N \l_tmpa_seq
+ \int_step_inline:nn {#2}
+ {
+ \seq_put_right:NV \l_tmpa_seq \c_one_int
+ }
+ \clist_set_from_seq:NN #1 \l_tmpa_seq
+}
+\cs_generate_variant:Nn \__moremath_generate_one_filled_clist:Nn { N V }
+\clist_new:N \l__moremath_id_entries_clist
+\cs_new_protected_nopar:Nn \moremath_id_matrix:n
+{
+ \clist_clear:N \l__moremath_id_entries_clist
+ \__moremath_generate_one_filled_clist:Nn \l__moremath_id_entries_clist {#1}
+ \moremath_diagonal_matrix:VV \l__moremath_matrix_delim_tl \l__moremath_id_entries_clist
+}
+\cs_new_protected_nopar:Nn \moremath_id_smallmatrix:n
+{
+ \clist_clear:N \l__moremath_id_entries_clist
+ \__moremath_generate_one_filled_clist:Nn \l__moremath_id_entries_clist {#1}
+ \moremath_diagonal_smallmatrix:VV \l__moremath_matrix_delim_tl \l__moremath_id_entries_clist
+}
+\cs_generate_variant:Nn \moremath_id_matrix:n { V }
+\cs_generate_variant:Nn \moremath_id_smallmatrix:n { V }
+\msg_new:nnnn { moremath } { matrix / already-defined-doc-cmd-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~\msg_line_context:.
+}
+{
+ The~control~sequence~'#1'~has~already\\
+ been~defined~by~some~other~package.\\
+ And~I~am~refusing~to~overwrite~the~existing~definition,\\
+ therefore~I~am~skipping~the~definition~of~this~command.
+}
+\bool_if:nTF \l__moremath_predef_crvector_bool
+{
+\cs_if_free:NTF \cvector
+{
+ \NewDocumentCommand \cvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_column_vector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % issue a warning message if the csname is already taken.
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \cvector
+ }
+} % \cs_if_free:NTF \cvector
+\cs_if_free:NTF \rvector
+{
+ \NewDocumentCommand \rvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_row_vector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % warn if csname is already taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip}
+ {
+ \rvector
+ }
+} % \cs_if_free:NTF \rvector
+\cs_if_free:NTF \smallcvector
+{
+ \NewDocumentCommand \smallcvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath / matrix} {#1}
+ }
+ \moremath_column_smallvector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % Issue a warning message if the csname is already taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallcvector
+ }
+} % \cs_if_free:NTF \smallcvector
+
+\cs_if_free:NTF \smallrvector
+{
+ \NewDocumentCommand \smallrvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_row_smallvector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % warn if csname is taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallrvector
+ }
+}
+\cs_new_protected:Nn \__moremath_new_vector_shorth_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ % set the delimiter key pre-set for this function
+ \keys_set:nn {moremath / matrix } {delimiter = #3}
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn {moremath / matrix } {##1}
+ }
+ #2 {\l__moremath_matrix_delim_tl} {##2}
+ \group_end:
+ }
+ }{
+ % warn if csname is taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ #1
+ }
+ }
+}
+\__moremath_new_vector_shorth_doc_cmd:NNn \pcvector \moremath_column_vector:nn {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \bcvector \moremath_column_vector:nn {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Bcvector \moremath_column_vector:nn {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vcvector \moremath_column_vector:nn {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vcvector \moremath_column_vector:nn {V}
+\__moremath_new_vector_shorth_doc_cmd:NNn \prvector \moremath_row_vector:nn {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \brvector \moremath_row_vector:nn {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Brvector \moremath_row_vector:nn {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vrvector \moremath_row_vector:nn {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vrvector \moremath_row_vector:nn {V}
+\__moremath_new_vector_shorth_doc_cmd:NNn \psmallcvector \moremath_column_smallvector:nn
+ {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallcvector \moremath_column_smallvector:nn
+ {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallcvector \moremath_column_smallvector:nn
+ {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallcvector \moremath_column_smallvector:nn
+ {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallcvector \moremath_column_smallvector:nn
+ {V}
+\__moremath_new_vector_shorth_doc_cmd:NNn \psmallrvector \moremath_row_smallvector:nn {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallrvector \moremath_row_smallvector:nn {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallrvector \moremath_row_smallvector:nn {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallrvector \moremath_row_smallvector:nn {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallrvector \moremath_row_smallvector:nn {V}
+
+}{ % \bool_if:nTF \l__moremath_predef_crvector_bool FALSE PATH
+ \msg_info:nnnn {moremath} {load / disabling} {no-crvector}
+ {
+ commands~producing~row~and~column~vectors
+ }
+} % \bool_if:nTF \l__moremath_predef_crvector_bool
+\bool_if:nTF \l__moremath_predef_matrix_bool
+{
+\cs_if_free:NTF \diagmat
+{
+ \NewDocumentCommand \diagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_diagonal_matrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} {matrix / already-defined-doc-cmd-skip}
+ {
+ \diagmat
+ }
+} % \cs_if_free:nTF \diagmat
+
+\cs_if_free:NTF \antidiagmat
+{
+ \NewDocumentCommand \antidiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_antidiagonal_matrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \antidiagmat
+ }
+} % \cs_if_free:nTF \antidiagmat
+
+\cs_if_free:NTF \smalldiagmat
+{
+ \NewDocumentCommand \smalldiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_diagonal_smallmatrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smalldiagmat
+ }
+}
+
+\cs_if_free:NTF \smallantidiagmat
+{
+ \NewDocumentCommand \smallantidiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_antidiagonal_smallmatrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallantidiagmat
+ }
+}
+\cs_new_protected:Nn \__moremath_new_matrix_shorth_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ \tl_if_empty:nF {#3}
+ {
+ \keys_set:nn { moremath / matrix }
+ {
+ delimiter = #3
+ }
+ } % \tl_if_empty:nF {#3}
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn { moremath / matrix } {##1}
+ }
+ #2 \l__moremath_matrix_delim_tl {##2}
+ \group_end:
+ }
+ }{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ #1
+ }
+ }
+}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \pdiagmat \moremath_diagonal_matrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bdiagmat \moremath_diagonal_matrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bdiagmat \moremath_diagonal_matrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vdiagmat \moremath_diagonal_matrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vdiagmat \moremath_diagonal_matrix:Vn {V}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \pantidiagmat
+ \moremath_antidiagonal_matrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bantidiagmat
+ \moremath_antidiagonal_matrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bantidiagmat
+ \moremath_antidiagonal_matrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vantidiagmat
+ \moremath_antidiagonal_matrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vantidiagmat
+ \moremath_antidiagonal_matrix:Vn {V}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \psmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {V}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \psmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {V}
+\cs_if_free:NTF \idmat
+{
+ \NewDocumentCommand \idmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_id_matrix:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \idmat FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {\idmat}
+}
+\cs_if_free:NTF \smallidmat
+{
+ \NewDocumentCommand \smallidmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_id_smallmatrix:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \smallidmat FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {\smallidmat}
+}
+\cs_new_protected:Nn \__moremath_new_id_matrix_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ \tl_if_empty:nF {#3}
+ {
+ \keys_set:nn { moremath / matrix } {#3}
+ }
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn { moremath / matrix } {##1}
+ }
+ #2 {##2}
+ \group_end:
+ }
+ }{ % \cs_if_free:NTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {#1}
+ }
+}
+\__moremath_new_id_matrix_doc_cmd:NNn \pidmat \moremath_id_matrix:n { delimiter = p }
+\__moremath_new_id_matrix_doc_cmd:NNn \bidmat \moremath_id_matrix:n { delimiter = b }
+\__moremath_new_id_matrix_doc_cmd:NNn \Bidmat \moremath_id_matrix:n { delimiter = B }
+\__moremath_new_id_matrix_doc_cmd:NNn \vidmat \moremath_id_matrix:n { delimiter = v }
+\__moremath_new_id_matrix_doc_cmd:NNn \Vidmat \moremath_id_matrix:n { delimiter = V }
+\__moremath_new_id_matrix_doc_cmd:NNn \psmallidmat \moremath_id_smallmatrix:n
+ { delimiter = p }
+\__moremath_new_id_matrix_doc_cmd:NNn \bsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = b }
+\__moremath_new_id_matrix_doc_cmd:NNn \Bsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = B }
+\__moremath_new_id_matrix_doc_cmd:NNn \vsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = v }
+\__moremath_new_id_matrix_doc_cmd:NNn \Vsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = V }
+}{ % \bool_if:nTF \l__moremath_predef_matrix_bool FALSE BRANCH
+ \msg_info:nnnn {moremath} { load / disabling } { no-matrix }
+ {
+ (anti-)diagonal~matrix~commands
+ }
+} % \bool_if:nTF \l__moremath_predef_matrix_bool
+\msg_new:nnnn { moremath } { abs-shorth / csname-already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~declaration~of~paired~delimiter~\msg_line_context:.\\
+ Use~package~option~'no-abs-shorthands'~to~disable~the~paired\\
+ delimiter~shorthands.
+}{
+ The~control~sequence~'#1'~has~already~been\\
+ defined~by~something~else.\\
+ I~am~refusing~to~overwrite~its~existing~definition~and~instead~avoid\\
+ declaring~a~paired~delimiter.\\
+}
+\bool_if:NTF \l__moremath_predef_abs_bool
+{
+\cs_if_free:NTF \abs
+{
+ \DeclarePairedDelimiter \abs {\lvert} {\rvert}
+}{
+ % warn if the csname is taken
+ \msg_warning:nnn { moremath } { abs-shorth / csname-already-defined-skip }
+ {\abs}
+} % \cs_if_free:NTF \abs
+
+\cs_if_free:NTF \norm
+{
+ \DeclarePairedDelimiter \norm {\lVert} {\rVert}
+}{
+ % warn if csname is already taken
+ \msg_warning:nnn { moremath } { abs-shorth / csname-already-defined-skip }
+ {\norm}
+} % \cs_if_free:NTF
+}{
+ \msg_info:nnnn {moremath} {load / disabling} {no-abs-shorthands}
+ {
+ '\abs'~and~'\norm'~macros
+ }
+} % End of the conditional
+\endinput
+%%
+%% End of file `moremath.sty'.
diff --git a/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls b/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls
index 7f5955ab4a1..538a98da064 100644
--- a/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls
+++ b/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls
@@ -194,10 +194,11 @@
% Version 4.2 2024/02/18 Changed spacing for sections to address complaints about adjacent sectioning commands
% Version 4.2b 2024/05/16 Added version check for l3kernel.
% Version 4.3 2024/06/07 Fixed bug with TOCs when calc package was loaded; added \msuappendixdelim
+% Version 4.3b 2024/07/08 Fixed spurious page break with biblatex per chapter bibliographies
% Report bugs/problems/questions to <amunn@msu.edu>
%
-\def\msu@version{4.3}
-\def\msu@date{2024/06/07}
+\def\msu@version{4.3b}
+\def\msu@date{2024/07/08}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{msu-thesis}[\msu@date\space Michigan State University Thesis Class version \msu@version]
\@ifundefined{ExplLoaderFileDate}
@@ -837,9 +838,10 @@ chapterapp.code = {
% This code probably needs to be revisited since it’s a unholy amalgam of old and new code
% Removed clearpage from the document level code in response to issue #26.
% Problem seems to only arise with biblatex so more testing is needed
+% Added test for natbib here 7/8/2024 because biblatex produces extra page
\newcommand\msu@addbibheadtotoc{%
\ifmsu@chapterbib
- \clearpage\phantomsection\addcontentsline{toc}{\msu@bibsection}{\bibtocname}
+ \@ifpackageloaded{natbib}{\clearpage}{}\phantomsection\addcontentsline{toc}{\msu@bibsection}{\bibtocname}
\else
\phantomsection\addcontentsline{toc}{chapter}{\bibtocname}
\fi
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 020f9ff08cf..83fc81cae33 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.75}
-\def\filedate{2024/06/18}
+\def\fileversion{1.752}
+\def\filedate{2024/07/05}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -390,7 +390,7 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\fi
\fi
\fi
-
+\iftx@gel\edef\rmdefaultB{mingelasio}\fi
\iftx@minion\edef\rmdefaultB{MinionPro-TLF}\fi
\iftx@noto\edef\rmdefaultB{NotoSerif-TLF}\fi
\iftx@notosans\edef\rmdefaultB{NotoSans-TLF}\fi
diff --git a/Master/texmf-dist/tex/latex/overarrows/overarrows.sty b/Master/texmf-dist/tex/latex/overarrows/overarrows.sty
index f954f12b55b..db0b1b04322 100644
--- a/Master/texmf-dist/tex/latex/overarrows/overarrows.sty
+++ b/Master/texmf-dist/tex/latex/overarrows/overarrows.sty
@@ -17,10 +17,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{overarrows}
-[2023/02/15 v1.1 Custom extensible arrows over math expressions]
+[2024/07/11 v1.2 Custom extensible arrows over math expressions]
\newif\ifovar@option@oldarrows@
\newif\ifovar@option@esvect@ \ovar@option@esvect@true \PassOptionsToPackage{f}{esvect}
\newif\ifovar@option@tikz@
+\newif\ifovar@option@pstricks@
\newif\ifovar@option@pstarrows@
\newif\ifovar@detectsubscripts@
\newif\ifovar@option@subother@
@@ -54,6 +55,7 @@
\DeclareOption{esvecth}{\ovar@option@esvect@true\PassOptionsToPackage{h}{esvect}}
\DeclareOption{old-arrows}{\ovar@option@oldarrows@true}
\DeclareOption{tikz}{\ovar@option@tikz@true}
+\DeclareOption{pstricks}{\ovar@option@pstricks@true}
\DeclareOption{pstarrows}{\ovar@option@pstarrows@true}
\DeclareOption{subscripts}{\ovar@detectsubscripts@true}
\DeclareOption{subother}{\ovar@option@subother@true}
@@ -117,35 +119,70 @@
\ProcessOptions\relax
\RequirePackage{amsmath}
\RequirePackage{etoolbox}
-\let\ovar@rightarrow\rightarrow
-\let\ovar@leftarrow\leftarrow
+\def\ovar@rightarrow{\rightarrow}
+\def\ovar@leftarrow{\leftarrow}
\ifovar@option@oldarrows@
\RequirePackage[old]{old-arrows}
- \let\ovar@rightarrow\varrightarrow
- \let\ovar@leftarrow\varleftarrow
+ \def\ovar@rightarrow{\varrightarrow}
+ \def\ovar@leftarrow{\varleftarrow}
\fi
\ifovar@option@esvect@
\RequirePackage{esvect}
+ \DeclareFontFamily{U}{esvect}{}
+ \DeclareFontShape{U}{esvect}{m}{n}{
+ <-5.5> vect5
+ <5.5-6.5> vect6
+ <6.5-7.5> vect7
+ <7.5-8.5> vect8
+ <8.5-9.5> vect9
+ <9.5-> vect10
+ }{}
\fi
\ifovar@option@tikz@
\RequirePackage{tikz}
\usetikzlibrary{arrows.meta}
\fi
+\ifovar@option@pstricks@
+ \RequirePackage{pstricks-add}
+\fi
\ifovar@option@pstarrows@
\RequirePackage[pstarrows]{pict2e}
\fi
+\DeclareHookRule{begindocument}{overarrows}{after}{unicode-math-luatex}
+\DeclareHookRule{begindocument}{overarrows}{after}{unicode-math-xetex}
+\AddToHook{begindocument}[overarrows]
+ {%
+ \ifdef{\relbareda}
+ {%
+ \gdef\ovar@auto@middle{\relbareda}
+ \gdef\ovar@auto@trim@middle{1}
+ }
+ {%
+ \gdef\ovar@auto@middle{\relbar}
+ \gdef\ovar@auto@trim@middle{2.5}
+ }%
+ \@ifpackageloaded{unicode-math}
+ {%
+ \check@mathfonts
+ \iffontchar\textfont\tw@\string"23AF
+ \gdef\ovar@auto@middle{\mathrel\harrowextender}
+ \gdef\ovar@auto@trim@middle{0}
+ \fi
+ }
+ {}%
+ }
\newcommand{\SetOverArrowsSubscriptCommand}[1]{\global\let\ovar@subcmd=#1}
\SetOverArrowsSubscriptCommand{_}
\ifovar@option@subother@
\begingroup
\catcode `_=12
- \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \SetOverArrowsSubscriptCommand{_}%
\endgroup
\fi
\ifovar@option@subactive@
\begingroup
\catcode `_=13
- \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \SetOverArrowsSubscriptCommand{_}%
\endgroup
\fi
\RequirePackage{pgfkeys}
@@ -286,12 +323,17 @@
}
}
},
+ middle config/harrowextender/.code={%
+ \pgfkeysalso{%
+ middle={\harrowextender},
+ trim middle={0},
+ }
+ },
middle config/auto/.code={%
- \ifovar@option@esvect@
- \pgfkeysalso{middle config=relbareda}
- \else
- \pgfkeysalso{middle config=relbar}
- \fi
+ \pgfkeysalso{%
+ middle={\ovar@auto@middle},
+ trim middle={\ovar@auto@trim@middle},
+ }
},
amsmath/.is choice,%
amsmath/mimic/.code=\pgfkeysalso{%
@@ -369,6 +411,39 @@
shift right=-2,
min length=12,
}
+\SetOverArrowsMethod[lens]{pstricks}{%
+ no arrow macro hook/.code={%
+ \ovar@set{%
+ arrow macro/.expanded={%
+ $\noexpand\mkern \expandonce{\ovar@shift@left} mu\noexpand\relax$%
+ \noexpand\begin{pspicture}\expandonce{\ovar@pstricks@geometry}%
+ \noexpand\psset{linewidth=\expandonce{\ovar@pstricks@linethickness}}%
+ \noexpand\psset{\expandonce{\ovar@pstricks@psset}}%
+ \expandonce{\ovar@pstricks@command}%
+ \noexpand\end{pspicture}%
+ $\noexpand\mkern \expandonce{\ovar@shift@right} mu\noexpand\relax$%
+ }
+ }
+ },
+ pstricks command/.store in=\ovar@pstricks@command,
+ psset/.store in=\ovar@pstricks@psset,
+ geometry/.store in=\ovar@pstricks@geometry,
+ line thickness/.store in=\ovar@pstricks@linethickness,
+ pstricks command/.value required,
+ psset/.value required,
+ geometry/.value required,
+ line thickness/.value required,
+ arrow/.style={pstricks command={\psline{##1}(0,0)(\overarrowlength,0)}},%
+ arrow/.value required,%
+ thinner/.style={line thickness={\overarrowsmallerthickness}},%
+ thinner/.value forbidden,%
+ shift right=-2,
+ min length=12,
+ geometry={(0,-0.5ex)(\overarrowlength,0.5ex)},%
+ line thickness={\overarrowthickness},%
+ arrow={->},%
+ psset={},%
+}
\SetOverArrowsMethod[lens]{picture}{%
no arrow macro hook/.code={%
\ovar@set{%
@@ -413,28 +488,61 @@
\newlength{\overarrowlength}
\newlength{\overarrowthickness}
\newlength{\overarrowsmallerthickness}
-\newlength{\ovar@extralength}
\newlength{\ovar@tempdim}
\def\ovar@set@arrowlength#1#2#3{%
\settowidth{\ovar@tempdim}{$\m@th#2\mskip #1 mu\relax$}%
\settowidth{\overarrowlength}{$\m@th#2#3$}%
\ifdim \overarrowlength < \ovar@tempdim \overarrowlength=\ovar@tempdim\fi%
}
-\def\ovar@set@arrowthickness#1{% use rule thickness=\fontdimen 8 font family 3
+\def\ovar@rulethickness@fontdimen{8}
+\def\ovar@rulethickness@family{3}
+\def\ovar@set@arrowthickness#1{%
\ifx#1\displaystyle%
- \overarrowthickness = \fontdimen 8 \textfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \textfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
\else\ifx#1\textstyle%
- \overarrowthickness = \fontdimen 8 \textfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \textfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
\else\ifx#1\scriptstyle%
- \overarrowthickness = \fontdimen 8 \scriptfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptscriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptscriptfont \ovar@rulethickness@family%
\else%
- \overarrowthickness = \fontdimen 8 \scriptscriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptscriptfont \ovar@rulethickness@family%
\overarrowsmallerthickness = \overarrowthickness%
\fi\fi\fi%
}
+\def\ovar@set@arrowthickness@UM@lua#1{%
+ \overarrowthickness = \Umathoverbarrule #1
+ \ifx#1\displaystyle%
+ \overarrowsmallerthickness = \Umathoverbarrule \textstyle%
+ \else\ifx#1\textstyle%
+ \overarrowsmallerthickness = \Umathoverbarrule \scriptstyle%
+ \else%
+ \overarrowsmallerthickness = \Umathoverbarrule \scriptscriptstyle%
+ \fi\fi%
+}
+\AddToHook{begindocument}[overarrows]
+ {%
+ \@ifpackageloaded{unicode-math-luatex}
+ {%
+ \global\let\ovar@set@arrowthickness\ovar@set@arrowthickness@UM@lua
+ }
+ {%
+ \@ifpackageloaded{unicode-math-xetex}
+ {%
+ \gdef\ovar@rulethickness@fontdimen{54}
+ \gdef\ovar@rulethickness@family{2}
+ }
+ {}
+ }
+ }
\def\ovar@stackover@@#1#2#3#4#5#6{\vbox{\ialign{##\crcr%
$#5\mskip #1 mu\relax$\crcr%
\noalign{#2\nointerlineskip}#4\crcr%
@@ -467,16 +575,27 @@
\ovar@stackunder@{#2}{#3}{#4}{#5}{#6}%
}
\def\ovar@stack@lens{\ovar@stackover@lens}
-\NewDocumentCommand{\DeclareOverArrowCommand}{ O{symb} m m }{%
+\ExplSyntaxOn
+\cs_new_protected:Npn \__overarrows_processor_strip_escape_char:n #1
+ {
+ \regex_match:nnTF { ^\cC. } { #1 }
+ { \tl_set:Nx \ProcessedArgument { \cs_to_str:N #1 } }
+ { \tl_set:Nx \ProcessedArgument { #1 } }
+ }
+\cs_new_eq:NN \ovar@cmdname@processor \__overarrows_processor_strip_escape_char:n
+\ExplSyntaxOff
+\NewDocumentCommand{\DeclareOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\begingroup
\ovar@set@common
\ifcsdef{ovar@set@#1}{%
\csuse{ovar@set@#1}
}{%
\PackageError{overarrows}{Unknown method #1}
- {Try with 'symb', 'tikz' or 'picture'}
+ {Try with 'symb', 'tikz', 'pstriks' or 'picture'}
}
- \ovar@set{#3 }
+ \ovar@set{#3}
\ifdef{\ovar@macro@arrow}{}{%
\ovar@set{no arrow macro hook}
}
@@ -519,12 +638,16 @@
\fi
\endgroup
}
-\NewDocumentCommand{\ProvideOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\ProvideOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsdef{#2}{}{
\DeclareOverArrowCommand[#1]{#2}{#3}
}
}
-\NewDocumentCommand{\NewOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\NewOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsdef{#2}{%
\PackageError{overarrows}{Command \csname #2\endcsname already defined}%
{You have used \protect\NewOverArrowCommand\space with a command that
@@ -534,7 +657,9 @@
\DeclareOverArrowCommand[#1]{#2}{#3}
}
}
-\NewDocumentCommand{\RenewOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\RenewOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsundef{#2}{%
\PackageError{overarrows}{Command \csname #2\endcsname undefined}%
{You have used \protect\RenewOverArrowCommand\space with a command that was
@@ -544,148 +669,151 @@
\DeclareOverArrowCommand[#1]{#2}{#3}
}
}
+\newsavebox\ovar@tempbox
\def\ovar@starversion#1#2#3{%
- #1#2{#3}%
- \settowidth{\ovar@extralength}{$\m@th#1#2{#3}$}
- \settowidth{\ovar@tempdim}{$\m@th#2{#3}$}
- \deflength{\ovar@extralength}{0.5\ovar@extralength-0.5\ovar@tempdim}%
- \kern-\ovar@extralength%
+ \sbox{\ovar@tempbox}{$\m@th #1#2{#3}$}%
+ \usebox{\ovar@tempbox}%
+ \settowidth{\ovar@tempdim}{$\m@th #2{#3}$}%
+ \kern\dimeval{0.5\ovar@tempdim - 0.5\wd\ovar@tempbox}%
}
\ifovar@option@esvect@
\let\esvectvv\vv
\undef\vv
- \NewOverArrowCommand{vv}{esvect, middle config=auto}
-\fi
-\ifovar@option@overrightarrow@
- \DeclareOverArrowCommand{overrightarrow}{%
- amsmath, middle config=relbar,
- end=\ovar@rightarrow,
- right arrow,
- }
-\fi
-\ifovar@option@underrightarrow@
- \DeclareOverArrowCommand{underrightarrow}{%
- amsmath, middle config=relbar,
- end=\ovar@rightarrow,
- right arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftarrow@
- \DeclareOverArrowCommand{overleftarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\relbar,
- left arrow,
- }
-\fi
-\ifovar@option@underleftarrow@
- \DeclareOverArrowCommand{underleftarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftrightarrow@
- \DeclareOverArrowCommand{overleftrightarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\ovar@rightarrow,
- center arrow,
- }
-\fi
-\ifovar@option@underleftrightarrow@
- \DeclareOverArrowCommand{underleftrightarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\ovar@rightarrow,
- center arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overrightharpoonup@
- \DeclareOverArrowCommand{overrightharpoonup}{%
- amsmath, middle config=relbar,
- end=\rightharpoonup,
- right arrow,
- }
-\fi
-\ifovar@option@underrightharpoonup@
- \DeclareOverArrowCommand{underrightharpoonup}{%
- amsmath, middle config=relbar,
- end=\rightharpoonup,
- right arrow,
- arrow under,
- }
+ \NewOverArrowCommand{\vv}{esvect, middle config = relbareda}
\fi
-\ifovar@option@overrightharpoondown@
- \DeclareOverArrowCommand{overrightharpoondown}{%
- amsmath, middle config=relbar,
- end=\rightharpoondown,
- right arrow,
- }
-\fi
-\ifovar@option@underrightharpoondown@
- \DeclareOverArrowCommand{underrightharpoondown}{%
- amsmath, middle config=relbar,
- end=\rightharpoondown,
- right arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftharpoonup@
- \DeclareOverArrowCommand{overleftharpoonup}{%
- amsmath, middle config=relbar,
- start=\leftharpoonup,
- end=\relbar,
- left arrow,
- }
-\fi
-\ifovar@option@underleftharpoonup@
- \DeclareOverArrowCommand{underleftharpoonup}{%
- amsmath, middle config=relbar,
- start=\leftharpoonup,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftharpoondown@
- \DeclareOverArrowCommand{overleftharpoondown}{%
- amsmath, middle config=relbar,
- start=\leftharpoondown,
- end=\relbar,
- left arrow,
- }
-\fi
-\ifovar@option@underleftharpoondown@
- \DeclareOverArrowCommand{underleftharpoondown}{%
- amsmath, middle config=relbar,
- start=\leftharpoondown,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overbar@
- \DeclareOverArrowCommand{overbar}{%
- amsmath, middle config=relbar,
- start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
- shift leftright=0,
- space after arrow=-0.3ex,
- }
-\fi
-\ifovar@option@underbar@
- \DeclareOverArrowCommand{underbar}{%
- amsmath, middle config=relbar,
- start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
- shift leftright=0,
- arrow under,
- space before arrow=-0.3ex,
+\AddToHook{begindocument}[overarrows]
+ {
+ \ifovar@option@overrightarrow@
+ \DeclareOverArrowCommand{\overrightarrow}{%
+ amsmath, middle config=relbar,
+ end=\ovar@rightarrow,
+ right arrow,
+ }
+ \fi
+ \ifovar@option@underrightarrow@
+ \DeclareOverArrowCommand{\underrightarrow}{%
+ amsmath, middle config=relbar,
+ end=\ovar@rightarrow,
+ right arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftarrow@
+ \DeclareOverArrowCommand{\overleftarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
+ \ifovar@option@underleftarrow@
+ \DeclareOverArrowCommand{\underleftarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftrightarrow@
+ \DeclareOverArrowCommand{\overleftrightarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\ovar@rightarrow,
+ center arrow,
+ }
+ \fi
+ \ifovar@option@underleftrightarrow@
+ \DeclareOverArrowCommand{\underleftrightarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\ovar@rightarrow,
+ center arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overrightharpoonup@
+ \DeclareOverArrowCommand{\overrightharpoonup}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoonup,
+ right arrow,
+ }
+ \fi
+ \ifovar@option@underrightharpoonup@
+ \DeclareOverArrowCommand{\underrightharpoonup}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoonup,
+ right arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overrightharpoondown@
+ \DeclareOverArrowCommand{\overrightharpoondown}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoondown,
+ right arrow,
+ }
+ \fi
+ \ifovar@option@underrightharpoondown@
+ \DeclareOverArrowCommand{\underrightharpoondown}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoondown,
+ right arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftharpoonup@
+ \DeclareOverArrowCommand{\overleftharpoonup}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoonup,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
+ \ifovar@option@underleftharpoonup@
+ \DeclareOverArrowCommand{\underleftharpoonup}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoonup,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftharpoondown@
+ \DeclareOverArrowCommand{\overleftharpoondown}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoondown,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
+ \ifovar@option@underleftharpoondown@
+ \DeclareOverArrowCommand{\underleftharpoondown}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoondown,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overbar@
+ \DeclareOverArrowCommand{\overbar}{%
+ amsmath, middle config=relbar,
+ start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
+ shift leftright=0,
+ space after arrow=-0.3ex,
+ }
+ \fi
+ \ifovar@option@underbar@
+ \DeclareOverArrowCommand{\underbar}{%
+ amsmath, middle config=relbar,
+ start={\vphantom{+}\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
+ shift leftright=0,
+ arrow under,
+ space before arrow=-0.3ex,
+ }
+ \fi
}
-\fi
\newcommand{\ovar@testmathstyles}[2][]{
\begingroup
\newcommand*{\ovar@row@teststyle}[1]{%
@@ -728,7 +856,9 @@
\end{displaymath}
}
\endgroup
-\NewDocumentCommand{\TestOverArrow}{ s o m }{
+\NewDocumentCommand{\TestOverArrow}{
+ s o >{\ovar@cmdname@processor} m
+}{%
\ifcsdef{#3}{}{%
\PackageWarning{overarrows}{Unknown name '#3' passed to
\protect\TestOverArrow}
diff --git a/Master/texmf-dist/tex/latex/passopt/passopt.sty b/Master/texmf-dist/tex/latex/passopt/passopt.sty
new file mode 100644
index 00000000000..d74c698d27a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/passopt/passopt.sty
@@ -0,0 +1,56 @@
+%
+% ***************** THE PASSOPT PACKAGE *****************
+%
+% Copyright (C) 2024 by Qu Yi <toquyi@163.com>
+%
+% This work may be distributed and/or modified under the
+% conditions of the CC-BY 4.0 License.
+% The latest version of this license is in
+% https://creativecommons.org/licenses/by/4.0/legalcode
+\NeedsTeXFormat{LaTeX2e}[2021/11/15]
+\ProvidesExplPackage{passopt}{2024/07/17}{1.01a}
+ {Passing options to packages or classes}
+
+\cs_generate_variant:Nn \tl_if_blank:nTF { v }
+\cs_new_protected:Npn \po_add_before_hook:nnn #1#2
+ { \hook_gput_code:nnn { #1/#2/before } { passopt } }
+\cs_new_protected:Npn \po_set_options_list:nnnnn #1#2#3#4#5
+ {
+ \po_add_before_hook:nnn {#1} {#5}
+ {
+ \cs_set:cpx { @raw@opt@#5.#2 }
+ {
+ \IfBooleanTF{#3}
+ {\exp_not:o {#4}}
+ {
+ \tl_if_blank:vTF { @raw@opt@#5.#2 }
+ { \exp_not:o {#4} }
+ { \exp_not:v { @raw@opt@#5.#2 },\exp_not:o {#4} }
+ }
+ }
+ \exp_args:Nc \protected@edef { opt@#5.#2 }
+ {
+ \exp_last_unbraced:Nv
+ \zap@space { @raw@opt@#5.#2 }~\@empty
+ }
+ }
+ }
+\cs_new_protected:Npn \po_clear_options_list:nnn #1#2#3
+ {
+ \po_add_before_hook:nnn {#1} {#3}
+ {
+ \tl_clear:c { @raw@opt@#3.#2 }
+ \tl_clear:c { opt@#3.#2 }
+ }
+ }
+\NewDocumentCommand{\SetOptionsToPackage}{smm}
+ {\po_set_options_list:nnnnn { package } { sty } {#1} {#2} {#3}}
+\NewDocumentCommand{\SetOptionsToClass}{smm}
+ {\po_set_options_list:nnnnn { class } { cls } {#1} {#2} {#3}}
+\cs_new_protected:Npn \ClearPackageOptions #1
+ { \po_clear_options_list:nnn { package } { sty } {#1} }
+\cs_new_protected:Npn \ClearClassOptions #1
+ { \po_clear_options_list:nnn { class } { cls } {#1} }
+\endinput
+%
+% End of file `passopt.sty'. \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
index 00b7dcc0f5e..88936f4045f 100644
--- a/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
+++ b/Master/texmf-dist/tex/latex/pdfx/pdfx.sty
@@ -6,9 +6,9 @@
%%
%% pdfx.dtx (with options: `package')
%%
-%% Copyright (c) 2019, CV Radhakrishnan <cvr@river-valley.org>,
+%% Copyright (c) 2019-2024, CV Radhakrishnan <cvr@river-valley.org>,
%% Han The Thanh <thanh@river-valley.org>,
-%% Ross Moore <ross.moore@mq.edu.au>,
+%% Ross Moore <ozross@icloud.com> - primary contact,
%% Peter Selinger <selinger@mathstat.dal.ca>
%%
%% This file may be distributed and/or modified under the conditions
@@ -31,7 +31,7 @@
}{}%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfx}
- [2019/02/27 v1.6.3 PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
+ [2024/06/24 v1.6.5f PDF/X and PDF/A support (CVR/HTH/RRM/PS)]
\newif\ifpdfx@noBOM \pdfx@noBOMfalse % use a BOM in the XMP packet
\newif\ifpdfx@x \pdfx@xfalse % PDF/X mode
@@ -50,13 +50,28 @@
\def\xmp@ReleaseDate{2005} % 2001 for PDF/X-1, 2005 for PDF/A-1,
% 2010 for PDF/A-2, 2012 for PDF/A-3.
+%% with Beamer pgf will have written Resource objects already
+\newif\ifpdfx@luacheck@needed
+\@ifpackageloaded{pgfcore}{\pdfx@luacheck@neededtrue}{}
+%% thanks to Ryutaroh Matsumoto for reporting this issue
+
\newcount\pdfx@minorversion
+\newcount\pdfx@majorversion
+\expandafter\ifx\csname pdfmajorversion\endcsname\relax
+%% RRM: 20240614 LuaLaTeX may not have this defined
+ \newcount\pdfmajorversion
+ \pdfmajorversion=1\relax
+\fi
\expandafter\ifx\csname pdfminorversion\endcsname\relax
-\else
- \global\pdfx@minorversion=\the\pdfminorversion
+%% RRM: 20240614 this could be set in luatex85 package
+ \newcount\pdfminorversion
+ \pdfminorversion=3\relax
\fi
+%% options can change these from the defaults
+\global\pdfx@majorversion=\the\pdfmajorversion
+\global\pdfx@minorversion=\the\pdfminorversion
-\def\pdfx@ErrorWarning#1#2#3#4{%
+\def\pdfx@ErrorWarning #1#2#3#4{%
\ifpdfx@noerr \PackageWarning{pdfx}{#1.^^J #2#3.^^J}%
\else \PackageError{pdfx}{#1}{#2#4.^^J
Use option 'noerr' to avoid this message.^^J}%
@@ -237,6 +252,9 @@
\DeclareOption{pdf15}{\global\pdfx@minorversion=5 }% 2005 Acrobat 6
\DeclareOption{pdf16}{\global\pdfx@minorversion=6 }% 2006 Acrobat 7 (ISBN 0-321-30474-8)
\DeclareOption{pdf17}{\global\pdfx@minorversion=7 }% 2008 ISO 32000-1:2008
+\DeclareOption{pdf20}{% 2020 ISO 32000-2:2020
+ \global\pdfx@majorversion=2 \relax
+ \global\pdfx@minorversion=0 }%
%% inhibits writing the XMP byte-order marker
\DeclareOption{noBOM}{\pdfx@noBOMtrue}
@@ -301,6 +319,13 @@
\ExecuteOptions{noBOM,a-1b}
\ProcessOptions
+\RequirePackage{ifluatex}
+\ifpdfx@luacheck@needed
+ \ifluatex
+ \RequirePackage{luatex85}
+ \fi
+\fi
+
\ifpdfx@ua\ifpdfx@x\else
\expandafter\if\xmp@Conformance A\else
\pdfx@ErrorWarning{PDF/UA requires 'Tagged PDF' for any structure.^^J
@@ -313,19 +338,23 @@
\expandafter\ifx\csname pdflastobj\endcsname\relax
\else
- \ifnum\pdflastobj >\z@ % pdftex has already written objects
+ \ifnum\pdflastobj >\z@ % pdf/luatex has already written objects
+ % e.g. by pgfcore , called from Beamer or other class
\ifnum\pdfx@minorversion=\pdfminorversion\else
\PackageError{pdfx}%
{^^J(pdfx) Cannot change the \string\pdfminorversion^^J%
- (pdfx) PDF version remains at 1.\the\pdfminorversion.^^J%
- (pdfx) Use \string\pdfminorversion=\the\pdfx@minorversion\space
+ (pdfx) PDF version remains at \the\pdfmajorversion.\the\pdfminorversion.^^J%
+ (pdfx) Use \string\pdfmajorversion=\the\pdfx@majorversion\space^^J%
+ and \string\pdfminorversion=\the\pdfx@minorversion\space
before \string\documentclass}%
{(pdfx) Another package or document-class has written objects into the PDF.^^J%
- (pdfx) Hit return to continue with PDF version 1.\the\pdfminorversion.%
- }%
+ (pdfx) Hit return to continue with PDF version %
+ \the\pdfmajorversion.\the\pdfminorversion.}%
+ \global\pdfx@majorversion=\the\pdfmajorversion
\global\pdfx@minorversion=\the\pdfminorversion
\fi
\else
+ \global\pdfmajorversion\pdfx@majorversion
\global\pdfminorversion\pdfx@minorversion
\fi
\fi
@@ -333,6 +362,7 @@
\expandafter\ifx\csname thepdfminorversion\endcsname\relax
\expandafter\ifx\csname pdfminorversion\endcsname\relax
\else
+ \xdef\thepdfmajorversion{\the\pdfmajorversion}
\xdef\thepdfminorversion{\the\pdfminorversion}
\fi\fi
@@ -341,16 +371,21 @@
\def\pdf@minorversion@xetex=#1{\gdef\thepdfminorversion{#1}}%
\let\pdfminorversion\pdf@minorversion@xetex
\else
- \ifnum\pdfminorversion < 4\relax
- \ifpdfx@x
- % more testing needed with PDF/X
- \else
- \pdfminorversion=4\relax % assumed for PDF/A ; options may change this for PDF/X
- \gdef\thepdfminorversion{4}%
- \fi
+ \ifnum\pdfmajorversion > 1\relax
+ \pdfminorversion=3\relax
+ %% else some JPG graphics with DCT encoding will fail
\else
- \ifnum\pdfminorversion<\thepdfminorversion\relax
- \global\pdfminorversion=\thepdfminorversion\relax
+ \ifnum\pdfminorversion < 4\relax
+ \ifpdfx@x
+ % more testing needed with PDF/X
+ \else
+ \pdfminorversion=4\relax % assumed for PDF/A ; options may change this for PDF/X
+ \gdef\thepdfminorversion{4}%
+ \fi
+ \else
+ \ifnum\pdfminorversion<\thepdfminorversion\relax
+ \global\pdfminorversion=\thepdfminorversion\relax
+ \fi
\fi
\fi
\fi
@@ -358,7 +393,8 @@
\pdfresetpageorigin=0
\fi
-\expandafter\ifx\csname pdfomitcharset\endcsname\relax\else
+\expandafter\ifx\csname pdfomitcharset\endcsname\relax
+\else
\ifpdfx@omitcharset
\pdfomitcharset = 1 %
%% do not create /Charset listings of font glyphs;
@@ -427,7 +463,9 @@
}%
\RequirePackage{pdftexcmds}%
\let\pdfx@mdfivesum\pdf@mdfivesum
- \let\pdfescapestring\pdf@escapestring
+ \long\def\pdf@escapestring@byte #1{%
+ \directlua {oberdiek.pdftexcmds.escapestring("\luaescapestring {#1}", "byte")}}%
+ %\let\pdf@escapestring\pdf@escapestring@byte
\else
\ifxetex
\expandafter\ifx\csname mdfivesum\endcsname\relax
@@ -477,6 +515,13 @@
\pdfgeninterwordspace=0 \relax
\fi
\begingroup
+ \expandafter\ifx\csname stockwidth\endcsname\relax\else
+ \ifdim\stockwidth=\z@ %% 20240528
+ \else
+ %% 20231023 support for memoir's stockwidth/height
+ \let\paperwidth\stockwidth
+ \let\paperheight\stockheight
+ \fi \fi
\dimen0=0.996264009963\paperwidth\relax
\edef\pdfx@mwidth{\strip@pt\dimen0}%
\advance\dimen0 -25\p@
@@ -524,7 +569,8 @@
\else
\ifnum\thepdfminorversion >3 \relax
\expandafter\ifx\csname pdfsuppresswarningdupmap\endcsname\relax
- \expandafter\ifx\csname pdfmapline\endcsname\relax\else
+ \expandafter\ifx\csname pdfmapline\endcsname\relax
+ \else
\pdfmapline{+dummy-space <dummy-space.pfb}
\fi
\else
@@ -554,16 +600,31 @@
\@namedef{M@L8U}{}%
%% adjust to LaTeX's 2018 change to the default encoding
+\def\pdfx@utfencodingname{utf8}%
+\def\pdfx@RawInputEncoding{%
+ \UseRawInputEncoding
+}
\expandafter\ifx\csname inputencodingname\endcsname\relax
\else
\def\pdfx@restoreencoding#1{%
- \@tempcnta=128
+ \@tempcnta=1\relax
+ \loop
+ \advance\@tempcnta\@ne
+ \ifnum\@tempcnta<8\relax
+ \repeat
+ \catcode11=13 \relax
+ \@tempcnta=14\relax
+ \loop
+ \advance\@tempcnta\@ne
+ \ifnum\@tempcnta<31 \relax
+ \repeat
+ \@tempcnta=128\relax
\loop
- \catcode\@tempcnta=13
\advance\@tempcnta\@ne
\ifnum\@tempcnta<256
\repeat
- \inputencoding{#1}%
+ \let\inputencodingname\relax %% kill previous
+ \inputencoding{#1}%}%
\let\LastDeclaredEncoding\pdfx@LastDeclaredEncoding
\let\DeclareFontEncoding@\pdfx@DeclareFontEncoding@
\let\DeclareUnicodeCharacter\pdfx@DeclareUnicodeCharacter
@@ -572,7 +633,9 @@
\let\pdfx@inputencodingname\inputencodingname
\global\let\pdfx@DeclareUnicodeCharacter\DeclareUnicodeCharacter
\global\let\pdfx@DeclareFontEncoding@\DeclareFontEncoding@
- \UseRawInputEncoding
+%% \expandafter\showthe\catcode\@tempcnta
+%% if the encoding is utf8 then don't change it here – wrong!
+ \expandafter\pdfx@RawInputEncoding %\fi
\fi
\InputIfFileExists{\pdfx@encodingfile}{}{}
\expandafter\ifx\csname pdfx@inputencodingname\endcsname\relax
@@ -699,6 +762,9 @@
\ifx\relax#1\relax\else\gdef\xmp@lang@Identifier{#1}\fi
\def\afterxmp@parse{\let\Identifier\pdfx@extraIdentifier}%
\xmp@parse{\global\let\xmp@Identifier\@this}}
+\newcommand{\pdfx@Nickname}[1][]{%
+ \ifx\relax#1\relax\else\gdef\xmp@lang@Nickname{#1}\fi
+ \xmp@parse{\global\let\xmp@Nickname\@this}}
\newcommand{\pdfx@Thumbnails}{%
\def\afterxmp@parse{\let\Thumbnails\pdfx@extraThumbnails}%
\xmp@parse{\global\let\xmp@Thumbnails\@this}}
@@ -899,6 +965,8 @@
\xmp@parse{\global\let\xmp@extraIdentifier\@this}%
}%
+%% Nickname only supports a single usage, for PDF/X
+
\newcommand{\pdfx@extraThumbnails}[1][]{%
\ifx\relax#1\relax
\expandafter\expandafter\expandafter\gdef
@@ -1254,6 +1322,9 @@
%%----------------------------------------------------------------------
%% Alternative way to get the CreationDate using Lua for XeTeX
\ifdefined\pdfcreationdate\else
+ \ifdefined\creationdate %% added to XeTeX in 2019
+ \let\pdfcreationdate\creationdate
+ \else
\begingroup %% ensure correct catcodes, not done by \dospecials
\catcode`\:=12 \catcode`\.=12
\begin{filecontents*}{creationdate.lua}
@@ -1289,7 +1360,7 @@
\def\noexpand\pdfcreationdate{\string D:20181028075445+10'00'}}%
\x
\fi
-\fi
+\fi \fi
%%----------------------------------------------------------------------
\def\pdfx@findUUID#1{\edef\pdfx@tmpstring{\pdfx@mdfivesum{#1}}
@@ -1460,7 +1531,6 @@
\fi\fi
}%
\fi\fi
-\hypersetup{pdfencoding=auto}% unicode
\expandafter\ifx\csname KV@Hyp@psdextra\endcsname\relax\else
\hypersetup{psdextra}
\fi
@@ -2195,16 +2265,17 @@
%% encoding, and store the result in \toka As a special case, if \tokb
%% is \@empty, set \toka to \@empty.
-\def\pdfx@topdfstring#1#2{%
- \ifx#2\@empty
+\RequirePackage{stringenc}% prevent it loading later inside a group
+\def\pdfx@topdfstring #1#2{%
+ \ifx #2\@empty
\global\let#1\empty
\else
\begingroup
\ifluatex\else\ifxetex\else
\inputencoding{utf8}%
\fi\fi
- \hypersetup{pdfencoding=auto}%
- \pdfstringdef#1{#2}%
+ \@ifl@t@r\fmtversion{2022/06/01}{}{\hypersetup{pdfencoding=auto}}%
+ \pdfstringdef #1{#2}%
\endgroup
\fi
}
@@ -2474,7 +2545,7 @@
\spacefactor\accent@spacefactor
}
%% same for named accents in math-mode
-\def\pdfx@mathaccentV#1#2#3#4#5{%
+\def\pdfx@mathaccentV #1#2#3#4#5{%
#5{\mathsurround=\z@\relax
\everymath{}%
\mathchoice
@@ -2485,10 +2556,67 @@
}%
\AMS@mathaccentV{#1}{#2}{#3}{#4}{\phantom{#5}}%
}
+
+%%% the original AMS coding:
+%%\mathaccentV=macro: #1#2#3#4#5->\ifmmode
+%% \gdef \macc@tmp {\macc@depth \@ne }%
+%% \setbox \z@ \hbox {\let\mathaccentV \macc@test
+%% \let \use@mathgroup \@gobbletwo
+%% \let \select@group \@gobblethree \frozen@everymath {}$#5$}\macc@tmp
+%% \ifnum \macc@depth =\@ne
+%% \global \let \macc@nucleus \@empty
+%% \mathaccent "\accentclass@
+%% \else \@xp \macc@nested
+%% \fi #2#3#4{#5}\macc@nucleus
+%% \else
+%% \@xp \nonmatherr@ \csname #1\endcsname \fi .
+
+\def\pdfx@AMS@mathaccentV #1#2#3#4#5{%
+ \ifmmode
+ \gdef \macc@tmp {\macc@depth \@ne }%
+ \setbox \z@ \hbox {\let\mathaccentV \macc@test
+ \let \use@mathgroup \@gobbletwo
+ \let \select@group \@gobblethree \frozen@everymath {}$\phantom{#5}$}\macc@tmp
+ \ifnum \macc@depth =\@ne
+ \global \let \macc@nucleus \@empty
+ \mathaccent "\accentclass@
+ \else \@xp \macc@nested
+ \fi #2#3#4{#5}\macc@nucleus
+ \else
+ \@xp \nonmatherr@ \csname #1\endcsname
+ \fi
+}
+
+%% code supplied by Yuwsuke Kieda, 7 May 2019 :
+%% https://gist.github.com/yuw/a31936370647d0044eeb4e47f3ae913f
+%%
+\@ifpackageloaded{amsmath}{%
+ \def\pdfx@macc@a #1#2{%
+ \begingroup
+ \let\macc@style#1\relax
+ \def\macc@palette ##1{##1\macc@style}%
+ \advance\macc@depth\m@ne
+ \ifnum\macc@depth=\z@
+ \gdef\macc@nucleus{\phantom{#2}}%% <<< here
+ \setbox\z@\hbox{$#1#2\@empty{}\macc@skewchar$}%
+ \setbox\tw@\hbox{$#1#2\@empty\macc@skewchar$}%
+ \dimen@\tw@\wd\tw@ \advance\dimen@-\tw@\wd\z@
+ \xdef\macc@kerna{\the\dimen@\relax}%
+ \setbox4\hbox{$#1#2\acc@check\@empty$}%
+ \global\setbox\@ne\hbox to\wd4{}%
+ \ht\@ne\ht4 \dp\@ne\dp4
+ \xdef\macc@kernb{\the\wd4\relax}%
+ \mathaccent\macc@code{\box\@ne\kern\macc@kerna}%
+ \else
+ \mathaccent\macc@code{\let\macc@adjust\@empty #1#2\@empty}%
+ \macc@adjust
+ \fi
+ \endgroup
+ }}\relax
\AtBeginDocument{%
\@ifpackageloaded{amsmath}{%
\let\AMS@mathaccentV\mathaccentV
- \let\mathaccentV\pdfx@mathaccentV}%
+ }%
}%
%% How to support XeTeX here ?
@@ -2740,10 +2868,25 @@
%% it should be loaded outside the grouping, else biblatex may barf
%%
\RequirePackage{ifthen}
-\begingroup
+
+%% 2024-04-05: from July 2024 LaTeX will not allow packages to load
+%% within a grouping, so reorganise a bit.
+%%
%% override the \ifpdf check of xmpincl package, inside the grouping
- \pdftrue
- \RequirePackage{xmpincl}
+%% after saving its current value:
+\let\pdfx@ifpdf\ifpdf
+\pdftrue
+%% now load the packages, then enter the grouping:
+\RequirePackage{xmpincl}
+%%
+\begingroup
+%%% 20240405 revert the value of \ifpdf ...
+\pdfx@ifpdf
+\else
+ %% 20240624 ... outside the grouping
+ \aftergroup\pdffalse
+\fi
+
%% combine coding from xmpincl and hyperxml to support XeTeX
\def\pdfx@xmpincl@xetex#1{%
\IfFileExists{#1.xmp}{%
@@ -2799,6 +2942,13 @@
%%----------------------------------------------------------------------
\begingroup
+%% 20210706 we need a pointer to unexpandable \par
+ \expandafter\ifx\csname tex_par:D\endcsname \relax
+ \let\pdfx@par\par
+ \else
+%% using LaTeX 2021-06 or later
+ \expandafter\let\expandafter\pdfx@par\csname tex_par:D\endcsname
+ \fi
\ifpdfx@x
\ifpdfx@vt
\def\xmp@template{pdfvt}%
@@ -2852,9 +3002,11 @@
%% beware 128 space characters -- for padding end of XMP packet
\gdef\paddingline{ }%
\typeout{Using XMP template file: \xmp@template.xmp}%
+ %% 20210706 ensure \par is unexpandable
+ \let\par\pdfx@par
\includexmp{\xmp@template}%
\endgroup
-
+%%%
%%
%% revert active characters to previous encoding
%%
@@ -2918,13 +3070,27 @@
%%
%% controls the color model and conversions with xcolor package
%%
+\def\pdfx@selectcolormodel@doing #1{%% Warning
+ \PackageWarning{pdfx}{Setting all color commands to #1,^^J%
+ consistent with the Color Model for PDF/%
+ \ifpdfx@x X \else \ifpdfx@e E \else A \fi\fi}%
+ }%% 20240528 inhibit any changes
+\def\pdfx@selectcolormodel@done #1{%% Warning
+ \PackageWarning{pdfx}{Color Model already set for PDF/%
+ \ifpdfx@x X\else \ifpdfx@e E\else A\fi\fi,^^Jcannot change to #1 }%
+ }%% 20240528 inhibit any changes
+%%
\ifpdfx@cmyk
%
% this will have been done already for PDF/X
%
\PassOptionsToPackage{cmyk,hyperref}{xcolor}
- \def\pdfx@handlexcolor{\def\@@mod{cmyk}\selectcolormodel{cmyk}%
- \convertcolorsUtrue\convertcolorsDtrue}
+ \def\pdfx@handlexcolor{\def\@@mod{cmyk}%
+ \pdfx@selectcolormodel@doing{cmyk}%
+ \selectcolormodel{cmyk}%
+ \convertcolorsUtrue\convertcolorsDtrue
+ \let\selectcolormodel\pdfx@selectcolormodel@done
+ }
\ifpdfx@x
\else
%% \AtBeginDocument{%
@@ -2947,8 +3113,12 @@
\fi
\else
\PassOptionsToPackage{rgb,hyperref}{xcolor}
- \def\pdfx@handlexcolor{\def\@@mod{rgb}\selectcolormodel{rgb}%
- \convertcolorsUtrue\convertcolorsDtrue}
+ \def\pdfx@handlexcolor{\def\@@mod{rgb}%
+ \pdfx@selectcolormodel@doing{rgb}%
+ \selectcolormodel{rgb}%
+ \convertcolorsUtrue\convertcolorsDtrue
+ \let\selectcolormodel\pdfx@selectcolormodel@done
+ }
\fi
\@ifpackageloaded{xcolor}{\pdfx@handlexcolor
\ifpdfx@cmyk\else\color{black}\fi}{%
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty b/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
index 3768fc4f249..d3e8d4cbe17 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
@@ -1,4 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Hugo Gomes @ 07/07/2024 v2.1.1
% Hugo Gomes @ 03/04/2024 v2.1.0a
% Hugo Gomes @ 14/02/2024 v2.1.0
% Hugo Gomes @ 29/05/2023 v2.0.1
@@ -7,7 +8,7 @@
% Hugo Gomes @ 10/10/2022 v1.0.0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{pgf-PeriodicTable}[03/04/2024 pgf-PeriodicTable v2.1.0a]%%
+\ProvidesPackage{pgf-PeriodicTable}[07/07/2024 pgf-PeriodicTable v2.1.1]%%
\RequirePackage{tikz}%
\usetikzlibrary{fadings}%
\tikzfading[name=aumentax, left color=transparent!80, right color=transparent!1]%
@@ -190,10 +191,10 @@ font,IUPAC,capitalize element names=false,show title,show period numbers,show gr
show legend,legend acronyms,legend back color,show legend pins,show extra legend,legend radio color,%
legend CS color,legend Z color,show blocks=false,show families=false,show MNM line,show periodic variations=false,%
show label LaAc,title font,title color,cell width,cell height,cell style,label font,period label color,group label color,%
-label LaAc font,Z list,CS solid, CS liquid,CS gas,CS synt,CS font,CS render mode,CS outline color,CS outline width,%
+label LaAc font,group numbers,Roman label color,Z list,CS solid, CS liquid,CS gas,CS synt,CS font,CS render mode,CS outline color,CS outline width,%
Z backcolor,Z color,Z font,Z align,Z padding,Z use box width=false,name color,name font,name align,Ar color,Ar font,Ar label,Ar precision,%
R color,R font,Rcov color,Rcov font,Rion color,Rion font,Ei color,Ei font,eneg color,eneg font,eaff color,eaff font,%
-O color,O font,Tmelt color,Tmelt font,TmeltC color,TmeltC font,Tboil color,Tboil font,TboilC color,TboilC font,%
+O color,O font,O Roman=false,Tmelt color,Tmelt font,TmeltC color,TmeltC font,Tboil color,Tboil font,TboilC color,TboilC font,%
eDist color,eDist font,eDist sep,eConfign color,eConfign font,eConfignl color,eConfignl font,d color,d font,Cp color,Cp font,%
kT color,kT font,ls color,ls font,ls align,ls,lsa color,lsa font,lsb color,lsb font,lsc color,lsc font,lsca color,lsca font,%
DiscY color,DiscY font,DiscY BC scale,DiscC color,DiscC font,spectra color,spectra font,MNM line color,MNM line width,%DiscC,
@@ -661,6 +662,16 @@ d unit,d precision,E precision,ls unit,ls precision,T precision,Cp precision,kT
\fi%
% O -> Oxidation States
\ifpgfPT@O\relax%
+ \ifpgfPTORoman% new in v2.1.1
+ \ifnum\Z=25\relax% Mn
+ \node[font=\pgfPTOfont,text=\pgfPTOcolor,text width=\pgfPT@data@O@wd,text centered]%
+ at ([xshift=\pgfPT@data@O@x,yshift=-\pgfPT@data@O@y]\Z) {\vbox to\pgfPT@data@O@ht{\vfil\pgfPT@box@zerodepth{\resizebox{.95\linewidth}{\height}{\pgfPT@data@ORoman}}
+ \vfil}};%
+ \else%
+ \node[font=\pgfPTOfont,text=\pgfPTOcolor,text width=\pgfPT@data@O@wd,text centered]%
+ at ([xshift=\pgfPT@data@O@x,yshift=-\pgfPT@data@O@y]\Z) {\vbox to\pgfPT@data@O@ht{\vfil\pgfPT@box@zerodepth{\pgfPT@data@ORoman}\vfil}};%
+ \fi%
+ \else%
\ifnum\Z=25\relax% Mn
\node[font=\pgfPTOfont,text=\pgfPTOcolor,text width=\pgfPT@data@O@wd,text centered]%
at ([xshift=\pgfPT@data@O@x,yshift=-\pgfPT@data@O@y]\Z) {\vbox to\pgfPT@data@O@ht{\vfil\pgfPT@box@zerodepth{\resizebox{.95\linewidth}{\height}{\pgfPT@data@O}}
@@ -669,6 +680,7 @@ d unit,d precision,E precision,ls unit,ls precision,T precision,Cp precision,kT
\node[font=\pgfPTOfont,text=\pgfPTOcolor,text width=\pgfPT@data@O@wd,text centered]%
at ([xshift=\pgfPT@data@O@x,yshift=-\pgfPT@data@O@y]\Z) {\vbox to\pgfPT@data@O@ht{\vfil\pgfPT@box@zerodepth{\pgfPT@data@O}\vfil}};%
\fi%
+ \fi%
\fi%
% Tmelt -> Melting Point (Kelvin)
\ifpgfPT@Tmelt\relax%
@@ -1188,15 +1200,21 @@ d unit,d precision,E precision,ls unit,ls precision,T precision,Cp precision,kT
% groups -->
\ifpgfPTgrlabels%
\global\pgfPTis@labeldrawnfalse%
+\pgfPT@gr@numbers{\pgfPTgrnum}% new in v2.1.1
\ifpgfPTIUPACMMIX%
\foreach \group in {1,2,4,5,...,18} {%
\edef\pgfPT@@grlist{\csname pgfPT@cells@G\@Roman\group\endcsname}%
\foreach \Zsearch in \pgfPT@@grlist{%
\foreach \Z in \pgfPT@@cellslist {%
\ifnum\Z=\Zsearch\global\pgfPTis@labeldrawntrue%
- {\pgfPTlabfont\pgfPTnumberfont\ifpgfPT@zhnumbers@gr\let\pgfPT@printnum\zhnumber\else\let\pgfPT@printnum\relax\fi%
- \node[above,font=\pgfPTlabfont,text=\pgfPTlabgrcolor] at%
- ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift]\Z) {\pgfPT@printnum{\group}};}\breakforeach\fi%
+ {\pgfPTlabfont\pgfPTnumberfont\colorlet{pgfPT@grcolor}{\pgfPTlabgrcolor}\ifpgfPT@zhnumbers@gr\let\pgfPT@printnum\zhnumber\else%
+ \ifpgfPT@grRoman\let\pgfPT@printnum\pgfPT@gr@Roman\colorlet{pgfPT@grcolor}{\pgfPTRomanlabgrcolor}\else\let\pgfPT@printnum\relax\fi\fi%
+ \node[above,font=\pgfPTlabfont,text=pgfPT@grcolor] at%
+ ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift]\Z) {\pgfPT@printnum{\group}};
+ \ifpgfPT@grarabic\colorlet{pgfPT@grcolor}{\pgfPTlabgrcolor}%
+ \node[above,font=\pgfPTlabfont,text=pgfPT@grcolor] at%
+ ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift+2ex]\Z) {\group};\fi}%
+ \breakforeach\fi%
}%
\ifpgfPTis@labeldrawn\global\pgfPTis@labeldrawnfalse\breakforeach\fi%
}%
@@ -1205,9 +1223,14 @@ d unit,d precision,E precision,ls unit,ls precision,T precision,Cp precision,kT
\foreach \Zsearch in \pgfPT@cells@GIIILaAc{%
\foreach \Z in \pgfPT@@cellslist {%
\ifnum\Z=\Zsearch\global\pgfPTis@labeldrawntrue%
- {\pgfPTlabfont\pgfPTnumberfont\ifpgfPT@zhnumbers@gr\let\pgfPT@printnum\zhnumber\else\let\pgfPT@printnum\relax\fi%
- \node[above,font=\pgfPTlabfont,text=\pgfPTlabgrcolor] at%
- ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift]\Z) {\pgfPT@printnum{3}};}\breakforeach\fi%
+ {\pgfPTlabfont\pgfPTnumberfont\colorlet{pgfPT@grcolor}{\pgfPTlabgrcolor}\ifpgfPT@zhnumbers@gr\let\pgfPT@printnum\zhnumber\else%
+ \ifpgfPT@grRoman\let\pgfPT@printnum\pgfPT@gr@Roman\colorlet{pgfPT@grcolor}{\pgfPTRomanlabgrcolor}\else\let\pgfPT@printnum\relax\fi\fi%
+ \node[above,font=\pgfPTlabfont,text=pgfPT@grcolor] at%
+ ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift]\Z) {\pgfPT@printnum{3}};
+ \ifpgfPT@grarabic\colorlet{pgfPT@grcolor}{\pgfPTlabgrcolor}%
+ \node[above,font=\pgfPTlabfont,text=pgfPT@grcolor] at%
+ ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift+2ex]\Z) {3};\fi}%
+ \breakforeach\fi%
}%
\ifpgfPTis@labeldrawn\global\pgfPTis@labeldrawnfalse\breakforeach\fi%
}%
@@ -1217,9 +1240,14 @@ d unit,d precision,E precision,ls unit,ls precision,T precision,Cp precision,kT
\foreach \Zsearch in \pgfPT@@grlist{%
\foreach \Z in \pgfPT@@cellslist {%
\ifnum\Z=\Zsearch\global\pgfPTis@labeldrawntrue%
- {\pgfPTlabfont\pgfPTnumberfont\ifpgfPT@zhnumbers@gr\let\pgfPT@printnum\zhnumber\else\let\pgfPT@printnum\relax\fi%
- \node[above,font=\pgfPTlabfont,text=\pgfPTlabgrcolor] at%
- ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift]\Z) {\pgfPT@printnum{\group}};}\breakforeach\fi%
+ {\pgfPTlabfont\pgfPTnumberfont\colorlet{pgfPT@grcolor}{\pgfPTlabgrcolor}\ifpgfPT@zhnumbers@gr\let\pgfPT@printnum\zhnumber\else%
+ \ifpgfPT@grRoman\let\pgfPT@printnum\pgfPT@gr@Roman\colorlet{pgfPT@grcolor}{\pgfPTRomanlabgrcolor}\else\let\pgfPT@printnum\relax\fi\fi%
+ \node[above,font=\pgfPTlabfont,text=pgfPT@grcolor] at%
+ ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift]\Z) {\pgfPT@printnum{\group}};%
+ \ifpgfPT@grarabic\colorlet{pgfPT@grcolor}{\pgfPTlabgrcolor}%
+ \node[above,font=\pgfPTlabfont,text=pgfPT@grcolor] at%
+ ([xshift=\pgfPT@@xshift,yshift=\pgfPT@grlabel@yshift+2ex]\Z) {\group};\fi}%
+ \breakforeach\fi%
}%
\ifpgfPTis@labeldrawn\global\pgfPTis@labeldrawnfalse\breakforeach\fi%
}%
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.data.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.data.tex
index 62d62e0f898..0a87ee38dda 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.data.tex
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.data.tex
@@ -142,122 +142,122 @@
}%
% ############################ THE DATA #############################
%
-\def\pgfPT@data@i{H/CS,1.008/Ar,[1.0078\noexpand\pgfPT@virgula1.0082]/Arstar,0/radio,53/R,32/Rcov,139.9\noexpand\pgfPT@espaco(1-)/Rion,1312/Ei,2.2/eneg,72.77/eaff,\noexpand\pgfPT@pm1/O,13.99/Tmelt,-259.16/TmeltC,20.271/Tboil,-252.879/TboilC,1/eDist,::1s+1/eConfign,::1s+1/eConfignl,0.08988/d,28.836/Cp,0.1805/kT,hex/ls,470/lsa,470/lsb,340/lsc,0.72/lsca,1766/DiscY,21/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@ii{He/CS,4.0026/Ar,4.0026/Arstar,0/radio,31/R,46/Rcov,---/Rion,2372.3/Ei,---/eneg,0/eaff,---/O,---/Tmelt,---/TmeltC,4.222/Tboil,-268.928/TboilC,2/eDist,::1s+2/eConfign,::1s+2/eConfignl,0.1786/d,20.786/Cp,0.1513/kT,fcc/ls,424.4/lsa,/lsb,/lsc,/lsca,1895/DiscY,19/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@iii{Li/CS,6.94/Ar,[6.938\noexpand\pgfPT@virgula6.997] /Arstar,0/radio,167/R,133/Rcov,76\noexpand\pgfPT@espaco(1+)/Rion,520.2/Ei,0.98/eneg,59.63/eaff,+1/O,453.65/Tmelt,180.5/TmeltC,1603/Tboil,1330/TboilC,2\noexpand\pgfPTeDistsep1/eDist,[He]::2s+1/eConfign,[He]::2s+1/eConfignl,534/d,24.86/Cp,84.8/kT,bcc/ls,350.93/lsa,/lsb,/lsc,/lsca,1817/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@iv{Be/CS,9.0122/Ar,9.0122/Arstar,0/radio,112/R,10/Rcov,45\noexpand\pgfPT@espaco(2+)/Rion,899.5/Ei,1.57/eneg,0/eaff,+2/O,1560/Tmelt,1287/TmeltC,2742/Tboil,2469/TboilC,2\noexpand\pgfPTeDistsep2/eDist,[He]::2s+2/eConfign,[He]::2s+2/eConfignl,1850/d,16.443/Cp,200/kT,hcp/ls,228.56/lsa,/lsb,358.32/lsc,1.57/lsca,1798/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@v{B/CS,10.81/Ar,[10.806\noexpand\pgfPT@virgula10.821] /Arstar,0/radio,87/R,85/Rcov,27\noexpand\pgfPT@espaco(3+)/Rion,800.6/Ei,2.04/eneg,26.99/eaff,+3/O,2349/Tmelt,2076/TmeltC,4200/Tboil,3927/TboilC,2\noexpand\pgfPTeDistsep3/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+1/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+1/eConfignl,2340/d,11.087/Cp,27.4/kT,rho/ls,505.66/lsa,/lsb,/lsc,/lsca,1808/DiscY,7/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@vi{C/CS,12.011/Ar,[12.009\noexpand\pgfPT@virgula12.012]/Arstar,0/radio,67/R,75/Rcov,16\noexpand\pgfPT@espaco(4+)/Rion,1086.5/Ei,2.55/eneg,121.78/eaff,0\noexpand\pgfPT@virgula\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula\noexpand\pgfPT@pm4/O,3823/Tmelt,3550/TmeltC,4300/Tboil,4027/TboilC,2\noexpand\pgfPTeDistsep4/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+2/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+2/eConfignl,2267/d,8.517/Cp,140/kT,hex/ls,246.12/lsa,/lsb,670.79/lsc,2.73/lsca,3750\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,12/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@vii{N/CS,14.007/Ar,[14.006\noexpand\pgfPT@virgula14.008]/Arstar,0/radio,56/R,71/Rcov,146\noexpand\pgfPT@espaco(3-)\noexpand\pgfPT@virgula16\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula13\noexpand\pgfPT@espaco(5+)/Rion,1402.3/Ei,3.04/eneg,0/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+5/O,63.15/Tmelt,-210/TmeltC,77.355/Tboil,-195.795/TboilC,2\noexpand\pgfPTeDistsep5/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+3/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+3/eConfignl,1.251/d,29.124/Cp,0.02583/kT,hex/ls,386.1/lsa,386.1/lsb,626.5/lsc,1.62/lsca,1772/DiscY,21/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@viii{O/CS,15.999/Ar,[15.999\noexpand\pgfPT@virgula16.000]/Arstar,0/radio,48/R,63/Rcov,140\noexpand\pgfPT@espaco(2-)/Rion,1313.9/Ei,3.44/eneg,140.98/eaff,--2/O,54.36/Tmelt,-218.79/TmeltC,90.188/Tboil,-182.962/TboilC,2\noexpand\pgfPTeDistsep6/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+4/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+4/eConfignl,1.429/d,29.378/Cp,0.02658/kT,mono/ls,540.3/lsa,342.9/lsb,508.6/lsc,0.94/lsca,1771/DiscY,19/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@ix{F/CS,18.998/Ar,18.998/Arstar,0/radio,42/R,64/Rcov,133\noexpand\pgfPT@espaco(1-)/Rion,1681/Ei,3.98/eneg,328.16/eaff,--1/O,53.48/Tmelt,-219.67/TmeltC,85.04/Tboil,-188.11/TboilC,2\noexpand\pgfPTeDistsep7/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+5/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+5/eConfignl,1.7/d,31.304/Cp,0.0277/kT,mono/ls,550/lsa,328/lsb,728/lsc,1.32/lsca,1886/DiscY,5/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@x{Ne/CS,20.18/Ar,20.18/Arstar,0/radio,38/R,67/Rcov,---/Rion,2080.7/Ei,---/eneg,0/eaff,---/O,24.56/Tmelt,-248.59/TmeltC,27.104/Tboil,-246.046/TboilC,2\noexpand\pgfPTeDistsep8/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+6/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+6/eConfignl,0.9002/d,20.786/Cp,0.0491/kT,fcc/ls,442.9/lsa,/lsb,/lsc,/lsca,1898/DiscY,21/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@xi{Na/CS,22.99/Ar,22.99/Arstar,0/radio,190/R,155/Rcov,102\noexpand\pgfPT@espaco(1+)/Rion,495.8/Ei,0.93/eneg,52.87/eaff,+1/O,370.944/Tmelt,97.794/TmeltC,1156.09/Tboil,882.94/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Ne]::3s+1/eConfign,[Ne]::3s+1/eConfignl,968/d,28.23/Cp,142/kT,bcc/ls,429.06/lsa,/lsb,/lsc,/lsca,1807/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xii{Mg/CS,24.305/Ar,[24.304\noexpand\pgfPT@virgula24.307] /Arstar,0/radio,145/R,139/Rcov,72\noexpand\pgfPT@espaco(2+)/Rion,737.7/Ei,1.31/eneg,0/eaff,+2/O,923/Tmelt,650/TmeltC,1363/Tboil,1090/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Ne]::3s+2/eConfign,[Ne]::3s+2/eConfignl,1738/d,24.869/Cp,156/kT,hcp/ls,320.94/lsa,/lsb,521.05/lsc,1.62/lsca,1755/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xiii{Al/CS,26.982/Ar,26.982/Arstar,0/radio,118/R,126/Rcov,53.5\noexpand\pgfPT@espaco(3+)/Rion,577.5/Ei,1.61/eneg,41.76/eaff,+3/O,933.47/Tmelt,660.32/TmeltC,2743/Tboil,2470/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep3/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+1/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+1/eConfignl,2700/d,24.2/Cp,237/kT,fcc/ls,404.95/lsa,/lsb,/lsc,/lsca,1824/DiscY,2/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xiv{Si/CS,28.085/Ar,[28.084\noexpand\pgfPT@virgula28.086]/Arstar,0/radio,111/R,116/Rcov,40\noexpand\pgfPT@espaco(4+)/Rion,786.5/Ei,1.9/eneg,134.07/eaff,\noexpand\pgfPT@pm4/O,1687/Tmelt,1414/TmeltC,3538/Tboil,3265/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep4/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+2/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+2/eConfignl,2330/d,19.789/Cp,149/kT,dia/ls,543.095/lsa,/lsb,/lsc,/lsca,1823/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xv{P/CS,30.974/Ar,30.974/Arstar,0/radio,98/R,111/Rcov,212\noexpand\pgfPT@espaco(3-)\noexpand\pgfPT@virgula44\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula38\noexpand\pgfPT@espaco(5+)/Rion,1011.8/Ei,2.19/eneg,72.04/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+5/O,317.3/Tmelt,44.15/TmeltC,550/Tboil,277/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep5/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+3/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+3/eConfignl,1823/d,23.824/Cp,0.236/kT,tric/ls,1145/lsa,550.3/lsb,1126.1/lsc,0.98/lsca,1669/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xvi{S/CS,32.06/Ar,[32.059\noexpand\pgfPT@virgula32.076]/Arstar,0/radio,88/R,103/Rcov,184\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula37\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula29\noexpand\pgfPT@espaco(6+)/Rion,999.6/Ei,2.58/eneg,200.41/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6/O,388.36/Tmelt,115.21/TmeltC,717.8/Tboil,444.6/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep6/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+4/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+4/eConfignl,1960/d,22.75/Cp,0.205/kT,fcort/ls,1046.5/lsa,1286.6/lsb,2448.6/lsc,2.34/lsca,500\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,12/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xvii{Cl/CS,35.45/Ar,[35.446\noexpand\pgfPT@virgula35.457]/Arstar,0/radio,79/R,99/Rcov,181\noexpand\pgfPT@espaco(1-)\noexpand\pgfPT@virgula12\noexpand\pgfPT@espaco(5+)\noexpand\pgfPT@virgula27\noexpand\pgfPT@espaco(7+)/Rion,1251.2/Ei,3.16/eneg,348.58/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+7/O,171.6/Tmelt,-101.5/TmeltC,239.11/Tboil,-34.04/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep7/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+5/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+5/eConfignl,3.2/d,33.949/Cp,0.0089/kT,bcort/ls,622.35/lsa,445.61/lsb,817.85/lsc,1.31/lsca,1774/DiscY,18/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@xviii{Ar/CS,39.95/Ar,[39.792\noexpand\pgfPT@virgula39.963]/Arstar,0/radio,71/R,96/Rcov,---/Rion,1520.6/Ei,---/eneg,0/eaff,0/O,83.81/Tmelt,-189.34/TmeltC,87.302/Tboil,-185.848/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep8/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+6/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+6/eConfignl,1.784/d,20.786/Cp,0.01772/kT,fcc/ls,525.6/lsa,/lsb,/lsc,/lsca,1894/DiscY,21/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@xix{K/CS,39.098/Ar,39.098/Arstar,0/radio,243/R,196/Rcov,138\noexpand\pgfPT@espaco(1+)/Rion,418.8/Ei,0.82/eneg,48.38/eaff,+1/O,336.7/Tmelt,63.5/TmeltC,1032/Tboil,759/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Ar]::4s+1/eConfign,[Ar]::4s+1/eConfignl,890/d,29.6/Cp,102.5/kT,bcc/ls,532.8/lsa,/lsb,/lsc,/lsca,1807/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xx{Ca/CS,40.078/Ar,40.078(4) /Arstar,0/radio,194/R,171/Rcov,100\noexpand\pgfPT@espaco(2+)/Rion,589.8/Ei,1/eneg,2.37/eaff,+2/O,1115/Tmelt,842/TmeltC,1757/Tboil,1484/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Ar]::4s+2/eConfign,[Ar]::4s+2/eConfignl,1550/d,25.929/Cp,201/kT,fcc/ls,558.84/lsa,/lsb,/lsc,/lsca,1808/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxi{Sc/CS,44.956/Ar,44.956/Arstar,0/radio,184/R,148/Rcov,74.5\noexpand\pgfPT@espaco(3+)/Rion,633.1/Ei,1.36/eneg,18/eaff,+3/O,1814/Tmelt,1541/TmeltC,3109/Tboil,2836/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+1\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+1/eConfignl,2985/d,25.52/Cp,15.8/kT,hcp/ls,330.9/lsa,/lsb,527.33/lsc,1.59/lsca,1879/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxii{Ti/CS,47.867/Ar,47.867/Arstar,0/radio,176/R,136/Rcov,86\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula67\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula60.5\noexpand\pgfPT@espaco(4+)/Rion,658.8/Ei,1.54/eneg,7.29/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+4/O,1941/Tmelt,1668/TmeltC,3560/Tboil,3287/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+2\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+2/eConfignl,4506/d,25.06/Cp,21.9/kT,hcp/ls,295.03/lsa,/lsb,468.31/lsc,1.59/lsca,1791/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxiii{V/CS,50.942/Ar,50.942/Arstar,0/radio,171/R,134/Rcov,79\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula64\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula58\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula54\noexpand\pgfPT@espaco(5+)/Rion,650.9/Ei,1.63/eneg,50.91/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+5/O,2183/Tmelt,1910/TmeltC,3680/Tboil,3407/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep11\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+3\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+3/eConfignl,6110/d,24.89/Cp,30.7/kT,bcc/ls,302.31/lsa,/lsb,/lsc,/lsca,1830/DiscY,23/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxiv{Cr/CS,51.996/Ar,51.996/Arstar,0/radio,166/R,122/Rcov,73\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula61.5\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula44\noexpand\pgfPT@espaco(6+)/Rion,652.9/Ei,1.66/eneg,65.21/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+6/O,2180/Tmelt,1907/TmeltC,2755/Tboil,2482/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep1/eDist,[Ar]::3d+5\noexpand\pgfPT@virgula4s+1/eConfign,[Ar]::4s+1\noexpand\pgfPT@virgula3d+5/eConfignl,7150/d,23.35/Cp,93.9/kT,bcc/ls,288.46/lsa,/lsb,/lsc,/lsca,1797/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxv{Mn/CS,54.938/Ar,54.938/Arstar,0/radio,161/R,119/Rcov,67\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula58\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula53\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula25.5\noexpand\pgfPT@espaco(6+)\noexpand\pgfPT@virgula46\noexpand\pgfPT@espaco(7+)/Rion,717.3/Ei,1.55/eneg,0/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6\noexpand\pgfPT@virgula+7/O,1519/Tmelt,1246/TmeltC,2334/Tboil,2061/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+5\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+5/eConfignl,7210/d,26.32/Cp,7.81/kT,bcc/ls,891.39/lsa,/lsb,/lsc,/lsca,1774/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxvi{Fe/CS,55.845/Ar,55.845(2)/Arstar,0/radio,156/R,116/Rcov,61\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula55\noexpand\pgfPT@espaco(3+)/Rion,762.5/Ei,1.83/eneg,14.79/eaff,+2\noexpand\pgfPT@virgula+3/O,1811/Tmelt,1538/TmeltC,3134/Tboil,2861/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep14\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+6\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+6/eConfignl,7860/d,25.1/Cp,80.4/kT,bcc/ls,286.64/lsa,/lsb,/lsc,/lsca,2000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,3/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxvii{Co/CS,58.933/Ar,58.933/Arstar,0/radio,152/R,111/Rcov,65\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula54.5\noexpand\pgfPT@espaco(3+)/Rion,760.4/Ei,1.88/eneg,63.9/eaff,+2\noexpand\pgfPT@virgula+3/O,1768/Tmelt,1495/TmeltC,3200/Tboil,2927/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+7\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+7/eConfignl,8900/d,24.81/Cp,100/kT,hcp/ls,250.71/lsa,/lsb,406.95/lsc,1.62/lsca,1735/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxviii{Ni/CS,58.693/Ar,58.693/Arstar,0/radio,149/R,110/Rcov,69\noexpand\pgfPT@espaco(2+)/Rion,737.1/Ei,1.91/eneg,111.65/eaff,+2/O,1728/Tmelt,1455/TmeltC,3003/Tboil,2730/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep16\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+8\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+8/eConfignl,8908/d,26.07/Cp,90.9/kT,fcc/ls,352.4/lsa,/lsb,/lsc,/lsca,1751/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxix{Cu/CS,63.546/Ar,63.546(3)/Arstar,0/radio,145/R,112/Rcov,77\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula73\noexpand\pgfPT@espaco(2+)/Rion,745.5/Ei,1.9/eneg,119.24/eaff,+1\noexpand\pgfPT@virgula+2/O,1357.77/Tmelt,1084.62/TmeltC,2835/Tboil,2562/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep1/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+1/eConfign,[Ar]::4s+1\noexpand\pgfPT@virgula3d+10/eConfignl,8960/d,24.44/Cp,401/kT,fcc/ls,361.47/lsa,/lsb,/lsc,/lsca,8000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,12/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxx{Zn/CS,65.38/Ar,65.38(2)/Arstar,0/radio,142/R,118/Rcov,74\noexpand\pgfPT@espaco(2+)/Rion,906.4/Ei,1.65/eneg,0/eaff,+2/O,692.68/Tmelt,419.53/TmeltC,1180/Tboil,907/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10/eConfignl,7140/d,25.39/Cp,116/kT,hcp/ls,266.49/lsa,/lsb,494.68/lsc,1.86/lsca,1746/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxxi{Ga/CS,69.723/Ar,69.723/Arstar,0/radio,136/R,124/Rcov,62\noexpand\pgfPT@espaco(3+)/Rion,578.8/Ei,1.81/eneg,29.06/eaff,+3/O,302.9146/Tmelt,29.7646/TmeltC,2673/Tboil,2400/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+1/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+1/eConfignl,5910/d,25.86/Cp,40.6/kT,bcort/ls,452.58/lsa,451.86/lsb,765.7/lsc,1.69/lsca,1875/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxxii{Ge/CS,72.63/Ar,72.630(8)/Arstar,0/radio,125/R,121/Rcov,73\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula53\noexpand\pgfPT@espaco(4+)/Rion,762/Ei,2.01/eneg,118.94/eaff,+2\noexpand\pgfPT@virgula\noexpand\pgfPT@pm4/O,1211.4/Tmelt,938.25/TmeltC,3106/Tboil,2833/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+2/eConfignl,5323/d,23.222/Cp,60.2/kT,dia/ls,565.791/lsa,/lsb,/lsc,/lsca,1886/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxxiii{As/CS,74.922/Ar,74.922/Arstar,0/radio,114/R,121/Rcov,58\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula46\noexpand\pgfPT@espaco(5+)/Rion,947/Ei,2.18/eneg,77.65/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+5/O,1090/Tmelt,817/TmeltC,887/Tboil,614/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+3/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+3/eConfignl,5727/d,24.64/Cp,50.2/kT,rho/ls,375.98/lsa,375.98/lsb,1054.75/lsc,2.81/lsca,1250/DiscY,12/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxxiv{Se/CS,78.971/Ar,78.971(8)/Arstar,0/radio,103/R,116/Rcov,198\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula50\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula42\noexpand\pgfPT@espaco(6+)/Rion,941/Ei,2.55/eneg,194.96/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6/O,494/Tmelt,221/TmeltC,958/Tboil,685/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+4/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+4/eConfignl,4810/d,25.363/Cp,0.519/kT,mono/ls,905.4/lsa,908.3/lsb,1160.1/lsc,1.28/lsca,1817/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxxv{Br/CS,79.904/Ar,[79.901\noexpand\pgfPT@virgula79.907]/Arstar,0/radio,94/R,114/Rcov,196\noexpand\pgfPT@espaco(1-)\noexpand\pgfPT@virgula59\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula31\noexpand\pgfPT@espaco(5+)/Rion,1139.9/Ei,2.96/eneg,324.54/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5/O,265.8/Tmelt,-7.3/TmeltC,332/Tboil,58.8/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+5/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+5/eConfignl,3102.8/d,75.69/Cp,0.122/kT,bcort/ls,672.65/lsa,464.51/lsb,870.23/lsc,1.29/lsca,1825/DiscY,5/DiscC,1/spectra,liquido/cor}%
-\def\pgfPT@data@xxxvi{Kr/CS,83.798/Ar,83.798(2)/Arstar,0/radio,88/R,117/Rcov,---/Rion,1350.8/Ei,3/eneg,0/eaff,0/O,115.78/Tmelt,-157.37/TmeltC,119.735/Tboil,-153.415/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+6/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+6/eConfignl,3.749/d,20.786/Cp,0.00943/kT,fcc/ls,570.6/lsa,/lsb,/lsc,/lsca,1898/DiscY,21/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@xxxvii{Rb/CS,85.468/Ar,85.468/Arstar,0/radio,265/R,210/Rcov,152\noexpand\pgfPT@espaco(1+)/Rion,403/Ei,0.82/eneg,46.88/eaff,+1/O,312.45/Tmelt,39.3/TmeltC,961/Tboil,688/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Kr]::5s+1/eConfign,[Kr]::5s+1/eConfignl,1532/d,31.06/Cp,58.2/kT,bcc/ls,558.5/lsa,/lsb,/lsc,/lsca,1861/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxxviii{Sr/CS,87.62/Ar,87.62/Arstar,0/radio,219/R,185/Rcov,118\noexpand\pgfPT@espaco(2+)/Rion,549.5/Ei,0.95/eneg,5.02/eaff,+2/O,1050/Tmelt,777/TmeltC,1650/Tboil,1382/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Kr]::5s+2/eConfign,[Kr]::5s+2/eConfignl,2640/d,26.4/Cp,35.4/kT,fcc/ls,608.49/lsa,/lsb,/lsc,/lsca,1787/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xxxix{Y/CS,88.906/Ar,88.906/Arstar,0/radio,212/R,163/Rcov,90\noexpand\pgfPT@espaco(3+)/Rion,600/Ei,1.22/eneg,29.6/eaff,+3/O,1799/Tmelt,1526/TmeltC,3203/Tboil,2930/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+1\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+1/eConfignl,4472/d,26.53/Cp,17.2/kT,hcp/ls,364.74/lsa,/lsb,573.06/lsc,1.57/lsca,1794/DiscY,4/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xl{Zr/CS,91.224/Ar,91.224(2)/Arstar,0/radio,206/R,154/Rcov,72\noexpand\pgfPT@espaco(4+)/Rion,640.1/Ei,1.33/eneg,41.81/eaff,+4/O,2128/Tmelt,1855/TmeltC,4650/Tboil,4377/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+2\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+2/eConfignl,6520/d,25.36/Cp,22.6/kT,hcp/ls,323.2/lsa,/lsb,514.7/lsc,1.59/lsca,1789/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xli{Nb/CS,92.906/Ar,92.906/Arstar,0/radio,198/R,147/Rcov,64\noexpand\pgfPT@espaco(5+)/Rion,652.1/Ei,1.6/eneg,88.52/eaff,+5/O,2750/Tmelt,2477/TmeltC,5017/Tboil,4744/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep12\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+4\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+4/eConfignl,8570/d,24.6/Cp,53.7/kT,bcc/ls,330.04/lsa,/lsb,/lsc,/lsca,1801/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xlii{Mo/CS,95.95/Ar,95.95/Arstar,0/radio,190/R,138/Rcov,65\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula59\noexpand\pgfPT@espaco(6+)/Rion,684.3/Ei,2.16/eneg,72.1/eaff,+4\noexpand\pgfPT@virgula+6/O,2896/Tmelt,2623/TmeltC,4912/Tboil,4639/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+5\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+5/eConfignl,10280/d,24.06/Cp,138/kT,bcc/ls,314.69/lsa,/lsb,/lsc,/lsca,1781/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xliii{Tc/CS,[98]/Ar,/Arstar,1/radio,183/R,128/Rcov,64.5\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula56\noexpand\pgfPT@espaco(7+)/Rion,702/Ei,1.9/eneg,53/eaff,+4\noexpand\pgfPT@virgula+7/O,2430/Tmelt,2157/TmeltC,4538/Tboil,4265/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+5\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+5/eConfignl,11000/d,24.27/Cp,50.6/kT,hcp/ls,273.5/lsa,/lsb,438.8/lsc,1.6/lsca,1937/DiscY,11/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@xliv{Ru/CS,101.07/Ar,101.07/Arstar,0/radio,178/R,125/Rcov,68\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula62\noexpand\pgfPT@espaco(4+)/Rion,710.2/Ei,2.2/eneg,100.96/eaff,+3\noexpand\pgfPT@virgula+4/O,2607/Tmelt,2334/TmeltC,4423/Tboil,4150/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+7\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+7/eConfignl,12450/d,24.06/Cp,117/kT,hcp/ls,270.55/lsa,/lsb,428.16/lsc,1.58/lsca,1844/DiscY,15/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xlv{Rh/CS,102.91/Ar,102.91/Arstar,0/radio,173/R,125/Rcov,66.5\noexpand\pgfPT@espaco(3+)/Rion,719.7/Ei,2.28/eneg,110.27/eaff,+3/O,2237/Tmelt,1964/TmeltC,3968/Tboil,3695/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep16\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+8\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+8/eConfignl,12410/d,24.98/Cp,150/kT,fcc/ls,380.34/lsa,/lsb,/lsc,/lsca,1804/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xlvi{Pd/CS,106.42/Ar,106.42/Arstar,0/radio,169/R,120/Rcov,86\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula61.5\noexpand\pgfPT@espaco(4+)/Rion,804.4/Ei,2.2/eneg,54.24/eaff,0\noexpand\pgfPT@virgula+2\noexpand\pgfPT@virgula+4/O,1828.05/Tmelt,1554.9/TmeltC,3236/Tboil,2963/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18/eDist,[Kr]::4d+10/eConfign,[Kr]::4d+10/eConfignl,12023/d,25.98/Cp,71.8/kT,fcc/ls,389.02/lsa,/lsb,/lsc,/lsca,1802/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xlvii{Ag/CS,107.87/Ar,107.87/Arstar,0/radio,165/R,128/Rcov,115\noexpand\pgfPT@espaco(1+)/Rion,731/Ei,1.93/eneg,125.86/eaff,+1/O,1234.93/Tmelt,961.78/TmeltC,2483/Tboil,2210/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+10/eConfignl,10490/d,25.35/Cp,429/kT,fcc/ls,408.57/lsa,/lsb,/lsc,/lsca,3000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,0/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xlviii{Cd/CS,112.41/Ar,112.41/Arstar,0/radio,161/R,136/Rcov,95\noexpand\pgfPT@espaco(2+)/Rion,867.8/Ei,1.69/eneg,0/eaff,+2/O,594.22/Tmelt,321.07/TmeltC,1040/Tboil,767/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10/eConfignl,8650/d,26.02/Cp,96.6/kT,hcp/ls,297.88/lsa,/lsb,561.67/lsc,1.89/lsca,1817/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xlix{In/CS,114.82/Ar,114.82/Arstar,0/radio,156/R,142/Rcov,80\noexpand\pgfPT@espaco(3+)/Rion,558.3/Ei,1.78/eneg,37.04/eaff,+3/O,429.75/Tmelt,156.6/TmeltC,2345/Tboil,2072/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+1/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+1/eConfignl,7310/d,26.74/Cp,81.8/kT,tetr/ls,325.17/lsa,/lsb,494.59/lsc,1.52/lsca,1863/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@l{Sn/CS,118.71/Ar,118.71/Arstar,0/radio,145/R,140/Rcov,118\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula69\noexpand\pgfPT@espaco(4+)/Rion,708.6/Ei,1.96/eneg,107.3/eaff,+2\noexpand\pgfPT@virgula\noexpand\pgfPT@pm4/O,505.08/Tmelt,231.93/TmeltC,2875/Tboil,2602/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+2/eConfignl,7265/d,25.77/Cp,66.8/kT,ctetr/ls,583.1/lsa,/lsb,318.1/lsc,0.55/lsca,3000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,0/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@li{Sb/CS,121.76/Ar,121.76/Arstar,0/radio,133/R,140/Rcov,76\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula60\noexpand\pgfPT@espaco(5+)/Rion,834/Ei,2.05/eneg,101.06/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+5/O,903.78/Tmelt,630.63/TmeltC,1908/Tboil,1635/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+3/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+3/eConfignl,6697/d,25.23/Cp,24.4/kT,rho/ls,430.7/lsa,/lsb,1127.3/lsc,2.62/lsca,815/DiscY,12/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lii{Te/CS,127.6/Ar,127.60(3)/Arstar,0/radio,123/R,136/Rcov,221\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula97\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula56\noexpand\pgfPT@espaco(6+)/Rion,869.3/Ei,2.1/eneg,190.16/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6/O,722.66/Tmelt,449.51/TmeltC,1261/Tboil,988/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+4/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+4/eConfignl,6240/d,25.73/Cp,3/kT,rho/ls,445.72/lsa,/lsb,592.9/lsc,1.33/lsca,1782/DiscY,14/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@liii{I/CS,126.9/Ar,126.9/Arstar,0/radio,115/R,133/Rcov,220\noexpand\pgfPT@espaco(1-)\noexpand\pgfPT@virgula95\noexpand\pgfPT@espaco(5+)\noexpand\pgfPT@virgula53\noexpand\pgfPT@espaco(7+)/Rion,1008.4/Ei,2.66/eneg,295.15/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+7/O,386.85/Tmelt,113.7/TmeltC,457.4/Tboil,184.3/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+5/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+5/eConfignl,4933/d,54.44/Cp,0.449/kT,bcort/ls,726.97/lsa,479.03/lsb,979.42/lsc,1.35/lsca,1811/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@liv{Xe/CS,131.29/Ar,131.29/Arstar,0/radio,108/R,131/Rcov,---/Rion,1170.4/Ei,2.6/eneg,0/eaff,0/O,161.4/Tmelt,-111.75/TmeltC,165.051/Tboil,-108.099/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+6/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+6/eConfignl,5.894/d,20.786/Cp,0.00565/kT,fcc/ls,620.23/lsa,/lsb,/lsc,/lsca,1898/DiscY,21/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@lv{Cs/CS,132.91/Ar,132.91/Arstar,0/radio,298/R,232/Rcov,167\noexpand\pgfPT@espaco(1+)/Rion,375.7/Ei,0.79/eneg,45.51/eaff,+1/O,301.7/Tmelt,28.5/TmeltC,944/Tboil,671/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Xe]::6s+1/eConfign,[Xe]::6s+1/eConfignl,1930/d,32.21/Cp,35.9/kT,bcc/ls,614.1/lsa,/lsb,/lsc,/lsca,1860/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lvi{Ba/CS,137.33/Ar,137.33/Arstar,0/radio,253/R,196/Rcov,135\noexpand\pgfPT@espaco(2+)/Rion,502.9/Ei,0.89/eneg,13.95/eaff,+2/O,1000/Tmelt,727/TmeltC,1910/Tboil,1637/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::6s+2/eConfign,[Xe]::6s+2/eConfignl,3510/d,28.07/Cp,18.4/kT,bcc/ls,501.9/lsa,/lsb,/lsc,/lsca,1808/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lvii{La/CS,138.91/Ar,138.91/Arstar,0/radio,226/R,180/Rcov,103.2\noexpand\pgfPT@espaco(3+)/Rion,538.1/Ei,1.1/eneg,53.8/eaff,+3/O,1193/Tmelt,920/TmeltC,3737/Tboil,3464/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula5d+1/eConfignl,6162/d,27.11/Cp,13.4/kT,hex/ls,377.2/lsa,/lsb,1214.4/lsc,3.22/lsca,1838/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lviii{Ce/CS,140.12/Ar,140.12/Arstar,0/radio,210/R,163/Rcov,101\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula87\noexpand\pgfPT@espaco(4+)/Rion,534.4/Ei,1.12/eneg,55/eaff,+3\noexpand\pgfPT@virgula+4/O,1068/Tmelt,795/TmeltC,3716/Tboil,3443/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep19\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+1\noexpand\pgfPT@virgula5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+1\noexpand\pgfPT@virgula5d+1/eConfignl,6770/d,26.94/Cp,11.3/kT,hex/ls,362/lsa,/lsb,599/lsc,1.65/lsca,1803/DiscY,9/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lix{Pr/CS,140.91/Ar,140.91/Arstar,0/radio,247/R,17/Rcov,99\noexpand\pgfPT@espaco(3+)/Rion,527/Ei,1.13/eneg,10.54/eaff,+3/O,1208/Tmelt,935/TmeltC,3403/Tboil,3130/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep21\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+3\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+3/eConfignl,6770/d,27.2/Cp,12.5/kT,hex/ls,367.21/lsa,/lsb,1183.26/lsc,3.22/lsca,1885/DiscY,1/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lx{Nd/CS,144.24/Ar,144.24/Arstar,0/radio,206/R,17/Rcov,98.3\noexpand\pgfPT@espaco(3+)/Rion,533.1/Ei,1.14/eneg,9.41/eaff,+3/O,1297/Tmelt,1024/TmeltC,3347/Tboil,3074/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep22\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+4\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+4/eConfignl,7010/d,27.45/Cp,16.5/kT,hex/ls,365.82/lsa,/lsb,1179.66/lsc,3.22/lsca,1885/DiscY,1/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxi{Pm/CS,[145]/Ar,[145]/Arstar,1/radio,205/R,173/Rcov,97\noexpand\pgfPT@espaco(3+)/Rion,540/Ei,1.13/eneg,12.45/eaff,+3/O,1315/Tmelt,1042/TmeltC,3273/Tboil,3000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep23\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+5\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+5/eConfignl,7260/d,---/Cp,17.9/kT,hex/ls,365/lsa,/lsb,1165/lsc,3.19/lsca,1945/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@lxii{Sm/CS,150.36/Ar,150.36(2)/Arstar,0/radio,238/R,172/Rcov,95.8\noexpand\pgfPT@espaco(3+)/Rion,544.5/Ei,1.17/eneg,15.63/eaff,+3/O,1345/Tmelt,1072/TmeltC,2173/Tboil,1900/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep24\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+6\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+6/eConfignl,7520/d,29.54/Cp,13.3/kT,rho/ls,362.1/lsa,/lsb,2625/lsc,7.25/lsca,1879/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxiii{Eu/CS,151.96/Ar,151.96/Arstar,0/radio,231/R,168/Rcov,117\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula94.7\noexpand\pgfPT@espaco(3+)/Rion,547.1/Ei,1.2/eneg,11.2/eaff,+2\noexpand\pgfPT@virgula+3/O,1099/Tmelt,826/TmeltC,1802/Tboil,1529/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+7\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+7/eConfignl,5244/d,27.66/Cp,13.9/kT,bcc/ls,458.1/lsa,/lsb,/lsc,/lsca,1901/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxiv{Gd/CS,157.25/Ar,157.25(3)/Arstar,0/radio,233/R,169/Rcov,93.5\noexpand\pgfPT@espaco(3+)/Rion,593.4/Ei,1.2/eneg,13.22/eaff,+3/O,1585/Tmelt,1312/TmeltC,3273/Tboil,3000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+7\noexpand\pgfPT@virgula5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+7\noexpand\pgfPT@virgula5d+1/eConfignl,7900/d,37.03/Cp,10.6/kT,hcp/ls,363.6/lsa,/lsb,578.26/lsc,1.59/lsca,1880/DiscY,20/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxv{Tb/CS,158.93/Ar,158.93/Arstar,0/radio,225/R,168/Rcov,92.3\noexpand\pgfPT@espaco(3+)/Rion,565.8/Ei,1.2/eneg,12.67/eaff,+3/O,1629/Tmelt,1356/TmeltC,3396/Tboil,3123/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep27\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+9\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+9/eConfignl,8230/d,28.91/Cp,11.1/kT,hcp/ls,360.1/lsa,/lsb,569.36/lsc,1.58/lsca,1843/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxvi{Dy/CS,162.5/Ar,162.5/Arstar,0/radio,228/R,167/Rcov,91.2\noexpand\pgfPT@espaco(3+)/Rion,573/Ei,1.22/eneg,33.96/eaff,+3/O,1680/Tmelt,1407/TmeltC,2840/Tboil,2567/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep28\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+10\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+10/eConfignl,8540/d,27.7/Cp,10.7/kT,hcp/ls,359.3/lsa,/lsb,565.37/lsc,1.57/lsca,1886/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxvii{Ho/CS,164.93/Ar,164.93/Arstar,0/radio,226/R,166/Rcov,90.1\noexpand\pgfPT@espaco(3+)/Rion,581/Ei,1.23/eneg,32.61/eaff,+3/O,1734/Tmelt,1461/TmeltC,2873/Tboil,2600/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep29\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+11\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+11/eConfignl,8790/d,27.15/Cp,16.2/kT,hcp/ls,357.73/lsa,/lsb,561.58/lsc,1.57/lsca,1878/DiscY,20/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxviii{Er/CS,167.26/Ar,167.26/Arstar,0/radio,226/R,165/Rcov,89\noexpand\pgfPT@espaco(3+)/Rion,589.3/Ei,1.24/eneg,30.1/eaff,+3/O,1802/Tmelt,1529/TmeltC,3141/Tboil,2868/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep30\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+12\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+12/eConfignl,9066/d,28.12/Cp,14.5/kT,hcp/ls,355.88/lsa,/lsb,558.74/lsc,1.57/lsca,1843/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxix{Tm/CS,168.93/Ar,168.93/Arstar,0/radio,222/R,164/Rcov,88\noexpand\pgfPT@espaco(3+)/Rion,596.7/Ei,1.25/eneg,99/eaff,+3/O,1818/Tmelt,1545/TmeltC,2223/Tboil,1950/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep31\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+13\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+13/eConfignl,9320/d,27.03/Cp,16.9/kT,hcp/ls,353.75/lsa,/lsb,555.46/lsc,1.57/lsca,1879/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxx{Yb/CS,173.05/Ar,173.05/Arstar,0/radio,222/R,170/Rcov,86.8\noexpand\pgfPT@espaco(3+)/Rion,603.4/Ei,1.1/eneg,0/eaff,+3/O,1097/Tmelt,824/TmeltC,1703/Tboil,1430/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14/eConfignl,6900/d,26.74/Cp,38.5/kT,fcc/ls,548.47/lsa,/lsb,/lsc,/lsca,1878/DiscY,20/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxi{Lu/CS,174.97/Ar,174.97/Arstar,0/radio,217/R,162/Rcov,86.1\noexpand\pgfPT@espaco(3+)/Rion,523.5/Ei,1.27/eneg,23.04/eaff,+3/O,1925/Tmelt,1652/TmeltC,3675/Tboil,3402/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+1/eConfignl,9841/d,26.86/Cp,16.4/kT,hcp/ls,350.31/lsa,/lsb,555.09/lsc,1.58/lsca,1906/DiscY,6/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxii{Hf/CS,178.49/Ar,178.49(2)/Arstar,0/radio,208/R,152/Rcov,71\noexpand\pgfPT@espaco(4+)/Rion,658.5/Ei,1.3/eneg,17.18/eaff,+4/O,2506/Tmelt,2233/TmeltC,4876/Tboil,4603/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+2\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+2/eConfignl,13310/d,25.73/Cp,23/kT,hcp/ls,319.64/lsa,/lsb,505.11/lsc,1.58/lsca,1922/DiscY,2/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxiii{Ta/CS,180.95/Ar,180.95/Arstar,0/radio,200/R,146/Rcov,64\noexpand\pgfPT@espaco(5+)/Rion,761/Ei,1.5/eneg,31/eaff,+5/O,3290/Tmelt,3017/TmeltC,5731/Tboil,5458/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep11\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+3\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+3/eConfignl,16690/d,25.36/Cp,57.5/kT,bcc/ls,330.26/lsa,/lsb,/lsc,/lsca,1802/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxiv{W/CS,183.84/Ar,183.84/Arstar,0/radio,193/R,137/Rcov,66\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula60\noexpand\pgfPT@espaco(6+)/Rion,770/Ei,2.36/eneg,78.76/eaff,+4\noexpand\pgfPT@virgula+6/O,3695/Tmelt,3422/TmeltC,6203/Tboil,5930/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep12\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+4\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+4/eConfignl,19250/d,24.27/Cp,173/kT,bcc/ls,316.52/lsa,/lsb,/lsc,/lsca,1783/DiscY,17/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxv{Re/CS,186.21/Ar,186.21/Arstar,0/radio,188/R,131/Rcov,63\noexpand\pgfPT@espaco(4+)/Rion,760/Ei,1.9/eneg,5.83/eaff,+4/O,3459/Tmelt,3186/TmeltC,5869/Tboil,5596/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+5\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+5/eConfignl,21020/d,25.48/Cp,48/kT,hcp/ls,276.1/lsa,/lsb,445.8/lsc,1.62/lsca,1925/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxvi{Os/CS,190.23/Ar,190.23(3)/Arstar,0/radio,185/R,129/Rcov,63\noexpand\pgfPT@espaco(4+)/Rion,840/Ei,2.2/eneg,103.99/eaff,+4/O,3306/Tmelt,3033/TmeltC,5285/Tboil,5012/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep14\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+6\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+6/eConfignl,22590/d,24.7/Cp,87.6/kT,hcp/ls,273.43/lsa,/lsb,431.73/lsc,1.58/lsca,1803/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxvii{Ir/CS,192.22/Ar,192.22/Arstar,0/radio,180/R,122/Rcov,68\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula62.5\noexpand\pgfPT@espaco(4+)/Rion,880/Ei,2.2/eneg,150.91/eaff,+3\noexpand\pgfPT@virgula+4/O,2719/Tmelt,2446/TmeltC,4403/Tboil,4130/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+7\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+7/eConfignl,22560/d,25.1/Cp,147/kT,fcc/ls,383.92/lsa,/lsb,/lsc,/lsca,1803/DiscY,7/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxviii{Pt/CS,195.08/Ar,195.08/Arstar,0/radio,177/R,123/Rcov,80\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula62.5\noexpand\pgfPT@espaco(4+)/Rion,870/Ei,2.28/eneg,205.04/eaff,+2\noexpand\pgfPT@virgula+4/O,2041.4/Tmelt,1768.3/TmeltC,4098/Tboil,3825/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep17\noexpand\pgfPTeDistsep1/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+9\noexpand\pgfPT@virgula6s+1/eConfign,[Xe]::6s+1\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+9/eConfignl,21450/d,25.86/Cp,71.6/kT,fcc/ls,392.35/lsa,/lsb,/lsc,/lsca,1735/DiscY,13/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxix{Au/CS,196.97/Ar,196.97/Arstar,0/radio,174/R,124/Rcov,137\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula85\noexpand\pgfPT@espaco(3+)/Rion,890.1/Ei,2.54/eneg,222.75/eaff,+1\noexpand\pgfPT@virgula+3/O,1337.33/Tmelt,1064.18/TmeltC,3243/Tboil,2970/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep1/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+1/eConfign,[Xe]::6s+1\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10/eConfignl,19300/d,25.418/Cp,318/kT,fcc/ls,407.83/lsa,/lsb,/lsc,/lsca,4000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,100/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxx{Hg/CS,200.59/Ar,200.59/Arstar,0/radio,171/R,133/Rcov,119\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula102\noexpand\pgfPT@espaco(2+)/Rion,1007.1/Ei,2/eneg,0/eaff,+1\noexpand\pgfPT@virgula+2/O,234.32/Tmelt,-38.83/TmeltC,629.88/Tboil,356.73/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10/eConfignl,13534/d,27.983/Cp,8.3/kT,rho/ls,300.9/lsa,/lsb,/lsc,/lsca,1500\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,3/DiscC,1/spectra,liquido/cor}%
-\def\pgfPT@data@lxxxi{Tl/CS,204.38/Ar,[204.38\noexpand\pgfPT@virgula204.39]/Arstar,0/radio,156/R,144/Rcov,150\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula88.5\noexpand\pgfPT@espaco(3+)/Rion,589.4/Ei,1.62/eneg,30.88/eaff,+1\noexpand\pgfPT@virgula+3/O,577/Tmelt,304/TmeltC,1746/Tboil,1473/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+1/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+1/eConfignl,11850/d,26.32/Cp,46.1/kT,hcp/ls,345.66/lsa,/lsb,552.48/lsc,1.6/lsca,1861/DiscY,21/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxxii{Pb/CS,207.2/Ar,207.2/Arstar,0/radio,154/R,144/Rcov,119\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula77.5\noexpand\pgfPT@espaco(4+)/Rion,715.6/Ei,1.87/eneg,34.42/eaff,+2\noexpand\pgfPT@virgula+4/O,600.61/Tmelt,327.46/TmeltC,2022/Tboil,1749/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+2/eConfignl,11340/d,26.65/Cp,35.3/kT,fcc/ls,495.02/lsa,/lsb,/lsc,/lsca,3800\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,3/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxxiii{Bi/CS,208.98/Ar,208.98/Arstar,0/radio,143/R,151/Rcov,103\noexpand\pgfPT@espaco(3+)/Rion,703/Ei,2.02/eneg,90.92/eaff,+3/O,544.7/Tmelt,271.5/TmeltC,1837/Tboil,1564/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+3/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+3/eConfignl,9780/d,25.52/Cp,7.97/kT,mono/ls,667.4/lsa,611.7/lsb,330.4/lsc,0.5/lsca,1400/DiscY,12/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxxiv{Po/CS,[209]/Ar,/Arstar,1/radio,135/R,145/Rcov,223\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula94\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula67\noexpand\pgfPT@espaco(6+)/Rion,812.1/Ei,2/eneg,136/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+6/O,527/Tmelt,254/TmeltC,1235/Tboil,962/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+4/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+4/eConfignl,9196/d,26.4/Cp,0/kT,sc/ls,335.9/lsa,/lsb,/lsc,/lsca,1898/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxxv{At/CS,[210]/Ar,/Arstar,1/radio,127/R,147/Rcov,62\noexpand\pgfPT@espaco(7+)/Rion,899.003/Ei,2.2/eneg,233.09/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+7/O,575/Tmelt,302/TmeltC,503/Tboil,230/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+5/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+5/eConfignl,---/d,---/Cp,1.7/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1940/DiscY,22/DiscC,0/spectra,solido/cor}%
-\def\pgfPT@data@lxxxvi{Rn/CS,[222]/Ar,/Arstar,1/radio,120/R,142/Rcov,---/Rion,1037/Ei,2.2/eneg,0/eaff,+2\noexpand\pgfPT@virgula+6/O,202/Tmelt,-71/TmeltC,211.5/Tboil,-61.7/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+6/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+6/eConfignl,9.73/d,20.786/Cp,0.00361/kT,fcc/ls,---/lsa,/lsb,/lsc,/lsca,1899/DiscY,8/DiscC,1/spectra,gasoso/cor}%
-\def\pgfPT@data@lxxxvii{Fr/CS,[223]/Ar,/Arstar,1/radio,---/R,---/Rcov,180\noexpand\pgfPT@espaco(1+)/Rion,380/Ei,0.7/eneg,46.89/eaff,+1/O,281/Tmelt,8/TmeltC,890/Tboil,620/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Rn]::7s+1/eConfign,[Rn]::7s+1/eConfignl,---/d,31.8/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1939/DiscY,5/DiscC,0/spectra,solido/cor}%
-\def\pgfPT@data@lxxxviii{Ra/CS,[226]/Ar,/Arstar,1/radio,---/R,201/Rcov,148\noexpand\pgfPT@espaco(2+)/Rion,509.3/Ei,0.9/eneg,9.65/eaff,+2/O,973/Tmelt,700/TmeltC,2010/Tboil,1737/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::7s+2/eConfign,[Rn]::7s+2/eConfignl,5500/d,---/Cp,18.6/kT,bcc/ls,514.8/lsa,/lsb,/lsc,/lsca,1898/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@lxxxix{Ac/CS,[227]/Ar,/Arstar,1/radio,---/R,186/Rcov,106.5\noexpand\pgfPT@espaco(3+)/Rion,499/Ei,1.1/eneg,33.77/eaff,+3/O,1323/Tmelt,1050/TmeltC,3471/Tboil,3198/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula6d+1/eConfignl,10000/d,27.2/Cp,12/kT,fcc/ls,587/lsa,/lsb,/lsc,/lsca,1902/DiscY,5/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xc{Th/CS,232.04/Ar,232.04/Arstar,1/radio,---/R,175/Rcov,/Rion,587/Ei,1.3/eneg,58.63/eaff,+4/O,2115/Tmelt,1842/TmeltC,5061/Tboil,4788/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Rn]::6d+2\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula6d+2/eConfignl,11700/d,26.23/Cp,54/kT,fcc/ls,508.42/lsa,/lsb,/lsc,/lsca,1829/DiscY,18/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xci{Pa/CS,231.04/Ar,231.04/Arstar,1/radio,---/R,169/Rcov,90\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula78\noexpand\pgfPT@espaco(5+)/Rion,568/Ei,1.5/eneg,53.03/eaff,+5/O,1841/Tmelt,1568/TmeltC,4273/Tboil,4000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep20\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+2\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+2\noexpand\pgfPT@virgula6d+1/eConfignl,15370/d,---/Cp,47/kT,tetr/ls,392.5/lsa,/lsb,323.8/lsc,0.82/lsca,1913/DiscY,10/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xcii{U/CS,238.03/Ar,238.03/Arstar,1/radio,---/R,170/Rcov,76\noexpand\pgfPT@espaco(5+)/Rion,597.6/Ei,1.38/eneg,30.39/eaff,+4\noexpand\pgfPT@virgula+6/O,1405.3/Tmelt,1132.2/TmeltC,4404/Tboil,4131/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep21\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+3\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+3\noexpand\pgfPT@virgula6d+1/eConfignl,19100/d,27.665/Cp,27.5/kT,bcort/ls,285.37/lsa,586.95/lsb,495.48/lsc,1.74/lsca,1789/DiscY,8/DiscC,1/spectra,solido/cor}%
-\def\pgfPT@data@xciii{Np/CS,[237]/Ar,/Arstar,1/radio,---/R,171/Rcov,110\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula87\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula71\noexpand\pgfPT@espaco(7+)/Rion,604.5/Ei,1.36/eneg,45.85/eaff,+5/O,917/Tmelt,644/TmeltC,4273/Tboil,4000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep22\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+4\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+4\noexpand\pgfPT@virgula6d+1/eConfignl,20200/d,29.46/Cp,6.3/kT,bcort/ls,666.3/lsa,472.3/lsb,488.7/lsc,0.73/lsca,1940/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@xciv{Pu/CS,[244]/Ar,/Arstar,1/radio,---/R,172/Rcov,100\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula74\noexpand\pgfPT@espaco(5+)\noexpand\pgfPT@virgula71\noexpand\pgfPT@espaco(6+)/Rion,584.7/Ei,1.28/eneg,0/eaff,+4/O,912.5/Tmelt,639.4/TmeltC,3501/Tboil,3228/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep24\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+6\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+6/eConfignl,19816/d,35.5/Cp,6.74/kT,mono/ls,618.3/lsa,482.2/lsb,1096.3/lsc,1.77/lsca,1940/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@xcv{Am/CS,[243]/Ar,/Arstar,1/radio,---/R,166/Rcov,126\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula97.5\noexpand\pgfPT@espaco(3+)/Rion,578/Ei,1.13/eneg,9.93/eaff,+3/O,1449/Tmelt,1176/TmeltC,2880/Tboil,2607/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+7\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+7/eConfignl,12000/d,62.7/Cp,10/kT,hex/ls,346.81/lsa,/lsb,1124.1/lsc,3.24/lsca,1944/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@xcvi{Cm/CS,[247]/Ar,/Arstar,1/radio,---/R,166/Rcov,97\noexpand\pgfPT@espaco(3+)/Rion,581/Ei,1.28/eneg,27.17/eaff,+3/O,1613/Tmelt,1340/TmeltC,3383/Tboil,3110/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+7\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+7\noexpand\pgfPT@virgula6d+1/eConfignl,13510/d,---/Cp,---/kT,hex/ls,349.6/lsa,/lsb,1133.1/lsc,3.24/lsca,1944/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@xcvii{Bk/CS,[247]/Ar,/Arstar,1/radio,---/R,---/Rcov,96\noexpand\pgfPT@espaco(3+)/Rion,601/Ei,1.3/eneg,0/eaff,+3/O,1323/Tmelt,1050/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep27\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+9\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+9/eConfignl,14780/d,---/Cp,10/kT,hex/ls,341.6/lsa,/lsb,1106.9/lsc,3.24/lsca,1949/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@xcviii{Cf/CS,[251]/Ar,/Arstar,1/radio,---/R,---/Rcov,95\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula82.1\noexpand\pgfPT@espaco(4+)/Rion,608/Ei,1.3/eneg,0/eaff,+3/O,1173/Tmelt,900/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep28\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+10\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+10/eConfignl,15100/d,---/Cp,---/kT,hex/ls,338/lsa,/lsb,1102.5/lsc,3.26/lsca,1950/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@xcix{Es/CS,[252]/Ar,/Arstar,1/radio,---/R,---/Rcov,83.5\noexpand\pgfPT@espaco(3+)/Rion,619/Ei,1.3/eneg,0/eaff,+3/O,1133/Tmelt,860/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep29\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+11\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+11/eConfignl,8840/d,---/Cp,---/kT,fcc/ls,575/lsa,/lsb,/lsc,/lsca,1952/DiscY,22/DiscC,1/spectra,sintetico/cor}%
-\def\pgfPT@data@c{Fm/CS,[257]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,627/Ei,1.3/eneg,33.96/eaff,+3/O,1800/Tmelt,1527/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep30\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+12\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+12/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1952/DiscY,22/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@ci{Md/CS,[258]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,635/Ei,1.3/eneg,93.91/eaff,+3/O,1100/Tmelt,827/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep31\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+13\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+13/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1955/DiscY,22/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cii{No/CS,[259]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,642/Ei,1.3/eneg,0/eaff,+2/O,1100/Tmelt,827/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1966/DiscY,24/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@ciii{Lr/CS,[266]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,470/Ei,1.3/eneg,0/eaff,+3/O,1900/Tmelt,1627/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep3/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+1/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula7p+1/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1961/DiscY,22/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@civ{Rf/CS,[267]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-580/Ei,---/eneg,---/eaff,+4/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+2\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+2/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1969/DiscY,16/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cv{Db/CS,[268]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-665/Ei,---/eneg,---/eaff,+5/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep11\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+3\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+3/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1970/DiscY,16/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cvi{Sg/CS,[269]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-757/Ei,---/eneg,---/eaff,+6/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep12\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+4\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+4/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1974/DiscY,22/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cvii{Bh/CS,[270]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-740/Ei,---/eneg,---/eaff,+7/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+5\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+5/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1981/DiscY,8/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cviii{Hs/CS,[270]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-730/Ei,---/eneg,---/eaff,+8/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep14\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+6\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+6/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1984/DiscY,8/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cix{Mt/CS,[278]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-800/Ei,---/eneg,---/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+7\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+7/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1982/DiscY,8/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cx{Ds/CS,[281]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-960/Ei,---/eneg,---/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep16\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+8\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+8/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1994/DiscY,8/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxi{Rg/CS,[282]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-1020/Ei,---/eneg,151/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep17\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+9\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+9/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1994/DiscY,8/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxii{Cn/CS,[285]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-1155/Ei,---/eneg,---/eaff,+2/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1996/DiscY,8/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxiii{Nh/CS,[286]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-707.2/Ei,---/eneg,66.6/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+1/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+1/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2004/DiscY,16/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxiv{Fl/CS,[289]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-832.2/Ei,---/eneg,---/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+2/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1998/DiscY,15/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxv{Mc/CS,[290]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-538.3/Ei,---/eneg,35.3/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+3/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+3/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2003/DiscY,16/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxvi{Lv/CS,[293]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-663.9/Ei,---/eneg,74.9/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+4/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+4/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2000/DiscY,15/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxvii{Ts/CS,[294]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-736.9/Ei,---/eneg,165.9/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+5/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+5/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2009/DiscY,100/DiscC,0/spectra,sintetico/cor}%
-\def\pgfPT@data@cxviii{Og/CS,[294]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-860.1/Ei,---/eneg,5.4/eaff,---/O,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+6/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+6/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2002/DiscY,16/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@i{H/CS,1.008/Ar,[1.0078\noexpand\pgfPT@virgula1.0082]/Arstar,0/radio,53/R,32/Rcov,139.9\noexpand\pgfPT@espaco(1-)/Rion,1312/Ei,2.2/eneg,72.77/eaff,\noexpand\pgfPT@pm1/O,\noexpand\pgfPT@pm I/ORoman,13.99/Tmelt,-259.16/TmeltC,20.271/Tboil,-252.879/TboilC,1/eDist,::1s+1/eConfign,::1s+1/eConfignl,0.08988/d,28.836/Cp,0.1805/kT,hex/ls,470/lsa,470/lsb,340/lsc,0.72/lsca,1766/DiscY,21/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@ii{He/CS,4.0026/Ar,4.0026/Arstar,0/radio,31/R,46/Rcov,---/Rion,2372.3/Ei,---/eneg,0/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,4.222/Tboil,-268.928/TboilC,2/eDist,::1s+2/eConfign,::1s+2/eConfignl,0.1786/d,20.786/Cp,0.1513/kT,fcc/ls,424.4/lsa,/lsb,/lsc,/lsca,1895/DiscY,19/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@iii{Li/CS,6.94/Ar,[6.938\noexpand\pgfPT@virgula6.997] /Arstar,0/radio,167/R,133/Rcov,76\noexpand\pgfPT@espaco(1+)/Rion,520.2/Ei,0.98/eneg,59.63/eaff,+1/O,+I/ORoman,453.65/Tmelt,180.5/TmeltC,1603/Tboil,1330/TboilC,2\noexpand\pgfPTeDistsep1/eDist,[He]::2s+1/eConfign,[He]::2s+1/eConfignl,534/d,24.86/Cp,84.8/kT,bcc/ls,350.93/lsa,/lsb,/lsc,/lsca,1817/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@iv{Be/CS,9.0122/Ar,9.0122/Arstar,0/radio,112/R,10/Rcov,45\noexpand\pgfPT@espaco(2+)/Rion,899.5/Ei,1.57/eneg,0/eaff,+2/O,+II/ORoman,1560/Tmelt,1287/TmeltC,2742/Tboil,2469/TboilC,2\noexpand\pgfPTeDistsep2/eDist,[He]::2s+2/eConfign,[He]::2s+2/eConfignl,1850/d,16.443/Cp,200/kT,hcp/ls,228.56/lsa,/lsb,358.32/lsc,1.57/lsca,1798/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@v{B/CS,10.81/Ar,[10.806\noexpand\pgfPT@virgula10.821] /Arstar,0/radio,87/R,85/Rcov,27\noexpand\pgfPT@espaco(3+)/Rion,800.6/Ei,2.04/eneg,26.99/eaff,+3/O,+III/ORoman,2349/Tmelt,2076/TmeltC,4200/Tboil,3927/TboilC,2\noexpand\pgfPTeDistsep3/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+1/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+1/eConfignl,2340/d,11.087/Cp,27.4/kT,rho/ls,505.66/lsa,/lsb,/lsc,/lsca,1808/DiscY,7/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@vi{C/CS,12.011/Ar,[12.009\noexpand\pgfPT@virgula12.012]/Arstar,0/radio,67/R,75/Rcov,16\noexpand\pgfPT@espaco(4+)/Rion,1086.5/Ei,2.55/eneg,121.78/eaff,0\noexpand\pgfPT@virgula\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula\noexpand\pgfPT@pm4/O,0\noexpand\pgfPT@virgula\noexpand\pgfPT@pm I\noexpand\pgfPT@virgula\noexpand\pgfPT@pm II\noexpand\pgfPT@virgula\noexpand\pgfPT@pm III\noexpand\pgfPT@virgula\noexpand\pgfPT@pm IV/ORoman,3823/Tmelt,3550/TmeltC,4300/Tboil,4027/TboilC,2\noexpand\pgfPTeDistsep4/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+2/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+2/eConfignl,2267/d,8.517/Cp,140/kT,hex/ls,246.12/lsa,/lsb,670.79/lsc,2.73/lsca,3750\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,12/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@vii{N/CS,14.007/Ar,[14.006\noexpand\pgfPT@virgula14.008]/Arstar,0/radio,56/R,71/Rcov,146\noexpand\pgfPT@espaco(3-)\noexpand\pgfPT@virgula16\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula13\noexpand\pgfPT@espaco(5+)/Rion,1402.3/Ei,3.04/eneg,0/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+5/O,\noexpand\pgfPT@pm III\noexpand\pgfPT@virgula+IV\noexpand\pgfPT@virgula+V/ORoman,63.15/Tmelt,-210/TmeltC,77.355/Tboil,-195.795/TboilC,2\noexpand\pgfPTeDistsep5/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+3/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+3/eConfignl,1.251/d,29.124/Cp,0.02583/kT,hex/ls,386.1/lsa,386.1/lsb,626.5/lsc,1.62/lsca,1772/DiscY,21/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@viii{O/CS,15.999/Ar,[15.999\noexpand\pgfPT@virgula16.000]/Arstar,0/radio,48/R,63/Rcov,140\noexpand\pgfPT@espaco(2-)/Rion,1313.9/Ei,3.44/eneg,140.98/eaff,--2/O,--II/ORoman,54.36/Tmelt,-218.79/TmeltC,90.188/Tboil,-182.962/TboilC,2\noexpand\pgfPTeDistsep6/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+4/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+4/eConfignl,1.429/d,29.378/Cp,0.02658/kT,mono/ls,540.3/lsa,342.9/lsb,508.6/lsc,0.94/lsca,1771/DiscY,19/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@ix{F/CS,18.998/Ar,18.998/Arstar,0/radio,42/R,64/Rcov,133\noexpand\pgfPT@espaco(1-)/Rion,1681/Ei,3.98/eneg,328.16/eaff,--1/O,--I/ORoman,53.48/Tmelt,-219.67/TmeltC,85.04/Tboil,-188.11/TboilC,2\noexpand\pgfPTeDistsep7/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+5/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+5/eConfignl,1.7/d,31.304/Cp,0.0277/kT,mono/ls,550/lsa,328/lsb,728/lsc,1.32/lsca,1886/DiscY,5/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@x{Ne/CS,20.18/Ar,20.18/Arstar,0/radio,38/R,67/Rcov,---/Rion,2080.7/Ei,---/eneg,0/eaff,---/O,---/ORoman,24.56/Tmelt,-248.59/TmeltC,27.104/Tboil,-246.046/TboilC,2\noexpand\pgfPTeDistsep8/eDist,[He]::2s+2\noexpand\pgfPT@virgula2p+6/eConfign,[He]::2s+2\noexpand\pgfPT@virgula2p+6/eConfignl,0.9002/d,20.786/Cp,0.0491/kT,fcc/ls,442.9/lsa,/lsb,/lsc,/lsca,1898/DiscY,21/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@xi{Na/CS,22.99/Ar,22.99/Arstar,0/radio,190/R,155/Rcov,102\noexpand\pgfPT@espaco(1+)/Rion,495.8/Ei,0.93/eneg,52.87/eaff,+1/O,+I/ORoman,370.944/Tmelt,97.794/TmeltC,1156.09/Tboil,882.94/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Ne]::3s+1/eConfign,[Ne]::3s+1/eConfignl,968/d,28.23/Cp,142/kT,bcc/ls,429.06/lsa,/lsb,/lsc,/lsca,1807/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xii{Mg/CS,24.305/Ar,[24.304\noexpand\pgfPT@virgula24.307] /Arstar,0/radio,145/R,139/Rcov,72\noexpand\pgfPT@espaco(2+)/Rion,737.7/Ei,1.31/eneg,0/eaff,+2/O,+II/ORoman,923/Tmelt,650/TmeltC,1363/Tboil,1090/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Ne]::3s+2/eConfign,[Ne]::3s+2/eConfignl,1738/d,24.869/Cp,156/kT,hcp/ls,320.94/lsa,/lsb,521.05/lsc,1.62/lsca,1755/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xiii{Al/CS,26.982/Ar,26.982/Arstar,0/radio,118/R,126/Rcov,53.5\noexpand\pgfPT@espaco(3+)/Rion,577.5/Ei,1.61/eneg,41.76/eaff,+3/O,+III/ORoman,933.47/Tmelt,660.32/TmeltC,2743/Tboil,2470/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep3/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+1/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+1/eConfignl,2700/d,24.2/Cp,237/kT,fcc/ls,404.95/lsa,/lsb,/lsc,/lsca,1824/DiscY,2/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xiv{Si/CS,28.085/Ar,[28.084\noexpand\pgfPT@virgula28.086]/Arstar,0/radio,111/R,116/Rcov,40\noexpand\pgfPT@espaco(4+)/Rion,786.5/Ei,1.9/eneg,134.07/eaff,\noexpand\pgfPT@pm4/O,\noexpand\pgfPT@pm IV/ORoman,1687/Tmelt,1414/TmeltC,3538/Tboil,3265/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep4/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+2/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+2/eConfignl,2330/d,19.789/Cp,149/kT,dia/ls,543.095/lsa,/lsb,/lsc,/lsca,1823/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xv{P/CS,30.974/Ar,30.974/Arstar,0/radio,98/R,111/Rcov,212\noexpand\pgfPT@espaco(3-)\noexpand\pgfPT@virgula44\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula38\noexpand\pgfPT@espaco(5+)/Rion,1011.8/Ei,2.19/eneg,72.04/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+5/O,\noexpand\pgfPT@pm III\noexpand\pgfPT@virgula+V/ORoman,317.3/Tmelt,44.15/TmeltC,550/Tboil,277/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep5/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+3/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+3/eConfignl,1823/d,23.824/Cp,0.236/kT,tric/ls,1145/lsa,550.3/lsb,1126.1/lsc,0.98/lsca,1669/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xvi{S/CS,32.06/Ar,[32.059\noexpand\pgfPT@virgula32.076]/Arstar,0/radio,88/R,103/Rcov,184\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula37\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula29\noexpand\pgfPT@espaco(6+)/Rion,999.6/Ei,2.58/eneg,200.41/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6/O,\noexpand\pgfPT@pm II\noexpand\pgfPT@virgula+IV\noexpand\pgfPT@virgula+VI/ORoman,388.36/Tmelt,115.21/TmeltC,717.8/Tboil,444.6/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep6/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+4/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+4/eConfignl,1960/d,22.75/Cp,0.205/kT,fcort/ls,1046.5/lsa,1286.6/lsb,2448.6/lsc,2.34/lsca,500\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,12/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xvii{Cl/CS,35.45/Ar,[35.446\noexpand\pgfPT@virgula35.457]/Arstar,0/radio,79/R,99/Rcov,181\noexpand\pgfPT@espaco(1-)\noexpand\pgfPT@virgula12\noexpand\pgfPT@espaco(5+)\noexpand\pgfPT@virgula27\noexpand\pgfPT@espaco(7+)/Rion,1251.2/Ei,3.16/eneg,348.58/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+7/O,\noexpand\pgfPT@pm I\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+V\noexpand\pgfPT@virgula+VII/ORoman,171.6/Tmelt,-101.5/TmeltC,239.11/Tboil,-34.04/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep7/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+5/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+5/eConfignl,3.2/d,33.949/Cp,0.0089/kT,bcort/ls,622.35/lsa,445.61/lsb,817.85/lsc,1.31/lsca,1774/DiscY,18/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@xviii{Ar/CS,39.95/Ar,[39.792\noexpand\pgfPT@virgula39.963]/Arstar,0/radio,71/R,96/Rcov,---/Rion,1520.6/Ei,---/eneg,0/eaff,0/O,0/ORoman,83.81/Tmelt,-189.34/TmeltC,87.302/Tboil,-185.848/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep8/eDist,[Ne]::3s+2\noexpand\pgfPT@virgula3p+6/eConfign,[Ne]::3s+2\noexpand\pgfPT@virgula3p+6/eConfignl,1.784/d,20.786/Cp,0.01772/kT,fcc/ls,525.6/lsa,/lsb,/lsc,/lsca,1894/DiscY,21/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@xix{K/CS,39.098/Ar,39.098/Arstar,0/radio,243/R,196/Rcov,138\noexpand\pgfPT@espaco(1+)/Rion,418.8/Ei,0.82/eneg,48.38/eaff,+1/O,+I/ORoman,336.7/Tmelt,63.5/TmeltC,1032/Tboil,759/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Ar]::4s+1/eConfign,[Ar]::4s+1/eConfignl,890/d,29.6/Cp,102.5/kT,bcc/ls,532.8/lsa,/lsb,/lsc,/lsca,1807/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xx{Ca/CS,40.078/Ar,40.078(4) /Arstar,0/radio,194/R,171/Rcov,100\noexpand\pgfPT@espaco(2+)/Rion,589.8/Ei,1/eneg,2.37/eaff,+2/O,+II/ORoman,1115/Tmelt,842/TmeltC,1757/Tboil,1484/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Ar]::4s+2/eConfign,[Ar]::4s+2/eConfignl,1550/d,25.929/Cp,201/kT,fcc/ls,558.84/lsa,/lsb,/lsc,/lsca,1808/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxi{Sc/CS,44.956/Ar,44.956/Arstar,0/radio,184/R,148/Rcov,74.5\noexpand\pgfPT@espaco(3+)/Rion,633.1/Ei,1.36/eneg,18/eaff,+3/O,+III/ORoman,1814/Tmelt,1541/TmeltC,3109/Tboil,2836/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+1\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+1/eConfignl,2985/d,25.52/Cp,15.8/kT,hcp/ls,330.9/lsa,/lsb,527.33/lsc,1.59/lsca,1879/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxii{Ti/CS,47.867/Ar,47.867/Arstar,0/radio,176/R,136/Rcov,86\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula67\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula60.5\noexpand\pgfPT@espaco(4+)/Rion,658.8/Ei,1.54/eneg,7.29/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+4/O,+II\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+IV/ORoman,1941/Tmelt,1668/TmeltC,3560/Tboil,3287/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+2\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+2/eConfignl,4506/d,25.06/Cp,21.9/kT,hcp/ls,295.03/lsa,/lsb,468.31/lsc,1.59/lsca,1791/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxiii{V/CS,50.942/Ar,50.942/Arstar,0/radio,171/R,134/Rcov,79\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula64\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula58\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula54\noexpand\pgfPT@espaco(5+)/Rion,650.9/Ei,1.63/eneg,50.91/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+5/O,+II\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+IV\noexpand\pgfPT@virgula+V/ORoman,2183/Tmelt,1910/TmeltC,3680/Tboil,3407/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep11\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+3\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+3/eConfignl,6110/d,24.89/Cp,30.7/kT,bcc/ls,302.31/lsa,/lsb,/lsc,/lsca,1830/DiscY,23/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxiv{Cr/CS,51.996/Ar,51.996/Arstar,0/radio,166/R,122/Rcov,73\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula61.5\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula44\noexpand\pgfPT@espaco(6+)/Rion,652.9/Ei,1.66/eneg,65.21/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+6/O,+II\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+VI/ORoman,2180/Tmelt,1907/TmeltC,2755/Tboil,2482/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep1/eDist,[Ar]::3d+5\noexpand\pgfPT@virgula4s+1/eConfign,[Ar]::4s+1\noexpand\pgfPT@virgula3d+5/eConfignl,7150/d,23.35/Cp,93.9/kT,bcc/ls,288.46/lsa,/lsb,/lsc,/lsca,1797/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxv{Mn/CS,54.938/Ar,54.938/Arstar,0/radio,161/R,119/Rcov,67\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula58\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula53\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula25.5\noexpand\pgfPT@espaco(6+)\noexpand\pgfPT@virgula46\noexpand\pgfPT@espaco(7+)/Rion,717.3/Ei,1.55/eneg,0/eaff,+2\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6\noexpand\pgfPT@virgula+7/O,+II\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+IV\noexpand\pgfPT@virgula+VI\noexpand\pgfPT@virgula+VII/ORoman,1519/Tmelt,1246/TmeltC,2334/Tboil,2061/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+5\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+5/eConfignl,7210/d,26.32/Cp,7.81/kT,bcc/ls,891.39/lsa,/lsb,/lsc,/lsca,1774/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxvi{Fe/CS,55.845/Ar,55.845(2)/Arstar,0/radio,156/R,116/Rcov,61\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula55\noexpand\pgfPT@espaco(3+)/Rion,762.5/Ei,1.83/eneg,14.79/eaff,+2\noexpand\pgfPT@virgula+3/O,+II\noexpand\pgfPT@virgula+III/ORoman,1811/Tmelt,1538/TmeltC,3134/Tboil,2861/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep14\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+6\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+6/eConfignl,7860/d,25.1/Cp,80.4/kT,bcc/ls,286.64/lsa,/lsb,/lsc,/lsca,2000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,3/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxvii{Co/CS,58.933/Ar,58.933/Arstar,0/radio,152/R,111/Rcov,65\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula54.5\noexpand\pgfPT@espaco(3+)/Rion,760.4/Ei,1.88/eneg,63.9/eaff,+2\noexpand\pgfPT@virgula+3/O,+II\noexpand\pgfPT@virgula+III/ORoman,1768/Tmelt,1495/TmeltC,3200/Tboil,2927/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+7\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+7/eConfignl,8900/d,24.81/Cp,100/kT,hcp/ls,250.71/lsa,/lsb,406.95/lsc,1.62/lsca,1735/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxviii{Ni/CS,58.693/Ar,58.693/Arstar,0/radio,149/R,110/Rcov,69\noexpand\pgfPT@espaco(2+)/Rion,737.1/Ei,1.91/eneg,111.65/eaff,+2/O,+II/ORoman,1728/Tmelt,1455/TmeltC,3003/Tboil,2730/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep16\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+8\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+8/eConfignl,8908/d,26.07/Cp,90.9/kT,fcc/ls,352.4/lsa,/lsb,/lsc,/lsca,1751/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxix{Cu/CS,63.546/Ar,63.546(3)/Arstar,0/radio,145/R,112/Rcov,77\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula73\noexpand\pgfPT@espaco(2+)/Rion,745.5/Ei,1.9/eneg,119.24/eaff,+1\noexpand\pgfPT@virgula+2/O,+I\noexpand\pgfPT@virgula+II/ORoman,1357.77/Tmelt,1084.62/TmeltC,2835/Tboil,2562/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep1/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+1/eConfign,[Ar]::4s+1\noexpand\pgfPT@virgula3d+10/eConfignl,8960/d,24.44/Cp,401/kT,fcc/ls,361.47/lsa,/lsb,/lsc,/lsca,8000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,12/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxx{Zn/CS,65.38/Ar,65.38(2)/Arstar,0/radio,142/R,118/Rcov,74\noexpand\pgfPT@espaco(2+)/Rion,906.4/Ei,1.65/eneg,0/eaff,+2/O,+II/ORoman,692.68/Tmelt,419.53/TmeltC,1180/Tboil,907/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10/eConfignl,7140/d,25.39/Cp,116/kT,hcp/ls,266.49/lsa,/lsb,494.68/lsc,1.86/lsca,1746/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxxi{Ga/CS,69.723/Ar,69.723/Arstar,0/radio,136/R,124/Rcov,62\noexpand\pgfPT@espaco(3+)/Rion,578.8/Ei,1.81/eneg,29.06/eaff,+3/O,+III/ORoman,302.9146/Tmelt,29.7646/TmeltC,2673/Tboil,2400/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+1/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+1/eConfignl,5910/d,25.86/Cp,40.6/kT,bcort/ls,452.58/lsa,451.86/lsb,765.7/lsc,1.69/lsca,1875/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxxii{Ge/CS,72.63/Ar,72.630(8)/Arstar,0/radio,125/R,121/Rcov,73\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula53\noexpand\pgfPT@espaco(4+)/Rion,762/Ei,2.01/eneg,118.94/eaff,+2\noexpand\pgfPT@virgula\noexpand\pgfPT@pm4/O,+II\noexpand\pgfPT@virgula\noexpand\pgfPT@pm IV/ORoman,1211.4/Tmelt,938.25/TmeltC,3106/Tboil,2833/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+2/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+2/eConfignl,5323/d,23.222/Cp,60.2/kT,dia/ls,565.791/lsa,/lsb,/lsc,/lsca,1886/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxxiii{As/CS,74.922/Ar,74.922/Arstar,0/radio,114/R,121/Rcov,58\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula46\noexpand\pgfPT@espaco(5+)/Rion,947/Ei,2.18/eneg,77.65/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+5/O,\noexpand\pgfPT@pm III\noexpand\pgfPT@virgula+V/ORoman,1090/Tmelt,817/TmeltC,887/Tboil,614/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+3/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+3/eConfignl,5727/d,24.64/Cp,50.2/kT,rho/ls,375.98/lsa,375.98/lsb,1054.75/lsc,2.81/lsca,1250/DiscY,12/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxxiv{Se/CS,78.971/Ar,78.971(8)/Arstar,0/radio,103/R,116/Rcov,198\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula50\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula42\noexpand\pgfPT@espaco(6+)/Rion,941/Ei,2.55/eneg,194.96/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6/O,\noexpand\pgfPT@pm II\noexpand\pgfPT@virgula+IV\noexpand\pgfPT@virgula+VI/ORoman,494/Tmelt,221/TmeltC,958/Tboil,685/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+4/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+4/eConfignl,4810/d,25.363/Cp,0.519/kT,mono/ls,905.4/lsa,908.3/lsb,1160.1/lsc,1.28/lsca,1817/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxxv{Br/CS,79.904/Ar,[79.901\noexpand\pgfPT@virgula79.907]/Arstar,0/radio,94/R,114/Rcov,196\noexpand\pgfPT@espaco(1-)\noexpand\pgfPT@virgula59\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula31\noexpand\pgfPT@espaco(5+)/Rion,1139.9/Ei,2.96/eneg,324.54/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5/O,\noexpand\pgfPT@pm I\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+V/ORoman,265.8/Tmelt,-7.3/TmeltC,332/Tboil,58.8/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+5/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+5/eConfignl,3102.8/d,75.69/Cp,0.122/kT,bcort/ls,672.65/lsa,464.51/lsb,870.23/lsc,1.29/lsca,1825/DiscY,5/DiscC,1/spectra,liquido/cor}%
+\def\pgfPT@data@xxxvi{Kr/CS,83.798/Ar,83.798(2)/Arstar,0/radio,88/R,117/Rcov,---/Rion,1350.8/Ei,3/eneg,0/eaff,0/O,0/ORoman,115.78/Tmelt,-157.37/TmeltC,119.735/Tboil,-153.415/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Ar]::3d+10\noexpand\pgfPT@virgula4s+2\noexpand\pgfPT@virgula4p+6/eConfign,[Ar]::4s+2\noexpand\pgfPT@virgula3d+10\noexpand\pgfPT@virgula4p+6/eConfignl,3.749/d,20.786/Cp,0.00943/kT,fcc/ls,570.6/lsa,/lsb,/lsc,/lsca,1898/DiscY,21/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@xxxvii{Rb/CS,85.468/Ar,85.468/Arstar,0/radio,265/R,210/Rcov,152\noexpand\pgfPT@espaco(1+)/Rion,403/Ei,0.82/eneg,46.88/eaff,+1/O,+I/ORoman,312.45/Tmelt,39.3/TmeltC,961/Tboil,688/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Kr]::5s+1/eConfign,[Kr]::5s+1/eConfignl,1532/d,31.06/Cp,58.2/kT,bcc/ls,558.5/lsa,/lsb,/lsc,/lsca,1861/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxxviii{Sr/CS,87.62/Ar,87.62/Arstar,0/radio,219/R,185/Rcov,118\noexpand\pgfPT@espaco(2+)/Rion,549.5/Ei,0.95/eneg,5.02/eaff,+2/O,+II/ORoman,1050/Tmelt,777/TmeltC,1650/Tboil,1382/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Kr]::5s+2/eConfign,[Kr]::5s+2/eConfignl,2640/d,26.4/Cp,35.4/kT,fcc/ls,608.49/lsa,/lsb,/lsc,/lsca,1787/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xxxix{Y/CS,88.906/Ar,88.906/Arstar,0/radio,212/R,163/Rcov,90\noexpand\pgfPT@espaco(3+)/Rion,600/Ei,1.22/eneg,29.6/eaff,+3/O,+III/ORoman,1799/Tmelt,1526/TmeltC,3203/Tboil,2930/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+1\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+1/eConfignl,4472/d,26.53/Cp,17.2/kT,hcp/ls,364.74/lsa,/lsb,573.06/lsc,1.57/lsca,1794/DiscY,4/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xl{Zr/CS,91.224/Ar,91.224(2)/Arstar,0/radio,206/R,154/Rcov,72\noexpand\pgfPT@espaco(4+)/Rion,640.1/Ei,1.33/eneg,41.81/eaff,+4/O,+IV/ORoman,2128/Tmelt,1855/TmeltC,4650/Tboil,4377/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+2\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+2/eConfignl,6520/d,25.36/Cp,22.6/kT,hcp/ls,323.2/lsa,/lsb,514.7/lsc,1.59/lsca,1789/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xli{Nb/CS,92.906/Ar,92.906/Arstar,0/radio,198/R,147/Rcov,64\noexpand\pgfPT@espaco(5+)/Rion,652.1/Ei,1.6/eneg,88.52/eaff,+5/O,+V/ORoman,2750/Tmelt,2477/TmeltC,5017/Tboil,4744/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep12\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+4\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+4/eConfignl,8570/d,24.6/Cp,53.7/kT,bcc/ls,330.04/lsa,/lsb,/lsc,/lsca,1801/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xlii{Mo/CS,95.95/Ar,95.95/Arstar,0/radio,190/R,138/Rcov,65\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula59\noexpand\pgfPT@espaco(6+)/Rion,684.3/Ei,2.16/eneg,72.1/eaff,+4\noexpand\pgfPT@virgula+6/O,+IV\noexpand\pgfPT@virgula+VI/ORoman,2896/Tmelt,2623/TmeltC,4912/Tboil,4639/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+5\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+5/eConfignl,10280/d,24.06/Cp,138/kT,bcc/ls,314.69/lsa,/lsb,/lsc,/lsca,1781/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xliii{Tc/CS,[98]/Ar,/Arstar,1/radio,183/R,128/Rcov,64.5\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula56\noexpand\pgfPT@espaco(7+)/Rion,702/Ei,1.9/eneg,53/eaff,+4\noexpand\pgfPT@virgula+7/O,+IV\noexpand\pgfPT@virgula+VII/ORoman,2430/Tmelt,2157/TmeltC,4538/Tboil,4265/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+5\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+5/eConfignl,11000/d,24.27/Cp,50.6/kT,hcp/ls,273.5/lsa,/lsb,438.8/lsc,1.6/lsca,1937/DiscY,11/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@xliv{Ru/CS,101.07/Ar,101.07/Arstar,0/radio,178/R,125/Rcov,68\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula62\noexpand\pgfPT@espaco(4+)/Rion,710.2/Ei,2.2/eneg,100.96/eaff,+3\noexpand\pgfPT@virgula+4/O,+III\noexpand\pgfPT@virgula+IV/ORoman,2607/Tmelt,2334/TmeltC,4423/Tboil,4150/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+7\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+7/eConfignl,12450/d,24.06/Cp,117/kT,hcp/ls,270.55/lsa,/lsb,428.16/lsc,1.58/lsca,1844/DiscY,15/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xlv{Rh/CS,102.91/Ar,102.91/Arstar,0/radio,173/R,125/Rcov,66.5\noexpand\pgfPT@espaco(3+)/Rion,719.7/Ei,2.28/eneg,110.27/eaff,+3/O,+III/ORoman,2237/Tmelt,1964/TmeltC,3968/Tboil,3695/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep16\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+8\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+8/eConfignl,12410/d,24.98/Cp,150/kT,fcc/ls,380.34/lsa,/lsb,/lsc,/lsca,1804/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xlvi{Pd/CS,106.42/Ar,106.42/Arstar,0/radio,169/R,120/Rcov,86\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula61.5\noexpand\pgfPT@espaco(4+)/Rion,804.4/Ei,2.2/eneg,54.24/eaff,0\noexpand\pgfPT@virgula+2\noexpand\pgfPT@virgula+4/O,0\noexpand\pgfPT@virgula+II\noexpand\pgfPT@virgula+IV/ORoman,1828.05/Tmelt,1554.9/TmeltC,3236/Tboil,2963/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18/eDist,[Kr]::4d+10/eConfign,[Kr]::4d+10/eConfignl,12023/d,25.98/Cp,71.8/kT,fcc/ls,389.02/lsa,/lsb,/lsc,/lsca,1802/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xlvii{Ag/CS,107.87/Ar,107.87/Arstar,0/radio,165/R,128/Rcov,115\noexpand\pgfPT@espaco(1+)/Rion,731/Ei,1.93/eneg,125.86/eaff,+1/O,+I/ORoman,1234.93/Tmelt,961.78/TmeltC,2483/Tboil,2210/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep1/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+1/eConfign,[Kr]::5s+1\noexpand\pgfPT@virgula4d+10/eConfignl,10490/d,25.35/Cp,429/kT,fcc/ls,408.57/lsa,/lsb,/lsc,/lsca,3000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,0/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xlviii{Cd/CS,112.41/Ar,112.41/Arstar,0/radio,161/R,136/Rcov,95\noexpand\pgfPT@espaco(2+)/Rion,867.8/Ei,1.69/eneg,0/eaff,+2/O,+II/ORoman,594.22/Tmelt,321.07/TmeltC,1040/Tboil,767/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10/eConfignl,8650/d,26.02/Cp,96.6/kT,hcp/ls,297.88/lsa,/lsb,561.67/lsc,1.89/lsca,1817/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xlix{In/CS,114.82/Ar,114.82/Arstar,0/radio,156/R,142/Rcov,80\noexpand\pgfPT@espaco(3+)/Rion,558.3/Ei,1.78/eneg,37.04/eaff,+3/O,+III/ORoman,429.75/Tmelt,156.6/TmeltC,2345/Tboil,2072/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+1/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+1/eConfignl,7310/d,26.74/Cp,81.8/kT,tetr/ls,325.17/lsa,/lsb,494.59/lsc,1.52/lsca,1863/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@l{Sn/CS,118.71/Ar,118.71/Arstar,0/radio,145/R,140/Rcov,118\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula69\noexpand\pgfPT@espaco(4+)/Rion,708.6/Ei,1.96/eneg,107.3/eaff,+2\noexpand\pgfPT@virgula\noexpand\pgfPT@pm4/O,+II\noexpand\pgfPT@virgula\noexpand\pgfPT@pm IV/ORoman,505.08/Tmelt,231.93/TmeltC,2875/Tboil,2602/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+2/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+2/eConfignl,7265/d,25.77/Cp,66.8/kT,ctetr/ls,583.1/lsa,/lsb,318.1/lsc,0.55/lsca,3000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,0/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@li{Sb/CS,121.76/Ar,121.76/Arstar,0/radio,133/R,140/Rcov,76\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula60\noexpand\pgfPT@espaco(5+)/Rion,834/Ei,2.05/eneg,101.06/eaff,\noexpand\pgfPT@pm3\noexpand\pgfPT@virgula+5/O,\noexpand\pgfPT@pm III\noexpand\pgfPT@virgula+V/ORoman,903.78/Tmelt,630.63/TmeltC,1908/Tboil,1635/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+3/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+3/eConfignl,6697/d,25.23/Cp,24.4/kT,rho/ls,430.7/lsa,/lsb,1127.3/lsc,2.62/lsca,815/DiscY,12/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lii{Te/CS,127.6/Ar,127.60(3)/Arstar,0/radio,123/R,136/Rcov,221\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula97\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula56\noexpand\pgfPT@espaco(6+)/Rion,869.3/Ei,2.1/eneg,190.16/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+6/O,\noexpand\pgfPT@pm II\noexpand\pgfPT@virgula+IV\noexpand\pgfPT@virgula+VI/ORoman,722.66/Tmelt,449.51/TmeltC,1261/Tboil,988/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+4/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+4/eConfignl,6240/d,25.73/Cp,3/kT,rho/ls,445.72/lsa,/lsb,592.9/lsc,1.33/lsca,1782/DiscY,14/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@liii{I/CS,126.9/Ar,126.9/Arstar,0/radio,115/R,133/Rcov,220\noexpand\pgfPT@espaco(1-)\noexpand\pgfPT@virgula95\noexpand\pgfPT@espaco(5+)\noexpand\pgfPT@virgula53\noexpand\pgfPT@espaco(7+)/Rion,1008.4/Ei,2.66/eneg,295.15/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+7/O,\noexpand\pgfPT@pm I\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+V\noexpand\pgfPT@virgula+VII/ORoman,386.85/Tmelt,113.7/TmeltC,457.4/Tboil,184.3/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+5/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+5/eConfignl,4933/d,54.44/Cp,0.449/kT,bcort/ls,726.97/lsa,479.03/lsb,979.42/lsc,1.35/lsca,1811/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@liv{Xe/CS,131.29/Ar,131.29/Arstar,0/radio,108/R,131/Rcov,---/Rion,1170.4/Ei,2.6/eneg,0/eaff,0/O,0/ORoman,161.4/Tmelt,-111.75/TmeltC,165.051/Tboil,-108.099/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Kr]::4d+10\noexpand\pgfPT@virgula5s+2\noexpand\pgfPT@virgula5p+6/eConfign,[Kr]::5s+2\noexpand\pgfPT@virgula4d+10\noexpand\pgfPT@virgula5p+6/eConfignl,5.894/d,20.786/Cp,0.00565/kT,fcc/ls,620.23/lsa,/lsb,/lsc,/lsca,1898/DiscY,21/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@lv{Cs/CS,132.91/Ar,132.91/Arstar,0/radio,298/R,232/Rcov,167\noexpand\pgfPT@espaco(1+)/Rion,375.7/Ei,0.79/eneg,45.51/eaff,+1/O,+I/ORoman,301.7/Tmelt,28.5/TmeltC,944/Tboil,671/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Xe]::6s+1/eConfign,[Xe]::6s+1/eConfignl,1930/d,32.21/Cp,35.9/kT,bcc/ls,614.1/lsa,/lsb,/lsc,/lsca,1860/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lvi{Ba/CS,137.33/Ar,137.33/Arstar,0/radio,253/R,196/Rcov,135\noexpand\pgfPT@espaco(2+)/Rion,502.9/Ei,0.89/eneg,13.95/eaff,+2/O,+II/ORoman,1000/Tmelt,727/TmeltC,1910/Tboil,1637/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::6s+2/eConfign,[Xe]::6s+2/eConfignl,3510/d,28.07/Cp,18.4/kT,bcc/ls,501.9/lsa,/lsb,/lsc,/lsca,1808/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lvii{La/CS,138.91/Ar,138.91/Arstar,0/radio,226/R,180/Rcov,103.2\noexpand\pgfPT@espaco(3+)/Rion,538.1/Ei,1.1/eneg,53.8/eaff,+3/O,+III/ORoman,1193/Tmelt,920/TmeltC,3737/Tboil,3464/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula5d+1/eConfignl,6162/d,27.11/Cp,13.4/kT,hex/ls,377.2/lsa,/lsb,1214.4/lsc,3.22/lsca,1838/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lviii{Ce/CS,140.12/Ar,140.12/Arstar,0/radio,210/R,163/Rcov,101\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula87\noexpand\pgfPT@espaco(4+)/Rion,534.4/Ei,1.12/eneg,55/eaff,+3\noexpand\pgfPT@virgula+4/O,+III\noexpand\pgfPT@virgula+IV/ORoman,1068/Tmelt,795/TmeltC,3716/Tboil,3443/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep19\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+1\noexpand\pgfPT@virgula5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+1\noexpand\pgfPT@virgula5d+1/eConfignl,6770/d,26.94/Cp,11.3/kT,hex/ls,362/lsa,/lsb,599/lsc,1.65/lsca,1803/DiscY,9/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lix{Pr/CS,140.91/Ar,140.91/Arstar,0/radio,247/R,17/Rcov,99\noexpand\pgfPT@espaco(3+)/Rion,527/Ei,1.13/eneg,10.54/eaff,+3/O,+III/ORoman,1208/Tmelt,935/TmeltC,3403/Tboil,3130/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep21\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+3\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+3/eConfignl,6770/d,27.2/Cp,12.5/kT,hex/ls,367.21/lsa,/lsb,1183.26/lsc,3.22/lsca,1885/DiscY,1/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lx{Nd/CS,144.24/Ar,144.24/Arstar,0/radio,206/R,17/Rcov,98.3\noexpand\pgfPT@espaco(3+)/Rion,533.1/Ei,1.14/eneg,9.41/eaff,+3/O,+III/ORoman,1297/Tmelt,1024/TmeltC,3347/Tboil,3074/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep22\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+4\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+4/eConfignl,7010/d,27.45/Cp,16.5/kT,hex/ls,365.82/lsa,/lsb,1179.66/lsc,3.22/lsca,1885/DiscY,1/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxi{Pm/CS,[145]/Ar,[145]/Arstar,1/radio,205/R,173/Rcov,97\noexpand\pgfPT@espaco(3+)/Rion,540/Ei,1.13/eneg,12.45/eaff,+3/O,+III/ORoman,1315/Tmelt,1042/TmeltC,3273/Tboil,3000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep23\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+5\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+5/eConfignl,7260/d,---/Cp,17.9/kT,hex/ls,365/lsa,/lsb,1165/lsc,3.19/lsca,1945/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@lxii{Sm/CS,150.36/Ar,150.36(2)/Arstar,0/radio,238/R,172/Rcov,95.8\noexpand\pgfPT@espaco(3+)/Rion,544.5/Ei,1.17/eneg,15.63/eaff,+3/O,+III/ORoman,1345/Tmelt,1072/TmeltC,2173/Tboil,1900/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep24\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+6\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+6/eConfignl,7520/d,29.54/Cp,13.3/kT,rho/ls,362.1/lsa,/lsb,2625/lsc,7.25/lsca,1879/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxiii{Eu/CS,151.96/Ar,151.96/Arstar,0/radio,231/R,168/Rcov,117\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula94.7\noexpand\pgfPT@espaco(3+)/Rion,547.1/Ei,1.2/eneg,11.2/eaff,+2\noexpand\pgfPT@virgula+3/O,+II\noexpand\pgfPT@virgula+III/ORoman,1099/Tmelt,826/TmeltC,1802/Tboil,1529/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+7\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+7/eConfignl,5244/d,27.66/Cp,13.9/kT,bcc/ls,458.1/lsa,/lsb,/lsc,/lsca,1901/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxiv{Gd/CS,157.25/Ar,157.25(3)/Arstar,0/radio,233/R,169/Rcov,93.5\noexpand\pgfPT@espaco(3+)/Rion,593.4/Ei,1.2/eneg,13.22/eaff,+3/O,+III/ORoman,1585/Tmelt,1312/TmeltC,3273/Tboil,3000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+7\noexpand\pgfPT@virgula5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+7\noexpand\pgfPT@virgula5d+1/eConfignl,7900/d,37.03/Cp,10.6/kT,hcp/ls,363.6/lsa,/lsb,578.26/lsc,1.59/lsca,1880/DiscY,20/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxv{Tb/CS,158.93/Ar,158.93/Arstar,0/radio,225/R,168/Rcov,92.3\noexpand\pgfPT@espaco(3+)/Rion,565.8/Ei,1.2/eneg,12.67/eaff,+3/O,+III/ORoman,1629/Tmelt,1356/TmeltC,3396/Tboil,3123/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep27\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+9\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+9/eConfignl,8230/d,28.91/Cp,11.1/kT,hcp/ls,360.1/lsa,/lsb,569.36/lsc,1.58/lsca,1843/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxvi{Dy/CS,162.5/Ar,162.5/Arstar,0/radio,228/R,167/Rcov,91.2\noexpand\pgfPT@espaco(3+)/Rion,573/Ei,1.22/eneg,33.96/eaff,+3/O,+III/ORoman,1680/Tmelt,1407/TmeltC,2840/Tboil,2567/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep28\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+10\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+10/eConfignl,8540/d,27.7/Cp,10.7/kT,hcp/ls,359.3/lsa,/lsb,565.37/lsc,1.57/lsca,1886/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxvii{Ho/CS,164.93/Ar,164.93/Arstar,0/radio,226/R,166/Rcov,90.1\noexpand\pgfPT@espaco(3+)/Rion,581/Ei,1.23/eneg,32.61/eaff,+3/O,+III/ORoman,1734/Tmelt,1461/TmeltC,2873/Tboil,2600/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep29\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+11\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+11/eConfignl,8790/d,27.15/Cp,16.2/kT,hcp/ls,357.73/lsa,/lsb,561.58/lsc,1.57/lsca,1878/DiscY,20/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxviii{Er/CS,167.26/Ar,167.26/Arstar,0/radio,226/R,165/Rcov,89\noexpand\pgfPT@espaco(3+)/Rion,589.3/Ei,1.24/eneg,30.1/eaff,+3/O,+III/ORoman,1802/Tmelt,1529/TmeltC,3141/Tboil,2868/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep30\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+12\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+12/eConfignl,9066/d,28.12/Cp,14.5/kT,hcp/ls,355.88/lsa,/lsb,558.74/lsc,1.57/lsca,1843/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxix{Tm/CS,168.93/Ar,168.93/Arstar,0/radio,222/R,164/Rcov,88\noexpand\pgfPT@espaco(3+)/Rion,596.7/Ei,1.25/eneg,99/eaff,+3/O,+III/ORoman,1818/Tmelt,1545/TmeltC,2223/Tboil,1950/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep31\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+13\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+13/eConfignl,9320/d,27.03/Cp,16.9/kT,hcp/ls,353.75/lsa,/lsb,555.46/lsc,1.57/lsca,1879/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxx{Yb/CS,173.05/Ar,173.05/Arstar,0/radio,222/R,170/Rcov,86.8\noexpand\pgfPT@espaco(3+)/Rion,603.4/Ei,1.1/eneg,0/eaff,+3/O,+III/ORoman,1097/Tmelt,824/TmeltC,1703/Tboil,1430/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14/eConfignl,6900/d,26.74/Cp,38.5/kT,fcc/ls,548.47/lsa,/lsb,/lsc,/lsca,1878/DiscY,20/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxi{Lu/CS,174.97/Ar,174.97/Arstar,0/radio,217/R,162/Rcov,86.1\noexpand\pgfPT@espaco(3+)/Rion,523.5/Ei,1.27/eneg,23.04/eaff,+3/O,+III/ORoman,1925/Tmelt,1652/TmeltC,3675/Tboil,3402/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+1\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+1/eConfignl,9841/d,26.86/Cp,16.4/kT,hcp/ls,350.31/lsa,/lsb,555.09/lsc,1.58/lsca,1906/DiscY,6/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxii{Hf/CS,178.49/Ar,178.49(2)/Arstar,0/radio,208/R,152/Rcov,71\noexpand\pgfPT@espaco(4+)/Rion,658.5/Ei,1.3/eneg,17.18/eaff,+4/O,+IV/ORoman,2506/Tmelt,2233/TmeltC,4876/Tboil,4603/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+2\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+2/eConfignl,13310/d,25.73/Cp,23/kT,hcp/ls,319.64/lsa,/lsb,505.11/lsc,1.58/lsca,1922/DiscY,2/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxiii{Ta/CS,180.95/Ar,180.95/Arstar,0/radio,200/R,146/Rcov,64\noexpand\pgfPT@espaco(5+)/Rion,761/Ei,1.5/eneg,31/eaff,+5/O,+V/ORoman,3290/Tmelt,3017/TmeltC,5731/Tboil,5458/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep11\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+3\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+3/eConfignl,16690/d,25.36/Cp,57.5/kT,bcc/ls,330.26/lsa,/lsb,/lsc,/lsca,1802/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxiv{W/CS,183.84/Ar,183.84/Arstar,0/radio,193/R,137/Rcov,66\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula60\noexpand\pgfPT@espaco(6+)/Rion,770/Ei,2.36/eneg,78.76/eaff,+4\noexpand\pgfPT@virgula+6/O,+IV\noexpand\pgfPT@virgula+VI/ORoman,3695/Tmelt,3422/TmeltC,6203/Tboil,5930/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep12\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+4\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+4/eConfignl,19250/d,24.27/Cp,173/kT,bcc/ls,316.52/lsa,/lsb,/lsc,/lsca,1783/DiscY,17/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxv{Re/CS,186.21/Ar,186.21/Arstar,0/radio,188/R,131/Rcov,63\noexpand\pgfPT@espaco(4+)/Rion,760/Ei,1.9/eneg,5.83/eaff,+4/O,+IV/ORoman,3459/Tmelt,3186/TmeltC,5869/Tboil,5596/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+5\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+5/eConfignl,21020/d,25.48/Cp,48/kT,hcp/ls,276.1/lsa,/lsb,445.8/lsc,1.62/lsca,1925/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxvi{Os/CS,190.23/Ar,190.23(3)/Arstar,0/radio,185/R,129/Rcov,63\noexpand\pgfPT@espaco(4+)/Rion,840/Ei,2.2/eneg,103.99/eaff,+4/O,+IV/ORoman,3306/Tmelt,3033/TmeltC,5285/Tboil,5012/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep14\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+6\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+6/eConfignl,22590/d,24.7/Cp,87.6/kT,hcp/ls,273.43/lsa,/lsb,431.73/lsc,1.58/lsca,1803/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxvii{Ir/CS,192.22/Ar,192.22/Arstar,0/radio,180/R,122/Rcov,68\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula62.5\noexpand\pgfPT@espaco(4+)/Rion,880/Ei,2.2/eneg,150.91/eaff,+3\noexpand\pgfPT@virgula+4/O,+III\noexpand\pgfPT@virgula+IV/ORoman,2719/Tmelt,2446/TmeltC,4403/Tboil,4130/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+7\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+7/eConfignl,22560/d,25.1/Cp,147/kT,fcc/ls,383.92/lsa,/lsb,/lsc,/lsca,1803/DiscY,7/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxviii{Pt/CS,195.08/Ar,195.08/Arstar,0/radio,177/R,123/Rcov,80\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula62.5\noexpand\pgfPT@espaco(4+)/Rion,870/Ei,2.28/eneg,205.04/eaff,+2\noexpand\pgfPT@virgula+4/O,+II\noexpand\pgfPT@virgula+IV/ORoman,2041.4/Tmelt,1768.3/TmeltC,4098/Tboil,3825/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep17\noexpand\pgfPTeDistsep1/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+9\noexpand\pgfPT@virgula6s+1/eConfign,[Xe]::6s+1\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+9/eConfignl,21450/d,25.86/Cp,71.6/kT,fcc/ls,392.35/lsa,/lsb,/lsc,/lsca,1735/DiscY,13/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxix{Au/CS,196.97/Ar,196.97/Arstar,0/radio,174/R,124/Rcov,137\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula85\noexpand\pgfPT@espaco(3+)/Rion,890.1/Ei,2.54/eneg,222.75/eaff,+1\noexpand\pgfPT@virgula+3/O,+I\noexpand\pgfPT@virgula+III/ORoman,1337.33/Tmelt,1064.18/TmeltC,3243/Tboil,2970/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep1/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+1/eConfign,[Xe]::6s+1\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10/eConfignl,19300/d,25.418/Cp,318/kT,fcc/ls,407.83/lsa,/lsb,/lsc,/lsca,4000\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,100/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxx{Hg/CS,200.59/Ar,200.59/Arstar,0/radio,171/R,133/Rcov,119\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula102\noexpand\pgfPT@espaco(2+)/Rion,1007.1/Ei,2/eneg,0/eaff,+1\noexpand\pgfPT@virgula+2/O,+I\noexpand\pgfPT@virgula+II/ORoman,234.32/Tmelt,-38.83/TmeltC,629.88/Tboil,356.73/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10/eConfignl,13534/d,27.983/Cp,8.3/kT,rho/ls,300.9/lsa,/lsb,/lsc,/lsca,1500\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,3/DiscC,1/spectra,liquido/cor}%
+\def\pgfPT@data@lxxxi{Tl/CS,204.38/Ar,[204.38\noexpand\pgfPT@virgula204.39]/Arstar,0/radio,156/R,144/Rcov,150\noexpand\pgfPT@espaco(1+)\noexpand\pgfPT@virgula88.5\noexpand\pgfPT@espaco(3+)/Rion,589.4/Ei,1.62/eneg,30.88/eaff,+1\noexpand\pgfPT@virgula+3/O,+I\noexpand\pgfPT@virgula+III/ORoman,577/Tmelt,304/TmeltC,1746/Tboil,1473/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+1/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+1/eConfignl,11850/d,26.32/Cp,46.1/kT,hcp/ls,345.66/lsa,/lsb,552.48/lsc,1.6/lsca,1861/DiscY,21/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxxii{Pb/CS,207.2/Ar,207.2/Arstar,0/radio,154/R,144/Rcov,119\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula77.5\noexpand\pgfPT@espaco(4+)/Rion,715.6/Ei,1.87/eneg,34.42/eaff,+2\noexpand\pgfPT@virgula+4/O,+II\noexpand\pgfPT@virgula+IV/ORoman,600.61/Tmelt,327.46/TmeltC,2022/Tboil,1749/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+2/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+2/eConfignl,11340/d,26.65/Cp,35.3/kT,fcc/ls,495.02/lsa,/lsb,/lsc,/lsca,3800\noexpand\pgfPT@scaletxt{\pgfPTDiscYBCscale}{\noexpand\pgfPT@espaco\noexpand\pgfPT@BClabel}/DiscY,3/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxxiii{Bi/CS,208.98/Ar,208.98/Arstar,0/radio,143/R,151/Rcov,103\noexpand\pgfPT@espaco(3+)/Rion,703/Ei,2.02/eneg,90.92/eaff,+3/O,+III/ORoman,544.7/Tmelt,271.5/TmeltC,1837/Tboil,1564/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+3/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+3/eConfignl,9780/d,25.52/Cp,7.97/kT,mono/ls,667.4/lsa,611.7/lsb,330.4/lsc,0.5/lsca,1400/DiscY,12/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxxiv{Po/CS,[209]/Ar,/Arstar,1/radio,135/R,145/Rcov,223\noexpand\pgfPT@espaco(2-)\noexpand\pgfPT@virgula94\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula67\noexpand\pgfPT@espaco(6+)/Rion,812.1/Ei,2/eneg,136/eaff,\noexpand\pgfPT@pm2\noexpand\pgfPT@virgula+4\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+6/O,\noexpand\pgfPT@pm II\noexpand\pgfPT@virgula+IV\noexpand\pgfPT@virgula+V\noexpand\pgfPT@virgula+VI/ORoman,527/Tmelt,254/TmeltC,1235/Tboil,962/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+4/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+4/eConfignl,9196/d,26.4/Cp,0/kT,sc/ls,335.9/lsa,/lsb,/lsc,/lsca,1898/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxxv{At/CS,[210]/Ar,/Arstar,1/radio,127/R,147/Rcov,62\noexpand\pgfPT@espaco(7+)/Rion,899.003/Ei,2.2/eneg,233.09/eaff,\noexpand\pgfPT@pm1\noexpand\pgfPT@virgula+3\noexpand\pgfPT@virgula+5\noexpand\pgfPT@virgula+7/O,\noexpand\pgfPT@pm I\noexpand\pgfPT@virgula+III\noexpand\pgfPT@virgula+V\noexpand\pgfPT@virgula+VII/ORoman,575/Tmelt,302/TmeltC,503/Tboil,230/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+5/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+5/eConfignl,---/d,---/Cp,1.7/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1940/DiscY,22/DiscC,0/spectra,solido/cor}%
+\def\pgfPT@data@lxxxvi{Rn/CS,[222]/Ar,/Arstar,1/radio,120/R,142/Rcov,---/Rion,1037/Ei,2.2/eneg,0/eaff,+2\noexpand\pgfPT@virgula+6/O,+II\noexpand\pgfPT@virgula+VI/ORoman,202/Tmelt,-71/TmeltC,211.5/Tboil,-61.7/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Xe]::4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6s+2\noexpand\pgfPT@virgula6p+6/eConfign,[Xe]::6s+2\noexpand\pgfPT@virgula4f+14\noexpand\pgfPT@virgula5d+10\noexpand\pgfPT@virgula6p+6/eConfignl,9.73/d,20.786/Cp,0.00361/kT,fcc/ls,---/lsa,/lsb,/lsc,/lsca,1899/DiscY,8/DiscC,1/spectra,gasoso/cor}%
+\def\pgfPT@data@lxxxvii{Fr/CS,[223]/Ar,/Arstar,1/radio,---/R,---/Rcov,180\noexpand\pgfPT@espaco(1+)/Rion,380/Ei,0.7/eneg,46.89/eaff,+1/O,+I/ORoman,281/Tmelt,8/TmeltC,890/Tboil,620/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep1/eDist,[Rn]::7s+1/eConfign,[Rn]::7s+1/eConfignl,---/d,31.8/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1939/DiscY,5/DiscC,0/spectra,solido/cor}%
+\def\pgfPT@data@lxxxviii{Ra/CS,[226]/Ar,/Arstar,1/radio,---/R,201/Rcov,148\noexpand\pgfPT@espaco(2+)/Rion,509.3/Ei,0.9/eneg,9.65/eaff,+2/O,+II/ORoman,973/Tmelt,700/TmeltC,2010/Tboil,1737/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::7s+2/eConfign,[Rn]::7s+2/eConfignl,5500/d,---/Cp,18.6/kT,bcc/ls,514.8/lsa,/lsb,/lsc,/lsca,1898/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@lxxxix{Ac/CS,[227]/Ar,/Arstar,1/radio,---/R,186/Rcov,106.5\noexpand\pgfPT@espaco(3+)/Rion,499/Ei,1.1/eneg,33.77/eaff,+3/O,+III/ORoman,1323/Tmelt,1050/TmeltC,3471/Tboil,3198/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula6d+1/eConfignl,10000/d,27.2/Cp,12/kT,fcc/ls,587/lsa,/lsb,/lsc,/lsca,1902/DiscY,5/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xc{Th/CS,232.04/Ar,232.04/Arstar,1/radio,---/R,175/Rcov,/Rion,587/Ei,1.3/eneg,58.63/eaff,+4/O,+IV/ORoman,2115/Tmelt,1842/TmeltC,5061/Tboil,4788/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Rn]::6d+2\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula6d+2/eConfignl,11700/d,26.23/Cp,54/kT,fcc/ls,508.42/lsa,/lsb,/lsc,/lsca,1829/DiscY,18/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xci{Pa/CS,231.04/Ar,231.04/Arstar,1/radio,---/R,169/Rcov,90\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula78\noexpand\pgfPT@espaco(5+)/Rion,568/Ei,1.5/eneg,53.03/eaff,+5/O,+V/ORoman,1841/Tmelt,1568/TmeltC,4273/Tboil,4000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep20\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+2\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+2\noexpand\pgfPT@virgula6d+1/eConfignl,15370/d,---/Cp,47/kT,tetr/ls,392.5/lsa,/lsb,323.8/lsc,0.82/lsca,1913/DiscY,10/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xcii{U/CS,238.03/Ar,238.03/Arstar,1/radio,---/R,170/Rcov,76\noexpand\pgfPT@espaco(5+)/Rion,597.6/Ei,1.38/eneg,30.39/eaff,+4\noexpand\pgfPT@virgula+6/O,+IV\noexpand\pgfPT@virgula+VI/ORoman,1405.3/Tmelt,1132.2/TmeltC,4404/Tboil,4131/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep21\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+3\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+3\noexpand\pgfPT@virgula6d+1/eConfignl,19100/d,27.665/Cp,27.5/kT,bcort/ls,285.37/lsa,586.95/lsb,495.48/lsc,1.74/lsca,1789/DiscY,8/DiscC,1/spectra,solido/cor}%
+\def\pgfPT@data@xciii{Np/CS,[237]/Ar,/Arstar,1/radio,---/R,171/Rcov,110\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula87\noexpand\pgfPT@espaco(4+)\noexpand\pgfPT@virgula71\noexpand\pgfPT@espaco(7+)/Rion,604.5/Ei,1.36/eneg,45.85/eaff,+5/O,+V/ORoman,917/Tmelt,644/TmeltC,4273/Tboil,4000/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep22\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+4\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+4\noexpand\pgfPT@virgula6d+1/eConfignl,20200/d,29.46/Cp,6.3/kT,bcort/ls,666.3/lsa,472.3/lsb,488.7/lsc,0.73/lsca,1940/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@xciv{Pu/CS,[244]/Ar,/Arstar,1/radio,---/R,172/Rcov,100\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula74\noexpand\pgfPT@espaco(5+)\noexpand\pgfPT@virgula71\noexpand\pgfPT@espaco(6+)/Rion,584.7/Ei,1.28/eneg,0/eaff,+4/O,+IV/ORoman,912.5/Tmelt,639.4/TmeltC,3501/Tboil,3228/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep24\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+6\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+6/eConfignl,19816/d,35.5/Cp,6.74/kT,mono/ls,618.3/lsa,482.2/lsb,1096.3/lsc,1.77/lsca,1940/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@xcv{Am/CS,[243]/Ar,/Arstar,1/radio,---/R,166/Rcov,126\noexpand\pgfPT@espaco(2+)\noexpand\pgfPT@virgula97.5\noexpand\pgfPT@espaco(3+)/Rion,578/Ei,1.13/eneg,9.93/eaff,+3/O,+III/ORoman,1449/Tmelt,1176/TmeltC,2880/Tboil,2607/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+7\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+7/eConfignl,12000/d,62.7/Cp,10/kT,hex/ls,346.81/lsa,/lsb,1124.1/lsc,3.24/lsca,1944/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@xcvi{Cm/CS,[247]/Ar,/Arstar,1/radio,---/R,166/Rcov,97\noexpand\pgfPT@espaco(3+)/Rion,581/Ei,1.28/eneg,27.17/eaff,+3/O,+III/ORoman,1613/Tmelt,1340/TmeltC,3383/Tboil,3110/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep25\noexpand\pgfPTeDistsep9\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+7\noexpand\pgfPT@virgula6d+1\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+7\noexpand\pgfPT@virgula6d+1/eConfignl,13510/d,---/Cp,---/kT,hex/ls,349.6/lsa,/lsb,1133.1/lsc,3.24/lsca,1944/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@xcvii{Bk/CS,[247]/Ar,/Arstar,1/radio,---/R,---/Rcov,96\noexpand\pgfPT@espaco(3+)/Rion,601/Ei,1.3/eneg,0/eaff,+3/O,+III/ORoman,1323/Tmelt,1050/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep27\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+9\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+9/eConfignl,14780/d,---/Cp,10/kT,hex/ls,341.6/lsa,/lsb,1106.9/lsc,3.24/lsca,1949/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@xcviii{Cf/CS,[251]/Ar,/Arstar,1/radio,---/R,---/Rcov,95\noexpand\pgfPT@espaco(3+)\noexpand\pgfPT@virgula82.1\noexpand\pgfPT@espaco(4+)/Rion,608/Ei,1.3/eneg,0/eaff,+3/O,+III/ORoman,1173/Tmelt,900/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep28\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+10\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+10/eConfignl,15100/d,---/Cp,---/kT,hex/ls,338/lsa,/lsb,1102.5/lsc,3.26/lsca,1950/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@xcix{Es/CS,[252]/Ar,/Arstar,1/radio,---/R,---/Rcov,83.5\noexpand\pgfPT@espaco(3+)/Rion,619/Ei,1.3/eneg,0/eaff,+3/O,+III/ORoman,1133/Tmelt,860/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep29\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+11\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+11/eConfignl,8840/d,---/Cp,---/kT,fcc/ls,575/lsa,/lsb,/lsc,/lsca,1952/DiscY,22/DiscC,1/spectra,sintetico/cor}%
+\def\pgfPT@data@c{Fm/CS,[257]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,627/Ei,1.3/eneg,33.96/eaff,+3/O,+III/ORoman,1800/Tmelt,1527/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep30\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+12\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+12/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1952/DiscY,22/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@ci{Md/CS,[258]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,635/Ei,1.3/eneg,93.91/eaff,+3/O,+III/ORoman,1100/Tmelt,827/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep31\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+13\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+13/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1955/DiscY,22/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cii{No/CS,[259]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,642/Ei,1.3/eneg,0/eaff,+2/O,+II/ORoman,1100/Tmelt,827/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1966/DiscY,24/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@ciii{Lr/CS,[266]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,470/Ei,1.3/eneg,0/eaff,+3/O,+III/ORoman,1900/Tmelt,1627/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep3/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+1/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula7p+1/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1961/DiscY,22/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@civ{Rf/CS,[267]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-580/Ei,---/eneg,---/eaff,+4/O,+IV/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep10\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+2\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+2/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1969/DiscY,16/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cv{Db/CS,[268]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-665/Ei,---/eneg,---/eaff,+5/O,+V/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep11\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+3\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+3/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1970/DiscY,16/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cvi{Sg/CS,[269]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-757/Ei,---/eneg,---/eaff,+6/O,+VI/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep12\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+4\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+4/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1974/DiscY,22/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cvii{Bh/CS,[270]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-740/Ei,---/eneg,---/eaff,+7/O,+VII/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep13\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+5\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+5/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1981/DiscY,8/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cviii{Hs/CS,[270]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-730/Ei,---/eneg,---/eaff,+8/O,+VIII/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep14\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+6\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+6/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1984/DiscY,8/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cix{Mt/CS,[278]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-800/Ei,---/eneg,---/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep15\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+7\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+7/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1982/DiscY,8/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cx{Ds/CS,[281]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-960/Ei,---/eneg,---/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep16\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+8\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+8/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1994/DiscY,8/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxi{Rg/CS,[282]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-1020/Ei,---/eneg,151/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep17\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+9\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+9/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1994/DiscY,8/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxii{Cn/CS,[285]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-1155/Ei,---/eneg,---/eaff,+2/O,+II/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep2/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1996/DiscY,8/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxiii{Nh/CS,[286]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-707.2/Ei,---/eneg,66.6/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep3/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+1/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+1/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2004/DiscY,16/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxiv{Fl/CS,[289]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-832.2/Ei,---/eneg,---/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep4/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+2/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+2/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,1998/DiscY,15/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxv{Mc/CS,[290]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-538.3/Ei,---/eneg,35.3/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep5/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+3/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+3/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2003/DiscY,16/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxvi{Lv/CS,[293]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-663.9/Ei,---/eneg,74.9/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep6/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+4/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+4/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2000/DiscY,15/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxvii{Ts/CS,[294]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-736.9/Ei,---/eneg,165.9/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep7/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+5/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+5/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2009/DiscY,100/DiscC,0/spectra,sintetico/cor}%
+\def\pgfPT@data@cxviii{Og/CS,[294]/Ar,/Arstar,1/radio,---/R,---/Rcov,---/Rion,-860.1/Ei,---/eneg,5.4/eaff,---/O,---/ORoman,---/Tmelt,---/TmeltC,---/Tboil,---/TboilC,2\noexpand\pgfPTeDistsep8\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep32\noexpand\pgfPTeDistsep18\noexpand\pgfPTeDistsep8/eDist,[Rn]::5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7s+2\noexpand\pgfPT@virgula7p+6/eConfign,[Rn]::7s+2\noexpand\pgfPT@virgula5f+14\noexpand\pgfPT@virgula6d+10\noexpand\pgfPT@virgula7p+6/eConfignl,---/d,---/Cp,---/kT,---/ls,---/lsa,/lsb,/lsc,/lsca,2002/DiscY,16/DiscC,0/spectra,sintetico/cor}%
\endinput
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex
index 8c09f620e15..8406d1a9a7d 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex
@@ -189,6 +189,12 @@ group label color/.default=blue!50!black,%
label LaAc font/.get=\pgfPTlabLaAcfont,%
label LaAc font/.store in=\pgfPTlabLaAcfont,%
label LaAc font/.default=\footnotesize\itshape,%
+group numbers/.get=\pgfPTgrnum,% new in v2.1.1
+group numbers/.store in=\pgfPTgrnum,%
+group numbers/.default=arabic,%
+Roman label color/.get=\pgfPTRomanlabgrcolor,% new in v2.1.1
+Roman label color/.store in=\pgfPTRomanlabgrcolor,%
+Roman label color/.default=blue!70!white,%
LaAc/.code=\pgfPT@LaAcstyle{#1},%
LaAc/.default={s=true,f=\footnotesize\itshape},%
per/.code=\pgfPT@perstyle{#1},%
@@ -199,7 +205,30 @@ per+gr/.code=\pgfPT@pergrstyle{#1},%
per+gr/.default={pc=red!50!black,gc=blue!50!black,f=\small\bfseries}%
}%
% setting keys with default values ---------------------------------------------------------------
-\pgfkeys{/pgfPerTable/.cd,label font,period label color,group label color,label LaAc font}%
+\pgfkeys{/pgfPerTable/.cd,label font,period label color,group label color,label LaAc font,group numbers,Roman label color}%
+% Groups in 'old' Roman numerals
+% CAS (USA) ; old IUPAC (Europe) ->
+\newif\ifpgfPT@grRoman@CAS\newif\ifpgfPT@grRoman\newif\ifpgfPT@grarabic%
+\def\pgfPT@gr@numbers#1{\edef\@pgfPT@grnum@atual{#1}\relax%
+\edef\@pgfPT@grnum@CAS{CAS}\edef\@pgfPT@grnum@IUPAC{IUPAC}%
+\edef\@pgfPT@grnum@CASarabic{CAS*}\edef\@pgfPT@grnum@IUPACarabic{IUPAC*}%
+\pgfPT@grRoman@CASfalse\pgfPT@grRomanfalse\pgfPT@grarabicfalse%
+\ifx\@pgfPT@grnum@atual\@pgfPT@grnum@CAS\relax\pgfPT@grRoman@CAStrue\pgfPT@grRomantrue\else%
+\ifx\@pgfPT@grnum@atual\@pgfPT@grnum@IUPAC\relax\pgfPT@grRomantrue\else%
+\ifx\@pgfPT@grnum@atual\@pgfPT@grnum@CASarabic\relax\pgfPT@grRoman@CAStrue\pgfPT@grRomantrue\pgfPT@grarabictrue\else%
+\ifx\@pgfPT@grnum@atual\@pgfPT@grnum@IUPACarabic\relax\pgfPT@grRomantrue\pgfPT@grarabictrue\fi\fi\fi\fi%
+}%
+\def\pgfPT@gr@Roman#1{\edef\@pgfPT@Z@atual{#1}\relax%
+\ifpgfPT@grRoman@CAS% CAS
+\ifcase\@pgfPT@Z@atual\relax\or I\hspace{.1ex}A\or II\hspace{.1ex}A\or III\hspace{.1ex}B\or IV\hspace{.1ex}B\or V\hspace{.1ex}B\or VI\hspace{.1ex}B\or VII\hspace{.1ex}B\or%
+\tikz{\path (0,0);\draw[line width=.2ex] (.1*\pgfPTcellwd,-.55ex) -- (.1*\pgfPTcellwd,0) -- (1.2*\pgfPTcellwd,0);}\or VIII\hspace{.1ex}B\or\tikz[xscale=-1]{\path (0,0);\draw[line width=.2ex] (.1*\pgfPTcellwd,-.55ex) -- (.1*\pgfPTcellwd,0) -- (1.2*\pgfPTcellwd,0);}%
+\or I\hspace{.1ex}B\or II\hspace{.1ex}B\or III\hspace{.1ex}A\or IV\hspace{.1ex}A\or V\hspace{.1ex}A\or VI\hspace{.1ex}A\or VII\hspace{.1ex}A\or VIII\hspace{.1ex}A\fi%
+\else% old IUPAC
+\ifcase\@pgfPT@Z@atual\relax\or I\hspace{.1ex}A\or II\hspace{.1ex}A\or III\hspace{.1ex}A\or IV\hspace{.1ex}A\or V\hspace{.1ex}A\or VI\hspace{.1ex}A\or VII\hspace{.1ex}A\or
+\tikz{\path (0,0);\draw[line width=.2ex] (.1*\pgfPTcellwd,-.55ex) -- (.1*\pgfPTcellwd,0) -- (1.2*\pgfPTcellwd,0);}\or VIII\hspace{.1ex}A\or\tikz[xscale=-1]{\path (0,0);\draw[line width=.2ex] (.1*\pgfPTcellwd,-.55ex) -- (.1*\pgfPTcellwd,0) -- (1.2*\pgfPTcellwd,0);}%
+\or I\hspace{.1ex}B\or II\hspace{.1ex}B\or III\hspace{.1ex}B\or IV\hspace{.1ex}B\or V\hspace{.1ex}B\or VI\hspace{.1ex}B\or VII\hspace{.1ex}B\or0\fi%
+\fi%
+}%
% end !! PGF keys: labels of periods and groups ------------------------------------------------
%
% defining PGF keys: the cells of the periodic table to be drawn -------------------------------
@@ -444,16 +473,18 @@ eaff font/.default=\tiny\bfseries%
% setting keys with default values -----------------------------------------------------------------
\pgfkeys{/pgfPerTable/.cd,eaff color,eaff font}%
% end !!
+\newif\ifpgfPTORoman% new in v2.1.1
\pgfkeys{/pgfPerTable/.cd,%
O color/.get=\pgfPTOcolor,%
O color/.store in=\pgfPTOcolor,%
O color/.default=black,%
O font/.get=\pgfPTOfont,%
O font/.store in=\pgfPTOfont,%
-O font/.default=\tiny\bfseries%
+O font/.default=\tiny\bfseries,%
+O Roman/.is if=pgfPTORoman% new in v2.1.1
}%
% setting keys with default values -----------------------------------------------------------------
-\pgfkeys{/pgfPerTable/.cd,O color,O font}%
+\pgfkeys{/pgfPerTable/.cd,O color,O font,O Roman=false}%
% end !!
\pgfkeys{/pgfPerTable/.cd,%
Tmelt color/.get=\pgfPTTmeltcolor,%
diff --git a/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.data.LSE.tex b/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.data.LSE.tex
index 53303b35f6c..9bb4004bfb6 100644
--- a/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.data.LSE.tex
+++ b/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.data.LSE.tex
@@ -31,12 +31,12 @@
% (see Es, Bk...)
%
\protected\def\pgfspectra@elt@data#1{\relax\ignorespaces\global\pgfspectra@datanotfoundtrue\relax%
-\pgfspectra@elt@search{#1}{H}{[92.6226 15 0],[93.0748 20 0],[93.7803 30 0],[94.9743 50 0],[97.2537 100 0],[102.5722 300 0],[121.5668 1000 0],[121.5674 500 0],[383.5384 5 0],[388.9049 6 0],[397.0072 8 0],[410.174 15 0],[434.047 30 0],[486.133 80 0],[656.272 120 0],[656.2852 180 0],[954.597 5 0],[1004.94 7 0],[1093.81 12 0],[1281.81 20 0],[1875.1 40 0],[2165.5301 5 0],[2625.15 8 0],[4051.1602 15 0],[4652.5102 4 0],[7457.8 6 0],[12368.5 3 0]}{ALLx1000x1000x0x0x0x0x0}{UVx1000x1000x0x0x0x0x0}{VISx180x180x0x0x0x0x0}{IVx40x40x0x0x0x0x0}%
-\pgfspectra@elt@search{#1}{He}{[23.1454 15 1],[23.2584 20 1],[23.4347 30 1],[23.7331 50 1],[24.3027 100 1],[25.6317 300 1],[30.378 1000 1],[30.3786 500 1],[32.0293 10 0],[50.55 2 0],[50.5684 3 0],[50.5912 4 0],[50.62 5 0],[50.657 7 0],[50.7058 10 0],[50.7718 15 0],[50.8643 20 0],[50.9998 25 0],[51.2098 35 0],[51.5616 50 0],[52.2213 100 0],[53.703 400 0],[58.4334 1000 0],[59.1412 50 0],[95.87 5 1],[97.211 6 1],[99.236 8 1],[102.527 15 1],[108.494 30 1],[121.509 35 1],[121.517 50 1],[164.034 120 1],[164.047 180 1],[238.54 7 1],[251.12 9 1],[257.76 50 0],[272.319 1 0],[273.33 12 1],[276.38 2 0],[281.82 10 0],[282.908 4 0],[294.511 10 0],[301.37 40 0],[318.774 20 0],[320.296 3 1],[320.31 15 1],[335.455 1 0],[344.759 2 0],[358.727 1 0],[361.364 3 0],[363.423 2 0],[370.5 3 0],[373.286 1 0],[381.9607 10 0],[381.976 1 0],[388.865 500 0],[396.4729 20 0],[400.927 1 0],[402.6191 50 0],[402.636 5 0],[412.082 12 0],[412.099 2 0],[414.376 3 0],[438.7929 10 0],[443.755 3 0],[447.1479 200 0],[447.168 25 0],[468.54 6 1],[468.57 30 1],[471.3146 30 0],[471.338 4 0],[492.1931 20 0],[501.5678 100 0],[504.774 10 0],[541.152 5 1],[587.562 500 0],[587.597 100 0],[656.01 8 1],[667.815 100 0],[686.748 3 0],[706.519 200 0],[706.571 30 0],[728.135 50 0],[781.615 1 0],[836.169 2 0],[906.327 2 0],[921.034 2 0],[946.361 10 0],[951.66 4 0],[952.617 3 0],[952.927 1 0],[960.342 1 0],[970.26 3 0],[1002.773 6 0],[1003.116 2 0],[1012.36 15 1],[1013.85 1 0],[1031.123 10 0],[1031.154 2 0],[1066.765 3 0],[1082.909 300 0],[1083.025 1000 0],[1083.034 2000 0],[1091.305 9 0],[1091.71 3 0],[1162.64 4 1],[1196.912 30 0],[1252.752 20 0],[1278.499 50 0],[1279.057 20 0],[1284.596 7 0],[1296.845 10 0],[1298.489 2 0],[1508.364 12 0],[1700.2471 200 0],[1855.5551 1 0],[1863.6801 6 1],[1868.534 500 0],[1869.723 200 0],[1908.9381 100 0],[1954.308 20 0],[2058.1301 1000 0],[2112.007 80 0],[2112.143 10 0],[2113.2029 20 0],[3090.85 3 1],[4047.8898 4 0]}{ALLx2000x2000x1000x0x0x0x0}{UVx1000x1000x1000x0x0x0x0}{VISx500x500x30x0x0x0x0}{IVx2000x2000x15x0x0x0x0}%
+\pgfspectra@elt@search{#1}{H}{[92.6226 15 0],[93.0748 20 0],[93.7803 30 0],[94.9743 50 0],[97.2537 100 0],[102.5722 300 0],[121.5668 1000 0],[121.5674 500 0],[383.5384 5 0],[388.9049 6 0],[397.0072 8 0],[410.174 15 0],[434.047 30 0],[486.133 80 0],[656.272 120 0],[656.2852 180 0],[954.597 5 0],[1004.94 7 0],[1093.81 12 0],[1281.81 20 0],[1875.1 40 0],[2165.5301 5 0],[2625.15 8 0]}{ALLx1000x1000x0x0x0x0x0}{UVx1000x1000x0x0x0x0x0}{VISx180x180x0x0x0x0x0}{IVx40x40x0x0x0x0x0}%,[4051.1602 15 0],[4652.5102 4 0],[7457.8 6 0],[12368.5 3 0]
+\pgfspectra@elt@search{#1}{He}{[23.1454 15 1],[23.2584 20 1],[23.4347 30 1],[23.7331 50 1],[24.3027 100 1],[25.6317 300 1],[30.378 1000 1],[30.3786 500 1],[32.0293 10 0],[50.55 2 0],[50.5684 3 0],[50.5912 4 0],[50.62 5 0],[50.657 7 0],[50.7058 10 0],[50.7718 15 0],[50.8643 20 0],[50.9998 25 0],[51.2098 35 0],[51.5616 50 0],[52.2213 100 0],[53.703 400 0],[58.4334 1000 0],[59.1412 50 0],[95.87 5 1],[97.211 6 1],[99.236 8 1],[102.527 15 1],[108.494 30 1],[121.509 35 1],[121.517 50 1],[164.034 120 1],[164.047 180 1],[238.54 7 1],[251.12 9 1],[257.76 50 0],[272.319 1 0],[273.33 12 1],[276.38 2 0],[281.82 10 0],[282.908 4 0],[294.511 10 0],[301.37 40 0],[318.774 20 0],[320.296 3 1],[320.31 15 1],[335.455 1 0],[344.759 2 0],[358.727 1 0],[361.364 3 0],[363.423 2 0],[370.5 3 0],[373.286 1 0],[381.9607 10 0],[381.976 1 0],[388.865 500 0],[396.4729 20 0],[400.927 1 0],[402.6191 50 0],[402.636 5 0],[412.082 12 0],[412.099 2 0],[414.376 3 0],[438.7929 10 0],[443.755 3 0],[447.1479 200 0],[447.168 25 0],[468.54 6 1],[468.57 30 1],[471.3146 30 0],[471.338 4 0],[492.1931 20 0],[501.5678 100 0],[504.774 10 0],[541.152 5 1],[587.562 500 0],[587.597 100 0],[656.01 8 1],[667.815 100 0],[686.748 3 0],[706.519 200 0],[706.571 30 0],[728.135 50 0],[781.615 1 0],[836.169 2 0],[906.327 2 0],[921.034 2 0],[946.361 10 0],[951.66 4 0],[952.617 3 0],[952.927 1 0],[960.342 1 0],[970.26 3 0],[1002.773 6 0],[1003.116 2 0],[1012.36 15 1],[1013.85 1 0],[1031.123 10 0],[1031.154 2 0],[1066.765 3 0],[1082.909 300 0],[1083.025 1000 0],[1083.034 2000 0],[1091.305 9 0],[1091.71 3 0],[1162.64 4 1],[1196.912 30 0],[1252.752 20 0],[1278.499 50 0],[1279.057 20 0],[1284.596 7 0],[1296.845 10 0],[1298.489 2 0],[1508.364 12 0],[1700.2471 200 0],[1855.5551 1 0],[1863.6801 6 1],[1868.534 500 0],[1869.723 200 0],[1908.9381 100 0],[1954.308 20 0],[2058.1301 1000 0],[2112.007 80 0],[2112.143 10 0],[2113.2029 20 0],[3090.85 3 1]}{ALLx2000x2000x1000x0x0x0x0}{UVx1000x1000x1000x0x0x0x0}{VISx500x500x30x0x0x0x0}{IVx2000x2000x15x0x0x0x0}%,[4047.8898 4 0]
\pgfspectra@elt@search{#1}{Li}{[149.293 3 1],[149.297 5 1],[149.304 1 1],[165.308 3 1],[165.313 5 1],[165.321 1 1],[233.688 3 1],[233.691 5 1],[233.7 2 1],[239.439 1 0],[242.543 3 0],[247.506 10 0],[255.17 24 1],[256.231 15 0],[265.729 2 1],[265.73 3 1],[272.824 0 1],[272.829 5 1],[272.832 2 1],[273.047 3 1],[273.055 1 1],[274.12 5 0],[293.402 2 1],[293.407 2 1],[293.412 5 1],[293.425 1 1],[302.912 3 1],[302.914 3 1],[315.531 3 1],[315.533 4 1],[319.626 1 1],[319.633 9 1],[319.636 4 1],[319.933 5 1],[319.943 2 1],[323.266 17 0],[371.4 1 1],[371.416 5 1],[371.427 6 1],[371.429 8 1],[371.44 7 1],[371.441 10 1],[371.451 1 1],[371.458 0 1],[371.87 3 0],[379.472 6 0],[391.53 20 0],[391.535 20 0],[398.548 10 0],[398.554 10 0],[413.256 40 0],[413.262 40 0],[427.307 20 0],[427.313 20 0],[432.542 5 1],[432.547 5 1],[432.554 1 1],[460.283 13 0],[460.289 13 0],[467.151 0 1],[467.165 6 1],[467.17 2 1],[467.806 3 1],[467.829 1 1],[488.132 4 1],[488.139 4 1],[488.149 1 1],[497.166 8 0],[497.175 8 0],[548.355 600 1],[548.565 600 1],[610.354 320 0],[610.365 320 0],[670.776 3600 0],[670.791 3600 0],[812.623 48 0],[812.645 48 0]}{ALLx3600x3600x600x0x0x0x0}{UVx24x17x24x0x0x0x0}{VISx3600x3600x600x0x0x0x0}{IVx48x48x0x0x0x0x0}%
-\pgfspectra@elt@search{#1}{Be}{[7.61 1 2],[7.648 2 2],[7.853 3 2],[7.866 4 2],[7.892 1 2],[8.189 5 2],[8.238 10 2],[8.32 20 2],[8.476 30 2],[8.831 50 2],[10.025 100 2],[50.999 3 2],[54.931 2 2],[58.208 6 2],[66.132 4 2],[67.559 8 2],[72.559 4 2],[72.571 5 1],[74.358 5 1],[74.623 7 2],[76.775 2 2],[77.537 8 1],[84.206 20 1],[92.525 2 1],[94.356 10 1],[97.327 10 1],[102.693 8 1],[103.632 5 1],[104.823 15 1],[111.469 1 2],[114.303 20 1],[119.719 60 1],[121.312 2 2],[121.432 1 2],[136.225 2 2],[140.152 1 2],[142.126 10 2],[142.286 5 2],[143.517 1 2],[144.077 2 2],[151.23 20 1],[151.243 60 1],[166.149 100 0],[175.469 2 2],[177.612 15 1],[177.634 20 1],[191.703 3 2],[192.967 5 0],[194.368 10 0],[195.497 60 2],[196.459 50 0],[198.513 5 0],[199.801 60 0],[205.59 50 0],[205.601 100 0],[207.694 75 2],[208.038 60 2],[211.856 25 2],[212.227 15 2],[212.557 10 0],[212.568 20 0],[212.72 15 2],[213.725 5 2],[214.5 25 0],[217.499 55 0],[217.51 55 0],[219.157 5 2],[234.861 950 0],[235.066 20 0],[235.071 60 0],[235.083 200 0],[241.334 2 1],[241.346 16 1],[245.384 20 1],[249.454 35 0],[249.458 35 0],[249.473 100 0],[250.743 16 1],[261.799 5 1],[261.813 20 1],[265.045 100 0],[265.055 60 0],[265.062 200 0],[265.069 60 0],[265.076 100 0],[269.746 5 1],[269.758 20 1],[272.888 20 1],[273.805 30 0],[289.813 20 0],[289.819 10 0],[289.825 20 0],[298.606 30 0],[298.642 10 0],[301.933 60 0],[301.949 30 0],[301.953 30 0],[301.96 20 0],[304.652 10 1],[304.669 30 1],[311.081 10 0],[311.092 10 0],[311.099 20 0],[313.042 480 1],[313.107 320 1],[319.381 20 0],[319.71 20 1],[319.715 30 1],[320.86 20 0],[322.963 60 0],[323.352 2 1],[324.162 10 1],[324.183 30 1],[326.902 15 0],[327.458 100 1],[327.467 30 1],[328.291 30 0],[332.101 30 0],[332.109 30 0],[332.134 220 0],[334.543 20 0],[336.763 60 0],[345.137 5 0],[345.518 300 0],[347.656 20 0],[351.554 300 0],[355.5 10 0],[372.036 100 2],[373.63 100 0],[381.345 700 0],[386.513 40 0],[386.542 80 0],[386.551 1 0],[386.572 6 0],[386.603 100 0],[424.914 90 2],[425.305 100 0],[425.376 60 0],[436.066 300 1],[436.099 500 1],[440.794 400 0],[448.552 2 2],[448.73 100 2],[449.509 1 2],[449.78 140 2],[457.266 12 0],[467.333 700 1],[467.342 1000 1],[470.937 6 0],[482.816 200 1],[484.916 40 0],[485.822 2 1],[508.775 80 0],[521.812 8 1],[521.833 20 1],[525.586 3 1],[527.028 64 1],[527.081 500 1],[540.304 20 1],[541.021 20 1],[614.201 140 2],[622.911 10 0],[627.943 16 1],[627.973 30 1],[647.354 30 0],[654.789 60 1],[655.836 60 1],[656.452 30 0],[663.644 2 1],[675.672 1 1],[675.713 2 1],[678.656 30 0],[688.422 1 0],[688.444 6 0],[698.275 100 0],[715.44 6 0],[715.465 40 0],[720.913 100 0],[740.12 3 1],[740.143 2 1],[755.19 10 0],[761.868 10 0],[761.888 20 0],[809.006 60 0],[815.899 5 0],[815.924 10 0],[825.407 4 0],[828.707 10 0],[854.736 30 0],[854.767 60 0],[880.137 300 0],[888.218 6 0],[919.045 40 0],[924.392 20 0],[934.389 1 1],[939.274 40 0],[947.643 2 1],[947.703 16 1],[984.732 20 0],[989.563 10 0],[989.596 20 0],[993.978 80 0],[1009.552 16 1],[1009.573 20 1],[1011.992 60 1],[1033.103 80 0],[1106.646 30 0],[1117.373 1 1],[1149.639 120 0],[1162.516 2 1],[1166.025 2 1],[1209.536 100 1],[1209.818 30 1],[1464.392 100 0],[1464.475 60 0],[1615.772 200 0],[1785.5381 80 0],[1785.6631 120 0],[1814.3539 100 0],[3177.5051 160 0],[3177.8699 200 0]}{ALLx1000x950x1000x140x0x0x0}{UVx950x950x480x100x0x0x0}{VISx1000x700x1000x140x0x0x0}{IVx300x300x100x0x0x0x0}%
-\pgfspectra@elt@search{#1}{B}{[4.859 30 4],[5.268 10 3],[6.031 30 3],[34.4 160 3],[38.5 450 3],[41.18 40 2],[41.87 285 3],[51.077 20 2],[51.085 40 2],[51.824 150 2],[51.827 75 2],[67.7 110 2],[67.714 160 2],[69.395 70 1],[73.136 40 1],[73.144 40 1],[75.848 40 2],[75.867 70 2],[88.254 110 1],[88.268 110 1],[98.467 40 1],[108.188 110 1],[108.207 110 1],[111.22 70 3],[116.89 450 3],[117.09 70 3],[123.016 110 1],[136.246 220 1],[160.046 70 0],[160.073 120 0],[162.358 160 1],[162.377 110 1],[162.402 220 1],[162.416 70 1],[162.434 160 1],[166.304 100 0],[166.687 150 0],[166.729 200 0],[181.786 150 0],[181.837 200 0],[182.591 300 0],[182.641 300 0],[184.281 110 1],[195.383 20 2],[206.578 550 2],[206.638 250 0],[206.665 250 0],[206.693 100 0],[206.719 300 0],[206.723 450 2],[207.709 160 2],[208.891 500 0],[208.957 500 0],[222.03 70 1],[223.409 40 2],[223.459 70 2],[232.303 40 1],[232.867 40 1],[239.32 40 1],[239.505 220 1],[245.969 40 1],[245.99 40 1],[249.677 1000 0],[249.773 1000 0],[252.47 70 3],[253.03 160 3],[282.168 450 3],[282.457 70 3],[282.585 285 3],[291.808 160 1],[303.226 110 1],[317.933 70 1],[332.318 110 1],[332.36 110 1],[345.129 450 1],[412.193 285 1],[419.479 110 1],[424.298 40 2],[424.361 70 2],[447.21 110 1],[447.285 110 1],[448.705 220 2],[449.773 360 2],[478.421 70 1],[494.038 110 1],[608.044 110 1],[628.547 70 1],[703.02 70 1],[703.19 40 1],[783.525 110 2],[784.141 70 2],[866.722 20 0],[866.857 70 0],[1166.004 800 0],[1166.247 570 0],[1562.908 125 0],[1624.038 200 0],[1624.467 250 0],[1899.433 235 0]}{ALLx1000x1000x450x550x450x30x0}{UVx1000x1000x450x550x450x30x0}{VISx360x0x285x360x0x0x0}{IVx800x800x0x110x0x0x0}%
-\pgfspectra@elt@search{#1}{C}{[3.4973 110 4],[4.0268 450 4],[22.719 110 4],[24.491 250 3],[24.866 160 4],[24.874 160 4],[28.914 200 3],[28.923 250 3],[31.242 570 3],[31.246 500 3],[37.169 250 2],[37.175 250 2],[37.178 150 2],[38.403 650 3],[38.418 700 3],[38.6203 500 2],[41.952 400 3],[41.971 500 3],[45.0734 200 2],[45.946 400 2],[45.952 500 2],[45.963 570 2],[51.1522 250 2],[53.5288 250 2],[53.808 300 2],[53.8149 350 2],[53.8312 400 2],[57.4281 350 2],[59.5022 9 1],[68.7053 30 1],[68.7345 50 1],[85.8092 10 1],[85.8559 20 1],[90.3624 30 1],[90.3962 60 1],[90.4142 150 1],[90.448 30 1],[97.703 800 2],[100.986 9 1],[101.008 10 1],[101.037 10 1],[103.6337 80 1],[103.7018 150 1],[115.791 150 0],[115.8019 150 0],[115.8035 150 0],[117.493 370 2],[117.526 350 2],[117.559 330 2],[117.571 500 2],[117.599 350 2],[117.637 370 2],[118.8992 150 0],[118.9447 150 0],[118.9631 200 0],[119.3009 300 0],[119.3031 300 0],[119.324 300 0],[119.3264 300 0],[119.3393 100 0],[119.3649 150 0],[119.3679 150 0],[119.4064 100 0],[119.4488 100 0],[126.1552 100 0],[127.7245 250 0],[127.7282 250 0],[127.7513 300 0],[127.755 300 0],[128.0333 200 0],[131.1363 100 0],[132.3951 9 1],[132.9578 120 0],[132.96 120 0],[133.4532 150 1],[133.5708 300 1],[135.4288 100 0],[135.584 150 0],[136.4164 120 0],[145.9032 100 0],[146.3336 200 0],[146.7402 120 0],[148.1764 150 0],[154.8202 1000 3],[155.0774 900 3],[156.031 150 0],[156.0683 400 0],[156.0708 400 0],[156.1341 100 0],[156.1438 400 0],[165.6266 150 0],[165.6928 120 0],[165.7008 300 0],[165.738 120 0],[165.7907 120 0],[165.8122 150 0],[175.1823 500 0],[193.0905 1000 0],[216.294 250 2],[227.091 40 4],[227.725 5 4],[227.792 20 4],[229.687 800 2],[247.856 800 0],[250.912 250 1],[251.206 350 1],[252.441 200 3],[252.998 300 3],[257.483 250 1],[269.775 150 2],[272.485 110 2],[272.53 150 2],[272.59 150 2],[274.128 350 1],[274.649 250 1],[283.671 1000 1],[283.76 800 1],[298.211 200 2],[299.262 800 1],[387.619 350 1],[387.641 350 1],[387.666 350 1],[391.898 570 1],[392.069 800 1],[405.606 150 2],[406.794 200 2],[406.891 250 2],[407.026 250 2],[407.452 250 1],[407.585 350 1],[416.286 150 2],[418.69 250 2],[426.7 800 1],[426.726 1000 1],[432.556 200 2],[464.742 600 2],[465.025 520 2],[465.147 375 2],[465.83 200 3],[466.586 200 2],[477.175 200 0],[493.205 200 0],[494.388 5 4],[494.456 5 4],[505.217 200 0],[513.294 350 1],[513.328 350 1],[514.349 350 1],[514.516 570 1],[515.109 400 1],[538.034 300 0],[564.807 250 1],[566.247 350 1],[569.592 450 2],[580.133 250 3],[581.198 200 3],[582.642 150 2],[588.977 570 1],[589.159 350 1],[600.113 200 0],[600.603 250 0],[600.718 110 0],[601.068 150 0],[601.322 300 0],[601.484 250 0],[657.805 800 1],[658.288 570 1],[658.761 200 0],[674.438 150 2],[678.39 250 1],[703.725 150 2],[711.318 250 0],[711.519 250 0],[711.563 250 1],[711.699 200 0],[711.99 350 1],[723.132 800 1],[723.642 1000 1],[761.265 150 2],[772.62 90 3],[786.089 200 0],[805.862 200 0],[819.648 300 2],[833.299 150 2],[833.515 520 0],[850.032 300 2],[906.143 250 0],[906.247 200 0],[907.828 200 0],[908.851 250 0],[909.483 450 0],[911.18 300 0],[940.573 800 0],[960.303 150 0],[962.08 250 0],[965.844 300 0],[1068.308 200 0],[1069.125 300 0],[1161.929 12 0],[1162.883 23 0],[1165.885 13 0],[1165.968 47 0],[1166.963 24 0],[1174.822 85 0],[1175.332 142 0],[1175.476 114 0],[1177.754 11 0],[1189.291 17 0],[1189.575 30 0],[1261.41 26 0],[1350.227 20 0],[1439.965 38 0],[1440.325 16 0],[1442.012 61 0],[1442.903 12 0],[1444.224 13 0],[1655.966 12 0],[1689.0381 50 0],[1733.8561 10 0],[1744.86 11 0],[1813.9801 13 0],[1972.199 23 0]}{ALLx1000x1000x1000x800x1000x450x0}{UVx1000x1000x1000x800x1000x450x0}{VISx1000x300x1000x600x250x5x0}{IVx800x800x0x300x0x0x0}%
+\pgfspectra@elt@search{#1}{Be}{[10.025 100 2],[50.999 3 2],[54.931 2 2],[58.208 6 2],[66.132 4 2],[67.559 8 2],[72.559 4 2],[72.571 5 1],[74.358 5 1],[74.623 7 2],[76.775 2 2],[77.537 8 1],[84.206 20 1],[92.525 2 1],[94.356 10 1],[97.327 10 1],[102.693 8 1],[103.632 5 1],[104.823 15 1],[111.469 1 2],[114.303 20 1],[119.719 60 1],[121.312 2 2],[121.432 1 2],[136.225 2 2],[140.152 1 2],[142.126 10 2],[142.286 5 2],[143.517 1 2],[144.077 2 2],[151.23 20 1],[151.243 60 1],[166.149 100 0],[175.469 2 2],[177.612 15 1],[177.634 20 1],[191.703 3 2],[192.967 5 0],[194.368 10 0],[195.497 60 2],[196.459 50 0],[198.513 5 0],[199.801 60 0],[205.59 50 0],[205.601 100 0],[207.694 75 2],[208.038 60 2],[211.856 25 2],[212.227 15 2],[212.557 10 0],[212.568 20 0],[212.72 15 2],[213.725 5 2],[214.5 25 0],[217.499 55 0],[217.51 55 0],[219.157 5 2],[234.861 950 0],[235.066 20 0],[235.071 60 0],[235.083 200 0],[241.334 2 1],[241.346 16 1],[245.384 20 1],[249.454 35 0],[249.458 35 0],[249.473 100 0],[250.743 16 1],[261.799 5 1],[261.813 20 1],[265.045 100 0],[265.055 60 0],[265.062 200 0],[265.069 60 0],[265.076 100 0],[269.746 5 1],[269.758 20 1],[272.888 20 1],[273.805 30 0],[289.813 20 0],[289.819 10 0],[289.825 20 0],[298.606 30 0],[298.642 10 0],[301.933 60 0],[301.949 30 0],[301.953 30 0],[301.96 20 0],[304.652 10 1],[304.669 30 1],[311.081 10 0],[311.092 10 0],[311.099 20 0],[313.042 480 1],[313.107 320 1],[319.381 20 0],[319.71 20 1],[319.715 30 1],[320.86 20 0],[322.963 60 0],[323.352 2 1],[324.162 10 1],[324.183 30 1],[326.902 15 0],[327.458 100 1],[327.467 30 1],[328.291 30 0],[332.101 30 0],[332.109 30 0],[332.134 220 0],[334.543 20 0],[336.763 60 0],[345.137 5 0],[345.518 300 0],[347.656 20 0],[351.554 300 0],[355.5 10 0],[372.036 100 2],[373.63 100 0],[381.345 700 0],[386.513 40 0],[386.542 80 0],[386.551 1 0],[386.572 6 0],[386.603 100 0],[424.914 90 2],[425.305 100 0],[425.376 60 0],[436.066 300 1],[436.099 500 1],[440.794 400 0],[448.552 2 2],[448.73 100 2],[449.509 1 2],[449.78 140 2],[457.266 12 0],[467.333 700 1],[467.342 1000 1],[470.937 6 0],[482.816 200 1],[484.916 40 0],[485.822 2 1],[508.775 80 0],[521.812 8 1],[521.833 20 1],[525.586 3 1],[527.028 64 1],[527.081 500 1],[540.304 20 1],[541.021 20 1],[614.201 140 2],[622.911 10 0],[627.943 16 1],[627.973 30 1],[647.354 30 0],[654.789 60 1],[655.836 60 1],[656.452 30 0],[663.644 2 1],[675.672 1 1],[675.713 2 1],[678.656 30 0],[688.422 1 0],[688.444 6 0],[698.275 100 0],[715.44 6 0],[715.465 40 0],[720.913 100 0],[740.12 3 1],[740.143 2 1],[755.19 10 0],[761.868 10 0],[761.888 20 0],[809.006 60 0],[815.899 5 0],[815.924 10 0],[825.407 4 0],[828.707 10 0],[854.736 30 0],[854.767 60 0],[880.137 300 0],[888.218 6 0],[919.045 40 0],[924.392 20 0],[934.389 1 1],[939.274 40 0],[947.643 2 1],[947.703 16 1],[984.732 20 0],[989.563 10 0],[989.596 20 0],[993.978 80 0],[1009.552 16 1],[1009.573 20 1],[1011.992 60 1],[1033.103 80 0],[1106.646 30 0],[1117.373 1 1],[1149.639 120 0],[1162.516 2 1],[1166.025 2 1],[1209.536 100 1],[1209.818 30 1],[1464.392 100 0],[1464.475 60 0],[1615.772 200 0],[1785.5381 80 0],[1785.6631 120 0],[1814.3539 100 0],[3177.5051 160 0],[3177.8699 200 0]}{ALLx1000x950x1000x140x0x0x0}{UVx950x950x480x100x0x0x0}{VISx1000x700x1000x140x0x0x0}{IVx300x300x100x0x0x0x0}%[7.61 1 2],[7.648 2 2],[7.853 3 2],[7.866 4 2],[7.892 1 2],[8.189 5 2],[8.238 10 2],[8.32 20 2],[8.476 30 2],[8.831 50 2],
+\pgfspectra@elt@search{#1}{B}{[34.4 160 3],[38.5 450 3],[41.18 40 2],[41.87 285 3],[51.077 20 2],[51.085 40 2],[51.824 150 2],[51.827 75 2],[67.7 110 2],[67.714 160 2],[69.395 70 1],[73.136 40 1],[73.144 40 1],[75.848 40 2],[75.867 70 2],[88.254 110 1],[88.268 110 1],[98.467 40 1],[108.188 110 1],[108.207 110 1],[111.22 70 3],[116.89 450 3],[117.09 70 3],[123.016 110 1],[136.246 220 1],[160.046 70 0],[160.073 120 0],[162.358 160 1],[162.377 110 1],[162.402 220 1],[162.416 70 1],[162.434 160 1],[166.304 100 0],[166.687 150 0],[166.729 200 0],[181.786 150 0],[181.837 200 0],[182.591 300 0],[182.641 300 0],[184.281 110 1],[195.383 20 2],[206.578 550 2],[206.638 250 0],[206.665 250 0],[206.693 100 0],[206.719 300 0],[206.723 450 2],[207.709 160 2],[208.891 500 0],[208.957 500 0],[222.03 70 1],[223.409 40 2],[223.459 70 2],[232.303 40 1],[232.867 40 1],[239.32 40 1],[239.505 220 1],[245.969 40 1],[245.99 40 1],[249.677 1000 0],[249.773 1000 0],[252.47 70 3],[253.03 160 3],[282.168 450 3],[282.457 70 3],[282.585 285 3],[291.808 160 1],[303.226 110 1],[317.933 70 1],[332.318 110 1],[332.36 110 1],[345.129 450 1],[412.193 285 1],[419.479 110 1],[424.298 40 2],[424.361 70 2],[447.21 110 1],[447.285 110 1],[448.705 220 2],[449.773 360 2],[478.421 70 1],[494.038 110 1],[608.044 110 1],[628.547 70 1],[703.02 70 1],[703.19 40 1],[783.525 110 2],[784.141 70 2],[866.722 20 0],[866.857 70 0],[1166.004 800 0],[1166.247 570 0],[1562.908 125 0],[1624.038 200 0],[1624.467 250 0],[1899.433 235 0]}{ALLx1000x1000x450x550x450x30x0}{UVx1000x1000x450x550x450x30x0}{VISx360x0x285x360x0x0x0}{IVx800x800x0x110x0x0x0}%[4.859 30 4],[5.268 10 3],[6.031 30 3],
+\pgfspectra@elt@search{#1}{C}{[22.719 110 4],[24.491 250 3],[24.866 160 4],[24.874 160 4],[28.914 200 3],[28.923 250 3],[31.242 570 3],[31.246 500 3],[37.169 250 2],[37.175 250 2],[37.178 150 2],[38.403 650 3],[38.418 700 3],[38.6203 500 2],[41.952 400 3],[41.971 500 3],[45.0734 200 2],[45.946 400 2],[45.952 500 2],[45.963 570 2],[51.1522 250 2],[53.5288 250 2],[53.808 300 2],[53.8149 350 2],[53.8312 400 2],[57.4281 350 2],[59.5022 9 1],[68.7053 30 1],[68.7345 50 1],[85.8092 10 1],[85.8559 20 1],[90.3624 30 1],[90.3962 60 1],[90.4142 150 1],[90.448 30 1],[97.703 800 2],[100.986 9 1],[101.008 10 1],[101.037 10 1],[103.6337 80 1],[103.7018 150 1],[115.791 150 0],[115.8019 150 0],[115.8035 150 0],[117.493 370 2],[117.526 350 2],[117.559 330 2],[117.571 500 2],[117.599 350 2],[117.637 370 2],[118.8992 150 0],[118.9447 150 0],[118.9631 200 0],[119.3009 300 0],[119.3031 300 0],[119.324 300 0],[119.3264 300 0],[119.3393 100 0],[119.3649 150 0],[119.3679 150 0],[119.4064 100 0],[119.4488 100 0],[126.1552 100 0],[127.7245 250 0],[127.7282 250 0],[127.7513 300 0],[127.755 300 0],[128.0333 200 0],[131.1363 100 0],[132.3951 9 1],[132.9578 120 0],[132.96 120 0],[133.4532 150 1],[133.5708 300 1],[135.4288 100 0],[135.584 150 0],[136.4164 120 0],[145.9032 100 0],[146.3336 200 0],[146.7402 120 0],[148.1764 150 0],[154.8202 1000 3],[155.0774 900 3],[156.031 150 0],[156.0683 400 0],[156.0708 400 0],[156.1341 100 0],[156.1438 400 0],[165.6266 150 0],[165.6928 120 0],[165.7008 300 0],[165.738 120 0],[165.7907 120 0],[165.8122 150 0],[175.1823 500 0],[193.0905 1000 0],[216.294 250 2],[227.091 40 4],[227.725 5 4],[227.792 20 4],[229.687 800 2],[247.856 800 0],[250.912 250 1],[251.206 350 1],[252.441 200 3],[252.998 300 3],[257.483 250 1],[269.775 150 2],[272.485 110 2],[272.53 150 2],[272.59 150 2],[274.128 350 1],[274.649 250 1],[283.671 1000 1],[283.76 800 1],[298.211 200 2],[299.262 800 1],[387.619 350 1],[387.641 350 1],[387.666 350 1],[391.898 570 1],[392.069 800 1],[405.606 150 2],[406.794 200 2],[406.891 250 2],[407.026 250 2],[407.452 250 1],[407.585 350 1],[416.286 150 2],[418.69 250 2],[426.7 800 1],[426.726 1000 1],[432.556 200 2],[464.742 600 2],[465.025 520 2],[465.147 375 2],[465.83 200 3],[466.586 200 2],[477.175 200 0],[493.205 200 0],[494.388 5 4],[494.456 5 4],[505.217 200 0],[513.294 350 1],[513.328 350 1],[514.349 350 1],[514.516 570 1],[515.109 400 1],[538.034 300 0],[564.807 250 1],[566.247 350 1],[569.592 450 2],[580.133 250 3],[581.198 200 3],[582.642 150 2],[588.977 570 1],[589.159 350 1],[600.113 200 0],[600.603 250 0],[600.718 110 0],[601.068 150 0],[601.322 300 0],[601.484 250 0],[657.805 800 1],[658.288 570 1],[658.761 200 0],[674.438 150 2],[678.39 250 1],[703.725 150 2],[711.318 250 0],[711.519 250 0],[711.563 250 1],[711.699 200 0],[711.99 350 1],[723.132 800 1],[723.642 1000 1],[761.265 150 2],[772.62 90 3],[786.089 200 0],[805.862 200 0],[819.648 300 2],[833.299 150 2],[833.515 520 0],[850.032 300 2],[906.143 250 0],[906.247 200 0],[907.828 200 0],[908.851 250 0],[909.483 450 0],[911.18 300 0],[940.573 800 0],[960.303 150 0],[962.08 250 0],[965.844 300 0],[1068.308 200 0],[1069.125 300 0],[1161.929 12 0],[1162.883 23 0],[1165.885 13 0],[1165.968 47 0],[1166.963 24 0],[1174.822 85 0],[1175.332 142 0],[1175.476 114 0],[1177.754 11 0],[1189.291 17 0],[1189.575 30 0],[1261.41 26 0],[1350.227 20 0],[1439.965 38 0],[1440.325 16 0],[1442.012 61 0],[1442.903 12 0],[1444.224 13 0],[1655.966 12 0],[1689.0381 50 0],[1733.8561 10 0],[1744.86 11 0],[1813.9801 13 0],[1972.199 23 0]}{ALLx1000x1000x1000x800x1000x450x0}{UVx1000x1000x1000x800x1000x450x0}{VISx1000x300x1000x600x250x5x0}{IVx800x800x0x300x0x0x0}%[3.4973 110 4],[4.0268 450 4],
\pgfspectra@elt@search{#1}{N}{[16.6947 52 4],[18.175 400 3],[18.6069 52 4],[18.6153 62 4],[19.17 400 3],[19.29 400 3],[19.687 500 3],[19.723 500 3],[20.26 500 3],[20.594 500 3],[20.597 500 3],[20.603 500 3],[20.9303 90 4],[21.72 500 3],[21.79 500 3],[22.34 500 3],[22.512 800 3],[22.521 800 3],[23.412 600 3],[23.42 600 3],[23.425 600 3],[23.607 550 3],[23.799 500 3],[23.87 500 3],[23.88 600 3],[23.962 500 3],[24.72 900 3],[24.7561 90 4],[24.7706 120 4],[24.843 500 3],[24.846 500 3],[24.848 500 3],[25.795 500 2],[25.85 650 2],[25.919 700 2],[26.009 800 2],[26.045 600 3],[26.128 800 2],[26.291 500 2],[26.523 500 2],[26.527 500 2],[26.6196 150 4],[26.6379 200 4],[26.87 500 2],[27.099 650 3],[28.342 250 3],[28.348 300 3],[28.358 350 3],[28.556 600 3],[29.77 600 3],[29.782 700 3],[30.032 650 3],[30.3123 90 3],[30.328 500 3],[31.4715 150 2],[31.485 200 2],[31.4877 90 2],[31.5053 150 3],[32.2503 120 3],[32.257 150 3],[32.2724 200 3],[32.3175 120 3],[32.326 600 2],[33.505 300 3],[33.835 500 2],[34.02 500 2],[35.193 500 3],[35.198 500 2],[35.306 700 3],[36.2833 120 2],[36.2881 150 2],[36.2946 150 2],[36.2985 90 2],[37.4204 300 2],[37.4441 350 2],[38.748 500 2],[42.077 500 3],[45.1869 250 2],[45.2226 300 2],[46.374 650 3],[64.4634 285 1],[64.4837 360 1],[64.5178 450 1],[64.75 140 0],[66.0286 360 1],[67.1016 170 1],[67.1386 285 1],[67.163 150 1],[67.1773 160 1],[67.2001 170 1],[68.4996 500 2],[68.5513 570 2],[68.5816 650 2],[68.6335 500 2],[69.27 350 0],[71.3518 90 4],[71.386 150 4],[74.6984 285 1],[74.8195 150 4],[74.8291 200 4],[76.3336 500 2],[76.4359 570 2],[76.5148 570 3],[77.1544 250 2],[77.1901 300 2],[77.2385 350 2],[77.2891 200 2],[77.2975 150 2],[77.5965 650 1],[88.567 90 0],[90.9697 90 0],[91.0278 80 0],[91.0645 40 0],[91.5612 450 1],[91.5962 450 1],[91.6012 550 1],[91.6701 650 1],[92.1992 520 3],[92.1992 520 3],[92.2519 500 3],[92.2519 500 3],[92.3057 480 3],[92.4283 520 3],[95.3415 90 0],[95.3655 100 0],[95.397 130 0],[95.5335 1000 3],[96.399 130 0],[96.4626 115 0],[96.5041 70 0],[97.9842 650 2],[97.9919 700 2],[98.979 900 2],[99.1514 700 2],[99.1579 1000 2],[103.616 150 3],[106.7614 90 0],[106.8612 60 0],[107.871 90 3],[108.399 450 1],[108.458 600 1],[108.5546 430 1],[108.5701 650 1],[109.7237 175 0],[109.8095 115 0],[109.826 115 0],[110.036 105 0],[110.0465 40 0],[110.1291 90 0],[113.4165 360 0],[113.4415 385 0],[113.498 410 0],[114.365 105 0],[116.3884 130 0],[116.4206 60 0],[116.4325 105 0],[116.7448 270 0],[116.8334 105 0],[116.8417 60 0],[116.8536 195 0],[117.651 230 0],[117.663 105 0],[117.7695 195 0],[118.3031 500 2],[118.455 570 2],[118.801 90 3],[119.955 410 0],[120.0223 385 0],[120.071 360 0],[122.5026 175 0],[122.537 160 0],[122.841 130 0],[122.879 160 0],[123.8821 1000 4],[124.2804 900 4],[124.3179 360 0],[124.3306 315 0],[131.054 290 0],[131.095 250 0],[131.9 230 0],[131.968 315 0],[132.657 115 0],[132.792 115 0],[138.7371 150 2],[141.194 360 0],[149.2625 700 0],[149.282 490 0],[149.4675 640 0],[154.9336 90 4],[161.633 200 4],[161.969 350 4],[171.855 1000 3],[172.9945 250 2],[174.2729 775 0],[174.5252 700 0],[174.7848 570 2],[175.1218 350 2],[175.1657 650 2],[180.4486 150 2],[180.5669 200 2],[184.642 150 2],[186.037 90 4],[188.506 350 2],[188.522 400 2],[190.799 200 2],[191.955 150 2],[191.977 150 2],[192.065 300 2],[192.084 150 2],[192.13 200 2],[206.401 200 2],[206.442 250 2],[206.868 120 2],[207.109 90 2],[208.034 90 3],[209.553 160 1],[209.62 70 1],[209.686 110 1],[211.759 90 2],[212.15 90 2],[213.018 110 1],[214.278 160 1],[214.731 90 2],[218.82 200 2],[218.838 150 2],[220.609 160 1],[228.669 160 1],[228.844 110 1],[231.649 220 1],[231.669 160 1],[231.705 285 1],[231.809 90 3],[246.127 160 1],[247.769 150 3],[249.683 110 1],[249.697 70 1],[252.022 110 1],[252.079 160 1],[252.223 220 1],[259.094 110 1],[264.565 250 3],[264.618 300 3],[264.696 350 3],[268.218 250 2],[268.92 90 2],[270.984 160 1],[279.922 110 1],[282.364 110 1],[285.916 60 4],[288.527 160 1],[297.452 90 4],[298.078 150 4],[298.131 250 4],[299.843 60 4],[300.683 220 1],[307.825 90 3],[336.734 120 2],[343.715 360 1],[346.337 90 3],[347.871 570 3],[348.299 500 3],[348.496 400 3],[374.754 90 3],[375.467 90 2],[377.105 120 2],[383.837 285 1],[391.9 360 1],[393.852 90 2],[395.585 450 1],[399.5 1000 1],[399.863 150 2],[400.358 200 2],[403.508 360 1],[404.131 550 1],[404.353 360 1],[405.776 150 3],[409.733 250 2],[409.994 140 0],[410.343 200 2],[410.995 185 0],[417.616 285 1],[419.576 120 2],[420.01 150 2],[422.774 285 1],[423.691 285 1],[423.705 220 1],[424.178 450 1],[433.291 90 2],[434.568 120 2],[437.911 300 2],[443.274 285 1],[444.703 650 1],[451.091 90 2],[451.486 120 2],[453.041 360 1],[460.148 550 1],[460.373 350 4],[460.633 90 3],[460.716 450 1],[461.387 360 1],[461.998 250 4],[462.139 450 1],[463.054 870 1],[463.414 90 2],[464.064 120 2],[464.308 550 1],[478.813 285 1],[480.329 450 1],[484.738 180 0],[485.882 90 2],[486.715 150 2],[489.511 285 1],[491.494 160 0],[493.512 210 0],[494.456 200 4],[495.023 160 0],[496.398 350 0],[498.737 285 1],[499.436 450 1],[500.148 650 1],[500.27 360 1],[500.515 870 1],[500.732 550 1],[501.062 450 1],[501.639 360 1],[502.566 360 1],[504.51 550 1],[528.12 185 0],[529.268 140 0],[531.435 90 2],[532.082 200 2],[532.718 150 2],[549.567 450 1],[553.536 285 1],[566.663 650 1],[567.602 550 1],[567.956 870 1],[568.621 450 1],[571.077 450 1],[574.73 285 1],[575.25 700 0],[576.475 240 0],[582.954 265 0],[585.404 235 0],[592.781 360 1],[593.178 550 1],[594.024 285 1],[594.165 650 1],[595.239 285 1],[599.943 160 0],[600.847 210 0],[616.776 285 1],[637.962 360 1],[638.077 150 3],[641.165 185 0],[642.064 210 0],[642.302 210 0],[642.832 210 0],[643.768 185 0],[644.094 235 0],[645.411 90 2],[645.79 185 0],[646.702 120 2],[646.844 300 0],[648.171 265 0],[648.205 750 1],[648.27 360 0],[648.375 300 0],[648.48 325 0],[649.122 160 0],[649.954 210 0],[650.631 185 0],[661.056 750 1],[662.254 185 0],[663.694 185 0],[664.496 235 0],[664.65 185 0],[665.346 235 0],[665.651 210 0],[672.262 185 0],[739.864 210 0],[740.612 160 0],[740.624 265 0],[742.364 685 0],[744.229 785 0],[746.831 900 0],[760.88 185 0],[761.846 60 4],[776.224 450 1],[818.487 400 0],[818.802 400 0],[820.036 250 0],[821.072 300 0],[821.634 570 0],[822.314 400 0],[824.239 400 0],[843.874 550 1],[856.774 500 0],[859.4 570 0],[862.924 650 0],[865.589 500 0],[867.608 220 1],[868.028 700 0],[868.34 650 0],[868.615 500 0],[868.743 110 1],[869.9 110 1],[870.325 500 0],[871.054 160 1],[871.17 570 0],[871.883 500 0],[872.889 250 0],[874.736 200 0],[938.68 500 0],[939.279 570 0],[946.068 250 0],[986.333 200 0],[986.541 160 1],[986.821 110 1],[988.739 160 1],[989.109 220 1],[996.186 160 1],[996.934 220 1],[1002.327 285 1],[1003.545 220 1],[1006.515 220 1],[1007.012 160 1],[1010.513 250 0],[1010.889 300 0],[1011.248 350 0],[1011.464 400 0],[1012.627 110 1],[1053.957 250 0],[1207.451 200 0],[1218.682 380 0],[1228.897 225 0],[1232.876 290 0],[1238.165 310 0],[1243.84 180 0],[1246.125 510 0],[1246.962 920 0],[1342.961 500 0],[1358.133 840 0],[1358.773 180 0],[1360.227 180 0],[1362.418 290 0],[1475.707 250 0],[1486.887 100 0],[1496.66 160 0],[1558.227 180 0],[1751.658 120 0],[1758.4859 100 0],[1787.826 100 0]}{ALLx1000x920x1000x1000x1000x1000x0}{UVx1000x775x650x1000x1000x1000x0}{VISx1000x900x1000x300x150x350x0}{IVx920x920x550x0x0x0x0}%
\pgfspectra@elt@search{#1}{O}{[12.4616 80 4],[13.5523 110 4],[13.8109 80 4],[13.9029 110 4],[15.1447 80 4],[15.1477 110 4],[15.1546 150 4],[16.4574 80 4],[16.4657 110 4],[16.4709 80 4],[16.6235 80 4],[16.799 150 4],[17.0219 110 4],[17.2169 450 4],[18.5745 250 4],[19.2751 375 4],[19.2799 450 4],[19.2906 520 4],[19.3003 80 4],[19.4593 200 4],[19.586 150 3],[19.601 200 3],[20.2161 80 4],[20.2224 80 4],[20.2283 80 4],[20.2334 80 4],[20.2393 150 4],[20.378 110 4],[20.382 150 4],[20.385 100 4],[20.389 200 4],[20.394 100 4],[20.718 110 3],[20.724 150 3],[20.7794 300 4],[21.504 150 4],[21.5103 200 4],[21.5245 250 4],[21.6018 250 4],[22.0352 520 4],[22.7372 80 4],[22.7469 80 4],[22.7511 150 4],[22.7549 80 4],[22.7634 80 4],[22.7689 80 4],[23.1823 150 4],[23.346 140 3],[23.35 150 3],[23.352 110 3],[23.356 200 3],[23.36 110 3],[23.836 90 3],[23.857 180 3],[24.8459 110 4],[25.256 110 3],[25.295 110 3],[25.308 150 3],[26.039 300 3],[26.056 250 3],[26.434 80 2],[26.448 110 2],[26.697 110 2],[26.698 150 2],[26.703 150 2],[27.738 150 2],[27.963 300 3],[27.994 375 3],[28.571 110 3],[28.584 150 3],[28.6448 110 4],[29.562 80 2],[29.566 110 2],[29.572 120 2],[30.341 150 2],[30.346 150 2],[30.352 140 2],[30.362 160 2],[30.369 160 2],[30.38 250 2],[30.56 200 2],[30.566 250 2],[30.57 190 2],[30.577 300 2],[30.584 190 2],[30.662 200 3],[30.688 150 3],[32.0979 450 2],[32.845 300 2],[32.874 250 2],[34.531 300 2],[35.514 110 2],[35.533 90 2],[35.547 80 2],[35.902 200 2],[35.922 190 2],[35.938 150 2],[37.38 210 2],[37.4 200 2],[37.408 300 2],[37.416 190 2],[37.433 200 2],[37.444 210 2],[39.5558 450 2],[43.498 300 2],[50.7391 800 2],[50.7683 900 2],[50.8182 1000 2],[52.5795 1000 2],[53.783 250 1],[53.826 300 1],[53.909 220 1],[53.955 200 1],[53.985 150 1],[55.333 700 3],[55.4075 775 3],[55.4514 850 3],[55.5261 700 3],[59.7818 700 2],[59.9598 1000 2],[60.8398 580 3],[60.97 110 2],[60.9829 640 3],[61.004 160 2],[61.075 200 2],[61.085 100 2],[61.6952 270 3],[61.7005 150 3],[61.7036 200 3],[62.4617 520 3],[62.513 580 3],[62.5852 640 3],[62.973 1000 4],[64.4148 150 1],[67.295 200 1],[67.377 150 1],[68.1272 230 4],[68.5544 70 0],[70.2332 800 2],[70.2822 800 2],[70.2899 900 2],[70.385 1000 2],[71.8484 900 1],[71.8562 600 1],[74.4794 70 0],[75.8678 700 4],[75.9441 640 4],[76.0228 580 4],[76.0445 775 4],[76.1128 640 4],[76.2003 700 4],[77.0793 70 0],[77.1056 90 0],[77.4518 520 4],[77.5321 70 0],[77.9734 200 3],[77.9821 315 3],[77.9912 360 3],[77.9997 200 3],[78.7711 640 3],[79.0109 520 3],[79.0199 700 3],[79.1973 70 0],[79.666 300 1],[80.22 200 3],[80.2255 160 3],[80.4267 90 0],[80.4848 70 0],[80.5295 70 0],[80.581 80 0],[83.2762 240 1],[83.2927 600 2],[83.3332 450 1],[83.3742 780 2],[83.4467 600 1],[83.5096 600 2],[83.5292 800 2],[87.7879 40 0],[92.1296 130 3],[92.1366 160 3],[92.2008 80 0],[92.3367 200 3],[92.3433 130 3],[93.5193 90 0],[94.8686 40 0],[97.1738 90 0],[97.6448 40 0],[98.8773 160 0],[99.0204 40 0],[102.5762 250 0],[102.7431 90 0],[103.923 160 0],[104.0942 60 0],[115.2152 40 0],[130.2168 900 0],[130.4858 600 0],[130.6029 300 0],[133.8612 200 3],[134.2992 130 3],[134.3512 230 3],[137.1292 640 4],[147.689 160 2],[150.672 160 4],[159.001 285 2],[159.133 160 2],[164.368 315 4],[170.7996 160 4],[176.012 220 2],[176.042 110 2],[176.322 220 2],[176.448 220 2],[176.778 750 2],[176.824 550 2],[177.167 360 2],[177.3 110 2],[177.385 110 2],[177.916 220 2],[178.103 160 2],[178.485 160 2],[178.966 220 2],[184.826 110 2],[185.662 110 2],[187.278 285 2],[187.287 285 2],[187.494 285 2],[192.004 160 2],[192.075 110 2],[192.152 110 2],[192.349 220 2],[192.382 110 2],[192.694 110 2],[201.327 360 2],[202.696 160 2],[204.567 220 2],[205.274 160 2],[228.342 30 1],[228.489 30 1],[229.332 110 1],[230.035 200 1],[231.305 30 1],[231.612 30 1],[231.679 30 1],[231.968 50 1],[232.215 30 1],[233.931 30 1],[239.044 200 2],[239.433 80 2],[241.16 110 1],[242.284 80 2],[242.555 80 1],[243.356 250 1],[243.606 80 1],[243.883 80 2],[244.426 80 1],[244.555 300 1],[244.9372 200 3],[245.004 200 3],[245.499 200 2],[249.344 200 3],[249.377 200 3],[250.773 200 3],[250.919 230 3],[251.72 200 3],[255.806 200 2],[268.753 80 2],[269.549 110 2],[273.334 300 1],[274.746 110 1],[278.101 1000 4],[278.699 920 4],[278.985 775 4],[283.626 160 3],[292.145 160 3],[294.133 200 4],[294.165 210 4],[295.968 80 2],[297.229 265 0],[298.378 250 2],[301.763 80 2],[302.345 80 2],[304.302 80 2],[304.713 200 2],[305.93 110 2],[306.342 460 3],[307.161 410 3],[312.171 80 2],[312.262 160 1],[312.944 220 1],[313.286 110 2],[313.482 450 1],[313.844 285 1],[314.466 160 4],[320.966 160 3],[323.857 80 2],[326.098 200 2],[326.546 300 2],[326.731 80 2],[327.098 220 1],[327.352 220 1],[327.769 220 1],[328.759 360 1],[330.515 160 1],[330.66 160 1],[331.23 80 2],[334.074 110 2],[334.808 230 3],[334.911 270 3],[335.427 160 3],[337.54 200 3],[337.72 220 1],[337.806 130 3],[338.12 360 3],[338.552 360 3],[339.025 285 1],[339.679 270 3],[340.352 360 3],[340.738 220 1],[340.966 230 3],[340.984 160 1],[341.169 410 3],[341.364 230 3],[344.41 80 2],[345.512 80 2],[347.081 285 1],[348.983 200 3],[349.224 160 3],[356.039 230 3],[356.333 270 3],[369.87 80 2],[370.275 80 2],[370.337 80 2],[370.724 110 2],[371.275 220 1],[371.508 110 2],[372.593 315 3],[372.733 285 1],[372.903 360 3],[373.685 410 3],[373.992 160 1],[374.4 110 2],[374.489 230 3],[374.949 360 1],[375.467 150 2],[375.721 80 2],[375.987 250 2],[379.126 110 2],[380.314 160 1],[382.341 120 0],[391.196 450 1],[391.929 160 1],[394.729 185 0],[394.748 160 0],[394.759 140 0],[395.437 220 1],[395.461 100 0],[396.159 200 2],[397.326 450 1],[398.22 220 1],[406.99 160 1],[407.216 285 1],[407.587 450 1],[408.391 80 1],[408.714 50 1],[408.927 150 1],[409.724 110 1],[410.5 220 1],[411.922 285 1],[412.399 100 4],[413.281 160 1],[414.606 50 1],[415.33 220 1],[418.546 285 1],[418.979 450 1],[423.327 80 0],[425.374 50 1],[425.398 50 1],[427.547 50 1],[430.378 50 1],[431.714 285 1],[433.686 160 1],[434.556 220 1],[434.943 285 1],[436.69 220 1],[436.825 100 0],[439.595 220 1],[441.491 450 1],[441.698 285 1],[444.821 160 1],[445.238 160 1],[446.545 50 1],[446.628 50 1],[446.783 50 1],[446.941 50 1],[459.097 360 1],[459.617 285 1],[460.939 80 1],[463.885 160 1],[464.181 360 1],[464.914 450 1],[465.084 160 1],[466.164 360 1],[467.623 285 1],[469.921 220 1],[470.536 285 1],[492.46 160 1],[493.027 230 4],[494.306 220 1],[532.91 135 0],[532.968 160 0],[533.074 190 0],[543.518 90 0],[543.578 110 0],[543.686 135 0],[557.734 120 0],[559.237 110 2],[559.791 130 4],[595.839 160 0],[595.858 190 0],[599.528 80 0],[604.623 160 0],[604.644 190 0],[604.649 110 0],[610.627 100 0],[615.598 400 0],[615.677 450 0],[615.818 490 0],[625.683 80 0],[626.155 100 0],[636.634 100 0],[637.432 100 0],[645.36 320 0],[645.444 360 0],[645.598 400 0],[650.024 130 4],[660.491 80 0],[665.383 100 0],[700.192 360 0],[700.223 450 0],[715.67 210 0],[725.415 400 0],[725.445 450 0],[725.453 320 0],[747.644 210 0],[747.724 100 0],[747.908 120 0],[748.067 120 0],[770.675 100 0],[777.194 870 0],[777.417 810 0],[777.539 750 0],[788.627 80 0],[794.315 100 0],[794.717 100 0],[794.755 235 0],[795.08 210 0],[795.216 185 0],[798.194 110 0],[798.24 135 0],[798.698 190 0],[798.733 135 0],[799.507 250 0],[822.182 400 0],[822.765 265 0],[823.002 265 0],[823.3 325 0],[823.535 120 0],[842.616 120 0],[844.625 810 0],[844.636 1000 0],[844.676 935 0],[882.043 325 0],[905.701 160 0],[911.829 120 0],[913.471 80 0],[915.014 80 0],[915.148 80 0],[915.601 235 0],[926.081 450 0],[926.084 490 0],[926.094 450 0],[926.258 400 0],[926.267 540 0],[926.277 590 0],[926.594 490 0],[926.601 640 0],[939.919 185 0],[948.116 120 0],[948.288 120 0],[948.743 235 0],[949.271 140 0],[949.797 265 0],[949.93 160 0],[950.559 235 0],[952.196 210 0],[952.336 120 0],[952.396 120 0],[952.828 100 0],[962.213 100 0],[962.529 120 0],[967.738 160 0],[969.466 80 0],[969.491 65 0],[974.15 235 0],[976.065 235 0],[990.905 120 0],[993.698 140 0],[994.041 120 0],[999.531 160 0],[1042.118 120 0],[1128.634 590 0],[1128.691 640 0],[1128.702 490 0],[1128.732 490 0],[1129.51 490 0],[1129.768 540 0],[1130.238 590 0],[1135.869 265 0],[1246.402 490 0],[1257.004 450 0],[1299.077 120 0],[1307.691 160 0],[1316.389 700 0],[1316.485 750 0],[1316.511 640 0],[1621.206 160 0],[1796.6699 120 0],[1802.1211 590 0],[1804.148 120 0],[1804.2189 120 0],[1804.623 120 0],[1822.923 140 0],[1824.3631 540 0],[2617.3561 140 0]}{ALLx1000x1000x900x1000x850x1000x0}{UVx1000x900x900x1000x850x1000x0}{VISx870x870x450x200x0x230x0}{IVx1000x1000x0x0x0x0x0}%
\pgfspectra@elt@search{#1}{F}{[13.454 8 4],[14.795 8 4],[14.8 10 4],[15.251 8 4],[15.854 8 4],[16.227 8 4],[16.35 8 4],[16.356 10 4],[16.598 18 4],[16.618 20 4],[16.979 6 3],[16.984 6 3],[17.107 6 3],[17.47 8 4],[17.637 8 3],[17.843 10 4],[17.859 8 4],[18.152 8 3],[18.157 8 3],[18.298 8 4],[18.672 8 4],[18.679 8 4],[18.684 10 4],[18.697 8 4],[18.701 8 4],[18.724 6 3],[19.057 12 4],[19.084 14 4],[19.197 8 4],[19.639 10 3],[19.645 12 3],[19.976 10 3],[19.98 10 3],[19.985 10 3],[19.993 10 3],[20 10 3],[20.009 14 3],[20.101 12 3],[20.106 14 3],[20.11 12 3],[20.116 16 3],[20.122 12 3],[20.555 8 4],[20.825 18 3],[21.385 14 3],[21.406 14 3],[22.077 14 3],[22.694 12 3],[22.71 10 3],[23.012 10 2],[23.322 12 3],[23.339 10 3],[23.986 14 3],[24.002 14 3],[24.008 18 3],[24.015 14 3],[24.028 14 3],[24.037 14 3],[25.103 20 3],[25.572 10 2],[25.577 12 2],[25.586 14 2],[26.171 14 2],[26.175 12 2],[26.381 16 2],[27.023 12 3],[27.969 14 2],[31.522 16 2],[31.554 14 2],[31.575 12 2],[37.53 6 1],[38.09 6 1],[40.704 8 1],[41.965 28 3],[42.005 30 3],[42.073 32 3],[42.951 20 2],[43.015 22 2],[43.022 16 2],[43.076 30 3],[43.091 10 1],[43.155 8 1],[43.564 8 1],[45.718 14 1],[46.429 18 2],[46.437 20 4],[46.511 20 2],[46.537 22 4],[46.598 24 4],[46.699 20 4],[47.195 8 1],[47.2 12 1],[47.271 10 1],[47.302 8 1],[48.46 18 1],[49.057 26 3],[49.1 32 3],[49.738 10 3],[49.783 12 3],[49.88 14 3],[50.616 18 4],[50.808 20 4],[50.839 24 2],[51.364 10 1],[51.397 14 4],[51.408 12 4],[51.494 14 1],[52.459 16 4],[52.529 18 4],[52.63 20 4],[54.685 14 1],[54.787 12 1],[54.832 10 1],[54.852 8 1],[56.769 24 2],[56.775 22 2],[57.064 28 3],[57.13 28 3],[57.139 30 3],[57.266 32 3],[60.567 18 1],[60.629 16 1],[60.68 20 1],[60.692 14 1],[60.747 16 1],[60.806 18 1],[63.014 16 2],[63.02 18 2],[64.767 14 4],[64.777 20 4],[64.787 22 4],[64.797 14 4],[65.403 26 4],[65.612 24 2],[65.687 26 2],[65.723 22 4],[65.733 28 4],[65.833 28 2],[67.612 28 3],[67.715 26 3],[67.722 30 3],[67.899 26 3],[67.921 32 3],[75.704 12 4],[78.039 3 0],[78.052 2 0],[78.238 2 0],[79.188 2.4 0],[79.254 2 0],[79.442 2 0],[80.696 30 0],[80.96 25 0],[95.187 100 0],[95.483 200 0],[95.555 150 0],[95.852 100 0],[97.24 4 0],[97.39 70 0],[97.622 20 0],[97.651 8 0],[97.775 20 0],[108.231 12 4],[108.839 14 4],[112.976 8 1],[121.903 16 2],[126.687 16 2],[126.771 18 2],[129.754 14 2],[132.706 8 1],[132.811 10 1],[133.359 8 1],[134.36 10 1],[134.404 8 1],[135.992 14 2],[140.061 10 1],[140.714 8 1],[149.309 12 1],[149.324 10 1],[149.331 8 1],[149.893 22 2],[150.201 24 2],[150.418 22 2],[150.479 28 2],[150.63 26 2],[150.677 22 2],[155.302 20 2],[155.759 22 2],[156.373 20 2],[156.554 20 2],[162.34 20 2],[165.076 20 2],[167.039 26 2],[167.74 28 2],[170.213 8 1],[171.699 20 2],[174.475 8 1],[174.555 10 1],[174.739 12 1],[177.009 24 2],[177.067 30 2],[177.293 22 2],[177.336 28 2],[179.165 32 2],[180.303 22 2],[180.47 20 2],[180.59 34 2],[183.93 22 2],[183.997 24 2],[184.014 22 2],[190.076 16 2],[202.744 20 2],[203.032 24 2],[217.144 8 3],[221.717 24 2],[222.918 2 4],[225.272 4 4],[229.829 10 3],[245.063 4 4],[245.158 8 3],[245.207 24 2],[245.692 10 3],[246.133 2 4],[246.485 26 2],[247.029 26 2],[247.873 24 2],[248.437 30 2],[254.277 24 2],[255.611 20 1],[258.004 24 2],[258.381 26 2],[259.323 24 2],[259.553 26 2],[259.928 28 2],[262.501 26 2],[262.97 28 2],[265.644 24 2],[269.398 2 4],[270.23 2 4],[270.396 2 4],[270.717 4 4],[275.555 26 2],[275.963 32 2],[278.815 24 2],[281.145 32 2],[282.074 8 3],[282.613 10 3],[283.399 28 2],[283.563 30 2],[286.033 30 2],[286.286 24 2],[287.14 20 1],[288.758 28 2],[288.945 30 2],[290.53 24 2],[291.329 28 2],[291.634 32 2],[293.249 28 2],[299.428 28 2],[299.721 24 2],[299.753 26 2],[299.947 24 2],[303.925 26 2],[303.975 24 2],[304.28 32 2],[304.914 30 2],[305.999 24 1],[311.362 28 2],[311.57 32 2],[312.154 36 2],[312.479 28 2],[313.423 28 2],[314.699 28 2],[315.349 28 1],[317.417 36 2],[317.476 34 2],[320.276 34 1],[321.4 24 2],[326.408 28 1],[341.465 28 1],[341.645 30 1],[341.68 28 1],[341.7 32 1],[347.296 32 1],[347.331 30 1],[347.478 34 1],[350.139 38 1],[350.145 40 1],[350.157 40 1],[350.284 36 1],[350.296 40 1],[350.311 42 1],[350.537 34 1],[350.552 40 1],[350.563 44 1],[352.289 32 1],[353.687 30 1],[354.177 32 1],[359.052 32 1],[359.41 1.2 0],[359.869 34 1],[360.139 36 1],[360.284 38 1],[366.817 2.4 0],[370.453 36 1],[371.035 32 1],[373.957 32 1],[380.583 28 1],[384.709 54 1],[384.999 52 1],[385.167 50 1],[389.848 1 0],[389.883 38 1],[390.193 36 1],[390.382 34 1],[393.069 1.6 0],[393.426 1 0],[394.856 1 0],[397.204 30 1],[397.267 32 1],[397.478 34 1],[402.473 48 1],[402.501 44 1],[402.549 46 1],[408.391 32 1],[410.307 38 1],[410.322 34 1],[410.351 40 1],[410.371 36 1],[410.387 34 1],[410.916 34 1],[411.654 32 1],[411.921 30 1],[420.715 28 1],[422.516 34 1],[424.412 30 1],[424.623 40 1],[424.639 38 1],[424.659 36 1],[424.677 34 1],[424.684 32 1],[427.536 34 1],[427.753 32 1],[427.893 32 1],[429.917 40 1],[442.03 28 2],[442.735 24 2],[443.232 24 2],[444.653 32 1],[444.672 34 1],[444.719 36 1],[447.999 28 2],[473.438 28 1],[485.939 34 1],[493.326 32 1],[496.065 1.2 0],[500.2 28 1],[501.254 30 2],[511.099 32 2],[517.325 30 1],[523.041 3 0],[527.901 2.4 0],[554.052 3.6 0],[555.243 2.4 0],[557.733 2 0],[558.927 32 1],[562.406 4 0],[562.693 2.4 0],[565.915 3 0],[566.753 8 0],[567.167 18 0],[568.914 3.6 0],[570.082 5 0],[570.731 5 0],[575.317 28 2],[576.12 24 2],[595.015 2.4 0],[595.919 5 0],[596.528 14 0],[599.443 10 0],[601.583 30 0],[603.804 16 0],[604.754 180 0],[608.011 20 0],[609.182 30 2],[612.55 28 2],[614.976 160 0],[621.087 80 0],[623.357 26 2],[623.965 2600 0],[624.79 28 1],[634.851 2000 0],[636.305 28 2],[641.365 1600 0],[656.969 90 0],[658.039 60 0],[665.041 80 0],[669.048 360 0],[670.828 80 0],[677.398 1400 0],[679.553 300 0],[683.426 1800 0],[685.603 10000 0],[687.022 1600 0],[690.248 3000 0],[690.982 1200 0],[696.635 800 0],[703.747 9000 0],[712.789 6000 0],[717.99 26 1],[720.236 3000 0],[721.179 26 1],[730.903 200 0],[731.102 3000 0],[731.43 140 0],[733.196 1000 0],[733.677 24 2],[735.494 26 2],[739.869 2000 0],[742.565 800 0],[748.272 440 0],[748.916 500 0],[751.492 180 0],[755.224 1000 0],[757.338 1000 0],[760.717 1400 0],[775.47 3600 0],[780.021 3000 0],[787.918 60 0],[789.859 100 0],[793.631 70 0],[795.632 60 0],[801.601 16 1],[804.093 200 0],[807.552 180 0],[807.752 70 0],[812.656 70 0],[812.926 120 0],[815.951 60 0],[817.934 120 0],[819.124 60 0],[820.863 70 0],[821.473 500 0],[823.077 600 0],[823.219 100 0],[827.462 300 0],[829.858 400 0],[830.24 120 0],[880.758 180 0],[890.092 200 0],[891.278 60 0],[902.549 70 0],[904.21 80 0],[917.868 70 0],[943.367 40 0],[950.53 5 0],[966.204 2.4 0],[973.434 5 0],[982.211 3 0],[990.265 2.4 0],[1004.798 16 1],[1028.545 3 0],[1086.231 4 0]}{ALLx10000x10000x54x36x32x28x0}{UVx200x200x44x36x32x28x0}{VISx10000x10000x54x32x0x0x0}{IVx3000x3000x16x0x0x0x0}%
@@ -44,7 +44,7 @@
\pgfspectra@elt@search{#1}{Na}{[10.628 100 4],[10.63 100 4],[10.64 100 4],[10.649 100 4],[10.793 200 4],[10.802 200 4],[11.082 200 4],[11.088 200 4],[11.151 100 4],[11.201 300 4],[11.47 100 4],[11.474 100 4],[11.799 400 4],[12.004 100 4],[12.518 400 4],[12.522 400 4],[12.529 500 4],[12.543 300 4],[12.546 300 4],[12.59 200 4],[12.621 100 4],[12.656 200 4],[12.661 100 4],[12.744 400 4],[12.747 400 4],[12.803 400 4],[12.805 400 4],[13.068 200 4],[13.135 300 4],[13.141 200 4],[13.164 300 4],[13.316 500 4],[13.339 400 4],[13.427 200 4],[13.579 300 4],[13.585 300 4],[13.6551 4 3],[13.6854 4 3],[13.881 200 4],[13.892 300 4],[13.9961 4 3],[14.2232 7 3],[14.2359 6 3],[14.6064 8 3],[14.6302 7 3],[14.864 400 4],[14.886 300 4],[15.0298 9 3],[15.0543 7 3],[15.064 7 3],[15.0687 8 3],[15.113 400 4],[15.1299 7 3],[15.5083 7 3],[15.524 7 3],[15.5448 7 3],[15.551 8 3],[15.6537 8 3],[15.721 300 4],[16.2448 12 3],[16.319 10 3],[16.362 300 4],[16.8411 12 3],[16.8546 10 3],[18.395 5 2],[18.935 5 2],[19.0445 10 3],[19.38 5 2],[19.404 5 2],[19.417 5 2],[19.429 5 2],[19.468 6 2],[19.553 6 2],[19.9772 10 3],[20.215 6 2],[20.219 6 2],[20.249 8 2],[20.271 5 2],[20.272 7 2],[20.276 8 2],[20.306 8 2],[20.328 8 2],[20.333 8 2],[20.549 10 3],[20.73 10 2],[21.534 10 2],[21.586 12 2],[21.612 12 2],[22.987 15 2],[23.059 12 2],[25.052 50 2],[25.137 30 2],[26.69 25 2],[26.765 70 2],[26.787 50 2],[26.863 50 2],[27.208 20 2],[27.245 20 2],[30.015 160 1],[30.02 160 1],[30.132 90 1],[30.144 100 1],[30.245 60 1],[30.715 800 4],[30.826 1000 4],[31.9644 10 3],[33.255 800 4],[33.391 900 4],[36.032 800 4],[36.037 800 4],[36.076 10 3],[37.208 300 1],[37.638 350 1],[37.814 100 2],[38.01 70 2],[40.072 1000 4],[40.8684 12 3],[40.9614 10 3],[41.0372 15 3],[41.1334 10 3],[41.2242 13 3],[44.505 500 4],[44.519 600 4],[45.99 600 4],[46.105 850 4],[46.326 1000 4],[129.397 60 1],[132.774 50 1],[133.676 7 2],[133.736 7 2],[134.067 8 2],[134.239 9 2],[134.273 10 2],[134.754 45 1],[135.528 11 2],[136.19 12 2],[137.234 11 2],[137.469 90 1],[140.468 90 1],[142.089 10 2],[144.419 10 2],[144.931 12 2],[149.521 45 1],[149.601 40 1],[149.773 45 1],[150.641 80 1],[150.691 60 1],[151.31 70 1],[151.963 60 1],[156.287 11 2],[156.529 10 2],[158.05 10 3],[158.218 11 3],[158.233 10 3],[158.398 11 3],[158.414 12 3],[158.699 10 3],[158.705 12 3],[159.818 10 2],[161.395 10 3],[161.592 11 3],[161.857 12 3],[165.547 11 3],[165.792 60 1],[168.894 11 2],[169.929 10 2],[170.197 15 3],[170.241 10 3],[171.112 10 2],[172.827 11 2],[173.111 10 2],[175.548 10 2],[177.657 90 1],[177.824 40 1],[178.304 60 1],[178.719 80 1],[178.885 45 1],[179.841 80 1],[180.126 45 1],[180.707 15 2],[180.709 90 1],[180.838 60 1],[181.077 10 2],[181.167 11 2],[181.681 10 2],[182.17 50 1],[183.387 45 1],[183.522 10 2],[183.522 80 1],[183.789 45 1],[183.894 10 2],[184.182 60 1],[184.436 11 2],[184.502 70 1],[184.753 12 2],[184.759 10 2],[184.956 15 2],[185.015 45 1],[185.038 12 2],[185.119 70 1],[185.317 80 1],[185.592 10 2],[185.671 10 2],[186.121 10 2],[186.645 45 1],[187.337 45 1],[187.508 60 1],[188.066 10 2],[188.191 160 1],[188.509 50 1],[188.574 45 1],[188.739 10 2],[188.747 20 2],[189.075 15 2],[190.016 15 2],[191.845 10 2],[192.396 11 2],[192.626 14 2],[192.724 12 2],[193.274 12 2],[193.389 13 2],[194.352 10 2],[194.643 12 2],[195.091 12 2],[195.124 14 2],[196.076 12 3],[196.508 11 3],[196.76 10 3],[197.716 10 2],[198.557 13 2],[199.568 10 2],[200.421 10 2],[200.522 11 2],[200.847 11 2],[201.187 15 2],[201.417 11 2],[201.703 12 2],[201.839 10 3],[202.856 12 2],[203.113 12 2],[203.59 11 2],[204.166 12 2],[204.329 12 2],[204.482 10 2],[204.544 10 2],[205.148 11 2],[206.036 10 2],[206.66 15 2],[208.291 13 2],[210.633 12 3],[211.453 10 3],[214.072 15 2],[214.454 14 2],[215.576 10 3],[220.283 15 2],[222.593 15 2],[222.853 80 1],[223.033 30 2],[223.219 16 2],[224.67 20 2],[225.147 14 2],[227.842 15 2],[228.566 13 2],[230.358 80 1],[230.999 15 2],[231.565 300 1],[238.699 18 2],[239.328 130 1],[239.403 17 2],[240.101 100 1],[240.659 15 2],[242.099 300 1],[242.473 300 1],[243.914 200 1],[244.15 250 1],[244.872 200 1],[245.218 200 1],[245.931 25 2],[246.885 18 2],[247.473 20 2],[249.315 1000 1],[249.703 25 2],[250.284 300 1],[250.63 450 1],[251.026 17 2],[251.546 600 1],[253.025 15 2],[253.154 600 1],[254.28 14 2],[258.631 550 1],[259.496 600 1],[261.181 850 1],[262.741 300 1],[263.181 300 1],[264.853 160 1],[265.131 200 1],[265.981 200 1],[266.1 850 1],[266.346 200 1],[266.646 350 1],[267.183 1000 1],[267.404 200 1],[267.809 850 1],[280.871 650 1],[280.952 850 1],[281.829 350 1],[282.987 600 1],[283.956 800 1],[284.172 1000 1],[285.281 16 0],[285.301 15 0],[285.651 650 1],[285.949 800 1],[286.102 350 1],[287.128 750 1],[287.295 650 1],[288.115 900 1],[288.626 850 1],[289.395 700 1],[290.114 900 1],[290.472 800 1],[290.492 1100 1],[291.752 1100 1],[291.905 1100 1],[291.985 1200 1],[292.095 1300 1],[292.349 1000 1],[293.088 750 1],[293.408 850 1],[293.774 950 1],[294.266 450 1],[294.57 800 1],[294.75 950 1],[295.124 1200 1],[295.24 1100 1],[296.012 850 1],[296.574 450 1],[297.073 500 1],[297.424 600 1],[297.499 750 1],[297.713 1000 1],[297.966 1100 1],[298.063 1100 1],[298.419 1300 1],[300.415 550 1],[300.744 750 1],[300.914 750 1],[300.948 450 1],[301.54 600 1],[301.734 450 1],[302.907 400 1],[303.708 400 1],[304.56 400 1],[305.367 550 1],[305.535 550 1],[305.616 550 1],[305.738 550 1],[305.795 550 1],[305.872 550 1],[306.025 700 1],[306.135 800 1],[306.438 500 1],[306.622 500 1],[306.654 500 1],[307.433 550 1],[307.832 550 1],[308.025 550 1],[308.706 550 1],[308.826 450 1],[309.204 550 1],[309.273 550 1],[309.445 650 1],[309.555 650 1],[310.358 500 1],[310.44 500 1],[311.145 450 1],[311.369 500 1],[312.294 400 1],[312.442 1700 1],[312.521 600 1],[312.938 600 1],[313.548 2500 1],[313.786 1700 1],[314.571 950 1],[314.928 2000 1],[316.374 2000 1],[317.509 700 1],[317.906 1000 1],[318.979 1700 1],[321.219 1600 1],[323.493 700 1],[325.796 1500 1],[326.021 650 1],[327.422 950 1],[328.56 1700 1],[330.135 1700 1],[330.237 19 0],[330.298 18 0],[330.496 1500 1],[331.804 1000 1],[332.769 950 1],[342.686 6 0],[353.305 1500 1],[363.127 1200 1],[371.107 850 1],[408.137 200 1],[411.37 300 1],[412.308 250 1],[423.326 250 1],[423.899 2 0],[424.037 200 1],[424.09 250 1],[424.208 3 0],[427.364 4 0],[427.679 5 0],[428.784 2 0],[429.101 3 0],[429.248 250 1],[429.286 250 1],[430.881 250 1],[430.904 250 1],[432.091 250 1],[432.14 6 0],[432.462 7 0],[433.729 250 1],[434.149 4 0],[434.411 250 1],[434.474 5 0],[436.86 200 1],[437.522 200 1],[438.749 200 1],[439.003 8 0],[439.281 250 1],[439.334 9 0],[440.512 200 1],[441.989 6 0],[442.325 7 0],[444.67 200 1],[444.741 200 1],[445.474 200 1],[445.523 200 1],[445.721 200 1],[447.463 200 1],[447.88 200 1],[448.167 200 1],[449.015 200 1],[449.087 200 1],[449.418 10 0],[449.766 11 0],[449.962 200 1],[450.697 200 1],[451.921 200 1],[452.498 200 1],[453.332 200 1],[454.163 7 0],[454.519 8 0],[455.153 200 1],[459.092 160 1],[472.223 160 1],[473.11 160 1],[473.25 100 1],[474.167 160 1],[476.879 160 1],[478.879 100 1],[481.475 50 1],[483.526 50 1],[514.311 60 1],[519.165 100 1],[520.333 50 1],[520.855 80 1],[539.063 60 1],[540.046 70 1],[541.455 90 1],[568.2633 5 0],[568.8204 9 0],[588.995 32 0],[589.5924 16 0],[617.525 60 1],[619.926 70 1],[623.468 70 1],[626.001 80 1],[627.474 80 1],[631.08 60 1],[635.283 60 1],[635.805 60 1],[636.115 70 1],[636.641 70 1],[637.891 60 1],[647.529 50 1],[651.421 90 1],[652.468 80 1],[653.07 130 1],[654.404 130 1],[654.575 130 1],[655.243 80 1],[780.978 4 0],[781.024 3 0],[818.3256 5 0],[819.4824 9 0],[864.992 7 0],[865.089 6 0],[915.388 4 0],[946.594 6 0],[996.128 7 0],[1057.228 3 0],[1074.644 10 0],[1074.929 9 0],[1083.487 8 0],[1138.145 11 0],[1140.378 12 0],[1476.748 115 0],[2205.6439 30 0],[2208.367 27 0],[2334.841 24 0],[2337.9131 24 0]}{ALLx2500x115x2500x100x15x1000x0}{UVx2500x19x2500x100x15x1000x0}{VISx300x32x300x0x0x0x0}{IVx115x115x0x0x0x0x0}%
\pgfspectra@elt@search{#1}{Mg}{[11.816 40 3],[11.881 80 3],[12.359 70 3],[12.465 240 3],[12.986 300 3],[13.281 300 3],[14.695 400 3],[14.741 300 3],[14.754 300 3],[17.08 15 2],[17.139 15 2],[18.007 350 3],[18.062 400 3],[18.08 400 3],[18.134 350 3],[18.224 15 2],[18.297 12 2],[18.651 20 2],[18.72 20 2],[18.853 10 2],[23.173 100 2],[23.426 80 2],[25.158 5 4],[27.658 35 4],[31.23 10 4],[32.099 4000 3],[32.331 3000 3],[35.109 20 4],[35.22 18 4],[35.309 30 4],[35.33 15 4],[35.422 18 4],[35.533 20 4],[80.041 40 3],[85.729 150 3],[86.674 30 3],[91.903 50 3],[92.978 30 3],[94.67 8 1],[94.677 9 1],[100.876 40 3],[102.596 14 1],[102.611 12 1],[102.641 30 3],[103.741 250 3],[104.437 80 3],[105.576 60 3],[121.099 300 3],[123.994 25 1],[124.04 20 1],[124.851 6 1],[124.993 8 1],[127.124 8 1],[127.194 9 1],[127.272 8 1],[127.343 11 1],[127.483 10 2],[128.07 11 2],[130.671 11 1],[130.788 12 1],[130.828 12 1],[130.944 14 1],[134.219 300 3],[134.657 800 3],[134.668 300 3],[135.205 600 3],[136.545 14 1],[136.726 15 1],[136.77 15 1],[136.942 18 1],[138.446 900 3],[138.577 500 3],[138.753 800 3],[139.127 12 2],[139.339 15 2],[140.468 300 3],[140.936 1000 3],[143.114 10 2],[143.753 500 3],[143.764 1000 3],[144.742 300 3],[145.954 300 3],[145.962 400 3],[147.6 20 1],[147.801 25 1],[148.089 20 1],[148.151 400 3],[148.29 30 1],[149.045 350 3],[149.55 300 3],[157.271 16 2],[158.624 12 2],[160.711 300 3],[164.593 1 0],[165.116 1 0],[165.831 2 0],[166.843 5 0],[168.302 500 3],[168.341 10 0],[168.709 13 2],[169.728 13 2],[169.881 400 3],[170.706 15 0],[172.204 10 2],[173.484 40 1],[173.762 50 1],[173.884 22 2],[174.756 12 2],[174.78 20 0],[174.893 18 2],[175.065 40 1],[175.346 50 1],[177.298 15 2],[178.325 20 2],[179.458 14 2],[180.066 15 2],[182.793 30 0],[184.417 300 3],[185.819 13 2],[187.949 12 2],[190.85 10 2],[192.39 12 2],[193.067 13 2],[193.784 11 2],[202.582 9 0],[203.955 15 2],[205.549 15 2],[206.49 25 2],[208.59 15 2],[209.196 20 2],[209.793 13 2],[211.277 15 2],[213.406 16 2],[217.77 20 2],[232.958 3 1],[239.515 20 2],[244.957 6 1],[246.775 15 2],[249.054 10 2],[251.84 12 3],[252.919 10 2],[253.479 4 3],[255.723 1 0],[256.094 1 0],[256.226 1 0],[256.494 1 0],[257.091 1 0],[257.225 1 0],[257.494 2 0],[257.789 1 0],[258.059 1 0],[258.422 1 0],[258.556 2 0],[258.828 3 0],[259.189 1 0],[259.323 1 0],[259.597 2 0],[260.25 2 0],[260.385 4 0],[260.662 5 0],[261.336 1 0],[261.473 2 0],[261.751 3 0],[262.866 3 0],[263.005 6 0],[263.287 8 0],[264.48 2 0],[264.621 3 0],[264.906 4 0],[266.076 8 1],[266.082 8 1],[266.812 6 0],[266.955 8 0],[267.246 10 0],[269.372 3 0],[269.518 5 0],[269.814 6 0],[273.199 8 0],[273.349 10 0],[273.653 12 0],[276.522 5 0],[276.834 7 0],[277.669 38 0],[277.827 32 0],[277.983 90 0],[278.129 8 0],[278.142 32 0],[278.297 36 0],[279.079 13 1],[279.553 1000 1],[279.806 16 1],[280.27 600 1],[280.976 3 0],[281.111 2 0],[281.178 1 0],[284.672 12 0],[284.675 12 0],[284.834 14 0],[284.842 14 0],[285.165 16 0],[285.166 16 0],[285.213 6000 0],[290.292 2 0],[290.636 4 0],[291.545 3 0],[291.545 3 0],[292.875 2 1],[293.654 3 1],[293.674 10 0],[293.674 10 0],[293.847 12 0],[293.847 12 0],[294.2 2 0],[294.2 13 0],[296.787 1 1],[297.17 1 1],[309.108 20 0],[309.299 22 0],[309.69 14 0],[310.471 9 1],[310.481 8 1],[316.898 6 1],[317.271 6 1],[317.578 7 1],[319.762 2 0],[329.905 12 2],[330.639 13 2],[332.993 17 0],[333.215 6 0],[333.59 12 2],[333.668 9 0],[334.258 11 2],[336.141 12 2],[338.124 10 2],[338.29 11 2],[338.737 11 2],[353.504 7 1],[353.886 8 1],[354.952 7 1],[355.337 8 1],[370.674 10 2],[382.93 140 0],[383.23 300 0],[383.829 500 0],[384.824 8 1],[384.891 1 0],[385.04 7 1],[385.396 2 0],[385.496 1 0],[385.886 2 0],[387.831 3 0],[389.191 2 0],[389.33 2 0],[389.557 3 0],[390.386 4 0],[393.84 6 0],[398.421 1 0],[398.675 8 0],[405.469 2 0],[405.75 10 0],[407.506 3 0],[408.183 2 0],[416.51 4 0],[416.727 15 0],[435.191 20 0],[435.453 6 0],[438.038 6 0],[438.464 9 1],[439.059 10 1],[442.8 8 1],[443.399 9 1],[443.649 5 1],[443.66 4 1],[448.116 14 1],[448.133 13 1],[453.429 6 1],[457.11 28 0],[462.13 3 0],[470.299 7 0],[473.003 10 0],[473.959 6 1],[473.971 5 1],[485.11 7 1],[491.6 10 2],[516.733 75 0],[517.268 220 0],[518.361 400 0],[526.421 8 1],[526.437 7 1],[534.598 1 0],[540.154 9 1],[550.96 2 0],[552.841 6 0],[571.109 30 0],[578.531 5 0],[578.556 4 0],[583.982 10 2],[591.643 7 1],[591.816 6 1],[625.675 15 2],[631.872 10 0],[631.924 9 0],[631.949 7 0],[634.674 10 1],[634.696 9 1],[654.597 11 1],[662.044 5 1],[662.057 6 1],[663.083 2 0],[678.145 7 1],[678.785 8 1],[681.286 7 1],[681.927 8 1],[689.49 4 0],[696.54 6 0],[706.041 8 0],[719.317 10 0],[729.106 10 0],[738.7 5 0],[738.769 12 0],[758.076 4 1],[765.76 20 0],[765.915 19 0],[765.99 17 0],[769.016 8 0],[769.155 15 0],[772.261 1 0],[774.634 1 0],[775.93 1 0],[778.65 5 1],[779.098 4 1],[781.114 3 0],[787.705 12 1],[788.167 2 0],[789.637 13 1],[793.081 7 0],[804.773 3 0],[804.985 5 0],[805.423 7 0],[809.872 10 0],[811.522 9 1],[812.043 8 1],[815.464 1 0],[815.913 2 0],[820.984 10 0],[821.303 20 0],[821.399 10 1],[822.292 7 1],[823.319 7 1],[823.464 11 1],[830.331 7 0],[830.56 9 0],[831.026 10 0],[834.612 15 0],[846.648 2 0],[846.884 5 0],[847.369 7 0],[871.018 10 0],[871.269 12 0],[871.783 13 0],[873.499 10 1],[873.602 17 0],[874.566 11 1],[880.676 14 0],[882.432 10 1],[883.508 11 1],[892.357 20 0],[898.903 7 0],[899.169 9 0],[899.716 10 0],[921.825 14 1],[924.427 13 1],[924.65 12 0],[925.578 30 0],[932.754 10 1],[934.054 10 1],[941.496 25 0],[942.981 17 0],[943.276 19 0],[943.878 20 0],[950.245 8 0],[950.311 7 0],[950.343 5 0],[963.189 12 1],[963.243 11 1],[995.32 15 0],[998.32 15 0],[998.647 17 0],[999.321 18 0],[1009.216 14 1],[1039.176 5 1],[1039.223 6 1],[1081.108 35 0],[1091.423 11 1],[1091.527 7 1],[1095.178 10 1],[1095.332 25 0],[1095.73 27 0],[1096.545 28 0],[1103.21 15 0],[1103.366 14 0],[1125.593 5 1],[1125.635 4 1],[1182.818 45 0],[1208.366 30 0],[1487.762 28 0],[1502.499 35 0],[1504.024 30 0],[1504.77 25 0],[1574.071 6 0],[1574.899 8 0],[1576.584 10 0],[1710.866 30 0],[2639.29 5 0]}{ALLx6000x6000x1000x100x4000x35x0}{UVx6000x6000x1000x100x4000x35x0}{VISx500x500x14x15x0x0x0}{IVx45x45x14x0x0x0x0}%
\pgfspectra@elt@search{#1}{Al}{[10.38 300 4],[10.388 400 4],[10.407 250 4],[10.418 250 4],[10.795 600 4],[10.806 300 4],[10.811 300 4],[11.85 250 4],[12.403 400 3],[12.553 900 4],[12.607 800 4],[12.973 700 3],[13.041 800 4],[13.085 1000 4],[13.1 900 4],[13.144 900 4],[13.263 500 4],[16.007 800 3],[16.169 700 3],[27.869 1000 4],[28.139 900 4],[48.6884 70 2],[48.6912 30 2],[51.1138 250 2],[51.1191 150 2],[56.0317 500 2],[56.0433 200 2],[67.0068 100 2],[67.1118 200 2],[69.5829 500 2],[69.6217 400 2],[72.5683 200 2],[72.6915 300 2],[85.5034 400 2],[85.6746 500 2],[89.2024 400 2],[89.3887 50 2],[89.3897 450 2],[102.734 500 3],[104.217 800 3],[104.852 700 3],[105.89 500 3],[106.143 500 3],[106.489 600 3],[106.657 500 3],[106.826 250 4],[106.944 600 3],[108.867 500 4],[109.014 300 4],[110.574 400 3],[111.882 600 3],[112.561 500 3],[113.682 400 3],[115.03 300 4],[116.259 10 2],[116.262 5 2],[116.542 350 4],[116.848 250 4],[117.743 40 1],[119.1812 50 1],[119.85 400 3],[122.055 400 3],[123.719 900 3],[124.021 600 3],[124.086 700 3],[124.879 700 3],[125.762 900 3],[126.418 800 3],[127.276 1000 3],[128.77 500 4],[133.006 400 4],[133.79 400 3],[135.018 150 1],[135.052 400 4],[135.281 100 2],[135.282 5 2],[135.286 70 2],[136.335 400 4],[136.92 600 4],[137.37 300 4],[137.662 500 3],[137.967 600 2],[138.413 800 2],[138.879 500 3],[143.194 600 3],[144.182 700 3],[144.587 400 4],[144.751 800 3],[145.526 300 4],[145.796 600 3],[147.564 600 4],[148.605 300 4],[148.689 700 3],[149.479 800 3],[150.837 700 4],[151.907 400 3],[152.614 1000 4],[153.754 800 3],[153.912 500 4],[153.983 800 1],[155.019 500 3],[155.725 1000 3],[155.903 500 3],[156.416 700 3],[156.9385 100 1],[157.79 300 4],[158.204 900 3],[158.446 800 3],[158.928 400 3],[158.987 350 4],[159.6059 125 1],[160.5766 700 2],[160.665 400 3],[161.1814 100 2],[161.1874 800 2],[161.781 400 3],[162.5627 150 1],[162.754 600 3],[163.682 500 3],[163.906 800 3],[164.4235 100 1],[164.4809 100 1],[167.0787 1000 1],[168.625 100 1],[171.944 800 1],[172.1244 500 1],[172.1271 900 1],[172.4952 500 1],[172.4984 900 1],[176.0104 350 1],[176.1975 300 1],[176.3 290 0],[176.3869 500 1],[176.3952 700 1],[176.564 450 0],[176.5815 300 1],[176.638 450 0],[176.7731 400 1],[176.914 450 0],[181.856 1000 3],[182.8588 600 1],[183.2837 400 1],[183.4808 250 1],[185.4716 1000 2],[185.5929 300 1],[185.8026 700 1],[185.998 120 1],[186.2311 1000 1],[186.279 600 2],[188.116 700 3],[192.9978 200 1],[193.1048 150 1],[193.2377 200 1],[193.4503 400 1],[193.4713 150 1],[193.584 300 2],[193.5863 15 2],[193.5949 200 2],[193.6907 150 1],[193.9261 220 1],[199.0531 700 1],[201.6052 150 1],[201.6234 150 1],[201.6368 100 1],[207.4008 200 1],[209.4264 700 1],[209.4744 150 1],[209.4791 300 1],[209.5104 100 1],[209.5141 200 1],[215.07 60 0],[218.1 60 0],[226.91 400 0],[226.922 120 0],[231.249 60 0],[231.353 70 0],[231.748 90 0],[231.906 60 0],[232.156 140 0],[236.705 460 0],[236.761 110 0],[236.811 110 0],[236.93 180 0],[237.022 140 0],[237.073 70 0],[237.207 160 0],[237.312 850 0],[237.335 170 0],[237.357 110 0],[237.84 60 0],[239.9 110 2],[251.33 60 0],[251.587 400 3],[256.798 240 0],[257.51 480 0],[257.54 60 0],[263.155 80 1],[263.77 110 1],[265.248 150 0],[266.039 200 0],[266.917 160 1],[276.277 285 2],[276.287 220 2],[281.619 650 1],[283.796 90 0],[284.01 90 0],[290.693 450 2],[304.128 150 1],[305.007 360 0],[305.468 60 0],[305.714 450 0],[306.429 90 0],[306.614 60 0],[307.464 150 1],[308.2153 4500 0],[309.271 7200 0],[309.2839 1800 0],[320.82 500 3],[326.721 500 3],[328.513 600 3],[334.446 400 3],[334.852 360 2],[335.088 290 2],[342.892 150 1],[343.935 70 0],[344.364 150 0],[344.486 70 0],[345.822 70 0],[347.354 500 3],[347.981 60 0],[348.263 60 0],[349.223 900 3],[350.846 800 3],[351.128 500 3],[351.756 700 3],[352.703 400 3],[354.108 500 3],[358.656 450 1],[358.707 360 1],[358.745 290 1],[360.163 870 2],[360.193 550 2],[361.236 750 2],[365.106 220 1],[365.11 110 1],[365.498 150 1],[365.5 290 1],[370.211 450 2],[371.312 550 2],[390.068 450 1],[393.2 60 0],[394.4006 4500 0],[396.152 9000 0],[398.014 110 2],[399.586 110 1],[408.245 110 2],[408.861 150 2],[414.237 110 2],[414.992 650 2],[415.017 650 2],[422.681 290 1],[436.464 110 2],[447.989 650 2],[447.997 650 2],[451.256 760 2],[452.894 550 2],[452.919 870 2],[458.582 150 1],[458.819 110 1],[466.68 550 1],[470.115 110 2],[470.141 150 2],[489.876 110 1],[490.277 110 1],[490.41 110 2],[510.752 70 0],[515.101 110 2],[516.389 110 2],[528.021 150 1],[528.377 290 1],[528.585 150 1],[531.232 110 1],[531.607 220 1],[537.184 150 1],[555.706 180 0],[555.795 110 0],[559.323 450 1],[569.66 1200 2],[572.273 1000 2],[585.362 110 1],[597.194 220 1],[600.176 290 1],[600.188 220 1],[600.642 450 1],[605.521 110 2],[606.111 150 1],[606.843 290 1],[606.853 110 1],[607.323 450 1],[618.157 110 1],[618.168 150 1],[618.228 290 1],[618.245 220 1],[618.342 450 1],[620.152 450 1],[620.17 360 1],[622.618 290 1],[623.178 360 1],[624.336 450 1],[633.574 450 1],[669.602 360 0],[669.867 230 0],[708.397 60 0],[708.464 70 0],[736.157 110 0],[736.23 140 0],[760.616 60 0],[761.482 90 0],[763.537 220 2],[766.026 150 2],[768.197 220 2],[783.531 230 0],[783.613 290 0],[788.179 360 2],[788.252 150 2],[790.551 290 2],[799.305 60 0],[800.319 90 0],[806.597 70 0],[807.535 110 0],[824.359 290 2],[827.511 360 2],[864.07 290 1],[877.287 360 0],[877.39 450 0],[882.891 110 0],[884.128 180 0],[891.29 90 0],[892.356 140 0],[908.991 60 0],[913.995 70 0],[929.065 150 1],[929.075 110 1],[957.152 290 2],[960.599 360 2],[1007.629 150 1],[1076.836 110 0],[1078.204 140 0],[1087.298 110 0],[1089.173 230 0],[1125.319 450 0],[1125.488 570 0],[1312.341 570 0],[1315.076 450 0],[1671.8961 230 0],[1675.0561 300 0],[1676.3359 140 0],[2109.3039 300 0],[2116.375 360 0]}{ALLx9000x9000x1000x1200x1000x1000x0}{UVx7200x7200x1000x1000x1000x1000x0}{VISx9000x9000x550x1200x0x0x0}{IVx570x570x290x360x0x0x0}%
-\pgfspectra@elt@search{#1}{Si}{[7.861 1 4],[7.89 1 4],[8.081 2 4],[8.111 2 4],[8.518 10 4],[8.558 6 4],[9.045 4 4],[9.085 4 4],[9.644 15 4],[9.714 10 4],[9.821 2 4],[11.786 20 4],[11.897 20 4],[45.782 4 3],[45.816 3 3],[51.512 2 3],[51.635 3 3],[56.661 8 2],[64.576 2 3],[65.222 6 2],[65.333 8 2],[67.348 5 2],[74.994 5 3],[80.007 5 2],[80.51 10 1],[81.505 7 3],[81.813 8 3],[82.052 20 1],[82.341 9 2],[84.372 20 1],[84.577 40 1],[85.014 10 1],[88.34 5 2],[88.972 100 1],[89.2 200 1],[89.941 10 1],[90.174 20 1],[91.301 10 1],[91.385 20 1],[92.981 20 1],[93.909 7 2],[96.795 9 2],[98.987 100 1],[99.268 200 1],[99.352 10 2],[99.479 13 2],[99.739 16 2],[100.537 7 2],[102.07 25 1],[102.369 50 1],[103.116 7 2],[103.392 8 2],[103.705 7 2],[105.705 30 1],[105.75 15 1],[106.663 8 3],[108.322 6 2],[110.837 14 2],[110.997 16 2],[111.323 18 2],[112.249 8 3],[112.744 20 1],[112.791 40 1],[112.834 10 3],[114.055 6 2],[114.158 7 2],[114.228 6 2],[114.431 8 2],[114.496 6 2],[114.511 8 2],[114.518 7 2],[115.5 6 2],[115.596 6 2],[115.81 7 2],[116.026 6 2],[116.158 8 2],[117.437 5 2],[117.443 6 2],[117.8 8 2],[119.042 100 1],[119.328 200 1],[119.45 250 1],[119.739 100 1],[120.651 30 2],[120.653 30 2],[120.752 9 2],[121.046 10 2],[121.612 10 1],[122.391 20 1],[122.425 20 1],[122.497 10 1],[122.681 50 1],[122.689 20 1],[122.699 40 1],[122.76 100 1],[122.844 10 1],[122.862 25 1],[122.875 150 1],[122.939 200 1],[123.543 7 2],[123.592 10 1],[124.674 100 1],[124.843 150 1],[125.009 100 1],[125.043 150 1],[125.116 200 1],[125.528 10 0],[125.649 40 0],[125.88 50 0],[126.042 1000 1],[126.473 2000 1],[126.502 200 1],[128.035 6 2],[129.454 17 2],[129.673 14 2],[129.889 15 2],[129.896 18 2],[130.115 14 2],[130.332 16 2],[130.437 100 1],[130.559 50 1],[130.927 200 1],[130.946 20 1],[131.259 13 2],[134.147 8 2],[134.239 7 2],[134.339 6 2],[134.687 100 1],[134.854 100 1],[135.006 150 1],[135.052 20 1],[135.066 20 1],[135.264 100 1],[135.372 100 1],[136.16 8 2],[136.237 5 2],[136.347 7 2],[136.526 8 2],[136.705 7 2],[136.944 5 2],[137.303 5 2],[138.799 5 2],[139.376 15 3],[140.277 12 3],[140.907 10 1],[141.022 20 1],[141.697 10 1],[141.724 13 2],[143.369 6 2],[143.577 8 2],[143.617 7 2],[144.173 5 2],[144.72 6 2],[145.725 5 2],[147.465 15 1],[148.487 15 1],[148.502 90 1],[148.522 30 1],[148.551 100 1],[150.024 12 2],[150.119 10 2],[150.187 9 2],[150.606 6 2],[150.91 100 1],[151.207 50 1],[151.357 30 1],[151.691 60 1],[152.672 500 1],[153.345 1000 1],[156.245 10 1],[156.285 15 1],[156.377 10 1],[157.387 50 0],[157.482 50 0],[159.241 50 0],[159.455 150 0],[159.493 50 0],[159.795 30 0],[162.287 100 0],[162.571 30 0],[162.943 300 0],[162.992 200 0],[163.113 75 0],[163.398 50 0],[163.461 1 3],[165.335 30 0],[166.452 30 0],[166.637 50 0],[166.762 100 0],[166.852 100 0],[167.259 100 0],[167.332 7 2],[167.52 200 0],[168.268 30 0],[168.682 30 0],[168.929 50 0],[169.079 30 0],[169.329 50 0],[169.551 50 0],[169.62 200 0],[169.794 200 0],[170.042 50 0],[170.063 30 0],[170.286 30 0],[170.443 50 0],[171.083 10 1],[171.13 20 1],[172.253 6 3],[172.738 5 3],[174.388 30 0],[174.74 50 0],[175.311 30 0],[176.366 50 0],[176.503 40 0],[176.56 30 0],[176.606 30 0],[177.063 30 0],[177.092 100 0],[177.683 100 0],[178.323 50 0],[179.912 100 0],[180.8 150 1],[180.909 50 0],[181.407 500 0],[181.692 200 1],[181.745 10 1],[182.245 50 0],[183.651 200 0],[183.801 30 0],[184.115 100 0],[184.144 200 0],[184.255 9 2],[184.377 200 0],[184.551 300 0],[184.61 100 0],[184.747 400 0],[184.814 200 0],[184.874 100 0],[185.067 500 0],[185.179 30 0],[185.246 200 0],[185.315 50 0],[186.932 20 1],[187.023 15 1],[187.31 100 0],[187.484 500 0],[187.581 100 0],[188.185 200 0],[188.77 200 0],[189.325 200 0],[190.133 1000 0],[190.246 100 1],[190.466 50 0],[191.062 50 1],[194.167 50 1],[194.459 15 1],[194.933 10 1],[194.956 100 1],[195.497 100 0],[198.443 30 0],[199.185 50 0],[201.097 30 0],[205.483 50 0],[205.865 50 1],[205.901 50 1],[206.119 40 0],[206.552 30 0],[207.202 200 1],[207.27 200 1],[210.321 30 0],[211.463 30 0],[212.018 3 3],[212.412 100 0],[212.747 4 3],[213.399 10 1],[213.64 30 1],[213.656 50 1],[214.791 50 0],[217.689 5 2],[220.798 110 0],[221.089 115 0],[221.174 110 0],[221.667 120 0],[221.806 120 0],[221.891 50 0],[228.704 5 3],[229.103 35 0],[229.548 6 2],[229.687 10 2],[230.093 8 2],[230.306 55 0],[230.819 10 2],[232.856 2 3],[233.44 30 1],[233.461 30 1],[234.42 10 1],[234.954 10 1],[235.017 20 1],[235.309 20 1],[235.63 100 1],[235.718 30 1],[235.797 50 1],[236.02 10 1],[236.676 2 3],[236.697 30 1],[237.099 3 3],[237.426 20 1],[242.845 10 1],[243.515 300 0],[243.877 65 0],[244.336 65 0],[244.948 11 2],[245.212 70 0],[248.282 2 3],[248.32 6 2],[248.538 1 3],[250.69 425 0],[251.432 375 0],[251.6113 500 0],[251.751 7 3],[251.9202 350 0],[252.4108 425 0],[252.8509 450 0],[253.2381 110 0],[254.182 25 2],[254.609 10 2],[255.921 14 2],[256.3679 30 0],[256.8641 85 0],[257.7151 45 0],[263.1282 190 0],[264.079 11 2],[265.551 14 2],[267.219 1 3],[267.512 4 3],[267.525 4 3],[267.757 1 3],[268.221 10 1],[272.381 3 3],[281.711 9 2],[283.149 7 2],[283.962 5 2],[288.1579 1000 0],[288.751 10 1],[289.513 3 3],[290.428 300 1],[290.447 2 3],[290.569 500 1],[295.915 5 2],[297.0355 55 0],[297.152 1 3],[298.052 5 2],[298.7645 150 0],[300.6739 50 0],[301.309 5 2],[302.0004 75 0],[302.155 20 1],[303 100 1],[303.473 6 2],[303.729 8 2],[304.093 9 2],[304.157 20 1],[304.219 30 1],[304.369 100 1],[304.385 10 1],[304.393 7 2],[304.508 5 2],[304.577 10 1],[304.83 50 1],[305.318 150 1],[306.824 7 2],[308.624 25 2],[308.646 6 2],[309.342 20 2],[309.365 5 2],[309.683 16 2],[312.627 6 2],[314.737 7 2],[314.956 7 3],[316.161 8 2],[316.571 9 3],[318.513 16 2],[318.602 13 2],[318.897 150 1],[319.225 50 1],[319.309 150 1],[319.421 50 1],[319.469 50 1],[319.541 100 1],[319.65 14 2],[319.951 200 1],[320.249 20 1],[320.387 100 1],[321.003 200 1],[321.055 15 2],[321.466 75 1],[321.625 7 2],[321.799 15 1],[322.044 10 1],[322.301 20 1],[323.05 12 2],[323.395 14 2],[324.162 15 2],[324.419 1 3],[325.34 7 2],[325.374 5 2],[325.48 7 2],[325.866 12 2],[327.046 6 2],[327.626 10 2],[327.926 7 2],[333.314 300 1],[333.982 500 1],[348.691 15 2],[352.594 9 2],[356.967 8 2],[359.047 20 2],[362.254 8 2],[363.945 5 2],[364.512 6 2],[368.14 7 2],[368.215 5 2],[376.244 8 3],[377.315 6 3],[379.141 20 2],[379.611 25 2],[380.654 30 2],[384.246 7 2],[385.366 100 1],[385.602 500 1],[386.26 200 1],[390.5523 300 0],[392.447 20 2],[394.749 6 2],[395.574 10 1],[396.384 6 2],[397.746 10 1],[398.124 5 2],[399.177 15 1],[399.801 10 1],[403.139 1 3],[403.806 2 3],[407.545 20 1],[407.678 15 1],[408.885 10 3],[410.186 5 2],[410.242 8 2],[410.2936 70 0],[411.55 5 2],[411.61 9 3],[412.807 300 1],[413.089 500 1],[418.335 10 1],[419.072 100 1],[419.813 50 1],[421.241 7 3],[431.41 3 3],[432.818 5 3],[433.85 9 2],[434.14 8 2],[437.763 8 2],[440.373 2 3],[440.59 6 2],[440.672 8 2],[441.165 1 3],[449.405 6 2],[455.262 30 2],[455.4 8 2],[456.782 25 2],[457.476 20 2],[461.127 1 3],[461.966 7 2],[462.142 100 1],[462.172 150 1],[462.862 3 3],[463.124 9 3],[463.828 7 2],[465.432 10 3],[465.692 3 3],[466.587 8 2],[466.714 1 3],[467.33 2 3],[468.302 9 2],[468.38 7 2],[471.665 16 2],[473.052 7 2],[478.2991 50 0],[479.2212 35 0],[479.2324 80 0],[480.043 8 2],[481.333 15 2],[481.972 16 2],[482.897 18 2],[488.32 15 1],[490.699 20 1],[493.28 20 1],[494.745 1 3],[494.7607 30 0],[495.011 3 3],[500.6061 40 0],[504.103 1000 1],[505.598 1000 1],[509.142 10 2],[511.376 7 2],[511.412 8 2],[518.19 100 1],[518.525 100 1],[519.286 200 1],[519.726 5 2],[520.241 500 1],[529.519 30 1],[530.497 2 3],[530.949 1 3],[540.534 100 1],[541.724 15 1],[542.892 15 1],[543.289 15 1],[543.862 100 1],[544.726 20 1],[545.146 6 2],[545.449 15 1],[545.645 100 1],[546.643 500 1],[546.687 500 1],[546.921 100 1],[547.305 7 2],[549.323 40 0],[549.645 200 1],[551.7535 35 0],[554.074 100 1],[557.666 150 1],[562.2221 30 0],[563.297 100 1],[563.948 200 1],[564.5611 90 0],[566.066 150 1],[566.5554 80 0],[566.956 1000 1],[568.144 30 1],[568.4484 120 0],[568.881 300 1],[569.0425 100 0],[570.1105 90 0],[570.137 200 1],[570.46 7 2],[570.637 100 1],[570.8397 160 0],[571.629 8 2],[573.973 20 2],[574.7667 45 0],[575.3625 45 0],[575.422 45 0],[576.2977 45 0],[577.2145 70 0],[578.0384 70 0],[578.573 30 1],[579.3071 90 0],[579.49 30 1],[579.7859 100 0],[580.047 150 1],[580.674 200 1],[582.78 30 1],[584.613 50 1],[586.748 10 1],[586.84 300 1],[587.3764 40 0],[589.879 10 2],[591.522 150 1],[594.8545 200 0],[595.756 500 1],[597.893 500 1],[606.745 10 1],[608.006 20 1],[608.667 10 1],[612.5021 90 0],[613.1574 85 0],[613.185 90 0],[614.2487 100 0],[614.5015 100 0],[615.5134 160 0],[623.732 160 0],[623.8287 40 0],[624.3813 125 0],[624.4468 125 0],[625.4188 180 0],[631.446 7 2],[633.1954 45 0],[634.71 1000 1],[637.136 1000 1],[652.436 6 2],[652.6609 45 0],[652.7199 45 0],[655.5462 45 0],[666.052 50 1],[666.5 15 1],[666.756 5 3],[667.188 100 1],[669.938 20 1],[670.121 7 3],[671.704 50 1],[672.1853 100 0],[674.164 30 0],[675.028 20 1],[681.845 30 1],[682.982 50 1],[683.156 6 2],[684.8568 30 0],[685.165 7 2],[697.6523 80 0],[699.836 3 3],[700.3567 180 0],[700.5883 180 0],[701.728 30 0],[701.7646 90 0],[703.4903 250 0],[704.794 6 3],[706.841 4 3],[716.469 70 0],[716.5545 200 0],[718.489 70 0],[719.358 65 0],[719.39 30 0],[722.6206 100 0],[723.5326 100 0],[723.582 60 0],[725.0625 180 0],[727.5294 160 0],[728.281 40 0],[728.9173 400 0],[729.026 55 0],[737.3 35 0],[740.5774 375 0],[740.9082 200 0],[741.535 40 0],[741.5946 275 0],[742.3497 425 0],[742.46 85 0],[746.189 5 2],[746.262 8 2],[746.632 9 2],[761.236 12 2],[763.05 2 3],[765.456 4 3],[767.875 4 3],[768.0267 100 0],[771.879 5 3],[772.382 6 3],[772.564 2 3],[773.047 1 3],[774.271 40 0],[775.291 1 3],[780.0008 30 0],[784.88 400 1],[784.972 500 1],[784.9967 30 0],[791.8386 90 0],[793.2349 120 0],[794.4001 140 0],[797.0306 35 0],[803.5619 35 0],[809.3241 70 0],[810.286 9 2],[810.345 11 2],[819.043 7 2],[819.116 6 2],[819.168 8 2],[823.0642 35 0],[824.061 1 3],[826.257 9 2],[826.564 5 2],[826.932 8 2],[827.138 5 2],[827.194 6 2],[844.3982 40 0],[850.1547 40 0],[850.2221 60 0],[853.6165 40 0],[855.678 120 0],[864.8462 50 0],[872.8011 40 0],[874.2451 75 0],[875.2009 100 0],[879.0389 35 0],[895.725 2 3],[901.816 1 3],[941.272 100 1],[941.3506 100 0],[1037.1269 30 0],[1058.5141 120 0],[1060.3431 120 0],[1066.0975 120 0],[1069.4251 30 0],[1072.7408 30 0],[1074.9384 60 0],[1078.455 30 0],[1078.6856 80 0],[1082.7091 140 0],[1084.3854 60 0],[1086.879 30 0],[1086.9541 130 0],[1088.2802 30 0],[1088.5336 30 0],[1097.9308 80 0],[1098.2061 30 0],[1101.7965 80 0],[1118.76 13 0],[1128.984 12 0],[1161.109 12 0],[1198.419 370 0],[1199.157 220 0],[1203.151 440 0],[1210.353 150 0],[1227.068 120 0],[1317.69 11 0],[1588.839 190 0],[1596.004 40 0],[1606.003 95 0],[1609.48 20 0],[1616.371 60 0],[1621.568 11 0],[1638.155 16 0],[1668.077 29 0],[1732.7289 28 0],[1872.29 26 0],[1938.5939 15 0],[1943.2971 48 0],[1949.3381 13 0],[1972.25 110 0],[1992.8881 31 0],[2091.7131 12 0],[2135.424 21 0],[2206.2711 12 0]}{ALLx2000x1000x2000x30x15x20x0}{UVx2000x1000x2000x30x15x20x0}{VISx1000x425x1000x30x10x0x0}{IVx500x440x500x11x2x0x0}%
+\pgfspectra@elt@search{#1}{Si}{[11.786 20 4],[11.897 20 4],[45.782 4 3],[45.816 3 3],[51.512 2 3],[51.635 3 3],[56.661 8 2],[64.576 2 3],[65.222 6 2],[65.333 8 2],[67.348 5 2],[74.994 5 3],[80.007 5 2],[80.51 10 1],[81.505 7 3],[81.813 8 3],[82.052 20 1],[82.341 9 2],[84.372 20 1],[84.577 40 1],[85.014 10 1],[88.34 5 2],[88.972 100 1],[89.2 200 1],[89.941 10 1],[90.174 20 1],[91.301 10 1],[91.385 20 1],[92.981 20 1],[93.909 7 2],[96.795 9 2],[98.987 100 1],[99.268 200 1],[99.352 10 2],[99.479 13 2],[99.739 16 2],[100.537 7 2],[102.07 25 1],[102.369 50 1],[103.116 7 2],[103.392 8 2],[103.705 7 2],[105.705 30 1],[105.75 15 1],[106.663 8 3],[108.322 6 2],[110.837 14 2],[110.997 16 2],[111.323 18 2],[112.249 8 3],[112.744 20 1],[112.791 40 1],[112.834 10 3],[114.055 6 2],[114.158 7 2],[114.228 6 2],[114.431 8 2],[114.496 6 2],[114.511 8 2],[114.518 7 2],[115.5 6 2],[115.596 6 2],[115.81 7 2],[116.026 6 2],[116.158 8 2],[117.437 5 2],[117.443 6 2],[117.8 8 2],[119.042 100 1],[119.328 200 1],[119.45 250 1],[119.739 100 1],[120.651 30 2],[120.653 30 2],[120.752 9 2],[121.046 10 2],[121.612 10 1],[122.391 20 1],[122.425 20 1],[122.497 10 1],[122.681 50 1],[122.689 20 1],[122.699 40 1],[122.76 100 1],[122.844 10 1],[122.862 25 1],[122.875 150 1],[122.939 200 1],[123.543 7 2],[123.592 10 1],[124.674 100 1],[124.843 150 1],[125.009 100 1],[125.043 150 1],[125.116 200 1],[125.528 10 0],[125.649 40 0],[125.88 50 0],[126.042 1000 1],[126.473 2000 1],[126.502 200 1],[128.035 6 2],[129.454 17 2],[129.673 14 2],[129.889 15 2],[129.896 18 2],[130.115 14 2],[130.332 16 2],[130.437 100 1],[130.559 50 1],[130.927 200 1],[130.946 20 1],[131.259 13 2],[134.147 8 2],[134.239 7 2],[134.339 6 2],[134.687 100 1],[134.854 100 1],[135.006 150 1],[135.052 20 1],[135.066 20 1],[135.264 100 1],[135.372 100 1],[136.16 8 2],[136.237 5 2],[136.347 7 2],[136.526 8 2],[136.705 7 2],[136.944 5 2],[137.303 5 2],[138.799 5 2],[139.376 15 3],[140.277 12 3],[140.907 10 1],[141.022 20 1],[141.697 10 1],[141.724 13 2],[143.369 6 2],[143.577 8 2],[143.617 7 2],[144.173 5 2],[144.72 6 2],[145.725 5 2],[147.465 15 1],[148.487 15 1],[148.502 90 1],[148.522 30 1],[148.551 100 1],[150.024 12 2],[150.119 10 2],[150.187 9 2],[150.606 6 2],[150.91 100 1],[151.207 50 1],[151.357 30 1],[151.691 60 1],[152.672 500 1],[153.345 1000 1],[156.245 10 1],[156.285 15 1],[156.377 10 1],[157.387 50 0],[157.482 50 0],[159.241 50 0],[159.455 150 0],[159.493 50 0],[159.795 30 0],[162.287 100 0],[162.571 30 0],[162.943 300 0],[162.992 200 0],[163.113 75 0],[163.398 50 0],[163.461 1 3],[165.335 30 0],[166.452 30 0],[166.637 50 0],[166.762 100 0],[166.852 100 0],[167.259 100 0],[167.332 7 2],[167.52 200 0],[168.268 30 0],[168.682 30 0],[168.929 50 0],[169.079 30 0],[169.329 50 0],[169.551 50 0],[169.62 200 0],[169.794 200 0],[170.042 50 0],[170.063 30 0],[170.286 30 0],[170.443 50 0],[171.083 10 1],[171.13 20 1],[172.253 6 3],[172.738 5 3],[174.388 30 0],[174.74 50 0],[175.311 30 0],[176.366 50 0],[176.503 40 0],[176.56 30 0],[176.606 30 0],[177.063 30 0],[177.092 100 0],[177.683 100 0],[178.323 50 0],[179.912 100 0],[180.8 150 1],[180.909 50 0],[181.407 500 0],[181.692 200 1],[181.745 10 1],[182.245 50 0],[183.651 200 0],[183.801 30 0],[184.115 100 0],[184.144 200 0],[184.255 9 2],[184.377 200 0],[184.551 300 0],[184.61 100 0],[184.747 400 0],[184.814 200 0],[184.874 100 0],[185.067 500 0],[185.179 30 0],[185.246 200 0],[185.315 50 0],[186.932 20 1],[187.023 15 1],[187.31 100 0],[187.484 500 0],[187.581 100 0],[188.185 200 0],[188.77 200 0],[189.325 200 0],[190.133 1000 0],[190.246 100 1],[190.466 50 0],[191.062 50 1],[194.167 50 1],[194.459 15 1],[194.933 10 1],[194.956 100 1],[195.497 100 0],[198.443 30 0],[199.185 50 0],[201.097 30 0],[205.483 50 0],[205.865 50 1],[205.901 50 1],[206.119 40 0],[206.552 30 0],[207.202 200 1],[207.27 200 1],[210.321 30 0],[211.463 30 0],[212.018 3 3],[212.412 100 0],[212.747 4 3],[213.399 10 1],[213.64 30 1],[213.656 50 1],[214.791 50 0],[217.689 5 2],[220.798 110 0],[221.089 115 0],[221.174 110 0],[221.667 120 0],[221.806 120 0],[221.891 50 0],[228.704 5 3],[229.103 35 0],[229.548 6 2],[229.687 10 2],[230.093 8 2],[230.306 55 0],[230.819 10 2],[232.856 2 3],[233.44 30 1],[233.461 30 1],[234.42 10 1],[234.954 10 1],[235.017 20 1],[235.309 20 1],[235.63 100 1],[235.718 30 1],[235.797 50 1],[236.02 10 1],[236.676 2 3],[236.697 30 1],[237.099 3 3],[237.426 20 1],[242.845 10 1],[243.515 300 0],[243.877 65 0],[244.336 65 0],[244.948 11 2],[245.212 70 0],[248.282 2 3],[248.32 6 2],[248.538 1 3],[250.69 425 0],[251.432 375 0],[251.6113 500 0],[251.751 7 3],[251.9202 350 0],[252.4108 425 0],[252.8509 450 0],[253.2381 110 0],[254.182 25 2],[254.609 10 2],[255.921 14 2],[256.3679 30 0],[256.8641 85 0],[257.7151 45 0],[263.1282 190 0],[264.079 11 2],[265.551 14 2],[267.219 1 3],[267.512 4 3],[267.525 4 3],[267.757 1 3],[268.221 10 1],[272.381 3 3],[281.711 9 2],[283.149 7 2],[283.962 5 2],[288.1579 1000 0],[288.751 10 1],[289.513 3 3],[290.428 300 1],[290.447 2 3],[290.569 500 1],[295.915 5 2],[297.0355 55 0],[297.152 1 3],[298.052 5 2],[298.7645 150 0],[300.6739 50 0],[301.309 5 2],[302.0004 75 0],[302.155 20 1],[303 100 1],[303.473 6 2],[303.729 8 2],[304.093 9 2],[304.157 20 1],[304.219 30 1],[304.369 100 1],[304.385 10 1],[304.393 7 2],[304.508 5 2],[304.577 10 1],[304.83 50 1],[305.318 150 1],[306.824 7 2],[308.624 25 2],[308.646 6 2],[309.342 20 2],[309.365 5 2],[309.683 16 2],[312.627 6 2],[314.737 7 2],[314.956 7 3],[316.161 8 2],[316.571 9 3],[318.513 16 2],[318.602 13 2],[318.897 150 1],[319.225 50 1],[319.309 150 1],[319.421 50 1],[319.469 50 1],[319.541 100 1],[319.65 14 2],[319.951 200 1],[320.249 20 1],[320.387 100 1],[321.003 200 1],[321.055 15 2],[321.466 75 1],[321.625 7 2],[321.799 15 1],[322.044 10 1],[322.301 20 1],[323.05 12 2],[323.395 14 2],[324.162 15 2],[324.419 1 3],[325.34 7 2],[325.374 5 2],[325.48 7 2],[325.866 12 2],[327.046 6 2],[327.626 10 2],[327.926 7 2],[333.314 300 1],[333.982 500 1],[348.691 15 2],[352.594 9 2],[356.967 8 2],[359.047 20 2],[362.254 8 2],[363.945 5 2],[364.512 6 2],[368.14 7 2],[368.215 5 2],[376.244 8 3],[377.315 6 3],[379.141 20 2],[379.611 25 2],[380.654 30 2],[384.246 7 2],[385.366 100 1],[385.602 500 1],[386.26 200 1],[390.5523 300 0],[392.447 20 2],[394.749 6 2],[395.574 10 1],[396.384 6 2],[397.746 10 1],[398.124 5 2],[399.177 15 1],[399.801 10 1],[403.139 1 3],[403.806 2 3],[407.545 20 1],[407.678 15 1],[408.885 10 3],[410.186 5 2],[410.242 8 2],[410.2936 70 0],[411.55 5 2],[411.61 9 3],[412.807 300 1],[413.089 500 1],[418.335 10 1],[419.072 100 1],[419.813 50 1],[421.241 7 3],[431.41 3 3],[432.818 5 3],[433.85 9 2],[434.14 8 2],[437.763 8 2],[440.373 2 3],[440.59 6 2],[440.672 8 2],[441.165 1 3],[449.405 6 2],[455.262 30 2],[455.4 8 2],[456.782 25 2],[457.476 20 2],[461.127 1 3],[461.966 7 2],[462.142 100 1],[462.172 150 1],[462.862 3 3],[463.124 9 3],[463.828 7 2],[465.432 10 3],[465.692 3 3],[466.587 8 2],[466.714 1 3],[467.33 2 3],[468.302 9 2],[468.38 7 2],[471.665 16 2],[473.052 7 2],[478.2991 50 0],[479.2212 35 0],[479.2324 80 0],[480.043 8 2],[481.333 15 2],[481.972 16 2],[482.897 18 2],[488.32 15 1],[490.699 20 1],[493.28 20 1],[494.745 1 3],[494.7607 30 0],[495.011 3 3],[500.6061 40 0],[504.103 1000 1],[505.598 1000 1],[509.142 10 2],[511.376 7 2],[511.412 8 2],[518.19 100 1],[518.525 100 1],[519.286 200 1],[519.726 5 2],[520.241 500 1],[529.519 30 1],[530.497 2 3],[530.949 1 3],[540.534 100 1],[541.724 15 1],[542.892 15 1],[543.289 15 1],[543.862 100 1],[544.726 20 1],[545.146 6 2],[545.449 15 1],[545.645 100 1],[546.643 500 1],[546.687 500 1],[546.921 100 1],[547.305 7 2],[549.323 40 0],[549.645 200 1],[551.7535 35 0],[554.074 100 1],[557.666 150 1],[562.2221 30 0],[563.297 100 1],[563.948 200 1],[564.5611 90 0],[566.066 150 1],[566.5554 80 0],[566.956 1000 1],[568.144 30 1],[568.4484 120 0],[568.881 300 1],[569.0425 100 0],[570.1105 90 0],[570.137 200 1],[570.46 7 2],[570.637 100 1],[570.8397 160 0],[571.629 8 2],[573.973 20 2],[574.7667 45 0],[575.3625 45 0],[575.422 45 0],[576.2977 45 0],[577.2145 70 0],[578.0384 70 0],[578.573 30 1],[579.3071 90 0],[579.49 30 1],[579.7859 100 0],[580.047 150 1],[580.674 200 1],[582.78 30 1],[584.613 50 1],[586.748 10 1],[586.84 300 1],[587.3764 40 0],[589.879 10 2],[591.522 150 1],[594.8545 200 0],[595.756 500 1],[597.893 500 1],[606.745 10 1],[608.006 20 1],[608.667 10 1],[612.5021 90 0],[613.1574 85 0],[613.185 90 0],[614.2487 100 0],[614.5015 100 0],[615.5134 160 0],[623.732 160 0],[623.8287 40 0],[624.3813 125 0],[624.4468 125 0],[625.4188 180 0],[631.446 7 2],[633.1954 45 0],[634.71 1000 1],[637.136 1000 1],[652.436 6 2],[652.6609 45 0],[652.7199 45 0],[655.5462 45 0],[666.052 50 1],[666.5 15 1],[666.756 5 3],[667.188 100 1],[669.938 20 1],[670.121 7 3],[671.704 50 1],[672.1853 100 0],[674.164 30 0],[675.028 20 1],[681.845 30 1],[682.982 50 1],[683.156 6 2],[684.8568 30 0],[685.165 7 2],[697.6523 80 0],[699.836 3 3],[700.3567 180 0],[700.5883 180 0],[701.728 30 0],[701.7646 90 0],[703.4903 250 0],[704.794 6 3],[706.841 4 3],[716.469 70 0],[716.5545 200 0],[718.489 70 0],[719.358 65 0],[719.39 30 0],[722.6206 100 0],[723.5326 100 0],[723.582 60 0],[725.0625 180 0],[727.5294 160 0],[728.281 40 0],[728.9173 400 0],[729.026 55 0],[737.3 35 0],[740.5774 375 0],[740.9082 200 0],[741.535 40 0],[741.5946 275 0],[742.3497 425 0],[742.46 85 0],[746.189 5 2],[746.262 8 2],[746.632 9 2],[761.236 12 2],[763.05 2 3],[765.456 4 3],[767.875 4 3],[768.0267 100 0],[771.879 5 3],[772.382 6 3],[772.564 2 3],[773.047 1 3],[774.271 40 0],[775.291 1 3],[780.0008 30 0],[784.88 400 1],[784.972 500 1],[784.9967 30 0],[791.8386 90 0],[793.2349 120 0],[794.4001 140 0],[797.0306 35 0],[803.5619 35 0],[809.3241 70 0],[810.286 9 2],[810.345 11 2],[819.043 7 2],[819.116 6 2],[819.168 8 2],[823.0642 35 0],[824.061 1 3],[826.257 9 2],[826.564 5 2],[826.932 8 2],[827.138 5 2],[827.194 6 2],[844.3982 40 0],[850.1547 40 0],[850.2221 60 0],[853.6165 40 0],[855.678 120 0],[864.8462 50 0],[872.8011 40 0],[874.2451 75 0],[875.2009 100 0],[879.0389 35 0],[895.725 2 3],[901.816 1 3],[941.272 100 1],[941.3506 100 0],[1037.1269 30 0],[1058.5141 120 0],[1060.3431 120 0],[1066.0975 120 0],[1069.4251 30 0],[1072.7408 30 0],[1074.9384 60 0],[1078.455 30 0],[1078.6856 80 0],[1082.7091 140 0],[1084.3854 60 0],[1086.879 30 0],[1086.9541 130 0],[1088.2802 30 0],[1088.5336 30 0],[1097.9308 80 0],[1098.2061 30 0],[1101.7965 80 0],[1118.76 13 0],[1128.984 12 0],[1161.109 12 0],[1198.419 370 0],[1199.157 220 0],[1203.151 440 0],[1210.353 150 0],[1227.068 120 0],[1317.69 11 0],[1588.839 190 0],[1596.004 40 0],[1606.003 95 0],[1609.48 20 0],[1616.371 60 0],[1621.568 11 0],[1638.155 16 0],[1668.077 29 0],[1732.7289 28 0],[1872.29 26 0],[1938.5939 15 0],[1943.2971 48 0],[1949.3381 13 0],[1972.25 110 0],[1992.8881 31 0],[2091.7131 12 0],[2135.424 21 0],[2206.2711 12 0]}{ALLx2000x1000x2000x30x15x20x0}{UVx2000x1000x2000x30x15x20x0}{VISx1000x425x1000x30x10x0x0}{IVx500x440x500x11x2x0x0}%[7.861 1 4],[7.89 1 4],[8.081 2 4],[8.111 2 4],[8.518 10 4],[8.558 6 4],[9.045 4 4],[9.085 4 4],[9.644 15 4],[9.714 10 4],[9.821 2 4],
\pgfspectra@elt@search{#1}{P}{[25.559 80 4],[25.567 50 4],[28.2301 90 3],[30.4996 90 3],[31.058 110 4],[31.134 150 4],[32.847 300 4],[32.878 250 4],[34.723 150 4],[34.82 200 4],[35.9293 120 3],[35.9899 150 3],[36.1514 120 3],[36.1629 150 3],[37.1299 120 3],[37.1504 150 3],[37.2001 200 3],[37.856 110 4],[38.8318 500 3],[38.95 250 4],[39.07 300 4],[41.003 150 4],[41.4604 120 3],[41.4999 200 3],[41.5805 250 3],[44.4245 250 3],[44.5158 300 3],[47.1146 90 2],[47.56 375 4],[48.4278 90 2],[49.818 120 2],[53.463 110 4],[53.499 80 4],[54.257 520 4],[54.492 600 4],[56.8038 250 3],[56.9853 200 2],[58.1831 200 2],[62.9008 350 3],[62.9914 400 3],[63.1779 500 3],[64.8482 350 3],[67.39 450 4],[75.651 300 3],[77.6353 300 3],[81.024 10 1],[82.3179 650 3],[82.473 700 3],[82.7932 800 3],[84.4646 200 2],[84.5038 150 2],[84.5664 250 2],[84.7019 250 3],[84.7669 300 2],[84.8016 200 2],[84.8465 120 2],[84.8639 150 2],[84.9799 350 3],[85.0392 200 3],[85.2686 250 2],[85.5624 350 2],[85.9406 200 2],[85.9652 500 2],[85.9729 250 2],[86.544 10 1],[86.545 450 4],[87.139 600 4],[87.7476 700 3],[91.3971 300 2],[91.712 300 2],[91.8665 350 2],[92.1849 250 2],[95.0655 1000 3],[99.762 250 4],[99.7999 200 2],[100.038 150 4],[100.3598 250 2],[102.5563 570 3],[102.8096 500 3],[103.0517 570 3],[103.3111 500 3],[103.5517 500 3],[111.798 900 4],[111.8551 570 3],[112.801 700 4],[120.6422 200 3],[124.982 20 1],[130.187 20 1],[130.447 20 1],[130.468 15 1],[130.548 35 1],[130.987 25 1],[131.07 60 1],[133.4808 500 2],[133.5705 200 3],[134.4327 650 2],[134.4845 300 2],[136.6695 500 3],[137.2674 400 3],[137.349 20 0],[137.706 20 0],[137.7282 350 3],[137.793 20 0],[137.94 25 0],[137.962 150 4],[138.0463 250 2],[138.1089 150 2],[138.147 25 0],[138.505 250 4],[143.013 50 0],[144.783 375 4],[145.289 30 1],[148.4507 500 3],[148.7788 400 3],[148.9098 300 3],[149.136 50 0],[149.299 40 0],[150.2228 350 2],[150.4663 250 2],[153.251 80 1],[153.59 120 1],[153.639 80 1],[154.229 120 1],[154.843 60 0],[161.05 450 4],[161.8632 150 2],[161.8907 200 2],[167.107 70 0],[167.168 180 0],[167.248 90 0],[167.461 230 0],[167.971 300 0],[168.599 120 0],[169.406 100 0],[170.641 60 0],[177.499 250 0],[178.287 200 0],[178.768 180 0],[184.719 100 0],[185.122 80 0],[185.891 150 0],[185.943 150 0],[186.2762 250 3],[186.2893 120 3],[186.358 200 3],[188.8523 650 3],[191.0183 200 3],[198.5682 120 3],[198.5851 150 3],[198.6114 200 3],[198.7022 150 3],[202.348 100 0],[203.347 150 0],[213.547 100 0],[213.618 200 0],[214.914 200 0],[215.294 100 0],[215.408 150 0],[218.029 200 4],[218.642 150 4],[242.44 375 4],[244.093 450 4],[244.124 200 4],[247.7823 200 3],[247.807 150 3],[247.8256 250 3],[248.419 100 1],[253.399 500 0],[253.561 700 0],[255.325 600 0],[255.49 500 0],[260.5506 250 3],[260.606 150 1],[261.1147 200 2],[262.618 100 1],[263.2713 300 2],[263.676 90 1],[264.4295 400 3],[268.0133 200 2],[272.4764 300 3],[272.877 400 3],[272.912 200 3],[273.9309 500 3],[273.9872 250 3],[274.0223 200 3],[289.5241 250 2],[296.1 300 4],[296.1242 200 3],[297.855 450 4],[317.509 700 4],[318.6186 250 2],[320.404 520 4],[321.9307 300 2],[323.3536 150 2],[323.3602 400 2],[330.892 150 1],[334.7736 650 3],[336.4467 570 3],[337.1122 400 3],[341.3543 200 3],[341.934 125 1],[342.5 100 1],[355.6546 200 2],[357.7526 200 2],[373.3393 200 3],[390.4812 200 2],[391.4314 250 2],[395.7641 300 2],[397.8307 350 2],[405.744 200 2],[405.9312 400 2],[408.0084 300 2],[408.318 150 4],[409.495 110 4],[417.848 100 1],[422.2195 500 2],[424.672 350 2],[424.9656 300 3],[428.86 200 1],[438.535 200 1],[442.071 400 1],[442.8171 200 2],[445.246 100 1],[446.3 150 1],[446.3668 200 2],[446.798 120 1],[447.526 200 1],[447.9776 250 2],[449.924 200 1],[453.081 120 1],[454.0288 250 3],[454.1112 250 3],[454.8056 150 3],[454.8449 200 3],[455.483 120 1],[455.807 120 1],[458.171 120 1],[458.804 500 1],[458.986 500 1],[460.208 600 1],[462.67 300 1],[465.831 300 1],[486.442 200 1],[492.72 150 1],[494.353 500 1],[495.439 300 1],[496.971 300 1],[515.672 110 4],[519.141 150 1],[523.5499 150 3],[525.352 300 1],[529.613 400 1],[531.607 250 1],[534.475 300 1],[537.82 250 1],[538.688 300 1],[540.972 200 1],[542.591 400 1],[545.074 400 1],[545.831 100 0],[546.12 125 1],[547.775 200 0],[548.355 200 1],[549.973 200 1],[550.719 200 1],[554.114 200 1],[558.327 200 1],[558.834 250 1],[572.771 100 1],[598.9774 150 3],[602.418 500 1],[603.404 400 1],[604.312 500 1],[605.55 250 1],[605.786 100 1],[608.3409 150 2],[608.782 350 1],[609.768 150 0],[614.2605 150 3],[616.559 350 1],[619.901 180 0],[623.229 100 1],[636.727 200 1],[640.9204 150 2],[643.532 250 1],[643.631 130 1],[645.999 600 1],[648.444 150 2],[648.6381 150 2],[650.346 600 1],[650.797 600 1],[671.328 150 1],[671.3939 150 3],[671.5906 120 3],[671.742 120 0],[699.269 150 2],[716.545 100 0],[717.512 150 0],[717.666 120 0],[744.3657 200 3],[750.576 100 0],[784.563 250 1],[811.3528 150 2],[827.807 120 0],[836.784 150 0],[853.146 100 0],[861.385 100 0],[863.762 150 0],[874.154 250 0],[887.217 50 0],[952.578 30 0],[959.354 25 0],[973.474 20 0],[975.073 25 0],[979.679 50 0],[1008.422 25 0],[1052.945 6 0],[1058.152 8 0]}{ALLx1000x700x600x650x1000x900x0}{UVx1000x700x150x650x1000x900x0}{VISx600x200x600x500x300x150x0}{IVx250x250x250x150x0x0x0}%
\pgfspectra@elt@search{#1}{S}{[43.74 5 4],[43.82 5 4],[43.96 5 4],[51.93 20 3],[52.01 20 3],[52.08 40 3],[52.2 20 3],[52.25 20 3],[55.12 20 3],[65.25 40 3],[65.3 40 3],[65.36 70 3],[65.4 40 3],[65.56 70 3],[65.59 20 3],[65.73 110 3],[65.83 40 4],[65.98 70 4],[66.09 40 3],[66.14 160 3],[66.32 110 4],[66.37 40 3],[66.48 40 3],[66.61 70 3],[67.62 5 4],[67.73 5 4],[67.81 20 4],[68.03 40 4],[68.09 110 4],[68.16 40 4],[68.62 5 4],[68.69 5 4],[68.98 5 4],[69.17 5 4],[69.35 20 4],[72.95 70 2],[73.242 110 2],[73.52 70 2],[73.85 70 2],[74.49 110 3],[74.84 110 3],[75.02 110 3],[75.38 110 3],[78.65 285 4],[78.9 70 2],[79.67 70 2],[79.83 40 3],[80.05 70 3],[80.4 70 3],[80.97 70 3],[81.6 110 3],[82.49 70 2],[83.63 70 2],[84.92 160 4],[85.22 110 4],[85.48 220 4],[85.79 110 4],[86.05 110 4],[88.36 20 4],[88.45 20 4],[88.58 5 4],[90.09 20 4],[90.28 5 4],[90.59 20 4],[90.69 40 1],[91.05 40 1],[91.27 40 1],[93.74 40 1],[93.77 40 1],[99.6 20 1],[100.05 20 1],[101.44 20 1],[101.95 20 1],[106.27 160 3],[107.3 160 3],[107.35 70 3],[107.71 285 2],[109.66 20 1],[110.23 40 1],[110.84 20 3],[111.09 20 3],[113.1 20 1],[113.16 20 1],[119.4 70 2],[120.1 70 2],[123.41 40 1],[125.05 40 1],[125.38 110 1],[125.95 110 1],[127.0782 275 0],[127.7216 250 0],[129.5653 280 0],[130.2337 275 0],[130.2863 235 0],[130.311 235 0],[130.343 245 0],[130.5883 260 0],[131.0194 265 0],[131.6542 355 0],[131.6618 290 0],[132.3515 375 0],[132.6643 355 0],[138.1552 775 0],[138.551 710 0],[138.8435 960 0],[138.9154 640 0],[139.2588 775 0],[139.6112 1000 0],[140.9337 300 0],[142.503 510 0],[143.328 425 0],[143.6968 300 0],[144.8229 300 0],[147.2972 425 0],[147.3995 550 0],[147.438 300 0],[148.1665 355 0],[148.3039 485 0],[148.3233 300 0],[148.5622 330 0],[148.715 390 0],[162.4 20 3],[162.92 20 3],[166.6688 680 0],[168.753 640 0],[180.7311 710 0],[182.0343 680 0],[182.6245 640 0],[190.0286 710 0],[191.4698 550 0],[238.7 20 3],[239.89 40 3],[246.05 110 2],[248.96 110 2],[249.62 160 2],[249.91 160 2],[250.82 220 2],[262.91 20 1],[263.69 70 2],[266.54 220 2],[267 40 1],[268.05 70 2],[269.18 110 2],[270.28 110 2],[271.89 220 2],[272.14 110 2],[272.68 220 2],[273.11 220 2],[274.1 110 2],[275.69 285 2],[277.52 110 2],[278.55 160 2],[279.74 70 2],[284.77 40 1],[285.6 70 2],[286.35 110 2],[290.43 160 2],[296.48 70 2],[298.6 160 2],[309.75 110 3],[311.77 40 3],[323.42 70 2],[332.49 70 2],[349.73 110 2],[363.2 160 2],[366.2 70 2],[370.94 110 2],[371.78 160 2],[383.83 160 2],[386.76 285 0],[390.2 285 0],[392.86 160 2],[393.33 360 1],[412.08 450 0],[414.23 280 1],[414.51 360 1],[415.31 450 1],[416.27 450 1],[425.36 360 2],[428.5 110 2],[433.27 70 2],[469.41 450 0],[469.54 285 0],[469.62 160 0],[471.62 280 1],[481.55 450 1],[492.41 360 1],[492.53 450 1],[499.35 285 0],[542.86 360 1],[543.28 650 1],[545.38 1000 1],[547.36 1000 1],[550.97 1000 1],[556.49 280 1],[560.61 1000 1],[564 450 1],[564.03 450 1],[564.7 280 1],[565.99 650 1],[566.47 450 1],[570.61 160 0],[581.92 450 1],[605.27 450 0],[628.64 280 1],[628.71 450 1],[630.55 450 1],[631.27 450 1],[638.49 280 1],[639.73 280 1],[639.8 280 1],[641.37 360 1],[674.36 160 0],[674.88 285 0],[675.72 450 0],[757.9 450 0],[762.98 450 0],[768.61 285 0],[769.67 450 0],[792.4 1000 0],[792.88 160 0],[793.03 285 0],[793.17 450 0],[796.74 450 0],[796.74 450 1],[831.47 450 0],[831.47 450 1],[858.56 450 0],[868.05 285 0],[869.47 450 0],[887.45 360 0],[888.25 110 0],[888.42 220 0],[903.59 160 0],[921.29 450 0],[922.81 450 0],[923.75 450 0],[941.35 285 0],[942.19 285 0],[943.71 285 0],[964.99 650 0],[967.23 450 0],[968.08 450 0],[969.37 450 0],[969.73 285 0],[973.97 285 0],[974.19 110 0],[993.23 285 0],[994.98 285 0],[995.89 285 0],[1045.55 285 0],[1045.68 70 0],[1045.95 285 0]}{ALLx1000x1000x1000x360x160x285x0}{UVx1000x1000x110x285x160x285x0}{VISx1000x450x1000x360x0x0x0}{IVx1000x1000x450x0x0x0x0}%
\pgfspectra@elt@search{#1}{Cl}{[28.733 30 4],[31.962 30 3],[33.184 20 3],[37.378 30 4],[39.015 40 4],[39.243 50 4],[40.627 10 2],[41.137 40 2],[41.181 40 2],[43.783 40 3],[46.486 40 3],[48.617 80 3],[53.473 80 3],[53.567 70 3],[53.615 60 3],[53.653 30 4],[53.701 40 4],[53.746 30 4],[53.761 90 3],[53.803 50 4],[53.812 60 3],[53.868 40 4],[54.223 80 4],[54.23 60 4],[54.287 40 4],[54.511 100 4],[54.633 60 4],[54.763 100 4],[54.922 50 3],[55.002 40 3],[55.202 70 3],[55.33 60 3],[55.462 70 3],[55.623 60 2],[55.661 70 2],[55.712 70 2],[55.9305 35 1],[56.153 70 2],[56.168 70 2],[56.174 70 2],[57.1904 40 1],[57.4406 80 1],[58.624 50 1],[60.15 50 3],[60.459 50 3],[60.635 50 2],[60.89 40 3],[61.207 40 3],[61.8057 70 1],[61.9982 60 1],[62.0298 80 1],[62.128 40 2],[62.6735 70 1],[63.319 40 4],[63.532 40 4],[63.5881 80 1],[63.6626 100 1],[65.0894 100 1],[65.37 40 3],[65.9811 100 1],[66.1841 130 1],[66.3074 200 1],[67.038 30 2],[67.313 30 2],[68.192 40 4],[68.2053 150 1],[68.317 40 4],[68.7656 150 1],[68.893 40 4],[69.3594 150 1],[72.5271 200 1],[72.8951 250 1],[74.521 40 3],[77.7562 200 1],[78.758 500 1],[78.874 500 1],[79.3342 500 1],[83.143 40 3],[83.484 50 3],[83.497 50 3],[83.9297 600 1],[83.9599 800 1],[84.081 40 3],[84.093 60 3],[84.141 700 1],[85.1691 500 1],[88.313 40 4],[88.8026 200 1],[89.3549 200 1],[89.434 40 4],[89.491 10 4],[93.628 10 2],[96.1499 200 1],[96.992 3 0],[97.321 50 3],[97.756 60 3],[97.79 40 3],[97.8284 4 0],[98.495 70 3],[98.575 40 3],[99.8372 2.5 0],[99.8432 2.5 0],[100.2346 7.5 0],[100.528 50 2],[100.878 60 2],[101.3664 15 0],[101.502 70 2],[102.5553 9 0],[106.3831 600 1],[106.7945 300 1],[107.1036 900 1],[107.1767 600 1],[107.523 500 1],[107.908 500 1],[108.4667 20 0],[108.5171 20 0],[108.5304 25 0],[108.806 40 0],[109.0271 35 0],[109.0982 25 0],[109.2437 25 0],[109.4769 40 0],[109.5148 35 0],[109.5662 35 0],[109.5797 40 0],[109.681 25 0],[109.7369 30 0],[109.8068 20 0],[109.9523 20 0],[110.7528 50 0],[113.9214 80 1],[116.7148 80 0],[117.9293 300 0],[118.8774 120 0],[120.1353 90 0],[133.5726 300 0],[134.724 1000 0],[135.1657 500 0],[136.3447 1200 0],[137.3116 250 0],[137.9528 2000 0],[138.9693 2500 0],[138.9957 2000 0],[139.6527 1200 0],[144.147 50 1],[152.8569 50 1],[153.721 30 3],[153.93 20 3],[154.2942 50 1],[154.519 20 3],[154.915 20 3],[155.8144 50 1],[156.505 50 1],[162.286 20 3],[182.25 60 2],[182.84 50 2],[185.7488 50 1],[190.161 50 2],[198.361 50 2],[199.737 45 1],[200.684 40 2],[203.2116 45 1],[208.8583 35 1],[209.1458 35 1],[225.307 70 2],[226.895 50 2],[227.834 50 2],[228.393 70 2],[232.35 60 2],[233.645 50 2],[234.064 60 2],[235.967 60 2],[237.037 60 2],[241.642 70 2],[242.779 17 1],[243.407 36 1],[244.714 60 2],[244.858 60 2],[248.691 50 2],[249.853 34 1],[250.274 47 1],[253.248 50 2],[254.696 26 1],[254.988 50 1],[256.484 46 1],[258.067 60 2],[260.331 32 1],[260.359 50 2],[263.267 50 2],[263.318 50 2],[265.872 95 1],[266.554 60 2],[267.695 75 1],[268.804 120 1],[270.136 40 3],[271.037 70 2],[272.403 50 3],[275.123 50 3],[277.064 40 3],[278.247 70 3],[283.54 40 3],[291.205 41 1],[296.556 60 2],[299.665 95 1],[300.606 50 1],[305.796 95 1],[306.313 50 3],[307.132 130 1],[307.668 60 3],[309.219 140 1],[310.446 60 2],[312.372 120 1],[313.934 80 2],[316.787 20 3],[319.145 90 2],[328.98 70 2],[331.543 190 1],[332.057 70 2],[332.906 80 2],[332.91 120 1],[334.042 90 2],[335.335 250 1],[339.289 80 2],[339.345 80 2],[353.003 90 2],[356.068 80 2],[360.21 90 2],[361.285 80 2],[362.269 70 2],[365.695 70 2],[367.028 70 2],[368.205 70 2],[370.545 60 2],[370.734 60 2],[372.045 80 2],[372.654 2 0],[374.881 80 2],[374.996 120 1],[377.935 50 2],[378.117 100 1],[379.876 150 1],[380.518 190 1],[380.946 130 1],[382.02 170 1],[382.759 280 1],[383.335 450 1],[384.32 250 1],[384.537 310 1],[384.565 390 1],[384.58 150 1],[385.099 1000 1],[385.137 790 1],[385.165 120 1],[386.083 2500 1],[386.099 440 1],[386.137 100 1],[391.387 150 1],[391.663 110 1],[392.587 50 2],[394.482 2 0],[399.15 70 2],[401.85 60 2],[405.907 60 2],[410.423 50 2],[410.479 2 0],[410.683 50 2],[413.25 1000 1],[420.967 6.5 0],[422.642 5 0],[426.458 6 0],[436.327 10 0],[436.95 10 0],[437.091 40 2],[437.293 500 1],[437.99 10 0],[438.975 10 0],[439.04 9 0],[440.303 9 0],[443.849 10 0],[447.53 9 0],[448.991 150 1],[452.619 10 0],[460.098 8 0],[460.821 50 2],[462.3938 4 0],[465.404 5 0],[466.1208 8 0],[469.1523 4.5 0],[470.314 30 2],[472.1255 4 0],[474.0729 4.5 0],[476.865 430 1],[478.132 1300 1],[479.455 9900 1],[481.006 2900 1],[481.947 1600 1],[486.375 10 2],[489.677 8100 1],[490.478 4700 1],[491.773 2600 1],[497.164 1 2],[499.548 1000 1],[507.826 2600 1],[509.9789 3 0],[521.794 5600 1],[522.136 2300 1],[539.212 1500 1],[542.323 9900 1],[542.351 1000 1],[544.337 1900 1],[544.421 1000 1],[545.702 560 1],[553.2162 4 0],[579.6305 5 0],[579.9914 4.5 0],[585.6742 3 0],[594.858 10 0],[601.9812 5 0],[608.261 3.5 0],[609.469 190 1],[611.443 16 0],[614.0245 20 0],[619.4757 16 0],[639.866 16 0],[643.4833 15 0],[653.143 15 0],[666.167 140 1],[667.843 15 0],[668.602 130 1],[671.341 120 1],[684.029 15 0],[693.2903 30 0],[698.1886 30 0],[708.6814 60 0],[725.662 750 0],[741.411 500 0],[746.237 55 0],[748.947 55 0],[749.2118 70 0],[754.7072 1100 0],[767.242 230 0],[770.2828 45 0],[771.7581 700 0],[774.497 1000 0],[776.916 220 0],[777.109 65 0],[782.136 220 0],[783.075 170 0],[787.822 300 0],[789.334 22 0],[789.931 230 0],[791.508 180 0],[792.4645 300 0],[793.389 210 0],[793.5012 170 0],[795.252 65 0],[797.472 150 0],[797.697 130 0],[798.06 60 0],[799.785 290 0],[801.561 220 0],[802.333 110 0],[805.107 40 0],[808.451 170 0],[808.556 220 0],[808.667 300 0],[808.773 130 0],[809.467 25 0],[819.442 250 0],[819.913 220 0],[820.021 220 0],[820.378 80 0],[821.204 1800 0],[822.045 300 0],[822.174 2000 0],[833.331 1800 0],[836.071 100 1],[836.184 56 1],[837.594 9990 0],[838.267 18 1],[839.202 10 1],[840.6199 40 0],[842.825 1500 0],[846.734 220 0],[855.044 220 0],[857.524 2000 0],[857.802 75 0],[858.597 7500 0],[862.854 45 0],[864.171 30 0],[868.626 350 0],[891.292 220 0],[894.806 300 0],[903.8982 200 0],[904.543 250 0],[906.9656 100 0],[907.317 200 0],[912.115 750 0],[919.1731 300 0],[919.7596 50 0],[928.886 400 0],[939.3862 150 0],[945.21 350 0],[948.6964 50 0],[958.4801 100 0],[959.222 350 0],[963.2509 25 0],[970.2439 100 0],[974.4426 25 0],[980.7057 20 0],[987.597 40 0],[1039.2549 33.1 0],[1043.283 3.8 1],[1050.662 1 1],[1050.912 1.4 1],[1051.246 1.9 1],[1051.417 2.5 1],[1080.147 0.9 1],[1088.542 0.5 1],[1095.571 0.1 1],[1112.305 30 0],[1139.262 23.1 0],[1140.969 26.9 0],[1143.633 100 0],[1172.056 18 0],[1186.676 19.5 0],[1202.17 17.2 0],[1324.38 35 0],[1329.6 31 0],[1334.68 55 0],[1382.17 52.5 0],[1436.97 14.8 0],[1493.17 29.4 0],[1510.8 26.9 0],[1546.51 38.1 0],[1546.76 16.9 0],[1552.03 109.4 0],[1573.01 148.7 0],[1581.84 19.3 0],[1586.97 278 0],[1588.33 27.7 0],[1592.89 34.2 0],[1596 73.5 0],[1597.05 28.3 0],[1607.76 12.9 0],[1619.85 25.9 0],[1937.0301 22.7 0],[1975.5301 71.7 0],[1976.6801 18.5 0],[2019.94 22.7 0],[2037.01 8.5 0],[2447 10 0]}{ALLx9990x9990x9900x90x90x100x0}{UVx2500x2500x900x90x90x100x0}{VISx9900x1100x9900x70x0x0x0}{IVx9990x9990x100x0x0x0x0}%
@@ -66,7 +66,7 @@
\pgfspectra@elt@search{#1}{As}{[60.07 25 4],[61.6 40 4],[71.55 120 4],[73.48 150 4],[73.72 60 4],[76.124 165 1],[80.283 165 1],[84.99 185 2],[86.63 185 2],[87.17 510 2],[88.9 325 2],[92.75 325 2],[93.72 325 2],[95.36 325 2],[96.38 325 2],[98.77 250 4],[102.196 340 1],[102.95 250 4],[105.16 40 4],[105.66 60 4],[108.235 340 1],[113.94 500 1],[114.931 615 1],[117.22 120 2],[118.151 555 1],[118.987 555 1],[119.638 615 1],[119.656 615 1],[120.744 340 1],[120.93 185 2],[121.117 800 1],[121.81 800 1],[122.315 340 1],[124.131 760 1],[124.308 965 1],[124.567 870 1],[125.858 800 1],[126.377 965 1],[126.634 800 1],[126.759 800 1],[128.099 715 1],[128.754 715 1],[130.57 715 1],[130.774 340 1],[133.315 760 1],[134.155 965 1],[135.593 760 1],[136.977 965 1],[137.365 800 1],[137.507 1000 1],[137.578 760 1],[139.464 800 1],[140.031 800 1],[144.859 500 1],[155.888 500 1],[157.099 500 1],[159.36 100 0],[166.055 500 1],[175.86 100 0],[180.615 170 0],[186.034 340 1],[189.042 1000 0],[191.294 500 1],[193.759 800 0],[197.262 585 0],[199.035 170 0],[199.113 100 0],[199.543 100 0],[200.334 230 0],[200.919 100 0],[201.332 100 0],[211.299 100 0],[214.408 100 0],[216.552 135 0],[225.31 150 3],[226.32 200 3],[228.812 350 0],[230.1 200 3],[234.984 350 0],[237.077 100 0],[238.118 135 0],[241.75 250 3],[244.61 150 3],[245.4 250 3],[245.653 170 0],[246.14 200 3],[260.2 340 1],[278.022 170 0],[283.0359 300 1],[283.1164 300 1],[286.044 100 0],[288.4406 300 1],[292.63 80 2],[295.9572 615 1],[298.2 185 2],[300.3819 300 1],[310.88 150 3],[311.6516 300 1],[384.26 340 1],[392.26 325 2],[403.72 185 2],[419.0082 715 1],[419.74 615 1],[424.2982 615 1],[431.5657 500 1],[432.3867 500 1],[433.664 500 1],[435.2145 500 1],[435.2864 425 1],[437.117 375 1],[442.7106 615 1],[443.1562 615 1],[445.8469 715 1],[446.1075 340 1],[446.6348 715 1],[447.446 500 1],[449.423 800 1],[450.7659 850 1],[453.974 615 1],[454.3483 715 1],[460.2427 615 1],[462.9787 340 1],[470.7586 340 1],[473.067 340 1],[488.8557 340 1],[506.898 100 0],[510.558 340 1],[510.755 500 1],[512.134 100 0],[514.163 100 0],[523.138 425 1],[533.123 500 1],[540.813 100 0],[545.132 135 0],[549.7727 340 1],[555.809 425 1],[565.132 425 1],[611.007 425 1],[617.027 500 1],[651.174 300 1],[709.227 300 1],[710.272 300 1],[799.053 340 1],[817.451 300 1],[842.891 100 0],[856.471 100 0],[865.414 100 0],[882.173 135 0],[886.966 100 0],[926.728 135 0],[930.061 200 0],[959.795 230 0],[962.67 290 0],[983.376 230 0],[988.605 100 0],[990.055 140 0],[991.571 170 0],[992.305 290 0],[1001.063 100 0],[1002.404 290 0],[1045.309 100 0],[1057.502 100 0],[1061.407 170 0]}{ALLx1000x1000x1000x510x250x250x0}{UVx1000x1000x1000x510x250x250x0}{VISx850x135x850x325x0x0x0}{IVx340x290x340x0x0x0x0}%
\pgfspectra@elt@search{#1}{Se}{[59.6 285 4],[60.1 285 4],[60.87 220 4],[61.3 360 4],[61.43 285 4],[63.6 285 3],[65.27 360 3],[65.42 285 3],[67.01 450 3],[67.19 285 3],[70.92 220 2],[70.94 220 2],[72.06 220 2],[72.28 220 3],[72.43 360 2],[72.64 285 2],[73.46 285 3],[73.72 220 2],[74.19 220 2],[74.64 450 3],[75.9 285 3],[75.91 450 4],[77.65 285 3],[77.73 285 2],[78.58 285 4],[79.08 220 2],[80.38 285 3],[80.43 285 4],[80.87 360 4],[81.48 220 4],[82.07 220 4],[82.85 285 1],[83.03 360 4],[83.27 360 1],[83.95 450 4],[84.3 360 2],[84.58 360 4],[87.92 220 2],[90.66 285 1],[91.29 360 1],[95.37 285 2],[95.44 220 2],[95.47 220 2],[95.96 360 3],[97.41 160 2],[97.48 360 2],[99.67 450 3],[101.34 360 1],[101.4 360 1],[103.36 450 1],[104.96 450 1],[105.74 360 1],[107.98 285 2],[109.47 360 4],[109.78 285 1],[109.91 360 2],[111.92 450 2],[114.19 360 1],[115.1 220 4],[115.6 220 1],[115.69 285 1],[116.85 285 1],[119.23 450 1],[120.57 220 1],[122.76 450 4],[123.49 220 1],[129.1 285 1],[130.72 220 3],[130.89 285 1],[131.44 285 3],[140.54 100 0],[140.64 100 0],[140.66 100 0],[143.53 120 0],[143.58 120 0],[144.48 100 0],[144.68 100 0],[144.7 100 0],[144.92 150 0],[145.63 120 0],[150.09 150 0],[153.04 250 0],[153.13 150 0],[153.18 200 0],[154.71 120 0],[156.03 120 0],[157.53 150 0],[157.76 150 0],[157.79 150 0],[157.95 150 0],[158 200 0],[158.75 150 0],[159.32 150 0],[160.65 250 0],[161.07 100 0],[161.13 100 0],[161.74 200 0],[162.12 150 0],[162.27 100 0],[162.62 120 0],[164.34 150 0],[167.12 250 0],[167.53 250 0],[169.07 250 0],[179.33 250 0],[179.53 300 0],[185.52 300 0],[185.88 250 0],[189.86 400 0],[191.38 350 0],[191.92 300 0],[196.09 500 0],[199.51 150 0],[203.98 500 0],[205.75 285 2],[207.48 500 0],[209 220 3],[213.66 285 3],[216.42 500 0],[216.52 160 3],[216.66 160 3],[233.28 150 0],[241.35 600 0],[254.8 300 0],[266.55 360 3],[272.43 285 3],[276.72 285 2],[277.38 220 2],[295.16 160 3],[303.87 220 1],[304.13 220 1],[337.98 285 2],[338.72 450 2],[341.39 450 2],[342.84 285 2],[345.78 450 2],[354.36 360 2],[357.02 285 2],[363.76 450 2],[371.17 360 2],[373.87 450 2],[374.3 285 2],[380.09 450 2],[404.67 360 2],[407.02 285 1],[408.32 220 2],[416.91 450 2],[417.53 360 1],[418.09 450 1],[432.87 120 0],[433.03 100 0],[438.29 285 1],[444.6 285 1],[444.92 220 1],[446.76 285 1],[463.79 220 2],[473.08 500 0],[473.9 400 0],[474.22 300 0],[484.06 285 1],[484.5 360 1],[522.75 450 1],[530.54 360 1],[536.55 100 0],[536.99 120 0],[537.41 110 0],[552.24 285 1],[556.69 285 1],[586.63 285 1],[605.6 450 1],[630.38 285 2],[632.56 200 0],[644.42 360 1],[649.05 285 1],[653.5 285 1],[683.13 150 0],[699.069 120 0],[699.1792 100 0],[701.0809 200 0],[701.3875 150 0],[706.2065 300 0],[757.51 200 0],[758.34 250 0],[759.22 150 0],[760.68 120 0],[800.1 300 0],[803.64 200 0],[806.09 120 0],[806.53 120 0],[808.11 120 0],[809.32 150 0],[809.47 150 0],[814.93 180 0],[815.2 150 0],[815.77 200 0],[816.31 180 0],[818.29 150 0],[818.5 100 0],[819.46 120 0],[844.047 150 0],[845.038 150 0],[874.233 150 0],[891.886 300 0],[896.969 100 0],[900.197 200 0],[903.861 200 0],[908.314 80 0],[908.879 120 0],[914.083 80 0],[918.188 60 0],[927.112 60 0],[943.25 100 0],[982.558 60 0],[1021.725 200 0],[1030.745 377 0],[1032.726 900 0],[1038.636 640 0],[1065.03 124 0],[1193.456 125 0],[1194.687 275 0],[1194.792 100 0],[1195.227 105 0],[1195.264 170 0],[1196.604 100 0],[1197.293 205 0],[1197.307 115 0],[1481.793 315 0],[1491.747 410 0],[1515.144 500 0],[1546.906 115 0],[1547.1 320 0],[1552.097 265 0],[1561.84 395 0],[1562.038 115 0],[1665.9439 360 0],[1681.3779 505 0],[1681.776 165 0],[1686.6539 205 0],[1697.2711 115 0],[2137.424 235 0],[2144.2561 680 0],[2147.348 415 0],[2171.6359 270 0],[2173.06 240 0],[2313.366 105 0],[2338.885 150 0],[2362.817 110 0],[2414.818 265 0],[2415.923 170 0],[2420.4439 185 0],[2438.599 375 0],[2441.367 160 0],[2447.117 225 0],[2501.751 255 0],[2512.743 510 0]}{ALLx900x900x450x450x450x450x0}{UVx600x600x450x450x450x450x0}{VISx500x500x450x450x0x0x0}{IVx900x900x0x0x0x0x0}%
\pgfspectra@elt@search{#1}{Br}{[37.973 70 3],[40.037 70 3],[46.837 60 4],[48.211 80 4],[53.197 90 4],[54.543 100 3],[54.79 100 4],[54.977 70 4],[55.976 100 3],[56.919 100 3],[57.659 100 3],[58.51 100 3],[58.671 100 3],[59.751 100 3],[60.009 100 3],[60.127 100 3],[60.703 100 3],[61.11 45 2],[61.785 100 3],[61.987 100 3],[62.04 30 2],[62.103 80 4],[63.014 100 3],[63.222 80 4],[64.223 100 3],[64.544 70 4],[65.264 40 4],[65.754 80 4],[66.153 100 3],[66.554 50 2],[67.719 50 2],[67.78 30 2],[67.962 80 4],[68.351 100 3],[68.768 45 2],[69.02 40 2],[69.699 35 2],[69.772 100 3],[71.168 30 1],[71.539 100 3],[72.7 30 2],[73.1 100 3],[73.64 30 2],[76.963 25 2],[80.012 100 3],[81.295 70 4],[81.366 100 3],[81.548 25 1],[81.779 25 2],[85.081 100 4],[85.527 15 4],[85.619 35 1],[88.923 100 1],[89.664 50 1],[90.599 50 1],[92.256 30 1],[94.897 100 1],[94.9 35 2],[96.04 40 2],[98.49 45 2],[98.493 50 1],[101.21 50 1],[101.554 100 1],[103.702 50 1],[104.16 60 4],[104.9 100 1],[106.476 45 1],[106.915 100 4],[107.187 50 1],[108.054 50 4],[110.15 25 0],[111.213 90 4],[113.459 30 0],[113.629 25 0],[114.356 100 4],[117.723 25 0],[117.89 40 0],[118.928 100 0],[118.938 25 0],[118.95 100 0],[119.837 50 0],[120.976 80 0],[121.073 100 0],[121.601 75 0],[122.113 100 0],[122.187 90 0],[122.324 100 0],[122.441 120 0],[122.69 120 0],[122.805 75 0],[123.243 750 0],[124.39 120 0],[124.959 80 0],[125.166 150 0],[125.58 100 0],[125.92 150 0],[126.166 120 0],[126.62 120 0],[127.482 90 3],[127.948 100 0],[128.626 100 0],[130.991 300 0],[131.35 25 2],[131.674 300 0],[131.737 100 0],[131.77 200 0],[138.46 1200 0],[140.29 25 2],[142.975 15 4],[144.26 40 4],[144.99 300 0],[147.035 15 4],[148.845 5000 0],[153.174 3000 0],[154.065 2500 0],[157.484 3000 0],[157.639 2000 0],[158.231 2500 0],[163.34 7500 0],[170.351 100 3],[213.379 100 3],[214.502 100 3],[225.721 100 3],[227.273 100 3],[228.517 35 1],[228.76 35 1],[229.344 40 2],[230.74 100 3],[231.329 30 2],[231.73 50 1],[233.693 40 1],[238.645 35 1],[238.67 50 1],[238.869 30 1],[238.896 45 1],[238.969 50 1],[239.221 35 1],[239.242 40 1],[240.816 100 3],[241.158 100 3],[246.239 30 2],[248.26 30 2],[248.85 30 1],[249.114 70 3],[249.522 30 1],[249.925 35 2],[252.17 45 1],[252.949 35 2],[254.148 40 1],[255.109 35 2],[255.692 40 1],[257.083 35 2],[257.317 30 2],[258.119 100 3],[258.499 40 2],[258.914 50 2],[259.448 30 2],[259.598 40 2],[260.62 45 2],[260.815 35 2],[261.313 50 2],[261.626 35 2],[262.652 50 2],[262.923 35 2],[263.96 35 2],[266.14 60 3],[267.153 35 2],[269.017 35 1],[271.377 40 1],[273.583 35 2],[274.652 35 1],[277.05 30 2],[278.528 30 2],[280.416 30 2],[280.755 30 1],[282.087 70 3],[284.288 100 3],[289.34 40 1],[290.771 110 3],[291.718 40 1],[292.696 40 2],[293.622 30 2],[296.721 40 1],[296.9 35 2],[297.226 50 1],[298.186 30 1],[298.587 30 1],[298.653 30 1],[299.404 40 2],[301.648 30 1],[302.076 50 2],[303.363 30 2],[303.645 35 2],[304.118 50 3],[307.442 50 2],[309.194 35 2],[311.729 35 2],[314.781 30 2],[317.408 40 2],[332.108 30 2],[333.307 45 2],[334.964 50 2],[338.056 50 3],[338.525 30 2],[342.382 35 1],[344.736 45 2],[348.758 40 2],[350.647 30 2],[351.736 45 2],[354.016 50 2],[355.108 30 2],[356.243 50 2],[360.071 45 2],[360.68 30 1],[369.353 25 2],[371.43 35 1],[381.565 120 0],[382.026 45 2],[383.469 35 1],[387.121 30 1],[389.163 40 1],[390.124 30 1],[390.395 20 2],[391.42 30 1],[391.438 50 1],[391.951 35 1],[392.409 40 1],[392.955 30 1],[393.969 35 1],[395.061 35 1],[398.038 50 1],[399.236 150 0],[402.404 30 1],[413.566 30 1],[414.02 30 1],[417.963 40 1],[419.345 30 1],[422.389 100 1],[423.689 30 1],[429.139 30 1],[436.514 200 0],[436.56 100 1],[442.514 150 0],[444.174 1000 0],[447.261 1000 0],[447.772 2000 0],[449.042 100 0],[450.655 35 2],[451.344 300 0],[451.974 20 2],[452.559 1500 0],[452.96 30 1],[454.292 50 1],[457.574 300 0],[460.136 30 1],[461.458 250 0],[462.27 35 1],[464.202 30 1],[465.198 30 1],[467.87 50 1],[469.317 40 1],[470.485 50 1],[471.976 35 1],[472.036 40 1],[472.82 30 1],[473.541 30 1],[474.264 40 1],[475.228 250 0],[476.6 35 1],[477.94 40 1],[478.031 400 0],[478.519 160 0],[478.55 50 1],[480.233 30 1],[481.67 50 1],[481.846 30 1],[484.481 35 1],[484.875 35 1],[492.112 40 1],[492.879 40 1],[493.066 45 1],[494.551 30 1],[497.976 400 0],[503.874 30 1],[505.464 30 1],[516.438 40 1],[517.587 15 2],[518.001 30 1],[518.235 50 1],[519.39 30 1],[523.823 50 1],[527.268 30 1],[530.41 35 1],[533.057 40 1],[533.205 50 1],[539.548 120 0],[542.278 40 1],[542.499 35 1],[543.507 30 1],[544.68 10 2],[546.622 120 0],[547.847 35 1],[548.879 30 1],[549.506 30 1],[550.669 50 1],[558.994 35 1],[571.871 30 1],[583.078 30 1],[585.208 180 0],[594.048 160 0],[612.214 240 0],[614.86 4000 0],[616.174 30 1],[617.739 200 0],[633.548 150 0],[635.073 6000 0],[635.294 40 1],[641.032 250 0],[648.356 180 0],[651.462 100 0],[654.457 2000 0],[654.809 150 0],[655.98 5000 0],[657.131 100 0],[657.914 180 0],[658.217 2000 0],[662.047 150 0],[663.162 5000 0],[668.228 2000 0],[669.213 1000 0],[672.828 800 0],[676.006 200 0],[677.948 200 0],[678.674 220 0],[679.004 650 0],[679.148 160 0],[686.115 180 0],[700.519 1000 0],[719.28 10 2],[726.045 200 0],[734.851 1000 0],[751.296 4000 0],[759.161 160 0],[759.507 180 0],[761.641 200 0],[767.31 10 2],[780.302 3000 0],[782.723 120 0],[788.145 250 0],[788.157 250 0],[792.581 250 0],[793.868 3000 0],[794.794 300 0],[795.018 300 0],[797.844 800 0],[797.857 1000 0],[798.994 3000 0],[802.635 200 0],[802.654 250 0],[813.152 3000 0],[815.265 100 0],[815.375 1000 0],[815.4 2500 0],[824.686 500 0],[826.496 1500 0],[827.244 7500 0],[833.47 2000 0],[834.37 1000 0],[838.404 120 0],[844.655 4000 0],[847.745 400 0],[851.338 150 0],[855.773 100 0],[856.628 100 0],[863.866 2000 0],[869.853 400 0],[879.347 1000 0],[881.996 1500 0],[882.522 2500 0],[888.898 400 0],[889.762 3000 0],[893.24 600 0],[894.939 180 0],[896.4 900 0],[902.442 35 1],[916.606 3000 0],[917.363 1500 0],[917.816 2000 0],[926.542 4000 0],[932.086 1500 0],[943.404 30 1],[979.348 600 0],[989.64 1000 0],[1014.008 300 0],[1023.774 600 0],[1029.962 100 0],[1037.765 150 0],[1045.796 3000 0],[1074.214 100 0],[1075.592 300 0],[1321.717 170 0],[1435.457 180 0],[1488.87 125 0],[1673.1189 180 0],[1856.8311 120 0],[1973.3619 350 0],[2028.173 100 0],[2062.467 100 0],[2178.724 120 0],[2286.565 400 0],[2351.315 100 0],[2834.65 50 0],[3038.085 50 0],[3163.0131 60 0],[3269.39 12 0],[3418.1871 15 0],[3834.575 15 0],[3996.4359 12 0]}{ALLx7500x7500x100x50x110x100x0}{UVx7500x7500x100x50x110x100x0}{VISx6000x6000x100x45x0x0x0}{IVx7500x7500x35x0x0x0x0}%
-\pgfspectra@elt@search{#1}{Kr}{[46.735 30 2],[47.216 150 4],[48.439 100 4],[49.625 250 4],[50.077 120 4],[50.72 200 4],[54.086 30 2],[54.804 60 4],[56.564 30 2],[56.916 30 2],[57.198 30 2],[57.983 30 2],[58.514 30 2],[58.596 30 2],[59.37 30 2],[59.41 30 2],[59.641 30 2],[60.017 40 2],[60.367 30 2],[60.586 50 2],[60.647 35 2],[61.112 50 2],[61.672 35 2],[62.145 40 2],[62.28 45 2],[62.502 50 2],[62.576 30 2],[62.859 45 2],[63.004 50 2],[63.309 35 2],[63.787 120 4],[63.998 50 2],[64.641 60 2],[65.12 50 2],[65.972 50 2],[66.486 30 2],[67.234 40 2],[67.285 35 2],[67.657 35 2],[68.013 35 2],[68.368 35 2],[68.625 45 2],[68.798 45 2],[69.193 45 2],[69.561 50 2],[69.805 30 2],[70.836 50 2],[70.885 600 4],[71.4 50 2],[72.204 100 2],[72.94 60 1],[74.67 30 2],[76.118 200 1],[76.398 100 1],[76.62 60 1],[77.103 200 1],[77.369 60 1],[78.21 200 1],[78.372 100 1],[78.597 60 2],[80.576 7 3],[81.682 18 3],[81.815 60 1],[83.038 60 1],[83.766 50 2],[84.204 22 3],[84.406 100 1],[85.473 50 2],[86.258 60 2],[86.482 60 1],[86.887 60 1],[87.084 40 2],[87.608 50 2],[88.414 200 1],[88.63 1000 1],[89.101 400 1],[89.781 75 2],[91.139 200 1],[91.743 2000 1],[94.544 50 0],[94.654 50 0],[95.106 20 0],[95.34 50 0],[96.337 50 0],[96.497 2000 1],[98.729 50 2],[100.106 100 0],[100.355 100 0],[103.002 100 0],[115.874 30 2],[116.487 200 0],[123.584 650 0],[163.882 6 2],[191.409 6 2],[223.734 3 3],[229.126 6 3],[232.93 3 3],[233.675 4 3],[234.827 4 3],[235.85 3 3],[238.805 3 3],[239.394 40 2],[241.69 4 3],[242.804 3 3],[244.268 5 3],[245.17 4 3],[245.974 6 3],[246.477 100 1],[247.406 5 3],[249.248 60 1],[249.401 40 2],[251.7 4 3],[251.802 5 3],[251.938 6 3],[252.45 5 3],[254.6 5 3],[254.7 6 3],[255.808 4 3],[256.325 30 2],[258.69 3 3],[260.617 5 3],[260.95 10 3],[261.53 8 3],[262.111 7 3],[263.976 60 2],[268.032 30 2],[268.119 40 2],[271.24 80 1],[273.055 3 3],[274.818 8 3],[277.47 6 3],[282.96 3 3],[283.3 100 1],[283.608 3 3],[284.1 30 2],[285.116 30 2],[285.3 5 3],[285.93 3 3],[287.061 50 2],[289.218 100 2],[290.917 30 2],[295.256 50 2],[299.222 60 2],[302.23 50 2],[302.445 80 2],[304.693 50 2],[305.672 30 2],[306.313 60 2],[309.716 40 2],[311.225 60 2],[312.061 30 2],[312.439 100 2],[314.135 60 2],[314.201 3 3],[318.911 100 2],[319.121 80 2],[322.499 6 3],[323.952 40 2],[324.044 40 2],[324.569 300 2],[326.17 3 3],[326.481 150 2],[326.848 100 2],[327.165 30 2],[328.589 30 2],[330.475 30 2],[331.147 50 2],[332.575 200 2],[333.076 60 2],[334.248 50 2],[335.193 100 2],[337.496 40 2],[343.946 100 2],[347.465 70 2],[348.859 100 2],[350.742 200 2],[356.423 100 2],[360.788 100 1],[363.1889 200 1],[364.134 30 2],[365.3928 250 1],[366.5324 80 0],[366.901 150 1],[367.9559 100 0],[368.6182 80 1],[369.065 30 2],[371.802 300 1],[371.8595 200 1],[372.135 150 1],[374.1638 200 1],[374.48 150 1],[375.4245 80 1],[377.8089 500 1],[378.3095 500 1],[380.93 3 3],[386.058 5 3],[386.87 40 2],[387.544 150 1],[390.6177 150 1],[392.0081 200 1],[393.429 5 3],[399.484 100 1],[399.7793 100 1],[405.7037 300 1],[406.5128 300 1],[406.737 50 2],[408.8337 500 1],[409.8729 250 1],[410.9248 100 1],[413.133 40 2],[414.5122 250 1],[415.446 40 2],[425.058 150 1],[427.3969 1000 0],[428.2967 100 0],[429.2923 600 1],[430.049 200 1],[431.781 500 1],[431.8551 400 0],[431.9579 1000 0],[432.298 150 1],[435.1359 100 0],[435.5477 3000 1],[436.2641 500 0],[436.969 200 1],[437.6121 800 0],[438.654 300 1],[439.9965 200 0],[442.5189 100 0],[443.1685 500 1],[443.6812 600 1],[445.3917 600 0],[446.3689 800 0],[447.5014 800 1],[448.988 400 1],[450.2353 600 0],[452.314 400 1],[455.661 200 1],[457.7209 800 1],[458.2978 300 1],[459.28 150 1],[461.5292 500 1],[461.9166 1000 1],[463.3885 800 1],[465.8876 2000 1],[468.0406 500 1],[469.1301 100 1],[469.436 200 1],[473.9002 3000 1],[476.2435 300 1],[476.5744 1000 1],[481.176 300 1],[482.518 300 1],[483.2077 800 1],[484.6612 700 1],[485.72 150 1],[494.559 300 1],[501.645 20 2],[502.24 200 1],[508.652 250 1],[512.573 400 1],[520.832 500 1],[530.866 200 1],[533.341 500 1],[546.817 200 1],[550.143 10 2],[556.2224 500 0],[557.0288 2000 0],[558.0386 80 0],[564.9561 100 0],[568.189 400 1],[569.035 200 1],[583.2855 100 0],[587.0914 3000 0],[599.222 200 1],[599.3849 60 0],[603.717 10 2],[605.6125 60 0],[607.838 10 2],[631.022 10 2],[642.018 300 1],[642.1026 100 0],[645.6288 200 0],[657.007 150 1],[669.9228 60 0],[690.4678 100 0],[721.313 250 1],[722.4104 100 0],[728.7258 80 0],[728.978 400 1],[740.702 400 1],[742.5541 60 0],[743.578 200 1],[748.6862 100 0],[752.446 300 1],[758.7411 1000 0],[760.1544 2000 0],[764.116 150 1],[768.5244 1000 0],[769.4538 1200 0],[773.569 250 1],[774.6827 150 0],[785.4821 800 0],[791.3423 200 0],[792.8597 180 0],[793.322 200 1],[797.362 120 1],[798.2401 100 0],[805.9503 1500 0],[810.4364 4000 0],[811.2899 6000 0],[813.2967 60 0],[819.0054 3000 0],[820.272 200 1],[821.8365 80 0],[826.324 3000 0],[827.2353 100 0],[828.105 1500 0],[829.8107 5000 0],[841.243 100 0],[850.887 3000 0],[876.411 150 0],[877.6748 6000 0],[892.8692 2000 0],[923.848 500 1],[929.382 500 1],[932.099 200 1],[936.195 300 1],[936.2082 100 0],[940.282 200 1],[947.093 200 1],[957.752 500 1],[960.58 500 1],[961.961 400 1],[966.334 200 1],[971.16 200 1],[975.1758 2000 0],[980.314 500 1],[985.6314 500 0],[1022.146 1000 1],[1118.7108 100 0],[1125.7711 200 0],[1125.9126 150 0],[1145.7481 500 0],[1179.2425 150 0],[1181.9377 1500 0],[1199.7105 600 0],[1207.7224 160 0],[1286.1892 100 0],[1317.7412 1100 0],[1362.2415 1000 0],[1363.422 2400 0],[1365.8394 800 0],[1371.1036 200 0],[1373.8851 600 0],[1397.4027 150 0],[1404.5657 550 0],[1410.4298 140 0],[1440.222 180 0],[1442.6793 2000 0],[1451.784 100 0],[1473.4436 1600 0],[1476.2672 550 0],[1476.5472 450 0],[1496.1894 400 0],[1500.5307 120 0],[1520.9526 140 0],[1523.9615 1700 0],[1532.648 130 0],[1533.4958 1500 0],[1537.2037 700 0],[1547.4026 200 0],[1568.102 180 0],[1582.009 120 0],[1672.6514 200 0],[1678.5129 2000 0],[1685.3488 1000 0],[1689.0441 2400 0],[1689.6754 1600 0],[1693.5807 1800 0],[1709.8771 600 0],[1736.7605 700 0],[1740.4443 120 0],[1761.6854 150 0],[1784.2736 650 0],[1800.2229 700 0],[1816.7314 2600 0],[1839.9785 100 0],[1858.0896 150 0],[1869.6295 300 0],[1878.5461 170 0],[1879.7703 200 0],[2020.9879 140 0],[2042.3965 300 0],[2044.6971 140 0],[2116.5471 600 0],[2190.2514 1800 0],[2248.5775 120 0],[2334.0416 180 0],[2426.0506 120 0],[2429.2221 180 0],[2523.382 600 0],[2861.0551 180 0],[2865.5721 1000 0],[2876.9711 150 0],[2882.249 140 0],[2923.6689 300 0],[3066.3539 300 0],[3097.916 300 0],[3930.0602 500 0],[3948.652 1100 0],[3955.725 220 0],[3957.2602 100 0],[3958.8398 1400 0],[3958.9602 1100 0],[3995.4801 500 0],[3996.6602 300 0],[4030.6102 1300 0],[4068.516 250 0]}{ALLx6000x6000x3000x300x22x600x0}{UVx2000x650x2000x300x22x600x0}{VISx3000x3000x3000x50x5x0x0}{IVx6000x6000x1000x0x0x0x0}%
+\pgfspectra@elt@search{#1}{Kr}{[46.735 30 2],[47.216 150 4],[48.439 100 4],[49.625 250 4],[50.077 120 4],[50.72 200 4],[54.086 30 2],[54.804 60 4],[56.564 30 2],[56.916 30 2],[57.198 30 2],[57.983 30 2],[58.514 30 2],[58.596 30 2],[59.37 30 2],[59.41 30 2],[59.641 30 2],[60.017 40 2],[60.367 30 2],[60.586 50 2],[60.647 35 2],[61.112 50 2],[61.672 35 2],[62.145 40 2],[62.28 45 2],[62.502 50 2],[62.576 30 2],[62.859 45 2],[63.004 50 2],[63.309 35 2],[63.787 120 4],[63.998 50 2],[64.641 60 2],[65.12 50 2],[65.972 50 2],[66.486 30 2],[67.234 40 2],[67.285 35 2],[67.657 35 2],[68.013 35 2],[68.368 35 2],[68.625 45 2],[68.798 45 2],[69.193 45 2],[69.561 50 2],[69.805 30 2],[70.836 50 2],[70.885 600 4],[71.4 50 2],[72.204 100 2],[72.94 60 1],[74.67 30 2],[76.118 200 1],[76.398 100 1],[76.62 60 1],[77.103 200 1],[77.369 60 1],[78.21 200 1],[78.372 100 1],[78.597 60 2],[80.576 7 3],[81.682 18 3],[81.815 60 1],[83.038 60 1],[83.766 50 2],[84.204 22 3],[84.406 100 1],[85.473 50 2],[86.258 60 2],[86.482 60 1],[86.887 60 1],[87.084 40 2],[87.608 50 2],[88.414 200 1],[88.63 1000 1],[89.101 400 1],[89.781 75 2],[91.139 200 1],[91.743 2000 1],[94.544 50 0],[94.654 50 0],[95.106 20 0],[95.34 50 0],[96.337 50 0],[96.497 2000 1],[98.729 50 2],[100.106 100 0],[100.355 100 0],[103.002 100 0],[115.874 30 2],[116.487 200 0],[123.584 650 0],[163.882 6 2],[191.409 6 2],[223.734 3 3],[229.126 6 3],[232.93 3 3],[233.675 4 3],[234.827 4 3],[235.85 3 3],[238.805 3 3],[239.394 40 2],[241.69 4 3],[242.804 3 3],[244.268 5 3],[245.17 4 3],[245.974 6 3],[246.477 100 1],[247.406 5 3],[249.248 60 1],[249.401 40 2],[251.7 4 3],[251.802 5 3],[251.938 6 3],[252.45 5 3],[254.6 5 3],[254.7 6 3],[255.808 4 3],[256.325 30 2],[258.69 3 3],[260.617 5 3],[260.95 10 3],[261.53 8 3],[262.111 7 3],[263.976 60 2],[268.032 30 2],[268.119 40 2],[271.24 80 1],[273.055 3 3],[274.818 8 3],[277.47 6 3],[282.96 3 3],[283.3 100 1],[283.608 3 3],[284.1 30 2],[285.116 30 2],[285.3 5 3],[285.93 3 3],[287.061 50 2],[289.218 100 2],[290.917 30 2],[295.256 50 2],[299.222 60 2],[302.23 50 2],[302.445 80 2],[304.693 50 2],[305.672 30 2],[306.313 60 2],[309.716 40 2],[311.225 60 2],[312.061 30 2],[312.439 100 2],[314.135 60 2],[314.201 3 3],[318.911 100 2],[319.121 80 2],[322.499 6 3],[323.952 40 2],[324.044 40 2],[324.569 300 2],[326.17 3 3],[326.481 150 2],[326.848 100 2],[327.165 30 2],[328.589 30 2],[330.475 30 2],[331.147 50 2],[332.575 200 2],[333.076 60 2],[334.248 50 2],[335.193 100 2],[337.496 40 2],[343.946 100 2],[347.465 70 2],[348.859 100 2],[350.742 200 2],[356.423 100 2],[360.788 100 1],[363.1889 200 1],[364.134 30 2],[365.3928 250 1],[366.5324 80 0],[366.901 150 1],[367.9559 100 0],[368.6182 80 1],[369.065 30 2],[371.802 300 1],[371.8595 200 1],[372.135 150 1],[374.1638 200 1],[374.48 150 1],[375.4245 80 1],[377.8089 500 1],[378.3095 500 1],[380.93 3 3],[386.058 5 3],[386.87 40 2],[387.544 150 1],[390.6177 150 1],[392.0081 200 1],[393.429 5 3],[399.484 100 1],[399.7793 100 1],[405.7037 300 1],[406.5128 300 1],[406.737 50 2],[408.8337 500 1],[409.8729 250 1],[410.9248 100 1],[413.133 40 2],[414.5122 250 1],[415.446 40 2],[425.058 150 1],[427.3969 1000 0],[428.2967 100 0],[429.2923 600 1],[430.049 200 1],[431.781 500 1],[431.8551 400 0],[431.9579 1000 0],[432.298 150 1],[435.1359 100 0],[435.5477 3000 1],[436.2641 500 0],[436.969 200 1],[437.6121 800 0],[438.654 300 1],[439.9965 200 0],[442.5189 100 0],[443.1685 500 1],[443.6812 600 1],[445.3917 600 0],[446.3689 800 0],[447.5014 800 1],[448.988 400 1],[450.2353 600 0],[452.314 400 1],[455.661 200 1],[457.7209 800 1],[458.2978 300 1],[459.28 150 1],[461.5292 500 1],[461.9166 1000 1],[463.3885 800 1],[465.8876 2000 1],[468.0406 500 1],[469.1301 100 1],[469.436 200 1],[473.9002 3000 1],[476.2435 300 1],[476.5744 1000 1],[481.176 300 1],[482.518 300 1],[483.2077 800 1],[484.6612 700 1],[485.72 150 1],[494.559 300 1],[501.645 20 2],[502.24 200 1],[508.652 250 1],[512.573 400 1],[520.832 500 1],[530.866 200 1],[533.341 500 1],[546.817 200 1],[550.143 10 2],[556.2224 500 0],[557.0288 2000 0],[558.0386 80 0],[564.9561 100 0],[568.189 400 1],[569.035 200 1],[583.2855 100 0],[587.0914 3000 0],[599.222 200 1],[599.3849 60 0],[603.717 10 2],[605.6125 60 0],[607.838 10 2],[631.022 10 2],[642.018 300 1],[642.1026 100 0],[645.6288 200 0],[657.007 150 1],[669.9228 60 0],[690.4678 100 0],[721.313 250 1],[722.4104 100 0],[728.7258 80 0],[728.978 400 1],[740.702 400 1],[742.5541 60 0],[743.578 200 1],[748.6862 100 0],[752.446 300 1],[758.7411 1000 0],[760.1544 2000 0],[764.116 150 1],[768.5244 1000 0],[769.4538 1200 0],[773.569 250 1],[774.6827 150 0],[785.4821 800 0],[791.3423 200 0],[792.8597 180 0],[793.322 200 1],[797.362 120 1],[798.2401 100 0],[805.9503 1500 0],[810.4364 4000 0],[811.2899 6000 0],[813.2967 60 0],[819.0054 3000 0],[820.272 200 1],[821.8365 80 0],[826.324 3000 0],[827.2353 100 0],[828.105 1500 0],[829.8107 5000 0],[841.243 100 0],[850.887 3000 0],[876.411 150 0],[877.6748 6000 0],[892.8692 2000 0],[923.848 500 1],[929.382 500 1],[932.099 200 1],[936.195 300 1],[936.2082 100 0],[940.282 200 1],[947.093 200 1],[957.752 500 1],[960.58 500 1],[961.961 400 1],[966.334 200 1],[971.16 200 1],[975.1758 2000 0],[980.314 500 1],[985.6314 500 0],[1022.146 1000 1],[1118.7108 100 0],[1125.7711 200 0],[1125.9126 150 0],[1145.7481 500 0],[1179.2425 150 0],[1181.9377 1500 0],[1199.7105 600 0],[1207.7224 160 0],[1286.1892 100 0],[1317.7412 1100 0],[1362.2415 1000 0],[1363.422 2400 0],[1365.8394 800 0],[1371.1036 200 0],[1373.8851 600 0],[1397.4027 150 0],[1404.5657 550 0],[1410.4298 140 0],[1440.222 180 0],[1442.6793 2000 0],[1451.784 100 0],[1473.4436 1600 0],[1476.2672 550 0],[1476.5472 450 0],[1496.1894 400 0],[1500.5307 120 0],[1520.9526 140 0],[1523.9615 1700 0],[1532.648 130 0],[1533.4958 1500 0],[1537.2037 700 0],[1547.4026 200 0],[1568.102 180 0],[1582.009 120 0],[1672.6514 200 0],[1678.5129 2000 0],[1685.3488 1000 0],[1689.0441 2400 0],[1689.6754 1600 0],[1693.5807 1800 0],[1709.8771 600 0],[1736.7605 700 0],[1740.4443 120 0],[1761.6854 150 0],[1784.2736 650 0],[1800.2229 700 0],[1816.7314 2600 0],[1839.9785 100 0],[1858.0896 150 0],[1869.6295 300 0],[1878.5461 170 0],[1879.7703 200 0],[2020.9879 140 0],[2042.3965 300 0],[2044.6971 140 0],[2116.5471 600 0],[2190.2514 1800 0],[2248.5775 120 0],[2334.0416 180 0],[2426.0506 120 0],[2429.2221 180 0],[2523.382 600 0],[2861.0551 180 0],[2865.5721 1000 0],[2876.9711 150 0],[2882.249 140 0],[2923.6689 300 0],[3066.3539 300 0],[3097.916 300 0],[3930.0602 500 0],[3948.652 1100 0],[3955.725 220 0],[3957.2602 100 0],[3958.8398 1400 0],[3958.9602 1100 0],[3995.4801 500 0],[3996.6602 300 0]}{ALLx6000x6000x3000x300x22x600x0}{UVx2000x650x2000x300x22x600x0}{VISx3000x3000x3000x50x5x0x0}{IVx6000x6000x1000x0x0x0x0}%,[4030.6102 1300 0],[4068.516 250 0]
\pgfspectra@elt@search{#1}{Rb}{[46.585 3 2],[47.488 1 1],[48.1118 4 1],[48.243 3.5 2],[48.247 3 2],[48.283 50 2],[48.484 30 2],[48.966 50 2],[48.996 10 2],[49.348 60 2],[49.743 9 1],[49.782 5 2],[50.028 10 2],[50.833 3 2],[50.8434 2 1],[51.3266 15 1],[51.679 40 2],[53.0173 30 1],[53.364 80 2],[53.3801 7.5 1],[53.586 120 2],[54.2887 4 1],[55.5036 20 1],[55.619 120 2],[55.836 50 2],[56.477 70 2],[56.671 150 2],[57.282 100 2],[57.665 150 2],[57.963 250 2],[58.126 150 2],[58.234 50 2],[58.677 80 2],[58.9419 250 1],[59.142 10 2],[59.365 90 2],[59.494 100 2],[59.518 1 3],[59.588 130 2],[59.849 120 2],[60.209 45 2],[60.551 5 2],[60.728 50 2],[61.331 40 2],[61.967 50 2],[62.083 2 2],[62.224 10 2],[63.006 25 2],[64.3878 150 1],[64.567 50 2],[66.376 2.5 3],[67.481 2 2],[69.7049 300 1],[71.1187 600 1],[71.624 2.5 3],[73.341 2 3],[74.085 5 3],[74.1456 1000 1],[74.986 2 3],[75.375 2 3],[76.904 500 2],[77.154 1 3],[77.689 2.5 3],[81.528 250 2],[81.792 0.9 3],[85.018 1.5 3],[98.8 1 3],[160.412 100 1],[164.496 20 1],[170.752 20 1],[171.685 60 1],[176.05 500 1],[180.347 20 1],[180.968 50 1],[186.533 50 1],[188.942 50 1],[195.424 50 1],[195.654 30 1],[197.142 20 1],[198.319 50 1],[204.223 30 1],[205.221 30 1],[205.28 50 1],[206.892 200 1],[207.15 100 1],[207.595 1000 1],[209.029 100 1],[210.806 20 1],[211.65 30 1],[212.525 100 1],[212.982 40 1],[214.31 20 1],[214.383 3000 1],[215.321 10 2],[216.459 25 2],[219.036 20 1],[219.799 60 1],[219.826 60 1],[220.786 30 1],[221.708 1000 1],[222.379 20 1],[223.772 40 1],[225.065 50 1],[225.143 20 1],[225.419 80 1],[225.455 20 1],[226.354 20 1],[226.394 50 1],[226.8 10 2],[228.682 50 1],[229.171 500 1],[229.88 30 1],[230.012 15 2],[230.414 50 2],[230.445 15 2],[231.246 25 2],[233.301 25 1],[233.339 200 1],[233.707 20 2],[234.19 10 2],[234.537 20 2],[234.981 10 2],[235.311 35 1],[235.396 30 1],[235.697 40 1],[235.804 30 1],[236.427 30 1],[236.432 20 1],[236.515 20 1],[236.751 30 1],[237.321 20 1],[238.044 15 2],[238.129 10 2],[238.534 200 1],[240.594 25 1],[241.846 15 2],[243.417 40 1],[245.914 80 1],[247.22 5000 1],[248.456 30 1],[248.47 70 1],[249.638 200 1],[250.267 20 1],[251.418 25 1],[252.424 100 1],[256.186 30 2],[257.371 10 2],[257.707 10 2],[258.683 20 2],[259.456 20 1],[262.376 40 1],[263.175 100 2],[263.683 35 2],[264.558 40 1],[265.668 10 2],[268.41 100 1],[271.176 100 1],[271.386 10 2],[274.101 25 1],[279.886 50 2],[280.027 15 2],[280.758 50 2],[281.215 50 1],[283.851 35 1],[284.544 10 2],[286.977 15 2],[287.388 75 1],[290.369 50 2],[294.962 15 2],[295.101 10 2],[295.607 200 2],[296.745 50 2],[296.813 15 2],[297.074 50 2],[298.74 25 2],[302.361 35 2],[303.962 20 2],[304.148 20 2],[305.136 100 1],[307.07 25 2],[308.202 0.2 0],[308.684 50 2],[308.858 25 1],[309.849 10 2],[311.136 50 2],[311.257 1 0],[311.306 0.3 0],[311.482 25 2],[311.892 12 2],[314.89 500 1],[315.754 2.5 0],[315.826 0.5 0],[316.1 120 1],[316.934 10 2],[322.26 20 2],[322.798 5 0],[322.916 0.6 0],[327.099 200 1],[328.641 50 2],[332.149 150 1],[333.016 10 2],[334.055 120 1],[334.692 20 2],[334.872 6 0],[335.082 7.5 0],[335.389 75 1],[339.303 120 1],[341.558 75 1],[343.418 100 1],[343.926 25 2],[346.15 150 1],[349.268 10 2],[352.139 300 1],[353.155 300 1],[354.115 100 1],[358.705 10 0],[359.157 4 0],[360.06 500 1],[360.064 1000 1],[363.98 60 1],[364.626 40 1],[364.756 35 1],[366.274 100 1],[366.381 90 1],[366.672 35 1],[367.566 30 1],[369.958 250 1],[374.633 35 1],[379.681 350 1],[380.19 250 1],[382.666 100 1],[386.074 45 1],[390.729 25 1],[392.22 50 1],[392.644 250 1],[394.051 2500 1],[397.815 100 1],[402.949 170 1],[408.388 250 1],[410.428 200 1],[413.611 170 1],[419.308 350 1],[420.18 100 0],[421.553 50 0],[424.44 9000 1],[426.658 50 1],[427.025 25 1],[427.314 1500 1],[428.797 250 1],[429.397 150 1],[430.626 50 1],[434.696 100 1],[437.712 250 1],[444.01 30 1],[446.947 100 1],[449.392 40 1],[451.904 70 1],[453.034 300 1],[453.379 50 1],[454.074 40 1],[457.177 2000 1],[462.242 300 1],[463.189 35 1],[464.857 1000 1],[465.928 50 1],[473.045 100 1],[475.53 100 1],[475.782 40 1],[477.595 3000 1],[478.283 500 1],[485.534 30 1],[488.559 150 1],[508.7987 0.2 0],[513.2471 0.2 0],[515.0134 1 0],[515.208 1000 1],[516.458 30 1],[516.5023 0.1 0],[516.5142 0.2 0],[516.965 0.1 0],[519.5278 1.5 0],[523.3968 0.2 0],[526.0034 2 0],[526.0228 0.1 0],[527.051 20 1],[532.238 0.3 0],[536.2601 4 0],[539.0568 0.4 0],[543.1532 7.5 0],[543.183 0.3 0],[551.255 50 1],[552.278 500 1],[557.8788 0.6 0],[563.599 500 1],[564.7774 4 0],[565.375 2 0],[569.915 300 1],[572.4121 6 0],[572.4614 0.3 0],[573.964 20 1],[607.0755 7.5 0],[613.527 20 1],[615.9626 3 0],[619.908 100 1],[620.6309 7.5 0],[626.94 30 1],[629.8325 12 0],[629.9224 0.5 0],[645.833 1000 1],[655.562 100 1],[656.081 500 1],[677.507 300 1],[727.9997 10 0],[731.652 30 1],[740.8173 15 0],[761.8933 20 0],[775.7651 30 0],[775.9436 6 0],[780.027 9000 0],[792.526 0.5 0],[792.554 0.4 0],[794.76 4500 0],[827.141 4 0],[827.171 3 0],[860.396 200 1],[886.8512 4 0],[886.8852 3 0],[897.888 30 1],[902.177 30 1],[922.464 0.3 0],[923.425 0.2 0],[924.641 50 1],[933.887 30 1],[937.35 20 1],[939.136 30 1],[947.932 100 1],[949.372 70 1],[952.265 3 0],[952.305 0.5 0],[954.018 2 0],[961.299 30 1],[967.154 30 1],[968.905 200 1],[977.606 20 1],[993.476 20 1],[1007.5282 3.5 0],[1007.5708 3 0],[1323.517 10 0],[1344.281 2 0],[1344.357 3 0],[1366.501 7.5 0],[1475.241 100 0],[1528.843 80 0],[1528.948 15 0],[2252.965 2 0],[2293.2471 1 0],[2731.4311 0.4 0],[2790.5369 0.2 0]}{ALLx9000x9000x9000x500x5x0x0}{UVx5000x10x5000x500x5x0x0}{VISx9000x100x9000x0x0x0x0}{IVx9000x9000x200x0x0x0x0}%
\pgfspectra@elt@search{#1}{Sr}{[28.431 2.4 3],[29.109 2.4 3],[29.119 2.4 3],[29.322 2.4 3],[29.812 3 3],[30.012 3 3],[30.027 2.4 3],[30.167 2.4 3],[30.718 5 2],[31.611 10 2],[32.161 10 2],[33.067 25 2],[35.162 100 2],[35.88 15 2],[36.349 50 2],[37.121 30 2],[37.853 4 3],[39.244 15 3],[39.3 10 3],[39.49 9 3],[39.622 10 3],[39.992 8 3],[40.385 7 3],[40.694 7 3],[41.293 6 3],[41.307 8 3],[41.532 8 3],[41.978 6 3],[43.021 5 3],[43.065 6 3],[43.724 200 2],[44.273 5 3],[47.176 5 3],[48.42 5 3],[49.179 375 2],[50.704 250 2],[50.814 5 3],[51.438 750 2],[51.728 2 4],[53.419 5 3],[54.051 1.2 4],[56.275 500 2],[57.801 5 4],[62.493 6 4],[64.223 5 4],[64.921 10 4],[65.915 4 4],[66.094 5 4],[66.443 40 3],[66.993 1.8 4],[68.623 7 4],[71.035 20 3],[71.579 1.2 4],[74.782 2.4 4],[86.232 1.8 4],[96.837 4 2],[97.578 4 2],[99.298 5 2],[102.523 10 2],[104.491 7 2],[105.774 4 2],[106.02 5 2],[109.877 4 2],[112.549 7 2],[114.024 4 2],[116.827 4 2],[118.209 4 2],[118.921 4 3],[123.623 10 2],[124.414 6 3],[124.475 4 3],[124.487 4 3],[125.778 4 3],[126.862 4 3],[133.113 4 3],[134.79 6 3],[136.115 4 3],[140.867 5 3],[159.274 4 3],[167.703 5 3],[170.516 4 3],[172.423 4 3],[172.953 5 3],[173.212 4 3],[177.725 4 3],[194.058 4 2],[195.844 6 2],[196.692 6 2],[199.461 4 3],[206.863 5 2],[209.959 10 2],[210.438 4 3],[211.431 5 2],[211.79 4 3],[211.848 6 2],[211.952 10 2],[213.312 10 2],[214.28 6 2],[214.574 4 2],[215.284 280 1],[216.596 280 1],[217.891 6 2],[218.014 6 2],[219.088 10 2],[220.386 10 2],[221.799 4 3],[221.95 10 2],[222.005 10 2],[223.041 4 3],[224.049 4 3],[225.338 4 3],[226.703 10 2],[227.371 20 2],[227.787 10 2],[231.033 6 2],[231.495 10 2],[233.479 10 2],[234.013 20 2],[234.697 10 3],[235.734 4 3],[240.417 10 2],[241.052 6 2],[242.81 32 0],[243.893 4 3],[244.141 5 3],[245.403 10 2],[248.279 6 3],[248.357 5 3],[248.652 20 2],[250.057 3.6 3],[250.359 10 2],[250.802 4 3],[253.403 4 3],[254.802 3.6 3],[255.56 8 3],[256.947 24 0],[257.104 8 3],[257.158 5 3],[258.934 3 3],[259.91 6 2],[262.035 5 3],[262.116 4 3],[262.269 7 2],[264.216 4 3],[264.296 6 2],[264.851 6 2],[265.466 7 2],[272.247 8 2],[278.6 10 2],[282.142 10 2],[283.053 3 3],[287.486 6 2],[292.934 6 2],[293.183 40 0],[293.46 1.8 3],[298.3 6 2],[300.261 20 2],[301.232 40 2],[301.929 2 3],[302.173 20 2],[305.983 6 2],[306.143 10 2],[310.425 6 2],[318.261 10 2],[323.539 20 2],[326.652 1.8 3],[330.173 60 0],[330.272 6 2],[332.999 60 0],[335.125 80 0],[336.633 60 0],[338.071 130 1],[343.076 10 2],[346.446 190 1],[347.489 24 1],[356.643 1.8 3],[374.105 1.8 3],[387.426 6 2],[393.64 6 2],[393.672 6 2],[394.08 60 0],[395.875 6 2],[396.926 120 0],[397.004 60 0],[403.038 260 0],[403.238 60 0],[407.771 9200 1],[409.403 6 2],[409.702 6 2],[410.563 6 2],[416.18 40 1],[421.552 6400 1],[429.857 1.8 3],[430.545 68 1],[433.58 7 2],[443.804 70 0],[460.733 13000 0],[468.508 1.8 3],[472.228 640 0],[474.192 440 0],[478.432 280 0],[481.188 960 0],[483.208 720 0],[485.504 100 0],[486.87 120 0],[487.249 600 0],[487.606 120 0],[487.632 400 0],[489.198 200 0],[496.226 1600 0],[496.794 260 0],[507.109 6 2],[513.034 6 2],[515.607 160 0],[515.826 7 2],[522.22 280 0],[522.511 400 0],[522.927 400 0],[523.855 560 0],[525.69 960 0],[525.771 8 2],[526.221 6 2],[528.832 6 2],[532.982 70 0],[539.103 6 2],[544.348 8 2],[545.084 300 0],[546.39 6 2],[548.084 1400 0],[548.612 220 0],[550.417 700 0],[552.183 520 0],[553.481 400 0],[554.005 400 0],[554.336 50 0],[566.466 6 2],[568.972 6 2],[597.01 40 0],[634.575 50 0],[636.394 50 0],[636.996 70 0],[638.075 200 0],[638.65 180 0],[638.824 120 0],[640.847 1800 0],[644.668 50 0],[646.579 50 0],[650.4 1100 0],[654.679 200 0],[655.026 340 0],[661.726 600 0],[664.354 160 0],[679.105 360 0],[687.838 960 0],[689.259 240 0],[707.01 1100 0],[715.309 12 0],[716.724 50 0],[723.227 40 0],[730.941 500 0],[762.15 100 0],[767.306 80 0],[785 10 0],[786.69 6 0],[787.4 4 0],[842.28 40 0],[850.569 24 1],[868.891 40 1],[871.956 6 1],[917 8 0],[920.45 6 0],[928.39 4 0],[929.41 20 0],[930.66 3 0],[931.92 6 0],[938.045 12 0],[941.125 8 0],[944.895 80 0],[959.6 120 0],[962.47 60 0],[963.81 20 0],[964.77 20 1],[1003.666 60 1],[1032.731 200 1],[1087.27 1.4 1],[1091.488 40 1],[1098.4 2 0],[1122.457 2.6 1],[1124.125 140 0],[1201.476 20 1],[1223.62 4 0],[1244.59 12 1],[1247.96 4 0],[1249.5 8 0],[1265.22 3 0],[1297.47 15 1],[1312.38 20 1],[1352.28 3 0],[1714.09 3 0],[1717.05 6 0],[1744.74 10 0],[1762.6 0.8 1],[1774.3 6 0],[1975.96 3 0],[2026.14 46 0],[2070.0699 24 0],[2076.45 8 0],[2077.8699 3 0],[2602.36 6 0]}{ALLx13000x13000x9200x750x40x10x0}{UVx750x80x280x750x40x10x0}{VISx13000x13000x9200x8x1.8x0x0}{IVx200x140x200x0x0x0x0}%
\pgfspectra@elt@search{#1}{Y}{[21.18 0.3 3],[21.451 0.3 3],[21.597 0.6 3],[21.739 0.6 3],[22.171 1.2 3],[22.218 0.3 3],[22.298 0.6 3],[22.884 0.2 3],[22.894 2 3],[22.978 0.3 3],[23.517 0.3 3],[23.577 2.5 3],[24.212 0.1 3],[24.23 3 3],[24.414 0.3 3],[26.372 0.3 3],[26.464 15 3],[27.24 3 3],[27.303 15 3],[27.86 1 3],[28.918 0.5 4],[29.999 5 4],[31.289 0.3 4],[31.335 20 4],[32.047 4 4],[32.169 4 4],[32.558 15 4],[32.657 20 4],[32.834 17.5 4],[33.04 5 4],[33.309 90 4],[33.38 50 4],[33.512 10 4],[33.514 40 4],[33.662 50 4],[33.902 50 4],[34.002 20 4],[34.042 0.5 4],[34.459 50 4],[34.965 10 4],[34.975 0.2 4],[35.136 1 4],[35.398 10 4],[35.556 10 4],[35.586 90 3],[37.042 30 3],[37.205 30 4],[37.996 40 4],[38.682 50 3],[39.777 20 4],[40.345 30 4],[40.881 0.1 4],[40.931 20 4],[41.503 20 4],[41.818 10 4],[41.859 15 4],[41.979 5 4],[42.074 30 4],[42.503 60 3],[42.787 0.1 4],[43.075 5 4],[43.766 10 4],[44.162 0.3 4],[44.296 3 4],[45.197 0.2 4],[45.584 1.5 4],[45.784 8.5 4],[47.31 30 3],[58.498 400 4],[63.097 200 4],[64.368 0.1 2],[64.669 0.4 2],[65.387 0.6 2],[65.698 1 2],[66.874 2.5 2],[67.198 4 2],[69.172 10 2],[69.385 0.4 2],[69.52 20 2],[72.791 0.9 2],[72.847 0.4 2],[72.883 0.2 2],[72.973 2 2],[73.049 60 2],[73.27 1.5 2],[73.436 80 2],[77.078 1.5 2],[77.179 1 2],[80.426 2 2],[80.52 500 2],[80.618 7.5 2],[80.897 15 2],[80.992 700 2],[85.564 10 2],[85.782 6 2],[98.423 2.5 2],[98.796 1.5 2],[98.921 1500 2],[99.637 2500 2],[99.919 2 2],[100.056 15 2],[100.335 2.5 2],[100.658 100 2],[100.786 120 2],[107.752 12 2],[108.135 50 2],[108.463 7.5 2],[108.839 35 2],[109.525 25 2],[109.587 2.5 2],[110.321 15 2],[128.974 300 2],[130.696 250 2],[131.451 500 2],[131.61 150 2],[133.404 400 2],[154.908 0.8 2],[155.381 1.5 2],[163.514 3 2],[164.043 7.5 2],[177.98 20 2],[178.605 60 2],[204.193 1 2],[204.207 0.5 2],[206.058 150 2],[206.898 400 2],[212.798 1000 2],[219.116 1600 2],[220.076 800 2],[220.603 800 2],[224.306 35 1],[226.141 15 2],[226.157 8 2],[228.434 1000 2],[231.992 0.3 2],[232.731 1000 2],[235.42 5 0],[236.723 5000 2],[237.383 3 -1],[238.524 5 -1],[241.393 2.5 1],[241.464 4000 2],[242.22 56 1],[246.061 6 1],[249.042 2.5 0],[254.028 1.2 -1],[254.757 1.4 -1],[255.017 1 -1],[268.165 2 0],[269.421 6 0],[269.539 2.6 0],[271.03 10 2],[271.054 9 2],[272.3 9.5 0],[273.008 2.2 0],[273.485 2.2 1],[274.253 7 0],[276.01 14 0],[278.011 0.5 2],[278.521 3 1],[278.559 1.2 1],[279.12 1.2 0],[279.144 7 2],[280.011 3 1],[280.327 2 2],[280.7 10 2],[281.364 2.6 0],[281.704 9000 2],[281.886 1.8 0],[282.256 4.5 0],[282.537 2.2 1],[282.638 4.5 1],[285.443 7 1],[285.63 2.6 1],[285.787 1.1 1],[286.767 600 2],[288.648 9.5 0],[289.769 1.8 1],[289.882 1.4 1],[291.341 600 2],[291.774 150 2],[291.856 160 2],[291.905 16 0],[293.003 1.8 1],[294.053 1.5 2],[294.601 9900 2],[294.84 39 0],[294.848 2 2],[296.496 35 0],[297.042 600 2],[297.391 1.8 1],[297.459 48 0],[298.055 3 1],[298.426 75 0],[299.526 7 0],[299.694 14 0],[300.526 7 0],[301.393 140 2],[301.885 150 2],[301.895 5.5 0],[302.173 13 0],[302.228 9 0],[302.649 2.6 1],[303.659 3 1],[304.484 4.5 0],[304.537 19 0],[304.711 2.2 0],[305.522 6 1],[308.685 6 1],[309.17 5.5 0],[309.376 2.2 1],[309.588 9.5 1],[311.181 4.5 0],[311.204 5.5 1],[311.428 2.2 0],[312.877 6 1],[312.993 8 1],[313.517 9.5 1],[317.306 11 1],[317.941 22 1],[319.131 7 0],[319.562 230 1],[320.027 220 1],[320.332 220 1],[321.669 390 1],[324.228 620 1],[326.71 0.3 2],[327.68 2.5 2],[328.091 31 1],[330.847 1.9 1],[332.789 470 1],[334.038 5.5 0],[336.2 16 1],[338.859 8.5 0],[339.704 4.5 0],[341.247 8.5 0],[344.882 20 1],[345.095 7 0],[346.788 11 1],[348.573 17 0],[349.609 170 1],[352.153 8 0],[354.601 4.5 1],[354.901 390 1],[355.18 13 0],[355.269 54 0],[355.876 17 0],[357.143 19 0],[357.605 26 0],[358.452 330 1],[358.775 30 0],[358.969 10 0],[359.292 280 0],[360.073 1000 1],[360.192 620 1],[361.105 780 1],[362.094 430 0],[362.871 190 1],[363.312 780 1],[366.461 300 1],[366.849 4.5 1],[369.253 17 0],[371.03 1300 1],[371.812 6 0],[373.861 6 0],[374.755 120 1],[374.989 5 0],[377.433 1000 1],[377.656 140 1],[378.23 5 1],[378.87 740 1],[381.835 130 1],[383.288 400 1],[384.787 7 1],[386.696 50 2],[387.682 8 0],[387.828 48 1],[388.777 3 0],[390.074 300 2],[390.459 6 0],[391.458 400 2],[391.825 5 0],[393.011 6 0],[393.066 24 1],[395.036 440 1],[395.16 15 1],[395.509 6 0],[398.26 360 1],[398.75 4 0],[403.96 380 2],[403.983 94 0],[404.011 300 2],[404.764 240 0],[407.738 940 0],[408.122 9 0],[408.371 200 0],[410.238 990 0],[410.639 6 0],[411.081 8 0],[412.161 12 2],[412.492 32 1],[412.831 890 0],[414.285 750 0],[415.763 10 0],[416.752 240 0],[417.414 200 0],[417.754 800 1],[419.928 12 1],[420.47 38 1],[421.302 8 0],[421.354 4 0],[421.78 16 0],[422.063 28 0],[422.425 8 0],[423.573 60 1],[423.594 220 0],[425.12 30 0],[430.23 36 0],[430.963 280 1],[431.63 5 0],[433.078 11 0],[433.729 3 0],[434.465 6 0],[434.879 44 0],[435.233 6 0],[435.27 6 0],[435.773 12 0],[435.873 80 1],[436.603 12 0],[437.494 1200 1],[437.561 15 0],[437.933 8 0],[438.548 3 0],[438.774 10 0],[439.401 3 0],[439.467 3 0],[439.802 180 1],[442.259 89 1],[443.734 8 0],[444.366 10 0],[444.663 13 0],[446.527 2 0],[447.389 4 0],[447.572 17 0],[447.696 18 0],[447.745 16 0],[448.728 11 0],[448.747 30 0],[449.175 3 0],[449.242 2.5 0],[450.595 50 0],[451.358 5 0],[451.401 8 0],[452.205 4 0],[452.725 89 0],[452.78 44 0],[454.432 10 0],[455.937 10 0],[456.439 3 0],[457.356 6 0],[458.132 3.5 0],[458.177 3 0],[459.655 13 0],[460.48 9.5 0],[461.3 4 0],[464.37 200 0],[465.832 20 0],[465.889 7 0],[466.747 8.5 0],[467.082 6 0],[467.484 200 0],[467.835 6 0],[468.232 26 1],[468.977 8.5 0],[469.681 18 0],[470.885 3.5 0],[472.585 6 0],[472.853 17 0],[473.237 6 0],[473.762 200 2],[474.14 8.5 0],[475.279 16 0],[476.098 41 0],[478.018 1.7 0],[478.104 12 0],[478.658 16 1],[478.689 17 0],[479.93 18 0],[480.431 5 0],[480.481 7 0],[481.738 8.5 -1],[481.82 14 -1],[481.964 14 0],[482.213 12 0],[482.331 19 1],[483.915 6 0],[483.987 77 0],[484.568 55 0],[485.269 41 0],[485.425 12 0],[485.487 89 1],[485.67 5 0],[485.984 33 0],[487.965 5 0],[488.369 190 1],[488.628 5 0],[488.665 4 0],[489.344 9.5 0],[490.012 110 1],[490.611 10 0],[490.9 4.5 0],[492.187 15 0],[493.093 3.5 0],[495.066 4.5 0],[497.43 12 0],[498.213 12 1],[500.697 10 0],[507.021 7.5 0],[507.219 7.5 0],[508.742 110 1],[508.818 3 0],[510.288 750 2],[511.911 21 1],[512.04 130 2],[512.321 45 1],[513.52 18 0],[519.643 12 1],[520.041 96 1],[520.572 150 1],[523.81 1000 2],[524.081 18 0],[526.358 300 2],[528.982 6 1],[532.078 4.5 1],[538.062 7.5 0],[538.364 400 2],[540.278 22 1],[541.703 2.4 0],[542.437 9 0],[543.824 19 0],[546.646 71 0],[546.847 10 0],[547.339 9 1],[548.074 9 1],[549.317 6 0],[549.559 3.5 0],[549.741 24 1],[550.345 30 0],[550.99 25 1],[551.364 6 0],[552.163 12 0],[552.676 2.4 0],[552.754 74 0],[554.163 3.5 0],[554.45 12 0],[554.602 9 1],[555.643 7.5 0],[556.281 600 2],[556.727 60 2],[556.775 6 0],[557.224 400 2],[557.742 18 0],[558.108 2.4 0],[558.187 62 0],[559.096 2.1 0],[559.412 2.1 0],[559.548 40 2],[560.208 300 2],[560.633 12 0],[562.391 1.5 0],[563.013 56 0],[563.225 2.4 0],[563.289 2.1 0],[564.469 12 0],[564.847 12 0],[566.294 74 1],[567.527 9 0],[569.363 1.8 0],[570.673 16 0],[572.061 2.4 0],[572.889 7.5 1],[573.012 15 -1],[573.209 2.1 0],[574.385 9 0],[574.693 1.8 -1],[576.422 2.4 -1],[576.564 7.5 0],[577.395 3.5 0],[578.169 10 1],[580 1.5 -1],[581.858 1.5 -1],[582.187 3 0],[583.227 2.1 0],[583.807 0.9 -1],[585.883 1.5 -1],[587.183 1.5 0],[587.614 2.4 -1],[587.996 2.4 0],[589.394 2.4 -1],[590.296 3.5 0],[591.219 2.4 -1],[593.11 2.4 -1],[593.908 9 -1],[594.572 4.5 0],[595.002 2.4 0],[595.641 7.5 -1],[597.204 130 -1],[598.186 5 0],[598.764 100 -1],[600.36 74 -1],[600.465 12 -1],[600.919 12 0],[601.987 62 -1],[602.341 12 0],[603.66 50 -1],[605.381 42 -1],[607.278 13 -1],[608.8 5 0],[608.935 21 -1],[609.678 16 -1],[610.782 13 -1],[611.473 13 -1],[612.738 7.5 -1],[613.206 140 -1],[613.504 12 0],[613.843 15 0],[614.836 110 -1],[615.172 12 -1],[616.508 82 -1],[618.223 56 -1],[619.173 120 0],[619.982 59 -1],[621.796 45 -1],[622.259 30 0],[623.672 27 -1],[625.105 4.5 0],[627.501 12 -1],[629.546 6 -1],[631.62 2.4 -1],[633.81 2.4 -1],[635.948 1.5 -1],[636.987 1.5 -1],[640.201 7.5 0],[643.5 100 0],[643.718 2.4 0],[650.123 1.8 -1],[651.833 1.8 -1],[653.584 1.8 -1],[653.86 9 0],[655.384 1.2 -1],[655.739 7 0],[657.258 1.2 -1],[657.685 3.5 0],[658.487 2.3 0],[661.375 9.5 1],[662.249 1.4 0],[663.649 1.9 0],[665.061 4 0],[666.44 2.1 0],[668.758 15 0],[669.183 1.4 0],[669.475 0.7 0],[669.926 1.6 0],[670.071 7 0],[671.32 3.5 0],[673.599 4 0],[679.371 19 0],[679.541 7 1],[680.315 1.2 0],[681.516 2.1 0],[683.249 1.4 1],[684.524 4.5 0],[685.824 1.4 1],[688.722 2.9 0],[689.6 2.1 1],[690.826 0.9 0],[693.352 1.4 0],[695.031 2.4 0],[695.168 1 1],[695.804 1 0],[697.988 2.4 0],[700.897 1.3 0],[700.993 1 0],[703.518 1.9 0],[705.294 2.9 0],[705.428 1.3 0],[707.513 0.9 0],[712.792 1.1 0],[719.166 3.5 0],[719.593 1 0],[725.458 200 2],[726.417 3.5 1],[729.308 0.9 0],[733.062 0.9 0],[733.296 0.5 1],[734.646 5 0],[739.877 1.1 0],[745.03 2.9 1],[749.488 1.7 0],[753.671 0.7 0],[755.871 900 2],[756.313 3.5 0],[761.772 0.8 0],[762.294 1.9 0],[765.289 0.7 0],[768.949 0.5 0],[769.8 0.8 0],[771.989 1.9 0],[772.408 1.9 0],[778.842 1.3 0],[779.632 1.3 0],[780.252 0.6 0],[781.216 1.7 0],[785.552 2.9 0],[786.453 600 2],[788.19 11 1],[791.671 800 2],[798.941 40 2],[799.143 1000 2],[799.933 1 0],[817.141 800 2],[832.961 0.9 0],[834.443 2.4 0],[836.564 0.8 0],[845.036 1.7 0],[852.894 0.8 0],[864.509 400 2],[879.621 1000 2],[880.062 9.5 0],[883.585 1.9 1],[911.659 800 2]}{ALLx9900x990x1300x9900x90x400x140}{UVx9900x430x1300x9900x90x400x5}{VISx1200x990x1200x1000x0x0x140}{IVx1000x9.5x11x1000x0x0x0}%
@@ -80,10 +80,10 @@
\pgfspectra@elt@search{#1}{Ag}{[70.98 40 2],[71.385 40 2],[71.773 20 2],[71.853 40 2],[72.696 60 2],[73.004 70 2],[73.028 30 2],[73.083 5 1],[73.094 30 2],[73.657 40 2],[73.813 20 2],[74.098 40 2],[74.229 40 2],[74.83 40 2],[75.28 6 1],[75.573 30 2],[75.827 20 2],[76.719 40 2],[76.833 50 2],[76.961 30 2],[77.638 70 2],[78.291 40 2],[78.576 30 2],[78.908 40 2],[79.235 50 2],[79.654 40 2],[79.791 50 2],[79.941 80 2],[80.888 60 2],[81.612 30 2],[82.239 36 2],[83.811 40 2],[100.532 3 1],[106.549 2 1],[107.223 2.4 1],[107.422 50 1],[110.703 30 1],[111.246 30 1],[119.583 12 1],[122.333 10 1],[124.08 10 1],[124.687 10 1],[125.681 11 1],[125.755 11 1],[126.663 10 1],[127.367 14 1],[129.751 13 1],[131.12 17 1],[131.381 11 1],[131.461 10 1],[132.384 12 1],[134.209 12 1],[134.257 10 1],[134.662 14 1],[135.354 10 1],[136.45 30 1],[137.322 24 2],[137.476 24 2],[139.6 20 1],[140.493 22 2],[141.093 20 1],[141.39 24 2],[141.429 24 2],[141.972 18 1],[142.861 24 2],[143.26 19 1],[145.274 24 2],[145.641 40 2],[146.472 20 1],[146.623 10 1],[147.144 20 2],[148.901 60 2],[150.737 10 0],[151.508 30 2],[151.563 20 0],[152.423 20 2],[152.704 24 2],[154.114 30 2],[154.858 10 0],[155.089 30 2],[155.304 26 2],[155.516 20 1],[158.741 26 2],[158.928 24 2],[161.379 20 2],[161.914 26 2],[163.446 20 2],[164.45 20 1],[165.152 12 0],[165.21 10 0],[165.224 20 2],[165.36 26 2],[165.443 60 2],[165.618 140 2],[165.71 30 2],[166.154 20 2],[167.075 26 2],[167.614 30 2],[168.107 20 2],[168.282 24 1],[169.351 100 2],[170.506 40 2],[170.811 2 0],[170.886 30 2],[170.927 10 0],[171.768 26 2],[172.227 40 2],[172.676 30 2],[172.814 50 2],[173.644 25 1],[174.734 40 2],[174.964 24 2],[175.089 30 2],[175.103 150 2],[176.057 20 2],[176.262 30 2],[176.614 2 0],[176.87 30 2],[177.181 20 2],[178.385 20 2],[179.037 15 1],[179.17 20 2],[179.269 20 2],[179.39 30 2],[180.224 30 2],[180.226 30 2],[180.277 20 2],[180.823 60 2],[181.683 50 2],[182.245 30 2],[182.883 70 2],[183.233 50 2],[183.25 24 2],[183.431 20 2],[183.61 50 2],[183.864 30 2],[184.014 80 2],[184.696 20 2],[184.771 4 0],[184.993 24 2],[185.633 30 2],[185.891 24 2],[186.039 20 2],[186.064 20 2],[186.712 70 2],[186.81 30 2],[187.255 20 2],[187.345 80 2],[188.036 50 2],[188.957 60 2],[191.692 80 2],[191.708 120 2],[192.53 40 2],[194.632 30 2],[194.844 20 2],[195.762 140 2],[195.927 24 2],[196.086 20 2],[196.689 80 2],[196.738 20 1],[197.592 120 2],[197.703 100 2],[198.187 30 2],[198.702 40 2],[199.516 26 2],[200.024 120 2],[200.73 60 2],[201.149 40 2],[201.365 30 2],[201.596 30 1],[203.398 30 1],[204.133 30 2],[205.317 30 2],[205.383 30 2],[205.699 40 2],[206.117 40 0],[206.985 20 0],[208.104 40 2],[211.382 16 1],[214.56 12 1],[214.647 60 2],[214.919 30 2],[216.189 120 2],[216.621 30 2],[217 3 0],[218.676 10 1],[221.123 30 2],[222.953 12 1],[223.84 20 2],[224.643 20 1],[224.651 100 2],[224.874 15 1],[228.003 15 1],[228.65 20 2],[230.956 6 0],[231.004 140 2],[231.26 2 0],[231.705 14 1],[232.029 16 1],[232.468 14 1],[233.14 16 1],[235.792 14 1],[237.502 10 0],[238.685 20 2],[239.569 60 2],[241.141 15 1],[241.323 18 1],[243.781 20 1],[244.793 16 1],[246.962 20 2],[247.384 16 1],[250.663 12 1],[256.287 20 2],[257.563 10 0],[266.049 12 1],[272.177 12 0],[276.754 15 1],[282.439 20 0],[292.677 2 0],[293.842 4 0],[309.91 4 0],[313.002 6 0],[317.058 2 0],[318.07 18 1],[321.567 3 0],[322.515 2 0],[323.318 3 0],[326.735 20 1],[328.068 11000 0],[330.567 2 0],[338.289 5600 0],[340.378 2 0],[346.916 6 0],[347.582 14 1],[349.528 16 1],[350.192 4 0],[350.803 4 0],[351.338 3 0],[352.112 2 0],[354.261 10 0],[354.716 2 0],[355.701 2 0],[358.667 4 0],[362.349 2 0],[362.468 10 0],[368.246 15 1],[368.25 6 0],[368.334 16 1],[370.92 10 0],[372.742 2 0],[375.314 4 0],[381.094 40 0],[381.178 10 0],[384.074 20 0],[384.785 3 0],[390.741 10 0],[390.931 10 1],[391.44 10 0],[392.01 14 1],[392.801 2 0],[394.043 2 0],[394.297 2 0],[394.943 12 1],[398.158 20 0],[398.519 14 1],[399.215 2 0],[405.548 20 0],[408.343 2 0],[408.591 16 1],[418.548 20 1],[421.096 18 0],[421.282 20 0],[431.107 10 0],[439.623 4 0],[447.604 10 0],[455.6 4 0],[461.569 6 0],[462.004 16 1],[462.046 10 1],[466.848 12 0],[467.76 6 0],[478.84 20 1],[479.62 4 0],[484.782 6 0],[487.41 20 0],[488.821 4 0],[491.75 2 0],[493.575 2 0],[499.289 4 0],[502.735 16 1],[512.35 3 0],[520.908 200 0],[533.362 2 0],[546.55 200 0],[547.155 20 0],[547.538 4 0],[554.567 4 0],[555.958 2 0],[566.734 20 0],[608.378 2 0],[626.85 2 0],[662.108 4 0],[735.996 4 0],[768.778 64 0],[800.54 5 1],[825.47 3 1],[827.352 100 0],[832.44 4 1],[837.95 3 1],[840.38 5 1],[849.25 3 1],[864.57 6 0],[870.485 2 0],[874.76 2.4 1],[900.09 3 1],[1255.1 2 0],[1681.95 12 0],[1741.6699 4 0],[1830.79 3 0],[1838.2301 3 0]}{ALLx11000x11000x50x150x0x0x0}{UVx11000x11000x50x150x0x0x0}{VISx200x200x20x0x0x0x0}{IVx100x100x5x0x0x0x0}%
\pgfspectra@elt@search{#1}{Cd}{[42.701 50 3],[43.788 20 3],[44.785 50 3],[48.09 60 3],[48.949 10 3],[49.3 70 3],[49.513 70 3],[49.814 70 3],[49.853 70 3],[50.409 80 3],[50.42 70 3],[50.45 70 3],[50.631 80 3],[50.801 60 3],[50.895 50 3],[50.955 70 3],[50.981 25 3],[51.14 70 3],[51.3 80 3],[51.45 70 3],[51.942 60 3],[52.097 15 3],[52.441 80 3],[52.447 70 3],[52.477 50 3],[52.51 70 3],[52.519 60 3],[52.707 70 3],[53.079 50 3],[53.109 80 3],[53.151 80 3],[53.429 70 3],[53.677 70 3],[53.724 50 3],[54.09 60 3],[54.174 70 3],[54.26 80 3],[54.655 80 3],[54.801 40 3],[54.833 20 3],[54.89 15 3],[55.127 25 3],[55.29 20 3],[55.306 60 3],[55.405 80 3],[56.026 25 3],[56.416 10 3],[56.701 60 3],[67.739 8 2],[68.458 15 2],[72.07 10 2],[106.223 20 3],[111.816 150 3],[112.6 30 3],[113.408 20 3],[113.904 15 3],[115.464 20 3],[115.573 10 3],[116.465 100 3],[116.578 20 3],[116.73 40 3],[117.973 20 3],[118.307 15 3],[118.34 100 3],[119.413 40 3],[119.563 20 3],[119.647 30 3],[119.893 20 3],[121.538 15 3],[122.352 20 3],[124.606 20 3],[124.656 15 3],[124.994 15 3],[125.6 100 1],[126.647 30 3],[127.441 15 3],[128.563 20 3],[128.758 20 3],[129.643 150 1],[129.946 20 3],[130.436 40 3],[130.607 30 3],[131.689 15 3],[132.185 15 3],[132.555 20 3],[132.65 100 1],[134.097 30 3],[134.615 15 3],[135.478 30 3],[135.811 20 3],[136.255 30 3],[137.048 60 3],[137.091 150 1],[138.098 30 3],[138.36 5 2],[139.21 15 2],[139.678 10 2],[139.765 20 3],[140.368 30 3],[140.658 15 3],[141.628 25 2],[141.889 60 3],[142.029 5 2],[142.054 8 2],[142.983 15 3],[143.286 5 2],[144.608 20 2],[144.754 20 3],[144.755 25 2],[145.263 20 3],[145.574 30 2],[146.597 15 3],[146.614 8 2],[146.667 15 3],[147.197 5 2],[148.295 15 3],[149.179 20 3],[149.181 15 2],[151.101 5 2],[151.165 10 2],[151.313 5 2],[151.426 200 1],[152.355 10 2],[152.84 15 2],[152.93 30 2],[153.21 5 2],[154.517 50 2],[154.757 25 2],[155.007 10 2],[155.045 20 2],[155.089 15 2],[155.218 5 2],[155.648 5 2],[156.066 15 2],[156.603 5 2],[156.898 15 2],[157.02 20 3],[157.158 200 1],[158.239 10 2],[159.873 20 3],[160.042 20 3],[160.159 40 2],[160.487 20 2],[160.664 20 2],[160.728 10 2],[160.891 15 2],[160.961 10 2],[161.251 15 2],[162.287 15 3],[162.527 15 2],[162.854 25 2],[165.187 20 2],[165.563 25 2],[166.86 100 1],[167.815 30 2],[169.97 10 2],[170.247 50 1],[170.716 40 2],[172.193 10 2],[172.295 40 2],[172.441 50 1],[172.566 30 2],[173.9 25 2],[174.569 5 2],[174.767 40 2],[174.815 15 2],[176.882 30 2],[177.306 40 2],[178.584 100 1],[178.919 30 2],[179.34 75 2],[179.61 15 2],[180.057 5 2],[182.341 40 2],[182.77 100 1],[184.466 50 2],[185.113 40 2],[185.137 20 2],[185.585 40 2],[185.667 200 2],[187.408 150 2],[188.649 15 2],[190.348 15 2],[190.998 25 2],[191.057 15 2],[192.223 300 1],[193.959 10 2],[194.354 100 1],[196.554 40 1],[198.689 30 1],[198.881 15 2],[199.543 200 1],[200.06 20 2],[200.407 15 2],[200.749 100 1],[201.612 15 2],[203.245 50 1],[203.623 75 1],[203.983 40 2],[204.561 50 2],[206.125 10 2],[208.791 75 2],[209.6 150 1],[209.745 10 2],[210.047 5 2],[211.16 50 2],[214.441 1000 1],[215.506 50 1],[218.779 100 1],[218.813 5 2],[219.456 1000 1],[221.843 5 2],[222.443 5 2],[226.502 1000 1],[228.8022 1500 0],[231.277 1000 1],[232.107 200 1],[237.682 40 1],[241.824 7 2],[241.869 50 1],[242.636 10 2],[246.973 50 1],[248.793 40 1],[249.1 3 0],[249.558 40 1],[249.981 25 2],[250.891 10 0],[250.911 50 1],[251.622 30 1],[251.859 15 0],[252.5196 25 0],[254.4613 50 0],[255.198 50 1],[255.3465 25 0],[256.5789 3 0],[257.293 500 1],[258.0106 50 0],[258.487 3 0],[259.2026 30 0],[260.2048 25 0],[261.881 15 2],[262.8979 50 0],[263.056 5 2],[263.219 40 0],[263.942 75 0],[265.923 40 1],[266.0325 50 0],[266.82 25 1],[267.262 50 1],[267.754 100 0],[267.7748 25 0],[270.7 50 1],[271.2505 75 0],[273.382 50 0],[274.854 1000 1],[276.3894 100 0],[276.423 50 0],[276.699 20 2],[277.4958 50 0],[280.559 30 2],[282.319 30 1],[283.69 200 0],[285.646 25 1],[286.818 100 0],[288.0767 200 0],[288.1224 50 0],[291.467 200 1],[292.787 50 1],[292.927 200 1],[298.062 1000 0],[298.1362 200 0],[298.1845 50 0],[303.06 50 1],[303.572 10 2],[308.0822 150 0],[308.148 25 1],[308.2593 30 0],[309.234 100 1],[313.3167 200 0],[314.679 50 1],[325.033 150 1],[325.2524 300 0],[326.1055 300 0],[334.321 50 1],[338.549 50 1],[338.888 30 1],[340.3652 800 0],[341.749 50 1],[344.242 50 1],[346.443 100 1],[346.62 1000 0],[346.7655 800 0],[348.308 25 1],[349.544 150 1],[349.9952 25 0],[352.411 100 1],[353.569 100 1],[361.0508 1000 0],[361.2873 800 0],[361.4453 60 0],[364.9558 20 0],[398.1926 10 0],[402.912 100 1],[413.477 200 1],[414.149 50 1],[428.508 100 1],[430.6672 8 0],[441.241 100 1],[441.2989 3 0],[441.563 1000 1],[444.045 30 1],[466.2352 8 0],[467.8149 200 0],[474.469 30 1],[479.9912 300 0],[488.172 50 1],[502.55 50 1],[508.5822 1000 0],[515.466 6 0],[526.801 100 1],[527.16 100 1],[533.748 1000 1],[537.813 1000 1],[538.189 200 1],[584.33 40 1],[588.022 50 1],[609.9142 300 0],[611.149 100 0],[632.5166 100 0],[633.0013 30 0],[635.472 400 1],[635.998 500 1],[643.847 2000 0],[646.494 400 1],[656.765 25 1],[672.578 500 1],[675.919 100 1],[677.8116 30 0],[723.701 50 1],[728.438 100 1],[734.567 1000 0],[806.699 50 1],[820.0309 5 0],[929.2 20 0],[1165.5 15 0],[1449.1 35 0],[1571.2 80 0],[1912.5 55 0],[2437.8 25 0],[2545.5 35 0]}{ALLx2000x2000x1000x200x150x0x0}{UVx1500x1500x1000x200x150x0x0}{VISx2000x2000x1000x0x0x0x0}{IVx80x80x50x0x0x0x0}%
\pgfspectra@elt@search{#1}{In}{[36.867 3 4],[37.01 3 4],[37.282 5 4],[37.294 5 4],[37.495 1 4],[37.584 3 4],[37.607 3 4],[37.679 5 4],[37.861 8.5 4],[37.924 1.5 4],[38.027 4.5 4],[38.156 5.5 4],[38.214 4.5 4],[38.276 5.5 4],[38.305 5 4],[38.621 8.5 4],[38.67 5 4],[38.866 1.5 4],[38.891 7 4],[39.003 5.5 4],[39.092 5.5 4],[39.229 4.5 4],[39.246 4.5 4],[39.36 0.5 4],[39.389 12.5 4],[39.574 5.5 4],[39.773 1.5 4],[39.979 5 4],[40.005 4.5 4],[40.057 12.5 4],[40.239 12.5 4],[40.533 1.5 4],[40.728 4.5 4],[40.736 1.5 4],[40.795 4.5 4],[41.743 4.5 4],[41.845 1 4],[42.316 1 4],[67.733 4 3],[68.453 7.5 3],[68.531 3.5 2],[69.162 2.5 2],[72.064 4 3],[78.217 0.5 2],[88.224 5 2],[89.084 5 2],[91.587 5 2],[91.745 1 2],[92.683 2.5 2],[140.308 15 2],[143.485 15 2],[147.034 2 3],[148.77 10 2],[149.414 10 2],[151.262 2.5 3],[152.35 2.5 3],[152.478 5 2],[153.021 10 2],[153.203 3.5 3],[153.295 15 2],[156.892 4 3],[156.933 1.5 3],[160.15 6 3],[160.508 0.5 3],[160.659 3.5 3],[162.542 50 2],[162.848 5 3],[164.228 10 2],[164.8 1 0],[165.18 4 3],[165.562 5 3],[166.738 0.5 3],[167.064 2.5 3],[167.616 0.5 0],[167.807 6 3],[170.202 2 3],[170.253 10 2],[170.711 7.5 3],[171.154 2.5 0],[172.189 3.5 3],[174.123 1 0],[174.765 6 3],[174.81 5 3],[174.883 50 2],[175.849 0.5 0],[176.788 1 2],[176.877 5 3],[177.301 6 3],[178.915 4 3],[179.338 6 3],[181.071 0.5 2],[184.241 15 2],[184.467 6 3],[185.03 20 2],[185.11 4.5 3],[185.584 4.5 3],[185.664 7.5 3],[186.298 7.5 2],[187.408 7.5 3],[190.352 2.5 3],[193.958 2.5 3],[194.331 1.5 3],[200.473 3 3],[210.117 0.5 3],[210.389 5 1],[211.231 4 3],[215.408 15 2],[215.442 1 2],[216.688 5 1],[217.99 1 0],[218.24 1 0],[218.74 1 0],[219.084 1 0],[219.567 7.5 1],[219.741 1 0],[219.952 5 2],[220.224 1 0],[220.528 25 1],[221.114 1.5 0],[222.513 2 3],[223.07 2.5 0],[223.218 2.5 2],[224.166 1.5 0],[225.579 15 1],[225.999 5 0],[226.126 10 2],[226.626 2.5 2],[227.241 2.5 2],[227.284 2.5 2],[227.82 2.5 0],[228.164 20 1],[228.375 1 0],[229.833 1 0],[229.87 1 0],[230.09 5 2],[230.249 1 0],[230.605 50 1],[230.686 12.5 0],[230.932 1.5 0],[230.975 1 0],[231.321 45 1],[231.509 1 0],[232.34 15 1],[232.441 2.5 0],[232.492 1.5 0],[232.795 35 1],[233.276 1.5 0],[233.457 40 1],[234.019 5 0],[234.59 4 0],[234.656 2.5 0],[235.075 25 1],[235.87 2.5 0],[237.814 7.5 0],[237.9 5 0],[238.263 55 1],[238.954 20 0],[239.318 20 1],[239.918 5 0],[240.647 25 1],[240.876 25 1],[241.906 25 1],[241.92 25 1],[242.72 35 1],[242.986 10 0],[243.099 5 0],[243.273 25 1],[244.263 30 1],[244.79 50 1],[245.323 30 1],[246.008 30 0],[246.802 15 0],[248.615 35 1],[248.862 55 1],[248.895 45 1],[249.859 40 1],[249.96 50 1],[250.099 45 1],[250.816 30 1],[251.231 55 1],[252.137 50 0],[252.298 5 0],[252.741 50 2],[255.356 35 1],[255.444 80 1],[256.015 550 0],[256.513 35 1],[259.875 35 1],[260.176 100 0],[260.404 25 1],[265.47 45 1],[266.263 50 1],[266.865 70 1],[267.456 70 1],[268.312 40 1],[271.026 800 0],[271.394 150 0],[272.552 25 2],[272.615 40 2],[274.975 65 1],[275.388 350 0],[277.537 20 0],[279.876 30 1],[281.897 45 1],[283.692 90 0],[285.814 15 0],[286.568 40 1],[289.018 60 1],[293.263 550 0],[294.105 50 1],[295.701 10 0],[296.617 30 1],[298.28 50 2],[299.94 55 1],[300.808 50 2],[300.882 15 2],[303.936 4000 0],[305.115 4 0],[309.98 55 1],[310.18 90 1],[313.86 65 1],[314.275 40 1],[314.67 65 1],[315.577 75 1],[315.84 50 1],[317.63 45 1],[319.811 45 1],[325.609 6500 0],[325.856 1500 0],[329.355 15 2],[333.85 45 1],[335.091 4 2],[337.659 37.5 1],[340.428 50 1],[343.84 55 1],[356.232 2.5 2],[369.391 90 1],[370.813 47.5 1],[371.614 190 1],[371.83 60 1],[371.872 80 1],[372.34 80 1],[379.521 85 1],[379.921 115 1],[383.465 125 1],[384.218 100 1],[385.282 50 2],[388.978 50 1],[390.207 50 1],[392.212 30 1],[393.44 32.5 1],[396.235 125 1],[400.466 60 1],[401.392 70 1],[402.377 50 2],[403.232 75 2],[405.694 205 1],[406.23 25 2],[407.157 50 2],[407.293 50 2],[410.176 8500 0],[420.514 70 1],[421.304 50 1],[421.966 55 1],[425.268 50 2],[437.287 75 1],[450.078 75 1],[450.958 20 2],[451.131 9000 0],[454.901 55 1],[457.085 70 1],[457.802 90 1],[457.84 90 1],[461.608 70 1],[461.717 85 1],[462.014 125 1],[462.07 75 1],[462.73 85 1],[463.704 70 1],[463.816 190 1],[464.458 110 1],[465.562 180 1],[465.674 160 1],[468.111 95 1],[468.48 225 1],[487.837 1.5 0],[490.706 45 1],[492.493 35 1],[497.377 75 1],[510.936 40 1],[511.514 50 1],[511.74 70 1],[512.08 135 1],[512.175 100 1],[512.985 40 1],[517.542 120 1],[518.444 70 1],[524.877 100 2],[525.432 15 0],[526.274 6 0],[530.945 75 1],[541.141 40 1],[541.845 70 1],[543.67 110 1],[549.75 65 1],[550.708 70 1],[551.3 160 1],[552.328 125 1],[553.65 65 1],[555.545 95 1],[557.69 120 1],[563.67 100 1],[564.515 50 2],[570.85 80 1],[570.991 25 0],[572.18 50 1],[572.317 20 2],[572.768 25 0],[581.95 50 2],[585.315 105 1],[590.34 245 1],[591.54 130 1],[591.878 60 1],[606.29 65 1],[609.595 125 1],[610.866 105 1],[611.59 90 1],[612.87 115 1],[612.94 120 1],[613.21 160 1],[614 75 1],[614.323 45 1],[614.81 70 1],[614.95 95 1],[616.115 40 1],[616.245 90 1],[619.772 100 2],[622.428 50 1],[622.83 140 1],[623.11 70 1],[630.48 135 1],[636.23 145 1],[646.9 150 1],[654.12 105 1],[675.188 95 1],[676.59 90 1],[678.372 50 1],[684.744 4 0],[689.15 160 1],[690.013 2 0],[718.29 190 1],[725.5 90 1],[727.65 105 1],[730.34 90 1],[735.06 160 1],[763.27 50 1],[768.29 50 1],[774.07 105 1],[777.696 50 1],[778.9 90 1],[780.68 35 1],[781.45 35 1],[784.09 45 1],[805.078 10 0],[822.7 120 1],[823.866 15 0],[831.492 7.5 0],[843.455 25 1],[867.895 15 0],[868.263 10 0],[870.025 25 0],[881.35 50 1],[883.26 40 1],[889.447 20 0],[917.008 5 0],[919.77 60 1],[920.2 60 1],[921.3 110 1],[924.11 80 1],[934.983 20 0],[937.027 30 0],[942.799 10 0],[997.786 50 0],[1025.703 100 0],[1071.742 30 0],[1074.431 50 0],[1133.472 10 0],[1173.148 10 0],[1291.259 5 0],[1342.996 4.5 0],[1382.448 2.5 0],[1431.625 3 0],[1441.92 1.5 0],[1466.866 3 0],[1471.908 3.5 0],[1650.4311 1 0],[2229.1061 3 0],[2387.9131 3.5 0]}{ALLx9000x9000x245x100x7.5x12.5x0}{UVx6500x6500x190x50x7.5x12.5x0}{VISx9000x9000x245x100x0x0x0}{IVx120x100x120x0x0x0x0}%
-\pgfspectra@elt@search{#1}{Sn}{[1.6 7 1],[35.514 120 4],[36.101 150 4],[37.255 100 4],[60.523 50 3],[61.904 50 3],[62.873 50 3],[75.301 100 2],[76.062 50 2],[77.579 75 2],[78.468 50 2],[89.992 1 1],[90.822 50 3],[91.092 200 2],[91.74 2 1],[93.563 1 1],[94.583 3 1],[95.45 4 1],[95.625 500 3],[98.513 7 1],[99.721 4 1],[101.092 50 2],[101.626 2 1],[101.972 500 3],[104.078 4 1],[104.132 1 1],[104.449 1000 3],[104.884 50 2],[105.837 100 3],[105.859 50 3],[106.21 3 1],[107.341 1000 3],[108.75 200 3],[108.935 200 4],[109.692 300 3],[110.324 50 3],[110.819 8 1],[111.934 0 3],[112.068 200 3],[113.279 100 4],[113.929 1000 2],[115.833 1000 2],[115.905 4 1],[116.074 200 4],[116.109 200 2],[116.143 10 1],[116.158 100 2],[116.294 3 1],[117.626 100 4],[118.051 4 1],[118.062 100 2],[118.425 1000 2],[118.992 100 4],[118.999 200 2],[120.406 200 2],[120.572 100 4],[121.052 2000 2],[121.51 100 2],[121.814 100 2],[121.907 9 1],[122.37 13 1],[123.017 100 2],[123.138 100 2],[124.3 11 1],[124.363 500 2],[125.138 2000 4],[125.992 1000 2],[127.631 40 2],[128.381 100 4],[129.086 20 1],[129.436 200 4],[130.22 100 4],[130.597 1000 2],[131.455 1000 3],[131.659 20 1],[132.734 1000 2],[133.47 200 2],[134.605 200 2],[134.765 1000 2],[136.971 200 2],[138.674 1000 2],[140.052 25 1],[141.061 500 2],[143.752 1000 3],[144.977 200 2],[147.515 20 1],[148.922 9 1],[153.29 100 3],[157.036 1000 2],[167.429 50 2],[173.721 10 0],[175.146 15 0],[175.33 10 0],[175.8 7 1],[176.498 20 0],[177.34 20 0],[179.075 30 0],[180.46 80 0],[181.134 15 1],[181.171 500 2],[181.304 30 0],[181.574 40 0],[181.931 25 0],[182.3 120 0],[183.189 9 1],[184.875 50 0],[185.2 30 0],[186.032 200 0],[186.142 20 0],[186.552 20 0],[186.596 30 0],[187.329 15 0],[188.264 30 0],[188.605 80 0],[189.14 100 0],[189.729 20 0],[189.991 12 1],[190.93 50 0],[191.161 40 0],[191.352 20 0],[192.531 80 0],[192.677 20 0],[192.795 15 0],[192.89 40 0],[193.317 25 0],[194.186 500 2],[194.269 20 0],[195.215 150 0],[195.552 50 2],[196.021 15 0],[197.146 30 0],[197.76 50 0],[198.42 80 0],[199.188 15 0],[199.498 20 0],[200.805 25 0],[201.576 30 0],[202.698 30 0],[204.066 50 0],[204.09 20 0],[205.403 50 0],[205.831 70 0],[206.4 20 0],[206.858 80 0],[207.289 100 0],[207.308 100 0],[208.062 25 0],[209.158 30 0],[209.435 40 0],[209.639 200 0],[210.093 100 0],[211.393 100 0],[212.126 50 0],[214.073 25 0],[214.143 20 0],[214.846 15 0],[214.863 1 1],[214.873 40 0],[215.143 20 0],[215.154 30 1],[217.132 80 0],[219.449 150 0],[219.934 300 0],[220.965 400 0],[220.967 4 1],[221.105 40 0],[223.172 80 0],[224.605 400 0],[224.607 6 1],[225.117 60 0],[226.719 30 0],[226.891 400 0],[228.226 20 0],[228.668 200 0],[231.723 600 0],[233.48 300 0],[235.484 1000 0],[235.79 20 0],[236.034 3 1],[236.833 22 1],[238.072 60 0],[238.454 4 1],[240.815 100 0],[242.17 800 0],[242.949 1000 0],[243.352 1 1],[244.898 15 1],[245.524 60 0],[247.64 20 0],[248.339 300 0],[248.348 13 1],[248.699 10 1],[249.57 200 0],[252.261 5 1],[252.392 90 0],[253.117 80 0],[254.655 400 0],[255.801 40 0],[257.158 500 0],[259.442 200 0],[263.694 50 0],[266.124 200 0],[266.493 2 1],[270.651 700 0],[272.782 2 1],[276.178 20 0],[277.981 150 0],[278.503 80 0],[278.796 60 0],[281.259 60 0],[281.358 80 0],[282.552 2 1],[283.999 1400 0],[284.642 1 1],[285.062 200 0],[286.332 1000 0],[291.28 1 1],[291.354 200 0],[291.982 6 1],[299.1 3 1],[299.444 7 1],[300.914 700 0],[301.218 1 1],[302.394 8 1],[303.28 200 0],[303.412 850 0],[304.75 12 1],[309.469 6 1],[314.184 60 0],[317.505 550 0],[321.871 40 0],[326.234 550 0],[328.321 50 1],[333.062 110 0],[335.197 60 1],[340.748 2 1],[347.246 10 1],[353.757 7 1],[357.545 11 1],[358.239 3 1],[362.008 2 1],[362.054 6 1],[365.578 40 0],[371.523 6 1],[380.102 280 0],[384.144 4 1],[429.465 1 1],[452.474 40 0],[457.913 1 1],[458.029 1 1],[487.722 2 1],[494.431 3 1],[497.973 20 0],[507.114 2 1],[507.267 2 1],[517.454 20 0],[533.236 10 1],[556.195 20 1],[558.892 25 1],[559.62 2 1],[563.171 500 0],[575.359 15 0],[579.72 1 1],[579.918 15 1],[592.544 50 0],[597.03 100 0],[603.77 150 0],[605.486 200 -1],[606.9 250 0],[607.346 100 0],[607.748 6 1],[607.97 5 1],[614.971 400 0],[615.46 200 0],[617.15 150 0],[631.078 100 0],[635.435 40 0],[645.35 70 1],[676.145 8 1],[684.405 25 1],[719.14 20 1],[738.779 10 1],[739.86 20 0],[740.862 1 1],[768.53 30 0],[774.18 13 1],[775.497 100 0],[790.4 3 1],[803.05 100 0],[803.93 30 0],[811.409 200 0],[812.1 30 0],[834.935 30 0],[835.704 80 0],[842.272 300 0],[855.26 400 0],[868.17 50 0],[901.895 30 0],[941.086 50 0],[941.537 80 0],[961.64 150 0],[974.11 50 0],[974.28 100 0],[980.538 300 0],[985.052 500 0],[1045.647 25 0],[1080.758 11 0],[1089.4 54 0],[1119.185 70 0],[1127.766 56 0],[1133.697 17 0],[1145.459 200 0],[1161.626 200 0],[1167.077 76 0],[1169.445 25 0],[1173.978 258 0],[1182.518 96 0],[1183.582 106 0],[1193.299 254 0],[1200.95 48 0],[1231.324 111 0],[1233.56 33 0],[1253.087 42 0],[1253.65 42 0],[1278.82 37 0],[1288.85 89 0],[1298.17 187 0],[1300.03 20 0],[1301.85 187 0],[1308.15 68 0],[1346.02 378 0],[1360.82 144 0],[1501.82 13 0],[1546.42 30 0],[1700.05 20 0],[1780.75 10 0],[2062.2199 20 0],[2086.1699 40 0],[2168.6199 8 0],[2213.1699 4 0],[2299.7199 3 0],[2432.7199 4 0],[2473.8199 4 0]}{ALLx2000x1400x70x2000x1000x2000x200}{UVx2000x1400x60x2000x1000x2000x0}{VISx500x500x70x0x0x0x200}{IVx500x500x3x0x0x0x0}%
+\pgfspectra@elt@search{#1}{Sn}{[35.514 120 4],[36.101 150 4],[37.255 100 4],[60.523 50 3],[61.904 50 3],[62.873 50 3],[75.301 100 2],[76.062 50 2],[77.579 75 2],[78.468 50 2],[89.992 1 1],[90.822 50 3],[91.092 200 2],[91.74 2 1],[93.563 1 1],[94.583 3 1],[95.45 4 1],[95.625 500 3],[98.513 7 1],[99.721 4 1],[101.092 50 2],[101.626 2 1],[101.972 500 3],[104.078 4 1],[104.132 1 1],[104.449 1000 3],[104.884 50 2],[105.837 100 3],[105.859 50 3],[106.21 3 1],[107.341 1000 3],[108.75 200 3],[108.935 200 4],[109.692 300 3],[110.324 50 3],[110.819 8 1],[111.934 0 3],[112.068 200 3],[113.279 100 4],[113.929 1000 2],[115.833 1000 2],[115.905 4 1],[116.074 200 4],[116.109 200 2],[116.143 10 1],[116.158 100 2],[116.294 3 1],[117.626 100 4],[118.051 4 1],[118.062 100 2],[118.425 1000 2],[118.992 100 4],[118.999 200 2],[120.406 200 2],[120.572 100 4],[121.052 2000 2],[121.51 100 2],[121.814 100 2],[121.907 9 1],[122.37 13 1],[123.017 100 2],[123.138 100 2],[124.3 11 1],[124.363 500 2],[125.138 2000 4],[125.992 1000 2],[127.631 40 2],[128.381 100 4],[129.086 20 1],[129.436 200 4],[130.22 100 4],[130.597 1000 2],[131.455 1000 3],[131.659 20 1],[132.734 1000 2],[133.47 200 2],[134.605 200 2],[134.765 1000 2],[136.971 200 2],[138.674 1000 2],[140.052 25 1],[141.061 500 2],[143.752 1000 3],[144.977 200 2],[147.515 20 1],[148.922 9 1],[153.29 100 3],[157.036 1000 2],[167.429 50 2],[173.721 10 0],[175.146 15 0],[175.33 10 0],[175.8 7 1],[176.498 20 0],[177.34 20 0],[179.075 30 0],[180.46 80 0],[181.134 15 1],[181.171 500 2],[181.304 30 0],[181.574 40 0],[181.931 25 0],[182.3 120 0],[183.189 9 1],[184.875 50 0],[185.2 30 0],[186.032 200 0],[186.142 20 0],[186.552 20 0],[186.596 30 0],[187.329 15 0],[188.264 30 0],[188.605 80 0],[189.14 100 0],[189.729 20 0],[189.991 12 1],[190.93 50 0],[191.161 40 0],[191.352 20 0],[192.531 80 0],[192.677 20 0],[192.795 15 0],[192.89 40 0],[193.317 25 0],[194.186 500 2],[194.269 20 0],[195.215 150 0],[195.552 50 2],[196.021 15 0],[197.146 30 0],[197.76 50 0],[198.42 80 0],[199.188 15 0],[199.498 20 0],[200.805 25 0],[201.576 30 0],[202.698 30 0],[204.066 50 0],[204.09 20 0],[205.403 50 0],[205.831 70 0],[206.4 20 0],[206.858 80 0],[207.289 100 0],[207.308 100 0],[208.062 25 0],[209.158 30 0],[209.435 40 0],[209.639 200 0],[210.093 100 0],[211.393 100 0],[212.126 50 0],[214.073 25 0],[214.143 20 0],[214.846 15 0],[214.863 1 1],[214.873 40 0],[215.143 20 0],[215.154 30 1],[217.132 80 0],[219.449 150 0],[219.934 300 0],[220.965 400 0],[220.967 4 1],[221.105 40 0],[223.172 80 0],[224.605 400 0],[224.607 6 1],[225.117 60 0],[226.719 30 0],[226.891 400 0],[228.226 20 0],[228.668 200 0],[231.723 600 0],[233.48 300 0],[235.484 1000 0],[235.79 20 0],[236.034 3 1],[236.833 22 1],[238.072 60 0],[238.454 4 1],[240.815 100 0],[242.17 800 0],[242.949 1000 0],[243.352 1 1],[244.898 15 1],[245.524 60 0],[247.64 20 0],[248.339 300 0],[248.348 13 1],[248.699 10 1],[249.57 200 0],[252.261 5 1],[252.392 90 0],[253.117 80 0],[254.655 400 0],[255.801 40 0],[257.158 500 0],[259.442 200 0],[263.694 50 0],[266.124 200 0],[266.493 2 1],[270.651 700 0],[272.782 2 1],[276.178 20 0],[277.981 150 0],[278.503 80 0],[278.796 60 0],[281.259 60 0],[281.358 80 0],[282.552 2 1],[283.999 1400 0],[284.642 1 1],[285.062 200 0],[286.332 1000 0],[291.28 1 1],[291.354 200 0],[291.982 6 1],[299.1 3 1],[299.444 7 1],[300.914 700 0],[301.218 1 1],[302.394 8 1],[303.28 200 0],[303.412 850 0],[304.75 12 1],[309.469 6 1],[314.184 60 0],[317.505 550 0],[321.871 40 0],[326.234 550 0],[328.321 50 1],[333.062 110 0],[335.197 60 1],[340.748 2 1],[347.246 10 1],[353.757 7 1],[357.545 11 1],[358.239 3 1],[362.008 2 1],[362.054 6 1],[365.578 40 0],[371.523 6 1],[380.102 280 0],[384.144 4 1],[429.465 1 1],[452.474 40 0],[457.913 1 1],[458.029 1 1],[487.722 2 1],[494.431 3 1],[497.973 20 0],[507.114 2 1],[507.267 2 1],[517.454 20 0],[533.236 10 1],[556.195 20 1],[558.892 25 1],[559.62 2 1],[563.171 500 0],[575.359 15 0],[579.72 1 1],[579.918 15 1],[592.544 50 0],[597.03 100 0],[603.77 150 0],[605.486 200 -1],[606.9 250 0],[607.346 100 0],[607.748 6 1],[607.97 5 1],[614.971 400 0],[615.46 200 0],[617.15 150 0],[631.078 100 0],[635.435 40 0],[645.35 70 1],[676.145 8 1],[684.405 25 1],[719.14 20 1],[738.779 10 1],[739.86 20 0],[740.862 1 1],[768.53 30 0],[774.18 13 1],[775.497 100 0],[790.4 3 1],[803.05 100 0],[803.93 30 0],[811.409 200 0],[812.1 30 0],[834.935 30 0],[835.704 80 0],[842.272 300 0],[855.26 400 0],[868.17 50 0],[901.895 30 0],[941.086 50 0],[941.537 80 0],[961.64 150 0],[974.11 50 0],[974.28 100 0],[980.538 300 0],[985.052 500 0],[1045.647 25 0],[1080.758 11 0],[1089.4 54 0],[1119.185 70 0],[1127.766 56 0],[1133.697 17 0],[1145.459 200 0],[1161.626 200 0],[1167.077 76 0],[1169.445 25 0],[1173.978 258 0],[1182.518 96 0],[1183.582 106 0],[1193.299 254 0],[1200.95 48 0],[1231.324 111 0],[1233.56 33 0],[1253.087 42 0],[1253.65 42 0],[1278.82 37 0],[1288.85 89 0],[1298.17 187 0],[1300.03 20 0],[1301.85 187 0],[1308.15 68 0],[1346.02 378 0],[1360.82 144 0],[1501.82 13 0],[1546.42 30 0],[1700.05 20 0],[1780.75 10 0],[2062.2199 20 0],[2086.1699 40 0],[2168.6199 8 0],[2213.1699 4 0],[2299.7199 3 0],[2432.7199 4 0],[2473.8199 4 0]}{ALLx2000x1400x70x2000x1000x2000x200}{UVx2000x1400x60x2000x1000x2000x0}{VISx500x500x70x0x0x0x200}{IVx500x500x3x0x0x0x0}%[1.6 7 1],
\pgfspectra@elt@search{#1}{Sb}{[69.118 10 2],[69.12 1 1],[69.869 10 2],[69.922 3 4],[72.286 15 2],[72.481 8 2],[73.233 15 2],[74.606 1 4],[76.443 1 1],[81.485 1 1],[83.1 6 4],[84.939 1 1],[85.508 2 1],[87.684 4 1],[89.802 1 4],[92.107 4 1],[98.357 6 1],[99.962 15 2],[100.113 6 1],[100.943 6 1],[101.194 40 2],[105.221 6 1],[105.627 8 1],[105.658 10 2],[105.732 8 1],[106.59 40 2],[106.993 20 2],[107.043 20 2],[107.376 5 2],[107.381 6 1],[107.582 30 2],[107.81 5 2],[108.406 20 2],[109.834 10 2],[110.432 8 4],[113.543 10 2],[115.149 30 2],[115.774 40 2],[116.696 12 2],[120.52 50 2],[121.064 50 2],[122.6 12 4],[123.03 6 1],[127.498 8 1],[130.669 20 2],[132.74 8 1],[135.804 6 1],[137.958 8 2],[138.47 8 1],[140.418 20 2],[140.783 6 1],[142.957 10 2],[143.076 10 0],[143.649 8 1],[146.419 10 0],[148.657 20 0],[149.136 40 0],[150.57 12 4],[151.257 50 0],[152.447 12 4],[153.274 120 0],[153.506 80 0],[156.551 6 1],[157.611 8 1],[158.136 7 1],[159.996 80 0],[160.698 10 1],[161.28 200 0],[162.33 100 0],[165.12 50 0],[165.704 20 1],[166.26 100 0],[167.389 15 2],[169.885 50 0],[171.023 3 2],[171.184 15 2],[171.693 80 0],[171.745 150 0],[172.343 150 0],[172.533 15 2],[173.619 100 0],[173.643 8 1],[175.779 50 0],[176.23 12 2],[176.576 100 0],[178.087 100 0],[178.824 100 0],[180.018 150 0],[181.05 50 0],[181.42 80 0],[182.95 100 0],[183.932 12 2],[185.889 60 0],[186.817 50 0],[187.115 300 0],[188.256 150 0],[189.128 70 0],[189.939 70 0],[192.708 100 0],[194.613 10 2],[195.039 200 0],[196.43 80 0],[198.605 60 0],[199.06 6 1],[202.4 50 0],[202.949 60 0],[203.977 70 0],[204.957 150 0],[205.41 3 2],[206.343 50 0],[206.833 1000 0],[207.956 100 0],[209.185 2 2],[209.841 50 0],[211.848 80 0],[212.7 5 2],[212.739 100 0],[213.705 50 0],[213.969 100 0],[214.18 10 1],[214.183 50 0],[214.486 100 0],[215.891 50 0],[217.581 1500 0],[217.919 250 0],[217.925 6 1],[220.132 200 0],[220.845 300 0],[220.85 6 1],[222.073 150 0],[222.198 100 0],[222.493 120 0],[222.515 6 1],[226.251 300 0],[228.898 120 0],[229.344 150 0],[230.646 300 0],[231.147 2500 0],[231.589 150 0],[237.367 400 0],[238.364 300 0],[239.522 100 0],[242.213 150 0],[242.635 250 0],[244.551 400 0],[247.832 400 0],[248.044 150 0],[248.046 8 1],[250.771 5 2],[251.054 100 0],[252.852 2000 0],[252.854 15 1],[256.775 10 1],[257.406 150 0],[259.013 15 2],[259.805 1500 0],[259.809 500 0],[261.231 300 0],[261.42 1 2],[261.717 12 2],[261.763 1 2],[265.26 200 0],[265.655 12 1],[266.939 20 2],[267.064 300 0],[268.276 200 0],[269.225 120 0],[271.89 150 0],[276.995 400 0],[278.587 5 2],[279.027 20 2],[285.109 12 1],[285.111 100 0],[287.792 1000 0],[296.61 12 1],[298.096 15 1],[302.983 500 0],[303.401 12 1],[304.067 12 1],[323.252 600 0],[324.128 20 1],[326.751 700 0],[333.661 20 2],[338.309 12 1],[338.315 100 0],[349.846 15 1],[350.407 50 2],[351.906 15 2],[352.047 12 1],[353.345 15 2],[355.918 40 2],[356.625 40 2],[363.78 25 1],[363.783 250 0],[372.278 20 1],[372.279 200 0],[373.89 30 2],[385.022 20 1],[403.355 200 0],[403.356 20 1],[413.363 20 1],[414.054 15 1],[419.517 15 1],[421.907 20 1],[426.509 40 2],[431.432 20 1],[434.483 12 1],[435.216 50 2],[441.142 12 1],[444.648 12 1],[450.692 12 1],[451.45 15 1],[459.189 30 2],[459.69 30 1],[459.909 20 1],[460.477 15 1],[464.732 30 1],[467.574 20 1],[469.291 30 2],[471.126 40 1],[473.544 12 1],[475.781 20 1],[476.536 20 1],[476.691 12 1],[478.403 30 1],[480.201 20 1],[483.282 20 1],[487.724 20 1],[494.74 15 1],[504.456 15 1],[516.632 12 1],[517.655 15 1],[523.894 20 1],[524.771 1 2],[535.424 20 1],[546.408 15 1],[549.032 30 0],[555.61 40 0],[556.813 15 1],[560.219 30 0],[563.202 100 0],[563.975 30 1],[569.08 1 2],[571.73 1 2],[583.034 60 0],[584.55 3 2],[589.509 15 1],[600.521 100 1],[605.341 20 1],[607.98 30 1],[613.004 50 1],[615.494 20 1],[624.67 5 2],[628.76 3 2],[630.276 12 1],[661.149 20 0],[664.744 30 1],[668.801 15 1],[680.667 6 1],[764.828 30 0],[784.444 80 0],[792.465 200 0],[796.955 40 0],[841.169 60 0],[857.264 150 0],[861.955 100 0],[868.27 30 0],[913.221 30 0],[951.868 400 0],[986.678 30 0],[994.914 400 0],[1007.849 200 0],[1026.101 300 0],[1036.433 50 0],[1048.83 50 0],[1058.56 200 0],[1067.741 1000 0],[1074.194 800 0],[1079.411 80 0],[1083.973 600 0],[1086.858 200 0],[1087.955 400 0],[1101.279 300 0],[1107.995 40 0],[1108.498 30 0],[1110.484 50 0],[1110.852 50 0],[1118.961 30 0],[1126.623 150 0],[1186.337 30 0],[1195.77 1 0],[1211.606 5 0],[1227.66 2 0],[1246.675 2 0]}{ALLx2500x2500x100x50x0x12x0}{UVx2500x2500x25x50x0x12x0}{VISx200x200x100x50x0x0x0}{IVx1000x1000x0x0x0x0x0}%
\pgfspectra@elt@search{#1}{Te}{[79.96 3 1],[80.228 4 1],[94.262 3 1],[100.373 3 1],[100.78 3 1],[101.427 2.5 1],[102.279 2.5 1],[105.7 3 1],[105.951 4 1],[106.886 3 1],[107.766 4 1],[109.011 3 1],[114.404 3 1],[115.31 2.5 1],[116.142 5 1],[117.434 5 1],[117.579 6 1],[120.854 4.5 1],[121.3 2.5 1],[122.098 4.5 1],[125.362 4.5 1],[127.052 4.5 1],[127.476 3.5 1],[130.653 4 1],[132.492 5 1],[133.642 3.5 1],[134.52 3.5 1],[136.324 4.5 1],[136.673 4 1],[137.48 5 1],[139.522 3 1],[143.952 3 1],[146.525 3 1],[148.956 3.5 1],[160.799 4 1],[160.841 5 1],[161.315 5 1],[163.891 3 1],[165.54 2.5 0],[168.85 2.5 0],[170 3 0],[170.158 3 1],[170.8 2.5 0],[175.1 3 0],[175.94 2.5 0],[177.5 2.5 0],[179.57 3 0],[179.63 3 0],[182.24 5 0],[182.55 3 0],[185.06 3 0],[185.21 3 0],[185.38 3 0],[185.72 4 0],[186.04 3 0],[196.288 1.5 1],[199.483 3.5 0],[200.02 3 0],[200.202 13000 0],[207.09 4 0],[208.116 3250 0],[214.281 9000 0],[214.725 1600 0],[215.985 180 0],[220.874 4.5 0],[225.549 5 0],[225.902 250 0],[226.552 5 0],[237.306 10 1],[238.326 600 0],[238.578 750 0],[238.782 10 1],[240.163 5 1],[243.647 5 1],[243.869 25 1],[253.072 60 0],[256.782 10 1],[257.496 5 1],[257.61 2.5 1],[257.924 3.5 1],[259.112 5 1],[259.285 5 1],[260.572 5 1],[262.192 2.5 1],[262.486 5 1],[262.796 10 1],[264.189 10 1],[264.848 10 1],[264.966 50 1],[265.77 20 1],[266.11 40 1],[267.713 55 0],[271.158 10 1],[276.965 3 0],[284.117 5 1],[284.615 5 1],[285.829 50 1],[286.1 10 1],[286.882 20 1],[289.541 75 1],[291.989 15 1],[294.211 25 1],[294.668 25 1],[296.729 35 1],[297.367 10 1],[297.59 25 1],[299.704 7.5 1],[301.202 7.5 1],[301.758 25 1],[302.331 10 1],[304.7 35 1],[305.246 10 1],[306.316 5 1],[307.356 7.5 1],[310.444 4 1],[313.258 5 1],[316.066 10 1],[317.514 50 0],[318.983 5 1],[321.121 2.5 1],[325.68 30 1],[326.877 15 1],[328.263 15 1],[332.192 20 1],[332.311 20 1],[332.922 30 1],[335.21 30 1],[336.279 30 1],[337.41 12.5 1],[340.679 75 1],[341.963 10 1],[344.225 25 1],[345.512 20 1],[345.688 10 1],[348.032 10 1],[348.367 20 1],[348.611 10 1],[352.111 25 1],[355.219 25 1],[361.178 50 1],[361.757 25 1],[364.446 20 1],[367.926 10 1],[372.566 15 1],[379.722 20 1],[380.092 10 1],[390.567 10 1],[391.854 10 1],[393.149 15 1],[394.798 10 1],[396.922 20 1],[397.594 12.5 1],[398.177 10 1],[400.652 25 1],[401.169 10 1],[402.973 15 1],[404.717 20 1],[404.888 15 1],[407.348 7.5 1],[410.104 15 1],[412.732 35 1],[416.355 15 1],[416.977 50 1],[417.929 15 1],[421.131 12.5 1],[422.573 40 1],[424.647 15 1],[425.115 10 1],[426.111 50 1],[426.436 15 1],[427.343 30 1],[428.585 40 1],[432.09 20 1],[436.128 15 1],[436.4 75 1],[437.712 15 1],[438.51 37.5 1],[439.6 30 1],[447.863 85 1],[453.707 40 1],[455.778 50 1],[463.062 35 1],[464.112 50 1],[465.437 90 1],[468.691 100 1],[469.638 50 1],[470.653 50 1],[476.605 50 1],[477.156 35 1],[478.487 50 1],[482.714 50 1],[483.128 75 1],[484.29 75 1],[486.512 65 1],[486.624 100 1],[488.522 40 1],[490.444 40 1],[496.188 30 1],[500.082 30 1],[508.3 4 0],[514.87 3.5 0],[544.984 25 1],[548.795 25 1],[557.635 75 1],[564.926 75 1],[566.62 50 1],[570.812 100 1],[573.35 3.5 0],[575.585 75 1],[578.91 4 0],[593.615 25 1],[597.468 50 1],[627.35 4 0],[634.97 4 0],[636.713 25 1],[640.59 4 0],[645.67 3.5 0],[661.34 4 0],[664.858 5 1],[666.02 4 0],[669 4 0],[679 5 0],[683.76 10 0],[685.47 10 0],[701.606 5 1],[703.913 5 1],[719.11 7.5 0],[723.662 5 1],[726.35 10 0],[728.09 4 0],[728.926 5 1],[744.539 5 1],[746.098 6 1],[746.875 7.5 1],[748.126 5 1],[755.68 5 0],[768.861 3 1],[775.91 7.5 0],[781.879 4 1],[786.161 4 1],[792.169 7.5 1],[794.314 7.5 1],[795.034 5 1],[797.29 10 0],[805.615 3 1],[806.14 15 0],[808.25 5 0],[812.244 5 1],[813.039 4 1],[815.447 4 1],[818.644 10 1],[819.094 3 1],[825.15 5 0],[827.353 7.5 1],[827.66 5 0],[829.11 5 0],[835.58 7.5 0],[837.212 5 1],[846.98 3.5 0],[849.22 4 0],[850.08 4 0],[852.14 6 0],[853.568 5 1],[857.578 6 1],[860.463 5 1],[862.168 4 1],[863.21 3.5 0],[867.295 7.5 1],[870.109 6 0],[873.381 5 1],[875.818 102.5 0],[883.152 6 0],[885.115 9 0],[889.792 3 1],[900.437 40.5 0],[904.339 9 0],[919.68 6 0],[920.678 7.5 0],[920.764 8.5 0],[946.9 6 0],[972.274 2830 0],[978.554 92.5 0],[984.23 54.5 0],[986.892 266 0],[990.261 59 0],[995.63 344.5 0],[995.993 18.5 0],[997.713 162.5 0],[997.931 68 0],[998.585 22.5 0],[1005.141 2975 0],[1009.101 2048.5 0],[1009.957 52 0],[1010.605 139.5 0],[1011.808 190.5 0],[1015.106 148 0],[1030.056 198.5 0],[1032.305 102.5 0],[1049.357 372.5 0],[1050.986 98.5 0],[1091.834 940 0],[1100.78 149 0],[1108.956 5100 0],[1116.374 254 0],[1148.723 3310 0],[1197.896 140 0],[1256.624 94 0],[1258.919 194.5 0],[1280.55 80.5 0],[1310.418 200 0],[1324.775 790 0],[1331.663 241.5 0],[1403.709 108.5 0],[1407.253 72 0],[1433.574 217 0],[1441.746 110 0],[1451.351 525 0],[1455.468 64.5 0],[1545.245 740 0],[1554.623 1215 0],[1640.39 1880 0],[1730.3539 980 0],[1829.159 1390 0],[1877.7301 197 0],[1962.352 134.5 0],[2014.7539 119.5 0],[2104.373 510 0],[2160.25 232 0],[2179.9641 18.5 0],[2255.5289 37 0],[2275.566 24 0],[2329.4939 13.5 0],[2397.8699 8.5 0],[2405.9039 12.5 0],[2642.8619 6.5 0],[2653.917 19 0],[2655.374 7.5 0],[2717.926 3.5 0]}{ALLx13000x13000x100x0x0x0x0}{UVx13000x13000x75x0x0x0x0}{VISx100x10x100x0x0x0x0}{IVx5100x5100x10x0x0x0x0}%
-\pgfspectra@elt@search{#1}{I}{[36.378 3 4],[38.074 3.6 4],[56.553 4.5 4],[60.186 0.5 3],[60.757 5 4],[61.246 0.6 3],[61.517 0.4 3],[65.422 0.4 3],[65.456 0.4 3],[65.58 0.2 1],[65.9 0.6 1],[66.398 0.8 1],[66.452 0.8 1],[66.506 0.8 1],[66.57 15 1],[66.681 0.6 2],[70.511 0.8 2],[71.955 100 1],[72.298 100 1],[78.464 0.7 2],[78.48 0.7 2],[79.552 0.8 2],[79.816 100 1],[83.41 120 1],[84.78 60 1],[86.597 0.5 2],[87.349 150 1],[87.594 100 1],[87.984 200 1],[88.188 150 1],[89.1 100 1],[89.317 100 1],[91.928 0.7 3],[92.038 0.5 2],[96.117 0.6 2],[100.057 120 1],[100.335 100 1],[101.858 400 1],[103.466 1000 1],[105.474 150 1],[106.634 200 1],[107.521 300 1],[107.858 0.6 2],[109.42 0.8 2],[110.5 500 1],[111.116 250 1],[111.722 150 1],[112.525 350 1],[113.15 200 1],[113.975 120 1],[113.98 1000 1],[115.467 150 1],[115.987 100 1],[116.056 1000 1],[116.648 2000 1],[116.705 150 1],[117.584 500 1],[117.865 1000 1],[118.734 1500 1],[119.085 1000 1],[119.529 1.5 0],[119.888 500 1],[120.022 700 1],[121.841 20 0],[122.089 2000 1],[122.405 60 0],[122.408 60 0],[122.889 50 0],[123.406 2000 1],[124.466 0.4 2],[125.134 60 0],[125.235 0.8 2],[125.915 250 0],[125.951 300 0],[126.127 80 0],[126.757 60 0],[126.76 60 0],[127.526 150 0],[128.94 300 0],[130.034 1000 0],[130.298 300 0],[130.693 0.5 2],[131.395 300 0],[131.754 300 0],[133.019 200 0],[133.652 2000 1],[135.51 500 0],[135.797 300 0],[136.097 500 0],[136.111 300 0],[136.771 250 0],[136.822 250 0],[138.323 400 0],[139.075 300 0],[139.29 200 0],[140.001 200 0],[142.549 800 0],[144.626 500 0],[145.318 500 0],[145.739 500 0],[145.747 500 0],[145.798 1000 0],[145.879 250 0],[145.915 400 0],[146.583 250 0],[148.592 100 0],[149.289 500 0],[150.704 500 0],[151.468 500 0],[151.805 1500 0],[152.645 250 0],[159.358 500 0],[161.76 500 0],[164.078 250 0],[170.207 1500 0],[178.276 1200 0],[179.909 500 0],[183.038 7500 0],[184.445 1500 0],[206.163 200 0],[222.443 0.1 2],[223.812 0.1 2],[224.93 0.5 3],[224.931 0.3 2],[230.938 0.2 2],[234.084 0.4 3],[234.085 0.3 2],[235.043 0.3 2],[235.346 0.2 2],[236.113 0.7 3],[236.774 0.4 2],[236.775 0.5 3],[237.145 0.2 2],[237.245 0.3 2],[237.245 0.6 3],[237.646 0.7 3],[237.647 0.4 2],[238.528 0.4 3],[238.711 0.8 3],[238.712 0.4 2],[239.2 0.6 3],[239.201 0.3 2],[240.305 0.4 3],[240.306 0.2 2],[240.363 0.2 2],[240.801 10 1],[241.485 0.2 2],[241.845 0.2 3],[241.849 0.2 2],[241.885 0.2 2],[241.918 10 1],[242.389 0.3 3],[242.391 0.2 2],[242.61 0.9 3],[242.612 0.5 2],[243.485 0.6 3],[243.488 0.3 2],[246.25 0.2 2],[246.668 0.3 3],[246.669 0.3 2],[246.696 0.3 3],[246.699 0.3 2],[247.535 0.8 3],[247.536 0.6 2],[248.551 0.4 3],[248.924 0.5 3],[248.927 0.4 2],[249.32 0.4 3],[249.321 0.2 2],[249.427 0.2 2],[249.474 10 1],[249.516 0.3 2],[249.607 0.2 2],[250.138 0.2 3],[250.141 0.3 2],[251.374 0.3 3],[251.682 0.2 2],[251.974 0.8 3],[251.975 0.6 2],[252.172 0.4 2],[252.172 0.6 3],[253.198 0.4 3],[253.199 0.3 2],[253.36 10 1],[253.427 20 1],[253.754 0.5 3],[253.756 0.2 2],[254.567 0.8 3],[254.571 0.7 2],[256.624 100 1],[258.279 200 1],[259.346 30 1],[264.077 0.4 2],[264.077 0.4 3],[264.211 0.4 2],[264.211 0.5 3],[265.223 0.8 3],[265.225 0.6 2],[268.898 20 1],[273.012 50 1],[276.515 2 1],[280.859 20 1],[281.845 0.3 3],[281.848 0.2 2],[283.944 0.2 2],[286.467 0.4 2],[286.468 0.6 3],[287.863 150 1],[288.515 0.4 2],[291.097 0.4 3],[291.098 0.3 2],[291.733 0.5 3],[291.735 0.3 2],[293.111 0.2 2],[299.387 100 1],[300.568 0.2 2],[306.917 0.4 3],[306.923 0.3 2],[307.875 500 1],[315.388 0.3 2],[316.103 20 1],[317.011 0.4 3],[317.014 0.3 2],[317.507 100 1],[318.164 0.4 3],[318.166 0.3 2],[321.012 0.4 3],[321.014 0.3 2],[321.348 0.6 3],[321.349 0.4 2],[322.49 0.6 3],[322.493 0.4 2],[330.047 0.2 2],[335.553 30 1],[342.499 25 1],[347.953 0.2 2],[349.741 30 1],[352.69 50 1],[354.69 0.4 3],[354.692 0.3 2],[361.381 0.3 2],[374.214 20 1],[375.44 0.2 2],[375.455 0.2 2],[396.316 0.3 2],[407.714 0.3 2],[410.223 20 0],[412.921 20 0],[413.415 10 0],[432.184 50 0],[445.286 30 1],[459.977 20 1],[463.245 30 1],[466.648 50 1],[467.553 100 1],[476.331 25 0],[486.232 100 0],[491.694 20 0],[498.692 100 1],[506.537 40 1],[511.929 1000 0],[514.973 20 1],[516.12 300 1],[517.619 30 1],[521.627 60 1],[522.897 50 1],[523.457 100 0],[524.571 300 1],[526.936 50 1],[529.978 40 1],[532.28 40 1],[533.822 1000 1],[534.515 500 1],[536.986 100 1],[540.542 80 1],[540.736 80 1],[542.706 60 0],[543.583 300 1],[543.8 100 1],[546.462 200 1],[549.15 80 1],[549.694 100 1],[550.472 100 1],[552.206 60 1],[559.852 60 1],[560.032 100 1],[561.289 150 1],[562.569 1000 1],[567.808 100 1],[569.091 200 1],[570.205 50 1],[571.053 400 1],[573.827 100 1],[576.072 100 1],[576.433 100 0],[577.483 50 1],[578.702 50 1],[589.403 200 0],[595.025 500 1],[598.486 30 0],[602.408 200 0],[606.893 50 1],[607.498 200 1],[608.243 100 0],[612.749 200 1],[619.188 80 0],[620.486 100 1],[621.31 50 0],[624.448 80 0],[625.749 90 1],[629.398 100 0],[631.313 50 0],[633.037 80 0],[633.35 40 0],[633.785 200 0],[633.944 100 0],[635.916 50 0],[656.649 100 0],[658.375 200 0],[658.527 100 0],[661.966 500 0],[666.111 50 0],[666.596 60 1],[669.729 50 0],[671.883 30 1],[673.203 40 0],[681.257 400 1],[695.878 100 1],[698.978 50 0],[708.521 20 1],[712.005 50 0],[712.205 120 0],[714.206 200 0],[716.479 100 0],[719.166 40 0],[722.73 70 0],[723.678 100 0],[723.784 50 0],[735.135 50 1],[740.206 500 0],[741.05 100 0],[741.648 50 0],[746.899 500 0],[749.052 50 0],[755.418 200 0],[755.665 50 0],[770.02 200 0],[779.898 50 1],[789.798 60 0],[796.948 50 0],[800.363 100 0],[804.374 9900 0],[806.57 30 0],[809.076 100 0],[816.938 80 0],[822.257 50 0],[824.005 400 0],[839.33 1000 0],[841.46 15 1],[848.611 100 0],[866.495 150 0],[870.08 50 0],[874.822 25 0],[885.324 100 0],[885.38 200 0],[885.75 300 0],[889.85 100 0],[896.469 40 0],[899.313 40 0],[902.24 500 0],[905.833 1500 0],[909.886 100 0],[911.391 1200 0],[912.803 60 0],[919.53 3 1],[922.774 60 0],[933.505 100 0],[942.671 400 0],[942.715 300 0],[948.033 1 1],[959.822 200 0],[964.961 200 0],[965.306 300 0],[973.173 500 0],[1000.305 50 0],[1013.116 75 0],[1023.882 100 0],[1037.52 40 0],[1039.174 40 0],[1040.549 0.6 1],[1046.654 500 0],[1108.468 0.1 1],[1123.656 40 0],[1155.846 35 0],[1177.834 32 0],[1199.686 45 0],[1203.369 30 0],[1230.458 15 0],[1314.916 6 0],[1395.827 14 0],[1428.702 20 0],[1446 10 0],[1503.257 22.5 0],[1552.865 10.5 0],[1603.733 15 0],[1827.5711 1.5 0],[1834.852 2 0],[1898.241 1.5 0],[1907.017 3.5 0],[1910.5119 11 0],[1937.002 5 0],[2064.8689 1 0],[2218.3029 22 0],[2222.6529 15 0],[2230.9211 3 0],[2442.082 3.2 0],[2736.542 1.2 0],[2757.3051 0.9 0],[3036.193 1 0],[3038.3881 0.8 0],[3429.573 1 0],[3451.3109 0.9 0],[4022.8539 0.3 0],[4163.3801 0.2 0]}{ALLx9900x9900x2000x0.8x0.9x5x0}{UVx7500x7500x2000x0.8x0.9x5x0}{VISx1000x1000x1000x0.3x0x0x0}{IVx9900x9900x15x0x0x0x0}%
+\pgfspectra@elt@search{#1}{I}{[36.378 3 4],[38.074 3.6 4],[56.553 4.5 4],[60.186 0.5 3],[60.757 5 4],[61.246 0.6 3],[61.517 0.4 3],[65.422 0.4 3],[65.456 0.4 3],[65.58 0.2 1],[65.9 0.6 1],[66.398 0.8 1],[66.452 0.8 1],[66.506 0.8 1],[66.57 15 1],[66.681 0.6 2],[70.511 0.8 2],[71.955 100 1],[72.298 100 1],[78.464 0.7 2],[78.48 0.7 2],[79.552 0.8 2],[79.816 100 1],[83.41 120 1],[84.78 60 1],[86.597 0.5 2],[87.349 150 1],[87.594 100 1],[87.984 200 1],[88.188 150 1],[89.1 100 1],[89.317 100 1],[91.928 0.7 3],[92.038 0.5 2],[96.117 0.6 2],[100.057 120 1],[100.335 100 1],[101.858 400 1],[103.466 1000 1],[105.474 150 1],[106.634 200 1],[107.521 300 1],[107.858 0.6 2],[109.42 0.8 2],[110.5 500 1],[111.116 250 1],[111.722 150 1],[112.525 350 1],[113.15 200 1],[113.975 120 1],[113.98 1000 1],[115.467 150 1],[115.987 100 1],[116.056 1000 1],[116.648 2000 1],[116.705 150 1],[117.584 500 1],[117.865 1000 1],[118.734 1500 1],[119.085 1000 1],[119.529 1.5 0],[119.888 500 1],[120.022 700 1],[121.841 20 0],[122.089 2000 1],[122.405 60 0],[122.408 60 0],[122.889 50 0],[123.406 2000 1],[124.466 0.4 2],[125.134 60 0],[125.235 0.8 2],[125.915 250 0],[125.951 300 0],[126.127 80 0],[126.757 60 0],[126.76 60 0],[127.526 150 0],[128.94 300 0],[130.034 1000 0],[130.298 300 0],[130.693 0.5 2],[131.395 300 0],[131.754 300 0],[133.019 200 0],[133.652 2000 1],[135.51 500 0],[135.797 300 0],[136.097 500 0],[136.111 300 0],[136.771 250 0],[136.822 250 0],[138.323 400 0],[139.075 300 0],[139.29 200 0],[140.001 200 0],[142.549 800 0],[144.626 500 0],[145.318 500 0],[145.739 500 0],[145.747 500 0],[145.798 1000 0],[145.879 250 0],[145.915 400 0],[146.583 250 0],[148.592 100 0],[149.289 500 0],[150.704 500 0],[151.468 500 0],[151.805 1500 0],[152.645 250 0],[159.358 500 0],[161.76 500 0],[164.078 250 0],[170.207 1500 0],[178.276 1200 0],[179.909 500 0],[183.038 7500 0],[184.445 1500 0],[206.163 200 0],[222.443 0.1 2],[223.812 0.1 2],[224.93 0.5 3],[224.931 0.3 2],[230.938 0.2 2],[234.084 0.4 3],[234.085 0.3 2],[235.043 0.3 2],[235.346 0.2 2],[236.113 0.7 3],[236.774 0.4 2],[236.775 0.5 3],[237.145 0.2 2],[237.245 0.3 2],[237.245 0.6 3],[237.646 0.7 3],[237.647 0.4 2],[238.528 0.4 3],[238.711 0.8 3],[238.712 0.4 2],[239.2 0.6 3],[239.201 0.3 2],[240.305 0.4 3],[240.306 0.2 2],[240.363 0.2 2],[240.801 10 1],[241.485 0.2 2],[241.845 0.2 3],[241.849 0.2 2],[241.885 0.2 2],[241.918 10 1],[242.389 0.3 3],[242.391 0.2 2],[242.61 0.9 3],[242.612 0.5 2],[243.485 0.6 3],[243.488 0.3 2],[246.25 0.2 2],[246.668 0.3 3],[246.669 0.3 2],[246.696 0.3 3],[246.699 0.3 2],[247.535 0.8 3],[247.536 0.6 2],[248.551 0.4 3],[248.924 0.5 3],[248.927 0.4 2],[249.32 0.4 3],[249.321 0.2 2],[249.427 0.2 2],[249.474 10 1],[249.516 0.3 2],[249.607 0.2 2],[250.138 0.2 3],[250.141 0.3 2],[251.374 0.3 3],[251.682 0.2 2],[251.974 0.8 3],[251.975 0.6 2],[252.172 0.4 2],[252.172 0.6 3],[253.198 0.4 3],[253.199 0.3 2],[253.36 10 1],[253.427 20 1],[253.754 0.5 3],[253.756 0.2 2],[254.567 0.8 3],[254.571 0.7 2],[256.624 100 1],[258.279 200 1],[259.346 30 1],[264.077 0.4 2],[264.077 0.4 3],[264.211 0.4 2],[264.211 0.5 3],[265.223 0.8 3],[265.225 0.6 2],[268.898 20 1],[273.012 50 1],[276.515 2 1],[280.859 20 1],[281.845 0.3 3],[281.848 0.2 2],[283.944 0.2 2],[286.467 0.4 2],[286.468 0.6 3],[287.863 150 1],[288.515 0.4 2],[291.097 0.4 3],[291.098 0.3 2],[291.733 0.5 3],[291.735 0.3 2],[293.111 0.2 2],[299.387 100 1],[300.568 0.2 2],[306.917 0.4 3],[306.923 0.3 2],[307.875 500 1],[315.388 0.3 2],[316.103 20 1],[317.011 0.4 3],[317.014 0.3 2],[317.507 100 1],[318.164 0.4 3],[318.166 0.3 2],[321.012 0.4 3],[321.014 0.3 2],[321.348 0.6 3],[321.349 0.4 2],[322.49 0.6 3],[322.493 0.4 2],[330.047 0.2 2],[335.553 30 1],[342.499 25 1],[347.953 0.2 2],[349.741 30 1],[352.69 50 1],[354.69 0.4 3],[354.692 0.3 2],[361.381 0.3 2],[374.214 20 1],[375.44 0.2 2],[375.455 0.2 2],[396.316 0.3 2],[407.714 0.3 2],[410.223 20 0],[412.921 20 0],[413.415 10 0],[432.184 50 0],[445.286 30 1],[459.977 20 1],[463.245 30 1],[466.648 50 1],[467.553 100 1],[476.331 25 0],[486.232 100 0],[491.694 20 0],[498.692 100 1],[506.537 40 1],[511.929 1000 0],[514.973 20 1],[516.12 300 1],[517.619 30 1],[521.627 60 1],[522.897 50 1],[523.457 100 0],[524.571 300 1],[526.936 50 1],[529.978 40 1],[532.28 40 1],[533.822 1000 1],[534.515 500 1],[536.986 100 1],[540.542 80 1],[540.736 80 1],[542.706 60 0],[543.583 300 1],[543.8 100 1],[546.462 200 1],[549.15 80 1],[549.694 100 1],[550.472 100 1],[552.206 60 1],[559.852 60 1],[560.032 100 1],[561.289 150 1],[562.569 1000 1],[567.808 100 1],[569.091 200 1],[570.205 50 1],[571.053 400 1],[573.827 100 1],[576.072 100 1],[576.433 100 0],[577.483 50 1],[578.702 50 1],[589.403 200 0],[595.025 500 1],[598.486 30 0],[602.408 200 0],[606.893 50 1],[607.498 200 1],[608.243 100 0],[612.749 200 1],[619.188 80 0],[620.486 100 1],[621.31 50 0],[624.448 80 0],[625.749 90 1],[629.398 100 0],[631.313 50 0],[633.037 80 0],[633.35 40 0],[633.785 200 0],[633.944 100 0],[635.916 50 0],[656.649 100 0],[658.375 200 0],[658.527 100 0],[661.966 500 0],[666.111 50 0],[666.596 60 1],[669.729 50 0],[671.883 30 1],[673.203 40 0],[681.257 400 1],[695.878 100 1],[698.978 50 0],[708.521 20 1],[712.005 50 0],[712.205 120 0],[714.206 200 0],[716.479 100 0],[719.166 40 0],[722.73 70 0],[723.678 100 0],[723.784 50 0],[735.135 50 1],[740.206 500 0],[741.05 100 0],[741.648 50 0],[746.899 500 0],[749.052 50 0],[755.418 200 0],[755.665 50 0],[770.02 200 0],[779.898 50 1],[789.798 60 0],[796.948 50 0],[800.363 100 0],[804.374 9900 0],[806.57 30 0],[809.076 100 0],[816.938 80 0],[822.257 50 0],[824.005 400 0],[839.33 1000 0],[841.46 15 1],[848.611 100 0],[866.495 150 0],[870.08 50 0],[874.822 25 0],[885.324 100 0],[885.38 200 0],[885.75 300 0],[889.85 100 0],[896.469 40 0],[899.313 40 0],[902.24 500 0],[905.833 1500 0],[909.886 100 0],[911.391 1200 0],[912.803 60 0],[919.53 3 1],[922.774 60 0],[933.505 100 0],[942.671 400 0],[942.715 300 0],[948.033 1 1],[959.822 200 0],[964.961 200 0],[965.306 300 0],[973.173 500 0],[1000.305 50 0],[1013.116 75 0],[1023.882 100 0],[1037.52 40 0],[1039.174 40 0],[1040.549 0.6 1],[1046.654 500 0],[1108.468 0.1 1],[1123.656 40 0],[1155.846 35 0],[1177.834 32 0],[1199.686 45 0],[1203.369 30 0],[1230.458 15 0],[1314.916 6 0],[1395.827 14 0],[1428.702 20 0],[1446 10 0],[1503.257 22.5 0],[1552.865 10.5 0],[1603.733 15 0],[1827.5711 1.5 0],[1834.852 2 0],[1898.241 1.5 0],[1907.017 3.5 0],[1910.5119 11 0],[1937.002 5 0],[2064.8689 1 0],[2218.3029 22 0],[2222.6529 15 0],[2230.9211 3 0],[2442.082 3.2 0],[2736.542 1.2 0],[2757.3051 0.9 0],[3036.193 1 0],[3038.3881 0.8 0],[3429.573 1 0],[3451.3109 0.9 0]}{ALLx9900x9900x2000x0.8x0.9x5x0}{UVx7500x7500x2000x0.8x0.9x5x0}{VISx1000x1000x1000x0.3x0x0x0}{IVx9900x9900x15x0x0x0x0}%,[4022.8539 0.3 0],[4163.3801 0.2 0]
\pgfspectra@elt@search{#1}{Xe}{[65.78 8 2],[66.01 8 2],[67.38 9 2],[67.4 9 2],[67.66 9 2],[69.4 10 2],[69.85 20 2],[70.51 12 2],[72.12 10 2],[73.1 15 2],[73.33 10 2],[74.041 350 1],[74.26 15 2],[75.6 10 2],[76.15 10 2],[76.91 10 2],[77.91 25 2],[79.29 15 2],[79.61 12 2],[80.2 15 2],[80.307 350 1],[82.32 25 2],[82.49 30 2],[85.3 25 2],[88.08 600 1],[88.554 350 1],[88.93 15 2],[89.4 20 2],[89.6 20 2],[92.587 600 1],[93.54 250 1],[96.55 10 2],[97.277 800 1],[97.668 700 1],[100.34 35 2],[101.77 35 2],[103.244 500 1],[103.768 700 1],[104.131 1100 1],[104.78 10 2],[104.827 1000 1],[105.192 1200 1],[106.64 12 2],[107.448 2000 1],[108.386 600 1],[110.043 1200 1],[113.03 30 2],[115.847 600 1],[116.963 250 1],[118.305 800 1],[119.204 250 0],[123.21 25 2],[124.476 600 1],[125.02 250 0],[129.559 1000 0],[146.961 600 0],[266.898 80 2],[271.733 100 2],[281.445 30 2],[281.591 40 2],[282.745 30 2],[284.765 40 2],[286.24 30 2],[286.473 200 1],[287.11 80 2],[287.124 60 2],[287.17 30 2],[289.522 150 1],[289.662 30 2],[290.66 50 2],[291.189 40 2],[291.236 80 2],[294.02 40 2],[294.52 60 2],[294.75 40 2],[294.81 40 2],[297.047 80 2],[297.932 400 1],[299.287 40 2],[300.425 30 2],[301.743 100 1],[302.381 100 2],[308.35 40 2],[309.11 50 2],[310.646 30 2],[312.887 300 1],[313.83 100 2],[315.082 80 2],[318.52 40 2],[324.286 100 2],[326.898 80 2],[328.782 30 2],[330.155 80 2],[333.16 40 2],[335.8 30 2],[336.672 200 1],[338.412 80 2],[340.007 2 0],[341.837 2 0],[342 2 0],[344.266 3 0],[344.42 60 2],[345.42 70 2],[345.87 100 2],[346.126 100 1],[346.822 40 2],[346.981 4 0],[347.236 4 0],[350.674 5 0],[352.283 80 2],[354.23 50 2],[354.986 10 0],[355.21 50 2],[355.404 10 0],[356.14 40 2],[357.97 100 2],[358.36 80 2],[359.54 100 2],[360.606 100 2],[360.7 40 2],[361.032 15 0],[361.306 8 0],[361.59 100 2],[362.31 40 2],[362.408 600 2],[363.306 6 0],[366.991 10 0],[367.667 50 2],[368.59 40 0],[369.349 40 0],[377.63 40 2],[378.102 300 2],[384.15 100 2],[387.78 200 2],[388.05 60 2],[390.791 100 1],[392.255 500 2],[395.059 300 2],[403.759 100 1],[405.007 200 2],[405.746 200 1],[406.04 60 2],[409.889 100 1],[410.91 100 2],[414.57 100 2],[415.804 200 1],[418.01 1000 1],[419.315 500 1],[420.848 300 1],[420.947 100 1],[421.372 300 1],[421.56 100 1],[422.3 300 1],[423.825 400 1],[424.538 500 1],[425.157 100 1],[428.59 30 2],[429.64 500 1],[431.051 500 1],[433.052 1000 1],[436.92 200 1],[437.378 100 1],[439.32 500 1],[439.577 500 1],[440.688 200 1],[441.607 150 1],[443.42 50 2],[444.813 500 1],[446.21 100 2],[446.219 1000 1],[448.086 500 1],[452.186 100 1],[456.91 100 2],[457.01 100 2],[464.14 100 2],[467.37 30 2],[468.357 60 2],[472.36 30 2],[473.4152 600 0],[475.73 100 2],[479.2619 150 0],[480.702 500 0],[482.971 400 0],[484.329 300 0],[486.95 40 2],[491.651 500 0],[492.3152 500 0],[497.171 200 1],[497.271 400 1],[498.877 300 1],[499.117 100 1],[502.828 200 0],[504.492 200 1],[508.062 1000 1],[512.242 300 1],[512.57 100 1],[517.882 100 1],[518.804 300 1],[519.137 400 1],[519.21 100 1],[523.9 60 2],[526.044 500 1],[526.195 500 1],[529.222 2000 1],[530.927 300 1],[531.387 1000 1],[533.933 2000 1],[536.32 200 1],[536.71 30 2],[536.807 200 1],[537.239 500 1],[539.28 100 0],[540.1 50 2],[541.915 3000 1],[543.896 800 1],[544.545 300 1],[545.045 200 1],[546.039 400 1],[547.261 1000 1],[549.486 100 1],[552.44 40 2],[552.553 200 1],[553.107 600 1],[556.662 100 0],[561.667 300 1],[565.938 300 1],[566.756 600 1],[567.091 150 1],[569.575 100 0],[569.961 200 1],[571.61 200 1],[572.691 500 1],[575.103 500 1],[575.865 300 1],[577.639 300 1],[581.596 100 1],[582.389 300 0],[582.48 150 0],[587.502 100 0],[589.329 300 1],[589.499 100 0],[590.513 200 1],[593.417 100 0],[594.553 500 1],[597.113 300 1],[597.646 2000 1],[600.892 200 1],[603.62 1000 1],[605.115 2000 1],[609.35 600 1],[609.759 1500 1],[610.143 400 1],[611.508 100 1],[614.645 100 1],[617.83 150 0],[617.966 120 0],[618.242 300 0],[619.407 500 1],[619.826 100 0],[620.597 60 2],[622.002 100 1],[622.17 25 2],[623.82 60 2],[625.905 60 2],[627.082 500 1],[627.754 400 1],[628.441 100 1],[628.601 100 0],[630.086 250 1],[631.806 500 0],[634.396 400 1],[635.635 600 1],[637.528 200 1],[639.799 100 1],[646.97 300 0],[647.284 150 0],[648.776 120 0],[649.872 100 0],[650.418 200 0],[651.283 300 1],[652.865 200 1],[653.316 100 0],[659.501 1000 1],[659.556 100 0],[659.725 400 1],[659.884 100 1],[666.892 150 0],[669.432 300 1],[672.801 200 0],[678.871 150 1],[679.037 100 1],[680.574 1000 1],[682.732 200 0],[687.211 100 0],[688.216 300 0],[691.022 80 1],[692.553 100 0],[694.211 800 1],[697.618 100 0],[699.088 2000 1],[708.215 150 1],[711.96 500 0],[714.75 50 1],[714.903 200 1],[716.483 500 1],[728.434 100 1],[730.18 200 1],[733.93 200 1],[738.6 100 0],[739.379 150 0],[754.845 300 1],[758.468 200 0],[761.857 80 1],[764.202 500 0],[764.391 100 0],[767.066 200 1],[778.704 60 1],[780.265 100 0],[788.132 100 0],[788.74 300 0],[796.734 500 0],[802.967 100 0],[805.726 200 0],[806.134 150 0],[810.198 100 0],[815.18 150 1],[817.102 100 0],[820.634 700 0],[823.1635 10000 0],[826.652 500 0],[828.0116 7000 0],[834.682 2000 0],[834.724 100 1],[840.919 2000 0],[851.519 50 1],[857.601 200 0],[860.423 50 1],[864.854 250 0],[869.22 100 0],[869.686 200 0],[871.619 50 1],[873.939 300 0],[875.82 100 0],[881.941 5000 0],[886.232 300 0],[890.873 200 0],[893.083 200 0],[895.225 1000 0],[898.105 100 0],[898.757 200 0],[904.545 400 0],[916.265 500 0],[916.752 100 0],[937.476 100 0],[951.338 200 0],[959.135 50 1],[968.532 150 0],[969.868 50 1],[971.816 100 0],[979.97 2000 0],[992.319 3000 0],[1083.837 100 0],[1174.201 90 0],[1223.524 375 0],[1225.776 100 0],[1259.02 300 0],[1262.3391 2500 0],[1354.415 250 0],[1365.7055 2000 0],[1414.2444 1250 0],[1424.096 800 0],[1436.499 375 0],[1466.081 140 0],[1473.2806 3000 0],[1509.972 100 0],[1541.8394 2500 0],[1555.713 150 0],[1597.954 250 0],[1603.99 100 0],[1605.328 1000 0],[1655.449 125 0],[1672.815 1500 0],[1732.577 1500 0],[1878.8131 350 0],[2018.7189 150 0],[2026.2242 3000 0],[2147.009 250 0],[2319.333 1250 0],[2327.9539 110 0],[2482.4711 1800 0],[2514.584 175 0],[2626.908 2000 0],[2651.0859 2500 0],[2838.1539 250 0],[2858.225 750 0],[2938.441 300 0],[2944.8061 150 0],[2964.958 100 0],[2981.3619 100 0],[3025.3141 600 0],[3047.5461 1500 0],[3050.4119 100 0],[3079.418 500 0],[3106.923 6000 0],[3133.601 125 0],[3160.791 550 0],[3229.308 100 0],[3273.926 1800 0],[3366.6691 3500 0],[3401.4672 150 0],[3433.527 450 0],[3474.4 170 0],[3507.025 5000 0],[3524.6922 110 0],[3620.9211 250 0],[3623.1738 150 0],[3650.8359 450 0],[3678.8828 850 0],[3868.598 140 0],[3873.782 175 0],[3893.9602 270 0],[3995.5141 120 0]}{ALLx10000x10000x3000x600x0x0x0}{UVx2000x1000x2000x600x0x0x0}{VISx3000x600x3000x500x0x0x0}{IVx10000x10000x150x0x0x0x0}%
\pgfspectra@elt@search{#1}{Cs}{[55.691 15 2],[58.415 50 2],[58.44 10 2],[59.1044 5 1],[60.301 240 2],[60.7291 1 1],[60.785 120 2],[60.794 160 2],[61.2786 0.8 1],[61.401 2000 2],[62.115 300 2],[63.586 120 2],[63.767 60 2],[63.817 400 2],[63.9356 40 1],[65.7112 2 1],[65.794 5 2],[66.382 90 2],[66.46 90 2],[66.625 500 2],[66.8386 10 1],[67.306 360 2],[67.96 80 2],[68.755 160 2],[69.16 1000 2],[69.943 160 2],[70.34 30 3],[70.389 700 2],[71.025 200 2],[71.8138 300 1],[72.179 4000 2],[72.22 4000 2],[73.156 1000 2],[73.195 60 2],[73.666 200 2],[74.029 2400 2],[74.223 30 2],[74.994 200 2],[75.038 300 2],[75.518 300 2],[75.882 240 2],[75.99 1.2 2],[77.361 1.4 3],[78.773 60 2],[80.195 15 2],[80.8761 300 1],[81.3837 300 1],[81.402 40 2],[81.735 3 2],[82.034 160 2],[82.364 0.8 3],[82.48 30 3],[82.599 40 2],[83.039 1500 2],[83.739 20 2],[84.337 0.8 2],[84.792 50 2],[86.183 3 3],[87.484 40 3],[89.692 30 3],[90.127 700 1],[92.035 3000 2],[92.166 100 2],[92.302 20 3],[92.6657 800 1],[93.267 5 2],[98.614 40 3],[99.514 10 3],[105.479 5000 2],[106.891 30 3],[117.865 26 1],[119.155 16 1],[202.505 5 1],[203.515 12 1],[207.743 16 1],[208.005 16 1],[208.871 16 1],[209.197 16 1],[209.95 3 1],[211.265 5 1],[214.675 20 1],[217.96 26 1],[218.214 5 1],[218.947 26 1],[221.315 5 1],[222.051 20 1],[222.888 26 1],[225.458 50 1],[225.782 40 1],[225.835 5 1],[226.761 70 1],[227.383 70 1],[228.668 5 1],[230.771 5 1],[231.568 8 1],[232.107 26 1],[234.313 16 1],[235.444 26 1],[235.785 5 1],[236.481 26 1],[239.286 50 1],[241.489 16 1],[243.271 5 1],[244.324 5 1],[247.607 26 1],[248.041 8 1],[251.572 26 1],[252.366 3 1],[253.908 26 1],[253.917 5 1],[255.065 12 1],[255.117 26 1],[256.817 26 1],[256.869 50 1],[257.303 200 1],[257.454 26 1],[257.674 26 1],[259.009 26 1],[260.944 50 1],[261.627 26 1],[262.795 5 1],[263.714 16 1],[264.469 5 1],[264.807 26 1],[265.171 40 1],[266.024 5 1],[266.979 26 1],[267.117 3 1],[267.324 8 1],[268.66 26 1],[268.941 5 1],[270.119 3 1],[272.421 26 1],[273.007 5 1],[273.388 5 1],[274.823 50 1],[274.984 16 1],[275.781 12 1],[276.197 16 1],[276.61 5 1],[277.699 50 1],[278.824 26 1],[278.98 26 1],[279.332 5 1],[279.45 26 1],[279.941 26 1],[281.694 100 1],[282.027 5 1],[282.904 5 1],[282.942 5 1],[284.619 26 1],[285.242 16 1],[286.637 16 1],[288.119 50 1],[288.374 5 1],[289.975 16 1],[291.465 16 1],[293.109 100 1],[294.095 100 1],[294.225 16 1],[294.98 6 1],[296.838 4 1],[297.085 5 1],[300.127 20 1],[301.204 16 1],[302.037 3 1],[306.098 3 1],[306.66 20 1],[308.087 5 1],[309.231 20 1],[318.094 16 1],[326.592 160 1],[326.713 160 1],[327.163 100 1],[332.943 20 1],[336.856 160 1],[355.98 20 1],[356.511 20 1],[365.107 3 1],[368.01 3 1],[368.764 3 1],[369.948 20 1],[373.254 3 1],[373.434 20 1],[375.14 3 1],[378.542 70 1],[380.51 100 1],[387.016 3 1],[387.6143 30 0],[388.8608 16 0],[389.698 200 1],[390.693 70 1],[392.558 100 1],[395.95 70 1],[396.519 100 1],[397.8 30 1],[404.718 70 1],[405.396 40 1],[406.796 100 1],[406.877 100 1],[407.336 14 1],[411.929 12 1],[412.121 100 1],[413.2 20 1],[415.127 70 1],[415.861 70 1],[419.32 12 1],[421.313 100 1],[422.112 40 1],[423.219 100 1],[423.441 70 1],[424.197 20 1],[427.174 20 1],[427.71 400 1],[428.835 200 1],[429.2 40 1],[430.064 100 1],[430.794 10 1],[432.758 10 1],[433.024 70 1],[436.328 400 1],[437.302 100 1],[438.443 80 1],[438.876 20 1],[439.691 40 1],[439.95 70 1],[440.385 70 1],[440.525 200 1],[441.021 70 1],[442.405 20 1],[443.571 70 1],[444.4 20 1],[445.344 40 1],[445.768 40 1],[445.918 40 1],[449.366 20 1],[450.152 200 1],[450.671 40 1],[450.683 20 1],[451.55 20 1],[452.285 30 1],[452.672 200 1],[453.894 160 1],[455.5276 80 0],[456.698 30 1],[457.179 30 1],[459.3169 40 0],[460.376 500 1],[460.999 20 1],[461.613 30 1],[462.309 70 1],[464.651 100 1],[465.654 30 1],[467.028 70 1],[469.561 20 1],[470.179 100 1],[473.298 70 1],[473.966 70 1],[474.913 20 1],[476.362 100 1],[478.636 40 1],[483.016 160 1],[487.002 160 1],[495.284 160 1],[497.259 100 1],[504.38 160 1],[505.27 100 1],[505.987 100 1],[508.177 20 1],[509.66 80 1],[522.7 300 1],[524.937 160 1],[527.404 80 1],[530.661 70 1],[534.916 70 1],[537.097 160 1],[541.969 100 1],[546.5944 1 0],[550.2884 1 0],[556.302 200 1],[563.5212 2.2 0],[566.4018 6 0],[574.5724 1.6 0],[581.418 70 1],[583.116 100 1],[583.8835 1 0],[584.5141 6 0],[592.565 100 1],[601.049 16 0],[603.4089 6 0],[612.862 80 1],[621.31 24 0],[621.7599 3 0],[635.4555 10 0],[641.954 20 1],[643.1969 3 0],[647.2623 3 0],[649.553 40 1],[653.644 40 1],[658.602 6 0],[658.651 40 0],[662.866 7 0],[672.3284 40 0],[682.4652 20 0],[687.0455 20 0],[695.552 80 1],[697.3297 40 0],[698.3491 7 0],[722.8536 40 0],[727.99 12 0],[727.9957 40 0],[760.8903 30 0],[794.3882 60 0],[799.068 12 0],[801.5724 20 0],[805.335 12 0],[807.892 12 0],[807.9033 70 0],[852.1122 200 0],[876.1415 40 0],[894.346 120 0],[917.2322 70 0],[920.8538 20 0],[1002.4359 70 0],[1012.3414 20 0],[1012.3602 80 0],[1358.831 28 0],[1360.257 3 0],[1375.883 3 0],[1469.493 70 0],[1792.3619 2.4 0],[1792.4211 1.8 0],[1916.2529 5 0],[1916.3199 4 0],[2131.1461 10 0],[2131.2289 9 0],[2576.349 20 0],[2576.4699 18 0],[3942.1219 40 0],[3942.4078 36 0]}{ALLx5000x200x800x5000x40x0x0}{UVx5000x0x800x5000x40x0x0}{VISx500x80x500x0x0x0x0}{IVx200x200x0x0x0x0x0}%
\pgfspectra@elt@search{#1}{Ba}{[40.382 1 2],[40.712 0.4 2],[42.012 1.4 2],[42.384 0.8 2],[44.895 1.8 2],[45.696 1.6 2],[55.548 2.8 2],[58.757 2.8 2],[64.727 3.6 2],[65.336 1.8 2],[74.312 3 2],[79.489 8000 3],[92.374 10000 3],[109.741 2.4 2],[111.367 3 2],[111.601 2.2 2],[113.305 2.8 2],[115.176 2.4 2],[117.062 2.4 2],[120.729 2.6 2],[121.892 2.2 2],[122.455 2.4 2],[128.853 2.4 2],[129.918 2.2 2],[130.74 2.2 2],[130.887 2.4 2],[131.572 2.4 2],[133.401 2.4 2],[135.471 2.2 2],[136.953 2.2 2],[141.661 2.2 2],[147.885 2.4 2],[148.672 40 1],[150.401 80 1],[151.068 2.4 2],[151.422 2.4 2],[155.438 60 1],[156.561 2.4 2],[156.612 2.4 2],[157.273 40 1],[157.455 2.4 2],[159.68 2.4 2],[161.095 2.4 2],[161.578 2.4 2],[167.451 20 1],[169.437 80 1],[171.153 2.4 2],[186.174 2.4 2],[188.392 2.4 2],[190.415 20 1],[192.47 100 1],[197.476 2.2 2],[199.954 60 1],[200.13 2 2],[200.84 3 2],[202.245 2.6 2],[202.395 80 1],[203.884 2 2],[207.043 2.4 2],[207.168 2.4 2],[207.6 2 2],[208.135 2.4 2],[213.487 2 2],[215.637 3.2 2],[216.076 2 2],[221.47 100 1],[223.033 4 2],[224.561 160 1],[225.473 200 1],[228.068 6 2],[230.424 280 1],[232.351 7 2],[233.11 12 2],[233.527 400 1],[234.758 38 1],[247.673 5 2],[250.507 5 2],[251.228 8 2],[252.383 8 2],[252.851 12 1],[253.092 5 2],[255.954 10 2],[257.048 5 2],[259.664 1.6 0],[263.478 20 1],[268.189 8 2],[270.263 1.6 0],[274.578 6 2],[277.136 3.6 1],[278.528 3 0],[293.895 5 2],[296.005 5 2],[296.248 6 2],[301.422 4 2],[304.342 6 2],[307.158 20 0],[307.914 8 2],[310.392 6 2],[310.821 2 0],[311.922 6 2],[313.26 1.6 0],[313.572 1.6 0],[313.77 2 0],[315.27 6 2],[315.534 2 0],[315.567 2 0],[315.805 2.4 0],[315.854 2.4 0],[316.56 5 0],[317.369 3 0],[318.316 6 0],[318.396 3 0],[319.391 2 0],[319.517 5 2],[320.37 5 0],[322.163 6 0],[322.219 8 0],[323.504 5 2],[326.196 10 0],[326.234 12 0],[328.15 8 0],[328.165 5 2],[328.177 3 0],[328.679 4 2],[332.28 10 0],[335.68 16 0],[336.818 10 2],[336.968 6 2],[337.708 12 0],[337.739 4 0],[342.032 14 0],[342.101 5 0],[342.148 6 0],[346.374 8 0],[350.111 40 0],[352.497 16 0],[353.135 6 0],[354.466 16 0],[354.768 4 0],[355.245 20 1],[356.773 40 1],[357.628 20 1],[357.762 6 0],[357.967 16 0],[359.657 40 1],[363.064 8 0],[363.683 8 0],[364.918 5 2],[368.847 4 0],[373.575 80 1],[381.669 40 1],[384.28 40 1],[385.476 20 1],[388.933 4 0],[389.178 280 1],[389.265 4 0],[390.991 8 0],[391.473 100 1],[392.685 5 2],[393.572 10 0],[393.787 4 0],[393.967 40 1],[394.951 100 1],[399.306 5 2],[399.34 16 0],[399.566 6 0],[403.626 60 1],[405.371 3.6 2],[408.377 40 1],[408.486 6 0],[413.066 300 1],[413.243 4 0],[416.6 40 1],[421.604 100 1],[426.795 160 1],[428.31 20 0],[428.78 60 1],[429.76 40 1],[430.932 160 1],[432.3 4 0],[432.573 120 1],[432.674 40 1],[432.962 60 1],[435.033 16 0],[440.254 12 0],[440.523 80 1],[443.189 8 0],[448.898 12 0],[449.364 10 0],[450.592 8 0],[450.963 40 1],[452.317 12 0],[452.493 26 1],[455.403 13000 1],[457.385 8 0],[457.964 16 0],[459.975 6 0],[461.992 4 0],[462.833 5 0],[464.41 60 1],[467.362 6 0],[469.162 7 0],[469.744 3 2],[470.043 4 0],[470.894 160 1],[472.644 8 0],[484.346 160 1],[484.714 60 1],[485.084 40 1],[487.765 6 0],[489.997 80 1],[490.29 3 0],[493.409 4000 1],[494.735 1.6 0],[495.715 200 1],[499.781 60 1],[501.3 200 1],[504.955 2 2],[509.754 2 2],[510.225 2.4 2],[513.454 2 2],[515.994 4 0],[526.703 4 0],[536.135 160 1],[539.16 200 1],[542.105 40 1],[542.455 20 0],[542.879 40 1],[548.03 60 1],[551.905 40 0],[553.548 200 0],[562.04 4 0],[568.018 2 0],[577.762 80 0],[578.418 160 1],[580.023 20 0],[580.569 4 0],[582.628 30 0],[585.368 560 1],[590.764 3 0],[597.17 20 0],[598.125 160 1],[599.709 20 0],[599.8 2 2],[599.985 60 1],[601.947 20 0],[606.312 40 0],[610.199 2.6 2],[611.078 60 0],[613.583 80 1],[614.172 4000 1],[634.168 30 0],[637.711 2 2],[637.891 100 1],[638.376 2 2],[645.085 18 0],[648.291 30 0],[649.69 2400 1],[649.876 60 0],[652.617 1.6 2],[652.731 30 0],[659.533 600 0],[665.41 30 0],[667.527 300 0],[669.384 360 0],[676.962 200 1],[686.569 120 0],[686.785 60 0],[687.409 200 1],[705.994 1200 0],[709.549 1.6 2],[712.033 480 0],[719.524 120 0],[722.884 120 0],[728.03 600 0],[739.241 240 0],[741.753 60 0],[745.978 180 0],[748.808 120 0],[763.69 90 0],[764.291 120 0],[767.209 360 0],[778.048 240 0],[783.957 36 0],[790.575 300 0],[791.134 120 0],[821.024 180 0],[830.869 1.6 2],[855.997 360 0],[871.074 20 1],[873.771 20 1],[879.976 60 0],[886.098 60 0],[891.499 90 0],[921.969 60 0],[930.808 60 0],[932.458 60 0],[937.006 300 0],[945.592 60 0],[952.176 1.6 2],[958.937 90 0],[960.888 180 0],[964.572 60 0],[983.037 300 0],[1000.108 180 0],[1003.21 120 0],[1023.323 240 0],[1047.126 60 0],[1079.125 24 0],[1101.269 36 0],[1111.442 30 0],[1130.304 48 0],[1169.745 24 0],[1320.73 24 0],[1381.05 24 0],[1407.79 24 0],[1500.04 24 0],[2071.2 24 0],[2551.5699 30 0],[2922.39 30 0]}{ALLx13000x1200x13000x12x10000x0x0}{UVx10000x40x400x12x10000x0x0}{VISx13000x1200x13000x5x0x0x0}{IVx360x360x20x1.6x0x0x0}%
@@ -115,7 +115,7 @@
\pgfspectra@elt@search{#1}{Pb}{[36.74 0.2 4],[37.253 0.2 4],[38.787 0.2 4],[39.438 0.2 4],[42.464 0.5 4],[43.103 0.3 4],[43.66 0.3 4],[43.847 0.2 4],[43.891 0.6 4],[45.345 0.4 4],[46.17 0.3 4],[47.536 0.8 3],[47.835 0.7 3],[49.62 0.3 4],[49.638 1 3],[49.994 1.2 3],[51.507 0.9 3],[52.978 1.4 3],[57.016 2 3],[57.39 0.8 3],[58.452 0.8 3],[64.85 1 3],[65.61 0.9 3],[69.442 0.4 4],[69.62 0.8 4],[70.373 2 4],[70.629 0.4 4],[70.766 0.6 4],[73.085 0.5 4],[74.946 1.2 4],[75.252 1 4],[75.58 1 4],[76.109 1 3],[76.276 0.6 4],[76.587 1 4],[76.745 1.8 4],[76.949 1.8 4],[77.142 1.4 4],[78.279 1.4 4],[78.705 1 4],[79.702 1.5 4],[79.98 0.5 4],[80.207 1.8 3],[80.282 1.2 3],[80.963 1.8 4],[81.232 0.5 4],[81.259 1 3],[81.41 0.8 4],[82.009 0.8 4],[82.207 0.8 3],[82.552 0.5 4],[82.741 1 3],[82.932 0.8 4],[83.26 1.2 3],[84.099 0.8 3],[84.288 0.8 3],[84.594 1.2 3],[84.604 0.2 1],[84.988 0.2 1],[85.198 0.5 4],[85.557 0.3 1],[85.764 1.8 3],[85.902 0.8 3],[86.233 1.6 3],[86.3 0.3 1],[86.397 2 4],[86.71 1 4],[87.044 1.4 3],[87.371 0.6 1],[87.796 0.2 1],[87.996 1.2 3],[88.035 0.7 3],[88.05 0.6 4],[88.39 1.8 4],[88.496 1.4 3],[88.499 1.4 3],[88.837 1.4 4],[88.968 0.8 1],[89.072 1.6 3],[89.44 1.4 4],[89.608 1.2 4],[89.63 0.3 1],[90.851 1.2 3],[91.509 0.8 4],[91.571 1.4 4],[91.79 1.2 3],[91.809 1.2 4],[92.028 1.2 4],[92.066 1.2 4],[92.212 1 3],[92.249 1.2 3],[92.452 0.7 3],[92.644 0.5 1],[92.764 1 3],[93.22 1.4 3],[93.7 0.8 3],[94.074 0.6 4],[94.62 0.8 4],[95.093 0.6 4],[95.285 0.7 3],[95.435 1.2 4],[95.495 0.4 4],[95.528 1 4],[95.876 0.2 1],[96.021 0.2 1],[96.101 0.1 2],[96.438 0.4 4],[96.536 0.3 1],[96.723 1 1],[97.256 0.9 1],[98.217 0.8 1],[98.671 1 1],[98.914 0.6 4],[99.589 1 1],[100.181 0.6 1],[100.542 0.8 4],[101.244 0.8 3],[101.661 1 1],[102.861 1.4 3],[103.05 0.3 2],[103.205 2 3],[104.124 1.6 3],[104.414 1.8 3],[104.89 1.2 2],[104.982 1 1],[105.077 1 1],[105.126 1 4],[105.653 1.5 3],[105.926 0.4 4],[106.066 1 1],[106.558 0.9 1],[106.92 0.4 2],[107.209 1.2 3],[107.47 0.3 2],[107.988 0.7 3],[108.081 1.8 3],[108.417 2 3],[108.886 1 4],[108.994 0.6 3],[109.652 0.9 4],[109.947 0.7 3],[110.394 1 1],[110.479 0.6 4],[110.843 1 1],[110.984 1 1],[111.53 0.6 3],[111.608 2 3],[111.867 0.4 2],[111.957 1 1],[112.133 0.4 4],[112.136 1 1],[113.314 1 1],[113.75 1 4],[113.784 1.8 3],[114.277 0.8 3],[114.493 1.4 3],[114.591 0.4 1],[115.236 0.4 4],[115.788 1.2 4],[116.7 0.4 2],[118.543 1.4 4],[118.995 2 3],[120.363 1 1],[123.12 1 1],[123.35 1.1 4],[124.847 1 4],[125.06 0.4 2],[126.69 0.1 2],[126.755 0.8 3],[129.082 0.8 3],[129.11 1 3],[131.305 2 3],[132.392 0.8 3],[133.165 1 1],[133.52 1 1],[134.306 1.2 3],[134.837 1 1],[138.894 1.6 3],[139.702 0.6 3],[140.026 1.8 3],[140.434 1 3],[143.396 1 1],[144.935 0.3 1],[151.076 0.7 3],[151.242 1 1],[153.571 1.4 3],[155.31 2 2],[161.01 0.1 2],[163.575 0.8 4],[167.153 1 1],[168.215 1 1],[171.123 0.4 2],[172.675 2 1],[174 0.2 0],[176.664 0.2 0],[179.467 0.2 0],[179.667 1 1],[179.839 0.8 3],[180.287 0.2 4],[181.297 0.5 0],[182.205 1 1],[184.3 0.2 4],[186.876 0.4 0],[188.867 0.2 4],[189.319 0.8 3],[189.702 0.2 4],[190.477 1 0],[191.433 0.2 4],[191.974 0.4 4],[192.1471 0.7 1],[195.796 0.5 4],[195.934 1.2 3],[197.244 0.4 0],[197.316 1.6 3],[197.788 0.2 0],[199.16 0.2 0],[199.231 0.2 0],[199.858 0.2 4],[199.883 1 4],[202.202 0.5 0],[204.258 1 3],[204.934 1.2 3],[205.088 0.5 0],[205.328 0.8 0],[207.845 0.8 4],[207.922 1.2 3],[211.1758 0.6 0],[211.5066 1 0],[214.255 1 4],[215.196 0.8 3],[215.401 1.5 3],[216.797 1 4],[217 50 0],[217.558 0.7 0],[217.746 1.2 3],[218.7888 0.7 0],[218.9603 0.8 0],[220.3534 1 1],[223.7425 2 0],[224.686 2 0],[224.689 2.5 0],[225.901 2 4],[227.666 1 4],[230.149 0.8 4],[233.2418 15 0],[235.953 1.6 3],[238.8797 18 0],[239.3792 55 0],[239.9597 14 0],[240.194 32 0],[241.1734 32 0],[241.761 1.6 3],[242.481 1.5 4],[244.3829 15 0],[244.6181 16 0],[247.6378 13 0],[252.669 0.8 1],[257.66 0.8 1],[257.726 8 0],[260.838 0.2 1],[261.3655 50 0],[261.4175 90 0],[262.8262 16 0],[263.4256 0.4 1],[265.7094 1 0],[266.3154 70 0],[269.7541 1 0],[280.1995 2500 0],[282.258 10 0],[282.3189 1400 0],[283.3053 3500 0],[284.0557 0.6 1],[286.424 0.4 3],[286.45 0.4 3],[287.3311 1400 0],[288.73 0.3 1],[291.4442 0.3 1],[294.743 0.2 1],[294.853 0.3 1],[296.646 1.5 0],[297.2991 1.5 0],[297.814 0.4 3],[298.0157 1.5 0],[298.6876 0.4 1],[301.639 1 1],[304.385 1 2],[305.256 0.4 3],[308.908 0.4 2],[310.274 0.4 2],[311.8894 15 0],[313.781 1 2],[317.65 1 2],[322.0528 60 0],[322.117 0.4 3],[322.9613 10 0],[324.0186 40 0],[324.284 0.5 2],[326.2355 20 0],[353.017 0.1 2],[357.2729 3500 0],[358.987 0.7 2],[363.9568 5000 0],[367.1491 2000 0],[368.3462 7000 0],[368.931 0.7 2],[370.602 0.3 2],[371.3982 1 1],[372.869 0.5 2],[373.9935 2500 0],[385.408 1.2 2],[395.192 0.8 2],[396.248 0.4 3],[401.9632 1500 0],[403.116 0.3 2],[404.98 0.4 3],[405.7807 9500 0],[406.2136 1400 0],[409.454 0.3 2],[411.076 0.5 1],[411.335 0.4 1],[412.811 0.2 2],[415.282 1 1],[415.7814 1 0],[416.8033 1000 0],[424.214 0.9 1],[424.492 2 1],[427.266 0.8 2],[429.382 0.7 1],[429.665 0.6 1],[434.0413 20 0],[435.274 1 1],[438.646 2 1],[449.615 1 3],[449.934 0.6 2],[453.46 1.6 3],[457.121 0.7 2],[457.9051 1 1],[458.227 1 1],[459.645 0.1 2],[460.54 0.8 3],[476.112 0.6 2],[479.859 0.4 2],[480.936 0.4 4],[482.686 0.1 2],[485.506 0.2 2],[500.5416 100 0],[500.6572 10 0],[504.258 5 1],[506.512 0.3 2],[507.058 1 1],[507.453 1 1],[507.635 1 0],[508.9484 5 0],[509.001 2 0],[510.7242 1 0],[511.164 1 1],[519.156 0.4 2],[520.1437 200 0],[536.764 1 1],[537.2099 1 1],[552.397 0.5 2],[554.425 1 1],[560.885 2 1],[569.2346 4 0],[577.941 0.3 2],[585.796 0.6 2],[589.5624 20 0],[591.454 0.2 3],[600.1862 200 0],[600.958 0.9 1],[601.1667 50 0],[604.117 0.8 1],[605.9356 50 0],[607.574 4 1],[608.1409 4 1],[611.052 5 0],[615.989 1 1],[623.5266 10 0],[665.099 0.5 4],[666.02 5 1],[675.32 0.4 4],[689.211 1 0],[712.894 0.5 0],[719.36 2 1],[722.8965 2000 0],[730.468 0.5 0],[733.015 0.8 0],[734.6676 1 0],[755.897 1 1],[763.256 1 1],[773.296 0.4 1],[780.9259 2 0],[781.797 0.5 0],[782.901 0.6 0],[789.6737 0.5 0],[815.691 0.2 1],[816.8001 1 0],[819.1886 0.6 0],[821.7711 0.5 0],[825.561 0.8 0],[827.269 4 0],[833.554 0.6 1],[839.568 1 1],[840.9384 2 0],[847.8492 1 0],[853.217 0.8 0],[854.495 0.7 1],[870.99 0.7 1],[871.939 0.5 1],[872.281 0.5 0],[885.7457 1 0],[905.082 1 1],[906.343 1 1],[924.528 0.2 1],[929.3476 0.8 0],[938.435 0.5 0],[938.589 0.5 0],[943.805 1.5 0],[960.4297 1.5 0],[960.873 0.6 0],[967.4351 1.5 0],[1029.0458 20 0],[1043.432 0.5 0],[1049.8965 10 0],[1064.9249 5 0],[1075.941 0.5 0],[1075.974 0.7 0],[1088.6688 1.5 0],[1096.953 4 0],[1105.922 0.6 0],[1133.308 0.3 0],[1147.949 0.2 1],[1148.876 0.2 0],[1162.791 0.5 1],[1256.137 0.1 0]}{ALLx9500x9500x5x2x2x2x0}{UVx7000x7000x2x2x2x2x0}{VISx9500x9500x5x1.2x1.6x0.5x0}{IVx20x20x1x0x0x0x0}%
\pgfspectra@elt@search{#1}{Bi}{[35.577 1 4],[36.952 1 4],[42.07 6 3],[42.978 1 4],[43.12 6 3],[43.563 1 4],[48.839 2 4],[49.272 1 4],[56.362 3 4],[59.073 1 2],[67.076 5 2],[67.887 2 4],[68.688 6 4],[70.654 1 4],[73.071 5 4],[73.817 10 4],[77.516 4 2],[79.05 6 3],[79.06 6 3],[79.25 8 3],[80.365 6 2],[82.03 10 3],[82.29 9 3],[82.49 12 3],[84.986 6 4],[85.568 5 4],[86.445 15 4],[87.26 15 3],[87.68 8 3],[88.017 6 4],[91.67 9 3],[92.093 7 2],[92.39 12 3],[92.548 6 2],[92.981 6 4],[94.33 15 3],[96.76 9 3],[96.88 8 3],[98.98 8 3],[103.999 25 2],[104.576 50 2],[105.181 30 2],[105.888 15 1],[108.547 20 1],[109.92 10 1],[110.34 24 3],[112.88 7 3],[113.86 6 3],[113.901 20 2],[113.946 15 4],[113.98 6 3],[114.591 15 2],[114.97 7 3],[116.319 8 1],[116.706 8 1],[122.464 50 2],[122.543 10 1],[123.278 15 1],[124.105 10 1],[126.535 10 1],[128.373 15 1],[130.618 10 1],[131.7 60 3],[132.546 20 1],[132.684 40 2],[132.947 20 1],[134.612 60 2],[135.007 20 1],[137.261 25 1],[137.602 15 1],[139.392 20 1],[142.333 35 2],[142.352 35 2],[143.683 45 1],[144.794 25 1],[145.511 50 1],[146.1 60 2],[146.214 25 1],[148.693 35 1],[150.25 20 1],[152.057 40 1],[153.317 40 1],[153.677 30 1],[153.806 35 1],[156.367 20 1],[157.37 40 1],[159.179 60 1],[160.158 25 1],[160.64 60 2],[160.97 40 1],[161.138 40 1],[165.281 20 1],[169.15 20 2],[174.929 20 1],[177.711 80 1],[178.747 60 1],[179.193 70 1],[182.38 70 1],[183.432 20 2],[186.39 10 2],[190.241 100 1],[191 30 3],[191.212 10 2],[195.453 9000 0],[196.013 7000 0],[198.826 10 2],[198.935 25 1],[202.075 20 2],[202.115 20 2],[202.121 7000 0],[206.17 9000 0],[206.89 45 1],[207.322 10 2],[207.337 14 2],[209.3 30 3],[210.342 15 2],[211.026 4600 0],[213.363 2500 0],[214.34 15 1],[214.346 15 1],[218.69 60 1],[221.355 30 2],[221.4 40 1],[222.825 360 0],[223.061 1700 0],[227.658 340 0],[231.1 100 3],[232.6 100 3],[236.812 16 1],[236.825 12 1],[237.6 100 3],[240.088 190 0],[241.46 75 2],[243.76 10 2],[250.1 10 1],[251.569 25 0],[252.449 70 0],[254.45 20 1],[262.791 700 0],[262.9 100 3],[267.7 100 3],[269.3 12 1],[269.676 280 0],[271.33 20 1],[273.05 140 0],[276.7 100 3],[277.2 100 3],[278.052 360 0],[278.6 100 3],[280.342 15 1],[280.37 11 1],[280.53 12 1],[280.962 140 0],[284.2 100 3],[284.74 30 2],[285.56 80 2],[289.798 4000 0],[292.4 100 3],[293.3 100 3],[293.6 100 3],[293.67 15 1],[293.83 3200 0],[295.04 20 1],[296.34 12 1],[298.903 2800 0],[299.334 700 0],[301.2 100 3],[302.464 2400 0],[303.487 60 0],[304.2 100 3],[306.772 9000 0],[307.666 140 0],[311.5 35 2],[323.9 100 3],[339.721 550 0],[343.083 10 1],[343.123 12 1],[345.1 40 2],[347.38 40 2],[348.55 35 2],[351.085 500 0],[354.08 15 2],[359.611 380 0],[361.34 45 2],[364.3 100 3],[365.42 12 1],[368.2 100 3],[369.532 50 2],[369.568 50 2],[373.4 100 3],[379.25 70 1],[381.11 12 1],[381.58 20 1],[384.58 10 1],[386.39 30 1],[386.8 100 3],[407.91 40 1],[409.72 10 1],[412.153 140 0],[412.186 140 0],[422.46 12 2],[425.94 75 1],[427.2 25 1],[430.17 70 1],[432.78 25 2],[433.98 12 1],[434.05 25 1],[434.2 30 3],[437.94 12 1],[447.68 25 1],[456.084 30 2],[456.154 30 2],[470.53 60 1],[472.252 600 0],[473.03 30 1],[474.97 20 1],[479.74 40 2],[490.82 12 1],[491.66 10 1],[496.97 12 1],[499.36 20 1],[507.93 45 2],[509.16 10 1],[512.43 50 1],[514.43 60 1],[520.15 20 1],[520.92 75 1],[527.03 40 1],[534.7 30 3],[539.78 10 1],[555.235 10 0],[559.941 3 0],[565.52 20 1],[571.92 40 1],[574.255 6 0],[581.83 12 1],[586.02 20 1],[597.3 20 1],[605.91 15 1],[612.8 15 1],[613.482 6 0],[647.573 3 0],[647.624 3 0],[649.77 15 1],[657.72 10 1],[660.02 40 1],[662.34 12 2],[680.86 50 1],[699.112 4 0],[703.3 12 1],[703.615 2 0],[738.1 10 1],[738.1 10 2],[750.233 2 0],[755.1 12 2],[759.8 25 2],[763.7 10 1],[763.7 10 2],[775 10 1],[783.87 3 0],[784.033 2 0],[796.5 20 1],[800.8 40 2],[805 12 1],[807 50 2],[810 20 2],[832.8 15 1],[838.8 15 1],[853.2 30 1],[854.454 2 0],[857.974 1 0],[865.3 25 1],[867.1 15 2],[875.488 2 0],[876.154 3 0],[886.3 25 1],[890.781 2 0],[893.4 20 2],[965.704 2000 0],[982.778 40 0],[1010.45 20 0],[1013.88 15 0],[1030.06 20 0],[1053.619 20 0],[1107.244 50 0],[1155.16 15 0],[1171.037 1500 0],[1199.949 40 0],[1216.508 200 0],[1237.464 10 0],[1269.004 200 0],[1281.78 100 0],[1433.05 200 0],[1600.15 50 0],[2255.16 60 0]}{ALLx9000x9000x100x80x100x15x0}{UVx9000x9000x100x80x100x15x0}{VISx600x600x75x45x100x0x0}{IVx2000x2000x30x50x0x0x0}%
\pgfspectra@elt@search{#1}{Po}{[213.902 250 0],[220.38 300 -1],[222.067 300 0],[222.213 200 0],[228.422 200 -1],[234.461 250 0],[242.172 250 0],[242.609 300 0],[245.008 1500 0],[248.394 700 0],[249.053 700 0],[250.218 200 -1],[253.495 300 0],[255.733 300 0],[255.801 1500 0],[256.231 400 -1],[257.88 300 -1],[258.764 400 0],[263.701 200 -1],[264.536 300 0],[266.333 700 -1],[267.167 200 0],[276.192 600 0],[280.026 400 0],[282.411 250 0],[286.601 300 0],[291.931 400 0],[295.892 600 0],[300.321 2500 0],[306.931 450 0],[311.595 200 -1],[318.902 400 0],[324.024 600 0],[328.638 250 0],[332.86 600 0],[348.979 300 -1],[349.365 200 -1],[358.833 400 -1],[367.136 200 -1],[386.193 500 0],[405.198 200 -1],[417.052 1200 0],[423.613 250 -1],[441.558 200 -1],[449.321 800 0],[461.144 350 0],[486.712 200 -1],[487.624 400 0],[494.681 450 -1],[532.323 350 0],[574.485 300 0],[796.262 600 0],[843.387 300 0],[861.826 500 0],[922.787 250 -1]}{ALLx2500x2500x0x0x0x0x700}{UVx2500x2500x0x0x0x0x700}{VISx1200x1200x0x0x0x0x450}{IVx600x600x0x0x0x0x250}%
-\pgfspectra@elt@search{#1}{At}{[216.225 8 0],[224.401 10 0]}{ALLx10x10x0x0x0x0x0x0}{UVx10x10x0x0x0x0x0x0}{VISx0x0x0x0x0x0x0}{IVx0x0x0x0x0x0x0}
+\pgfspectra@elt@search{#1}{At}{[216.225 8 0],[224.401 10 0]}{ALLx10x10x0x0x0x0x0x0}{UVx10x10x0x0x0x0x0x0}{VISx0x0x0x0x0x0x0}{IVx0x0x0x0x0x0x0}%
\pgfspectra@elt@search{#1}{Rn}{[351.46 5 0],[373.989 10 0],[375.365 20 0],[391.72 10 0],[394.172 10 0],[395.236 10 0],[422.606 10 0],[430.776 80 0],[433.578 7 0],[434.96 100 0],[443.505 40 0],[445.925 50 0],[450.848 50 0],[457.772 50 0],[460.938 50 0],[472.176 30 0],[572.258 6 0],[606.192 10 0],[620.075 6 0],[638.045 6 0],[655.749 10 0],[660.643 10 0],[662.723 15 0],[666.96 6 0],[670.428 8 0],[675.181 20 0],[680.679 6 0],[683.695 8 0],[683.757 8 0],[689.116 10 0],[699.89 10 0],[705.542 200 0],[726.811 100 0],[729.1 20 0],[732.098 6 0],[741.904 10 0],[745 300 0],[747.089 8 0],[748.313 8 0],[751.413 8 0],[751.692 8 0],[752.393 6 0],[759.755 6 0],[760.128 8 0],[765.748 10 0],[773.843 10 0],[774.664 20 0],[780.982 100 0],[804.9 20 0],[809.951 100 0],[817.384 6 0],[827.096 100 0],[831.451 8 0],[834.974 6 0],[838.105 10 0],[848.748 10 0],[849.489 10 0],[852.095 20 0],[860.007 100 0],[863.976 10 0],[867.583 15 0],[880.775 10 0],[932.702 50 0],[994.857 6 0],[1010.613 5 0]}{ALLx300x300x0x0x0x0x0}{UVx20x20x0x0x0x0x0}{VISx300x300x0x0x0x0x0}{IVx100x100x0x0x0x0x0}%
\pgfspectra@elt@search{#1}{Ra}{[236.973 8 1],[246.055 8 1],[247.55 10 1],[258.661 8 1],[264.373 10 1],[270.896 20 1],[279.521 10 1],[281.376 30 1],[303.344 10 1],[310.18 5 0],[364.955 100 1],[381.442 200 1],[419.409 8 1],[424.472 8 1],[434.064 100 1],[443.627 20 1],[453.311 30 1],[464.129 8 0],[468.228 100 1],[469.928 8 0],[482.591 100 0],[485.607 10 0],[485.941 10 1],[492.753 10 1],[509.756 10 0],[520.593 10 0],[528.328 10 0],[532.029 10 0],[539.98 10 0],[540.023 20 0],[540.681 20 0],[548.213 8 0],[550.198 10 0],[555.357 10 0],[555.585 20 0],[561.666 10 0],[566.081 50 0],[581.363 20 1],[620.03 30 0],[633.69 10 0],[644.62 20 0],[648.732 20 0],[659.334 10 1],[671.932 10 1],[698.022 20 0],[711.85 20 0],[714.121 50 0],[722.516 20 0],[731.027 10 0],[783.812 20 0],[801.97 50 1],[817.731 6 0],[833.507 5 0],[993.221 5 0]}{ALLx200x100x200x0x0x0x0}{UVx100x5x100x0x0x0x0}{VISx200x100x200x0x0x0x0}{IVx50x20x50x0x0x0x0}%
\pgfspectra@elt@search{#1}{Ac}{[206.2 20 3],[210 8 1],[250.212 30 3],[255.808 100 3],[262.644 1000 2],[268.29 50 2],[271.25 20 1],[272.623 10 1],[276.018 10 1],[278.156 10 1],[279.083 5 3],[279.39 50 3],[279.759 20 1],[280.676 20 1],[283.347 8 1],[284.716 150 1],[289.52 8 1],[289.682 30 1],[292.302 30 1],[295.255 2000 2],[299.417 200 1],[304.33 500 1],[306.936 200 1],[307.807 100 1],[308.604 100 1],[308.737 100 1],[311.283 200 1],[312.016 100 1],[315.309 500 1],[315.441 600 1],[316.481 200 1],[322.47 20 3],[323.059 300 1],[323.77 150 1],[326.091 500 1],[331.801 100 1],[338.353 200 1],[339.278 2000 2],[341.384 200 1],[341.777 500 1],[348.116 500 1],[348.759 3000 2],[348.953 200 1],[352.924 100 1],[353.463 100 1],[355.499 200 1],[356.559 1000 1],[369.488 100 1],[375.667 300 1],[379.982 200 1],[386.312 2000 1],[391.447 100 1],[406.16 400 1],[408.844 3000 1],[416.84 3000 1],[417.998 100 0],[418.312 20 0],[419.44 20 0],[420.969 300 1],[435.913 300 1],[438.453 20 0],[438.641 1000 1],[439.671 20 0],[441.309 2000 2],[446.273 20 0],[450.72 1000 1],[456.987 3000 2],[460.545 500 1],[471.658 10 0],[472.016 400 1],[481.222 300 1],[494.518 100 1],[495.823 100 1],[496.087 100 1],[519.321 8 2],[544.638 150 1],[573.205 300 1],[575.897 400 1],[591.085 1000 1],[616.475 600 1],[616.783 200 1],[624.283 400 1],[635.986 20 0],[669.127 20 0],[729.04 6 0],[786.61 6 0]}{ALLx3000x100x3000x3000x100x0x0}{UVx3000x0x1000x3000x100x0x0}{VISx3000x100x3000x3000x0x0x0}{IVx6x6x0x0x0x0x0}%
diff --git a/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.sty b/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.sty
index 308c9bcc780..2135d346677 100644
--- a/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.sty
+++ b/Master/texmf-dist/tex/latex/pgf-spectra/pgf-spectra.sty
@@ -7,9 +7,10 @@
% Hugo Gomes @ 21/02/2023 (v2.2.0)
% Hugo Gomes @ 25/04/2023 (v3.0.0)
% Hugo Gomes @ 27/04/2023 (v3.0.1)
+% Hugo Gomes @ 07/07/2024 (v3.0.1a)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{pgf-spectra}[27/04/2023 pgf-spectra v3.0.1]%
+\ProvidesPackage{pgf-spectra}[07/07/2024 pgf-spectra v3.0.1a]%
\RequirePackage{tikz}%
\DeclareOption{LSE}{\input{pgf-spectra.data.LSE.tex}\xdef\pgfspectra@DATASET{1}}%
\DeclareOption{NIST}{\input{pgf-spectra.data.NIST.tex}\xdef\pgfspectra@DATASET{0}}%
@@ -640,15 +641,15 @@ precision=1,unit={}% NEW v3.0.0 (for data library)
\fi%
}%
\def\pgfspectra@utils@put@label{\ignorespaces%
- \ifx\pgfspectra@elt@chemsym\undefined\def\pgfspectra@elt@chemsym{}\fi%
+ \ifx\pgfspectra@elt@chemsym\undefined\def\pgfspectra@elt@chemsym{}\else\fi%
\pgfspectra@get@label@position%
\ifnum\pgfspectra@begin>\pgfspectra@end%
\ifcase\pgfspectra@label@position%
%west
\ifpgfspectra@drawaxis%\ifpgfspectra@axislabel%
- \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2em,align=right] at (-2.5*\@pgfspectra@axis@height-\pgfspectra@width,0.5*\pgfspectra@height-1.25*\@pgfspectra@axis@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
+ \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2.1em,align=right] at (-2.5*\@pgfspectra@axis@height-\pgfspectra@width,0.5*\pgfspectra@height-1.25*\@pgfspectra@axis@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
\else%
- \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2em,align=right] at (-\pgfspectra@width,0.5*\pgfspectra@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
+ \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2.1em,align=right] at (-\pgfspectra@width,0.5*\pgfspectra@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
\fi%
\or%north west
\ifpgfspectra@drawaxis%
@@ -693,9 +694,9 @@ precision=1,unit={}% NEW v3.0.0 (for data library)
\ifcase\pgfspectra@label@position%
%west
\ifpgfspectra@drawaxis%
- \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2em,align=right] at (-2.5*\@pgfspectra@axis@height,0.5*\pgfspectra@height-1.25*\@pgfspectra@axis@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
+ \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2.1em,align=right] at (-2.5*\@pgfspectra@axis@height,0.5*\pgfspectra@height-1.25*\@pgfspectra@axis@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
\else%
- \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2em,align=right] at (0,0.5*\pgfspectra@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
+ \node[\pgfspectra@labelfontcolor,font=\pgfspectra@labelfont,left,minimum width=2.1em,align=right] at (0,0.5*\pgfspectra@height) {\pgfspectra@labelbtext\pgfspectra@elt@chemsym\pgfspectra@labelatext};%
\fi%
\or%north west
\ifpgfspectra@drawaxis%
diff --git a/Master/texmf-dist/tex/latex/photobook/photobook.cls b/Master/texmf-dist/tex/latex/photobook/photobook.cls
index a2a84809e8b..9e93d91b004 100644
--- a/Master/texmf-dist/tex/latex/photobook/photobook.cls
+++ b/Master/texmf-dist/tex/latex/photobook/photobook.cls
@@ -92,8 +92,8 @@
%%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the
%%% code and the generated docs...
-\edef\photobook@FILEVERSION{v0.1.29}
-\edef\photobook@FILEDATE{2023-08-24}
+\edef\photobook@FILEVERSION{v0.1.30}
+\edef\photobook@FILEDATE{2024-07-18}
%% \documentclass{ltxdoc}
@@ -248,26 +248,27 @@
%% \begin{minipage}{\textwidth}
%% \begin{verbatim}
%%
+%% <-------------------------------------------------> paperwidth
%% <---> bleed <---> bleed
-%%
-%% + - - - - - - - - - - - - - - - - - - - - - - + - + ^
-%% . . . | bleed
-%% . +-----------------------------------------+----- v . . ---
-%% . | ^ . . = .
-%% . | . . . . . . | . . . = . ^
-%% . |<-- blockwidth ------------------------->= . |
-%% . | . | . . . = . |
-%% . | | . . = . textheight
-%% . | . Page | . . . = . |
-%% . | blockheight . . = . |
-%% . | . | . . <--> bindingoffset |
-%% . | | . . = . |
-%% . | . . . . . . | . <--> gutteroffset v
-%% . | v . . = .
-%% . +-----------------------------------------+----- ^ . . ---
-%% . . . . | bleed
-%% + - - - - - - - - - - - - - - - - - - - - - - + - + v
-%% . .
+%% paperheight v
+%% + - - - - - - - - - - - - - - - - - - - - - - + - + ^ . . . ---
+%% . . . | bleed .
+%% . +-----------------------------------------+----- v . . ---
+%% . | ^ . . = . .
+%% . | . . . . . . | . . . = . ^
+%% . |<-- blockwidth ------------------------->= . | .
+%% . | . | . . . = . |
+%% . | | . . = . textheight .
+%% . | . Page | . . . = . |
+%% . | blockheight . . = . | .
+%% . | . | . . <--> bindingoffset |
+%% . | | . . = . | .
+%% . | . . . . . . | . <--> gutteroffset v
+%% . | v . . = . .
+%% . +-----------------------------------------+----- ^ . . ---
+%% . . . . | bleed .
+%% + - - - - - - - - - - - - - - - - - - - - - - + - + v . . . ---
+%% . . ^
%% | <-- textwidth --------------> . |
%% ^ gutter
%%
@@ -278,6 +279,9 @@
%% account for |\gutteroffset|, namely macros that do not display content
%% with bleeds.
%%
+%% Also note that bleeds are included in \href{https://ctan.org/pkg/geometry}{geometry}'s
+%% |\paperwidth| and |\paperheight|.
+%%
% NOTE: if blockwidth/blockheight are set they will force recalculations
% and overriding of the paperwidth/paperheight if they were changed
% by the user code anywhere between \documentclass[..]{photobook}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty b/Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty
index c45aa22a654..b5c37d61db3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty
@@ -43,24 +43,23 @@
\fi
}
\def\abjad@zero{}
-\def\abjad@three{ج\ifabjad@jim@notail\char"200D\fi}
+\def\abjad@one{ا}
+\def\abjad@three{ج\ifabjad@jim@notail\Uchar"200D\fi}
\def\abj@num@i@iso#1{%
- \ifcase#1\or ا\or ب\or\abjad@three\or د%
- \or ه\char"200D\or و\or ز\or ح\or ط\fi%
- \ifnum#1=\z@\abjad@zero\fi}
+ \ifcase#1\abjad@zero\or \abjad@one\or ب\or\abjad@three\or د%
+ \or ه\Uchar"200D\or و\or ز\or ح\or ط\fi}
\def\abj@num@i#1{%
- \ifcase#1\or ا\or ب\or\abjad@three\or د%
- \or ه\or و\or ز\or ح\or ط\fi%
- \ifnum#1=\z@\abjad@zero\fi}
+ \ifcase#1\abjad@zero\or\abjad@one\or ب\or\abjad@three\or د%
+ \or ه\or و\or ز\or ح\or ط\fi}
\def\abj@num@ii#1{%
\ifcase#1\or ي\or ك\or ل\or م\or ن%
- \or س\or ع\or ف\or ص\fi%
- \ifnum#1=\z@\fi\abj@num@i}
+ \or س\or ع\or ف\or ص\fi
+ \abj@num@i}
\def\abj@num@iii#1{%
\ifcase#1\or ق\or ر\or ش\or ت\or ث%
- \or خ\or ذ\or ض\or ظ\fi%
- \ifnum#1=\z@\fi\abj@num@ii}
+ \or خ\or ذ\or ض\or ظ\fi
+ \abj@num@ii}
\def\abj@num@iv#1{%
\ifcase#1\or غ\fi
- \ifnum#1=\z@\fi\abj@num@iii}
+ \abj@num@iii}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/cal-util.def b/Master/texmf-dist/tex/latex/polyglossia/cal-util.def
index 85576f39f71..fa6e325029e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/cal-util.def
+++ b/Master/texmf-dist/tex/latex/polyglossia/cal-util.def
@@ -45,7 +45,7 @@
%% This is an algorithm from Reingold & Dershowitz,
-%% Calendrical Calculations, The Millenium Edition
+%% Calendrical Calculations, The Millennium Edition
%%
\def\@FixedFromGregorian#1#2#3#4{%
\setcounter{tmpA}{(#1-1)*365}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-acadien.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf
index 36d3136d29b..c231e80f342 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-acadien.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for Canadian (Acadian) French]
% We provide this as a babel alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
index 2e1a3a0719a..7029af6bf65 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-aeb.ldf}[polyglossia: module for aeb (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
index f47e9adcbda..baa1c8c0282 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-af.ldf}[polyglossia: module for af (Afrikaans)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{afrikaans}
+\InheritGlossFile{afrikaans}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
index 7eb4a47a7dd..41b672984bb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-afb.ldf}[polyglossia: module for afb (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf
index 33d1f12831c..653d10b5dda 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-afrikaans.ldf}[polyglossia: module for Afrikaans]
@@ -16,22 +16,21 @@
% BCP-47 compliant aliases
\setlanguagealias*{afrikaans}{af}
-\define@boolkey{afrikaans}[afrikaans@]{babelshorthands}[true]{}
-
+\DeclareKeys[polyglossia/gloss/afrikaans]
+ {
+ babelshorthands.if = afrikaans@babelshorthands,
+ babelshorthands.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{afrikaans}{babelshorthands=false}
+\InitializeGlossOptions{afrikaans}{babelshorthands=false}
\ifsystem@babelshorthands
- \setkeys{afrikaans}{babelshorthands=true}
+ \SetGlossOptions{afrikaans}{babelshorthands=true}
\else
- \setkeys{afrikaans}{babelshorthands=false}
+ \SetGlossOptions{afrikaans}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\afrikaans@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf
index 06a4cd6c681..bbfbb2e7576 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-albanian.ldf}[polyglossia: module for Albanian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
index 649198b3789..e5a358a17e8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-am.ldf}[polyglossia: module for am (Amharic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{amharic}
+\InheritGlossFile{amharic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
index f456ab17a0e..2531eb7c587 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-american.ldf}[polyglossia: module for American English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf
index 38c225672ac..aebbd10989a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-amharic.ldf}[polyglossia: module for Amharic]
\PolyglossiaSetup{amharic}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
index b52bfa6942c..54cb4d4b6eb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-apd.ldf}[polyglossia: module for apd (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
index 22340aeff1c..3583fd12ccb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-IQ.ldf}[polyglossia: module for ar-IQ (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar,bcp47-region=IQ}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
index 83fd1b49ad9..bd140fb026c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-JO.ldf}[polyglossia: module for ar-JO (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-JO,bcp47-language=ar,bcp47-region=JO}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
index 69a13896196..538e6a5a90a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-LB.ldf}[polyglossia: module for ar-LB (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-LB,bcp47-language=ar,bcp47-region=LB}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
index 6176cfabdcb..471dad5d12b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-MR.ldf}[polyglossia: module for ar-MR (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
index 821d107bbc9..8158dca6e94 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-PS.ldf}[polyglossia: module for ar-PS (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-PS,bcp47-language=ar,bcp47-region=PS}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
index f736606934f..b437f61e191 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-SY.ldf}[polyglossia: module for ar-SY (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-SY,bcp47-language=ar,bcp47-region=SY}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
index 06759e39b51..4eef25a7166 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-YE.ldf}[polyglossia: module for ar-YE (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar,bcp47-region=YE}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
index f35c8e67727..84a751f2fc0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar.ldf}[polyglossia: module for ar (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
index 3d478f02757..885fe3d02e8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arabic.ldf}[polyglossia: module for Arabic]
\RequireBidi
@@ -38,104 +38,112 @@
\setlanguagealias*[locale=default]{arabic}{apd}
\setlanguagealias*[locale=mashriq]{arabic}{ar-PS}
-\define@boolkey{arabic}[arabic@]{abjadalph}[true]{}
-
\newif\ifeastern@numerals
-\define@choicekey*+{arabic}{numerals}[\xpg@val\xpg@nr]{mashriq,maghrib,eastern,western}[mashriq]{%
- \ifcase\xpg@nr\relax
- % mashriq:
- \eastern@numeralstrue%
- \or
- % maghrib:
- \eastern@numeralsfalse
- \or
- % eastern:
- \eastern@numeralstrue%
- \or
- % western:
- \eastern@numeralsfalse
- \fi
- \xpg@info{Option: Arabic, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Arabic numerals option `#1'}}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{arabic}[arabic@]{abjadjimnotail}[true]{%
- \ifarabic@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi}
-
-\define@choicekey*+{arabic}{locale}[\xpg@val\xpg@nr]{default,mashriq,libya,algeria,tunisia,morocco,mauritania}[default]{%
- \ifcase\xpg@nr\relax
- % default:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar}%
- \xpg@info{Option: arabic, locale=default}%
- \or
- % mashriq:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar}%
- \xpg@info{Option: arabic, locale=mashriq}%
- \or
- % libya:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ayl,bcp47-language=ar,bcp47-region=LY}%
- \xpg@info{Option: arabic, locale=libya}%
- \or
- % algeria:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=arq,bcp47-language=ar,bcp47-region=DZ,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=algeria}%
- \or
- % tunisia:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=aeb,bcp47-language=ar,bcp47-region=TN,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=tunisia}%
- \or
- % morocco:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=ary,bcp47-language=ar,bcp47-region=MA,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=morocco}%
- \or
- % mauritania:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
- \xpg@info{Option: arabic, locale=mauritania}%
- \fi
- \gdef\@@arabic@month{\@arabic@month{#1}}
- }{\xpg@warning{Unknown Arabic locale `#1'}}
-
\newif\if@hijrical
-\define@choicekey*+{arabic}{calendar}[\xpg@val\xpg@nr]{gregorian,hijri,islamic}[gregorian]{%
- \ifcase\xpg@nr\relax
- % gregorian:
- \@hijricalfalse
- \or
- % hijri:
- \@hijricaltrue
- \or
- % islamic:
- \@hijricaltrue
- \fi
- \xpg@info{Option: Arabic, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Arabic calendar option `#1'}}
-
-
-\define@key{arabic}{hijricorrection}[0]{%
- \gdef\arabic@hijri@correction{#1}}%
-
\newif\ifarabic@customsep\arabic@customsepfalse
-\def\xpg@sepmark{}
-\define@key{arabic}{sectionsep}[.]{%
- \arabic@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
+
+\DeclareKeys[polyglossia/gloss/arabic]
+ {
+ hijricorrection.code = \gdef\arabic@hijri@correction{#1},
+ hijricorrection.default:n = 0,
+ sectionsep.code = \gdef\xpg@sepmark{#1}\arabic@customseptrue,
+ sectionsep.default:n = .,
+ abjadalph.if = arabic@abjadalph,
+ abjadalph.default:n = true,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ numerals.choice:,
+ numerals / mashriq.code =
+ {%
+ \eastern@numeralstrue
+ },
+ numerals / maghrib.code =
+ {%
+ \eastern@numeralsfalse
+ },
+ numerals / eastern.code =
+ {%
+ \eastern@numeralstrue
+ },
+ numerals / western.code =
+ {%
+ \eastern@numeralsfalse
+ },
+ numerals.default:n = mashriq,
+ numerals/unknown.code = \xpg@warning{Unknown Arabic numerals option `#1'},
+ locale.choice:,
+ locale / default.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / mashriq.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / libya.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ayl,bcp47-language=ar,bcp47-region=LY}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / algeria.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{أ}%
+ \SetLanguageKeys{arabic}{bcp47=arq,bcp47-language=ar,bcp47-region=DZ,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / tunisia.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{أ}%
+ \SetLanguageKeys{arabic}{bcp47=aeb,bcp47-language=ar,bcp47-region=TN,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / morocco.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{أ}%
+ \SetLanguageKeys{arabic}{bcp47=ary,bcp47-language=ar,bcp47-region=MA,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / mauritania.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale.default:n = default,
+ locale/unknown.code = \xpg@warning{Unknown Arabic locale `#1'},
+ calendar.choice:,
+ calendar / gregorian.code =
+ {%
+ \@hijricalfalse
+ },
+ calendar / hijri.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar / islamic.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Arabic calendar option `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{arabic}{locale=default,calendar=gregorian,numerals=mashriq,hijricorrection=0,abjadjimnotail=false}
+\InitializeGlossOptions{arabic}{locale=default,calendar=gregorian,numerals=mashriq,hijricorrection=0,abjadjimnotail=false}
% Register alias options
-\xpg@set@alias@values{arabic}{calendar}{islamic}{hijri}
+\SetLanguageAliasValues{arabic}{calendar}{islamic,hijri}
\def\arabicgregmonth@default#1{\ifcase#1%
% Egypt, Sudan, Yemen and Golf states
@@ -155,9 +163,12 @@
\def\arabicgregmonth@mauritania#1{\ifcase#1%
\or يناير\or فبراير\or مارس\or إبريل\or مايو\or يونيو\or يوليو\or أغشت\or شتمبر\or أكتوبر\or نوفمبر\or دجمبر\fi}
-\def\@arabic@month#1{\ifcsdef{arabicgregmonth@#1}{\expandafter\csname arabicgregmonth@#1\endcsname}%
-{\xpg@warning{Option `locale=#1' is not defined for Arabic: using `default' instead}%
-\arabicgregmonth@default}}
+\def\@arabic@month#1{%
+ \@ifundefined{arabicgregmonth@#1}%
+ {\xpg@warning{Option `locale=#1' is not defined for Arabic: using `default' instead}%
+ \arabicgregmonth@default}%
+ {\expandafter\csname arabicgregmonth@#1\endcsname}%
+}
%\Hijritoday is now locale-aware and will format the date with this macro:
\DefineFormatHijriDate{arabic}{\@ensure@RTL{\arabicnumber{\value{Hijriday}}%
@@ -189,18 +200,18 @@
}
\def\datearabic{%
\def\today{%
- \if@hijrical%
+ \if@hijrical
\Hijritoday[\arabic@hijri@correction]%
\else%
- \if@RTL%
+ \if@RTL
\arabicnumber\day\space\@@arabic@month{\month}%
\space\arabicnumber\year%
\else% in LR environment we format the gregorian date within \textenglish
- \ifcsdef{english@loaded}{\textenglish{\today}}%else US format
- {\normalfontlatin\ifcase\month\or January\or February\or March\or April\or May\or June\or%
- July\or August\or September\or October\or November\or December\fi%
+ \iflanguageloaded{english}{\textenglish{\today}}%else US format
+ {\normalfontlatin\ifcase\month\or January\or February\or March\or April\or May\or June\or
+ July\or August\or September\or October\or November\or December\fi
\space\number\day,\space\number\year}%
- \fi%
+ \fi
\fi}}
% Use \providecommand here as the ldf file might
@@ -226,10 +237,9 @@
\or ح\or ط\or ي\or ك\or ل\or م\or ن%
\or س\or ع\or ف\or ص\or ق\or ر\or ش%
\or ت\or ث\or خ\or ذ\or ض\or ظ\or غ%
- \else\xpg@ill@value{#1}{arabic@abjad@alph}\fi%
+ \else\xpg@ill@value{#1}{arabic@abjad@alph}\fi
}
-
\def\abjadmaghribi#1{%
\ifnum#1>1999\xpg@ill@value{#1}{abjad}%
\else
@@ -252,111 +262,111 @@
%maghribi س -> ص ص -> ض ش -> س ض -> ظ ظ -> غ غ -> ش
\def\abj@maghribi@num@ii#1{%
- \ifcase#1\or ي\or ك\or ل\or م\or ن%
+ \ifcase#1\abjad@zero\or ي\or ك\or ل\or م\or ن%
\or ص\or ع\or ف\or ض\fi
- \ifnum#1=\z@\abjad@zero\fi\abj@num@i}
+ \abj@num@i}
\def\abj@maghribi@num@iii#1{%
\ifcase#1\or ق\or ر\or س\or ت\or ث%
\or خ\or ذ\or ظ\or غ\fi
- \ifnum#1=\z@\fi\abj@maghribi@num@ii}
+ \abj@maghribi@num@ii}
\def\abj@maghribi@num@iv#1{%
\ifcase#1\or ش\fi
- \ifnum#1=\z@\fi\abj@maghribi@num@iii}
+ \abj@maghribi@num@iii}
\def\arabic@numbers{%
\ifarabic@abjadalph
- \let\@alph\abjadalph%
- \let\@Alph\abjadalph%
+ \let\@alph\abjadalph
+ \let\@Alph\abjadalph
\else
- \let\@alph\abjad%
- \let\@Alph\abjad%
+ \let\@alph\abjad
+ \let\@Alph\abjad
\fi
}
\def\noarabic@numbers{%
- \let\@alph\latin@alph%
- \let\@Alph\latin@Alph%
+ \let\@alph\latin@alph
+ \let\@Alph\latin@Alph
}
% Store original definition
\let\xpg@save@arabic\@arabic
\def\arabic@globalnumbers{%
- \let\@arabic\arabicnumber%
+ \let\@arabic\arabicnumber
\renewcommand\thefootnote{\localnumeral*{footnote}}%
\renewcommand\theequation{\localnumeral*{equation}}%
}
\def\noarabic@globalnumbers{%
- \let\@arabic\xpg@save@arabic%
+ \let\@arabic\xpg@save@arabic
}
\def\arabic@xetex@capsformat{%
- \let\xpg@save@sepmark\@SepMark%
+ \let\xpg@save@sepmark\@SepMark
\SepMark{\xpg@sepmark}
}
\def\noarabic@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi
}
\def\arabic@luatex@capsformat{%
%
% change chapter and part headings
\ifarabic@customsep
- \ifcsdef{chapter}{%
- \let\xpg@save@thesection\thesection%
+ \ifcsname chapter\endcsname
+ \let\xpg@save@thesection\thesection
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
- \let\xpg@save@theequation\theequation%
+ \let\xpg@save@theequation\theequation
\renewcommand*\theequation{%
\ifnum \c@chapter>\z@ \thechapter\xpg@sepmark\fi\@arabic\c@equation}
- \let\xpg@save@thefigure\thefigure%
+ \let\xpg@save@thefigure\thefigure
\renewcommand*\thefigure{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@figure}
- \let\xpg@save@thetable\thetable%
+ \let\xpg@save@thetable\thetable
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
- \let\xpg@save@thesubsection\thesubsection%
+ \fi
+ \let\xpg@save@thesubsection\thesubsection
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
- \let\xpg@save@thesubsubsection\thesubsubsection%
+ \let\xpg@save@thesubsubsection\thesubsubsection
\renewcommand\thesubsubsection{\thesubsection\xpg@sepmark\@arabic\c@subsubsection}
- \let\xpg@save@theparagraph\theparagraph%
+ \let\xpg@save@theparagraph\theparagraph
\renewcommand\theparagraph
{\thesubsubsection\xpg@sepmark\@arabic\c@paragraph}
- \let\xpg@save@thesubparagraph\thesubparagraph%
+ \let\xpg@save@thesubparagraph\thesubparagraph
\renewcommand\thesubparagraph{\theparagraph\xpg@sepmark\@arabic\c@subparagraph}
- \fi% (end \ifarabic@customsep)
+ \fi % (end \ifarabic@customsep)
}
\def\noarabic@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
- \let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
- \let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
- \let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
- \let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
- \let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
- \let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
- \let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
- \let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \ifcsname xpg@save@thesection\endcsname
+ \let\thesection\xpg@save@thesection
+ \fi
+ \ifcsname xpg@save@theequation\endcsname
+ \let\theequation\xpg@save@theequation
+ \fi
+ \ifcsname xpg@save@thefigure\endcsname
+ \let\thefigure\xpg@save@thefigure
+ \fi
+ \ifcsname xpg@save@thetable\endcsname
+ \let\thetable\xpg@save@thetable
+ \fi
+ \ifcsname xpg@save@thesubsection\endcsname
+ \let\thesubsection\xpg@save@thesubsection
+ \ifcsname xpg@save@thesubsubsection\endcsname
+ \let\thesubsubsection\xpg@save@thesubsubsection
+ \fi
+ \fi
+ \ifcsname xpg@save@theparagraph\endcsname
+ \let\theparagraph\xpg@save@theparagraph
+ \fi
+ \ifcsname xpg@save@thesubparagraph\endcsname
+ \let\thesubparagraph\xpg@save@thesubparagraph
+ \fi
}
\def\blockextras@arabic{%
@@ -368,7 +378,7 @@
\fi
\fi
}
-%
+
\def\noextras@arabic{%
\ifarabic@customsep
\ifxetex
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf
index ea904ad5e3a..0770300480f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-armenian.ldf}[polyglossia: module for Armenian]
@@ -21,43 +21,49 @@
\newif\if@eastern@armenian
\@eastern@armenianfalse
-\define@choicekey*+{armenian}{variant}[\xpg@val\xpg@nr]{western,eastern}[western]{%
- \ifcase\xpg@nr\relax
- % western:
- \@eastern@armenianfalse%
- \or
- % eastern:
- \@eastern@armeniantrue%
- \fi
- \xpg@info{Option: Armenian, variant=\xpg@val}%
-}{\xpg@warning{Unknown Armenian variant `#1'}}
\newif\if@armenian@numerals
\@armenian@numeralsfalse
-\define@key{armenian}{numerals}[armenian]{%
- \ifstrequal{#1}{arabic}{%
- \@armenian@numeralsfalse%
- \SetLanguageKeys{armenian}{bcp47-extension-u=nu-latn}%
- }{%
- \@armenian@numeralstrue%
- \SetLanguageKeys{armenian}{bcp47-extension-u={}}%
- }%
-}
-\define@boolkey{armenian}[armenian@]{capitalyiwn}[true]{%
- \ifarmenian@capitalyiwn
- % MakeUppercase capitalizes the ligature of letters ech and yiwn (U+0587)
- % to capital ech and yiwn (also the output if Armenian is not selected at all)
- \SetLanguageKeys{armenian}{bcp47-casing=hy-x-yiwn,bcp47-extension-x=yiwn}
- \else
- % Capitalize ech and yiwn ligature to capital ech and vew,
- % following Armenian spelling reform
- \SetLanguageKeys{armenian}{bcp47-casing=hy,bcp47-extension-x={}}
- \fi
-}
+\DeclareKeys[polyglossia/gloss/armenian]
+ {
+ variant.choice:,
+ variant / western.code =
+ {%
+ \@eastern@armenianfalse
+ },
+ variant / eastern.code =
+ {%
+ \@eastern@armeniantrue
+ },
+ variant.default:n = western,
+ variant/unknown.code = \xpg@warning{Unknown Armenian variant `#1'},
+ numerals.choice:,
+ numerals / armenian.code =
+ {%
+ \@armenian@numeralstrue
+ \SetLanguageKeys{armenian}{bcp47-extension-u={}}%
+ },
+ numerals / arabic.code =
+ {%
+ \@armenian@numeralsfalse
+ \SetLanguageKeys{armenian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = armenian,
+ capitalyiwn.choice:,
+ capitalyiwn / true.code =
+ {%
+ \SetLanguageKeys{armenian}{bcp47-casing=hy-x-yiwn,bcp47-extension-x=yiwn}%
+ },
+ capitalyiwn / false.code =
+ {%
+ \SetLanguageKeys{armenian}{bcp47-casing=hy,bcp47-extension-x={}}%
+ },
+ capitalyiwn.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{armenian}{numerals=armenian,variant=western}
+\InitializeGlossOptions{armenian}{numerals=armenian,variant=western}
% Taken from ArmTeX. Audit!
\def\captionsarmenian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
index e2ef5273c56..d71e48bd945 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arq.ldf}[polyglossia: module for arq (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
index ad64804b5ee..c0b5debd39d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ary.ldf}[polyglossia: module for ary (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
index 0dd998cbe5a..41e1cfd5702 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arz.ldf}[polyglossia: module for arz (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
index e9f5095fccf..f073cdc632f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ast.ldf}[polyglossia: module for ast (Asturian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{asturian}
+\InheritGlossFile{asturian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf
index 44babd93ef5..109a560111f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translated by Xuacu <xuacusk8 at gmail dot com>
% Contributed by Kevin Godby <godbyk at gmail dot com>
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
index c624020f9ac..d3c85168511 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-australian.ldf}[polyglossia: module for Australian English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
index b7ef2e504b6..b1397542781 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-austrian.ldf}[polyglossia: module for Austrian German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
index 815db99c2ec..a24eb19c922 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ayl.ldf}[polyglossia: module for ayl (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
index b8a13680aa1..4395a83d2e8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasa.ldf}[polyglossia: module for Bahasa Indonesia]
% We provide this as a babel alias
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
index 37a604e050f..e710b619997 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasai.ldf}[polyglossia: module for Bahasa Indonesia]
% We only provide this gloss for babel compatibility. Since bahasai is
% a malay variety, we use 'malay' with variant 'indonesian' now.
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
index f879535507c..d4c2ea9ec0c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasam.ldf}[polyglossia: module for Bahasa Melayu]
% We only provide this gloss for babel compatibility. Since bahasam is
% a malay variety, we use 'malay' with variant 'malaysian' now.
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf
index b4ab3525f5a..dbff903d788 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-basque.ldf}[polyglossia: module for Basque]
\PolyglossiaSetup{basque}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
index 02d49ffff15..975f48c0acc 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-be-tarask.ldf}[polyglossia: module for be-tarask (Belarusian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{belarusian}
+\InheritGlossFile{belarusian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
index efa0abbd949..666620a671c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-be.ldf}[polyglossia: module for be (Belarusian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{belarusian}
+\InheritGlossFile{belarusian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf
index b5eb8753728..816e5900378 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-belarusian.ldf}[polyglossia: module for Belarusian]
@@ -26,63 +26,68 @@
\setlanguagealias*{belarusian}{be}
\def\belarusian@spelling{modern}
-\define@choicekey*+{belarusian}{spelling}[\xpg@val\xpg@nr]{modern,classic,tarask}[modern]{%
- \ifcase\xpg@nr\relax
- % modern:
- \def\belarusian@spelling{modern}%
- \SetLanguageKeys{belarusian}{bcp47=be,bcp47-variant=1959acad}%
- \or
- % classic:
- \def\belarusian@spelling{tarask}%
- \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
- \or
- % tarask:
- \def\belarusian@spelling{tarask}%
- \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
- \fi
-}{\xpg@warning{Unknown Belarusian spelling `#1'}}
-
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{belarusian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \fi
- \xpg@info{Option: Belarusian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Belarusian numerals value `#1'}}
-\define@boolkey{belarusian}[belarusian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/belarusian]
+ {
+ babelshorthands.if = belarusian@babelshorthands,
+ babelshorthands.default:n = true,
+ spelling.choice:,
+ spelling / modern.code =
+ {%
+ \def\belarusian@spelling{modern}%
+ \SetLanguageKeys{belarusian}{bcp47=be,bcp47-variant=1959acad}%
+ },
+ spelling / classic.code =
+ {%
+ \def\belarusian@spelling{tarask}%
+ \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
+ },
+ spelling / tarask.code =
+ {%
+ \def\belarusian@spelling{tarask}%
+ \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
+ },
+ spelling.default:n = modern,
+ spelling/unknown.code = \xpg@warning{Unknown Belarusian spelling `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Belarusian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{belarusian}{babelshorthands=false,numerals=arabic,spelling=modern}
+\InitializeGlossOptions{belarusian}{babelshorthands=false,numerals=arabic,spelling=modern}
% Register alias options
-\xpg@set@alias@values{belarusian}{spelling}{classic}{tarask}
+\SetLanguageAliasValues{belarusian}{spelling}{classic,tarask}
\ifsystem@babelshorthands
- \setkeys{belarusian}{babelshorthands=true}
+ \SetGlossOptions{belarusian}{babelshorthands=true}
\else
- \setkeys{belarusian}{babelshorthands=false}
+ \SetGlossOptions{belarusian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\belarusian@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf
index bbddce0fe8f..1831fbdf032 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by সাজেদুর রহিম জোয়ারদার <toshazed@gmail.com>
% TODO implement Bengali calendar
@@ -27,30 +27,36 @@
\newif\ifbengali@devanagari@numerals
\newif\ifbengali@bengali@numerals
-\define@choicekey*+{bengali}{numerals}[\xpg@val\xpg@nr]{Devanagari,Bengali,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \bengali@bengali@numeralsfalse%
- \bengali@devanagari@numeralstrue%
- \or
- % Bengali:
- \bengali@bengali@numeralstrue%
- \bengali@devanagari@numeralsfalse%
- \or
- % Western:
- \bengali@bengali@numeralsfalse%
- \bengali@devanagari@numeralsfalse%
- \fi
- \xpg@info{Option: Bengali, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Bengali numeral `#1'}}
\def\extras@bengali{}
\def\noextras@bengali{}
-\define@boolkey{bengali}[bengali@]{changecounternumbering}[true]{}
+\DeclareKeys[polyglossia/gloss/bengali]
+ {
+ changecounternumbering.if = bengali@changecounternumbering,
+ changecounternumbering.default:n = true,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \bengali@bengali@numeralsfalse
+ \bengali@devanagari@numeralstrue
+ },
+ numerals / bengali.code =
+ {%
+ \bengali@bengali@numeralstrue
+ \bengali@devanagari@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \bengali@bengali@numeralsfalse
+ \bengali@devanagari@numeralsfalse
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Bengali numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{bengali}{changecounternumbering=false,numerals=Devanagari}
+\InitializeGlossOptions{bengali}{changecounternumbering=false,numerals=Devanagari}
\def\captionsbengali{%
\def\refname{তথ্যসূত্রসমূহ}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
index d75aff3a6e9..fe47cb79588 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bg.ldf}[polyglossia: module for bg (Bulgarian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bulgarian}
+\InheritGlossFile{bulgarian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
index 2c868f96eec..c85acb7dcac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bn.ldf}[polyglossia: module for bn (Bengali)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bengali}
+\InheritGlossFile{bengali}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
index 0f590f9da3a..f569a743133 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bo.ldf}[polyglossia: module for bo (Tibetan)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{tibetan}
+\InheritGlossFile{tibetan}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf
index e94edab0a53..24b7756ae52 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bosnian.ldf}[polyglossia: module for Bosnian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
index 5ad3f56ef00..62436958f59 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-br.ldf}[polyglossia: module for br (Breton)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{breton}
+\InheritGlossFile{breton}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf
index f5c681c9f32..85e541ab0c3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for Brazilian Portuguese]
@@ -6,6 +6,6 @@
% 'brazil' was selected in accordance with babel.
% Since brazil is a variety of portuguese, we use 'portuguese' now.
-\xpg@load@master@language{portuguese}
+\InheritGlossFile{portuguese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf
index 3d0b34a99f9..51f048c909f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-breton.ldf}[polyglossia: module for Breton]
\PolyglossiaSetup{breton}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
index ccf3a39ccfd..2a9870c6370 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-british.ldf}[polyglossia: module for British English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
index 335992a52e5..fa0243300c8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bs.ldf}[polyglossia: module for bs (Bosnian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bosnian}
+\InheritGlossFile{bosnian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf
index c7976480e5b..22cb9194716 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bulgarian.ldf}[polyglossia: module for Bulgarian]
\PolyglossiaSetup{bulgarian}{
@@ -61,15 +61,15 @@
\def\figurename{Фигура}%
\def\tablename{Таблица}%
%\def\thepart{}%
- %\def\partname{}%
+ \def\partname{Част}%
\def\pagename{Стр.}%
\def\seename{вж.}%
\def\alsoname{вж.\ също и}%
\def\enclname{Приложения}%
\def\ccname{копия}%
- %\def\headtoname{}%
- \def\proofname{Proof}%
- \def\glossaryname{Glossary}%
+ \def\headtoname{За}%
+ \def\proofname{Доказателство}%
+ \def\glossaryname{Притурка}%
}
\def\datebulgarian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
index b8d173e11f1..9c8d87d3226 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ca.ldf}[polyglossia: module for ca (Catalan)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{catalan}
+\InheritGlossFile{catalan}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
index 249bd57c9f1..119f086eeac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-canadian.ldf}[polyglossia: module for Canadian English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
index 8cfed1e4da2..e62a04726aa 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-canadien.ldf}[polyglossia: module for Canadian French]
% We provide this as a babel alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf
index 37566fd974d..1e855fabb64 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-catalan.ldf}[polyglossia: module for Catalan]
\PolyglossiaSetup{catalan}{
@@ -16,21 +16,21 @@
% BCP-47 compliant aliases
\setlanguagealias*{catalan}{ca}
-\define@boolkey{catalan}[catalan@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/catalan]
+ {
+ babelshorthands.if = catalan@babelshorthands,
+ babelshorthands.default:n = true,
+ }
\ifsystem@babelshorthands
- \setkeys{catalan}{babelshorthands=true}
+ \SetGlossOptions{catalan}{babelshorthands=true}
\else
- \setkeys{catalan}{babelshorthands=false}
+ \SetGlossOptions{catalan}{babelshorthands=false}
\fi
% Register default options
-\xpg@initialize@gloss@options{catalan}{babelshorthands=false}
+\InitializeGlossOptions{catalan}{babelshorthands=false}
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
%%% adapted from Babel's catalan.ldf
\newdimen\leftllkern \newdimen\rightllkern \newdimen\raiselldim
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf
index 05621e02298..004a8e8903c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-chinese.ldf}[polyglossia: module for Chinese]
@@ -22,51 +22,60 @@
\setlanguagealias*[variant=simplified]{chinese}{zh-CN}
\setlanguagealias*[variant=traditional]{chinese}{zh-TW}
-\providebool{chinese@traditional}
+\@ifundefined{ifchinese@traditional}%
+ {\newif\ifchinese@traditional}{}
-\def\chinese@variant{chinese}
-
-\newif\ifchinese@numerals
-\define@key{chinese}{numerals}[arabic]{%
- \ifstrequal{#1}{chinese}%
- {\chinese@numeralstrue%
- \SetLanguageKeys{chinese}{bcp47-extension-u=nu-hant}%
- }{\chinese@numeralsfalse%
- \SetLanguageKeys{chinese}{bcp47-extension-u=nu-latn}%
- }%
-}
+\@ifundefined{ifchinese@numerals}%
+ {\newif\ifchinese@numerals}{}
+\def\chinese@variant{chinese}
-\define@choicekey*+{chinese}{variant}[\xpg@val\xpg@nr]{cn,simplified,tw,traditional}[cn]{%
- \ifcase\xpg@nr\relax
- % cn:
- \chinese@traditionalfalse
- \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
- \xpg@info{Option: Chinese, variant=simplified}%
- \or
- % simplified:
- \chinese@traditionalfalse
- \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
- \xpg@info{Option: Chinese, variant=simplified}%
- \or
- % tw:
- \chinese@traditionaltrue
- \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
- \xpg@info{Option: Chinese, variant=traditional}%
- \or
- % traditional:
- \chinese@traditionaltrue
- \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
- \xpg@info{Option: Chinese, variant=traditional}%
- \fi
-}{\xpg@warning{Unknown Chinese variant `#1'}}
+\DeclareKeys[polyglossia/gloss/chinese]
+ {
+ variant.choice:,
+ variant / cn.code =
+ {%
+ \chinese@traditionalfalse
+ \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
+ },
+ variant / simplified.code =
+ {%
+ \chinese@traditionalfalse
+ \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
+ },
+ variant / tw.code =
+ {%
+ \chinese@traditionaltrue
+ \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
+ },
+ variant / traditional.code =
+ {%
+ \chinese@traditionaltrue
+ \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
+ },
+ variant.default:n = cn,
+ variant/unknown.code = \xpg@warning{Unknown Chinese variant `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \chinese@numeralsfalse
+ \SetLanguageKeys{chinese}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / chinese.code =
+ {%
+ \chinese@numeralstrue
+ \SetLanguageKeys{chinese}{bcp47-extension-u=nu-hant}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Chinese numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{chinese}{variant=cn,numerals=arabic}
-%\xpg@initialize@gloss@options{chinese}{variant=tw,numerals=arabic}
+\InitializeGlossOptions{chinese}{variant=cn,numerals=arabic}
+%\InitializeGlossOptions{chinese}{variant=tw,numerals=arabic}
% Register alias options
-\xpg@set@alias@values{chinese}{variant}{cn}{simplified}
-\xpg@set@alias@values{chinese}{variant}{tw}{traditional}
+\SetLanguageAliasValues{chinese}{variant}{cn,simplified}
+\SetLanguageAliasValues{chinese}{variant}{tw,traditional}
\def\chinese@capsformat{%
@@ -118,7 +127,7 @@
\def\enclname{附件}%
\def\ccname{抄送}%
\def\headtoname{收件人}%
- \def\\glossaryname{詞彙表}%
+ \def\glossaryname{詞彙表}%
}
\def\captions@chinese@simplified{%
\def\contentsname{目录}%
@@ -141,7 +150,7 @@
\def\enclname{附件}%
\def\ccname{抄送}%
\def\headtoname{收件人}%
- \def\\glossaryname{词汇表}%
+ \def\glossaryname{词汇表}%
}
\newcount\c@TempJNum%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
index f216864f4c6..f3fb645422d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb-Arab.ldf}[polyglossia: module for ckb-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
index 73db9067eff..93bd7dcdcf8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb-Latn.ldf}[polyglossia: module for ckb-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
index 360d484e8c2..73d86d55a01 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb.ldf}[polyglossia: module for ckb (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf
new file mode 100644
index 00000000000..b20a680f5bd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf
@@ -0,0 +1,9 @@
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-classiclatin.ldf}[polyglossia: module for classic Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
index 2f7e8653738..3aea4d6ff28 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cop.ldf}[polyglossia: module for cop (Coptic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{coptic}
+\InheritGlossFile{coptic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf
index 0cff5d46d13..4368557e1c7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-coptic.ldf}[polyglossia: module for Coptic]
\PolyglossiaSetup{coptic}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf
index 15b7bc02a01..8c7d64ae5e1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-croatian.ldf}[polyglossia: module for Croatian]
\PolyglossiaSetup{croatian}{
@@ -20,40 +20,40 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{croatian}[croatian@]{babelshorthands}[true]{}
-
-\define@boolkey{croatian}[croatian@]{disabledigraphs}[true]{}
-
-% Alias kept for backwards compatibility. Please do not remove
-\define@boolkey{croatian}[croatian@]{disableligatures}[true]{%
- \xpg@warning{The option disableligatures is deprected.\MessageBreak
- Please use disabledigraphs instead}%
- \ifcroatian@disableligatures
- \croatian@disabledigraphstrue
- \else
- \croatian@disabledigraphsfalse
- \fi
-}
-
-\define@boolkey{croatian}[croatian@]{splithyphens}[true]{}
-
-\define@boolkey{croatian}[croatian@]{localalph}[true]{}
+\DeclareKeys[polyglossia/gloss/croatian]
+ {
+ babelshorthands.if = croatian@babelshorthands,
+ babelshorthands.default:n = true,
+ disabledigraphs.if = croatian@disabledigraphs,
+ disabledigraphs.default:n = true,
+ splithyphens.if = croatian@splithyphens,
+ splithyphens.default:n = true,
+ localalph.if = croatian@localalph,
+ localalph.default:n = true,
+ disableligatures.choices:nn = { true, false }
+ {%
+ \xpg@warning{The option disableligatures is deprecated.\MessageBreak
+ Please use disabledigraphs instead}%
+ \ifcase\UseName{l_keys_choice_int}\or
+ \croatian@disabledigraphstrue
+ \or
+ \croatian@disabledigraphsfalse
+ \fi
+ },
+ disableligatures.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{croatian}{babelshorthands=false,disabledigraphs=false,
+\InitializeGlossOptions{croatian}{babelshorthands=false,disabledigraphs=false,
splithyphens=true,localalph=true}
\ifsystem@babelshorthands
- \setkeys{croatian}{babelshorthands=true}
+ \SetGlossOptions{croatian}{babelshorthands=true}
\else
- \setkeys{croatian}{babelshorthands=false}
+ \SetGlossOptions{croatian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\croatian@@splhyphen#1{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
index bcf199e0747..107496bca65 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cy.ldf}[polyglossia: module for cy (Welsh)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{welsh}
+\InheritGlossFile{welsh}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
index d3775620eed..81cf42534e9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cz.ldf}[polyglossia: module for cz (Czech)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{czech}
+\InheritGlossFile{czech}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf
index 858f3d4ae6c..85aaf6fca69 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-czech.ldf}[polyglossia: module for Czech]
@@ -21,26 +21,26 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{czech}[czech@]{babelshorthands}[true]{}
-
-\define@boolkey{czech}[czech@]{splithyphens}[true]{}
-
-\define@boolkey{czech}[czech@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/czech]
+ {
+ babelshorthands.if = czech@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = czech@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = czech@vlna,
+ vlna.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{czech}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{czech}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{czech}{babelshorthands=true}
+ \SetGlossOptions{czech}{babelshorthands=true}
\else
- \setkeys{czech}{babelshorthands=false}
+ \SetGlossOptions{czech}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\czech@@splithyphen#1{%
\def\czech@sh@tmp{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
index ff3dda30d0a..7a6f2e8abd1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-da.ldf}[polyglossia: module for da (Danish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{danish}
+\InheritGlossFile{danish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf
index 6126beaeb8b..0e779b8677a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-danish.ldf}[polyglossia: module for Danish]
\PolyglossiaSetup{danish}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf
index 6ec76bdff99..ab66673e7c4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1901.ldf}[polyglossia: module for de-AT-1901 (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf
index 0354d8b16fc..38021f39d44 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1996.ldf}[polyglossia: module for de-AT-1996 (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
index 5e016be933d..2c74672a940 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT.ldf}[polyglossia: module for de-AT (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf
index 1df826fee1d..0c68393bc3e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1901.ldf}[polyglossia: module for de-CH-1901 (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf
index 7ccf3664967..d115b45dd71 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1996.ldf}[polyglossia: module for de-CH-1996 (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
index d99f0594d75..5ca22d3cf8f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH.ldf}[polyglossia: module for de-CH (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf
index 1f4a987a1b4..f1b57ec2d43 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1901.ldf}[polyglossia: module for de-DE-1901 (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf
index 9114631dcf1..a51fb8fca22 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1996.ldf}[polyglossia: module for de-DE-1996 (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
index 174cfc6ea0a..f88846d4d5d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE.ldf}[polyglossia: module for de-DE (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf
index 97852bb8e02..07e96769bf4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1901-Latf.ldf}[polyglossia: module for de-AT-1901-Latf (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf
index a87e11a509c..02124310792 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1996-Latf.ldf}[polyglossia: module for de-AT-1996-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf
index 41eb5a93b9b..a71b3cac654 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-Latf.ldf}[polyglossia: module for de-AT-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf
index 05d331c364b..2545c40ce48 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1901-Latf.ldf}[polyglossia: module for de-CH-1901-Latf (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf
index 3e256710167..08f3d5b3da0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1996-Latf.ldf}[polyglossia: module for de-CH-1996-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf
index db4d3494874..e9022148d23 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-Latf.ldf}[polyglossia: module for de-CH-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf
index 4b7f9f97bad..a5637e4fb1a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1901-Latf.ldf}[polyglossia: module for de-DE-1901-Latf (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf
index a4324450320..cb6c2261296 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1996-Latf.ldf}[polyglossia: module for de-DE-1996-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf
index 19649f6f98b..161729c7fd1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-Latf.ldf}[polyglossia: module for de-DE-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
index 2eddf761c4d..c399b378c46 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-Latf.ldf}[polyglossia: module for de-Latf (German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
index 5f15ee4e843..05d3f990eea 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de.ldf}[polyglossia: module for de (German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
index 10debfabfa6..a8859eac5fb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-divehi.ldf}[polyglossia: module for Divehi]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
index 03e4a24986b..c3f45032b9b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dsb.ldf}[polyglossia: module for dsb (Sorbian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf
index f679e7f039c..f2ebd6f9168 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dutch.ldf}[polyglossia: module for Dutch]
\PolyglossiaSetup{dutch}{
@@ -15,24 +15,24 @@
% BCP-47 compliant aliases
\setlanguagealias*{dutch}{nl}
-\define@boolkey{dutch}[dutch@]{babelshorthands}[true]{}
-
-\define@boolkey{dutch}[dutch@]{tremahyphenation}[true]{}
+\DeclareKeys[polyglossia/gloss/dutch]
+ {
+ babelshorthands.if = dutch@babelshorthands,
+ babelshorthands.default:n = true,
+ tremahyphenation.if = dutch@tremahyphenation,
+ tremahyphenation.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{dutch}{babelshorthands=false,tremahyphenation=true}
+\InitializeGlossOptions{dutch}{babelshorthands=false,tremahyphenation=true}
\ifsystem@babelshorthands
- \setkeys{dutch}{babelshorthands=true}
+ \SetGlossOptions{dutch}{babelshorthands=true}
\else
- \setkeys{dutch}{babelshorthands=false}
+ \SetGlossOptions{dutch}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\xpg@trema#1{\allowhyphens\discretionary{-}{#1}{\"{#1}}\allowhyphens}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
index 95ba8b33b3c..e157ca05322 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dv.ldf}[polyglossia: module for dv (Divehi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{divehi}
+\InheritGlossFile{divehi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf
new file mode 100644
index 00000000000..51659c46528
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf
@@ -0,0 +1,9 @@
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-ecclesiasticlatin.ldf}[polyglossia: module for ecclesiastic Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
index 3b2763da549..32cfa796b91 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el-monoton.ldf}[polyglossia: module for el-monoton (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
index f36384c04de..0a57420ca3f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el-polyton.ldf}[polyglossia: module for el-polyton (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
index 23acc8b54cf..b9a45d3501f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el.ldf}[polyglossia: module for el (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
index a75c84a3a61..362795a36b2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-AU.ldf}[polyglossia: module for en-AU (Australian English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
index 3253e418ab7..4c61b1afdd0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
-\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadan English)]
+\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadian English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
index fb958322bf4..bf8d7eb4726 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-GB.ldf}[polyglossia: module for en-GB (British English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
index 15db1b4a330..b9956311def 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-NZ.ldf}[polyglossia: module for en-NZ (Newzealand English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
index 55e3c76b979..943933b5836 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-US.ldf}[polyglossia: module for en-US (American English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
index 2fc32374054..65818e7fd70 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en.ldf}[polyglossia: module for en (English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
index 87da24e5e21..c434e00c40d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-english.ldf}[polyglossia: module for English]
@@ -30,9 +30,12 @@
\setlanguagealias[variant=canadian]{english}{canadian}
\setlanguagealias[variant=newzealand]{english}{newzealand}
-\providebool{british@hyphen}
-\providebool{english@ordinalmonthday}
-\providebool{british@dateformat}
+\@ifundefined{ifbritish@hyphen}%
+ {\newif\ifbritish@hyphen}{}
+\@ifundefined{ifenglish@ordinalmonthday}%
+ {\newif\ifenglish@ordinalmonthday}{}
+\@ifundefined{ifbritish@dateformat}%
+ {\newif\ifbritish@dateformat}{}
% US English (\l@english) is default
% Initialize its settings
@@ -41,49 +44,46 @@
\english@ordinalmonthdayfalse
\british@dateformatfalse
-% Option ordinalmonthday
-\define@boolkey{english}[english@]{ordinalmonthday}[true]{}
-
-\define@choicekey*+{english}{variant}[\xpg@val\xpg@nr]{uk,british,us,american,usmax,australian,newzealand,canadian}[us]{%
- \ifcase\xpg@nr\relax
+\DeclareKeys[polyglossia/gloss/english]
+ {
+ ordinalmonthday.if = english@ordinalmonthday,
+ ordinalmonthday.default:n = true,
+ variant.choices:nn = { uk, british, us, american, usmax, australian, newzealand, canadian }
+ {%
+ \ifcase\UseName{l_keys_choice_int}\or
% uk:
\british@hyphentrue
\british@dateformattrue
\english@ordinalmonthdaytrue
\SetLanguageKeys{english}{babelname=british,bcp47=en-GB,bcp47-language=en,bcp47-region=GB}%
- \xpg@info{Option: English, variant=british}%
\or
% british:
\british@hyphentrue
\british@dateformattrue
\english@ordinalmonthdaytrue
\SetLanguageKeys{english}{babelname=british,bcp47=en-GB,bcp47-language=en,bcp47-region=GB}%
- \xpg@info{Option: english variant=british}%
\or
% us:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: English, variant=american}%
\or
% american:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: English, variant=american}%
\or
% usmax:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: english variant=american (with additional patterns)}%
- \xpg@ifdefined{usenglishmax}{}%
+ \IfLanguageDefinedF{usenglishmax}%
{\xpg@warning{No hyphenation patterns were loaded for "US English Max"\MessageBreak
I will use the standard patterns for US English instead}%
- \adddialect\l@usenglishmax\l@english\relax%
+ \adddialect\l@usenglishmax\l@english
}%
\def\english@variant{usenglishmax}%
\or
@@ -94,8 +94,7 @@
\british@dateformattrue
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=australian,bcp47=en-AU,bcp47-language=en,bcp47-region=AU}%
- \xpg@info{Option: English, variant=australian}%
- \adddialect\l@australian\l@english%
+ \adddialect\l@australian\l@english
\or
% newzealand:
% These use the british hyphenation patterns
@@ -104,8 +103,7 @@
\british@dateformattrue
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=newzealand,bcp47=en-NZ,bcp47-language=en,bcp47-region=NZ}%
- \xpg@info{Option: English, variant=newzealand}%
- \adddialect\l@newzealand\l@english%
+ \adddialect\l@newzealand\l@english
\or
% canadian:
% This is currently equivalent to usenglish (as in babel)
@@ -113,45 +111,35 @@
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=canadian,bcp47=en-CA,bcp47-language=en,bcp47-region=CA}%
- \xpg@info{Option: English, variant=american}%
- \adddialect\l@canadian\l@english%
+ \adddialect\l@canadian\l@english
\fi
\ifbritish@hyphen
- \xpg@ifdefined{ukenglish}{}%
+ \IfLanguageDefinedF{ukenglish}%
{\xpg@warning{No hyphenation patterns were loaded for British English\MessageBreak
I will use the patterns for US English instead}%
- \adddialect\l@ukenglish\l@english\relax%
+ \adddialect\l@ukenglish\l@english
}%
\def\english@variant{ukenglish}%
\fi
-}{\xpg@warning{Unknown English variant `#1'}}
+ },
+ variant.default:n = us,
+ variant/unknown.code = \xpg@warning{Unknown English variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{english}{variant=us,ordinalmonthday=false}
+\InitializeGlossOptions{english}{variant=us,ordinalmonthday=false}
% Register alias options
-\xpg@set@alias@values{english}{variant}{us}{american}
-\xpg@set@alias@values{english}{variant}{uk}{british}
+\SetLanguageAliasValues{english}{variant}{us,american}
+\SetLanguageAliasValues{english}{variant}{uk,british}
\ifxetex
% Check if \l@english is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{english}{}{%
- \def\do##1{%
- \xpg@ifdefined{#1}%
- {\csletcs{l@english}{l@#1}\listbreak}%
- {%
- \xpg@warning{No hyphenation patterns for English found"\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@english0
- }%
- }%
- \docsvlist{british, american, usenglishmax, australian, newzealand}
- \xpg@ifdefined{english}{}{}
- }%
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{english}{british, american, usenglishmax, australian, newzealand}
\fi
\def\english@language{%
- \polyglossia@setup@language@patterns{\english@variant}%
+ \SetupPolyglossiaLangPatterns{\english@variant}%
}%
\def\captionsenglish{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
index 6c0cb13ecdc..ee888a9a3df 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-eo.ldf}[polyglossia: module for eo (Esperanto)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{esperanto}
+\InheritGlossFile{esperanto}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
index 0b0555e3727..2d4927f3c40 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es-ES.ldf}[polyglossia: module for es-ES (Spain's Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
index 9e459726429..656834e9f4a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es-MX.ldf}[polyglossia: module for es-MX (Mexican Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
index fb470d36c9c..8d6968fea50 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es.ldf}[polyglossia: module for es (Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf
index bd4e63a4a40..cb6c35e5329 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-esperanto.ldf}[polyglossia: module for Esperanto]
\PolyglossiaSetup{esperanto}{
@@ -29,10 +29,10 @@
\def\figurename{Figuro}%
\def\tablename{Tabelo}%
%\def\thepart{}%
- %\def\partname{}%
+ \def\partname{Parto}%
\def\pagename{Paĝo}%
\def\seename{vidu}%
- \def\alsoname{Parto}%
+ \def\alsoname{vidu ankaŭ}%
\def\enclname{Aldono(j)}%
\def\ccname{Kopie al}%
\def\headtoname{Al}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf
index 5dfb90ea569..7d179e433d7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-estonian.ldf}[polyglossia: module for Estonian]
\PolyglossiaSetup{estonian}{
@@ -38,7 +38,7 @@
\def\ccname{Koopia(d)}%
%\def\headtoname{}%
\def\proofname{Korrektuur}%
- \def\glossaryname{Glossary}% <-- need translation
+ \def\glossaryname{Sõnastik}%
}
\def\dateestonian{%
\def\today{\number\day.\space\ifcase\month\or
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
index 5ab0c3f3bae..0151ac000df 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-et.ldf}[polyglossia: module for et (Estonian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{estonian}
+\InheritGlossFile{estonian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
index 98448839b1f..39c5bdfef1c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-eu.ldf}[polyglossia: module for eu (Basque)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{basque}
+\InheritGlossFile{basque}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
index 08c337bdfb0..abe7241e059 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fa.ldf}[polyglossia: module for fa (Persian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{persian}
+\InheritGlossFile{persian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
index 09ae993ea43..21af458e2cf 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-farsi.ldf}[polyglossia: module for Farsi]
% We only provide this gloss for babel compatibility.
% The proper English language name is Persian.
-\xpg@load@master@language{persian}
+\InheritGlossFile{persian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
index 3b03ab4b433..a6b932ff10b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fi.ldf}[polyglossia: module for fi (Finnish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{finnish}
+\InheritGlossFile{finnish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf
index 3bd83a947d3..1d9b03c1974 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-finnish.ldf}[polyglossia: module for Finnish]
\PolyglossiaSetup{finnish}{
@@ -16,51 +16,54 @@
% BCP-47 compliant aliases
\setlanguagealias*{finnish}{fi}
-\define@boolkey{finnish}[finnish@]{babelshorthands}[true]{}
-
\newif\if@finnish@schoolhyphens
\newif\if@finnish@babelhyphens
-\define@choicekey*+{finnish}{hyphens}[\xpg@val\xpg@nr]{default,school,babel}[default]{%
- \ifcase\xpg@nr\relax
- % default:
- \@finnish@schoolhyphensfalse
- \@finnish@babelhyphensfalse
- \or
- % school:
- \@finnish@schoolhyphenstrue
- \@finnish@babelhyphensfalse
- \or
- % babel:
- \@finnish@schoolhyphensfalse
- \@finnish@babelhyphenstrue
- \fi
- \xpg@info{Option: Finnish, hyphens=\xpg@val}%
-}{\xpg@warning{Unknown Finnish hyphens `#1'}}
-
-% backwards compatibility
-\define@boolkey{finnish}[finnish@]{schoolhyphens}[true]{%
- \iffinnish@schoolhyphens
- \@finnish@schoolhyphenstrue
- \@finnish@babelhyphensfalse
- \else
- \@finnish@schoolhyphensfalse
- \fi
-}
+
+\DeclareKeys[polyglossia/gloss/finnish]
+ {
+ babelshorthands.if = finnish@babelshorthands,
+ babelshorthands.default:n = true,
+ hyphens.choice:,
+ hyphens / default.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ \@finnish@babelhyphensfalse
+ },
+ hyphens / school.code =
+ {%
+ \@finnish@schoolhyphenstrue
+ \@finnish@babelhyphensfalse
+ },
+ hyphens / babel.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ \@finnish@babelhyphenstrue
+ },
+ hyphens.default:n = default,
+ hyphens/unknown.code = \xpg@warning{Unknown Finnish hyphens `#1'},
+ schoolhyphens.choice:,
+ schoolhyphens / true.code =
+ {%
+ \@finnish@schoolhyphenstrue
+ \@finnish@babelhyphensfalse
+ },
+ schoolhyphens / false.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ },
+ schoolhyphens.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{finnish}{babelshorthands=false,hyphens=default}
+\InitializeGlossOptions{finnish}{babelshorthands=false,hyphens=default}
\ifsystem@babelshorthands
- \setkeys{finnish}{babelshorthands=true}
+ \SetGlossOptions{finnish}{babelshorthands=true}
\else
- \setkeys{finnish}{babelshorthands=false}
+ \SetGlossOptions{finnish}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\finnish@shorthands{%
\xpg@activate@shorthands%
@@ -105,15 +108,15 @@
\def\finnish@language{%
\if@finnish@schoolhyphens
- \xpg@ifdefined{schoolfinnish}{%
- \polyglossia@setup@language@patterns{schoolfinnish}%
+ \IfLanguageDefinedTF{schoolfinnish}{%
+ \SetupPolyglossiaLangPatterns{schoolfinnish}%
}{%
\xpg@warning{Finnish 'School' hyphenation patterns (schoolfinnish) not available.\MessageBreak
I will use the standard patterns for Finnish instead}%
- \polyglossia@setup@language@patterns{finnish}%
+ \SetupPolyglossiaLangPatterns{finnish}%
}%
\else
- \polyglossia@setup@language@patterns{finnish}%
+ \SetupPolyglossiaLangPatterns{finnish}%
\fi
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf
index 49e1c088687..173d01f3c57 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CA-u-sd-canb.ldf}[polyglossia: module for fr-CA-u-sd-canb (Canadian French, Acadian subvariety)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
index 8c8058a00e9..c1404f6862e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CA.ldf}[polyglossia: module for fr-CA (Canadian French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
index b8c2126df7c..c31c4f57f8c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CH.ldf}[polyglossia: module for fr-CH (Swiss French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
index 41f1eb0ad50..b66ad30ec8c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-FR.ldf}[polyglossia: module for fr-FR (France's French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
index 672c6de8939..46267775b17 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr.ldf}[polyglossia: module for fr (French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
index 2b0c795cdeb..8beace22bbd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-french.ldf}[polyglossia: module for French]
@@ -28,43 +28,9 @@
\setlanguagealias[variant=canadian]{french}{canadien}
\def\french@variant{french}
-\define@choicekey*+{french}{variant}[\xpg@val\xpg@nr]{french,canadian,acadian,swiss}[french]{%
- \ifcase\xpg@nr\relax
- % french:
- \def\french@variant{french}%
- \SetLanguageKeys{french}{babelname=french,bcp47=fr-FR,bcp47-language=fr,bcp47-region=FR}%
- \french@thincolonspacefalse
- \or
- % canadian:
- \def\french@variant{canadien}%
- \SetLanguageKeys{french}{babelname=canadien,bcp47=fr-CA,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-caqc}%
- \xpg@ifdefined{canadien}{}%
- {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
- I will use the standard patterns for French instead}%
- \adddialect\l@canadien\l@french\relax}%
- \french@thincolonspacefalse
- \or
- % acadian:
- \def\french@variant{acadian}%
- \SetLanguageKeys{french}{babelname=acadian,bcp47=fr-CA-u-sd-canb,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-canb}%
- \xpg@ifdefined{acadian}{}%
- {\xpg@warning{No hyphenation patterns were loaded for "French (Canada, Acadian)"\MessageBreak
- I will use the standard patterns for French instead}%
- \adddialect\l@acadian\l@french\relax}%
- \french@thincolonspacefalse
- \or
- % swiss:
- \def\french@variant{swissfrench}%
- \SetLanguageKeys{french}{babelname=french,bcp47=fr-CH,bcp47-language=fr,bcp47-region=CH}%
- \adddialect\l@swissfrench\l@french\relax%
- \french@thincolonspacetrue
- \fi
- \xpg@info{Option: French, variant=\xpg@val}%
-}{\xpg@warning{Unknown French variant `#1'}}
-
\def\french@language{%
- \polyglossia@setup@language@patterns{\french@variant}%
+ \SetupPolyglossiaLangPatterns{\french@variant}%
}%
\ifluatex
@@ -84,91 +50,103 @@
% Save original footnote definition
% Do this at the end of the preamble to catch other
% packages' footnote changes (#391)
-\AtEndPreamble{%
+\AddToHook{begindocument/before}{%
\let\xpg@orig@makefntext\@makefntext
}
-\define@boolkey{french}[french@]{frenchfootnote}[true]{}
-
-\define@boolkey{french}[french@]{autospacing}[true]{}
-\french@autospacingtrue
-
-\define@boolkey{french}[french@]{frenchpart}[true]{}
-\french@frenchparttrue
-
-\newif\iffrench@autospaceguillemets
-\define@boolkey{french}[french@]{autospaceguillemets}[true]{}
-\french@autospaceguillemetstrue
-
-\newif\iffrench@thincolonspace
-\define@boolkey{french}[french@]{thincolonspace}[true]{}
-\french@thincolonspacefalse
-
-% Backwards compatibility
-\define@boolkey{french}[french@]{automaticspacesaroundguillemets}[true]{%
- \iffrench@automaticspacesaroundguillemets
- \setkeys{french}{autospaceguillemets=true}%
- \else
- \setkeys{french}{autospaceguillemets=false}%
- \fi
-}
-
% name is for compatibility with babel
\let\french@ttfamilyORI\ttfamily
\DeclareRobustCommand\french@ttfamilyFB{\nofrench@punctuation\french@ttfamilyORI}
-% Allow to switch on autospacing in ttfamily context
-\define@boolkey{french}[french@]{autospacetypewriter}[true]{}
-\french@autospacetypewriterfalse
-
-% This is how babel-french has it
-\define@boolkey{french}[french@]{OriginalTypewriter}[true]{%
- \iffrench@OriginalTypewriter
- \setkeys{french}{autospacetypewriter=false}%
- \else
- \setkeys{french}{autospacetypewriter=true}%
- \fi
-}
-
% Configuration of item labels
\def\french@itemi{\textemdash}
\def\french@itemii{\textemdash}
\def\french@itemiii{\textemdash}
\def\french@itemiv{\textemdash}
-\define@key{french}{itemlabels}[\textemdash]{%
- \def\french@itemi{#1}
- \def\french@itemii{#1}
- \def\french@itemiii{#1}
- \def\french@itemiv{#1}
-}
-
-\define@key{french}{itemlabeli}[\textemdash]{%
- \def\french@itemi{#1}
-}
-
-\define@key{french}{itemlabelii}[\textemdash]{%
- \def\french@itemii{#1}
-}
-
-\define@key{french}{itemlabeliii}[\textemdash]{%
- \def\french@itemiii{#1}
-}
-
-\define@key{french}{itemlabeliv}[\textemdash]{%
- \def\french@itemiv{#1}
-}
+\newif\iffrench@autospacetypewriter
+\french@autospacetypewriterfalse
+\newif\iffrench@autospacing
+\french@autospacingtrue
+\newif\iffrench@frenchpart
+\french@frenchparttrue
+\newif\iffrench@autospaceguillemets
+\french@autospaceguillemetstrue
-\define@boolkey{french}[french@]{frenchitemlabels}[true]{}
+\DeclareKeys[polyglossia/gloss/french]
+ {
+ variant.choice:,
+ variant / french.code =
+ {%
+ \def\french@variant{french}%
+ \SetLanguageKeys{french}{babelname=french,bcp47=fr-FR,bcp47-language=fr,bcp47-region=FR}%
+ \french@thincolonspacefalse
+ },
+ variant / canadian.code =
+ {%
+ \def\french@variant{canadien}%
+ \SetLanguageKeys{french}{babelname=canadien,bcp47=fr-CA,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-caqc}%
+ \IfLanguageDefinedF{canadien}%
+ {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
+ I will use the standard patterns for French instead}%
+ \adddialect\l@canadien\l@french\relax}%
+ \french@thincolonspacefalse
+ },
+ variant / acadian.code =
+ {%
+ \def\french@variant{acadian}%
+ \SetLanguageKeys{french}{babelname=acadian,bcp47=fr-CA-u-sd-canb,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-canb}%
+ \IfLanguageDefinedF{acadian}%
+ {\xpg@warning{No hyphenation patterns were loaded for "French (Canada, Acadian)"\MessageBreak
+ I will use the standard patterns for French instead}%
+ \adddialect\l@acadian\l@french\relax}%
+ \french@thincolonspacefalse
+ },
+ variant / swiss.code =
+ {%
+ \def\french@variant{swissfrench}%
+ \SetLanguageKeys{french}{babelname=french,bcp47=fr-CH,bcp47-language=fr,bcp47-region=CH}%
+ \adddialect\l@swissfrench\l@french\relax%
+ \french@thincolonspacetrue
+ },
+ variant.default:n = french,
+ variant/unknown.code = \xpg@warning{Unknown French variant `#1'},
+ frenchfootnote.if = french@frenchfootnote,
+ frenchfootnote.default:n = true,
+ autospacing.if = french@autospacing,
+ autospacing.default:n = true,
+ frenchpart.if = french@frenchpart,
+ frenchpart.default:n = true,
+ autospaceguillemets.if = french@autospaceguillemets,
+ autospaceguillemets.default:n = true,
+ thincolonspace.if = french@thincolonspace,
+ thincolonspace.default:n = true,
+ automaticspacesaroundguillemets.meta:n = {autospaceguillemets=#1},
+ autospacetypewriter.if = french@autospacetypewriter,
+ autospacetypewriter.default:n = true,
+ originaltypewriter.meta:n = {autospacetypewriter=#1},
+ itemlabeli.store = \french@itemi,
+ itemlabelii.store = \french@itemii,
+ itemlabeliii.store = \french@itemiii,
+ itemlabeliv.store = \french@itemiv,
+ frenchitemlabels.if = french@frenchitemlabels,
+ frenchitemlabels.default:n = true,
+ itemlabels.code =
+ \def\french@itemi{#1}%
+ \def\french@itemii{#1}%
+ \def\french@itemiii{#1}%
+ \def\french@itemiv{#1},
+ itemlabels.default:n = \textemdash
+ }
% Register default options
-\xpg@initialize@gloss@options{french}{variant=french,autospacing=true,thincolonspace=false,
+\InitializeGlossOptions{french}{variant=french,autospacing=true,thincolonspace=false,
autospaceguillemets=true,autospacetypewriter=false,
frenchfootnote=false,frenchitemlabels=false,
itemlabels=\textemdash,itemlabeli=\textemdash,itemlabelii=\textemdash,
itemlabeliii=\textemdash,itemlabeliv=\textemdash}
% Register alias options
-\xpg@set@alias@values{french}{variant}{canadian}{acadian}
+\SetLanguageAliasValues{french}{variant}{canadian,acadian}
\def\french@fontsetup{%
@@ -339,100 +317,100 @@
\def\french@capsformat{%
% Change part heading
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\xpg@french@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
+ \@ifundefined{titleformat}{%
+ % With KOMA
+ \@ifundefined{sectionformat}{%
+ % With memoir
+ \@ifundefined{@memptsize}{% (not \ifdefined\@memptsize)
+ % With standard classes
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\xpg@french@part\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for French}}}%
+ }% (end \ifdefined \@part)
+ }{% Hyperref
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\xpg@french@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{}%
- }%
- }{% (not \ifdefined\titleformat)
- % With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\xpg@french@part~\partname}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
- {\partnamefont\xpg@french@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
+ }% (end \ifdefined\NR@part)
+ }{%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
\let\xpg@save@part@format\@part%
\patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
{\partnamefont\xpg@french@part\partnamenum\printpartname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
- % With standard classes
- \ifcsdef{NR@part}{% Hyperref
+ }%
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
+ \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
+ {\partnamefont\xpg@french@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for French}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\xpg@french@part~\partname}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
{\partname\nobreakspace\thepart}%
{\xpg@french@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\xpg@french@part\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for French}}{}}%
- }{}% (end \ifdefined \NR@part)
- }% (end \ifdefined\@part)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\xpg@french@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for French}}%
+ }%
}% (end \ifdefined\titleformat)
}
\def\nofrench@capsformat{%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
- % With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- }{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
}%
- }{}%
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
}% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ % With titlesec
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
+ }%
+ }%
}% (end \ifdefined\titleformat)
}
@@ -443,7 +421,7 @@
\if@xpg@french@footnote@set%
\else%
\iffrench@frenchfootnote%
- \ifdefstring{\xpg@main@language}{french}{%
+ \IfMainLanguageTF{french}{%
\ifx\@makefntext\undefined\else%
\long\def\french@makefntext##1{%
\parindent1em \noindent\quad%
@@ -467,7 +445,7 @@
\if@xpg@french@itemlabels@set%
\else%
\iffrench@frenchitemlabels
- \ifdefstring{\xpg@main@language}{french}{%
+ \IfMainLanguageTF{french}{%
\renewcommand{\labelitemi}{\french@itemi}%
\renewcommand{\labelitemii}{\french@itemii}%
\renewcommand{\labelitemiii}{\french@itemiii}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
index 2db31a34152..7713ef99fe5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-friulan.ldf}[polyglossia: module for Friulian]
% We only provide this gloss for babel compatibility.
-\xpg@load@master@language{friulian}
+\InheritGlossFile{friulian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf
index 49b69eaf9dd..ed1f24ae428 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-friulian.ldf}[polyglossia: module for Friulian]
@@ -52,7 +52,7 @@
Lui\or Avost\or Setembar\or Otobar\or Novembar\or Dicembar%
\fi\space dal\space\number\year}}
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgfu@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
index ca0671bbe9a..2005e4d484a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fur.ldf}[polyglossia: module for fur (Friulian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{friulian}
+\InheritGlossFile{friulian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
index 02fd9e40091..364fa8e773e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ga.ldf}[polyglossia: module for ga (Gaelic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf
index 2cbf5adbc5e..8b91897888a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gaelic.ldf}[polyglossia: module for Gaelic]
@@ -22,23 +22,28 @@
\setlanguagealias[variant=scottish]{gaelic}{scottish}
\def\gaelic@variant{irish}
-\define@choicekey*+{gaelic}{variant}[\xpg@val\xpg@nr]{irish,scottish}[irish]{%
- \ifcase\xpg@nr\relax
- % irish:
- \gdef\gaelic@variant{irish}%
- \SetLanguageKeys{gaelic}{language=Irish,langtag=IRI,babelname=irish,bcp47=ga,bcp47-language=ga}%
- \xpg@fontsetup@latin{gaelic}%
- \or
- % scottish:
- \gdef\gaelic@variant{scottish}%
- \SetLanguageKeys{gaelic}{language=Gaelic,langtag=GAE,babelname=scottish,bcp47=gd,bcp47-language=gd}%
- \xpg@fontsetup@latin{gaelic}%
- \fi
- \xpg@info{Option: gaelic, variant=\xpg@val}%
-}{\xpg@warning{Unknown gaelic variant `#1'}}
+
+\DeclareKeys[polyglossia/gloss/gaelic]
+ {
+ variant.choice:,
+ variant / irish.code =
+ {%
+ \gdef\gaelic@variant{irish}%
+ \SetLanguageKeys{gaelic}{language=Irish,langtag=IRI,babelname=irish,bcp47=ga,bcp47-language=ga}%
+ \SetupLatinPolyglossiaFont{gaelic}%
+ },
+ variant / scottish.code =
+ {%
+ \gdef\gaelic@variant{scottish}%
+ \SetLanguageKeys{gaelic}{language=Gaelic,langtag=GAE,babelname=scottish,bcp47=gd,bcp47-language=gd}%
+ \SetupLatinPolyglossiaFont{gaelic}%
+ },
+ variant.default:n = irish,
+ variant/unknown.code = \xpg@warning{Unknown gaelic variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{gaelic}{variant=irish}
+\InitializeGlossOptions{gaelic}{variant=irish}
\def\captionsgaelic@irish{%
\def\refname{Tagairtí}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf
index 469af7e8cde..ab10957c8ea 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-galician.ldf}[polyglossia: module for Galician]
\PolyglossiaSetup{galician}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
index 94842fd4d52..bd0a4572e90 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gd.ldf}[polyglossia: module for gd (Gaelic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf
index e58cede44b3..be0db60a34b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-georgian.ldf}[polyglossia: module for Georgian]
@@ -18,34 +18,37 @@
\setlanguagealias*{georgian}{ka}
\newif\ifgeorgian@numerals
-\define@key{georgian}{numerals}[arabic]{%
- \ifstrequal{#1}{georgian}%
- {\georgian@numeralstrue%
- \SetLanguageKeys{georgian}{bcp47-extension-u=nu-geor}%
- }%
- {\georgian@numeralsfalse%
- \SetLanguageKeys{georgian}{bcp47-extension-u=nu-latn}%
- }%
-}
-
-\define@boolkey{georgian}[georgian@]{babelshorthands}[true]{}
-\define@boolkey{georgian}[georgian@]{oldmonthnames}[true]{}
+\DeclareKeys[polyglossia/gloss/georgian]
+ {
+ babelshorthands.if = georgian@babelshorthands,
+ babelshorthands.default:n = true,
+ oldmonthnames.if = georgian@oldmonthnames,
+ oldmonthnames.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \georgian@numeralsfalse
+ \SetLanguageKeys{georgian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / georgian.code =
+ {%
+ \georgian@numeralstrue
+ \SetLanguageKeys{georgian}{bcp47-extension-u=nu-geor}%
+ },
+ numerals.default:n = arabic
+ }
% Register default options
-\xpg@initialize@gloss@options{georgian}{babelshorthands=false,oldmonthnames=false,numerals=arabic}
+\InitializeGlossOptions{georgian}{babelshorthands=false,oldmonthnames=false,numerals=arabic}
\ifsystem@babelshorthands
- \setkeys{georgian}{babelshorthands=true}
+ \SetGlossOptions{georgian}{babelshorthands=true}
\else
- \setkeys{georgian}{babelshorthands=false}
+ \SetGlossOptions{georgian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\georgian@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
index 918b759eb80..f4f918f50cb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-german.ldf}[polyglossia: module for German]
@@ -47,51 +47,11 @@
\newif\if@german@oldspelling
\@german@oldspellingfalse
-\define@choicekey*+{german}{spelling}[\xpg@val\xpg@nr]{new,old,1901,1996}[new]{%
- \ifcase\xpg@nr\relax
- % new:
- \@german@oldspellingfalse
- \or
- % old:
- \@german@oldspellingtrue
- \or
- % 1901:
- \@german@oldspellingtrue
- \or
- % 1996:
- \@german@oldspellingfalse
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, spelling=\xpg@val}%
-}{\xpg@warning{Unknown German spelling `#1'}}
\newif\if@austrian@locale
\@austrian@localefalse
\newif\if@swiss@locale
\@swiss@localefalse
-\define@choicekey*+{german}{variant}[\xpg@val\xpg@nr]{german,austrian,swiss}[german]{%
- \ifcase\xpg@nr\relax
- % german:
- \@swiss@localefalse%
- \@austrian@localefalse%
- \or
- % austrian:
- \@austrian@localetrue%
- \@swiss@localefalse%
- \or
- % swiss:
- \@swiss@localetrue%
- \@austrian@localefalse%
- \xpg@ifdefined{swissgerman}{}%
- {%
- \xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
- I will use the standard patterns for German (old spelling) instead}%
- \adddialect\l@swissgerman\l@german\relax%
- }%
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, variant=\xpg@val}%
-}{\xpg@warning{Unknown German variant `#1'}}
\def\german@set@babelname{%
\if@german@oldspelling
@@ -140,58 +100,110 @@
}
\newif\if@german@blackletter
-\define@choicekey*+{german}{script}[\xpg@val\xpg@nr]{latin,blackletter,fraktur}[latin]{%
- \ifcase\xpg@nr\relax
- % latin:
- \@german@blackletterfalse%
- \or
- % blackletter:
- \@german@blacklettertrue%
- \or
- % fraktur:
- \@german@blacklettertrue%
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, script=\xpg@val}%
-}{\xpg@warning{Unknown German script `#1'}}
-\define@boolkey{german}[german@]{capitaleszett}[true]{%
- \ifgerman@capitaleszett
- % MakeUppercase capitalizes the eszett (U+00DF) with U+1E9E
- \SetLanguageKeys{german}{bcp47-casing=de-x-eszett,bcp47-extension-x=eszett}
- \else
- % Capitalize eszett as <SS>
- \SetLanguageKeys{german}{bcp47-casing=de,bcp47-extension-x={}}
- \fi
-}
-
-
-% Option defunc'ed, as both XeTeX and LuaTeX meanwhile
-% use the experimental German hyphenation patterns by default.
-\define@boolkey{german}[german@]{latesthyphen}[true]{}
-
-\define@boolkey{german}[german@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/german]
+ {
+ babelshorthands.if = german@babelshorthands,
+ babelshorthands.default:n = true,
+ latesthyphen.if = german@latesthyphen,
+ latesthyphen.default:n = true,
+ capitaleszett.choice:,
+ capitaleszett / true.code =
+ {% MakeUppercase capitalizes the eszett (U+00DF) with U+1E9E
+ \SetLanguageKeys{german}{bcp47-casing=de-x-eszett,bcp47-extension-x=eszett}%
+ },
+ capitaleszett / false.code =
+ {% Capitalize eszett as <SS>
+ \SetLanguageKeys{german}{bcp47-casing=de,bcp47-extension-x={}}%
+ },
+ capitaleszett.default:n = true,
+ script.choice:,
+ script / latin.code =
+ {%
+ \@german@blackletterfalse
+ \german@set@babelname
+ },
+ script / blackletter.code =
+ {%
+ \@german@blacklettertrue
+ \german@set@babelname
+ },
+ script / fraktur.code =
+ {%
+ \@german@blacklettertrue
+ \german@set@babelname
+ },
+ script.default:n = latin,
+ script/unknown.code = \xpg@warning{Unknown German script `#1'},
+ spelling.choice:,
+ spelling / new.code =
+ {%
+ \@german@oldspellingfalse
+ \german@set@babelname
+ },
+ spelling / old.code =
+ {%
+ \@german@oldspellingtrue
+ \german@set@babelname
+ },
+ spelling / 1901.code =
+ {%
+ \@german@oldspellingtrue
+ \german@set@babelname
+ },
+ spelling / 1996.code =
+ {%
+ \@german@oldspellingfalse
+ \german@set@babelname
+ },
+ spelling.default:n = new,
+ spelling/unknown.code = \xpg@warning{Unknown German spelling `#1'},
+ variant.choice:,
+ variant / german.code =
+ {%
+ \@swiss@localefalse
+ \@austrian@localefalse
+ \german@set@babelname
+ },
+ variant / austrian.code =
+ {%
+ \@austrian@localetrue
+ \@swiss@localefalse
+ \german@set@babelname
+ },
+ variant / swiss.code =
+ {%
+ \@swiss@localetrue
+ \@austrian@localefalse
+ \IfLanguageDefinedF{swissgerman}
+ {%
+ \xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
+ I will use the standard patterns for German (old spelling) instead}%
+ \adddialect\l@swissgerman\l@german\relax
+ }%
+ \german@set@babelname
+ },
+ variant.default:n = german,
+ variant/unknown.code = \xpg@warning{Unknown German variant `#1'}
+ }
+
-\setkeys{german}{spelling,script,variant}
+\SetGlossOptions{german}{spelling,script,variant}
% Register default options
-\xpg@initialize@gloss@options{german}{variant=german,spelling=new,script=latin,babelshorthands=false}
+\InitializeGlossOptions{german}{variant=german,spelling=new,script=latin,babelshorthands=false}
% Register alias options
-\xpg@set@alias@values{german}{spelling}{new}{1996}
-\xpg@set@alias@values{german}{spelling}{old}{1901}
-\xpg@set@alias@values{german}{script}{blackletter}{fraktur}
+\SetLanguageAliasValues{german}{spelling}{new,1996}
+\SetLanguageAliasValues{german}{spelling}{old,1901}
+\SetLanguageAliasValues{german}{script}{blackletter,fraktur}
\ifsystem@babelshorthands
- \setkeys{german}{babelshorthands=true}
+ \SetGlossOptions{german}{babelshorthands=true}
\else
- \setkeys{german}{babelshorthands=false}
+ \SetGlossOptions{german}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\german@shorthands{%
\xpg@activate@shorthands%
@@ -313,15 +325,15 @@
\def\german@language{%
\if@german@oldspelling
\if@swiss@locale
- \polyglossia@setup@language@patterns{swissgerman}%
+ \SetupPolyglossiaLangPatterns{swissgerman}%
\else
- \polyglossia@setup@language@patterns{german}%
+ \SetupPolyglossiaLangPatterns{german}%
\fi
\if@austrian@locale
\adddialect\l@austrian\l@german%
\fi
\else
- \polyglossia@setup@language@patterns{ngerman}%
+ \SetupPolyglossiaLangPatterns{ngerman}%
\if@austrian@locale
\adddialect\l@naustrian\l@ngerman%
\fi
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
index d5b6a8768b2..da48264a9c9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-germanb.ldf}[polyglossia: module for German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
index 11c6fdff929..c5be58f01c4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gl.ldf}[polyglossia: module for gl (Galician)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{galician}
+\InheritGlossFile{galician}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
index 82184ffaaa4..820df8e3198 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-grc.ldf}[polyglossia: module for grc (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf
index 537379cb7f4..b48684d1b58 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-greek.ldf}[polyglossia: module for Greek]
@@ -22,7 +22,7 @@
% BCP-47 compliant aliases
\setlanguagealias*[variant=ancient]{greek}{grc}
-\setlanguagealias*[varant=polytonic]{greek}{el-polyton}
+\setlanguagealias*[variant=polytonic]{greek}{el-polyton}
\setlanguagealias*[variant=monotonic]{greek}{el-monoton}
\setlanguagealias*{greek}{el}
@@ -42,44 +42,9 @@
\newif\if@greek@ancient\@greek@ancientfalse
\newif\if@greek@poly\@greek@polyfalse
-\define@choicekey*+{greek}{variant}[\xpg@val\xpg@nr]{monotonic,mono,polytonic,poly,ancient,ancientgreek}[monotonic]{%
- \xpg@ifdefined{greek}{}{%
- \xpg@nopatterns{greek}%
- \adddialect\l@greek\l@nohyphenation
- }%
- \ifcase\xpg@nr\relax
- % monotonic:
- \@greek@polyfalse
- \@greek@ancientfalse
- \or
- % mono:
- \@greek@polyfalse
- \@greek@ancientfalse
- \or
- % polytonic:
- \@greek@polytrue
- \@greek@ancientfalse
- \or
- % poly:
- \@greek@polytrue
- \@greek@ancientfalse
- \or
- % ancient:
- \@greek@polyfalse
- \@greek@ancienttrue
- \or
- % ancientgreek:
- \@greek@polyfalse
- \@greek@ancienttrue
- \fi
- \greek@set@langdata
- \xpg@info{Option: Greek, variant=\xpg@val}%
-}{\xpg@warning{Unknown Greek variant `#1'}}
-
-
\def\greek@set@langdata{%
\if@greek@ancient
- \xpg@ifdefined{ancientgreek}{}%
+ \IfLanguageDefinedF{ancientgreek}%
{\xpg@warning{No hyphenation patterns were loaded for Ancient Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@ancientgreek\l@greek\relax}%
@@ -89,7 +54,7 @@
\SetLanguageKeys{greek}{babelname=greek,bcp47=grc,bcp47-language=grc,bcp47-variant={}}%
\else
\if@greek@poly
- \xpg@ifdefined{polygreek}{}%
+ \IfLanguageDefinedF{polygreek}%
{\xpg@warning{No hyphenation patterns were loaded for Polytonic Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@polygreek\l@greek\relax}%
@@ -98,7 +63,7 @@
\def\dategreek{\datepolygreek}%
\SetLanguageKeys{greek}{babelname=polutonikogreek,bcp47=el-polyton,bcp47-language=el,bcp47-variant=polyton}%
\else% monotonic greek
- \xpg@ifdefined{monogreek}{}%
+ \IfLanguageDefinedF{monogreek}%
{\xpg@warning{No hyphenation patterns were loaded for Monotonic Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@monogreek\l@greek\relax}%
@@ -112,42 +77,85 @@
\def\greek@language{%
- \polyglossia@setup@language@patterns{\greek@variant}%
+ \SetupPolyglossiaLangPatterns{\greek@variant}%
}
\newif\if@greek@numerals
-\define@choicekey*+{greek}{numerals}[\xpg@val\xpg@nr]{greek,arabic}[greek]{%
- \ifcase\xpg@nr\relax
- % greek:
- \@greek@numeralstrue%
- \SetLanguageKeys{greek}{bcp47-extension-u=nu-grek}%
- \or
- % arabic:
- \@greek@numeralsfalse%
- \SetLanguageKeys{greek}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Greek, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Greek numerals value `#1'}}
-
-\define@boolkey{greek}[greek@]{capitaliota}[true]{%
- \ifgreek@capitaliota
- % \MakeUppercase converts the ypogegrammeni (subscript muted iota) to capital iota
- \SetLanguageKeys{greek}{bcp47-casing=el-x-iota,bcp47-extension-x=iota}
- \else
- % \MakeUppercase retains the subscript versions (default)
- \SetLanguageKeys{greek}{bcp47-casing=el,bcp47-extension-x={}}
- \fi
-}
-
-\define@boolkey{greek}{attic}[true]{\xpg@warning{Greek option `attic' is no longer required.}}
+\DeclareKeys[polyglossia/gloss/greek]
+ {
+ variant.choices:nn = { monotonic, mono,polytonic, poly,ancient, ancientgreek }
+ {%
+ \CheckHyphenationPatterns{greek}%
+ \ifcase\UseName{l_keys_choice_int}\or
+ % monotonic:
+ \@greek@polyfalse
+ \@greek@ancientfalse
+ \or
+ % mono:
+ \@greek@polyfalse
+ \@greek@ancientfalse
+ \or
+ % polytonic:
+ \@greek@polytrue
+ \@greek@ancientfalse
+ \or
+ % poly:
+ \@greek@polytrue
+ \@greek@ancientfalse
+ \or
+ % ancient:
+ \@greek@polyfalse
+ \@greek@ancienttrue
+ \or
+ % ancientgreek:
+ \@greek@polyfalse
+ \@greek@ancienttrue
+ \fi
+ \greek@set@langdata
+ },
+ variant.default:n = monotonic,
+ variant/unknown.code = \xpg@warning{Unknown Greek variant `#1'},
+ numerals.choice:,
+ numerals / greek.code =
+ {%
+ \@greek@numeralstrue
+ \SetLanguageKeys{greek}{bcp47-extension-u=nu-grek}%
+ },
+ numerals / arabic.code =
+ {%
+ \@greek@numeralsfalse
+ \SetLanguageKeys{greek}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = greek,
+ numerals/unknown.code = \xpg@warning{Unknown Greek numerals value `#1'},
+ capitaliota.choice:,
+ capitaliota / true.code =
+ {%
+ \@greek@capitaliotatrue
+ % \MakeUppercase converts the ypogegrammeni (subscript muted iota) to capital iota
+ \SetLanguageKeys{greek}{bcp47-casing=el-x-iota,bcp47-extension-x=iota}%
+ },
+ capitaliota / false.code =
+ {%
+ \@greek@capitaliotafalse
+ % \MakeUppercase retains the subscript versions (default)
+ \SetLanguageKeys{greek}{bcp47-casing=el,bcp47-extension-x={}}%
+ },
+ capitaliota.default:n = true,
+ attic.choices:nn = { true, false }
+ {%
+ \xpg@warning{Greek option `attic' is no longer required.}
+ },
+ capitaliota.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{greek}{variant=monotonic,numerals=greek}
+\InitializeGlossOptions{greek}{variant=monotonic,numerals=greek}
% Register alias options
-\xpg@set@alias@values{greek}{variant}{monotonic}{mono}
-\xpg@set@alias@values{greek}{variant}{polytonic}{poly}
+\SetLanguageAliasValues{greek}{variant}{monotonic,mono}
+\SetLanguageAliasValues{greek}{variant}{polytonic,poly}
\def\monogreekcaptions{%
\def\refname{Αναφορές}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
index 80a60baa797..05e2aa40bb5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-he.ldf}[polyglossia: module for he (Hebrew)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hebrew}
+\InheritGlossFile{hebrew}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
index 7ee62033e1d..3b3491ce9ad 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hebrew.ldf}[polyglossia: module for Hebrew]
@@ -24,41 +24,48 @@
% BCP-47 compliant aliases
\setlanguagealias*{hebrew}{he}
-% hebrewcal options
-\define@key{hebrew}{marcheshvan}[true]{\setkeys{hebrewcal}{marcheshvan=#1}}
-\define@key{hebrew}{transliteration}[alt]{\setkeys{hebrewcal}{transliteration=#1}}
-\define@key{hebrew}{fullyear}[true]{\setkeys{hebrewcal}{fullyear=#1}}
-
\newif\if@calendar@hebrew
-\define@choicekey*+{hebrew}{calendar}[\xpg@val\xpg@nr]{hebrew,gregorian}[gregorian]{%
- \ifcase\xpg@nr\relax
- % hebrew:
- \@calendar@hebrewtrue
- \or
- % gregorian:
- \@calendar@hebrewfalse
- \fi
- \xpg@info{Option: Hebrew, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Hebrew calendar `#1'}}
-
\newif\if@hebrew@numerals
-\define@choicekey*+{hebrew}{numerals}[\xpg@val\xpg@nr]{hebrew,arabic}[arabic]{%
- \ifcase\xpg@nr\relax
- % hebrew:
- \@hebrew@numeralstrue
- \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-hebr}%
- \or
- % arabic:
- \@hebrew@numeralsfalse
- \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Hebrew, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Hebrew numerals value `#1'}}
-\setkeys{hebrew}{numerals}
+\DeclareKeys[polyglossia/gloss/hebrew]
+ {
+ marcheshvan.code = \setkeys{hebrewcal}{marcheshvan=#1},
+ marcheshvan.default:n = true,
+ transliteration.code = \setkeys{hebrewcal}{transliteration=#1},
+ transliteration.default:n = alt,
+ fullyear.code = \setkeys{hebrewcal}{fullyear=#1},
+ fullyear.default:n = true,
+ calendar.choice:,
+ calendar / hebrew.code =
+ {%
+ \@calendar@hebrewtrue
+ },
+ calendar / gregorian.code =
+ {%
+ \@calendar@hebrewfalse
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Hebrew calendar `#1'},
+ numerals.choice:,
+ numerals / hebrew.code =
+ {%
+ \@hebrew@numeralstrue
+ \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-hebr}%
+ },
+ numerals / arabic.code =
+ {%
+ \@hebrew@numeralsfalse
+ \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Hebrew numerals value `#1'}
+ }
+
+
+\SetGlossOptions{hebrew}{numerals}
% Register default options
-\xpg@initialize@gloss@options{hebrew}{numerals=arabic,calendar=gregorian,marcheshvan=false,fullyear=false}
+\InitializeGlossOptions{hebrew}{numerals=arabic,calendar=gregorian,marcheshvan=false,fullyear=false}
\def\captionshebrew{%
\def\prefacename{מבוא}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
index 24ac6a0ea58..1e9f1240502 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hi.ldf}[polyglossia: module for hi (Hindi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hindi}
+\InheritGlossFile{hindi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf
index 7803b17ef44..a3a6360fe04 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% UTF-8 strings kindly provided by Zdenĕk Wagner, 10-03-2008
% with corrections and additional contributions by Anshuman Pandey
@@ -25,8 +25,7 @@
\ifx\l@hindi\@undefined%
\ifx\l@sanskrit\@undefined%
- \xpg@nopatterns{Hindi}%
- \adddialect\l@hindi\l@nohyphenation%
+ \XPGNoPatternsFallback{hindi}%
\else
\xpg@warning{No hyphenation patterns were loaded for Hindi\MessageBreak
I will use the patterns for Sanskrit instead}
@@ -35,26 +34,31 @@
\fi
\def\hindi@language{%
- \polyglossia@setup@language@patterns{hindi}%
+ \SetupPolyglossiaLangPatterns{hindi}%
}
\newif\ifhindi@devanagari@numerals
\hindi@devanagari@numeralstrue
-\define@choicekey*+{hindi}{numerals}[\xpg@val\xpg@nr]{Devanagari,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \hindi@devanagari@numeralstrue%
- \SetLanguageKeys{hindi}{bcp47-extension-u=nu-deva}%
- \or
- % Western:
- \hindi@devanagari@numeralsfalse%
- \SetLanguageKeys{hindi}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Hindi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Hindi numeral `#1'}}
+
+\DeclareKeys[polyglossia/gloss/hindi]
+ {
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \hindi@devanagari@numeralstrue
+ \SetLanguageKeys{hindi}{bcp47-extension-u=nu-deva}%
+ },
+ numerals / western.code =
+ {%
+ \hindi@devanagari@numeralsfalse
+ \SetLanguageKeys{hindi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Hindi numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{hindi}{numerals=devanagari}
+\InitializeGlossOptions{hindi}{numerals=devanagari}
\newcommand{\hindinumerals}[2]{\hindinumber{#2}}
@@ -74,6 +78,7 @@
\def\contentsname{विषय सूची}%
\def\enclname{}%
\def\figurename{चित्र}% रेखाचित्र
+ \def\glossaryname{शब्दार्थ सूची}%
\def\headpagename{पृष्ठ}%
\def\headtoname{}%
\def\indexname{सूची}%
@@ -85,6 +90,7 @@
\def\pagename{पृष्ठ}%
\def\partname{खण्ड}%
\def\prefacename{प्रस्तावना}% प्राक्कथन
+ \def\proofname{प्रमाण}%
\def\refname{हवाले}%
\def\tablename{तालिका}%
\def\seename{देखिए}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
index 9354b06cadc..1bcc48ff4c6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hr.ldf}[polyglossia: module for hr (Croatian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{croatian}
+\InheritGlossFile{croatian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
index f2c872c2c41..51d2499b0ac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hsb.ldf}[polyglossia: module for hsb (Higher Sorbian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
index 9700f33025b..8f86fc248e4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hu.ldf}[polyglossia: module for hu (Hungarian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hungarian}
+\InheritGlossFile{hungarian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf
index a846c750bb8..0ed88f1aca6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hungarian.ldf}[polyglossia: module for Hungarian]
@@ -25,53 +25,61 @@
\newif\if@hungarian@swapcaptions
\newif\if@hungarian@swapheadings
\newif\if@hungarian@swapheaders
-\define@choicekey*+{hungarian}{swapstrings}[\xpg@val\xpg@nr]{all,captions,headings,headers,hheaders,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@hungarian@swapcaptionstrue%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheaderstrue%
- \or
- % captions:
- \@hungarian@swapcaptionstrue%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheadersfalse%
- \or
- % headings:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheadersfalse%
- \or
- % headers:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheaderstrue%
- \or
- % hheaders:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheaderstrue%
- \or
- % none:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheadersfalse%
- \fi
- \xpg@info{Option: Hungarian, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Hungarian swapstrings value `#1'}}
-% Force punctuation: 1) after section type counters; 2) after @chapapp in the running head
-\define@boolkey{hungarian}[hungarian@]{forceheadingpunctuation}[true]{}
+\DeclareKeys[polyglossia/gloss/hungarian]
+ {
+ forceheadingpunctuation.if = hungarian@forceheadingpunctuation,
+ forceheadingpunctuation.default:n = true,
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@hungarian@swapcaptionstrue
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / captions.code =
+ {%
+ \@hungarian@swapcaptionstrue
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings / headings.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / hheaders.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Hungarian swapstrings value `#1'}
+ }
% Register default options
% forceheadinpunctuatin is recommended, but the default value is false for compatibility reasons
-\xpg@initialize@gloss@options{hungarian}{swapstrings=all,
+\InitializeGlossOptions{hungarian}{swapstrings=all,
forceheadingpunctuation=false}
\def\hungarian@language{%
- \polyglossia@setup@language@patterns{hungarian}%
- \xpg@ifdefined{hungarian}{\adddialect\l@magyar\l@hungarian}{}%
+ \SetupPolyglossiaLangPatterns{hungarian}%
+ \IfLanguageDefinedT{hungarian}{\adddialect\l@magyar\l@hungarian}%
}%
\def\captionshungarian{%
@@ -143,120 +151,104 @@
% change chapter and part headings
\if@hungarian@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
- {\thechapter.\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
+ \@ifundefined{titleformat}{%
% With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\thepart.~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat%
- \renewcommand{\chapterformat}{\mbox{\thechapter\autodot%
- \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead%
- \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
- {\printchapternum.\chapternamenum\printchaptername}%
- {}%
- {\xpg@warning{Failed to patch chapter for Hungarian}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
- {\printpartnum.\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
- {\printpartnum.\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{sectionformat}{%
+ % Memoir?
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{@makechapterhead}{%
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead%
\patchcmd{\@makechapterhead}%
{\@chapapp\space \thechapter}%
{\thechapter.\space \@chapapp}%
{}%
{\xpg@warning{Failed to patch chapter for Hungarian}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Hungarian}}}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part%
\patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\thepart.\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Hungarian}}{}}%
- }{}% (end \ifdefined\@part)
}% (end not hyperref)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }{% with memoir (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead%
+ \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
+ {\printchapternum.\chapternamenum\printchaptername}%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Hungarian}}%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
+ {\printpartnum.\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
+ {\printpartnum.\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\thepart.~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat%
+ \renewcommand{\chapterformat}{\mbox{\thechapter\autodot%
+ \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+ {\thechapter.\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+ }%
}% (end \ifdefined\titleformat)
\fi% (end \if@hungarian@swapheadings)
%
% Change running headers
\if@hungarian@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat%
- \renewcommand*\chaptermarkformat{%
- \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\@hungarian@forced@dot\enskip}{}}
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark%
- \renewcommand*\chaptermark[1]{%
- \markboth{\memUChead{%
- \ifnum \c@secnumdepth >\m@ne
- \ifbool{@mainmatter}{%
- \thechapter.\ \@chapapp\@hungarian@forced@dot\ %
- }{}%
- \fi
- ##1}}{}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter.}%
{\let\xpg@save@chaptermark@format\chaptermark%
@@ -266,8 +258,24 @@
{}%
{\xpg@warning{Failed to patch chaptermark for Hungarian}}}%
{}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark%
+ \renewcommand*\chaptermark[1]{%
+ \markboth{\memUChead{%
+ \ifnum \c@secnumdepth >\m@ne
+ \ifbool{@mainmatter}{%
+ \thechapter.\ \@chapapp\@hungarian@forced@dot\ %
+ }{}%
+ \fi
+ ##1}}{}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat%
+ \renewcommand*\chaptermarkformat{%
+ \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\@hungarian@forced@dot\enskip}{}}
}% (end \ifdefined\chapterformat)
\fi% (end \if@hungarian@swapheaders)
}
@@ -279,58 +287,58 @@
\let\fnum@figure\xpg@save@fnum@figure%
%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format%
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format%
- }{}%
- }{}% (end \ifdefined\chaptermark)
- }% (end \ifdefined\chapterformat)
+ }%
+ }% (end \ifdefined\chaptermark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format%
+ }%
+ }% (end \ifdefined\chaptermarkformat)
}
% Hungarian needs 1) trailing dots in chapter headings; 2) trailing dot in section, subsection, etc, counters
\def\@hungarian@forced@dot{}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
index ee335e8b4dd..16b61a8776b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hy.ldf}[polyglossia: module for hy (Armenian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{armenian}
+\InheritGlossFile{armenian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
index 1652403941d..1e843ef5df8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ia.ldf}[polyglossia: module for ia (Interlingua)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{interlingua}
+\InheritGlossFile{interlingua}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf
index 4415bbab088..43a9efe3f8a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-icelandic.ldf}[polyglossia: module for Icelandic]
\PolyglossiaSetup{icelandic}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
index e72a43d5f51..adf9c602827 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-id.ldf}[polyglossia: module for id (Malay)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf
index d105dae74c7..ec3b1844e9a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-interlingua.ldf}[polyglossia: module for Interlingua]
\PolyglossiaSetup{interlingua}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
index ed1fc5af650..0e5b9c888b3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-irish.ldf}[polyglossia: module for Irish]
% We only provide this gloss for babel compatibility. Since irish is
% a gaelic variety, we use 'gaelic' with variant 'irish' now.
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
index aed4195b8d1..6724333f2bc 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-is.ldf}[polyglossia: module for is (Icelandic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{icelandic}
+\InheritGlossFile{icelandic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
index e3bf7d00df8..42ae275e327 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-it.ldf}[polyglossia: module for it (Italian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{italian}
+\InheritGlossFile{italian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf
index edf9d4f79e9..da005e54c76 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf
@@ -1,5 +1,5 @@
% !TEX encoding = UTF-8 Unicode
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-italian.ldf}[polyglossia: module for Italian]
\PolyglossiaSetup{italian}{
@@ -18,24 +18,22 @@
% BCP-47 compliant aliases
\setlanguagealias*{italian}{it}
-
-%%% CHANGES START %%% by Enrico Gregorio
-\define@boolkey{italian}[italian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/italian]
+ {
+ babelshorthands.if = italian@babelshorthands,
+ babelshorthands.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{italian}{babelshorthands=false}
+\InitializeGlossOptions{italian}{babelshorthands=false}
\ifsystem@babelshorthands
- \setkeys{italian}{babelshorthands=true}
+ \SetGlossOptions{italian}{babelshorthands=true}
\else
- \setkeys{italian}{babelshorthands=false}
+ \SetGlossOptions{italian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\italian@shorthands{%
\xpg@activate@shorthands%
@@ -115,7 +113,7 @@
%%% CHANGES START %%% by Enrico Gregorio
\let\xpgit@savedvalues\empty
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgit@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
index 7329e61bdc9..6abed7ecc51 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ja.ldf}[polyglossia: module for ja (Japanese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{japanese}
+\InheritGlossFile{japanese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf
index 5d90a303747..43015d36cec 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-japanese.ldf}[polyglossia: module for Japanese]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
index dc0fb85531e..c48b7287989 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ka.ldf}[polyglossia: module for ka (Georgian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{georgian}
+\InheritGlossFile{georgian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf
index 1ea7dfce332..97941ff1902 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf
@@ -1,5 +1,5 @@
%% gloss-kannada.ldf
-%% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+%% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%%
%% Copyright 2011 Aravinda VK <hallimanearavind AT gmail.com>,
%% Shankar Prasad <prasad.mvs AT gmail.com>,
@@ -53,12 +53,20 @@
\def\tmp@western{Western}
\newif\ifkannada@numerals
\kannada@numeralstrue
-
-\define@key{kannada}{numerals}[Kannada]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@western
- \kannada@numeralsfalse
- \fi}
+
+\DeclareKeys[polyglossia/gloss/kannada]
+ {
+ numerals.choice:,
+ numerals / kannada.code =
+ {%
+ \kannada@numeralstrue
+ },
+ numerals / western.code =
+ {%
+ \kannada@numeralsfalse
+ },
+ numerals.default:n = kannada
+ }
\def\captionskannada{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf
index 9c9ec53f328..0a8656b4c50 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-khmer.ldf}[polyglossia: module for Khmer]
\PolyglossiaSetup{khmer}{
@@ -19,18 +19,24 @@
\newif\if@khmer@numerals
\def\tmp@khmer{khmer}
-\define@key{khmer}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@khmer%
- \@khmer@numeralstrue%
- \SetLanguageKeys{khmer}{bcp47-extension-u=nu-khmr}%
- \else%
- \@khmer@numeralsfalse%
- \SetLanguageKeys{khmer}{bcp47-extension-u=nu-latn}%
- \fi%
-}
-\setkeys{khmer}{numerals}
+\DeclareKeys[polyglossia/gloss/khmer]
+ {
+ numerals.choice:,
+ numerals / khmer.code =
+ {%
+ \@khmer@numeralstrue
+ \SetLanguageKeys{khmer}{bcp47-extension-u=nu-khmr}%
+ },
+ numerals / arabic.code =
+ {%
+ \@khmer@numeralsfalse
+ \SetLanguageKeys{khmer}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = arabic
+ }
+
+\SetGlossOptions{khmer}{numerals}
\def\captionskhmer{%
\def\prefacename{អារម្ភកថា}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
index b37d1706ab6..f2af014aef5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-km.ldf}[polyglossia: module for km (Khmer)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{khmer}
+\InheritGlossFile{khmer}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
index 523a68916e4..63807f6320b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr-Arab.ldf}[polyglossia: module for kmr-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
index dfc34ce7ee9..64bb99df246 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr-Latn.ldf}[polyglossia: module for kmr-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
index a908ee2d815..254d0d846ca 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr.ldf}[polyglossia: module for kmr (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
index 66c45035a90..3c311112a86 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kn.ldf}[polyglossia: module for kn (Kannada)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kannada}
+\InheritGlossFile{kannada}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
index bf767b7cda9..c4b68924c06 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ko.ldf}[polyglossia: module for ko (Korean)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{korean}
+\InheritGlossFile{korean}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
index 48464c50d25..fd464294356 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-korean.ldf}[polyglossia: module for Korean]
@@ -18,40 +18,48 @@
% BCP-47 compliant aliases
\setlanguagealias*{korean}{ko}
-% variant : plain (0), classic (1), or modern (2)
-\define@choicekey{korean}{variant}[\xpg@val\xpg@nr]{plain,classic,modern}[plain]{%
- \let\xpg@korean@variant\xpg@nr
-}
-% captions : hangul (0) or hanja (1)
-\define@choicekey{korean}{captions}[\xpg@val\xpg@nr]{hangul,hanja}[hangul]{%
- \let\xpg@korean@captions\xpg@nr
-}
-% swapstrings: all (0), headings (1), headers (2), or none (3)
\newif\if@korean@swapheadings
\newif\if@korean@swapheaders
-\define@choicekey*+{korean}{swapstrings}[\xpg@val\xpg@nr]{all,headings,headers,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@korean@swapheadingstrue%
- \@korean@swapheaderstrue%
- \or
- % headings:
- \@korean@swapheadingstrue%
- \@korean@swapheadersfalse%
- \or
- % headers:
- \@korean@swapheadingsfalse%
- \@korean@swapheaderstrue%
- \or
- % none:
- \@korean@swapheadingsfalse%
- \@korean@swapheadersfalse%
- \fi
- \xpg@info{Option: Korean, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Korean swapstrings value `#1'}}
+
+\DeclareKeys[polyglossia/gloss/korean]
+ {
+ variant.choices:nn = { plain, classic, modern }
+ {%
+ \edef\xpg@korean@variant{\the\numexpr\UseName{l_keys_choice_int}-1\relax}
+ },
+ variant.default:n = plain,
+ captions.choices:nn = { hangul, hanja }
+ {%
+ \edef\xpg@korean@captions{\the\numexpr\UseName{l_keys_choice_int}-1\relax}
+ },
+ captions.default:n = hangul,
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@korean@swapheadingstrue
+ \@korean@swapheaderstrue
+ },
+ swapstrings / headings.code =
+ {%
+ \@korean@swapheadingstrue
+ \@korean@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@korean@swapheadingsfalse
+ \@korean@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@korean@swapheadingsfalse
+ \@korean@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Korean swapstrings value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{korean}{variant=plain,swapstrings=all,captions=hangul}
+\InitializeGlossOptions{korean}{variant=plain,swapstrings=all,captions=hangul}
\def\captionskorean{%
\ifcase\xpg@korean@captions\relax
@@ -113,60 +121,48 @@
% change chapter and part headings
\if@korean@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
- {}%
- {\xpg@warning{Failed to patch part for Korean}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part
- \patchcmd{\@part}%
+ \@ifundefined{titleformat}{%
+ % With KOMA
+ \@ifundefined{sectionformat}{%
+ % With memoir
+ \@ifundefined{@memptsize}{%
+ % With standard classes
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead
+ \patchcmd{\@makechapterhead}%
+ {\@chapapp\space \thechapter}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\space \thechapter
+ \else
+ \koreanTHEname\space \thechapter\space \@chapapp
+ \fi
+ }%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Korean}}%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \ifpatchable{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\let\xpg@save@part@format\@part
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Korean}}}}%
+ {}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
{}%
{\xpg@warning{Failed to patch part for Korean}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\space \thechapter
- \else
- \koreanTHEname\space \thechapter\space \@chapapp
- \fi
- }{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
- }{}%
- }{% (not \ifdefined\titleformat)
- % With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat
- \renewcommand*{\partformat}{\koreanTHEname~\thepart~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat
- \renewcommand*{\chapterformat}{\mbox{%
- \IfChapterUsesPrefixLine
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \chapapp\nobreakspace \thechapter\autodot
- \else
- \koreanTHEname\nobreakspace \thechapter\nobreakspace \chapapp\autodot
- \fi
- }%
- {\thechapter\autodot\enskip}%
- }}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
+ }% (end not hyperref)
+ }{% (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead
\patchcmd{\@makechapterhead}%
{\printchaptername \chapternamenum \printchapternum}%
@@ -184,19 +180,9 @@
\ifpatchable\printchaptername\@chapapp
{\chapnamefont\koreanTHEname\chapternamenum}{}}%
\fi
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part
- \patchcmd{\NR@part}%
- {\printpartname \partnamenum \printpartnum}%
- {\printkoreanpartthe \printpartnum\partnamenum \printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Korean}}%
- \ifdefined\printkoreanpartthe\else
- \def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
- \fi
- }{% not hyperref
- \ifcsdef{@part}{%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
\let\xpg@save@part@format\@part
\patchcmd{\@part}%
{\printpartname \partnamenum \printpartnum}%
@@ -206,84 +192,77 @@
\ifdefined\printkoreanpartthe\else
\def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
\fi
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
- % With standard classes
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead
- \patchcmd{\@makechapterhead}%
- {\@chapapp\space \thechapter}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\space \thechapter
- \else
- \koreanTHEname\space \thechapter\space \@chapapp
- \fi
- }%
- {}%
- {\xpg@warning{Failed to patch chapter for Korean}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
+ }%
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part
\patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {\printpartname \partnamenum \printpartnum}%
+ {\printkoreanpartthe \printpartnum\partnamenum \printpartname}%
{}%
{\xpg@warning{Failed to patch part for Korean}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \ifpatchable{\@part}%
- {\partname\nobreakspace\thepart}%
- {\let\xpg@save@part@format\@part
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Korean}}{}}}%
- {}%
- }{}% (end \ifdefined\@part)
- }% (end not hyperref)
+ \ifdefined\printkoreanpartthe\else
+ \def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
+ \fi
+ }%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat
+ \renewcommand*{\partformat}{\koreanTHEname~\thepart~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat
+ \renewcommand*{\chapterformat}{\mbox{%
+ \IfChapterUsesPrefixLine
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \chapapp\nobreakspace \thechapter\autodot
+ \else
+ \koreanTHEname\nobreakspace \thechapter\nobreakspace \chapapp\autodot
+ \fi
+ }%
+ {\thechapter\autodot\enskip}%
+ }}%
+ }%
}% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Korean}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Korean}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\space \thechapter
+ \else
+ \koreanTHEname\space \thechapter\space \@chapapp
+ \fi
+ }{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
+ }%
}% (end \ifdefined\titleformat)
\fi % (end \if@korean@swapheadings)
%
% Change running headers
\if@korean@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat
- \renewcommand*\chaptermarkformat{%
- \IfChapterUsesPrefixLine
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \chapapp\ \thechapter\autodot
- \else
- \koreanTHEname\ \thechapter\ \chapapp\autodot
- \fi
- }%
- {\thechapter\autodot}%
- \enskip
- }%
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark
- \patchcmd{\chaptermark}%
- {\@chapapp\ \@nameuse{thechapter}}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\ \@nameuse{thechapter}%
- \else
- \koreanTHEname\ \@nameuse{thechapter}\ \@chapapp
- \fi
- }%
- {}%
- {\xpg@warning{Failed to patch chaptermark for Korean}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter}%
{\let\xpg@save@chaptermark@format\chaptermark
@@ -299,65 +278,94 @@
{}%
{\xpg@warning{Failed to patch chaptermark for Korean}}}%
{}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark
+ \patchcmd{\chaptermark}%
+ {\@chapapp\ \@nameuse{thechapter}}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\ \@nameuse{thechapter}%
+ \else
+ \koreanTHEname\ \@nameuse{thechapter}\ \@chapapp
+ \fi
+ }%
+ {}%
+ {\xpg@warning{Failed to patch chaptermark for Korean}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat
+ \renewcommand*\chaptermarkformat{%
+ \IfChapterUsesPrefixLine
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \chapapp\ \thechapter\autodot
+ \else
+ \koreanTHEname\ \thechapter\ \chapapp\autodot
+ \fi
+ }%
+ {\thechapter\autodot}%
+ \enskip
+ }%
}% (end \ifdefined\chapterformat)
\fi % (end \if@korean@swapheaders)
}
\def\nokorean@headingsformat{%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format
+ }{%
+ \let\NR@part\xpg@save@part@format
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format
+ }{%
+ \let\NR@part\xpg@save@part@format
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format
- }{%
- \let\@part\xpg@save@part@format
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format
- }{}%
- }{}% (end \ifdefined\chaptermark)
+ }%
+ }% (end \ifdefined\chaptermark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format
+ }%
}% (end \ifdefined\chapterformat)
}
@@ -421,13 +429,13 @@
\XeTeXinterchartokenstate\z@
\XeTeXlinebreakpenalty\z@
\XeTeXlinebreakskip\z@skip
- \XeTeXlinebreaklocale "en"
+ \XeTeXlinebreaklocale ""
\noextras@korean@common
}
\else % luatex
- \def\inlineextras@korean{\xpg@attr@korean\xpg@korean@variant\relax}
+ \def\inlineextras@korean{\xpg@attr@cjkspacing\xpg@korean@variant\relax}
\def\noextras@korean{%
- \unsetattribute\xpg@attr@korean
+ \unsetattribute\xpg@attr@cjkspacing
\noextras@korean@common
}
\fi
@@ -447,7 +455,7 @@
\let\newattribute\newluatexattribute
\let\unsetattribute\unsetluatexattribute
\fi
-\newattribute\xpg@attr@korean
+\newattribute\xpg@attr@cjkspacing
\newattribute\xpg@attr@autojosa
% user commands for Josa
% Josa : particles in Korean grammar that immediately follow a noun or pronoun.
@@ -468,7 +476,7 @@
\protected\def\로{\으 로}
\def\xpg@reset@josa {\global\let\xpg@josa@zwang\z@}\xpg@reset@josa
% load lua file for korean
-\directlua{ require "polyglossia-korean" }
+\directlua{ require "polyglossia-cjk-spacing" }
\endinput\fi
% XeTeX
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
index 339368062c8..f25b8d53397 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku-Arab.ldf}[polyglossia: module for ku-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
index 31f0b817406..ba7b6a32954 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku-Latn.ldf}[polyglossia: module for ku-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
index 59805fb6261..b261cbc0df6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku.ldf}[polyglossia: module for ku (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf
index e114fd118aa..3b69d39e010 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Created on September 1, 2019
% Last updated on May 17, 2020
@@ -41,36 +41,9 @@
\newif\if@kurdish@kurmanji
\def\kurdish@variant{sorani}
-\define@choicekey*+{kurdish}{variant}[\xpg@val\xpg@nr]{sorani,kurmanji}[sorani]{%
- \ifcase\xpg@nr\relax
- % sorani:
- \def\kurdish@variant{sorani}%
- \@kurdish@kurmanjifalse%
- \or
- % kurmanji:
- \def\kurdish@variant{kurmanji}%
- \@kurdish@kurmanjitrue%
- \fi
- \kurdish@set@variety%
- \xpg@info{Option: kurdish, variant=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish variant `#1'}}
\newif\if@kurdish@latin
\newif\if@kurdish@arabic
-\define@choicekey*+{kurdish}{script}[\xpg@val\xpg@nr]{arabic,latin}{%
- \ifcase\xpg@nr\relax
- % arabic:
- \@kurdish@latinfalse%
- \@kurdish@arabictrue%
- \or
- % latin:
- \@kurdish@latintrue%
- \@kurdish@arabicfalse%
- \fi
- \kurdish@set@variety%
- \xpg@info{Option: kurdish, script=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish script `#1'}}
-
\newif\if@western@numerals
\newif\if@force@western@numerals
@@ -87,7 +60,7 @@
\SetLanguageKeys{kurdish}{script=Latin,direction=LR,scripttag=latn,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
\fi
\def\kurdish@script{latin}
- \xpg@fontsetup@latin{kurdish}%
+ \SetupLatinPolyglossiaFont{kurdish}%
\else
\if@kurdish@arabic% arabic explicitly set
\if@kurdish@kurmanji
@@ -97,61 +70,84 @@
\else
\SetLanguageKeys{kurdish}{script=Arabic,direction=RL,scripttag=arab,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
\fi
- \xpg@fontsetup@nonlatin{kurdish}%
+ \SetupNonLatinPolyglossiaFont{kurdish}%
\else% sorani=arabic, kurmanji=latin
\if@kurdish@kurmanji
\@western@numeralstrue%
\SetLanguageKeys{kurdish}{script=Latin,direction=LR,scripttag=latn,babelname=kurmanji,bcp47=kmr-Latn,bcp47-language=kmr,bcp47-script=Latn,bcp47-casing=kmr-Latn}%
- \xpg@fontsetup@latin{kurdish}%
+ \SetupLatinPolyglossiaFont{kurdish}%
\def\kurdish@script{latin}
\else
\SetLanguageKeys{kurdish}{script=Arabic,direction=RL,scripttag=arab,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
- \xpg@fontsetup@nonlatin{kurdish}%
+ \SetupNonLatinPolyglossiaFont{kurdish}%
\fi
\fi
\fi
}
\newif\if@western@numerals
-\define@choicekey*+{kurdish}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \or
- % western:
- \@western@numeralstrue%
- \@force@western@numeralstrue%
- \fi
- \xpg@info{Option: Kurdish, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish numerals option `#1'}}
\newif\ifkurdish@customsep\kurdish@customsepfalse
\def\xpg@sepmark{}
-\define@key{kurdish}{sectionsep}[.]{%
- \kurdish@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{kurdish}[kurdish@]{abjadjimnotail}[true]{%
- \ifkurdish@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi%
-}
-
-% NOT YET USED
-\define@key{kurdish}{locale}[default]{%
- \def\@kurdish@locale{#1}}
%TODO add option for CALENDAR
+\DeclareKeys[polyglossia/gloss/kurdish]
+ {
+ variant.choice:,
+ variant / sorani.code =
+ {%
+ \def\kurdish@variant{sorani}%
+ \@kurdish@kurmanjifalse
+ \kurdish@set@variety
+ },
+ variant / kurmanji.code =
+ {%
+ \def\kurdish@variant{kurmanji}%
+ \@kurdish@kurmanjitrue
+ \kurdish@set@variety
+ },
+ variant.default:n = sorani,
+ variant/unknown.code = \xpg@warning{Unknown Kurdish variant `#1'},
+ script.choice:,
+ script / arabic.code =
+ {%
+ \@kurdish@latinfalse
+ \@kurdish@arabictrue
+ \kurdish@set@variety
+ },
+ script / latin.code =
+ {%
+ \@kurdish@latintrue
+ \@kurdish@arabicfalse
+ \kurdish@set@variety
+ },
+ script.default:n = sorani,
+ script/unknown.code = \xpg@warning{Unknown Kurdish script `#1'},
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \@force@western@numeralstrue
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Kurdish numerals value `#1'},
+ sectionsep.code = \gdef\xpg@sepmark{#1}\kurdish@customseptrue,
+ sectionsep.default:n = .,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ locale.store = \@kurdish@locale
+ }
+
% Register default options
-\xpg@initialize@gloss@options{kurdish}{variant=sorani,locale=default,script=arabic,abjadjimnotail=false,numerals=eastern}
+\InitializeGlossOptions{kurdish}{variant=sorani,locale=default,script=arabic,abjadjimnotail=false,numerals=eastern}
\def\kurdish@language{%
- \polyglossia@setup@language@patterns{\kurdish@pattern}%
+ \SetupPolyglossiaLangPatterns{\kurdish@pattern}%
}%
\def\kurdishNativemonth#1{\ifcase#1%
@@ -404,16 +400,16 @@
}
\def\nokurdish@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\kurdish@luatex@capsformat{%
%
% change chapter and part headings
\ifkurdish@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -425,7 +421,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -440,30 +436,30 @@
}
\def\nokurdish@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@kurdish{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
index db4eabba41d..79deb39afc7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kurmanji.ldf}[polyglossia: module for Kurmanji Kurdish]
% We provide this gloss for babel compatibility.
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf
index abb9bc4bf2f..b4091d70014 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xclassic.ldf}[polyglossia: module for la-xclassic (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf
index b00755c8ace..8eec40dbd49 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xecclesiastic.ldf}[polyglossia: module for la-xecclesiastic (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf
index 0d75aaf005a..029ad4a9168 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xmedieval.ldf}[polyglossia: module for la-xmedieval (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
index c1e3e26ece0..99e36c42bf0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la.ldf}[polyglossia: module for la (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf
index 4d979bb93c1..41a6817e115 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lao.ldf}[polyglossia: module for Lao]
@@ -22,14 +22,23 @@
\newif\if@lao@numerals
\def\tmp@lao{lao}
-\define@key{lao}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@lao\@lao@numeralstrue\else
- \@lao@numeralsfalse\fi
-}
+
+\DeclareKeys[polyglossia/gloss/lao]
+ {
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \@lao@numeralsfalse
+ },
+ numerals / lao.code =
+ {%
+ \@lao@numeralstrue
+ },
+ numerals.default:n = arabic
+ }
% Register default options
-\xpg@initialize@gloss@options{lao}{numerals=arabic}
+\InitializeGlossOptions{lao}{numerals=arabic}
% Translations provided by Brian Wilson <bountonw at gmail.com>
\def\captionslao{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf
index 18d83e92114..8479fbaa42a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latex.ldf}[polyglossia: module for default language]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
index 2fc092c0638..d1211a83cb2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latin.ldf}[polyglossia: module for Latin]
@@ -33,6 +33,9 @@
\bool_new:N \l_polyglossia_latin_use_v_bool
\bool_new:N \l_polyglossia_latin_use_ligatures_bool
\bool_new:N \l_polyglossia_latin_capitalize_month_bool
+\bool_new:N \l_polyglossia_latin_babelshorthands_bool
+\bool_new:N \l_polyglossia_latin_prosodic_shorthands_bool
+\bool_new:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
\cs_new:Npn \polyglossia_latin_classical_character_codes:
{
@@ -68,11 +71,11 @@
\cs_new:Npn \polyglossia_latin_use_modern_patterns:
{
- \xpg@ifdefined {latin}
+ \IfLanguageDefinedTF {latin}
{
\def \latin@language
{
- \polyglossia@setup@language@patterns {latin}
+ \SetupPolyglossiaLangPatterns {latin}
\str_case:Vn \l_polyglossia_latin_variant_str
{
{classic} { \adddialect \l@classiclatin \l@latin }
@@ -96,11 +99,11 @@
\cs_new:Npn \polyglossia_latin_set_patterns:n #1
% #1 may be "classiclatin" or "liturgicallatin"
{
- \xpg@ifdefined {#1}
+ \IfLanguageDefinedTF {#1}
{
\def \latin@language
{
- \polyglossia@setup@language@patterns {#1}
+ \SetupPolyglossiaLangPatterns {#1}
\str_case:Vn \l_polyglossia_latin_variant_str
{
{classic} {
@@ -316,7 +319,8 @@
% Save original footnote definition
% Do this at the end of the preamble to catch other
% packages' footnote changes (#391)
-\AtEndPreamble{%
+\hook_gput_code:nnn { begindocument / before } {.}
+{
\cs_if_exist:NT \@makefntext
{
\cs_set_eq:NN \polyglossia_latin_original_footnote:n \@makefntext
@@ -340,40 +344,27 @@
\cs_new:Npn \polyglossia_latin_apply_footnote_option:
{
- \str_if_eq:VnTF \xpg@main@language {latin}
+ \IfMainLanguageTF {latin}
{
\cs_if_exist:NT \@makefntext
{
- \iflatin@ecclesiasticfootnotes
+ \bool_if:NTF \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ {
\let \@makefntext \polyglossia_latin_variant_footnote:n
- \else
+ }
+ {
\let \@makefntext \polyglossia_latin_original_footnote:n
- \fi
+ }
}
}
{
- \iflatin@ecclesiasticfootnotes
- \msg_warning:nn {polyglossia} {latin / ineffective footnote option}
- \fi
- }
- }
-
-\define@boolkey {latin} [latin@] {ecclesiasticfootnotes} [true]
- {
- \token_if_eq_meaning:NNTF \@onlypreamble \@notprerr
- {
- % within the document
- \polyglossia_latin_apply_footnote_option:
- }
- {
- % within the preamble
- % The application of the option has to be postponed as the main
- % language may be undefined when the option is called.
- \AtBeginDocument { \polyglossia_latin_apply_footnote_option: }
+ \bool_if:NT \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ {
+ \msg_warning:nn {polyglossia} {latin / ineffective footnote option}
+ }
}
}
-
%%%%% Language variants: classic, medieval, modern, and ecclesiastic
\str_new:N \l_polyglossia_latin_variant_str
@@ -436,58 +427,6 @@
\polyglossia_latin_use_modern_patterns:
}
-\define@key{latin}{variant}
- {
- \str_case:nnF {#1}
- {
- {classic}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {classic}
- \polyglossia_latin_classic_settings:
- }
- {medieval}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {medieval}
- \polyglossia_latin_medieval_settings:
- }
- {modern}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {modern}
- \polyglossia_latin_modern_settings:
- }
- {ecclesiastic}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {ecclesiastic}
- \polyglossia_latin_ecclesiastic_settings:
- }
- }
- {
- \msg_warning:nnn {polyglossia} {latin / illegal language variant} {#1}
- }
- }
-
-
-%%%%% Boolean options concerning spelling
-
-\define@boolkey{latin}[latin@]{usej}[true]
- {
- \iflatin@usej
- \bool_set_true:N \l_polyglossia_latin_use_j_bool
- \else
- \bool_set_false:N \l_polyglossia_latin_use_j_bool
- \fi
- }
-
-\define@boolkey{latin}[latin@]{capitalizemonth}[true]
- {
- \iflatin@capitalizemonth
- \bool_set_true:N \l_polyglossia_latin_capitalize_month_bool
- \else
- \bool_set_false:N \l_polyglossia_latin_capitalize_month_bool
- \fi
- }
-
-
%%%%% Hyphenation variants: classic, liturgical, and modern
\msg_new:nnn {polyglossia} {latin / hyphenation variant}
@@ -500,23 +439,6 @@
The~Latin~hyphenation~variant~"#1"~is~undefined~\msg_line_context:.
}
-\define@key {latin} {hyphenation}
- {
- \str_case:nnTF {#1}
- {
- {classic} { \polyglossia_latin_set_patterns:n {classiclatin} }
- {liturgical} { \polyglossia_latin_set_patterns:n {liturgicallatin} }
- {modern} { \polyglossia_latin_use_modern_patterns: }
- }
- {
- \msg_info:nnn {polyglossia} {latin / hyphenation variant} {#1}
- }
- {
- \msg_warning:nnn {polyglossia} {latin / illegal hyphenation variant} {#1}
- }
- }
-
-
%%%%% Latin captions and date
\def \captionslatin
@@ -588,30 +510,89 @@
}
}
-
-%%%%% Latin shorthands
-
-\define@boolkey{latin}[latin@]{babelshorthands}[true]
- {
- }
-
-\define@boolkey{latin}[latin@]{prosodicshorthands}[true]
+\DeclareKeys[polyglossia/gloss/latin]
{
+ babelshorthands.bool_set:N = \l_polyglossia_latin_babelshorthands_bool,
+ babelshorthands.default:n = true,
+ prosodicshorthands.bool_set:N = \l_polyglossia_latin_prosodic_shorthands_bool,
+ prosodicshorthands.default:n = true,
+ usej.bool_set:N = \l_polyglossia_latin_use_j_bool,
+ capitalizemonth.bool_set:N = \l_polyglossia_latin_capitalize_month_bool,
+ hyphenation.code =
+ \str_case:nnTF {#1}
+ {
+ {classic} { \polyglossia_latin_set_patterns:n {classiclatin} }
+ {liturgical} { \polyglossia_latin_set_patterns:n {liturgicallatin} }
+ {modern} { \polyglossia_latin_use_modern_patterns: }
+ }
+ {
+ \msg_info:nnn {polyglossia} {latin / hyphenation variant} {#1}
+ }
+ {
+ \msg_warning:nnn {polyglossia} {latin / illegal hyphenation variant} {#1}
+ },
+ variant.code =
+ \str_case:nnF {#1}
+ {
+ {classic}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {classic}
+ \polyglossia_latin_classic_settings:
+ }
+ {medieval}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {medieval}
+ \polyglossia_latin_medieval_settings:
+ }
+ {modern}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {modern}
+ \polyglossia_latin_modern_settings:
+ }
+ {ecclesiastic}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {ecclesiastic}
+ \polyglossia_latin_ecclesiastic_settings:
+ }
+ }
+ {
+ \msg_warning:nnn {polyglossia} {latin / illegal language variant} {#1}
+ },
+ ecclesiasticfootnotes.choices:nn = { true, false }
+ {
+ \ifcase\UseName{l_keys_choice_int}\or
+ \bool_set_true:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ \else
+ \bool_set_false:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ \fi
+ \xpg_if_in_preamble:TF
+ {
+ % within the preamble
+ % The application of the option has to be postponed as the main
+ % language may be undefined when the option is called.
+ \AtBeginDocument { \polyglossia_latin_apply_footnote_option: }
+ }
+ {
+ % within the document
+ \polyglossia_latin_apply_footnote_option:
+ }
+ },
+ ecclesiasticfootnotes.default:n = true
}
% Register default options
-\xpg@initialize@gloss@options{latin}{variant=modern,hyphenation=modern,babelshorthands=false,
+\InitializeGlossOptions{latin}{variant=modern,hyphenation=modern,babelshorthands=false,
prosodicshorthands=false,ecclesiasticfootnotes=false,
usej=false,capitalizemonth=true}
\ifsystem@babelshorthands
- \setkeys{latin}{babelshorthands=true}
+ \SetGlossOptions{latin}{babelshorthands=true}
\else
- \setkeys{latin}{babelshorthands=false}
+ \SetGlossOptions{latin}{babelshorthands=false}
\fi
\ExplSyntaxOff % babelsh.def does not support expl3 syntax
-\ifcsundef{initiate@active@char}{\input{babelsh.def}}{}
+\@ifundefined{initiate@active@char}{\input{babelsh.def}}{}
\ExplSyntaxOn
\initiate@active@char {"}
@@ -643,13 +624,13 @@
\AtBeginDocument
{
- \str_if_eq:VnTF \xpg@main@language {latin}
+ \IfMainLanguageTF {latin}
{
- \iflatin@prosodicshorthands
- \else
+ \bool_if:NF \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\shorthandoff {=}
\shorthandoff* {^}
- \fi
+ }
}
{
% The following command should not be called if the main language
@@ -1011,7 +992,7 @@
\let \xpgla@savedvalues \empty
-\AtEndPreamble
+\hook_gput_code:nnn { begindocument / before } {.}
{
\edef \xpgla@savedvalues
{
@@ -1024,12 +1005,14 @@
\def \noextras@latin
{
- \iflatin@babelshorthands
+ \bool_if:NT \l_polyglossia_latin_babelshorthands_bool
+ {
\polyglossia_latin_no_shorthands:
- \fi
- \iflatin@prosodicshorthands
+ }
+ \bool_if:NT \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\polyglossia_latin_no_prosodic_shorthands:
- \fi
+ }
\xpgla@savedvalues
\polyglossia_latin_no_punctuation_spacing:
\polyglossia_latin_modern_character_codes:
@@ -1045,16 +1028,20 @@
{
\polyglossia_latin_punctuation_spacing:
}
- \iflatin@babelshorthands
+ \bool_if:NTF \l_polyglossia_latin_babelshorthands_bool
+ {
\polyglossia_latin_shorthands:
- \else
+ }
+ {
\polyglossia_latin_no_shorthands:
- \fi
- \iflatin@prosodicshorthands
+ }
+ \bool_if:NTF \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\polyglossia_latin_prosodic_shorthands:
- \else
+ }
+ {
\polyglossia_latin_no_prosodic_shorthands:
- \fi
+ }
}
\def \blockextras@latin
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf
deleted file mode 100644
index 496d8356dde..00000000000
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinclassic.ldf}[polyglossia: module for classic Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf
deleted file mode 100644
index aab9c456d44..00000000000
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinecclesiastic.ldf}[polyglossia: module for ecclesiastic Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf
deleted file mode 100644
index 1f76e51ba2b..00000000000
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinmedieval.ldf}[polyglossia: module for medieval Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf
index 495a2384b07..a0e938f3c5a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latvian.ldf}[polyglossia: module for Latvian]
\PolyglossiaSetup{latvian}{
@@ -25,12 +25,12 @@
\def\contentsname{Saturs}%
\def\listfigurename{Attēlu saraksts}%
\def\listtablename{Tabulu saraksts}%
- \def\indexname{Index}%
+ \def\indexname{Priekšmetu rādītājs}%
\def\figurename{Att.}%
\def\tablename{Tabula}%
\def\partname{Daļa}%
- \def\enclname{encl}%
- \def\ccname{cc}%
+ \def\enclname{Pielikumā}%
+ \def\ccname{Kopija(s)}%
\def\headtoname{To}%
\def\pagename{lpp.}%
\def\seename{sk.}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf
index c3f389702bb..c120f8394f7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translated by Paulius Sladkevičius <komsas@gmail.com>
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
index dbb6a3406a2..d74145d09a8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lo.ldf}[polyglossia: module for lo (Lao)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{lao}
+\InheritGlossFile{lao}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
index a754a11e9e2..a4927b4f86a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lowersorbian.ldf}[polyglossia: module for Lower Sorbian]
% We provide this as a babel alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
index 4f054727f6e..96cd05cede4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lsorbian.ldf}[polyglossia: module for Lower Sorbian]
% We only provide this gloss for babel compatibility. Since lsorbian is
% a sorbian variety, we use 'sorbian' with variant 'lower' now.
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
index a229c22f599..c01d7f9cae3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lt.ldf}[polyglossia: module for lt (Lithuanian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{lithuanian}
+\InheritGlossFile{lithuanian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
index 872db3d41eb..88932fe434d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lv.ldf}[polyglossia: module for lv (Latvian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latvian}
+\InheritGlossFile{latvian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf
index 7d1465ee3d5..e1c8534b2a3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-macedonian.ldf}[polyglossia: module for Macedonian]
\PolyglossiaSetup{macedonian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
index 034802242c0..9533a325b4a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-magyar.ldf}[polyglossia: module for Hungarian (Magyar)]
% We only provide this gloss for babel compatibility.
-\xpg@load@master@language{hungarian}
+\InheritGlossFile{hungarian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf
index c890ffcd2b9..451ed329b8f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-malay.ldf}[polyglossia: module for Malay]
@@ -26,65 +26,44 @@
% Backwards compat. alias
\setlanguagealias[variant=malaysian]{malay}{bahasam}
-\providebool{malay@melayu}
+\@ifundefined{ifmalay@melayu}%
+ {\newif\ifmalay@melayu}{}
\malay@melayufalse
\def\malay@variant{malay}
-\define@choicekey*+{malay}{variant}[\xpg@val\xpg@nr]{indonesian,malaysian}[malaysian]{%
- \ifcase\xpg@nr\relax
- % indonesian:
- \def\malay@variant{indonesian}%
- \malay@melayufalse
- \or
- % malaysian:
- \def\malay@variant{malay}%
- \malay@melayutrue
- \fi
- \ifmalay@melayu
- \SetLanguageKeys{malay}{language=Malay,langtag=MLY,babelname=bahasam,bcp47=zsm,bcp47-language=zsm}%
- \xpg@fontsetup@latin{malay}%
- % Check if \l@malay is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{malay}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@malay}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{melayu,bahasam,bahasai,indonesian,indon,bahasa}
- \xpg@ifdefined{malay}{}{%
- \xpg@warning{No hyphenation patterns for Malay (Malaysian) found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@malay0%
- }%
- }%
- \else
- \SetLanguageKeys{malay}{language=Indonesian,langtag=IND,babelname=bahasa,bcp47=id,bcp47-language=id}%
- \xpg@fontsetup@latin{malay}%
- % Check if \l@indonesian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{indonesian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@indonesian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{indon,bahasai,bahasam,malay,melayu,bahasa}
- \xpg@ifdefined{indonesian}{}{%
- \xpg@warning{No hyphenation patterns for Malay (Indonesian) found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@indonesian0
- }%
- }%
- \fi
- \xpg@info{Option: malay, variant=\xpg@val}%
-}{\xpg@warning{Unknown malay variant `#1'}}
+
+\DeclareKeys[polyglossia/gloss/malay]
+ {
+ variant.choice:,
+ variant / indonesian.code =
+ {%
+ \def\malay@variant{indonesian}%
+ \malay@melayufalse
+ \SetLanguageKeys{malay}{language=Indonesian,langtag=IND,babelname=bahasa,bcp47=id,bcp47-language=id}%
+ \SetupLatinPolyglossiaFont{malay}%
+ % Check if \l@indonesian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{indonesian}{indon,bahasai,bahasam,malay,melayu,bahasa}%
+ },
+ variant / malaysian.code =
+ {%
+ \def\malay@variant{malay}%
+ \malay@melayutrue
+ \SetLanguageKeys{malay}{language=Malay,langtag=MLY,babelname=bahasam,bcp47=zsm,bcp47-language=zsm}%
+ \SetupLatinPolyglossiaFont{malay}%
+ % Check if \l@malay is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{malay}{melayu,bahasam,bahasai,indonesian,indon,bahasa}%
+ },
+ variant.default:n = malaysian,
+ variant/unknown.code = \xpg@warning{Unknown malay variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{malay}{variant=malaysian}
+\InitializeGlossOptions{malay}{variant=malaysian}
\def\malay@language{%
- \polyglossia@setup@language@patterns{\malay@variant}%
+ \SetupPolyglossiaLangPatterns{\malay@variant}%
}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf
index 44def596e77..84524dac5ce 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-malayalam.ldf}[polyglossia: module for Malayalam]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf
index 79b48a24c5a..cbb0dce0cbb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by Abhijit Navale <abhi_navale@live.in>
% Ordinals (1-100) added by Niranjan Tambe <niranjanvikastambe@gmail.com> on 14th December, 2019
@@ -28,21 +28,25 @@
\newif\ifmarathi@devanagari@numerals
\marathi@devanagari@numeralstrue
-\define@choicekey*+{marathi}{numerals}[\xpg@val\xpg@nr]{Western,Devanagari}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Western:
- \marathi@devanagari@numeralsfalse%
- \SetLanguageKeys{marathi}{bcp47-extension-u=nu-latn}%
- \or
- % Devanagari:
- \marathi@devanagari@numeralstrue%
- \SetLanguageKeys{marathi}{bcp47-extension-u=nu-deva}%
- \fi
- \xpg@info{Option: Marathi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Marathi numerals value `#1'}}
+\DeclareKeys[polyglossia/gloss/marathi]
+ {
+ numerals.choice:,
+ numerals / western.code =
+ {%
+ \marathi@devanagari@numeralsfalse
+ \SetLanguageKeys{marathi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / devanagari.code =
+ {%
+ \marathi@devanagari@numeralstrue
+ \SetLanguageKeys{marathi}{bcp47-extension-u=nu-deva}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Marathi numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{marathi}{numerals=Devanagari}
+\InitializeGlossOptions{marathi}{numerals=Devanagari}
\newcommand{\marathinumerals}[2]{\marathinumber{#2}}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf
new file mode 100644
index 00000000000..f718bde8fa3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf
@@ -0,0 +1,9 @@
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-medievallatin.ldf}[polyglossia: module for medieval Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
index d5795bc39d3..dd2fbe301bd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mk.ldf}[polyglossia: module for mk (Macedonian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{macedonian}
+\InheritGlossFile{macedonian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
index 74ebd5902fa..175a75bee7f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ml.ldf}[polyglossia: module for ml (Malayalam)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{malayalam}
+\InheritGlossFile{malayalam}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
index f19bfb63f24..985d73b69d8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mn.ldf}[polyglossia: module for mn (Mongolian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{mongolian}
+\InheritGlossFile{mongolian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf
index 04d4fe1e4da..d8eca6721d5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mongolian.ldf}[polyglossia: module for Mongolian]
@@ -30,43 +30,46 @@
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{mongolian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \fi
- \xpg@info{Option: Mongolian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Mongolian numerals value `#1'}}
-\define@boolkey{mongolian}[mongolian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/mongolian]
+ {
+ babelshorthands.if = mongolian@babelshorthands,
+ babelshorthands.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Mongolian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{mongolian}{babelshorthands=false,numerals=arabic}
+\InitializeGlossOptions{mongolian}{babelshorthands=false,numerals=arabic}
\ifsystem@babelshorthands
- \setkeys{mongolian}{babelshorthands=true}
+ \SetGlossOptions{mongolian}{babelshorthands=true}
\else
- \setkeys{mongolian}{babelshorthands=false}
+ \SetGlossOptions{mongolian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\mongolian@shorthands{%
\xpg@activate@shorthands%
@@ -119,7 +122,7 @@
\def\bibname{Номзүй}%
\def\chaptername{Бүлэг}%
\def\appendixname{Хавсралт}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Агуулга}}%
{\def\contentsname{Гарчиг}}%
\def\listfigurename{Зургийн жагсаалт}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
index fa37ee180c0..7a56186cb25 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mr.ldf}[polyglossia: module for mr (Marathi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{marathi}
+\InheritGlossFile{marathi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
index 01cb9a28833..32524dab4fe 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-naustrian.ldf}[polyglossia: module for Austrian German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
index 715d6a22841..34bfbbce49a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nb.ldf}[polyglossia: module for nb (Norwegian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
index 298913ccb8d..baf56a91398 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-newzealand.ldf}[polyglossia: module for Newzealand English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
index cb77aa6be8d..7bacbf2b423 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ngerman.ldf}[polyglossia: module for German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf
index a7b7712520d..196b55d48ee 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nko.ldf}[Polyglossia: module for N’Ko]
\PolyglossiaSetup{nko}{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
index d000c9c1e38..95121a64502 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
@@ -1,11 +1,11 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-norsk.ldf}[polyglossia: module for Norwegian (Bokmal)]
% We only provide this gloss for babel compatibility. Since norsk is
% actually norwegian bokmal, we use 'norwegian' with variant 'bokmal' now.
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf
index 544c8b7df79..ba7b7aca46d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-norwegian.ldf}[polyglossia: module for Norwegian]
\PolyglossiaSetup{norwegian}{
@@ -20,28 +20,32 @@
\setlanguagealias[variant=nynorsk]{norwegian}{nynorsk}
\def\norwegian@variant{nynorsk}
-\define@choicekey*+{norwegian}{variant}[\xpg@val\xpg@nr]{nynorsk,bokmal}[nynorsk]{%
- \ifcase\xpg@nr\relax
- % nynorsk:
- \def\norwegian@variant{nynorsk}%
- \SetLanguageKeys{norwegian}{langtag=NYN,babelname=nynorsk,bcp47=nn,bcp47-language=nn}%
- \xpg@fontsetup@latin{norwegian}%
- \or
- % bokmal:
- \def\norwegian@variant{norsk}%
- \SetLanguageKeys{norwegian}{langtag=NOR,babelname=norsk,bcp47=nb,bcp47-language=nb}%
- \xpg@fontsetup@latin{norwegian}%
- \fi
- \xpg@info{Option: norwegian, variant=\xpg@val}%
-}{\xpg@warning{Unknown norwegian variant `#1'}}
+\DeclareKeys[polyglossia/gloss/norwegian]
+ {
+ variant.choice:,
+ variant / nynorsk.code =
+ {%
+ \def\norwegian@variant{nynorsk}%
+ \SetLanguageKeys{norwegian}{langtag=NYN,babelname=nynorsk,bcp47=nn,bcp47-language=nn}%
+ \SetupLatinPolyglossiaFont{norwegian}%
+ },
+ variant / bokmal.code =
+ {%
+ \def\norwegian@variant{norsk}%
+ \SetLanguageKeys{norwegian}{langtag=NOR,babelname=norsk,bcp47=nb,bcp47-language=nb}%
+ \SetupLatinPolyglossiaFont{norwegian}%
+ },
+ variant.default:n = nynorsk,
+ variant/unknown.code = \xpg@warning{Unknown norwegian variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{norwegian}{variant=nynorsk}
+\InitializeGlossOptions{norwegian}{variant=nynorsk}
\def\norwegian@language{%
- \polyglossia@setup@language@patterns{\norwegian@variant}%
+ \SetupPolyglossiaLangPatterns{\norwegian@variant}%
}%
\def\captionsnorwegian@nynorsk{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
index 5fa656d2a50..19d45a3143c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nswissgerman.ldf}[polyglossia: module for Swiss German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
index 648d2b346d4..5a44bced302 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
@@ -1,11 +1,11 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nynorsk.ldf}[polyglossia: module for Norwegian (Nynorsk)]
% We only provide this gloss for babel compatibility. Since nynorsk is
% a norwegian variety, we use 'norwegian' with variant 'nynorsk' now.
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf
index a383b92b28f..163fd7dc576 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
%%
%% This is file `gloss-occitan.ldf',
@@ -34,19 +34,19 @@
% BCP-47 compliant aliases
\setlanguagealias*{occitan}{oc}
-\define@boolkey{occitan}[occitan@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/occitan]
+ {
+ babelshorthands.if = occitan@babelshorthands,
+ babelshorthands.default:n = true
+ }
\ifsystem@babelshorthands
- \setkeys{occitan}{babelshorthands=true}
+ \SetGlossOptions{occitan}{babelshorthands=true}
\else
- \setkeys{occitan}{babelshorthands=false}
+ \SetGlossOptions{occitan}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\occitan@shorthands{%
\xpg@activate@shorthands%
@@ -138,7 +138,7 @@
\def\today{\occitanday\space \occitanmonth\space de~\number\year}%
}
\let\xpgoc@savedvalues\empty
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgoc@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf
index 7efbd533912..7101033d02e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by ଅଶୋକ ଦାସ୍ <das@pas.rochester.edu> and ଅଭିଷେକ ଜେନା <avisekjena@gmail.com>
% TODO implement Odia calendar
@@ -30,32 +30,37 @@
\newif\ifodia@devanagari@numerals
\newif\ifodia@odia@numerals
-\define@choicekey*+{odia}{numerals}[\xpg@val\xpg@nr]{Devanagari,Odia,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \odia@odia@numeralsfalse%
- \odia@devanagari@numeralstrue%
- \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-deva}%
- \or
- % Odia:
- \odia@odia@numeralstrue%
- \odia@devanagari@numeralsfalse%
- \or
- % Western:
- \odia@odia@numeralsfalse%
- \odia@devanagari@numeralsfalse%
- \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Odia, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Odia numeral `#1'}}
-
\def\extras@odia{}
\def\noextras@odia{}
-\define@boolkey{odia}[odia@]{changecounternumbering}[true]{}
+\DeclareKeys[polyglossia/gloss/odia]
+ {
+ changecounternumbering.if = odia@changecounternumbering,
+ changecounternumbering.default:n = true,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \odia@odia@numeralsfalse
+ \odia@devanagari@numeralstrue
+ \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-deva}%
+ },
+ numerals / odia.code =
+ {%
+ \odia@odia@numeralstrue
+ \odia@devanagari@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \odia@odia@numeralsfalse
+ \odia@devanagari@numeralsfalse
+ \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Odia numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{odia}{changecounternumbering=false,numerals=Devanagari}
+\InitializeGlossOptions{odia}{changecounternumbering=false,numerals=Devanagari}
\def\captionsodia{%
\def\refname{ସନ୍ଦର୍ଭ}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
index a864d2040e0..7f9cee9b542 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-odia.ldf}[polyglossia: module for or (Odia)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{odia}
+\InheritGlossFile{odia}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
index c54ec572b9c..9f56ed05039 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-pa.ldf}[polyglossia: module for pa (Punjabi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{punjabi}
+\InheritGlossFile{punjabi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf
index ae1a9b0d288..6018964b451 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-persian.ldf}[polyglossia: module for Persian]
@@ -27,42 +27,36 @@
\setlanguagealias{persian}{farsi}
\newif\if@western@numerals
-\define@choicekey*+{persian}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \SetLanguageKeys{persian}{bcp47-extension-u=nu-arab}%
- \or
- % western:
- \@western@numeralstrue%
- \SetLanguageKeys{persian}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Persian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Persian numerals option `#1'}}
-
\newif\ifpersian@customsep\persian@customsepfalse
\def\xpg@sepmark{}
-\define@key{persian}{sectionsep}[.]{%
- \persian@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{persian}[persian@]{abjadjimnotail}[true]{%
- \ifpersian@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi}
-
-% NOT YET USED
-\define@key{persian}{locale}[default]{%
- \def\@persian@locale{#1}}
%TODO add option for CALENDAR
+\DeclareKeys[polyglossia/gloss/persian]
+ {
+ sectionsep.code = \gdef\xpg@sepmark{#1}\persian@customseptrue,
+ sectionsep.default:n = .,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ locale.store = \@persian@locale,
+ locale.default:n = default,
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ \SetLanguageKeys{persian}{bcp47-extension-u=nu-arab}%
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \SetLanguageKeys{persian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Persian numerals option `#1'}
+ }
+
% Register default options
-\xpg@initialize@gloss@options{persian}{locale=default,numerals=eastern,abjadjimnotail=false}
+\InitializeGlossOptions{persian}{locale=default,numerals=eastern,abjadjimnotail=false}
\def\farsigregmonth#1{\ifcase#1%
\or ژانویه\or فوریه\or مارس\or آوریل\or مه\or ژوئن\or ژوئیه\or اوت\or سپتامبر\or اکتبر\or نوامبر\or دسامبر\fi}
@@ -147,16 +141,16 @@
}
\def\nopersian@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\persian@luatex@capsformat{%
%
% change chapter and part headings
\ifpersian@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -168,7 +162,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -183,30 +177,30 @@
}
\def\nopersian@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@persian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf
index 1b6b9b537d1..214182ba500 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf
@@ -1,5 +1,5 @@
% !TEX encoding = UTF-8 Unicode
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-piedmontese.ldf}[2013/02/12 v1.0 polyglossia: module for Piedmontese]
\makeatletter
@@ -17,19 +17,19 @@
% BCP-47 compliant aliases
\setlanguagealias*{piedmontese}{pms}
-\define@boolkey{piedmontese}[piedmontese@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/piedmontese]
+ {
+ babelshorthands.if = piedmontese@babelshorthands,
+ babelshorthands.default:n = true
+ }
\ifsystem@babelshorthands
- \setkeys{piedmontese}{babelshorthands=true}
+ \SetGlossOptions{piedmontese}{babelshorthands=true}
\else
- \setkeys{piedmontese}{babelshorthands=false}
+ \SetGlossOptions{piedmontese}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\piedmontese@shorthands{%
\xpg@activate@shorthands%
@@ -93,7 +93,7 @@
ëd luj\or d'agost\or dë stèmber\or d'otóber\or ëd novèmber\or dë dzèmber%
\fi\space dal\space\number\year}}
-\AtEndPreamble{%
+\AddToHook{begindocument/before}{%
\edef\xpgpms@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf
index 48ceed5bbb6..bc48e3e4b1e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-polish.ldf}[polyglossia: module for Polish]
@@ -20,26 +20,26 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{polish}[polish@]{babelshorthands}[true]{}
-
-\define@boolkey{polish}[polish@]{splithyphens}[true]{}
-
-\define@boolkey{polish}[polish@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/polish]
+ {
+ babelshorthands.if = polish@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = polish@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = polish@vlna,
+ vlna.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{polish}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{polish}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{polish}{babelshorthands=true}
+ \SetGlossOptions{polish}{babelshorthands=true}
\else
- \setkeys{polish}{babelshorthands=false}
+ \SetGlossOptions{polish}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\polish@@splhyphen#1{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
index 68f53eb1f22..e8f541e486c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-polutonikogreek.ldf}[polyglossia: module for polytonic Greek]
% We provide this as a babel alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
index 6111b581193..d635007377a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for Portuguese]
@@ -7,6 +7,6 @@
% introduced it in 8.3 filename times). Since polyglossia uses full
% English language names, we use 'portuguese' now.
-\xpg@load@master@language{portuguese}
+\InheritGlossFile{portuguese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf
index bb03525be7e..e58233056a1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-portuguese.ldf}[polyglossia: module for Portuguese]
@@ -28,41 +28,42 @@
\fi
\def\portuguese@variant{portuges}
-\define@choicekey*+{portuguese}{variant}[\xpg@val\xpg@nr]{portuguese,brazilian}[portuguese]{%
- \ifcase\xpg@nr\relax
- % portuguese:
- \def\portuguese@variant{portuges}%
- \SetLanguageKeys{portuguese}{babelname=portuges,bcp47=pt-PT,bcp47-language=pt,bcp47-region=PT}%
- \or
- % brazilian:
- \def\portuguese@variant{brazil}%
- \SetLanguageKeys{portuguese}{babelname=brazil,bcp47=pt-BR,bcp47-language=pt,bcp47-region=BR}%
- % There are no specific brazil patterns
- \adddialect\l@brazil\l@portuges\relax%
- \fi
- \xpg@info{Option: portuguese, variant=\xpg@val}%
-}{\xpg@warning{Unknown portuguese variant `#1'}}
-
-\define@boolkey{portuguese}[portuguese@]{babelshorthands}[true]{}
-
-\define@boolkey{portuguese}[portuguese@]{splithyphens}[true]{}
+
+\DeclareKeys[polyglossia/gloss/portuguese]
+ {
+ babelshorthands.if = portuguese@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = portuguese@splithyphens,
+ splithyphens.default:n = true,
+ variant.choice:,
+ variant / portuguese.code =
+ {%
+ \def\portuguese@variant{portuges}%
+ \SetLanguageKeys{portuguese}{babelname=portuges,bcp47=pt-PT,bcp47-language=pt,bcp47-region=PT}%
+ },
+ variant / brazilian.code =
+ {%
+ \def\portuguese@variant{brazil}%
+ \SetLanguageKeys{portuguese}{babelname=brazil,bcp47=pt-BR,bcp47-language=pt,bcp47-region=BR}%
+ % There are no specific brazil patterns
+ \adddialect\l@brazil\l@portuges\relax
+ },
+ variant.default:n = portuguese,
+ variant/unknown.code = \xpg@warning{Unknown portuguese variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{portuguese}{variant=portuguese,
+\InitializeGlossOptions{portuguese}{variant=portuguese,
babelshorthands=false,
splithyphens=true}
\ifsystem@babelshorthands
- \setkeys{portuguese}{babelshorthands=true}
+ \SetGlossOptions{portuguese}{babelshorthands=true}
\else
- \setkeys{portuguese}{babelshorthands=false}
+ \SetGlossOptions{portuguese}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\portuguese@@splhyphen#1{%
@@ -131,7 +132,7 @@
}
\def\portuguese@language{%
- \polyglossia@setup@language@patterns{\portuguese@variant}%
+ \SetupPolyglossiaLangPatterns{\portuguese@variant}%
}%
\def\captionsportuguese@portuges{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf
index 48eacd30e7f..e150176c02d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% UTF-8 strings kindly provided by
% Arvinder Singh Kang, <17-11-2022>
@@ -25,26 +25,31 @@
\def\punjabi@language{%
% patterns are spelled panjabi
- \polyglossia@setup@language@patterns{panjabi}%
+ \SetupPolyglossiaLangPatterns{panjabi}%
}
\newif\ifpunjabi@gurmukhi@numerals
\punjabi@gurmukhi@numeralstrue
-\define@choicekey*+{punjabi}{numerals}[\xpg@val\xpg@nr]{Gurmukhi,Western}[Gurmukhi]{%
- \ifcase\xpg@nr\relax
- % Gurmukhi:
- \punjabi@gurmukhi@numeralstrue%
- \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-guru}%
- \or
- % Western:
- \punjabi@gurmukhi@numeralsfalse%
- \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Punjabi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Punjabi numeral `#1'}}
+
+\DeclareKeys[polyglossia/gloss/punjabi]
+ {
+ numerals.choice:,
+ numerals / gurmukhi.code =
+ {%
+ \punjabi@gurmukhi@numeralstrue
+ \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-guru}%
+ },
+ numerals / western.code =
+ {%
+ \punjabi@gurmukhi@numeralsfalse
+ \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = gurmukhi,
+ numerals/unknown.code = \xpg@warning{Unknown Punjabi numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{punjabi}{numerals=gurmukhi}
+\InitializeGlossOptions{punjabi}{numerals=gurmukhi}
\newcommand{\punjabinumerals}[2]{\punjabinumber{#2}}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf
index 290dad9c71b..0051613ac77 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-romanian.ldf}[polyglossia: module for Romanian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf
index aa50a200003..b8c9d628e01 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-romansh.ldf}[polyglossia: module for Romansh]
\makeatletter
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf
index 8dcf535ebf5..34b2abd2445 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-russian.ldf}[polyglossia: module for Russian]
@@ -27,11 +27,6 @@
\setlanguagealias*[spelling=old]{russian}{ru-petr1708}
\newif\if@russian@modern
-\define@key{russian}{spelling}[modern]{%
- \ifstrequal{#1}{old}%
- {\@russian@modernfalse\SetLanguageKeys{russian}{bcp47=ru-petr1708,bcp47-variant=petr1708}}%
- {\@russian@moderntrue\SetLanguageKeys{russian}{bcp47=ru,bcp47-variant=luna1918}}%
-}
\def\captionsrussian{%
\if@russian@modern\captionsrussian@modern\else\captionsrussian@old\fi%
@@ -43,49 +38,68 @@
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{russian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Russian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Russian numerals value `#1'}}
-
-\define@boolkey{russian}[russian@]{indentfirst}[true]{%
- \ifrussian@indentfirst
- \SetLanguageKeys{russian}{indentfirst=true}%
- \else
- \SetLanguageKeys{russian}{indentfirst=false}%
- \fi%
-}
-
-\define@boolkey{russian}[russian@]{babelshorthands}[true]{}
-
-% Force punctuation after heading number
-\define@boolkey{russian}[russian@]{forceheadingpunctuation}[true]{}
-% Define some math functions
-\define@boolkey{russian}[russian@]{mathfunctions}[true]{}
+\DeclareKeys[polyglossia/gloss/russian]
+ {
+ babelshorthands.if = russian@babelshorthands,
+ babelshorthands.default:n = true,
+ forceheadingpunctuation.if = russian@forceheadingpunctuation,
+ forceheadingpunctuation.default:n = true,
+ mathfunctions.if = russian@mathfunctions,
+ mathfunctions.default:n = true,
+ spelling.choice:,
+ spelling / modern.code =
+ {%
+ \@russian@moderntrue
+ \SetLanguageKeys{russian}{bcp47=ru,bcp47-variant=luna1918}%
+ },
+ spelling / old.code =
+ {%
+ \@russian@modernfalse
+ \SetLanguageKeys{russian}{bcp47=ru-petr1708,bcp47-variant=petr1708}%
+ },
+ spelling.default:n = modern,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Russian numerals value `#1'},
+ indentfirst.choice:,
+ indentfirst / true.code =
+ {%
+ \SetLanguageKeys{russian}{indentfirst=true}%
+ },
+ indentfirst / false.code =
+ {%
+ \SetLanguageKeys{russian}{indentfirst=false}%
+ },
+ indentfirst.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{russian}{babelshorthands=false,
+\InitializeGlossOptions{russian}{babelshorthands=false,
spelling=modern,
numerals=arabic,
indentfirst=true,
@@ -94,16 +108,12 @@
\ifsystem@babelshorthands
- \setkeys{russian}{babelshorthands=true}
+ \SetGlossOptions{russian}{babelshorthands=true}
\else
- \setkeys{russian}{babelshorthands=false}
+ \SetGlossOptions{russian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\russian@shorthands{%
\xpg@activate@shorthands%
@@ -155,7 +165,7 @@
\def\bibname{Литература}%
\def\chaptername{Глава}%
\def\appendixname{Приложение}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Содержание}}%
{\def\contentsname{Оглавление}}%
\def\listfigurename{Список иллюстраций}%
@@ -198,7 +208,7 @@
\def\bibname{Библіографія}%
\def\chaptername{Глава}%
\def\appendixname{Приложеніе}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Содержаніе}}%
{\def\contentsname{Оглавленіе}}%
\def\listfigurename{Списокъ иллюстрацій}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf
index 9efe055865f..802718dbc47 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sami.ldf}[polyglossia: module for Sami]
@@ -28,19 +28,19 @@
% % northern:
% \def\sami@variant{samin}%
% \SetLanguageKeys{sami}{language=Northern Sami,langtag=NSM}%
-% \xpg@fontsetup@latin{sami}%
+% \SetupLatinPolyglossiaFont{sami}%
% \or
% % other:
% \def\sami@variant{}%
% \SetLanguageKeys{sami}{language= Sami,langtag=}%
-% \xpg@fontsetup@latin{sami}%
+% \SetupLatinPolyglossiaFont{sami}%
% \fi
% \xpg@info{Option: sami, variant=\xpg@val}%
%}{\xpg@warning{Unknown sami variant `#1'}}
%\def\sami@language{%
-% \polyglossia@setup@language@patterns{\sami@variant}%
+% \SetupPolyglossiaLangPatterns{\sami@variant}%
%}%
\def\captionssami@northern{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
index 0801e7423ab..e15a05b2430 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-samin.ldf}[polyglossia: module for Northern Sami]
% We only provide this gloss for babel compatibility. Since samin is
% a sami variety, we use 'sami' with variant 'northern' now.
-\xpg@load@master@language{sami}
+\InheritGlossFile{sami}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf
index 094c6f6691d..1c9901082c9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sanskrit.ldf}[polyglossia: module for Sanskrit]
@@ -27,56 +27,55 @@
\setlanguagealias*[script=gujarati]{sanskrit}{sa-Gujr}
\setlanguagealias*[script=latin]{sanskrit}{sa-Latn}
-\define@key{sanskrit}{Script}[devanagari]{%
- \ifcsdef{fontsetup@sanskrit@#1}%
- {\csname fontsetup@sanskrit@#1\endcsname}%
- {\xpg@error{`#1' is not a valid script for Sanskrit}%
- }%
-}
-
-\define@key{sanskrit}{script}[devanagari]{\setkeys{sanskrit}{Script=#1}}
-
\def\fontsetup@sanskrit@devanagari{%
\SetLanguageKeys{sanskrit}{scripttag=deva,script=Devanagari,bcp47=sa-Deva,bcp47-language=sa,bcp47-script=Deva,bcp47-casing=sa-Deva}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@gujarati{%
\SetLanguageKeys{sanskrit}{scripttag=gujr,script=Gujarati,bcp47=sa-Gujr,bcp47-language=sa,bcp47-script=Gujr,bcp47-casing=sa-Gujr}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@malayalam{%
\SetLanguageKeys{sanskrit}{scripttag=mlym,script=Malayalam,bcp47=sa-Mlym,bcp47-language=sa,bcp47-script=Mlym,bcp47-casing=sa-Mlym}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@bengali{%
\SetLanguageKeys{sanskrit}{scripttag=beng,script=Bengali,bcp47=sa-Beng,bcp47-language=sa,bcp47-script=Beng,bcp47-casing=sa-Beng}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@kannada{%
\SetLanguageKeys{sanskrit}{scripttag=knda,script=Kannada,bcp47=sa-Knda,bcp47-language=sa,bcp47-script=Knda,bcp47-casing=sa-Knda}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@telugu{%
\SetLanguageKeys{sanskrit}{scripttag=telu,script=Telugu,bcp47=sa-Relu,bcp47-language=sa,bcp47-script=Relu,bcp47-casing=sa-Relu}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@latin{%
\SetLanguageKeys{sanskrit}{scripttag=latn,script=Latin,bcp47=sa-Latn,bcp47-language=sa,bcp47-script=Latn,bcp47-casing=sa-Latn}
- \xpg@fontsetup@latin{sanskrit}}
+ \SetupLatinPolyglossiaFont{sanskrit}}
\newif\ifsanskrit@devanagari@numerals
\sanskrit@devanagari@numeralstrue
-\define@choicekey*+{sanskrit}{numerals}[\xpg@val\xpg@nr]{devanagari,western}[devanagari]{%
- \ifcase\xpg@nr\relax
- % devanagari:
- \sanskrit@devanagari@numeralstrue%
- \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-deva}%
- \or
- % western:
- \sanskrit@devanagari@numeralsfalse%
- \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Sanskrit, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Sanskrit numeral `#1'}}
+\DeclareKeys[polyglossia/gloss/sanskrit]
+ {
+ script.code = \@ifundefined{fontsetup@sanskrit@#1}%
+ {\xpg@error{`#1' is not a valid script for Sanskrit}}%
+ {\csname fontsetup@sanskrit@#1\endcsname},
+ script.default:n = devanagari,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \sanskrit@devanagari@numeralstrue
+ \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-deva}%
+ },
+ numerals / western.code =
+ {%
+ \sanskrit@devanagari@numeralsfalse
+ \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Sanskrit numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{sanskrit}{script=devanagari,numerals=devanagari}
+\InitializeGlossOptions{sanskrit}{script=devanagari,numerals=devanagari}
% Use \providecommand here as the ldf file might
% be reloaded via BCP.
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
index a53cd0c6d3f..562e7358a5e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-scottish.ldf}[polyglossia: module for Scottish Gaelic]
% We only provide this gloss for babel compatibility. Since scottish is
% a gaelic variety, we use 'gaelic' with variant 'scottish' now.
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf
index 3a80bdd1370..3bc4740ebb4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-serbian.ldf}[polyglossia: module for Serbian]
%TODO split into gloss-serbiancyr.ldf and gloss-serbianlat.ldf
@@ -39,67 +39,10 @@
\fi
\newif\if@serbian@cyr
-\define@choicekey*+{serbian}{Script}[\xpg@val\xpg@nr]{cyrillic,latin}[cyrillic]{%
- \ifcase\xpg@nr\relax
- % cyrillic:
- \@serbian@cyrtrue
- \xpg@fontsetup@nonlatin{serbian}%
- \or
- % latin:
- \@serbian@cyrfalse
- \xpg@fontsetup@latin{serbian}%
- %TODO \def\serbian@language{\language=\l@serbianlat}%
- % or should we use Croatian patterns as a fallback for the time being???
- \fi
- \serbian@set@languagekeys%
- \xpg@info{Option: Serbian, script=\xpg@val}%
-}{\xpg@warning{Unknown Serbian script `#1'}}
-
-\define@key{serbian}{script}[cyrillic]{\setkeys{serbian}{Script=#1}}
-
\newif\if@serbian@ijekavian
-\define@choicekey*+{serbian}{variant}[\xpg@val\xpg@nr]{ekavian,ijekavian}[ekavian]{%
- \ifcase\xpg@nr\relax
- % ekavian:
- \@serbian@ijekavianfalse%
- \or
- % ijekavian:
- \@serbian@ijekaviantrue%
- \fi
- \serbian@set@languagekeys%
- \xpg@info{Option: Serbian, variant=\xpg@val}%
-}{\xpg@warning{Unknown Serbian variant `#1'}}
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{serbian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Serbian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Serbian numerals value `#1'}}
-
-\define@boolkey{serbian}[serbian@]{splithyphens}[true]{}
-
-\define@boolkey{serbian}[serbian@]{datei}[true]{}
\def\serbian@set@languagekeys{%
\if@serbian@cyr
@@ -117,10 +60,75 @@
\fi%
}
-\setkeys{serbian}{Script,numerals}
+\DeclareKeys[polyglossia/gloss/serbian]
+ {
+ splithyphens.if = serbian@splithyphens,
+ splithyphens.default:n = true,
+ datei.if = serbian@datei,
+ datei.default:n = true,
+ variant.choice:,
+ variant / ekavian.code =
+ {%
+ \@serbian@ijekavianfalse
+ \serbian@set@languagekeys
+ },
+ variant / ijekavian.code =
+ {%
+ \@serbian@ijekaviantrue
+ \serbian@set@languagekeys
+ },
+ variant.default:n = ekavian,
+ variant/unknown.code = \xpg@warning{Unknown Serbian variant `#1'},
+ script.choice:,
+ script / cyrillic.code =
+ {%
+ \@serbian@cyrtrue
+ \SetupNonLatinPolyglossiaFont{serbian}%
+ \serbian@set@languagekeys
+ },
+ script / latin.code =
+ {%
+ \@serbian@cyrfalse
+ \SetupLatinPolyglossiaFont{serbian}%
+ %TODO \def\serbian@language{\language=\l@serbianlat}%
+ % or should we use Croatian patterns as a fallback for the time being???
+ \serbian@set@languagekeys
+ },
+ script.default:n = cyrillic,
+ script/unknown.code = \xpg@warning{Unknown Serbian script `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Serbian numerals value `#1'}
+ }
+
+\SetGlossOptions{serbian}{script,numerals}
% Register default options
-\xpg@initialize@gloss@options{serbian}{script=cyrillic,numerals=arabic,splithyphens=true}
+\InitializeGlossOptions{serbian}{script=cyrillic,numerals=arabic,splithyphens=true}
\def\captionsserbian{%
\if@serbian@cyr\captionsserbian@cyr\else\captionsserbian@lat\fi
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
index 7e395fbb602..5493765d9b6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-serbianc.ldf}[polyglossia: module for Serbian (cyrillic)]
% We provide this as a babel alias
-\xpg@load@master@language{serbian}
+\InheritGlossFile{serbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf
index 863b9babde3..b08d84335ed 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovak.ldf}[polyglossia: module for Slovak]
@@ -19,26 +19,26 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{slovak}[slovak@]{babelshorthands}[true]{}
-
-\define@boolkey{slovak}[slovak@]{splithyphens}[true]{}
-
-\define@boolkey{slovak}[slovak@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/slovak]
+ {
+ babelshorthands.if = slovak@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = slovak@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = slovak@vlna,
+ vlna.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{slovak}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{slovak}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{slovak}{babelshorthands=true}
+ \SetGlossOptions{slovak}{babelshorthands=true}
\else
- \setkeys{slovak}{babelshorthands=false}
+ \SetGlossOptions{slovak}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\slovak@@splhyphen#1{%
@@ -214,7 +214,7 @@
\def\contentsname{Obsah}%
\def\listfigurename{Zoznam obrázkov}%
\def\listtablename{Zoznam tabuliek}%
- \def\indexname{Index}%
+ \def\indexname{Register}%
\def\figurename{Obrázok}%
\def\tablename{Tabuľka}%
%\def\thepart{}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
index 4b932a45446..ce2de8083c9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovene.ldf}[polyglossia: module for Slovenian]
% We provide this as a babel alias
-\xpg@load@master@language{slovenian}
+\InheritGlossFile{slovenian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf
index 2b574559ead..5a08442e3f0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovenian.ldf}[polyglossia: module for Slovenian]
@@ -19,10 +19,14 @@
% Babel aliases
\setlanguagealias{slovenian}{slovene}
-\define@boolkey{slovenian}[slovenian@]{localalph}[true]{}
+\DeclareKeys[polyglossia/gloss/slovenian]
+ {
+ localalph.if = slovenian@localalph,
+ localalph.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{slovenian}{localalph=false}
+\InitializeGlossOptions{slovenian}{localalph=false}
\def\captionsslovenian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf
index 27b0274d218..c7b0a1c0ce8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sorbian.ldf}[polyglossia: module for Sorbian]
@@ -26,60 +26,40 @@
\setlanguagealias[variant=upper]{sorbian}{uppersorbian}
\def\sorbian@variant{usorbian}
-\define@choicekey*+{sorbian}{variant}[\xpg@val\xpg@nr]{upper,lower}[upper]{%
- \ifcase\xpg@nr\relax
- % upper:
- \def\sorbian@variant{usorbian}%
- \SetLanguageKeys{sorbian}{language=Upper Sorbian,langtag=USB,babelname=uppersorbian,bcp47=hsb,bcp47-language=hsb}%
- \xpg@fontsetup@latin{sorbian}%
- % Check if \l@usorbian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{usorbian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@usorbian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{uppersorbian}
- \xpg@ifdefined{usorbian}{}{%
- \xpg@warning{No hyphenation patterns for Upper Sorbian found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@usorbian0%
- }
- }%
- \or
- % lower:
- \def\sorbian@variant{lsorbian}%
- \SetLanguageKeys{sorbian}{language=Lower Sorbian,langtag=LSB,babelname=lowersorbian,bcp47=dsb,bcp47-language=dsb}%
- \xpg@fontsetup@latin{sorbian}%
- % Check if \l@lsorbian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{lsorbian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@lsorbian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{lowersorbian,Lsorbian,usorbian,uppersorbian}
- \xpg@ifdefined{lsorbian}{}{%
- \xpg@warning{No hyphenation patterns for Lower Sorbian found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@lsorbian0%
- }
- }%
- \fi
- \xpg@info{Option: sorbian, variant=\xpg@val}%
-}{\xpg@warning{Unknown sorbian variant `#1'}}
-
-
-\define@boolkey{sorbian}[sorbian@]{olddate}[true]{}
+
+\DeclareKeys[polyglossia/gloss/sorbian]
+ {
+ olddate.if = sorbian@olddate,
+ olddate.default:n = true,
+ variant.choice:,
+ variant / upper.code =
+ {%
+ \def\sorbian@variant{usorbian}%
+ \SetLanguageKeys{sorbian}{language=Upper Sorbian,langtag=USB,babelname=uppersorbian,bcp47=hsb,bcp47-language=hsb}%
+ \SetupLatinPolyglossiaFont{sorbian}%
+ % Check if \l@usorbian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{usorbian}{uppersorbian}%
+ },
+ variant / lower.code =
+ {%
+ \def\sorbian@variant{lsorbian}%
+ \SetLanguageKeys{sorbian}{language=Lower Sorbian,langtag=LSB,babelname=lowersorbian,bcp47=dsb,bcp47-language=dsb}%
+ \SetupLatinPolyglossiaFont{sorbian}%
+ % Check if \l@lsorbian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{lsorbian}{lowersorbian,Lsorbian,usorbian,uppersorbian}%
+ },
+ variant.default:n = upper,
+ variant/unknown.code = \xpg@warning{Unknown sorbian variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{sorbian}{variant=upper,olddate=false}
+\InitializeGlossOptions{sorbian}{variant=upper,olddate=false}
\def\sorbian@language{%
- \polyglossia@setup@language@patterns{\sorbian@variant}%
+ \SetupPolyglossiaLangPatterns{\sorbian@variant}%
}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf
index c7f6358f047..0b5b128ae2a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-spanish.ldf}[polyglossia: module for Spanish]
@@ -27,52 +27,58 @@
\newif\if@spanish@mexico
\@spanish@mexicofalse
-\define@choicekey*+{spanish}{variant}[\xpg@val\xpg@nr]{spanish,mexican}[spanish]{%
- \ifcase\xpg@nr\relax
- % spanish:
- \@spanish@mexicofalse%
- \SetLanguageKeys{spanish}{babelname=spanish,bcp47=es-ES,bcp47-region=ES}%
- \or
- % mexican:
- \@spanish@mexicotrue%
- \SetLanguageKeys{spanish}{babelname=spanishmx,bcp47=es-MX,bcp47-region=MX}%
- \fi
- \xpg@info{Option: spanish, variant=\xpg@val}%
-}{\xpg@warning{Unknown spanish variant `#1'}}
% Localized math operators à la babel
\newif\ifspanish@accentedoperators
\newif\ifspanish@spacedoperators
\newif\ifspanish@locoperators
-\define@choicekey*+{spanish}{spanishoperators}[\xpg@val\xpg@nr]{all,accented,spaced,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \spanish@locoperatorstrue%
- \spanish@accentedoperatorstrue%
- \spanish@spacedoperatorstrue%
- \or
- % accented:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorstrue%
- \spanish@spacedoperatorsfalse%
- \or
- % spaced:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorsfalse%
- \spanish@spacedoperatorstrue%
- \or
- % none:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorsfalse%
- \spanish@spacedoperatorsfalse%
- \fi
- \xpg@info{Option: Spanish, spanishoperators=\xpg@val}%
-}{\xpg@warning{Unknown spanishoperators value `#1'}}
-
+\DeclareKeys[polyglossia/gloss/spanish]
+ {
+ variant.choice:,
+ variant / spanish.code =
+ {%
+ \@spanish@mexicofalse
+ \SetLanguageKeys{spanish}{babelname=spanish,bcp47=es-ES,bcp47-region=ES}%
+ },
+ variant / mexican.code =
+ {%
+ \@spanish@mexicotrue
+ \SetLanguageKeys{spanish}{babelname=spanishmx,bcp47=es-MX,bcp47-region=MX}%
+ },
+ variant.default:n = spanish,
+ variant/unknown.code = \xpg@warning{Unknown spanish variant `#1'},
+ spanishoperators.choice:,
+ spanishoperators / all.code =
+ {%
+ \spanish@locoperatorstrue
+ \spanish@accentedoperatorstrue
+ \spanish@spacedoperatorstrue
+ },
+ spanishoperators / accented.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorstrue
+ \spanish@spacedoperatorsfalse
+ },
+ spanishoperators / spaced.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorsfalse
+ \spanish@spacedoperatorstrue
+ },
+ spanishoperators / none.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorsfalse
+ \spanish@spacedoperatorsfalse
+ },
+ spanishoperators.default:n = all,
+ spanishoperators/unknown.code = \xpg@warning{Unknown spanishoperators value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{spanish}{variant=spanish,spanishoperators=none}
+\InitializeGlossOptions{spanish}{variant=spanish,spanishoperators=none}
\let\xpg@save@lim\lim
\let\xpg@save@limsup\limsup
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
index 850f5564ec5..4c0e71b0235 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-spanishmx.ldf}[polyglossia: module for Mexican Spanish]
% We provide this as a babel alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf
index a47304f1291..142a4b2d795 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-swedish.ldf}[polyglossia: module for Swedish]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
index fe679140556..9ab9f7e8d57 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-swissgerman.ldf}[polyglossia: module for Swiss German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
index 7bd32c3ddcd..e93148da005 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-syriac.ldf}[polyglossia: module for Syriac]
@@ -22,34 +22,37 @@
% BCP-47 compliant aliases
\setlanguagealias*{syriac}{syr}
-\def\syriacnumber#1{\@syriacnumber{#1}}%
+\def\syriacnumber#1{\@syriacnumber{#1}}
\newif\if@eastern@numerals
-\define@choicekey*+{syriac}{numerals}[\xpg@val\xpg@nr]{eastern,western,abjad}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@eastern@numeralstrue
- \SetLanguageKeys{syriac}{bcp47-extension-u=nu-syrc}%
- \or
- % western:
- \@eastern@numeralsfalse
- \SetLanguageKeys{syriac}{bcp47-extension-u=nu-latn}%
- \or
- % abjad:
- \let\syriacnumber\abjadsyriac%
- \fi
- \xpg@info{Option: Syriac, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Syriac numerals option `#1'}}
-
\newif\ifsyriac@customsep\syriac@customsepfalse
\def\xpg@sepmark{}
-\define@key{syriac}{sectionsep}[.]{%
- \syriac@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
+
+\DeclareKeys[polyglossia/gloss/syriac]
+ {
+ sectionsep.code = \gdef\xpg@sepmark{#1}\syriac@customseptrue,
+ sectionsep.default:n = .,
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@eastern@numeralstrue
+ \SetLanguageKeys{syriac}{bcp47-extension-u=nu-syrc}%
+ },
+ numerals / western.code =
+ {%
+ \@eastern@numeralsfalse
+ \SetLanguageKeys{syriac}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / abjad.code =
+ {%
+ \let\syriacnumber\abjadsyriac
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Syriac numerals option `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{syriac}{numerals=western}
+\InitializeGlossOptions{syriac}{numerals=western}
%\define@key{polyglossia}{syriaclocale}[default]{%
% \def\@syriac@locale{#1}}
@@ -136,13 +139,13 @@
\IfCharIsAvailableTF{0661}%
{\@ensure@LTR{\protect\arabicdigits{\number#1}}}%
{\@ensure@LTR{\arabicdigits{\number#1}}
- \ifcsdef{arabicfont}%
- {\@ensure@LTR{\protect\arabicdigits{\number#1}}%
- \xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
- I am using \string\arabicfont instead}}%
+ \@ifundefined{arabicfont}%
{\number#1%%% <---changed from \RL{\protect\reset@font\protect\number#1}%
\xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
since \string\arabicfont is not defined, we'll use Western numerals instead}}%
+ {\@ensure@LTR{\protect\arabicdigits{\number#1}}%
+ \xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
+ I am using \string\arabicfont instead}}%
}%
\else
%%\RL{\protect\reset@font\number#1}%
@@ -180,16 +183,16 @@
}
\def\nosyriac@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\syriac@luatex@capsformat{%
%
% change chapter and part headings
\ifsyriac@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -201,7 +204,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -216,30 +219,30 @@
}
\def\nosyriac@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@syriac{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf
index 3d737cfe785..38b4a1e7ba9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-tamil.ldf}[polyglossia: module for Tamil]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf
index 25f4b29971f..dfe53caabd4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-telugu.ldf}[polyglossia: module for Telugu]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf
index ed530fbac5c..bfaa96cb1ed 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-thai.ldf}[polyglossia: module for Thai]
%% This is partly based on thai-latex for Babel:
@@ -29,19 +29,25 @@
\newif\if@thai@numerals
\def\tmp@thai{thai}
-\define@key{thai}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@thai
- \@thai@numeralstrue%
- \SetLanguageKeys{thai}{bcp47-extension-u=nu-thai}%
- \else
- \@thai@numeralsfalse%
- \SetLanguageKeys{thai}{bcp47-extension-u=nu-latn}%
- \fi
-}
+
+\DeclareKeys[polyglossia/gloss/thai]
+ {
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \@thai@numeralsfalse
+ \SetLanguageKeys{thai}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / thai.code =
+ {%
+ \@thai@numeralstrue
+ \SetLanguageKeys{thai}{bcp47-extension-u=nu-thai}%
+ },
+ numerals.default:n = arabic,
+ }
% Register default options
-\xpg@initialize@gloss@options{thai}{numerals=arabic}
+\InitializeGlossOptions{thai}{numerals=arabic}
\def\captionsthai{%
\def\refname{หนังสืออ้างอิง}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
index 70de9a9ac24..b8223fe8458 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-tibetan.ldf}[polyglossia: module for Tibetan]
%% Copyright 2013 Elie Roux
@@ -24,20 +24,18 @@
\setlanguagealias*{tibetan}{bo}
\newif\if@tibetan@numerals
-\def\tmp@tibetan{tibetan}
-\define@key{tibetan}{numerals}[tibetan]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@tibetan
- \@tibetan@numeralstrue%
- \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-tibt}%
- \else
- \@tibetan@numeralsfalse%
- \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-latn}%
- \fi%
-}
+\DeclareKeys[polyglossia/gloss/tibetan]
+ {
+ numerals.choice:,
+ numerals/tibetan.code = \@tibetan@numeralstrue
+ \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-tibt},
+ numerals/arabic.code = \@tibetan@numeralsfalse
+ \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-latn},
+ numerals.default:n = tibetan
+ }
\ifluatex
- \newluatexattribute\xpg@tibteol %
+ \newattribute\xpg@tibteol %
\directlua{polyglossia.load_tibt_eol()}%
\fi
@@ -62,7 +60,7 @@
}
% Register default options
-\xpg@initialize@gloss@options{tibetan}{numerals=tibetan}
+\InitializeGlossOptions{tibetan}{numerals=tibetan}
% some are known, but very few
% a few come from "Standardizing Tibetan Terms of Information Technology"
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
index a6784ae276b..da46f8a6dda 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-turkish.ldf}[polyglossia: module for Turkish]
\RequirePackage{hijrical}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf
index 9ec398470e3..af159166235 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-turkmen.ldf}[polyglossia: module for Turkmen]
%% Translations provided by Nazar Annagurban <nazartm at gmail dot com>
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
index 8093324dd00..65faa3e0795 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
@@ -1,8 +1,8 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ug.ldf}[polyglossia: module for ug (Uyghur)]
% BCP 47 tag for Uyghur
-\xpg@load@master@language{uyghur}
+\InheritGlossFile{uyghur}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
index bf09149725d..4a9674f2feb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ukrainian.ldf}[polyglossia: module for Ukrainian]
% Strings taken from Babel
@@ -26,51 +26,52 @@
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{ukrainian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Ukrainian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Ukrainian numerals value `#1'}}
-
-% Define some math functions
-\define@boolkey{ukrainian}[ukrainian@]{mathfunctions}[true]{}
+\DeclareKeys[polyglossia/gloss/ukrainian]
+ {
+ babelshorthands.if = ukrainian@babelshorthands,
+ babelshorthands.default:n = true,
+ mathfunctions.if = ukrainian@mathfunctions,
+ mathfunctions.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Ukrainian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{ukrainian}{numerals=arabic,mathfunctions=true}
-
-\define@boolkey{ukrainian}[ukrainian@]{babelshorthands}[true]{}
+\InitializeGlossOptions{ukrainian}{numerals=arabic,mathfunctions=true}
\ifsystem@babelshorthands
- \setkeys{ukrainian}{babelshorthands=true}
+ \SetGlossOptions{ukrainian}{babelshorthands=true}
\else
- \setkeys{ukrainian}{babelshorthands=false}
+ \SetGlossOptions{ukrainian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\ukrainian@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
index 9ca440a885c..418551d25f3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-uppersorbian.ldf}[polyglossia: module for Upper Sorbian]
% We provide this as a babel alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
index f95459e7d5b..47af125a2b7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
%%% Adapted from a file contributed by Kamal Abdali
\ProvidesFile{gloss-urdu.ldf}[polyglossia: module for Urdu]
@@ -25,52 +25,46 @@
\setlanguagealias*{urdu}{ur}
\newif\if@western@numerals
-\define@choicekey*+{urdu}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \SetLanguageKeys{urdu}{bcp47-extension-u=nu-arab}%
- \or
- % western:
- \@western@numeralstrue%
- \SetLanguageKeys{urdu}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Urdu, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Urdu numerals option `#1'}}
-
\newif\ifurdu@customsep\urdu@customsepfalse
\def\xpg@sepmark{}
-\define@key{urdu}{sectionsep}[.]{%
- \urdu@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{urdu}[urdu@]{abjadjimnotail}[true]{%
- \ifurdu@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi%
-}
-
\newif\if@hijrical
-\define@choicekey*+{urdu}{calendar}[\xpg@val\xpg@nr]{gregorian,hijri}[gregorian]{%
- \ifcase\xpg@nr\relax
- % gregorian:
- \@hijricalfalse
- \or
- % hijri:
- \@hijricaltrue
- \fi
- \xpg@info{Option: Urdu, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Urdu calendar option `#1'}}
-\define@key{urdu}{hijricorrection}[0]{%
- \gdef\urdu@hijri@correction{#1}}%
+\DeclareKeys[polyglossia/gloss/urdu]
+ {
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ sectionsep.code = \gdef\xpg@sepmark{#1}\urdu@customseptrue,
+ sectionsep.default:n = .,
+ hijricorrection.code = \gdef\urdu@hijri@correction{#1},
+ hijricorrection.default:n = 0,
+ calendar.choice:,
+ calendar / gregorian.code =
+ {%
+ \@hijricalfalse
+ },
+ calendar / hijri.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Urdu calendar option `#1'},
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ \SetLanguageKeys{urdu}{bcp47-extension-u=nu-arab}%
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \SetLanguageKeys{urdu}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Urdu numerals option `#1'}
+ }
% This should set the defaults
-\setkeys{urdu}{calendar,numerals,hijricorrection}
+\SetGlossOptions{urdu}{calendar,numerals,hijricorrection}
\def\urdugregmonth#1{\ifcase#1%
\or جنوری\or فروری\or مارچ\or اپریل\or مئی\or جون\or جولائی\or اگست\or ستمبر\or اکتوبر\or نومبر\or دسمبر\fi}
@@ -157,16 +151,16 @@
}
\def\nourdu@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\urdu@luatex@capsformat{%
%
% change chapter and part headings
\ifurdu@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -178,7 +172,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -193,30 +187,30 @@
}
\def\nourdu@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@urdu{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
index 028f7987e0d..9c33a8be580 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-usorbian.ldf}[polyglossia: module for Upper Sorbian]
% We only provide this gloss for babel compatibility. Since usorbian is
% a sorbian variety, we use 'sorbian' with variant 'upper' now.
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf
index 4d2c0bde96b..b96e21cda77 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-uyghur.ldf}[polyglossia: module for Uyghur]
%% Translations provided by Osman Tursun (Github Account: neouyghur)
@@ -22,62 +22,72 @@
\newif\if@uyghur@swapcaptions
\newif\if@uyghur@swapheadings
\newif\if@uyghur@swapheaders
-\define@choicekey*+{uyghur}{swapstrings}[\xpg@val\xpg@nr]{all,captions,headings,headers,hheaders,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@uyghur@swapcaptionstrue%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheaderstrue%
- \or
- % captions:
- \@uyghur@swapcaptionstrue%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheadersfalse%
- \or
- % headings:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheadersfalse%
- \or
- % headers:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheaderstrue%
- \or
- % hheaders:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheaderstrue%
- \or
- % none:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheadersfalse%
- \fi
- \xpg@info{Option: Uyghur, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Uyghur swapstrings value `#1'}}
-
\newif\if@uyghur@ordchapter
\newif\if@uyghur@romchapter
-\define@choicekey*+{uyghur}{chapterformat}[\xpg@val\xpg@nr]{ordinal,roman,arabic}[ordinal]{%
- \ifcase\xpg@nr\relax
- % ordinal:
- \@uyghur@ordchaptertrue%
- \@uyghur@romchapterfalse%
- \or
- % roman:
- \@uyghur@ordchapterfalse%
- \@uyghur@romchaptertrue%
- \or
- % arabic:
- \@uyghur@ordchapterfalse%
- \@uyghur@romchapterfalse%
- \fi
- \xpg@info{Option: Uyghur, chapterformat=\xpg@val}%
-}{\xpg@warning{Unknown Uyghur chapterformat value `#1'}}
+
+\DeclareKeys[polyglossia/gloss/uyghur]
+ {
+ chapterformat.choice:,
+ chapterformat / ordinal.code =
+ {%
+ \@uyghur@ordchaptertrue
+ \@uyghur@romchapterfalse
+ },
+ chapterformat / roman.code =
+ {%
+ \@uyghur@ordchapterfalse
+ \@uyghur@romchaptertrue
+ },
+ chapterformat / arabic.code =
+ {%
+ \@uyghur@ordchapterfalse
+ \@uyghur@romchapterfalse
+ },
+ chapterformat.default:n = ordinal,
+ chapterformat/unknown.code = \xpg@warning{Unknown Uyghur chapterformat value `#1'},
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@uyghur@swapcaptionstrue
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / captions.code =
+ {%
+ \@uyghur@swapcaptionstrue
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings / headings.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / hheaders.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Uyghur swapstrings value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{uyghur}{swapstrings=all,chapterformat=ordinal}
+\InitializeGlossOptions{uyghur}{swapstrings=all,chapterformat=ordinal}
\def\captionsuyghur{%
@@ -125,120 +135,104 @@
% change chapter and part headings
\if@uyghur@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
- {\the@uyghur@chapter\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
+ \@ifundefined{titleformat}{%
% With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\the@uyghur@part~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat%
- \renewcommand{\chapterformat}{\mbox{\the@uyghur@chapter%
- \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
- }{}%
- }{% (not \ifdefined\sectionformat)
+ \@ifundefined{sectionformat}{%
% With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead%
- \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
- {\chapnumfont\the@uyghur@chapter\chapternamenum\printchaptername}%
- {}%
- {\xpg@warning{Failed to patch chapter for Uyghur}}%
- }{}%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}{\printpartname \partnamenum \printpartnum}%
- {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
- {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{@makechapterhead}{%
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead%
\patchcmd{\@makechapterhead}%
{\@chapapp\space \thechapter}%
{\the@uyghur@chapter\space \@chapapp}%
{}%
{\xpg@warning{Failed to patch chapter for Uyghur}}%
- }{}%
- \ifcsdef{H@old@part}{% Hyperref
+ }%
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Uyghur}}}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref
\let\xpg@save@part@format\H@old@part%
\patchcmd{\H@old@part}%
{\partname\nobreakspace\thepart}%
{\the@uyghur@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Uyghur}}{}}%
- }{}% (end \ifdefined\@part)
}% (end not hyperref)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead%
+ \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
+ {\chapnumfont\the@uyghur@chapter\chapternamenum\printchaptername}%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Uyghur}}%
+ }%
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
+ {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }{% Hyperref
+ \let\xpg@save@part@format\H@old@part%
+ \patchcmd{\H@old@part}{\printpartname \partnamenum \printpartnum}%
+ {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\the@uyghur@part~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat%
+ \renewcommand{\chapterformat}{\mbox{\the@uyghur@chapter%
+ \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }{% Hyperref
+ \let\xpg@save@part@format\H@old@part%
+ \patchcmd{\H@old@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+ {\the@uyghur@chapter\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+ }%
}% (end \ifdefined\titleformat)
\fi% (end \if@uyghur@swapheadings)
%
% Change running headers
\if@uyghur@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat%
- \renewcommand*\chaptermarkformat{%
- \the@uyghur@chapter\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark%
- \renewcommand*\chaptermark[1]{%
- \markboth{\memUChead{%
- \ifnum \c@secnumdepth >\m@ne
- \ifbool{@mainmatter}{%
- \the@uyghur@chapter\ \@chapapp\ %
- }{}%
- \fi
- ##1}}{}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter.}%
{\let\xpg@save@chaptermark@format\chaptermark%
@@ -248,21 +242,38 @@
{}%
{\xpg@warning{Failed to patch chaptermark for Uyghur}}}%
{}%
- }{}% (end \ifdefined\sectionmark)
- \ifcsdef{sectionmark}{%
- \ifpatchable{\sectionmark}%
- {\thesection.}%
- {\let\xpg@save@sectionmark@format\sectionmark%
- \patchcmd{\sectionmark}%
- {\thesection.}%
- {\thesection}%
- {}%
- {\xpg@warning{Failed to patch sectionmark for Uyghur}}}%
- {}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\sectionmark)
+ \@ifundefined{sectionmark}{}{%
+ \ifpatchable{\sectionmark}%
+ {\thesection.}%
+ {\let\xpg@save@sectionmark@format\sectionmark%
+ \patchcmd{\sectionmark}%
+ {\thesection.}%
+ {\thesection}%
+ {}%
+ {\xpg@warning{Failed to patch sectionmark for Uyghur}}%
+ }%
+ {}%
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark%
+ \renewcommand*\chaptermark[1]{%
+ \markboth{\memUChead{%
+ \ifnum \c@secnumdepth >\m@ne
+ \ifbool{@mainmatter}{%
+ \the@uyghur@chapter\ \@chapapp\ %
+ }{}%
+ \fi
+ ##1}}{}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat%
+ \renewcommand*\chaptermarkformat{%
+ \the@uyghur@chapter\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
}% (end \ifdefined\chapterformat)
- \fi% (end \if@uyghur@swapheaders)
+ \fi% (end \if@uyghur@swapheaders)
}
\def\nouyghur@capsformat{%
@@ -272,62 +283,62 @@
\let\fnum@figure\xpg@save@fnum@figure%
%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{H@old@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\H@old@part\xpg@save@part@format%
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{H@old@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\H@old@part\xpg@save@part@format%
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format%
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format%
- }{}%
- }{}% (end \ifdefined\chaptermark)
- \ifcsdef{sectionmark}{%
- \ifcsdef{xpg@save@sectionmark@format}{%
+ }%
+ }% (end \ifdefined\chaptermark)
+ \@ifundefined{sectionmark}{}{%
+ \@ifundefined{xpg@save@sectionmark@format}{}{%
\let\sectionmark\xpg@save@sectionmark@format%
- }{}%
- }{}% (end \ifdefined\sectionmark)
+ }%
+ }% (end \ifdefined\sectionmark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format%
+ }%
}% (end \ifdefined\chapterformat)
}
@@ -363,22 +374,22 @@
\let\the@uyghur@chapter\thechapter
\def\uyghur@chapterformat{%
- \ifcsdef{part}{%
+ \@ifundefined{part}{}{%
\if@uyghur@ordchapter%
\renewcommand{\the@uyghur@part}{\uyghurord{part}}%
\fi%
\if@uyghur@romchapter%
\renewcommand{\the@uyghur@part}{\Roman{part}}%
\fi%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\if@uyghur@ordchapter%
\renewcommand{\the@uyghur@chapter}{\uyghurord{chapter}}%
\fi%
\if@uyghur@romchapter%
\renewcommand{\the@uyghur@chapter}{\Roman{chapter}}%
\fi%
- }{}%
+ }%
}
\def\uyghur@numbers{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf
index d223d38d3a2..3689b48112f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-vietnamese.ldf}[polyglossia: module for Vietnamese]
%% Strings contributed by Daniel Owens < dhowens . pmbx . net >
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf
index 5b68cfa9d9c..81174769141 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-welsh.ldf}[polyglossia: module for Welsh]
@@ -15,21 +15,26 @@
% BCP-47 compliant aliases
\setlanguagealias*{welsh}{cy}
-\providebool{welsh@formaldate}
+\@ifundefined{ifwelsh@formaldate}%
+ {\newif\ifwelsh@formaldate}{}
-\define@choicekey*+{welsh}{date}[\xpg@val\xpg@nr]{long,short}[short]{%
- \ifcase\xpg@nr\relax
- % long:
- \welsh@formaldatetrue
- \or
- % accented:
- \welsh@formaldatefalse
- \fi
- \xpg@info{Option: Welsh, date=\xpg@val}%
-}{\xpg@warning{Unknown date value `#1'}}
+\DeclareKeys[polyglossia/gloss/welsh]
+ {
+ date.choice:,
+ date / long.code =
+ {%
+ \welsh@formaldatetrue
+ },
+ date / short.code =
+ {%
+ \welsh@formaldatefalse
+ },
+ date.default:n = short,
+ date/unknown.code = \xpg@warning{Unknown date value `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{welsh}{date=short}
+\InitializeGlossOptions{welsh}{date=short}
\def\captionswelsh{%
\def\refname{Cyfeiriadau}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
index 13a85e1f67e..2e99abca24d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-zh-CN.ldf}[polyglossia: module for zh-CN (Chinese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{chinese}
+\InheritGlossFile{chinese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
index 10792a0d386..0b907e2a4e1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-zh-TW.ldf}[polyglossia: module for zh-TW (Chinese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{chinese}
+\InheritGlossFile{chinese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
index c949624724e..679d2bfe6dd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
@@ -73,7 +73,7 @@
\ifnum#1<5000
\Hebrewnumeral{#1}%
\else
- \ifnum#1<6000 % current millenium, print without thousands
+ \ifnum#1<6000 % current millennium, print without thousands
\@tempcnta=#1\relax
\if@xpg@hebrew@fullyear\else\advance\@tempcnta by -5000\fi
\Hebrewnumeral{\@tempcnta}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty b/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty
index 79da8d0020b..2d396f5f71c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty
@@ -16,7 +16,7 @@ l3calc. Please update expl3!
\@ifundefined{@Remainder}{\input{cal-util.def}}{}
%% The following functions are straightforward implementation
-%% of Reingold & Dershowitz, Calendrical Calculations, The Millenium Edition
+%% of Reingold & Dershowitz, Calendrical Calculations, The Millennium Edition
%%
\def\@FixedFromHijri#1#2#3#4{% year,month,day,counter
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-korean.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua
index 59ec736b49d..7102dc0cf37 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-korean.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua
@@ -1,6 +1,6 @@
--
--- polyglossia-korean.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- polyglossia-cjk-spacing.lua
+-- part of polyglossia v2.2 -- 2024/07/15
--
local glyph_id = node.id"glyph"
@@ -8,13 +8,17 @@ local hbox_id = node.id"hlist"
local vbox_id = node.id"vlist"
local glue_id = node.id"glue"
local penalty_id = node.id"penalty"
-local disc_id = node.id"disc"
+local whatsit_id = node.id"whatsit"
+local math_id = node.id"math"
--
--- attr_korean: variant = plain (0), classic (1), modern (2)
+-- attr_cjk: variant = plain: 0, JP/classic: 1, KR/modern: 2, SC: 3, TC: 4
--
-local attr_korean = luatexbase.attributes["xpg@attr@korean"]
-local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
+local attr_cjk = luatexbase.attributes["xpg@attr@cjkspacing"]
+--
+-- attr_josa: ONLY For Korean. DO NOT declare \newattribute for other langs
+--
+local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
--
-- characters after which linebreak is not allowed
@@ -63,9 +67,9 @@ local nobr_after = {
-- characters before which linebreak is not allowed
-- (currently, not much differences among the followings)
-- 1: normal chars
--- 2: hangul jamo vowels and trailing consonants
+-- 2: hangul jamo vowels and trailing consonants plus combinings
-- 3: kana small letters
--- 0: dashes (supress visible spacing)
+-- 0: dashes (suppress visible spacing after this char)
--
local nobr_before = setmetatable({
[0x21] = 1, -- ! EXCLAMATION MARK
@@ -76,7 +80,7 @@ local nobr_before = setmetatable({
[0x2D] = 0, -- - HYPHEN-MINUS
[0x2E] = 1, -- . FULL STOP
[0x2F] = 0, -- / SOLIDUS
- [0x3A] = 0, -- : COLON
+ [0x3A] = 1, -- : COLON
[0x3B] = 1, -- ; SEMICOLON
[0x3E] = 1, -- > GREATER-THAN SIGN
[0x3F] = 1, -- ? QUESTION MARK
@@ -88,11 +92,11 @@ local nobr_before = setmetatable({
[0xBB] = 1, -- » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
[0x2013] = 0, -- – EN DASH
[0x2014] = 0, -- — EM DASH
- [0x2015] = 1, -- ― HORIZONTAL BAR
+ [0x2015] = 0, -- ― HORIZONTAL BAR
[0x2019] = 1, -- ’ RIGHT SINGLE QUOTATION MARK
[0x201D] = 1, -- ” RIGHT DOUBLE QUOTATION MARK
- [0x2025] = 1, -- ‥ TWO DOT LEADER
- [0x2026] = 1, -- … HORIZONTAL ELLIPSIS
+ [0x2025] = 0, -- ‥ TWO DOT LEADER
+ [0x2026] = 0, -- … HORIZONTAL ELLIPSIS
[0x232A] = 1, -- 〉 RIGHT-POINTING ANGLE BRACKET
[0x3001] = 1, -- 、 IDEOGRAPHIC COMMA
[0x3002] = 1, -- 。 IDEOGRAPHIC FULL STOP
@@ -124,10 +128,10 @@ local nobr_before = setmetatable({
[0x308E] = 3, -- ゎ HIRAGANA LETTER SMALL WA
[0x3095] = 3, -- ゕ HIRAGANA LETTER SMALL KA
[0x3096] = 3, -- ゖ HIRAGANA LETTER SMALL KE
- [0x3099] = 1, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309A] = 1, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
- [0x309B] = 1, -- ゛ KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309C] = 1, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x3099] = 2, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309A] = 2, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x309B] = 2, -- ゛ KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309C] = 2, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
[0x309D] = 1, -- ゝ HIRAGANA ITERATION MARK
[0x309E] = 1, -- ゞ HIRAGANA VOICED ITERATION MARK
[0x30A0] = 1, -- ゠ KATAKANA-HIRAGANA DOUBLE HYPHEN
@@ -147,9 +151,9 @@ local nobr_before = setmetatable({
[0x30FC] = 1, -- ー KATAKANA-HIRAGANA PROLONGED SOUND MARK
[0x30FD] = 1, -- ヽ KATAKANA ITERATION MARK
[0x30FE] = 1, -- ヾ KATAKANA VOICED ITERATION MARK
- [0xFE30] = 1, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
- [0xFE31] = 1, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
- [0xFE32] = 1, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
+ [0xFE30] = 0, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
+ [0xFE31] = 0, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
+ [0xFE32] = 0, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
[0xFE36] = 1, -- ︶ PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
[0xFE38] = 1, -- ︸ PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
[0xFE3A] = 1, -- ︺ PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
@@ -176,18 +180,18 @@ local nobr_before = setmetatable({
[0xFF63] = 1, -- 」 HALFWIDTH RIGHT CORNER BRACKET
[0xFF64] = 1, -- 、 HALFWIDTH IDEOGRAPHIC COMMA
[0xFF65] = 1, -- ・ HALFWIDTH KATAKANA MIDDLE DOT
- [0xFF9E] = 1, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
- [0xFF9F] = 1, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+ [0xFF9E] = 2, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
+ [0xFF9F] = 2, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
}, { __index = function(_,c)
if c >= 0x1160 and c <= 0x11FF then return 2 end
if c >= 0xD7B0 and c <= 0xD7FF then return 2 end
- if c >= 0x302A and c <= 0x302F then return 1 end
+ if c >= 0x302A and c <= 0x302F then return 2 end -- tone marks
if c >= 0x31F0 and c <= 0x31FF then return 3 end
if c >= 0xFF67 and c <= 0xFF70 then return 3 end
- if c >= 0xFE00 and c <= 0xFE0F then return 1 end
+ if c >= 0xFE00 and c <= 0xFE0F then return 2 end -- variation selectors
if c >= 0xFE10 and c <= 0xFE19 and not (c == 0xFE17) then return 1 end
if c >= 0xFE50 and c <= 0xFE58 then return 1 end
- if c >= 0xE0100 and c <= 0xE01EF then return 1 end
+ if c >= 0xE0100 and c <= 0xE01EF then return 2 end -- variation selecters
end
})
@@ -205,6 +209,7 @@ local function is_cjk (c)
or c >= 0xFF00 and c <= 0xFFEF
or c >= 0x1F100 and c <= 0x1F2FF
or c >= 0x20000 and c <= 0x2FA1F
+ or c >= 0x30000 and c <= 0x323AF
or nobr_after[c] and c > 0x2014
or nobr_before[c] and c > 0x2014
end
@@ -244,8 +249,28 @@ local charclass = setmetatable({
}, { __index = function() return 0 end })
--
+-- get character class
+-- var : variant = plain, JP/classic, KR/modern, SC, TC
+-- c : codepoint
+--
+local function get_charclass (var, c)
+ if var < 3 then
+ return charclass[c]
+ elseif var == 3 then
+ -- SC : these are left aligned
+ return (c == 0xFF01 or c == 0xFF1F) and 4 -- FULLWIDTH EXCLAMATION/QUESTION MARK
+ or (c == 0xFF1A or c == 0xFF1B) and 2 -- FULLWIDTH COLON/SEMICOLON
+ or charclass[c]
+ end
+ -- TC : these are center aligned
+ return (c == 0x3001 or c == 0xFF0C) and 3 -- IDEOGRAPHIC/FULLWIDTH COMMA
+ or (c == 0x3002 or c == 0xFF0E) and 3 -- IDEOGRAPHIC/FULLWIDTH FULL STOP -- 5 ?
+ or charclass[c]
+end
+
+--
-- table for spacing between char classes
--- 1 stands for 0.5*fontsize when variant=classic
+-- 1 stands for 0.5*fontsize when variant = JP/classic or SC or TC
--
local intercharclass = { [0] =
{ [0] = nil, {1,1}, nil, {.5,.5} },
@@ -277,7 +302,7 @@ end
--
-- return 0.5*fontsize of given fontid
--- space: true if variant=modern; then 0.5*interword_space
+-- space: true if variant=KR/modern; then 0.5*interword_space
--
local function get_font_size (fid, space)
local size = font.getparameters(fid)
@@ -291,7 +316,7 @@ end
--
-- charclass 1 thru 4 will be packed in \hbox to 0.5em{\hss? curr \hss?}
--- when variant=classic/modern
+-- when variant ~= plain
--
local function glyph_to_box (head, curr, class)
local g, h = curr
@@ -320,7 +345,7 @@ end
--
-- insert spacing defined as charclass[a][b] between a and b
-- f: fontid
--- var: variant = plain, classic, modern
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
-- cc: charclass of current char
-- nc: charclass of next char
-- nobr: linebreak is not allowed
@@ -339,12 +364,16 @@ end
--
-- insert inter-character spacing in other normal cases
--- f: fontid
--- var: variant = plain, classic, modern
--- x: true between cjk and non-cjk (a little more spacing)
+-- f: fontid
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
+-- nobr: no linebreak
+-- x: true between cjk and non-cjk (a little more spacing)
--
-local function insert_penalty_glue (head, curr, f, var, x)
- if var ~= 1 then
+local function insert_penalty_glue (head, curr, f, var, nobr, x)
+ if nobr then
+ local penalty = get_new_penalty(10000)
+ head, curr = node.insert_after(head, curr, penalty)
+ elseif var == 0 or var == 2 then
local penalty = get_new_penalty(50)
head, curr = node.insert_after(head, curr, penalty)
end
@@ -360,53 +389,64 @@ end
--
-- main process for linebreak and inter-character spacing
--- lb: true if pre_linebreak_filter
--
-local function korean_break (head, lb)
+local function cjk_break (head)
local curr = head
while curr do
- if curr.id == glyph_id then
- local var = node.has_attribute(curr, attr_korean)
+ if attr_cjk and (curr.id == glyph_id or curr.id == math_id and curr.subtype == 1) then
+ local var = node.has_attribute(curr, attr_cjk)
if var then
- local c, f = curr.char or 0, curr.font or 0
- local cc, cjkc = charclass[c], is_cjk(c)
+ local c, f = curr.char or 0, curr.font
+ local cc, cjkc = get_charclass(var, c), is_cjk(c)
-- compress cjk punctuations when charclass is 1 thru 4
if var > 0 and cc > 0 and cc < 5 then
head, curr = glyph_to_box(head, curr, cc)
end
- local next = curr.next
- if next and next.id == glyph_id then
+ local next = node.getnext(curr)
+ while next and next.id == whatsit_id do -- skip whatsit nodes
+ curr, next = next, node.getnext(next)
+ end
+
+ if next and (next.id == glyph_id or next.id == math_id and next.subtype == 0) then
local n = next.char or 0
- local nc = charclass[n]
+ f = f or next.font or 0 -- in case of curr == math_off
+
+ -- skip combining. or dash+dash case to suppress stretching
+ if nobr_before[n] == 2 or (nobr_before[c] == 0 and nobr_before[n] == 0) then
+ goto skip_combining
+ end
+
+ local nc = get_charclass(var, n)
local nobr = nobr_before[n] or nobr_after[c]
-- insert spacing as of intercharclass
if var > 0 and intercharclass[cc][nc] then
head, curr = insert_cjk_penalty_glue(head, curr, f, var, cc, nc, nobr)
- -- or insert spacing when linebreak is allowed
- elseif not nobr then
+ else
local cjkn = is_cjk(n)
-- if curr or next is cjk char
if cjkc or cjkn then
- -- if between cjk and non-cjk
- if var > 0 and not (cjkc and cjkn) and nobr_before[c] ~= 0 then
- head, curr = insert_penalty_glue(head, curr, f, var, true)
+ -- plain variant / cjk+cjk / nobr cjk+noncjk / after dash
+ -- : insert a 0pt glue
+ if var == 0 or (cjkc and cjkn) or nobr or nobr_before[c] == 0 then
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr)
- -- or under pre_linebreak_filter
- elseif lb then
- head, curr = insert_penalty_glue(head, curr, f, var)
+ -- other cases: insert a small glue
+ else
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr, true)
end
end
end
end
end
end
- curr = curr.next
+ ::skip_combining::
+ curr = node.getnext(curr)
end
return head
end
@@ -420,7 +460,7 @@ end
local function reorder_tm (head)
local curr, tone = node.slide(head)
while curr do
- if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
+ if curr.id == glyph_id and node.has_attribute(curr, attr_cjk) then
local f = font.getfont(curr.font) or font.fonts[curr.font]
if f and f.hb then -- harfbuzz do the right thing
tone = nil
@@ -436,7 +476,7 @@ local function reorder_tm (head)
end
end
end
- curr = curr.prev
+ curr = node.getprev(curr)
end
return head
end
@@ -523,7 +563,7 @@ local function get_prev_char (p)
local pc = get_prev_char(node.slide(p.head))
if pc then return pc end
end
- p = p.prev
+ p = node.getprev(p)
end
end
@@ -538,10 +578,10 @@ local function auto_josa (head)
if josa then
local cc = curr.char or 0
if josa == 0 then
- josa = josa_code[get_prev_char(curr.prev) or 0x30]
+ josa = josa_code[get_prev_char(node.getprev(curr)) or 0x30]
end
if cc == 0xC774 then
- local n = curr.next
+ local n = node.getnext(curr)
if n and n.char and n.char >= 0xAC00 and n.char <= 0xD7A3 then
else
cc = 0xAC00
@@ -560,7 +600,7 @@ local function auto_josa (head)
node.unset_attribute(curr, attr_josa)
end
end
- curr = curr.next
+ curr = node.getnext(curr)
end
for _,v in ipairs(tofree) do node.free(v) end
return head
@@ -571,39 +611,13 @@ end
-- As char value of glyphs can be changed by opentype GSUB process,
-- we have to occupy the first position among callback functions.
--
-local prepend_to_callback
-if luatexbase.base_add_to_callback then
- prepend_to_callback = function(name, func, desc)
- luatexbase.add_to_callback(name, func, desc, 1)
- end
-else
- prepend_to_callback = function(name, func, desc)
- local t = { {func, desc} }
- for _,v in ipairs(luatexbase.callback_descriptions(name)) do
- table.insert(t, {luatexbase.remove_from_callback(name, v)})
- end
- for _,v in ipairs(t) do
- luatexbase.add_to_callback(name, v[1], v[2])
- end
- end
-end
-
-prepend_to_callback ("pre_linebreak_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head, true)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
-
-prepend_to_callback ("hpack_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
+luatexbase.add_to_callback( "pre_shaping_filter",
+function(head)
+ if attr_josa then head = auto_josa(head) end
+ head = cjk_break(head)
+ if attr_josa then head = reorder_tm(head) end
+ return head
+end,
+"polyglossia.lang_cjk_spacing")
-- vim:ft=lua:tw=0:sw=4:ts=4:expandtab
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua
index c2a1a27bebe..d0257e93720 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua
index 982f6ba8d4f..844d11cb5ac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-latin.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
index 99e538b1613..d8cfa89e5fa 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
@@ -1,13 +1,12 @@
--
-- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
-local remove_from_callback = luatexbase.remove_from_callback
-local priority_in_callback = luatexbase.priority_in_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local new_attribute = luatexbase.new_attribute
local node = node
@@ -331,13 +330,16 @@ local function activate(lang)
-- important to be able to intermix languages with different spacings
-- in one paragraph.
tex.setattribute(punct_attr, id)
- for _, callback_name in ipairs{ "pre_linebreak_filter", "hpack_filter" } do
- if not priority_in_callback(callback_name, "polyglossia-punct.process") then
- add_to_callback(callback_name, process, "polyglossia-punct.process", 1)
- end
- end
end
+add_to_callback("pre_linebreak_filter",process,"polyglossia-punct.process")
+add_to_callback("hpack_filter",process,"polyglossia-punct.process")
+declare_callback_rule("pre_linebreak_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+declare_callback_rule("hpack_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+
+
local function deactivate()
tex.setattribute(punct_attr, -0x7FFFFFFF) -- this value means "unset"
-- Though it would make compilation slightly faster, it is not possible to
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua
index 61b891ac283..7a2b84270db 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-sanskrit.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
index 8247e2deb33..d51a594de3f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
@@ -1,30 +1,28 @@
--
-- polyglossia-tibt.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
local remove_from_callback = luatexbase.remove_from_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local priority_in_callback = luatexbase.priority_in_callback
local next, type = next, type
-
-local nodes, fonts, node = nodes, fonts, node
-
-local nodecodes = nodes.nodecodes --- <= preloaded node.types()
+local node = node
local insert_node_before = node.insert_before
local insert_node_after = node.insert_after
-local remove_node = nodes.remove
+local remove_node = node.remove
local copy_node = node.copy
local has_attribute = node.has_attribute
local end_of_math = node.end_of_math
if not end_of_math then -- luatex < .76
local traverse_nodes = node.traverse_id
- local math_code = nodecodes.math
+ local math_code = node.id('math_char')
local end_of_math = function (n)
for n in traverse_nodes(math_code, n.next) do
return n
@@ -32,10 +30,10 @@ if not end_of_math then -- luatex < .76
end
end
--- node types as of April 2013
-local glyph_code = nodecodes.glyph
-local penalty_code = nodecodes.penalty
-local kern_code = nodecodes.kern
+-- node types as of April 2024
+local glyph_code = node.id('glyph')
+local penalty_code = node.id('penalty')
+local kern_code = node.id('kern')
-- we make a new node, so that we can copy it later on
local penalty_node = node.new(penalty_code)
@@ -66,7 +64,6 @@ local function process(head)
end
end
elseif id == math_code then
- -- warning: this is a feature of luatex > 0.76
start = end_of_math(start) -- weird, can return nil .. no math end?
end
if start then
@@ -79,15 +76,13 @@ end
local callback_name = "pre_linebreak_filter"
local function activate()
- if not priority_in_callback (callback_name, "polyglossia-tibt.process") then
- add_to_callback(callback_name, process, "polyglossia-tibt.process", 1)
- end
+ add_to_callback(callback_name, process, "polyglossia-tibt.process")
+ declare_callback_rule(callback_name,
+ "polyglossia-tibt.process", "before", "luaotfload.node_processor")
end
local function desactivate()
- if priority_in_callback (callback_name, "polyglossia-tibt.process") then
- remove_from_callback(callback_name, "polyglossia-tibt.process")
- end
+ remove_from_callback(callback_name, "polyglossia-tibt.process")
end
polyglossia.activate_tibt_eol = activate
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua
index c07d8d9ac49..5f346bef767 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua
@@ -1,6 +1,6 @@
--
-- polyglossia.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
local module_name = "polyglossia"
@@ -76,7 +76,7 @@ local function newloader(langentry)
end
-- language info will be written into the .log file
- local s = { "Language data for " .. langentry }
+ local s = { }
for k, v in pairs(langdata) do
if type(v) == 'table' then -- for 'synonyms'
s[#s+1] = k .. "\t" .. table.concat(v,',')
@@ -84,7 +84,10 @@ local function newloader(langentry)
s[#s+1] = k .. "\t" .. tostring(v)
end
end
- log_info(table.concat(s,"\n"))
+ local a = {}
+ for _,n in pairs(s) do table.insert(a, n) end
+ table.sort(a)
+ log_info("Language data for " .. langentry .. "\n" .. table.concat(a,"\n"))
--
-- LaTeX's \newlanguage increases language register (count19),
@@ -94,7 +97,7 @@ local function newloader(langentry)
-- this possible situation, our newloader() function will
-- unfortunately overwrite the language \lang@xyz.
--
- -- Threfore here we will compare LaTeX's \newlanguage number with
+ -- Therefore here we will compare LaTeX's \newlanguage number with
-- LuaTeX's lang.new() id and select the bigger one for our new
-- language object. Also we will update LaTeX's language register
-- by this new id, so that another possible \newlanguage should not
@@ -109,7 +112,7 @@ local function newloader(langentry)
local newlangid = math.max(langcnt, langid)
-- set language register for possible \newlanguage
tex.setcount('global', lang_register, newlangid)
- -- get new lang object if needeed
+ -- get new lang object if needed
if langid ~= newlangid then
langobject = lang.new(newlangid)
end
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
index 20f6538d448..a8d0c57b540 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
@@ -1,32 +1,27 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage
- {polyglossia} {2024/03/07} {v2.1}
+ {polyglossia} {2024/07/15} {v2.2}
{Modern multilingual typesetting with XeLaTeX and LuaLaTeX}
+% TODO Handle remaining uses in the gloss files (\patchcmd)
+% and remove package call afterwards
\RequirePackage{etoolbox}
-\RequirePackage{xkeyval}[2008/08/13]
% Will raise error if used with anything else than XeTeX or LuaTeX
\RequirePackage{fontspec}[2010/06/08]% v2.0
\RequirePackage{iftex}
\prg_generate_conditional_variant:Nnn \clist_if_in:Nn {Ne} {TF, T, F} % check if needed
-% correct a bug in tracklang
-\AddToHook{package/tracklang/after}{%
- \IfPackageAtLeastTF{tracklang}{2019/08/30}
- {}
- {\cs_gset_eq:NN \AddTrackedLangage \AddTrackedLanguage}
-}
-
%% The following is for compatibility with Babel-aware package:
% \languageshorthands is provided by babelsh.def, which is
% only loaded by some glosses, but some classes presuppose
% it is there generally. So let's provide a stub:
\ProvideDocumentCommand \languageshorthands { m } {}
% These have to be provided at the end of the preamble
-\AddToHook{begindocument/before}{
- \cs_gset_eq:NN \bbl@set@language \xpg@set@language@aux % for biblatex
- \cs_gset_eq:NN \bbl@main@language \xpg@main@language % for biblatex
+\hook_gput_code:nnn {begindocument/before} {.}
+{
+ \cs_gset_eq:NN \bbl@set@language \xpg_set_language_aux:nn % for biblatex
+ \cs_gset_eq:NN \bbl@main@language \xpg_main_language_tl % for biblatex
\ProvideDocumentCommand \texorpdfstring { m m } { #1 } % dummy command if hyperref is not loaded
}
@@ -35,16 +30,15 @@
%% \l@nohyphenation is defined in polyglossia.lua
\sys_if_engine_luatex:TF
{
- \RequirePackage{luatexbase} % already included by fontspec, but needed here
- \RequireLuaModule{polyglossia}
+ \lua_load_module:n{polyglossia}
}{
\cs_if_free:cT { l@nohyphenation }
{ \chardef\l@nohyphenation=255 }
}
-% Which version of XeTeX do we use? What is the boudary class? 4095 or 255
+% Which version of XeTeX do we use? What is the boundary class? 4095 or 255
\cs_if_exist:cTF { e@alloc@intercharclass@top }
- { \let\xpg@boundaryclass=\e@alloc@intercharclass@top }
+ { \cs_gset_eq:NN \xpg@boundaryclass \e@alloc@intercharclass@top }
{ \chardef\xpg@boundaryclass=\@cclv }
% Useful for getting list of loaded languages and variants. Like babel's bbl@loaded
@@ -80,18 +74,18 @@
\cs_new_nopar:Nn \__xpg_at_begin_document:
{
% save various command
- \let\latin@alph\@alph % TODO rename when we have the C locale
- \let\latin@Alph\@Alph % TODO rename when we have the C locale
+ \cs_gset_eq:cc{latin@alph}{@alph}% TODO rename when we have the C locale
+ \cs_gset_eq:cc{latin@Alph}{@Alph}% TODO rename when we have the C locale
% push to C language gloss
- \let\polyglossia@Clang@@arabic\@arabic
- \let\polyglossia@Clang@arabic\arabic
+ \cs_gset_eq:cc{xpg_Clang_arabic}{@arabic}
\xpg_initial_setup:
% apply \familydefault changes
- \xpg@set@familydefault
+ \xpg_set_familydefault:
}
-\AddToHook{begindocument}{
+\hook_gput_code:nnn {begindocument} {.}
+{
\__xpg_at_begin_document:
}
@@ -99,7 +93,8 @@
% loaded after \set[main|other]language
% Track whether the main language has been set
\bool_new:N \g_xpg_main_lang_set_bool
-\AddToHook{begindocument/end}{
+\hook_gput_code:nnn {begindocument/end} {.}
+{
% now we have the C locale definition: select the language
\__xpg_at_begin_document_selectlanguage:
\bool_gset_true:N \g_xpg_main_lang_set_bool
@@ -107,99 +102,177 @@
\__xpg_at_begin_document_hyphenation:
}
-%% custom message macros
-\providecommand*{\xpg@error}[1]{
- \PackageError{polyglossia}{#1}{}
+%
+% MESSAGES
+%
+
+% message templates
+\msg_new:nnn { polyglossia } { general } { #1 }
+
+\msg_new:nnn { polyglossia } { languagenotloaded }
+{
+ The~ language~ #1~ is~ not~ loaded.~ You~ must~ load~ it~ in~ order~ to~ use~ it.
}
+\msg_redirect_name:nnn { polyglossia } { languagenotloaded } { critical }
-\providecommand*{\xpg@warning}[1]{
- \PackageWarning{polyglossia}{#1}
+\msg_new:nnn { polyglossia } { languagenolongerloaded }
+{
+ The~ language~ #1~ is~ no~ longer~ loaded.~ Please~ rerun~ LaTeX.
}
+\msg_redirect_name:nnn { polyglossia } { languagenolongerloaded } { warning }
-\providecommand*{\xpg@info}[1]{
- \PackageInfo{polyglossia}
- {#1\@gobble}
-} %% the \@gobble is to prevent displaying the line nr
+\msg_new:nnn { polyglossia } { unknownlocalnumeral }
+{
+ Unknown~ key~ "#1"~ in~ \string\localnumeral.
+}
-%TODO change all instances of \xpg@nopatterns in gloss-*.ldf files
-\providecommand*{\xpg@nopatterns@fallback}[2][nohyphenation]{
- \xpg@warning{No~ hyphenation~ patterns~ were~ loaded~ for~ `#2'\MessageBreak
- I~ will~ use~ \string\language=\string\l@ #1\space instead}
- \expandafter\adddialect\csname l@#2\expandafter\endcsname\csname l@#1\endcsname\relax}
+\msg_new:nnn { polyglossia } { localnumeralemptyvalue }
+{
+ Keys~ of~ \string\localnumeral~ must~ have~ a~ value.
+}
-\providecommand*{\xpg@nopatterns}[1]{
- \xpg@warning{No~ hyphenation~ patterns~ were~ loaded~ for~ `#1'\MessageBreak
- I~ will~ use~ \string\language=\string\l@nohyphenation\space instead}
- %%TODO? \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax
- }
+\msg_new:nnn { polyglossia } { illvalue }
+{
+ Illegal~ value~ (#1)~ for~ #2!
+}
-\def\xpg@ill@value#1#2{
- \xpg@warning{Illegal~ value~ (#1)~ for~ #2}}
+\msg_new:nnn { polyglossia } { illarg }
+{
+ Invalid~ argument~ (#1)~ for~ #2!
+}
-% error out if lang is not loaded
-\cs_new_nopar:Nn \xpg_error_if_lang_not_loaded:n
+\msg_new:nnn { polyglossia } { nopatterns }
{
- \seq_if_in:NeF \__xpg_langs_loaded {#1}
- {
- \xpg@error{language~ #1~ is~ not~ loaded.~ Please~ load~ it~ before~ using~ it.}
- }
+ No~ hyphenation~ patterns~ were~ loaded~ for~ `#2' \iow_newline:
+ I~ will~ use~ \string\language=\string\l@ #1\space instead.
}
-\msg_new:nnn { polyglossia } { languagenotloaded }
+\msg_new:nnn { polyglossia } { undefcmd }
{
- The~ language~ #1~ is~ not~ loaded.~ You~ should~ load~ it.
+ \tl_to_str:N {#1} ~ is~ not~ defined!
}
-\msg_redirect_name:nnn { polyglossia } { languagenotloaded } { critical }
-\msg_new:nnn { polyglossia } { languagenolongerloaded }
+%% custom message macros
+\cs_new_nopar:Nn \xpg_error_msg:n
{
- The~ language~ #1~ is~ no~ longer~ loaded.~ Please~ rerun~ LaTeX.
+ \exp_args:Nnne \msg_error:nnn { polyglossia } { general } { #1 }
}
-\msg_redirect_name:nnn { polyglossia } { languagenolongerloaded } { warning }
-\msg_new:nnn { polyglossia } { unknownlocalnumeral }
+\cs_new_nopar:Nn \xpg_warning_msg:n
{
- Unknown~ key~ "#1"~ in~ \string\localnumeral.
+ \exp_args:Nnne \msg_warning:nnn { polyglossia } { general } { #1 }
}
-\msg_new:nnn { polyglossia } { localnumeralemptyvalue }
+\cs_new_nopar:Nn \xpg_info_msg:n
{
- Keys~ of~ \string\localnumeral~ must~ have~ value.
+ \exp_args:Nnne \msg_info:nnn { polyglossia } { general } { #1 }
}
+\cs_new_nopar:Nn \xpg_no_patterns_msg:n
+{
+ \msg_warning:nnnn { polyglossia } { nopatterns } { nohyphenation } { #1 }
+}
+
+\cs_new_nopar:Nn \xpg_ill_value_msg:nn
+{
+ \msg_warning:nnnn { polyglossia } { illvalue } { #1 } { #2 }
+}
+
+\cs_new_nopar:Nn \xpg_ill_arg_msg:nn
+{
+ \msg_error:nnnn { polyglossia } { illarg } { #1 } { #2 }
+}
+
+% error out if lang is not loaded
+\cs_new_nopar:Nn \xpg_error_if_lang_not_loaded:n
+{
+ \seq_if_in:NeF \__xpg_langs_loaded {#1}
+ {
+ \msg_error:nnn { polyglossia } { languagenotloaded } { #1 }
+ }
+}
%% use macro if defined, else warn that it is not
\cs_new_nopar:Nn \__xpg_use_or_warn:N
{
\cs_if_exist_use:NF {#1}
{
- \xpg@warning { \tl_to_str:N {#1} ~ is~ not~ defined }
+ \msg_error:nnn { polyglossia } { undefcmd } { #1 }
}
}
\cs_generate_variant:Nn \__xpg_use_or_warn:N {c}
+% gloss message interface
+\cs_set_eq:cc { xpg@error } { xpg_error_msg:n }
+\cs_set_eq:cc { xpg@warning } { xpg_warning_msg:n }
+\cs_set_eq:cc { xpg@info } { xpg_info_msg:n }
+\cs_set_eq:cc { xpg@ill@value } { xpg_ill_value_msg:nn }
+
+
+\NewDocumentCommand \XPGNoPatternsFallback { O{ nohyphenation } m }
+{
+ \msg_warning:nnnn { polyglossia } { nopatterns } { #1 } { #2 }
+ \exp_args:Ncc \adddialect {l@#2} {l@#1}
+}
+
+\NewDocumentCommand \CheckHyphenationPatterns { m }
+{
+ \xpg_if_language_defined:nF {#1}
+ {
+ \XPGNoPatternsFallback{#1}
+ }
+}
+
+%
+% END MESSAGES
+
%% ensure directionality if bidi is loaded, else ignore
-\def\@@ensure@dir#1{\ifcsundef{@ensure@dir}{#1}{\@ensure@dir{#1}}}
-\def\@@ensure@maindir#1{\ifcsundef{@ensure@maindir}{#1}{\@ensure@maindir{#1}}}
+%%% FIXME still used?
+\cs_new_nopar:Npn \@@ensure@dir #1
+{
+ \cs_if_exist_use:c{@ensure@dir}{#1}
+}
-%% Used by the language definitions files for right-to-left languages
-\NewDocumentCommand \RequireBidi {}
+\cs_new_nopar:Npn \@@ensure@maindir #1
+{
+ \cs_if_exist_use:c{@ensure@maindir}{#1}
+}
+
+% if we are in the document preamble run T else F
+\prg_set_conditional:Nnn \xpg_if_in_preamble: {T, F, TF}
{
- \sys_if_engine_luatex:TF
- {\ifx\@onlypreamble\@notprerr\else\RequirePackage{luabidi}\fi}
- {\ifx\@onlypreamble\@notprerr\else\RequirePackage{bidi}\fi}
+ \cs_if_eq:NNTF { \@onlypreamble } { \@notprerr }
+ {
+ \prg_return_false:
+ }
+ {
+ \prg_return_true:
+ }
}
-% if #1 is LR run #2 else #3
+%% Used by the language definitions files for right-to-left languages
+\DeclareDocumentCommand \RequireBidi {}
+ {
+ \xpg_if_in_preamble:T
+ {
+ \sys_if_engine_luatex:TF
+ { \RequirePackage{luabidi} }
+ { \RequirePackage{bidi} }
+ }
+ \DeclareDocumentCommand \RequireBidi {} {}
+ }
+
+% if #1 is LR run T else F
\prg_set_conditional:Nnn \__xpg_if_LR_str:n {p, T, F, TF}
{
- \str_case_e:nnF{#1}{
+ \str_case_e:nnF{#1}
+ {
{LR}{\prg_return_true:}
{RL}{\prg_return_false:}
}
{
- \xpg@error{Unknown~ direction~#1}
+ \xpg_error_msg:n {Unknown~ direction~#1}
\prg_return_false:
}
}
@@ -212,17 +285,18 @@
{
\__xpg_if_LR_str:nF {#1}
{
- \xpg@error{right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
+ \xpg_error_msg:n {right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
}
}
\cs_new_nopar:Nn \__xpg_set_text_direction:n
{
\__xpg_if_LR_str:nF {#1}
{
- \xpg@error{right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
+ \xpg_error_msg:n {right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
}
}
-\AddToHook{package/bidi/after}{
+\hook_gput_code:nnn {package/bidi/after} {.}
+{
\cs_gset_nopar:Nn \__xpg_set_par_direction:n
{
\__xpg_if_LR_str:nTF{#1}
@@ -244,7 +318,8 @@
}
}
}
-\AddToHook{package/luabidi/after}{
+\hook_gput_code:nnn {package/luabidi/after} {.}
+{
\cs_gset_nopar:Nn \__xpg_set_par_direction:n
{
\__xpg_if_LR_str:nTF{#1}
@@ -273,13 +348,21 @@
{ \cs_new_nopar:Nn \__xpg_setRTLmain: { \@RTLmaintrue\setnonlatin } }
%% compatibility with babel
-\let\addto\gappto % gappto is defined in etoolbox
+\cs_set:Npn \addto #1 #2
+{
+ \cs_if_exist:NF { #1 }
+ { \cs_new:Npn { #1 } {} }
+ \tl_gput_right:Nn { #1 } { #2 }
+}
-%% NEW EXPERIMENTAL SETUP INTERFACE FOR GLOSS FILES
+%% SETUP INTERFACE FOR GLOSS FILES
%% options currently available:
%% language : the name of the language (as understood by fontspec)
%% hyphennames : the different hyphenation patterns to try (comma separated list)
-%%% TODO: if pattern is prefixed by !, then it should be loaded as a fallback, with \xpg@nopatterns@fallback - i.e. with a warning: e.g. sanskrit for hindi, or catalan for asturian. – Also for languages with variants! (English and German, etc.)
+%%% TODO: if pattern is prefixed by !, then it should be loaded as a fallback,
+%%%% with \CheckHyphenationPatterns - i.e. with a warning: e.g. sanskrit for hindi,
+%%%% or catalan for asturian. – Also for languages with variants!
+%%%% (English and German, etc.)
%% script : the name of the script (as understood by fontspec) – default is Latin
%% scripttag : the OpenType tag for the script
%% langtag : the OpenType tag for the language
@@ -287,19 +370,20 @@
%% frenchspacing : boolean
%% indentfirst : boolean
%% fontsetup : boolean
-%% TODO: nouppercase : boolean (for scripts like Arabic, Devanagari, etc which have no concept of uppercase/lowercase)
+%% TODO: nouppercase : boolean (for scripts like Arabic, Devanagari, etc which have
+%% no concept of uppercase/lowercase)
%% TODO: localalph = {<alph_csname>,<Alph_csname>}
%% TODO: localnumeral = <csname>
%% or even better localdigits = {0123456789} for fully automatic setup
-\newcommand*\PolyglossiaSetup[2]{
+\NewDocumentCommand \PolyglossiaSetup { m m }
+{
\__xpg_keys_define_lang:n{#1}
\keys_set:nn { polyglossia / #1 } { #2 }
\__xpg_setup_hyphen:n {#1}
%define booleans etoolbox style and set defaults
%% TODO ? \providetoggle{#1@setup@done}%
- % we initialize these so that we can use \gappto below
- \csgdef{init@extras@#1}{}
- \csgdef{init@noextras@#1}{} % we don't use this yet: remove?
+ % we initialize this so that we can append below
+ \cs_gset:cpn {init@extras@#1} {}
% here we do the fontsetup:
\__xpg_auto_setupfont:n { #1 }
%% TODO? \toggletrue{#1@setup@done}
@@ -318,35 +402,41 @@
\clist_map_inline:nn { #1 } { \keys_set:nn { polyglossia / ##1 } { #2 } }
}
-
+\bool_new:N \l__xpg_have_hyphen_bool
% setup hyphennames from a str list of hyphen
\cs_new:Nn \__xpg_setup_hyphen:n
{
- \clist_set:Ne{\l_tmpa_clist}{\prop_item:Nn \g_xpg_langsetup_prop {#1 / hyphennames}}
- \providebool{havehyphen}
- \boolfalse{havehyphen}
+ \clist_set:Ne{\l_tmpa_clist}{\prop_item:Nn \l_xpg_langsetup_prop {#1 / hyphennames}}
+ \bool_set_false:N \l__xpg_have_hyphen_bool
% for each hyphen in the set until we find one that works
- \clist_map_inline:Nn \l_tmpa_clist {
- \ifbool{havehyphen}{}{
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ \bool_if:NF \l__xpg_have_hyphen_bool
+ {
% check if language hyphenname is defined
- \__xpg_check_if_exist_l@:nF{#1}{
+ \__xpg_pattern_check_if_exists:nF{#1}
+ {
% if not, first consider nohyphenation
\str_if_eq:nnTF{##1}{nohyphenation}
{
\cs_gset_eq:cc{l@#1}{l@##1}
- \global\booltrue{havehyphen}
- }{
+ \bool_gset_true:N \l__xpg_have_hyphen_bool
+ }
+ {
% then test if hyphenation is defined
- \xpg@ifdefined{##1}{
+ \xpg_if_language_defined:nT {##1}
+ {
% test if language hyphenation is nohyphenation
- \cs_if_eq:cNF{l@#1}{\l@nohyphenation}{\global\booltrue{havehyphen}}{%
+ \cs_if_eq:cNTF{l@#1}{\l@nohyphenation}
+ { \bool_gset_true:N \l__xpg_have_hyphen_bool }
+ {
% if false define language to hyphenation if it is not equal...
\str_if_eq:nnF{#1}{##1}{\cs_gset_eq:cc{l@#1}{l@##1}}
% ...and load
- \xpg@set@hyphenation@patterns{##1}
- \global\booltrue{havehyphen}
- }
- }{}
+ \xpg_set_hyphenation_patterns:n {##1}
+ \bool_gset_true:N \l__xpg_have_hyphen_bool
+ }
+ }
}
}
}
@@ -354,19 +444,17 @@
% if l@#1 does not yet exist,
% we assign it to nohyphenation
% we do this here in case and if the hyphennames key was omitted
- \ifbool{havehyphen}{}{
- \xpg@ifdefined{#1}{}
- {
- \xpg@nopatterns{#1}
- \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax
- }
+ \bool_if:NF \l__xpg_have_hyphen_bool
+ {
+ \CheckHyphenationPatterns{#1}
}
- \csdef{#1@language}{
- \polyglossia@setup@language@patterns{#1}
+ \cs_gset:cpn {#1@language}
+ {
+ \SetupPolyglossiaLangPatterns{#1}
}
% setup hyphenmins
\clist_set:Ne \l_tmpa_clist
- { \prop_item:Nn \g_xpg_langsetup_prop {#1 / hyphenmins} }
+ { \prop_item:Nn \l_xpg_langsetup_prop {#1 / hyphenmins} }
\cs_if_eq:cNF {l@#1} \l@nohyphenation
{
\use:x
@@ -378,7 +466,8 @@
}
}
-\newcommand*\polyglossia@setup@language@patterns[1]{
+\NewDocumentCommand \SetupPolyglossiaLangPatterns { m }
+{
\bool_if:NTF \g__xpg_hyphenation_disabled_bool
{
\tl_gset:Ne \g__xpg_lastlanguage_tl {\the\csname l@#1\endcsname}
@@ -392,32 +481,29 @@
\language=\l@nohyphenation
}
{
- \xpg@set@hyphenation@patterns{#1}
+ \xpg_set_hyphenation_patterns:n {#1}
}
}
{
% Since this function is sometimes called from the gloss files
% directly, we need to check whether the requested hyphenname exists.
- \xpg@ifdefined{#1}{}
- {
- \xpg@nopatterns{#1}
- \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax%
- }
- \xpg@set@hyphenation@patterns{#1}
+ \CheckHyphenationPatterns{#1}
+ \xpg_set_hyphenation_patterns:n {#1}
}
}
}
-\prop_new:N \g_xpg_langsetup_prop
+\prop_new_linked:N \l_xpg_langsetup_prop
\cs_new_protected:Npn \__xpg_keys_define_lang:n #1
{
- \keys_define:nn {polyglossia}{
+ \keys_define:nn {polyglossia}
+ {
% the script font
#1 / script
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/script}{##1}
- \prop_gput:Nne{\g_xpg_langsetup_prop}{#1/lcscript}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/script}{##1}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/lcscript}
{\tl_if_empty:nF{##1}{\str_lowercase:n{##1}}}
},
#1 / script
@@ -426,84 +512,89 @@
.initial:n = latin,
% the opentype script tag
#1 / scripttag
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/scripttag}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/scripttag}{##1}},
#1 / scripttag
.default:n = {},
#1 / scripttag
.initial:n = {},
% the language full name
#1 / language
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/language}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/language}{##1}},
#1 / language
.value_required:n = true,
#1 / language
.initial:x = {\str_uppercase:n#1},
% the language tag
#1 / langtag
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/langtag}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/langtag}{##1}},
#1 / langtag
.value_required:n = true,
#1 / langtag
.initial:n = {},
% the BCP-47 tag
#1 / bcp47
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47}{##1}},
#1 / bcp47
.value_required:n = true,
#1 / bcp47
.initial:n = {},
% the BCP-47 language tag
#1 / bcp47-language
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-language}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-language}{##1}},
#1 / bcp47-language
.value_required:n = true,
#1 / bcp47-language
.initial:n = {},
% the BCP-47 region tag
#1 / bcp47-region
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-region}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-region}{##1}},
#1 / bcp47-region
.value_required:n = false,
#1 / bcp47-region
.initial:n = {},
% the BCP-47 script tag
#1 / bcp47-script
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-script}{##1}},
+ .code:n =
+ {
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-script}{##1}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/lc-bcp47-script}
+ {\tl_if_empty:nF{##1}{\str_lowercase:n{##1}}}
+ },
#1 / bcp47-script
.value_required:n = true,
#1 / bcp47-script
- .initial:n = {},
+ .initial:n = {Latn},
% the BCP-47 variant tag
#1 / bcp47-variant
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-variant}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-variant}{##1}},
#1 / bcp47-variant
.value_required:n = false,
#1 / bcp47-variant
.initial:n = {},
% the BCP-47 extension-t tag
#1 / bcp47-extension-t
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-t}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-t}{##1}},
#1 / bcp47-extension-t
.value_required:n = false,
#1 / bcp47-extension-t
.initial:n = {},
% the BCP-47 extension-u tag
#1 / bcp47-extension-u
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-u}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-u}{##1}},
#1 / bcp47-extension-u
.value_required:n = false,
#1 / bcp47-extension-u
.initial:n = {},
% the BCP-47 extension-x tag
#1 / bcp47-extension-x
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-x}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-x}{##1}},
#1 / bcp47-extension-x
.value_required:n = false,
#1 / bcp47-extension-x
.initial:n = {},
% the BCP-47 casing alias
#1 / bcp47-casing
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-casing}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-casing}{##1}},
#1 / bcp47-casing
.value_required:n = false,
#1 / bcp47-casing
@@ -512,7 +603,7 @@
#1 / hyphennames
.code:n = {
\clist_set:Nn{\l_tmpa_clist}{##1}
- \prop_gput:Nne{\g_xpg_langsetup_prop}{#1/hyphennames}{\clist_use:Nn \l_tmpa_clist {,}}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/hyphennames}{\clist_use:Nn \l_tmpa_clist {,}}
},
#1 / hyphennames
.value_required:n = true,
@@ -525,8 +616,8 @@
{LR}{}
{RL}{\RequireBidi}
}
- {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/direction}{##1}}
- {\xpg@error{Unknown~ direction~ "##1"~ for~ language~ "#1"}}
+ { \prop_put:Nnn \l_xpg_langsetup_prop {#1/direction}{##1} }
+ { \xpg_error_msg:n {Unknown~ direction~ "##1"~ for~ language~ "#1"} }
},
#1 / direction
.value_required:n = true,
@@ -537,9 +628,9 @@
.code:n = {
% check syntax
\int_compare:nNnF { \clist_count:n {##1} } = {2}
- {\xpg@error{hypenmins~should~be~a~list~of~two~entries,~got~"##1"}}
+ { \xpg_error_msg:n {hypenmins~should~be~a~list~of~two~entries,~got~"##1"} }
% set prop
- \prop_gput:Nnn \g_xpg_langsetup_prop {#1/hyphenmins} {##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/hyphenmins} {##1}
},
#1 / hyphenmins
.value_required:n = true,
@@ -550,9 +641,9 @@
.code:n = {
% check syntax
\int_compare:nNnF { \clist_count:n {##1} } = {1}
- {\xpg@error{totalhyphenhypenmin~should~be~a~single~entry,~got~"##1"}}
+ { \xpg_error_msg:n {totalhyphenhypenmin~should~be~a~single~entry,~got~"##1"} }
% set prop
- \prop_gput:Nnn \g_xpg_langsetup_prop {#1/totalhyphenmin} {##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/totalhyphenmin} {##1}
},
#1 / totalhyphenmin
.value_required:n = false,
@@ -571,35 +662,35 @@
% environment name
#1 / envname
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/envname}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/envname}{##1}
},
#1/ envname.value_required:n = true,
#1/ envname.initial:n = {#1},
% babel name
#1 / babelname
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/babelname}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/babelname}{##1}
},
#1/ babelname.value_required:n = true,
#1/ babelname.initial:n = {#1},
% default numerals
#1 / localnumeral
. code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/localnumeral}{##1}
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/Localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/Localnumeral}{##1}
},
#1 / localnumeral.value_required:n = true,
- #1 / localnumeral.initial:n = {polyglossia@C@localnumeral},
+ #1 / localnumeral.initial:n = {xpg_C_localnumeral:nn},
% uppercased
#1 / Localnumeral
. code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/Localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/Localnumeral}{##1}
},
#1 / Localnumeral.value_required:n = true,
- #1 / Localnumeral.initial:n = {polyglossia@C@localnumeral},
+ #1 / Localnumeral.initial:n = {xpg_C_localnumeral:nn},
% environment define command (by default create the environment)
#1 / DefineCommandsCmd
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/DefineCommandsCmd}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/DefineCommandsCmd}{##1}},
#1 / DefineCommandsCmd
.value_required:n = true,
#1 / DefineCommandsCmd
@@ -607,9 +698,20 @@
}
}
+\DeclareExpandableDocumentCommand \babelname { }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / babelname }
+ }
+
+\DeclareExpandableDocumentCommand \mainbabelname { }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / babelname }
+ }
+
% TODO move to C module
-\newcommand*{\polyglossia@C@localnumeral}[2]{
- \polyglossia@Clang@@arabic{#2}
+\cs_new:Nn \xpg_C_localnumeral:nn
+{
+ \xpg_Clang_arabic{#2}
}
\cs_new:Npn \__xpg_localnumeral_parse:nn #1 #2
@@ -633,7 +735,7 @@
\__xpg_localnumeral_parse:nn
} { #2 }
}
- { \use:c { \prop_item:Ne \g_xpg_langsetup_prop
+ { \use:c { \prop_item:Ne \l_xpg_langsetup_prop
{ \languagename / #3 } } { } { #1 } }
}
@@ -668,31 +770,31 @@
\cs_new_nopar:Npn \__xpg_indent_first:n #1
{
\bool_if:cTF { g__xpg_#1_if_bool }
- { \french@indent } { \nofrench@indent }
+ { \__xpg_french_indent: } { \__xpg_no_french_indent: }
}
\cs_new:Nn \__xpg_lang_set_par_direction:n
{
- \prop_get:NeNTF \g_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
+ \prop_get:NeNTF \l_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
{
\__xpg_set_par_direction:n{\l_tmpa_tl}
}
{
- \xpg@error{Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
- \prop_show:N{\g_xpg_langsetup_prop}
+ \xpg_error_msg:n {Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
+ \prop_show:N{\l_xpg_langsetup_prop}
}
}
\cs_new:Nn \__xpg_lang_set_text_direction:nn
{
- \prop_get:NeNTF \g_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
+ \prop_get:NeNTF \l_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
{
\__xpg_set_text_direction:n{\l_tmpa_tl}{#2}
}
{
- \xpg@error{Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
- \prop_show:N{\g_xpg_langsetup_prop}
+ \xpg_error_msg:n {Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
+ \prop_show:N{\l_xpg_langsetup_prop}
}
}
@@ -723,7 +825,7 @@
{
\bool_gset_true:N \g__xpg_hyphenation_disabled_bool
\tl_gset:Ne \g__xpg_lastlanguage_tl { \the\language }
- % We do not call \xpg@set@hyphenation@patterns here to avoid a warning message.
+ % We do not call \xpg_set_hyphenation_patterns:n here to avoid a warning message.
% "nohyphenation" is not listed in language.dat.lua.
\language=\l@nohyphenation
}
@@ -735,19 +837,19 @@
{
\bool_gset_false:N \g__xpg_hyphenation_disabled_bool
\language=\tl_use:N{\g__xpg_lastlanguage_tl}
- }%
+ }
}
\cs_new:Npn \__xpg_auto_setupfont:n #1
{
\bool_if:cTF { g__xpg_#1_fontsetup_bool }
{
- \str_if_eq:eeTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript}}{latin}
- {\xpg@fontsetup@latin{#1}}
- {\xpg@fontsetup@nonlatin{#1}}
+ \str_if_eq:eeTF{\prop_item:Nn{\l_xpg_langsetup_prop}{#1/lcscript}}{latin}
+ {\SetupLatinPolyglossiaFont{#1}}
+ {\SetupNonLatinPolyglossiaFont{#1}}
}
{
- \xpg@info{Skipping~ automatic~ font~ setup~ for~ language~ #1}
+ \xpg_info_msg:n{Skipping~ automatic~ font~ setup~ for~ language~ #1}
}
}
@@ -759,40 +861,40 @@
\bool_if:nTF{\tl_if_empty_p:n{#1} || \tl_if_empty_p:n{#2}}
{
% maybe an error ?
- \xpg@warning{Asking~ to~ add~ empty~ feature~to~ main~ font~
+ \xpg_warning_msg:n{Asking~ to~ add~ empty~ feature~to~ main~ font~
(Language="#2"~ to~ langtag~ "#1")}
}
{
- \str_if_eq:nnTF{#2}{Turkish}{
+ \str_if_eq:nnTF{#2}{Turkish}
+ {
\fontspec_if_language:nTF {TRK}
{
\addfontfeature{Language=Turkish}
}
{
- \fontspec_if_language:nTF {TUR}
+ \fontspec_if_language:nT {TUR}
{
\addfontfeature{Language=Turkish}
- }{}
+ }
}
}{
- \fontspec_if_language:nTF{#1}
+ \fontspec_if_language:nT{#1}
{
\addfontfeature{Language=#2}
}
- {}
}
}
}
-\cs_generate_variant:Nn \__xpg_add_font_feature_language:nn { on , no, oo , Vn, nV, VV , xn, nx, xx}
+\cs_generate_variant:Nn \__xpg_add_font_feature_language:nn { ee }
-% add fontfeature Script=#2 to scripttag #1
-% do nothing if #1 or #2 is empty
+% add fontfeature Script=#3 to scripttag #2 for family #1
+% do nothing if #2 or #3 is empty
\cs_new:Nn \__xpg_add_font_feature_script:nnn
{
\bool_if:nTF{\tl_if_empty_p:n{#2} || \tl_if_empty_p:n{#3}}
{
% maybe an error ?
- \xpg@warning{Asking~ to~ add~ empty~ feature~to~ main~ font
+ \xpg_warning_msg:n{Asking~ to~ add~ empty~ feature~to~ main~ font
(Script="#3"~ to~ scripttag~ "#2")}
}
{
@@ -828,118 +930,58 @@
\regex_replace_once:nnN { \.[^\.]* \Z } { } \xpg_fname_str
% ... and, finally, quotation marks
\regex_replace_once:nnN { " } { } \xpg_fname_str
- \xpg@error{
- The~ current~ main ~ \xpg_ffamily_tl\space font,~ \xpg_fname_str,~ does~ not~ contain~ the~"#3"~ script!\MessageBreak
- Please~ define~\csname\tl_if_empty:nF{#3}{\str_lowercase:n{#3}}font\xpg_ffamilysh_tl\endcsname~
- with~ \string\newfontfamily\space command
+ \xpg_error_msg:n
+ {
+ The~ current~ main ~ \xpg_ffamily_tl\space font,~ \xpg_fname_str,~ does~ not~ contain~ the~"#3"~ script! \iow_newline:
+ Please~ define~\csname\tl_if_empty:nF{#3}{\str_lowercase:n{#3}}font\xpg_ffamilysh_tl\endcsname~
+ with~ \string\newfontfamily\space command
}
}
}
}
-\cs_generate_variant:Nn \__xpg_add_font_feature_script:nnn { non , nno, noo , nVn, nnV, nVV , nxn, nnx, nxx}
+\cs_generate_variant:Nn \__xpg_add_font_feature_script:nnn { nee }
-\def\xpg@fontsetup@latin#1{
- \begingroup
- \csgdef{#1@font@rm}{
- \cs_if_exist_use:cF{#1font}{
- \rmfamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \csgdef{#1@font@sf}{
- \cs_if_exist_use:cF{#1fontsf}{
- \sffamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \csgdef{#1@font@tt}{
- \cs_if_exist_use:cF{#1fonttt}{
- \ttfamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \endgroup
-}
-
-\def\xpg@fontsetup@nonlatin#1{
- \begingroup
- \csgdef{#1@font@rm}{
- \cs_if_exist_use:cF{#1font}
- {
- \providetoggle{#1@use@script@font}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\rmfamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} font}
- {
- \toggletrue{#1@use@script@font}
- }
- {
- \rmfamilylatin
- }
- }
- \iftoggle{#1@use@script@font}{}{
- \__xpg_add_font_feature_script:nxx{rm}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }%
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }%
- \def\familytype{rm}
- }%
- \csgdef{#1@font@sf}{
- \cs_if_exist_use:cF{#1fontsf}
+%% TODO: probably can be cleaned a little more
+\cs_new_protected:Npn \__xpg_setup_font:nnnnn #1 #2 #3 #4 #5 % #1 = lang, #2 = family, #3 = family, #4 = gobble, #5 gobble
+ {
+ \cs_set_protected_nopar:cpn { #1@font@#2 }
{
- \providetoggle{#1@use@script@fontsf}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\sffamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} fontsf}
+ \cs_if_exist_use:cF{ #1font#3 }
{
- \toggletrue{#1@use@script@fontsf}
- }
- {
- \sffamilylatin
- }
- }
- \iftoggle{#1@use@script@fontsf}{}{
- \__xpg_add_font_feature_script:nxx{sf}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }%
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }%
- \def\familytype{sf}
- }%
- \csgdef{#1@font@tt}{
- \cs_if_exist_use:cF{#1fonttt}
- {
- \providetoggle{#1@use@script@fonttt}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\ttfamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} fonttt}
- {
- \toggletrue{#1@use@script@fonttt}
- }
- {
- \ttfamilylatin
- }
- }
- \iftoggle{#1@use@script@fonttt}{}{
- \__xpg_add_font_feature_script:nxx{tt}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
+ \cs_if_exist_use:cF { \prop_item:Nn \l_xpg_langsetup_prop { #1 / lc-bcp47-script } font#3 }
+ {
+ #4 { \prop_item:Nn \l_xpg_langsetup_prop { #1 / lcscript } font#3 }
+ {
+ \use:c { #2familylatin }
+ #5
+ {
+ \__xpg_add_font_feature_script:nee { #2 }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / scripttag } }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / script } }
+ }
+ }
+ }
+ \__xpg_add_font_feature_language:ee
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / langtag } }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / language } }
+ }
+ \tl_set:Nn \familytype { #2 }
}
- \def\familytype{tt}
}
- \endgroup
-}
+
+\NewDocumentCommand \SetupLatinPolyglossiaFont { m }
+ {
+ \__xpg_setup_font:nnnnn { #1 } { rm } { } { \use_ii:nn } { \use_none:n }
+ \__xpg_setup_font:nnnnn { #1 } { sf } { sf } { \use_ii:nn } { \use_none:n }
+ \__xpg_setup_font:nnnnn { #1 } { tt } { tt } { \use_ii:nn } { \use_none:n }
+ }
+
+\NewDocumentCommand \SetupNonLatinPolyglossiaFont { m }
+ {
+ \__xpg_setup_font:nnnnn { #1 } { rm } { } { \cs_if_exist_use:cF } { \use:n }
+ \__xpg_setup_font:nnnnn { #1 } { sf } { sf } { \cs_if_exist_use:cF } { \use:n }
+ \__xpg_setup_font:nnnnn { #1 } { tt } { tt } { \cs_if_exist_use:cF } { \use:n }
+ }
%%% END OF PolyglossiaSetup
@@ -948,40 +990,53 @@
\cs_new_nopar:Nn \__xpg_local_marks:n { }
\cs_new_nopar:Nn \__xpg_enable_local_marks:
{
- \xpg@info{Option:~ localmarks}
+ \xpg_info_msg:n{Option:~ localmarks}
\cs_gset_nopar:Nn \__xpg_local_marks:n
{
- \def\xpg@tmp@lang{##1}
- \DeclareRobustCommand\markboth[2]{
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \unrestored@protected@xdef\@themark
- {
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####2}}}
- }
- \@temptokena \expandafter{\@themark}
- \mark{\the\@temptokena}
- \endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi
- }
- \DeclareRobustCommand\markright[1]{
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \expandafter\@markright\@themark
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}
- \@temptokena \expandafter{\@themark}
- \mark{\the\@temptokena}
- \endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi
- }
+ \DeclareDocumentCommand \markboth { m m }
+ {
+ \group_begin:
+ \cs_set_eq:cc { label } { relax }
+ \cs_set_eq:cc { index } { relax }
+ \cs_set_eq:cc { glossary } { relax }
+ \unrestored@protected@xdef\@themark
+ {
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####2}}}
+ }
+ \@temptokena \expandafter{\@themark}
+ \mark_insert:nn{2e-left}{####1}
+ \mark_insert:nn{2e-right}{####2}
+ \tl_if_empty:nF{####2}{ \mark_insert:nn{2e-right-nonempty}{####2} }
+ \mark{\the\@temptokena}
+ \group_end:
+ \if@nobreak\ifvmode\nobreak\fi\fi
+ }
+ \DeclareDocumentCommand \markright { m }
+ {
+ \group_begin:
+ \cs_set_eq:cc { label } { relax }
+ \cs_set_eq:cc { index } { relax }
+ \cs_set_eq:cc { glossary } { relax }
+ \expandafter\@markright\@themark
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}
+ \@temptokena \expandafter{\@themark}
+ \mark_insert:nn{2e-right}{####1}
+ \tl_if_empty:nF{####1}{ \mark_insert:nn{2e-right-nonempty}{####1} }
+ \mark{\the\@temptokena}
+ \group_end:
+ \if@nobreak\ifvmode\nobreak\fi\fi
+ }
}
}
%we call this macro when a gloss file is not found for a given language
-\def\xpg@nogloss#1{
- \xpg@warning{File~ gloss-#1.ldf~ do~ not~ exists!\MessageBreak
- I~ will~ nevertheless~ try~ to~ use~ hyphenation~ patterns~ for~ #1.}
+\cs_new_nopar:Nn \__xpg_no_gloss:n
+{
+ \xpg_warning_msg:n
+ {File~ gloss-#1.ldf~ do~ not~ exists! \iow_newline:
+ I~ will~ nevertheless~ try~ to~ use~ hyphenation~ patterns~ for~ #1.}
+
\PolyglossiaSetup{#1}{hyphenmins={2,3},hyphennames={#1},fontsetup=true}
% the above amounts to:
%\ifcsundef{l@#1}%
@@ -990,59 +1045,64 @@
%\csdef{#1@language}{\language=\csname l@#1\endcsname}%
}
-\newcommand{\xpg@input}[1]{
+\cs_new_nopar:Nn \xpg_input:n
+{
% Store catcode of @ before making at letter
- \chardef\xpg@saved@at@catcode\catcode`\@
- \makeatletter
- \input{#1}
+ \cs_set_protected_nopar:Npx \__xpg_restore_at_catcode:
+ { \char_set_catcode:nn { `@ } { \char_value_catcode:n {`\@ } } }
+ \char_set_catcode_letter:N @
+ \file_input:n { #1 }
% restore former @ catcode
- \catcode`\@=\xpg@saved@at@catcode
+ \__xpg_restore_at_catcode:
}
% try to load a language file
-\cs_new:Nn \__xpg_load_lang_definition:nn {
- \file_if_exist:nTF{gloss-#2.ldf}
+\cs_new:Nn \__xpg_load_lang_definition:nn
+{
+ \file_if_exist:nTF{gloss-#2.ldf}
{
- % Temporarily force catcode of ~ to 13 since babelsh.def
+ \tl_set:Nn \xpg__tmp_default_options_tl { #1 }
+ % Temporarily force catcode of ~ to 13 (active) since babelsh.def
% requires it. This is needed particularly with LaTeX3
% packages which force \ExplSyntaxOn (#425)
- \protected\edef\xpg@restore@tilde@catcode{\catcode 126 = \the\catcode 126\relax}
- \catcode 126 = 13
- \xpg@input{gloss-#2.ldf}
- \setkeys{#2}{#1}
+ \cs_gset_protected:Npx \__xpg_restore_tilde_catcode:
+ { \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } } }
+ \char_set_catcode_active:n { 126 }
+ \xpg_input:n {gloss-#2.ldf}
% restore former ~ catcode
- \xpg@restore@tilde@catcode
+ \__xpg_restore_tilde_catcode:
}
{
- \xpg@nogloss{#2}
+ \__xpg_no_gloss:n {#2}
}
}
\cs_generate_variant:Nn \__xpg_load_lang_definition:nn { ee }
% load a master language from an alias file
-\newcommand*\xpg@load@master@language[1] {
- \xpg@input{gloss-#1.ldf}
+\NewDocumentCommand \InheritGlossFile { m }
+{
\seq_if_in:NeF \__xpg_langs_loaded {#1}
{
+ \xpg_input:n {gloss-#1.ldf}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#1/target}} {#1} {
- \use:c{\prop_item:Nn{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Nn{\l_xpg_langsetup_prop}
{#1/DefineCommandsCmd}}
{#1}
}
+ \seq_gput_right:Nn \__xpg_langs_loaded {#1}
}
\__xpg_register_language:nn{}{#1}
- \seq_gput_right:Nn \__xpg_langs_loaded {#1}
}
-\prop_new:N \__xpg_alias
+\prop_new_linked:N \__xpg_alias
% define environment and command if not alias
\cs_new:Nn \xpg_define_language_commands:n {
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#1/target}} {#1}
{
\exp_args:Ne
- \NewDocumentEnvironment {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/envname}} { O{} }
+ \NewDocumentEnvironment {\prop_item:Nn{\l_xpg_langsetup_prop}{#1/envname}} { O{} }
{
\otherlanguage [ ##1 ] { #1 }
}
@@ -1070,7 +1130,7 @@
% target to self fall back to language table
\str_if_eq:eeTF { \prop_item:Ne \__xpg_alias {#1/target} } { #1 }
{
- \prop_item:Nn{\g_xpg_langsetup_prop} {#1/#2}
+ \prop_item:Nn{\l_xpg_langsetup_prop} {#1/#2}
}
% load alias by recursion
{
@@ -1193,20 +1253,29 @@
\clist_if_in:NeF \xpg@loaded {#2}{
\clist_gput_right:Ne \xpg@loaded {#2}
}
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@set@langvariant}
+ \group_begin:
+ % set language options
+ \__xpg_set_language_options:nn {#2} {#1}
% register babelname
- \prop_get:NeN \g_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
+ \prop_get:NeN \l_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
\clist_if_in:NeF \xpg@bloaded {\l_tmpa_tl}{
\clist_gput_right:Ne \xpg@bloaded {\l_tmpa_tl}
}
% register BCP-47 ID
- \prop_get:NeN \g_xpg_langsetup_prop {#2/bcp47} \l_tmpa_tl
+ \prop_get:NeN \l_xpg_langsetup_prop {#2/bcp47} \l_tmpa_tl
\clist_if_in:NeF \xpg@bcp@loaded {\l_tmpa_tl}{
\clist_gput_right:Ne \xpg@bcp@loaded {\l_tmpa_tl}
}
+ % register variant
+ \prop_get:NnNT \l_xpg_curropt_prop {#2/variant} \l_tmpa_tl {
+ \clist_if_in:NeF \xpg@vloaded {\l_tmpa_tl}{
+ \clist_gput_right:Ne \xpg@vloaded {\l_tmpa_tl}
+ }}
+ \group_end:
}
+\prop_new_linked:N \l_xpg_curropt_prop
+
\DeclareDocumentCommand \setdefaultlanguage { O{} m }
{
% latex is an internal language, so do not record
@@ -1221,12 +1290,13 @@
\__xpg_load_lang_definition:nn{#1}{#2}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#2/target}} {#2} {
- \use:c{\prop_item:Ne{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Ne{\l_xpg_langsetup_prop}
{#2/DefineCommandsCmd}}
{#2}
}
\seq_gput_right:Ne \__xpg_langs_loaded {#2}
}
+ \cs_set_nopar:Npe \mainlanguagevariant { \prop_item:Ne \l_xpg_curropt_prop { \xpg_alias_base_lang:n{#2} / variant } }
\exp_args:Nee \__xpg_set_default_language:nn {\xpg_alias_add_to_option_i:nn{#2}{#1}}
{\xpg_alias_base_lang:n{#2}}
}
@@ -1234,70 +1304,22 @@
\cs_new:Nn \__xpg_set_default_language:nn
{
- \gdef\xpg@main@language{#2}
- \tl_if_blank:nTF {#1}
- {
- \cs_gset_nopar:Npn \mainlanguagevariant {}
- }
- {
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@main@langvariant}
- }
- \csgdef{#2@gvar}{\mainlanguagevariant}
+ \tl_gset:Nn \xpg_main_language_tl {#2}
%% The following settings are for the default language and script
% this tells bidi.sty or luabidi.sty that the document is RTL
- \__xpg_if_LR_str:eF{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eF{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{
\__xpg_setRTLmain:
}
\cs_gset_nopar:Nn \__xpg_at_begin_document_selectlanguage: {
\selectbackgroundlanguage{#2}
- \selectlanguage[#1]{#2}%
+ \selectlanguage[#1]{#2}
}
- \xpg@info{Default~ language~ is~ #2}
- \polyglossia@set@language@name[#1]{#2}
+ \str_if_eq:eeF { #2 } { latex }
+ { \xpg_info_msg:n{Default~ language~ is~ #2} }
+ \xpg_set_language_name:n { #2 }
\cs_gset_nopar:Npn \mainlanguagename {#2}
- % Store babelname of main language (for external packages such as biblatex)
- \cs_gset_nopar:Npe \mainbabelname { \prop_item:Nn \g_xpg_langsetup_prop {#2/babelname} }
- % Store babelname of current language (for external packages such as biblatex)
- \cs_gset_eq:NN \babelname \mainbabelname
- \cs_gset_eq:cc{#2@gbabelname}{babelname}%
- % Store BCP-47 ID and subtags of main language:
- % 1. store main.* (sub)tags
- \cs_gset_nopar:cpe {bcp47.main.tag} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47 } }
- \cs_gset_nopar:cpe {bcp47.main.language} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-language } }
- \cs_gset_nopar:cpe {bcp47.main.region} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-region } }
- \cs_gset_nopar:cpe {bcp47.main.script} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-script } }
- \cs_gset_nopar:cpe {bcp47.main.variant} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-variant } }
- \cs_gset_nopar:cpe {bcp47.main.extension.t} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47extension-t } }
- \cs_gset_nopar:cpe {bcp47.main.extension.u} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-extension-u } }
- \cs_gset_nopar:cpe {bcp47.main.extension.x} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-extension-x } }
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_nopar:cpe {bcp47.main.casing} { \prop_item:Nn \g_xpg_langsetup_prop {#2 / bcp47-language} } }
- { \cs_gset_nopar:cpe {bcp47.main.casing} { \tmpcasing } }
- % 2. Store lang (sub)tags
- \cs_gset_eq:cc {bcp47.tag} {bcp47.main.tag}
- \cs_gset_eq:cc {bcp47.language} {bcp47.main.language}
- \cs_gset_eq:cc {bcp47.region} {bcp47.main.region}
- \cs_gset_eq:cc {bcp47.script} {bcp47.main.script}
- \cs_gset_eq:cc {bcp47.variant} {bcp47.main.variant}
- \cs_gset_eq:cc {bcp47.extension.t} {bcp47.main.extension.t}
- \cs_gset_eq:cc {bcp47.extension.u} {bcp47.main.extension.u}
- \cs_gset_eq:cc {bcp47.extension.x} {bcp47.main.extension.x}
- \cs_gset_eq:cc {bcp47.casing} {bcp47.main.casing}
- % 3. Store global language BCP47 settings (with default subtags as set by main language options)
- \cs_gset_eq:cc{#2@g.bcp47.tag}{bcp47.tag}
- \cs_gset_eq:cc{#2@g.bcp47.language}{bcp47.language}
- \cs_gset_eq:cc{#2@g.bcp47.region}{bcp47.region}
- \cs_gset_eq:cc{#2@g.bcp47.script}{bcp47.script}
- \cs_gset_eq:cc{#2@g.bcp47.variant}{bcp47.variant}
- \cs_gset_eq:cc{#2@g.bcp47.extension.t}{bcp47.extension.t}
- \cs_gset_eq:cc{#2@g.bcp47.extension.u}{bcp47.extension.u}
- \cs_gset_eq:cc{#2@g.bcp47.extension.x}{bcp47.extension.x}
- \cs_gset_eq:cc{#2@g.bcp47.casing}{bcp47.casing}
}
\DeclareCommandCopy \setmainlanguage \setdefaultlanguage
@@ -1308,11 +1330,11 @@
{
\str_case:nnF {#1}
{
- {bcp-47} { \csuse{bcp47.tag} }
- {bcp47} { \csuse{bcp47.tag} }
+ {bcp-47} { \use:c{bcp47.tag} }
+ {bcp47} { \use:c{bcp47.tag} }
}
{
- \xpg@error{Invalid~ \string\languageid\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \languageid }
}
}
@@ -1322,11 +1344,11 @@
{
\str_case:nnF {#1}
{
- {bcp-47} { \csuse{bcp47.main.tag} }
- {bcp47} { \csuse{bcp47.main.tag} }
+ {bcp-47} { \use:c{bcp47.main.tag} }
+ {bcp47} { \use:c{bcp47.main.tag} }
}
{
- \xpg@error{Invalid~ \string\mainlanguageid\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \mainlanguageid }
}
}
% Kernel command to access to BCP-47 data.
@@ -1346,281 +1368,205 @@
% and main.* variants thereof
% See https://github.com/latex3/latex2e/issues/1035
\DeclareExpandableDocumentCommand \BCPdata {m}
+ {
+ \cs_if_exist_use:cF{bcp47.#1}
+ { \xpg_ill_arg_msg:nn { #1 } { \BCPdata } }
+ }
+
+\clist_map_inline:nn
+ {
+ language, region, script, variant,
+ extension.t, extension.u, extension.x
+ }{
+ \tl_set:Nn \l_tmpa_tl { #1 }
+ \tl_replace_once:Nnn \l_tmpa_tl { . } { - }
+ \cs_gset_nopar:cpe { bcp47.#1 }
+ {
+ \exp_not:n { \prop_item:Ne \l_xpg_langsetup_prop } { \exp_not:N \languagename / bcp47-\l_tmpa_tl }
+ }
+ \cs_gset_nopar:cpe { bcp47.main.#1 }
+ {
+ \exp_not:n { \prop_item:Ne \l_xpg_langsetup_prop } { \exp_not:N \mainlanguagename / bcp47-\l_tmpa_tl }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.casing }
+ {
+ \tl_if_empty:eTF { \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-casing } }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-language }
+ }{
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-casing }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.main.casing }
+ {
+ \tl_if_empty:eTF { \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-casing } }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-language }
+ }{
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-casing }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.tag }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47 }
+ }
+\cs_gset_nopar:cpn { bcp47.main.tag }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47 }
+ }
+
+\cs_new_nopar:Npn \languagevariant
+ {
+ \prop_item:Ne \l_xpg_curropt_prop { \languagename / variant }
+ }
+
+\cs_new:Nn \xpg_set_language_name:n
{
- \cs_if_exist_use:cF{bcp47.#1}
- { \xpg@error{Invalid~ \string\BCPdata\space argument:~ #1} }
-}
-
-% main babel name
-\cs_new_nopar:Npn \mainlanguagename {}
-\cs_new_nopar:Npn \mainbabelname {}
-\cs_new_nopar:cpn {bcp47.main.tag} {}
-\cs_new_nopar:cpn {bcp47.main.language} {}
-\cs_new_nopar:cpn {bcp47.main.region} {}
-\cs_new_nopar:cpn {bcp47.main.script} {}
-\cs_new_nopar:cpn {bcp47.main.variant} {}
-\cs_new_nopar:cpn {bcp47.main.extension.t} {}
-\cs_new_nopar:cpn {bcp47.main.extension.u} {}
-\cs_new_nopar:cpn {bcp47.main.extension.x} {}
-\cs_new_nopar:cpn {bcp47.main.casing} {}
-\cs_new_nopar:Npn \mainlanguagevariant {}%
-% Store main language variant for external packages
-\define@key{xpg@main@langvariant}{variant}{
- \cs_gset_nopar:Npn \mainlanguagevariant {#1}
-}
-
-\cs_new_nopar:Npn \babelname {}
-\def\languagevariant{}
-% Store current language variant for external packages
-\define@key{xpg@set@langvariant}{variant}{
- \def\languagevariant{#1}
-}
-
-\newcommand*\polyglossia@set@language@name[2][]{
- \def\languagename{#2}
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gvar}{\def\languagevariant{}}{\def\languagevariant{\csuse{#2@gvar}}}
- }{
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@set@langvariant}
- \cs_set_eq:cc{#2@var}{languagevariant}
- }%
+ \cs_set:Npn \languagename { #1 }
}
-
-\newcommand*{\resetdefaultlanguage}[2][]{
+\NewDocumentCommand \resetdefaultlanguage { O{} m }
+{
\__xpg_reset_default_language:nn
{\xpg_alias_add_to_option_i:nn{#2}{#1}}
{\xpg_alias_base_lang:n{#2}}
}
-\cs_new:Nn \__xpg_store_bcp_info:nn
-{
- % Store BCP-47 ID and subtags of current language
- \tl_if_blank:nTF {#1}{
- % tag (e.g., en-US)
- \ifcsundef{#2@g.bcp47.tag}{
- \csedef{bcp47.tag}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47 } }
- }{
- \csedef{bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- % language (e.g., en)
- \ifcsundef{#2@g.bcp47.language}{
- \csedef{bcp47.language}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-language } }
- }{
- \csedef{bcp47.language}{\csuse{#2@g.bcp47.language}}
- }
- % region (e.g., US)
- \ifcsundef{#2@g.bcp47.region}{%
- \csedef{bcp47.region}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-region } }
- }{
- \csedef{bcp47.region}{\csuse{#2@g.bcp47.region}}%
- }
- % script (e.g., Latn)
- \ifcsundef{#2@g.bcp47.script}{
- \csedef{bcp47.script}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-script } }
- }{
- \csedef{bcp47.script}{\csuse{#2@g.bcp47.script}}
- }
- % variant (e.g., 1996)
- \ifcsundef{#2@g.bcp47.variant}{
- \csedef{bcp47.variant}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-variant } }
- }{
- \csedef{bcp47.variant}{\csuse{#2@g.bcp47.variant}}
- }
- % extension.t (tranformation)
- \ifcsundef{#2@g.bcp47.extension.t}{%
- \csedef{bcp47.extension.t}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-t } }
- }{
- \csedef{bcp47.extension.t}{\csuse{#2@g.bcp47.extension.t}}
- }
- % extension.u (additional locale information)
- \ifcsundef{#2@g.bcp47.extension.u}{%
- \csedef{bcp47.extension.u}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-u } }
- }{
- \csedef{bcp47.extension.u}{\csuse{#2@g.bcp47.extension.u}}
- }
- % extension.x (private use area)
- \ifcsundef{#2@g.bcp47.extension.x}{
- \csedef{bcp47.extension.x}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-x } }
- }{
- \csedef{bcp47.extension.x}{\csuse{#2@g.bcp47.extension.x}}
- }
- % casing
- \ifcsundef{#2@g.bcp47.casing}{
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_eq:cc {bcp47.casing} {bcp47.language} }
- { \csedef{bcp47.casing}{ \tmpcasing } }
- }{
- \csedef{bcp47.casing}{\csuse{#2@g.bcp47.casing}}
- }
- }{
- \csedef{bcp47.tag}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47 } }
- \csedef{bcp47.language}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-language } }
- \csedef{bcp47.region}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-region } }
- \csedef{bcp47.script}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-script } }
- \csedef{bcp47.variant}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-variant } }
- \csedef{bcp47.extension.t}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-t } }
- \csedef{bcp47.extension.u}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-u } }
- \csedef{bcp47.extension.x}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-x } }
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_eq:cc {bcp47.casing} {bcp47.language} }
- { \csedef{bcp47.casing}{ \tmpcasing } }
- }
-}
-
\cs_new:Nn \__xpg_reset_default_language:nn
{
\xpg_error_if_lang_not_loaded:n{#2}
% disable globalnumbers of previously defined default language
- \csuse{no\xpg@main@language @globalnumbers}
- \csuse{noextras@\xpg@main@language}%
+ \use:c{no\xpg_main_language_tl @globalnumbers}
+ \use:c{noextras@\xpg_main_language_tl}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{noextras@bbl@\mainbabelname}%
- \csuse{init@noextras@\xpg@main@language}%
- \polyglossia@set@language@name[#1]{#2}%
- \__xpg_if_LR_str:eF{\prop_item:Ne{\g_xpg_langsetup_prop}{#2/direction}}
+ \cs_if_exist_use:c{noextras@bbl@\mainbabelname}
+ \use:c{init@noextras@\xpg_main_language_tl}
+ \xpg_set_language_name:n { #2 }
+ \__xpg_if_LR_str:eF{\prop_item:Ne{\l_xpg_langsetup_prop}{#2/direction}}
{
\@rlmaintrue\@rl@footnotetrue
}
- \selectlanguage[#1]{#2}%
- \selectbackgroundlanguage{#2}%
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{%
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store variant
- \tl_if_blank:nTF {#1}
- {
- \cs_gset_nopar:Npn \mainlanguagevariant {}
- }
- {
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@main@langvariant}
- }
- \csgdef{#2@gvar}{\mainlanguagevariant}
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
+ \selectlanguage[#1]{#2}
+ \selectbackgroundlanguage{#2}
+ \cs_set_nopar:Npe \mainlanguagevariant { \prop_item:Ne \l_xpg_curropt_prop { \xpg_alias_base_lang:n{#2} / variant } }
}
% This saves the normalfont for the latin script since we may change normalfont in other scripts
-\let\normalfontlatin=\normalfont
+\cs_set_eq:cc { normalfontlatin } { normalfont }
% Provide default fonts (as set with \setmainfont, \setsansfont and \setmonofont)
% for Latin scripts and as a fallback for non-Latin scripts.
-\DeclareRobustCommand\xpg@defaultfont@rm{
+\cs_set_protected:Nn \xpg_defaultfont_rm:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\rmdefault
- \ifdefined\UseHook\UseHook{rmfamily}\fi
+ \hook_use:n { rmfamily }
\selectfont
}
-\DeclareRobustCommand\xpg@defaultfont@sf{
+
+\cs_set_protected:Nn \xpg_defaultfont_sf:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\sfdefault
- \ifdefined\UseHook\UseHook{sffamily}\fi
+ \hook_use:n { sffamily }
\selectfont
}
-\DeclareRobustCommand\xpg@defaultfont@tt{
+
+\cs_set_protected:Nn \xpg_defaultfont_tt:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\ttdefault
- \ifdefined\UseHook\UseHook{ttfamily}\fi
+ \hook_use:n { ttfamily }
\selectfont
}
-\def\xpg@patch@fontfamilies{
+\cs_new:Nn \__xpg_patch_fontfamilies:
+{
% This robustifies the redefinitions of \<xx>family (suggestion by Enrico Gregorio)
% e.g. to prevent expansion of the \familytype redefinition in auxiliary files
- \csgappto{rmfamily~}{\def\familytype{rm}}
- \csgappto{sffamily~}{\def\familytype{sf}}
- \csgappto{ttfamily~}{\def\familytype{tt}}
+ \tl_put_right:cn {rmfamily~} {\tl_set:Nn \familytype {rm}}
+ \tl_put_right:cn {sffamily~} {\tl_set:Nn \familytype {sf}}
+ \tl_put_right:cn {ttfamily~} {\tl_set:Nn \familytype {tt}}
}
% These switches activate the default fonts
% Note that a simple \let\rmfamilylatin=\rmfamily
% does not work reliably (see #24)
-\cs_gset_eq:cc{rmfamilylatin}{xpg@defaultfont@rm}
-\cs_gset_eq:cc{sffamilylatin}{xpg@defaultfont@sf}
-\cs_gset_eq:cc{ttfamilylatin}{xpg@defaultfont@tt}
-
-\def\xpg@set@familydefault{
- % We need the \edef route here in order
- % to detect both \renewcommand and \let
- % changes.
- \edef\tempa{\familydefault}
- \edef\tempb{\sfdefault}
- \ifcsequal{tempa}{tempb}
- {\def\familytype{sf}}
- {\edef\tempb{\ttdefault}
- \ifcsequal{tempa}{tempb}
- {\def\familytype{tt}}
- {\def\familytype{rm}}}
- \xpg@patch@fontfamilies
+\cs_set_eq:cc{rmfamilylatin}{xpg_defaultfont_rm:}
+\cs_set_eq:cc{sffamilylatin}{xpg_defaultfont_sf:}
+\cs_set_eq:cc{ttfamilylatin}{xpg_defaultfont_tt:}
+
+\cs_new:Nn \xpg_set_familydefault:
+{
+ \tl_set:Ne \l_tmpa_tl { \familydefault }
+ \tl_set:Ne \l_tmpb_tl { \sfdefault }
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {sf} }
+ { \tl_set_eq:NN \l_tmpb_tl \ttdefault
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {tt} }
+ { \tl_set:Nn \familytype {rm} }
+ }
+ \__xpg_patch_fontfamilies:
% This (re-)saves the normalfont for the latin script since we may
% change normalfont in other scripts
- \let\normalfontlatin=\normalfont
+ \cs_set_eq:cc{ normalfontlatin }{ normalfont }
% And for all cases, we also reset \<xx>familylatin
- \cs_gset_eq:cc{rmfamilylatin}{xpg@defaultfont@rm}
- \cs_gset_eq:cc{sffamilylatin}{xpg@defaultfont@sf}
- \cs_gset_eq:cc{ttfamilylatin}{xpg@defaultfont@tt}
-}
-
-\def\resetfontlatin{
- \DeclareRobustCommand\rmfamily{\xpg@defaultfont@rm}
- \DeclareRobustCommand\sffamily{\xpg@defaultfont@sf}
- \DeclareRobustCommand\ttfamily{\xpg@defaultfont@tt}
- \xpg@patch@fontfamilies
- \global\let\normalfont=\normalfontlatin
-}
-
-\def\selectfontfamilylatin{
- \def\tmp@tt{tt}\def\tmp@sf{sf}
- \ifx\familytype\tmp@tt
- \ttfamilylatin
- \else\ifx\familytype\tmp@sf
- \sffamilylatin
- \else\rmfamilylatin\fi\fi}
-
-\def\xpg@select@fontfamily#1{
- \def\tmp@tt{tt}\def\tmp@sf{sf}
- \ifx\familytype\tmp@tt
- \__xpg_use_or_warn:c{#1@font@tt}
- \else\ifx\familytype\tmp@sf
- \__xpg_use_or_warn:c{#1@font@sf}
- \else\__xpg_use_or_warn:c{#1@font@rm}\fi\fi}
-
-\def\xpg@set@normalfont#1{
- \letcs{\rmfamily}{#1@font@rm}
- \letcs{\sffamily}{#1@font@sf}
- \letcs{\ttfamily}{#1@font@tt}
- \robustify\rmfamily
- \robustify\sffamily
- \robustify\ttfamily
- \gdef\normalfont{\protect\xpg@select@fontfamily{#1}
- \fontseries{\seriesdefault}\selectfont
- \fontshape{\shapedefault}
- \ifdefined\UseHook\UseHook{normalfont}\fi
- \selectfont}
- \gdef\reset@font{\protect\normalfont}
-}
-
-\let\@@fterindentfalse\@afterindentfalse
-\def\french@indent{
- \let\@afterindentfalse\@afterindenttrue
+ \cs_set_eq:cc{ rmfamilylatin }{ xpg_defaultfont_rm: }
+ \cs_set_eq:cc{ sffamilylatin }{ xpg_defaultfont_sf: }
+ \cs_set_eq:cc{ ttfamilylatin }{ xpg_defaultfont_tt: }
+}
+
+\cs_set_nopar:Nn \xpg_select_fontfamily:n
+{
+ \str_if_eq:VnTF \familytype { tt }
+ { \__xpg_use_or_warn:c { #1@font@tt } }
+ { \str_if_eq:VnTF \familytype { sf }
+ { \__xpg_use_or_warn:c { #1@font@sf } }
+ { \__xpg_use_or_warn:c { #1@font@rm } }
+ }
+}
+
+\cs_set_protected:Npn \xpg_select_default_fontfamily:n #1
+ {
+ \tl_set:Ne \l_tmpa_tl { \familydefault }
+ \tl_set:Ne \l_tmpb_tl { \sfdefault }
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {sf} }
+ { \tl_set_eq:NN \l_tmpb_tl \ttdefault
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {tt} }
+ { \tl_set:Nn \familytype {rm} }
+ }
+ \xpg_select_fontfamily:n{#1}
+ }
+
+\cs_new_nopar:Nn \xpg_set_normalfont:n
+{
+ \cs_set_eq:cc { rmfamily } { #1@font@rm }
+ \cs_set_eq:cc { sffamily } { #1@font@sf }
+ \cs_set_eq:cc { ttfamily } { #1@font@tt }
+ \cs_set_nopar:Npn \normalfont
+ { \xpg_select_default_fontfamily:n {#1}
+ \fontseries{\seriesdefault}\selectfont
+ \fontshape{\shapedefault}
+ \hook_use:n { normalfont }
+ \selectfont
+ }
+ \cs_set_nopar:Npn \reset@font {\protect\normalfont}
+}
+
+\cs_gset_eq:cc { @@fterindentfalse } { @afterindentfalse }
+\cs_new_nopar:Nn \__xpg_french_indent:
+{
+ \cs_set_eq:cc { @afterindentfalse } { @afterindenttrue }
\@afterindenttrue
}
-\def\nofrench@indent{
- \let\@afterindentfalse\@@fterindentfalse
+\cs_new_nopar:Nn \__xpg_no_french_indent:
+{
+ \cs_set_eq:cc { @afterindentfalse } { @@fterindentfalse }
\@afterindentfalse
}
@@ -1631,10 +1577,10 @@
\cs_new:Nn \__xpg_select_background_language:n
{
- \str_if_eq:eeTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript}}{latin}
+ \str_if_eq:eeTF { \prop_item:Nn{\l_xpg_langsetup_prop}{#1/lcscript} } { latin }
{}
- {\xpg@set@normalfont{#1}}
- \csuse{#1@globalnumbers}
+ { \xpg_set_normalfont:n{#1} }
+ \use:c{#1@globalnumbers}
}
\cs_generate_variant:Nn \__xpg_select_background_language:n {e}
% Declare secondary language #2 with language options #1
@@ -1645,7 +1591,7 @@
\__xpg_load_lang_definition:ee {#1} {#2}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#2/target}} {#2} {
- \use:c{\prop_item:Ne{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Ne{\l_xpg_langsetup_prop}
{#2/DefineCommandsCmd}}
{#2}
}
@@ -1658,28 +1604,13 @@
\cs_new:Nn \__xpg_set_otherlanguage:nn
{
\__xpg_register_language:nn{#1}{#2}
- % If a variant is set, store it.
- \gdef\otherlanguagevariant{}
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@other@langvariant}
-
- \csgdef{#2@gvar}{\otherlanguagevariant}
- \prop_get:NeNT \g_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
- { \xdef\otherlanguagebabelname{\l_tmpa_tl} }
- \cs_gset_eq:cc{#2@gbabelname}{otherlanguagebabelname}
}
\cs_generate_variant:Nn \__xpg_set_otherlanguage:nn { ee }
-
-% Store main language variant for external packages
-\define@key{xpg@other@langvariant}{variant}{
- \gdef\otherlanguagevariant{#1}
-}
-
\NewDocumentCommand \setotherlanguages { m }
- {
+{
\clist_map_function:eN { #1 } \setotherlanguage
- }
+}
\cs_set:Nn \xpg_common_language:
{% FIXME is this really needed???
@@ -1702,7 +1633,8 @@
% for specific (esp. tag-based) aliases
% where \text<alias> would cause clashes
% (e.g., \textit)
-\newcommand\textlang[3][]{
+\NewDocumentCommand \textlang { O{} m +m }
+{
\__xpg_textlanguage:een {#1} {#2} {#3}
}
@@ -1711,45 +1643,20 @@
% inside case changing commands (e.g. \MakeUppercase)
\tl_put_right:Nn \l_text_case_exclude_arg_tl { \textlang }
-% Alias to {<lang>}, but more suitable
-% for specific (esp. tag-based) aliases
-% where {<alias>} would cause clashes
-% (e.g., \fi)
-\DeclareEnvironmentCopy { lang } { otherlanguage }
-
% wrapper for foreignlanguage and otherlanguage*
-\newcommand*\polyglossia@setforeignlanguage[2][]{
- \select@@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_foreign_language:nn
+{
+ \xpg_select_language:nn { #1 } { #2 }
\__xpg_register_language:nn{#1}{#2}
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
-}
-
-% Expandable lowercasing. We use this to assure keyval
-% options are lowercased (also when used in \MakeUppercase
-% contexts e.g. in headings)
-% Macro adapted from tudscr.sty
-\newcommand*\xpg@str@lowercase[2]{
- \protected@edef#1{
- \lowercase{\def\noexpand#1{#2}}
- }#1
}
% lowercase options before passing to setkeys
-\cs_new:Nn \__xpg_set_keys:nn
+\NewDocumentCommand \SetGlossOptions { m m }
{
- \xpg@str@lowercase{\xpg@tmp@opts}{#2}
- \exp_args:Nne \setkeys{#1}{\xpg@tmp@opts}
+ % \text_lowercase:n fully expands
+ % (as opposed to \str_lowercase:n)
+ \use:c { xpg_#1_default_options_tl }
+ \exp_args:Ne \keys_set:ne{ polyglossia / gloss / #1 }{ \text_lowercase:n {#2} }
}
% joint code of \foreignlanguage, otherlanguage*
@@ -1759,54 +1666,30 @@
\cs_new:Nn \xpg_otherlanguage:nn
{
\xpg_error_if_lang_not_loaded:n{#2}
- \__xpg_set_keys:nn{#2}{#1}
- \polyglossia@setforeignlanguage[#1]{#2}
+ \SetGlossOptions{#2}{#1}
+ \xpg_set_foreign_language:nn { #1 } { #2 }
% Hook for external packages such as biblatex
\polyglossia@language@switched
% buggy restoration heure
- \csuse{inlineextras@#2}
+ \use:c{inlineextras@#2}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
\cs_if_exist_use:c{inlineextras@bbl@\babelname}
}
\DeclareDocumentCommand { \foreignlanguage } { O{} m +m }
- {
+{
\__xpg_foreignlanguage:eeen {#1} {#2} {\xpg_alias_base_lang:n{#2}} {#3}
- }
+}
% prevent case changing of language name in \foreignlanguage
\tl_put_right:Nn \l_text_case_exclude_arg_tl { \foreignlanguage }
-% Direct access to polyglossia@setforeignlanguage
+% Direct access to \xpg_set_foreign_language:nn
% used in captions
-\newcommand{\setforeignlanguage}[2][]
-{
- \polyglossia@setforeignlanguage[#1]{#2}
-}
-
-% Stack to store matrix languages
-\seq_new:N \__xpg_current_matrixlang_stack
-
-% Store embedding language when an embedded language is switched to
-\cs_new_nopar:Nn \__xpg_store_matrixlang:
+\NewDocumentCommand \setforeignlanguage { O{} m }
{
- \seq_gput_left:Nn \__xpg_current_matrixlang_stack \languagename
-}
-
-% When an embedded language is closed, reset to the embedding language
-% and remove stored matrix language from stack
-\cs_new_nopar:Nn \__xpg_reset_to_matrixlang:
-{
- % if stack is empty, use main language
- \seq_gpop_left:NNTF \__xpg_current_matrixlang_stack \l_tmpa_tl
- { \cs_set_eq:NN \__xpg_current_matrixlang \l_tmpa_tl }
- { \cs_set_eq:NN \__xpg_current_matrixlang \mainlanguagename }
- % Reset the language's/script's font families if the embedding script is latin
- \str_if_eq:eeT{\prop_item:Ne{\g_xpg_langsetup_prop}{\__xpg_current_matrixlang/lcscript}}{latin}
- {\resetfontlatin}
- % In case a \<lang>font is defined, re-activate that
- \exp_args:Ne \xpg@set@normalfont{\__xpg_current_matrixlang}
+ \xpg_set_foreign_language:nn { #1 } { #2 }
}
% internal wrapper for foreign language
@@ -1820,12 +1703,10 @@
{
\msg_show:nnn { polyglossia } { languagenotloaded } {#2}
}{
- \__xpg_store_matrixlang:
\group_begin:
\xpg_otherlanguage:nn{ \xpg_alias_add_to_option_i:nn{#2}{#1} }{ #3 }
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
- \__xpg_reset_to_matrixlang:
}
}
\cs_generate_variant:Nn \__xpg_foreignlanguage:nnnn {eeen}
@@ -1834,11 +1715,9 @@
% otherlanguage* is the environment equivalent of \foreignlanguage
\DeclareDocumentEnvironment { otherlanguage* } { O{} m }
{
- \__xpg_store_matrixlang:
\__xpg_otherlanguage:eee { #1 } { #2 } { \xpg_alias_base_lang:n { #2 } }
}{
- \egroup% \group_end: does not work here!
- \__xpg_reset_to_matrixlang:
+ \c_group_end_token% \group_end: does not work here!
}
% internal wrapper
@@ -1853,7 +1732,7 @@
}{
\xpg_otherlanguage:nn{ \xpg_alias_add_to_option_i:nn{#2}{#1} }{ #3 }
\__xpg_lang_set_text_direction:nn{#3}%
- \bgroup% \group_begin: does not work here!
+ \c_group_begin_token% \group_begin: does not work here!
}
}
\cs_generate_variant:Nn \__xpg_otherlanguage:nnn { eee }
@@ -1869,9 +1748,6 @@
}
\cs_generate_variant:Nn \__xpg_textlanguage:nnn {een}
-% Track whether we are in an inline lang (\text...) switch
-\bool_new:N \l__xpg_inline_lang_bool
-
% use by \text<lang> and \textlang. Equivalent to \foreignlanguage,
% except that dates are localized.
% #1: option
@@ -1885,41 +1761,43 @@
\msg_show:nnn { polyglossia } { languagenotloaded } {#2}
}
{
- \__xpg_store_matrixlang:
\group_begin:
- \bool_set_true:N \l__xpg_inline_lang_bool
\xpg_otherlanguage:nn{#1}{#3}
- \csuse{date#3}
+ \use:c{date#3}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
\cs_if_exist_use:c{date@bbl@\babelname}
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
- \__xpg_reset_to_matrixlang:
}
}
\cs_generate_variant:Nn \__xpg_textlanguage:nnnn {nnen}
% Define language-specific hyphenation exceptions
-\newcommand\pghyphenation[3][]{
- \bgroup
- \xpg_error_if_lang_not_loaded:n{#2}
- \setkeys{#2}{#1}
- \select@@language[#1]{#2}
+\NewDocumentCommand \pghyphenation {O{} m m}
+{
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n { #2 }
+ \SetGlossOptions{#2}{#1}
+ \xpg_select_language:nn { #1 } { #2 }
\hyphenation{#3}
- \egroup
+ \c_group_end_token
}
% Hook that other package authors can use
% (for instance biblatex):
% Do not rename!
-\newcommand*{\xpg@hook@setlanguage}{}
+\cs_set_nopar:Npn \xpg@hook@setlanguage {}
-\def\xpg@pop@language@i#1#2{
- \xpg@set@language@aux[#1]{#2}
+\cs_set_nopar:Nn \__xpg_pop_language:nn
+{
+ \xpg_set_language_aux:nn { #1 } { #2 }
\xpg@hook@setlanguage
- \let\emp@langname\@undefined}
+% FIXME This seems to be a very old relict.
+% The macro is nowhere used. Probably remove.
+% \let\emp@langname\@undefined
+}
\DeclareDocumentCommand \selectlanguage {s O{} m}
{
@@ -1938,131 +1816,124 @@
\cs_new:Nn \__xpg_select_language:nnn
{
% Register the language options
- \__xpg_set_language_options:nnn {#3} {#2} {@xpg@set@langvariant}
+ \__xpg_set_language_options:nn {#3} {#2}
\IfBooleanTF { #1 } % The starred variant does not write to the aux
{
- \xpg@set@language@nonaux[#2]{#3}
+ \xpg_set_language_nonaux:nn { #2 } { #3 }
}{
- \cs_set_nopar:Npe \xpg@pop@language { \exp_not:N \xpg@pop@language@i {#2} {#3} }
- \group_insert_after:N \xpg@pop@language
- \xpg@set@language@aux[#2]{#3}
+ \cs_set_nopar:Ne \xpg_pop_language: { \exp_not:N \__xpg_pop_language:nn { #2 } { #3 } }
+ \group_insert_after:N \xpg_pop_language:
+ \xpg_set_language_aux:nn { #2 } { #3 }
}
- \__xpg_register_language:nn{#2}{#3}
+ \__xpg_register_language:nn { #2 } { #3 }
}
\cs_generate_variant:Nn \__xpg_select_language:nnn { nee, nne }
-
% set lang option #2 for lang #1
-\cs_new:Nn \__xpg_set_language_options:nnn
+\cs_new:Nn \__xpg_set_language_options:nn
{
- \tl_if_blank:nF {#2}
+ \cs_if_exist:cT { xpg_#1_default_options_prop }
{
- % If the optional argument sets a value for the key “variant”, copy it to xpg@langvariant
- \clist_map_inline:nn { #2 } {
- \xpg@parsevariantkeyvalue##1=#3:#1\relax
- }%
- \__xpg_set_keys:nn{#1}{#2}
+ \prop_concat:ccc { l_xpg_curropt_prop } { l_xpg_curropt_prop }
+ { xpg_#1_default_options_prop }
}
+ \xpg__keyval_parser:eeN { #2 } { #1 } \l_xpg_curropt_prop
+ \SetGlossOptions{#1}{#2}
}
% Initialize default language options, so that
% \iflanguageoption has the info it needs also
% for default settings
-\newcommand*\xpg@initialize@gloss@options[2]{
- \__xpg_set_language_options:nnn {#1} {#2} {@xpg@set@langvariant}
-}
+\NewDocumentCommand \InitializeGlossOptions { m m }
+{
+ \tl_new:c { xpg_#1_default_options_tl }
+ \prop_new:c { xpg_#1_default_options_prop }
+ \keys_precompile:nec { polyglossia / gloss / #1 }
+ { \text_lowercase:n { #2, \xpg__tmp_default_options_tl } }
+ { xpg_#1_default_options_tl }
+ \xpg__keyval_parser:enc { #2, \xpg__tmp_default_options_tl } { #1 }
+ { xpg_#1_default_options_prop }
+ \prop_concat:ccc { l_xpg_curropt_prop } { l_xpg_curropt_prop }
+ { xpg_#1_default_options_prop }
+ \use:c { xpg_#1_default_options_tl }
+ \__xpg_set_language_options:nn {#1} {#2}
+}
+\tl_new:N \xpg__tmp_default_options_tl
+\cs_generate_variant:Nn \keys_precompile:nnN { nec }
% Record synonymous keyvals such as variant=us and variant=american
-% Syntax: \xpg@set@alias@values{<lang>}{<key>}{<val>}{<alias vals, comma-separated>}
-\newcommand*\xpg@set@alias@values[4]{%
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#3 }
- { \prop_new:c {xpg@alias@keyvals@#1@#3} }
- \prop_put:cnn { xpg@alias@keyvals@#1@#3 }
- {#2}{#4}
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#4 }
- { \prop_new:c {xpg@alias@keyvals@#1@#4} }
- \prop_put:cnn { xpg@alias@keyvals@#1@#4 }
- {#2}{#3}
-}
-
-% Patch xkeyval to record default values of keys
-\pretocmd{\XKV@define@default}{%
- \csgdef{xpg@default@opt@\XKV@header #1}{#2}
-}{}{\xpg@warning{Patching xkeyval failed!}}
-
-% Helper to get and register option keyvals
-\def\xpg@parsevariantkeyvalue#1=#2@#3:#4\relax{
- \def\@tmpa{#1}
- \def\@tmpb{variant}
- % variant values are stored in specific macros
- % (\xpg@main@langvariant, \xpg@other@langvariant
- % and \xpg@set@langvariant)
- \ifx\@tmpa\@tmpb\setkeys{#3}{#1=#2}\fi
- \tl_if_empty:nTF{#2}
- {
- \ifcsdef{xpg@default@opt@KV@#4@#1}
- {\xpg@store@opt@keyval#1:\csuse{xpg@default@opt@KV@#4@#1}=:#4\relax}
- {}%
- }
- { \xpg@store@opt@keyval#1:#2:#4\relax }
-}%
-
-% Store option keys and values
-% This strips trailing '=' from values.
-\def\xpg@store@opt@keyval#1:#2=:#3\relax{
- \prop_if_exist:cF { xpg@current@options@#3 }
- { \prop_new:c {xpg@current@options@#3} }
- \prop_put:cnn { xpg@current@options@#3 }
- {#1}{#2}
+% Syntax: \SetLanguageAliasValues{<lang>}{<key>}{<alias vals, comma-separated>}
+\int_new:N \l_xpg_alias_keyvals_int
+\int_set:Nn \l_xpg_alias_keyvals_int { 2 }
+\NewDocumentCommand \SetLanguageAliasValues { m m m }
+{
+ \clist_map_inline:nn { #3 }
+ {
+ \int_const:cn { c_xpg_alias_keyvals_#1_#2_##1_int } { \l_xpg_alias_keyvals_int }
+ }
+ \int_incr:N \l_xpg_alias_keyvals_int
}
+\cs_new:Npn \xpg__keyval_parser:nnN #1 #2 #3 % #1 = key-vals, #2 = language, #3 = prop
+ {
+ \keyval_parse:nnn
+ { \xpg__keyval_parser_default:nnn { #2 } { #3 } }
+ { \xpg__keyval_parser_nondefault:nnnn { #2 } { #3 } }
+ { #1 }
+ }
+\cs_generate_variant:Nn \xpg__keyval_parser:nnN { eeN, enc }
+
+\cs_new:Npn \xpg__keyval_parser_default:nnn #1 #2 #3 % #1 = lang, #2 = prop, #3 = key
+ {
+ \str_set:Nn \l_tempa_str { #1 / #3 }
+ \str_concat:NNN \l_tempa_str \c__keys_default_root_str \l_tempa_str
+ \prop_put:Nne #2 { #1 / #3 } { \use:c { \l_tempa_str } }
+ }
+
+\cs_new:Npn \xpg__keyval_parser_nondefault:nnnn #1 #2 #3 #4 % #1 = lang, #2 = prop, #3 = key, #4 = value
+ {
+ \prop_put:Nnn #2 { #1 / #3 } { #4 }
+ }
\prg_set_conditional:Npnn \__xpg_check_option_value:NNN #1#2#3 { p , T , F , TF }
-{
- \prop_get:cnNTF {xpg@current@options@#1} {#2} \l_tmpa_tl
- {
- \str_if_eq:eeTF{\l_tmpa_tl}{#3}
- {\prg_return_true:}
+ {
+ \bool_lazy_or:nnTF
+ {
+ \str_if_eq_p:ee { \prop_item:Nn \l_xpg_curropt_prop { #1 / #2 } } { #3 }
+ } {
+ \int_compare_p:nNn
{
- \prop_get:cnNTF {xpg@alias@keyvals@#1@#3} {#2} \l_tmpb_tl
- {
- \clist_set:Ne{\l_tmpa_clist}{\l_tmpb_tl}
- \providetoggle{xpgvalfound}
- \togglefalse{xpgvalfound}
- \clist_map_inline:Nn \l_tmpa_clist {
- \str_if_eq:eeT{##1}{\l_tmpa_tl}
- { \toggletrue{xpgvalfound} }
- }
- \iftoggle{xpgvalfound}{\prg_return_true:}{\prg_return_false:}
- }
- {
- \prg_return_false:
- }
- }
- }
- {
- \prg_return_false:
- }
+ \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_#3_int } { 0 }
+ } = {
+ \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_\prop_item:Nn \l_xpg_curropt_prop { #1 / #2 }_int } { 1 }
+ }
+ } { \prg_return_true: } { \prg_return_false: }
+ }
+
+\prg_set_conditional:Npnn \xpg_if_main_language:n #1 { T, F, TF }
+{
+ \str_if_eq:VnTF \xpg_main_language_tl { #1 }
+ { \prg_return_true: }
+ { \prg_return_false: }
}
+\cs_set_eq:NN \IfMainLanguageTF \xpg_if_main_language:nTF
+
+\cs_set_eq:NN \IfMainLanguageT \xpg_if_main_language:nT
+
+\cs_set_eq:NN \IfMainLanguageF \xpg_if_main_language:nF
+
% Test if option value is set
\DeclareDocumentCommand \iflanguageoption { m m m m m }
{
\__xpg_check_option_value:NNNTF{#1}{#2}{#3}{#4}{#5}
}
-
-% Append any variant to csv list of variants
-\define@key{xpg@langvariant}{variant}{
- \clist_if_in:NeF \xpg@vloaded {#1}{
- \clist_gput_right:Ne \xpg@vloaded {#1}
- }
-}
-
% Test if language is loaded
\DeclareDocumentCommand \iflanguageloaded { m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\clist_if_in:NeTF \xpg@loaded{#1}{#2}{#3}
}
}
@@ -2070,7 +1941,8 @@
% Same for babellanguage is loaded
\DeclareDocumentCommand \ifbabellanguageloaded { m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\clist_if_in:NeTF \xpg@bloaded{#1}{#2}{#3}
}
}
@@ -2078,7 +1950,8 @@
% Same for languageid
\DeclareDocumentCommand \iflanguageidloaded { m m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\str_case:nnTF {#1}
{
{bcp-47} { \clist_if_in:NeTF \xpg@bcp@loaded{#2}{#3}{#4} }
@@ -2086,7 +1959,7 @@
}
{}
{
- \xpg@error{Invalid~ \string\iflanguageidloaded\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \iflanguageidloaded }
}
}%
}
@@ -2116,53 +1989,46 @@
}
-\newcommand*{\xpg@set@language@nonaux}[2][]{
- \@select@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_language_nonaux:nn
+{
+ \__xpg_start_language:nn { #1 } { #2 }
}
-\newcommand*{\xpg@set@language@aux}[2][]{
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
- \@select@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_language_aux:nn
+{
+ \__xpg_start_language:nn { #1 } { #2 }
% Write to the aux
- \xpg@set@language@only@aux[#1]{#2}
+ \xpg_set_language_only_aux:nn { #1 } { #2 }
}
-\newcommand*{\xpg@set@language@only@aux}[2][]{
+\cs_new_nopar:Nn \xpg_set_language_only_aux:nn
+{
% Write to the aux (toc files)
\if@filesw
\addtocontents{toc}{\selectlanguage*[#1]{#2}}
\fi
}
-\AtBeginDocument{
+\hook_gput_code:nnn {begindocument} {.}
+{
\if@filesw
- \immediate\write\@mainaux
- {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
+ \immediate\write\@mainaux
+ {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
\fi
}
% Since captions might float to other language regions,
% we need to change the language here (#542)
-\AddToHook{cmd/caption/before}{
+\hook_gput_code:nnn {cmd/caption/before} {.}
+{
\ifhmode\unskip\fi
\addtocontents{lof}{\protect\setforeignlanguage{\languagename}}
\addtocontents{lot}{\protect\setforeignlanguage{\languagename}}
}
% check if language is defined
-\prg_set_conditional:Npnn \__xpg_check_if_exist_l@:n #1 { F, TF }
+\prg_set_conditional:Npnn \__xpg_pattern_check_if_exists:n #1 { F, TF }
{
\bool_lazy_and:nnTF
{ \cs_if_exist_p:c { l@#1 } }
@@ -2171,82 +2037,125 @@
{ \prg_return_false: }
}
-\def\polyglossia@luatex@load@lang#1{
+\cs_new_nopar:Nn \__xpg_luatex_load_lang:n
+{
% if \l@#1 is not properly defined, call lua function newloader(#1),
% and assign the returned number to \l@#1
- \__xpg_check_if_exist_l@:nF {#1}
+ \__xpg_pattern_check_if_exists:nF {#1}
{
\directlua { token.set_char('l@#1', polyglossia.newloader'#1') }
}
}
-% This check is also used by biblatex, so don't
-% rename silently.
-\newcommand\xpg@ifdefined[3]{
+% check if language is defined
+\prg_set_conditional:Npnn \xpg_if_language_defined:n #1 { T, F, TF }
+{
% With luatex, we first need to define \l@#1.
\sys_if_engine_luatex:T
{
- \polyglossia@luatex@load@lang{#1}
+ \__xpg_luatex_load_lang:n {#1}
}
- \__xpg_check_if_exist_l@:nTF{#1}{#2}{#3}
+ \__xpg_pattern_check_if_exists:nTF{#1}
+ { \prg_return_true: }
+ { \prg_return_false: }
+}
+
+% Aliases for gloss files
+\cs_gset_eq:cc { IfLanguageDefinedTF } { xpg_if_language_defined:nTF }
+\cs_gset_eq:cc { IfLanguageDefinedT } { xpg_if_language_defined:nT }
+\cs_gset_eq:cc { IfLanguageDefinedF } { xpg_if_language_defined:nF }
+
+% Check if patterns for language #1 is defined. If not, try
+% the comma-separated list of fallbacks in #2
+\NewDocumentCommand \TryPatternWithFallback { m m }
+{
+ \xpg_if_language_defined:nF { #1 }
+ {
+ \clist_clear_new:N \l_xpg_lang_patterns
+ \clist_set:Ne \l_xpg_lang_patterns { #2 }
+ \bool_set_false:N \l_tmpa_bool
+ \clist_map_inline:Nn \l_xpg_lang_patterns
+ {
+ \xpg_if_language_defined:nT { ##1 }
+ {
+ \cs_gset_eq:cc { l@#1 } { l@##1 }
+ \bool_set_true:N \l_tmpa_bool
+ \clist_map_break:
+ }
+ }
+ \bool_if:NF \l_tmpa_bool
+ {
+ \xpg_warning_msg:n
+ {No~ hyphenation~ patterns~ for~ #1~ found \iow_newline:
+ Falling~ back~ to~ the~ default~ patterns~ (=~English)!}
+ \exp_args:Nc \adddialect {l@#1} 0
+ }
+ }
}
+% This old term is used by biblatex, so don't drop!
+\cs_gset_eq:cc { xpg@ifdefined } { xpg_if_language_defined:nTF }
+
% Set \bbl@hyphendata@\the\language, which is (lua)babel's
% hyphenation pattern hook
% FIXME Clarifiy why/when this is needed.
-\newcommand*\xpg@set@bbl@hyphendata[1]{
+\cs_new:Nn \xpg_set_bbl_hyphendata:n
+{
\sys_if_engine_luatex:T
{
- \ifcsdef{bbl@hyphendata@#1}{}{
- \global\@namedef{bbl@hyphendata@\the\language}{}
+ \cs_if_exist:cF {bbl@hyphendata@#1}
+ {
+ \cs_gset:cpn {bbl@hyphendata@\the\language} {}
}
}
}
% Set hyphenation patterns for a given language. This does the right
% thing both for XeTeX and LuaTeX
-\newcommand*\xpg@set@hyphenation@patterns[1]{
- \sys_if_engine_luatex:T { \polyglossia@luatex@load@lang{#1} }
+\cs_new:Nn \xpg_set_hyphenation_patterns:n
+{
+ \sys_if_engine_luatex:T { \__xpg_luatex_load_lang:n {#1} }
\language=\csname l@#1\endcsname
}
-\newcommand*\@select@language[2][]{
+\cs_new:Nn \__xpg_start_language:nn
+{
% hook for compatibility with biblatex
- \select@language{#2}
- \xpg@set@bbl@hyphendata{\the\language}
+ \select@language { #2 }
+ \xpg_set_bbl_hyphendata:n {\the\language}
\xpg_initial_setup:
- \select@@language[#1]{#2}%
+ \xpg_select_language:nn { #1 } { #2 }
% Hook for external packages such as biblatex
- \polyglossia@language@switched%
- \__xpg_lang_set_par_direction:n{#2}
- \csuse{captions#2}%
- \csuse{date#2}%
+ \polyglossia@language@switched
+ \__xpg_lang_set_par_direction:n {#2}
+ \use:c {captions#2}
+ \use:c {date#2}
% These are hooks for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{captions@bbl@\babelname}
- \cs_if_exist_use:c{date@bbl@\babelname}
- \__xpg_local_marks:n{#2}
- \csuse{init@extras@#2}%
+ \cs_if_exist_use:c {captions@bbl@\babelname}
+ \cs_if_exist_use:c {date@bbl@\babelname}
+ \__xpg_local_marks:n {#2}
+ \use:c {init@extras@#2}
\__xpg_indent_first:n { #2 }
- \csuse{blockextras@#2}%
+ \cs_if_exist_use:c {blockextras@#2}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{blockextras@bbl@\babelname}
- }
+ \cs_if_exist_use:c {blockextras@bbl@\babelname}
+}
% hook for compatibility with biblatex
% (probably no longer used due to the
% more general hook that follows, but
% we keep it for backwards comp.)
-\def\select@language#1{}
+\cs_set:Npn \select@language #1 {}
% Hook for external packages such as biblatex
% do not rename!
-\def\polyglossia@language@switched{}
+\cs_new:Npn \polyglossia@language@switched {}
-% remove all custumization for language #1
+% remove all customization for language #1
\cs_new:Npn \noextrascurrent #1
-{%
+{
\cs_if_exist_use:c{noextras@#1}%
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
@@ -2254,160 +2163,105 @@
}
% Common code for `\select@language' and `\foreignlanguage'.
-\newcommand{\select@@language}[2][]{%
+\cs_new:Nn \xpg_select_language:nn
+{
% disable the extras and number settings of the previous language
\cs_if_exist:cT{languagename}
{
\noextrascurrent{\languagename}
\cs_if_exist_use:c{no\languagename @numbers}
\sys_if_engine_xetex:T{
- \__xpg_if_LR_str:eTF{\prop_item:Ne{\g_xpg_langsetup_prop}{\languagename/direction}}
+ \__xpg_if_LR_str:eTF{\prop_item:Ne{\l_xpg_langsetup_prop}{\languagename/direction}}
{
- \__xpg_if_LR_str:eF{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eF{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{\setnonlatin} % LTR -> RTL
}
{
- \__xpg_if_LR_str:eT{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eT{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{\setlatin} % RTL -> LTR
}
}
}
- \polyglossia@set@language@name[#1]{#2}
- % Set the language's/script's font families
- \str_if_eq:eeT{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/lcscript}} {latin}
- {
- \resetfontlatin
- }
- \bool_if:NF \l__xpg_inline_lang_bool
- { % This for non-inline font switches
- % in case a \<lang>font is defined
- \xpg@set@normalfont{#2}
- }
- \xpg@select@fontfamily{#2}
+ \xpg_set_language_name:n { #2 }
+ \xpg_set_normalfont:n { #2 }
+ \xpg_select_fontfamily:n { #2 }
\__xpg_use_or_warn:c{#2@language}
\cs_if_exist_use:c{#2@numbers}
- \use@localhyphenmins[#1]{#2}
+ \__xpg_use_localhyphenmins:nn { #1 } { #2 }
\__xpg_french_spacing:n { #2 }
}
-\let\xpg@pop@language\relax
+\cs_undefine:N \xpg_pop_language:
-%
-% Keep track of the active (nested) languages and options
-%
-\clist_new:N \l_xpg_lang_stack
-
-\cs_new:Nn \__xpg_stack_language:nn
-{
- \clist_gpush:Nn \l_xpg_lang_stack {#1:#2}
-}
+\DeclareDocumentEnvironment { otherlanguage } { O{} m }
+ {
+ \selectlanguage[#1]{#2}
+ } { }
-\cs_generate_variant:Nn \__xpg_stack_language:nn {nx}
+% Alias to {<lang>}, but more suitable
+% for specific (esp. tag-based) aliases
+% where {<alias>} would cause clashes
+% (e.g., \fi)
+\DeclareEnvironmentCopy { lang } { otherlanguage }
-\cs_new:Nn \__xpg_unstack_language:n
+\NewDocumentCommand \setlocalhyphenmins { m m m }
{
- \clist_gpop:NNTF \l_xpg_lang_stack \l_tmpa_tl {
- % Stored format = options:language => split:
- \seq_set_split:Nne \l_tmpa_seq {:} \l_tmpa_tl
- \seq_get_left:NN \l_tmpa_seq \l_tmpb_tl
- \seq_get_right:NN \l_tmpa_seq \l_tmpc_tl
- % Execute passed command with language and maybe options
- % and re-set stored language's keys
- \tl_if_empty:NTF \l_tmpb_tl {\cs_if_exist_use:c{#1}{\l_tmpc_tl}}
- {\__xpg_set_keys:nn{\l_tmpc_tl}{\l_tmpb_tl}
- \cs_if_exist_use:c{#1}[\l_tmpb_tl]{\l_tmpc_tl}
- }
- }
- {}
-}
-
-\DeclareDocumentEnvironment { otherlanguage } { O{} m }
- {
- % Get real current (pre-switch) options (incl. defaults)
- \clist_clear_new:N \l_xpg_current_options
- \prop_if_exist:cF { xpg@current@options@\languagename }
- { \prop_new:c {xpg@current@options@\languagename} }
- \prop_map_inline:cn {xpg@current@options@\languagename}
+ \xpg_if_language_defined:nTF{#1}
+ {
+ \cs_if_eq:ccTF { l@#1 } { l@nohyphenation }
{
- \clist_put_right:Nn \l_xpg_current_options {##1=##2}
+ \xpg_warning_msg:n {\string\setlocalhyphenmin\space~ useless~ for~ unhyphenated~ language~ #1}
+ }{
+ \providehyphenmins{#1}{#2#3}
}
- % Store current (pre-switch) options and language on stack
- \__xpg_stack_language:nx{\clist_use:Nn \l_xpg_current_options {,}}{\languagename}
- \selectlanguage[#1]{#2}
- }
- {
- % restore previous language in aux file and remove closed one from stack
- \__xpg_unstack_language:n{xpg@set@language@only@aux}
- }
-
-\newcommand{\setlocalhyphenmins}[3]{
- \xpg@ifdefined{#1}{
- \expandafter\ifx\csname l@#1\endcsname\l@nohyphenation
- \xpg@warning{\string\setlocalhyphenmin\space~ useless~ for~ unhyphenated~ language~ #1}
- \else
- \providehyphenmins{#1}{#2#3}
- \fi
}{
- \xpg@warning{\string\setlocalhyphenmin\space~ useless~ for~ unknown~ language~ #1}
+ \xpg_warning_msg:n {\string\setlocalhyphenmin\space~ useless~ for~ unknown~ language~ #1}
}
}
% \setlanghyphenmins[options]{lang}{l}{r}
-\newcommand*\setlanghyphenmins[4][]{%
+\NewDocumentCommand \setlanghyphenmins { O{} m m m }
+{
% Check for real language name and options
- \edef\xpg@tmp@opts{\xpg_alias_add_to_option_i:nn{#2}{#1}}
- \edef\xpg@tmp@lang{\xpg_alias_base_lang:n{#2}}
- \bgroup
- \xpg_error_if_lang_not_loaded:n{\xpg@tmp@lang}
- \__xpg_set_keys:nn{\xpg@tmp@lang}{\xpg@tmp@opts}
+ \tl_set:Nx \l_tmp_opts_tl { \xpg_alias_add_to_option_i:nn{#2}{#1} }
+ \tl_set:Nx \l_tmp_lang_tl { \xpg_alias_base_lang:n{#2} }
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n{\l_tmp_lang_tl}
+ \SetGlossOptions{\l_tmp_lang_tl}{ \l_tmp_opts_tl }
% Store bcp47.tag@hypenmins
- \tl_if_blank:nTF {\xpg@tmp@opts}{%
- \ifcsundef{\csname xpg@tmp@lang\endcsname @g.bcp47.tag}{
- \csedef{tmp@bcp47.tag}{\prop_item:Ne{\g_xpg_langsetup_prop}{ \xpg@tmp@lang / bcp47 }}
- }{
- \csedef{tmp@bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- }{
- \csedef{tmp@bcp47.tag}{\prop_item:Ne{\g_xpg_langsetup_prop}{ \xpg@tmp@lang / bcp47 }}
- }
- \csgdef{\csname tmp@bcp47.tag\endcsname @hyphenmins}{{#3}{#4}}
- \egroup
+ \cs_set_nopar:cpe {tmp@bcp47.tag} { \prop_item:Ne{\l_xpg_langsetup_prop}{ \l_tmp_lang_tl / bcp47 } }
+ \cs_gset:cpn {\csname tmp@bcp47.tag\endcsname @hyphenmins} {{#3}{#4}}
+ \c_group_end_token
}
-% \use@localhypenmins[options]{lang}
-\newcommand*\use@localhyphenmins[2][]{
- \bgroup
- \xpg_error_if_lang_not_loaded:n{#2}
- \__xpg_set_keys:nn{#2}{#1}
+% \__xpg_use_localhyphenmins:nn {options}{lang}
+\cs_new_nopar:Nn \__xpg_use_localhyphenmins:nn
+{
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n {#2}
+ \SetGlossOptions {#2} {#1}
% Use bcp47.tag@hypenmins
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@g.bcp47.tag}{
- \csxdef{tmp@bcp47.tag}{\prop_item:Nn{\g_xpg_langsetup_prop}{ #2 / bcp47 }}
- }{
- \csxdef{tmp@bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- }{
- \csxdef{tmp@bcp47.tag}{\prop_item:Nn{\g_xpg_langsetup_prop}{ #2 / bcp47 }}
- }
- \egroup
- \ifcsundef{\csname tmp@bcp47.tag\endcsname @hyphenmins}{
- \ifcsundef{#2hyphenmins}{}
+ \cs_gset_nopar:cpe {tmp@bcp47.tag} { \prop_item:Nn{\l_xpg_langsetup_prop}{ #2 / bcp47 } }
+ \c_group_end_token
+ \cs_if_exist:cTF {\csname tmp@bcp47.tag\endcsname @hyphenmins}
+ {
+ \tl_set:Ne \l_tmpa_tl { \use:c{\csname tmp@bcp47.tag\endcsname @hyphenmins} }
+ \expandafter \set@hyphenmins \l_tmpa_tl
+ }{
+ \cs_if_exist:cT{#2hyphenmins}
{
\expandafter\expandafter\expandafter\set@hyphenmins\csname #2hyphenmins\endcsname\relax
}
- }{
- \edef\tmpa{\csuse{\csname tmp@bcp47.tag\endcsname @hyphenmins}}
- \expandafter\expandafter\expandafter\set@hyphenmins\tmpa\relax
}
- \sys_if_engine_luatex:T{
+ \sys_if_engine_luatex:T
+ {
% Set \totalhyphenmin if specified
- \prop_get:NeNTF \g_xpg_langsetup_prop {#2/totalhyphenmin} \l_tmpa_tl
+ \prop_get:NeNT \l_xpg_langsetup_prop {#2/totalhyphenmin} \l_tmpb_tl
{
- \xpg@info{totalhyphenmin: '\l_tmpa_tl'}
- \expandafter\hyphenationmin \l_tmpa_tl
+ \xpg_info_msg:n {totalhyphenmin: '\l_tmpb_tl'}
+ \expandafter\hyphenationmin \l_tmpb_tl
}
- {}
}
}
@@ -2419,23 +2273,26 @@
\DeclareDocumentEnvironment { hyphenrules } { O{} m }
{
% Check for real language name and options
- \edef\xpg@tmp@opts{\xpg_alias_add_to_option_i:nn{#2}{#1}}
- \edef\xpg@tmp@lang{\xpg_alias_base_lang:n{#2}}
+ \tl_set:Nx \l_tmp_opts_tl { \xpg_alias_add_to_option_i:nn{#2}{#1} }
+ \tl_set:Nx \l_tmp_lang_tl { \xpg_alias_base_lang:n{#2} }
% Register the language options
- \__xpg_set_language_options:nnn {\xpg@tmp@lang} {\xpg@tmp@opts} {@xpg@set@langvariant}
+ \__xpg_set_language_options:nn { \l_tmp_lang_tl } { \l_tmp_opts_tl }
% Now switch patterns
- \__xpg_use_or_warn:c{\use:c{xpg@tmp@lang}@language}
+ \__xpg_use_or_warn:c{\use:c{l_tmp_lang_tl}@language}
% And activate hyphenmins
- \use@localhyphenmins[\xpg@tmp@opts]{\xpg@tmp@lang}
+ \__xpg_use_localhyphenmins:nn { \l_tmp_opts_tl } { \l_tmp_lang_tl }
}
{ }
-\AddToHook{begindocument/before}{
- \IfPackageLoadedTF{bidi}{
- \providecommand*{\aemph}[1]{$\overline{\hboxR{#1}}$}
+\hook_gput_code:nnn {begindocument/before} {.}
+{
+ \IfPackageLoadedTF{bidi}
+ {
+ \ProvideDocumentCommand \aemph { m } { $\overline{\hboxR{#1}}$ }
}{}
- \IfPackageLoadedTF{luabidi}{
- \providecommand*{\aemph}[1]{$\overline{\hbox{\RL{#1}}}$}
+ \IfPackageLoadedTF{luabidi}
+ {
+ \ProvideDocumentCommand \aemph { m } { $\overline{\hbox{\RL{#1}}}$ }
}{}
}
@@ -2469,7 +2326,8 @@
.value_required:n = true,
}
-\keys_set:nn { polyglossia } {
+\keys_set:nn { polyglossia }
+{
localmarks = false,
verbose = true,
babelshorthands = false,
@@ -2486,23 +2344,35 @@
\sys_if_engine_luatex:T{
\str_if_eq:eeF{\g_xpg_luatex_renderer_str}{none}
{
- \xpg@info{Setting~ LuaTeX~ font~ renderer~ to~ \g_xpg_luatex_renderer_str}
+ \xpg_info_msg:n{Setting~ LuaTeX~ font~ renderer~ to~ \g_xpg_luatex_renderer_str}
\exp_args:Ne \defaultfontfeatures{Renderer=\g_xpg_luatex_renderer_str}
}
}
-\bool_if:nF \g_xpg_verbose_bool {
- \gdef\@latex@info#1{\relax} % no latex info
- \gdef\@font@info#1{\relax} % no latex font info
- \gdef\@font@warning#1{\relax} % no latex font warnings
- \gdef\zf@PackageInfo#1{\relax} % no fontspec info
- \gdef\xpg@info#1{\relax} % no polyglossia info
+\bool_if:nF \g_xpg_verbose_bool
+{
+ \cs_gset_nopar:Npn \@latex@info #1 { \relax } % no latex info
+ \cs_gset_nopar:Npn \@font@info #1 { \relax } % no latex font info
+ \cs_gset_nopar:Npn \@font@warning #1 { \relax } % no latex font warnings
+ \msg_redirect_module:nnn { fontspec } { info } { none } % no fontspec info
+ \msg_redirect_module:nnn { polyglossia } { info } { none } % no polyglossia info
}
\bool_if:nT \g_xpg_localmarks_bool {
\__xpg_enable_local_marks:
}
+% common code to initiate babelshordhands in glosses
+\cs_new:Npn \InitializeBabelShorthands
+{
+ \cs_if_exist:cF {initiate@active@char}
+ {
+ \file_input:n {babelsh.def}
+ \initiate@active@char{"}
+ \shorthandoff{"}
+ }
+}
+
% Control shorthand (de-)activation
% This checks that the shorthand char is only deactivated
% if we have activated it ourselves and hence keeps
@@ -2530,21 +2400,22 @@
% Inherit shorthands in other languages
\NewDocumentCommand \inheritbabelshorthands { m m }
{
- \AddToHook{begindocument/before}{
+ \hook_gput_code:nnn {begindocument/before} {.}
+ {
% Load the involved languages if necessary
% Error if they do not exist
\tl_set:Nn \l__xpg_tmpa_lang_tl { \xpg_alias_base_lang:n{#1} }
\clist_if_in:NeF \xpg@loaded {\l__xpg_tmpa_lang_tl}{
\file_if_exist:nTF{gloss-\l__xpg_tmpa_lang_tl .ldf}
{ \setotherlanguage{#1} }
- { \xpg@error{ Source~ language~ #1,~ used~ in~
+ { \xpg_error_msg:n { Source~ language~ #1,~ used~ in~
\string\inheritbabelshorthands,~ does~ not~ exist } }
}
\tl_set:Nn \l__xpg_tmpb_lang_tl { \xpg_alias_base_lang:n{#2} }
\clist_if_in:NeF \xpg@loaded {\l__xpg_tmpb_lang_tl}{
\file_if_exist:nTF{gloss-\l__xpg_tmpb_lang_tl .ldf}
{ \setotherlanguage{#2} }
- { \xpg@error{ Target~ language~ #2,~ used~ in~
+ { \xpg_error_msg:n { Target~ language~ #2,~ used~ in~
\string\inheritbabelshorthands,~ does~ not~ exist } }
}
% Test whether the requested shorthands exist
@@ -2556,7 +2427,7 @@
{ \bool_set_true:N \l__xpg_no_shorthands_bool }
\bool_if:nT { \l__xpg_no_shorthands_bool }
{
- \xpg@error{ No~ babel~ shorthands~ exist~ for~ language~ #1 }
+ \xpg_error_msg:n { No~ babel~ shorthands~ exist~ for~ language~ #1 }
}
% If so, apply:
\bool_if:nF { \l__xpg_no_shorthands_bool }
@@ -2581,7 +2452,7 @@
\iflanguageloaded{\l__xpg_tmpa_lang_tl}{
\use:c{\l__xpg_tmpa_lang_tl @shorthands}
}{
- \xpg@error{ Language~ #1,~ requested~ in~
+ \xpg_error_msg:n { Language~ #1,~ requested~ in~
\string\startbabelshorthands,~ is~ not~ loaded }
}
}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex b/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex
new file mode 100644
index 00000000000..4113ae9a278
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex
@@ -0,0 +1,543 @@
+%%%
+% Arbre de calculs
+%%%
+\newtoks\toklistearbre%
+\newtoks\toklistearbrefractions%
+\newtoks\toklistearbreexpressions%
+
+\def\UpdatetoksArbreCalcul#1\nil{\IfDecimal{#1}{\addtotok\toklistearbre{#1,}}{\addtotok\toklistearbre{"#1",}}}%
+\def\UpdatetoksArbreFractions#1\nil{\addtotok\toklistearbrefractions{"#1",}}%
+\def\UpdatetoksArbreExpressions#1\nil{\addtotok\toklistearbreexpressions{"#1",}}%
+
+\setKVdefault[ArbreCalcul]{Correction=false,Couleur=LightSteelBlue,Substitue=7,Litteral=false,Largeur=8mm,LargeurC=8mm,Ecart=1.5cm,Hauteur=10mm,Lettre="x",CouleurDepart=LightGreen,Fractions=false,Nombres={},Expressions={},Etape=infinity}%
+\defKV[ArbreCalcul]{Fraction=\setKV[ArbreCalcul]{Fractions}}%
+
+\NewDocumentCommand\ArbreCalcul{om}{%
+ \useKVdefault[ArbreCalcul]%
+ \setKV[ArbreCalcul]{#1}%
+ \toklistearbre{}%
+ \toklistearbrefractions{}%
+ \toklistearbreexpressions{}%
+ \infixtoRPN{#2}%
+ \setsepchar{ }\ignoreemptyitems%
+ \readlist*\ListeNombres{\RPN}%
+ \reademptyitems%
+ \foreachitem\compteur\in\ListeNombres{\expandafter\UpdatetoksArbreCalcul\compteur\nil}%
+ \ifboolKV[ArbreCalcul]{Fractions}{%
+ \xdef\Foo{\useKV[ArbreCalcul]{Nombres}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeFractions{\Foo}%
+ \reademptyitems
+ \foreachitem\compteur\in\ListeFractions{\expandafter\UpdatetoksArbreFractions\compteur\nil}%
+ \BuildArbreCalculFraction{\the\toklistearbre}{\the\toklistearbrefractions}%
+ }{%
+ \ifboolKV[ArbreCalcul]{Litteral}{
+ \xdef\Foo{\useKV[ArbreCalcul]{Nombres}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeFractions{\Foo}%
+ \reademptyitems
+ \foreachitem\compteur\in\ListeFractions{\expandafter\UpdatetoksArbreFractions\compteur\nil}%
+ \xdef\Foo{\useKV[ArbreCalcul]{Expressions}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeExpressions{\Foo}%
+ \reademptyitems
+ \foreachitem\compteur\in\ListeExpressions{\expandafter\UpdatetoksArbreExpressions\compteur\nil}%
+% listarbre : \the\toklistearbre%
+%
+% listfracions : \the\toklistearbrefractions
+%
+% listexpressions : \the\toklistearbreexpressions
+ \BuildArbreCalculLitteral{\the\toklistearbre}{\the\toklistearbrefractions}{\the\toklistearbreexpressions}%
+ }{%
+ \BuildArbreCalcul{\the\toklistearbre}%
+ }%
+ }%
+}%
+
+\NewDocumentCommand\BuildArbreCalcul{m}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ boolean Correction,Litteral,Allume[];
+ Correction=\useKV[ArbreCalcul]{Correction};
+ Litteral=\useKV[ArbreCalcul]{Litteral};
+
+ NombreSubstitue=\useKV[ArbreCalcul]{Substitue};
+
+ etape=0;
+ Etape=\useKV[ArbreCalcul]{Etape};
+
+ color Evidence,CoulDepart;
+ Evidence=\useKV[ArbreCalcul]{Couleur};
+ CoulDepart=\useKV[ArbreCalcul]{CouleurDepart};
+
+ pair pointprec;
+
+ path base[];
+ base1=unitsquare xscaled \useKV[ArbreCalcul]{Largeur} yscaled 5mm;
+ base2=fullcircle scaled 5mm;
+ base3=unitsquare xscaled \useKV[ArbreCalcul]{LargeurC} yscaled 5mm;
+
+ vardef BlocCalcul(expr Ba,Bb,op,cha,chb)=%
+ % Ba point gauche
+ % Bb point droite
+ % op opération à afficher
+ etape:=etape+1;
+ save $;
+ picture $;
+ path cc[];
+ pair Bc;
+ Bc=(0.5*(xpart(Ba)+xpart(Bb)),if ypart(Bb)<ypart(Ba):ypart(Bb) else:ypart(Ba) fi -0.75u);
+ pointprec:=Bc+u*(0,-0.75);
+ $=image(
+ if Allume[numeropoint-1]=true:
+ cc1=base3 shifted (Ba-center base3);
+ else:
+ cc1=base1 shifted (Ba-center base1);
+ fi;
+ if Allume[numeropoint]=true:
+ cc2=base3 shifted (Bb-center base3);
+ else:
+ cc2=base1 shifted (Bb-center base1);
+ fi;
+
+ cc3=(fullcircle scaled 5mm) shifted Bc;
+ cc4=base3 shifted (pointprec-center base3);
+ if op="mul":
+ label(TEX("$\times$"),Bc);
+ ValeurPile[numeropoint-1]:=cha*chb;
+ elseif op="add":
+ label(TEX("$+$"),Bc);
+ ValeurPile[numeropoint-1]:=cha+chb;
+ elseif op="sub":
+ label(TEX("$\_$"),Bc);
+ ValeurPile[numeropoint-1]:=cha-chb;
+ elseif op="div":
+ label(TEX("$\div$"),Bc);
+ ValeurPile[numeropoint-1]:=cha/chb;
+ fi;
+ if Correction:
+ if etape<Etape+1:
+ fill cc4 withcolor Evidence;
+ label(TEX("\num{"&decimal(ValeurPile[numeropoint-1])&"}"),pointprec);
+ fi;
+ fi;
+ for l=1 upto 4:
+ trace cc[l];
+ endfor;
+ draw (Ba--Bc) cutbefore cc1 cutafter cc3;
+ draw (Bb--Bc) cutbefore cc2 cutafter cc3;
+ draw (Bc--pointprec) cutbefore cc3 cutafter cc4;
+ );
+ $
+ enddef;
+
+ numeric Valeurs[];
+ numeric Valeursa[];
+
+ string Operations[];
+
+ numeric numeropoint;
+ numeropoint=0;
+
+ numeric ValeurPile[];
+
+ vardef RecupDonnees(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ if numeric p_:
+ Valeurs[n]=p_;
+ Operations[n]="";
+ else:
+ Valeurs[n]=infinity;
+ Operations[n]=p_;
+ fi;
+ endfor;
+ n:=n+1;
+ Operations[n]="stop";
+ nbtotal=n;
+ for k=1 upto nbtotal:
+ ValeurPile[k]=0;
+ endfor;
+ enddef;
+
+ pair A[];
+ ecart=\useKV[ArbreCalcul]{Ecart};
+
+ RecupDonnees(#1);
+
+ A[0]=(0,0);
+ k=0;
+ nbetape:=0;
+
+ for p_=#1:
+ k:=k+1;
+ if numeric p_:
+ numeropoint:=numeropoint+1;
+ if unknown A[numeropoint]:A[numeropoint]-A[numeropoint-1]=ecart*(1,0);Allume[numeropoint]=false; else:
+ A[numeropoint]:=A[numeropoint-1]+ecart*(1,0); Allume[numeropoint]:=false;
+ fi;
+ if Valeurs[k]=0:Valeursa[k]:=NombreSubstitue else: Valeursa[k]=Valeurs[k] fi;
+ if Operations[k+1]="neg":
+ if Valeurs[k]=0:fill (base1 shifted (A[numeropoint]-center base1)) withcolor CoulDepart; if Litteral:
+ label(TEX("$\useKV[ArbreCalcul]{Lettre}$"),A[numeropoint]);
+ else:
+ label(TEX("\num{"&decimal(-Valeursa[k])&"}"),A[numeropoint]);
+ fi;
+ else:
+ label(TEX("\num{"&decimal(-Valeursa[k])&"}"),A[numeropoint]);
+ fi;
+ ValeurPile[numeropoint]:=-Valeursa[k];
+ else:
+ if Valeurs[k]=0:fill (base1 shifted (A[numeropoint]-center base1)) withcolor CoulDepart;if Litteral:
+ label(TEX("$\useKV[ArbreCalcul]{Lettre}$"),A[numeropoint]);
+ else:
+ label(TEX("\num{"&decimal(Valeursa[k])&"}"),A[numeropoint]);
+ fi;
+ else:
+ label(TEX("\num{"&decimal(Valeursa[k])&"}"),A[numeropoint]);
+ fi;
+ ValeurPile[numeropoint]:=Valeursa[k];
+ fi;
+ elseif string p_:
+ if p_<>"neg":
+ trace BlocCalcul(A[numeropoint-1],A[numeropoint],Operations[k],ValeurPile[numeropoint-1],ValeurPile[numeropoint]);
+ A[numeropoint-1]:=pointprec;
+ Allume[numeropoint-1]:=true;
+ numeropoint:=numeropoint-1;
+ fi;
+ fi;
+ endfor;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\BuildArbreCalculFraction{mm}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ boolean Correction,Allume[];
+ Correction=\useKV[ArbreCalcul]{Correction};
+
+ string Fraction;
+ Fraction=\useKV[ArbreCalcul]{Fraction};
+
+ color Evidence,CoulDepart;
+ Evidence=\useKV[ArbreCalcul]{Couleur};
+ CoulDepart=\useKV[ArbreCalcul]{CouleurDepart};
+
+ pair pointprec;
+
+ path base[];
+ base1=unitsquare xscaled \useKV[ArbreCalcul]{Largeur} yscaled \useKV[ArbreCalcul]{Hauteur};
+ base2=fullcircle scaled 5mm;
+ base3=unitsquare xscaled \useKV[ArbreCalcul]{LargeurC} yscaled \useKV[ArbreCalcul]{Hauteur};
+
+ vardef BlocCalcul(expr Ba,Bb,op,cha,chb)=%
+ % Ba point gauche
+ % Bb point droite
+ % op opération à afficher
+ etape:=etape+1;
+ save $;
+ picture $;
+ path cc[];
+ pair Bc;
+ Bc=(0.5*(xpart(Ba)+xpart(Bb)),if ypart(Bb)<ypart(Ba):ypart(Bb) else:ypart(Ba) fi -0.75u);
+ pointprec:=Bc+u*(0,-1.25);
+ $=image(
+ if Allume[numeropoint-1]=true:
+ cc1=base3 shifted (Ba-center base3);
+ else:
+ cc1=base1 shifted (Ba-center base1);
+ fi;
+ if Allume[numeropoint]=true:
+ cc2=base3 shifted (Bb-center base3);
+ else:
+ cc2=base1 shifted (Bb-center base1);
+ fi;
+ cc3=(fullcircle scaled 5mm) shifted Bc;
+ cc4=base3 shifted (pointprec-center base3);
+ if op="mul":
+ label(TEX("$\times$\MulFraction[Seul][3]{"&cha&"}{"&chb&"}[\ResultatMul]"),Bc);
+ ValeurPile[numeropoint-1]:="\ResultatMul";
+ elseif op="add":
+ label(TEX("$+$\AddFraction[Seul][3]{"&cha&"}{"&chb&"}[\ResultatAdd]"),Bc);
+ ValeurPile[numeropoint-1]:="\ResultatAdd";
+ elseif op="sub":
+ label(TEX("$\_$\SousFraction[Seul][3]{"&cha&"}{"&chb&"}[\ResultatSous]"),Bc);
+ ValeurPile[numeropoint-1]:="\ResultatSous";
+ elseif op="div":
+ label(TEX("$\div$\DivFraction[Seul][3]{"&cha&"}{"&chb&"}[\ResultatDiv]"),Bc);
+ ValeurPile[numeropoint-1]:="\ResultatDiv";
+ fi;
+ if Correction:
+ if etape<Etape+1:
+ fill cc4 withcolor Evidence;
+ label(TEX("$\displaystyle\tofrac{"&ValeurPile[numeropoint-1]&"}$"),pointprec);
+ fi;
+ fi;
+ for l=1 upto 4:
+ trace cc[l];
+ endfor;
+ draw (Ba--Bc) cutbefore cc1 cutafter cc3;
+ draw (Bb--Bc) cutbefore cc2 cutafter cc3;
+ draw (Bc--pointprec) cutbefore cc3 cutafter cc4;
+ );
+ $
+ enddef;
+
+ numeric Valeurs[];
+ string Valeursa[];
+
+ string Operations[];
+
+ numeric numeropoint;
+ numeropoint=0;
+
+ string ValeurPile[];
+
+ vardef RecupDonnees(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ if numeric p_:
+ Valeurs[n]=p_;
+ Operations[n]="";
+ else:
+ Valeurs[n]=infinity;
+ Operations[n]=p_;
+ fi;
+ endfor;
+ n:=n+1;
+ Operations[n]="stop";
+ nbtotal=n;
+ for k=1 upto nbtotal:
+ ValeurPile[k]="0";
+ endfor;
+ enddef;
+
+ vardef RecupFractions(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Valeursa[n]=p_;
+ endfor;
+ enddef;
+
+ pair A[];
+ ecart=\useKV[ArbreCalcul]{Ecart};
+
+ RecupDonnees(#1);
+ RecupFractions(#2);
+
+ etape=0;
+ Etape=\useKV[ArbreCalcul]{Etape};
+
+ A[0]=(0,0);
+ k=0;
+ nbetape:=0;
+
+ for p_=#1:
+ k:=k+1;
+ if numeric p_:
+ numeropoint:=numeropoint+1;
+ if unknown A[numeropoint]:A[numeropoint]-A[numeropoint-1]=ecart*(1,0);Allume[numeropoint]=false; else:
+ A[numeropoint]:=A[numeropoint-1]+ecart*(1,0); Allume[numeropoint]:=false;
+ fi;
+ if Valeurs[k]=0:Valeursa[Valeurs[k]]:=\useKV[ArbreCalcul]{Fraction} fi;
+ if Operations[k+1]="neg":
+ if Valeurs[k]=0:fill (base1 shifted (A[numeropoint]-center base1)) withcolor CoulDepart;
+ label(TEX("$\displaystyle\tofrac{"&-Valeursa[Valeurs[k]]&"}$"),A[numeropoint]);
+ else:
+ label(TEX("$\displaystyle\tofrac{"&-Valeursa[Valeurs[k]]&"}$"),A[numeropoint]);
+ fi;
+ ValeurPile[numeropoint]:=decimal(-Valeursa[Valeurs[k]]);
+ else:
+ if Valeurs[k]=0:fill (base1 shifted (A[numeropoint]-center base1)) withcolor CoulDepart;
+ label(TEX("$\displaystyle\tofrac{"&Valeursa[Valeurs[k]]&"}$"),A[numeropoint]);
+ else:
+ label(TEX("$\displaystyle\tofrac{"&Valeursa[Valeurs[k]]&"}$"),A[numeropoint]);
+ fi;
+ ValeurPile[numeropoint]:=Valeursa[Valeurs[k]];
+ fi;
+ elseif string p_:
+ if p_<>"neg":
+ trace BlocCalcul(A[numeropoint-1],A[numeropoint],Operations[k],ValeurPile[numeropoint-1],ValeurPile[numeropoint]);
+ A[numeropoint-1]:=pointprec;
+ Allume[numeropoint-1]:=true;
+ numeropoint:=numeropoint-1;
+ fi;
+ fi;
+ endfor;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\BuildArbreCalculLitteral{mmm}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ boolean Correction,Allume[];
+ Correction=\useKV[ArbreCalcul]{Correction};
+
+ color Evidence,CoulDepart;
+ Evidence=\useKV[ArbreCalcul]{Couleur};
+ CoulDepart=\useKV[ArbreCalcul]{CouleurDepart};
+
+ pair pointprec;
+
+ path base[];
+ base1=unitsquare xscaled \useKV[ArbreCalcul]{Largeur} yscaled \useKV[ArbreCalcul]{Hauteur};
+ base2=fullcircle scaled 5mm;
+ base3=unitsquare xscaled \useKV[ArbreCalcul]{LargeurC} yscaled \useKV[ArbreCalcul]{Hauteur};
+
+ vardef BlocCalcul(expr Ba,Bb,op,cha,chb)=%
+ % Ba point gauche
+ % Bb point droite
+ % op opération à afficher
+ etape:=etape+1;
+ save $;
+ picture $;
+ path cc[];
+ pair Bc;
+ Bc=(0.5*(xpart(Ba)+xpart(Bb)),if ypart(Bb)<ypart(Ba):ypart(Bb) else:ypart(Ba) fi -0.75u);
+ pointprec:=Bc+u*(0,-1.25);
+ $=image(
+ if Allume[numeropoint-1]=true:
+ cc1=base3 shifted (Ba-center base3);
+ else:
+ cc1=base1 shifted (Ba-center base1);
+ fi;
+ if Allume[numeropoint]=true:
+ cc2=base3 shifted (Bb-center base3);
+ else:
+ cc2=base1 shifted (Bb-center base1);
+ fi;
+ cc3=(fullcircle scaled 5mm) shifted Bc;
+ cc4=base3 shifted (pointprec-center base3);
+ if op="mul":
+ label(TEX("$\times$"),Bc);
+ ValeurPile[numeropoint-1]:="";
+ elseif op="add":
+ label(TEX("$+$"),Bc);
+ ValeurPile[numeropoint-1]:="";
+ elseif op="sub":
+ label(TEX("$\_$"),Bc);
+ ValeurPile[numeropoint-1]:="";
+ elseif op="div":
+ label(TEX("$\div$"),Bc);
+ ValeurPile[numeropoint-1]:="";
+ fi;
+ if Correction:
+ if etape<Etape+1:
+ fill cc4 withcolor Evidence;
+ label(TEX("$"&Valeursc[etape]&"$"),pointprec);
+ fi;
+ fi;
+ for l=1 upto 4:
+ trace cc[l];
+ endfor;
+ draw (Ba--Bc) cutbefore cc1 cutafter cc3;
+ draw (Bb--Bc) cutbefore cc2 cutafter cc3;
+ draw (Bc--pointprec) cutbefore cc3 cutafter cc4;
+ );
+ $
+ enddef;
+
+ numeric Valeurs[];
+ string Valeursa[];
+ string Valeursc[];
+
+ string Operations[];
+
+ numeric numeropoint;
+ numeropoint=0;
+
+ string ValeurPile[];
+
+ vardef RecupDonnees(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ if numeric p_:
+ Valeurs[n]=p_;
+ Operations[n]="";
+ else:
+ Valeurs[n]=infinity;
+ Operations[n]=p_;
+ fi;
+ endfor;
+ n:=n+1;
+ Operations[n]="stop";
+ nbtotal=n;
+ for k=1 upto nbtotal:
+ ValeurPile[k]="0";
+ endfor;
+ enddef;
+
+ vardef RecupFractions(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Valeursa[n]=p_;
+ endfor;
+ enddef;
+
+ vardef RecupCorrections(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Valeursc[n]=p_;
+ endfor;
+ enddef;
+
+ pair A[];
+ ecart=\useKV[ArbreCalcul]{Ecart};
+
+ RecupDonnees(#1);
+ RecupFractions(#2);
+ RecupCorrections(#3);
+
+ etape=0;
+ Etape=\useKV[ArbreCalcul]{Etape};
+
+ A[0]=(0,0);
+ k=0;
+ nbetape:=0;
+
+ for p_=#1:
+ k:=k+1;
+ if numeric p_:
+ numeropoint:=numeropoint+1;
+ if unknown A[numeropoint]:A[numeropoint]-A[numeropoint-1]=ecart*(1,0);Allume[numeropoint]=false; else:
+ A[numeropoint]:=A[numeropoint-1]+ecart*(1,0); Allume[numeropoint]:=false;
+ fi;
+ if Valeurs[k]=0:Valeursa[Valeurs[k]]:=\useKV[ArbreCalcul]{Lettre} fi;
+ if Operations[k+1]="neg":
+ if Valeurs[k]=0:fill (base1 shifted (A[numeropoint]-center base1)) withcolor CoulDepart;
+ label(TEX("$"&-Valeursa[Valeurs[k]]&"$"),A[numeropoint]);
+ else:
+ label(TEX("$"&-Valeursa[Valeurs[k]]&"$"),A[numeropoint]);
+ fi;
+ ValeurPile[numeropoint]:=decimal(-Valeursa[Valeurs[k]]);
+ else:
+ if Valeurs[k]=0:fill (base1 shifted (A[numeropoint]-center base1)) withcolor CoulDepart;
+ label(TEX("$"&Valeursa[Valeurs[k]]&"$"),A[numeropoint]);
+ else:
+ label(TEX("$"&Valeursa[Valeurs[k]]&"$"),A[numeropoint]);
+ fi;
+ ValeurPile[numeropoint]:=Valeursa[Valeurs[k]];
+ fi;
+ elseif string p_:
+ if p_<>"neg":
+ trace BlocCalcul(A[numeropoint-1],A[numeropoint],Operations[k],ValeurPile[numeropoint-1],ValeurPile[numeropoint]);
+ A[numeropoint-1]:=pointprec;
+ Allume[numeropoint-1]:=true;
+ numeropoint:=numeropoint-1;
+ fi;
+ fi;
+ endfor;
+ \end{mplibcode}
+ \fi
+}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex
index fdf037ef818..e3660cff1e1 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex
@@ -1,4 +1,4 @@
-\setKVdefault[CalculsFractions]{Couleurs=false,Negatif=false}%
+\setKVdefault[CalculsFractions]{Couleurs=false,Negatif=false,Seul=false}%
\defKV[CalculsFractions]{Couleur=\setKV[CalculsFractions]{Couleurs}\setKV[ClesSimplification]{Couleur=#1}}%
\NewDocumentCommand\tofrac{m}{%
@@ -50,7 +50,7 @@
\xdef\PfCNumD{1}%
}{%
\StrCut{#5}{/}\PfCNumC\PfCNumD%
- }
+ }%
\xdef\PfCAddFoo{\PfCNumA/\PfCNumB,\PfCNumC/\PfCNumD}%
\setsepchar[*]{,*/}\ignoreemptyitems%
\readlist*\ListeFractions{\PfCAddFoo}%
@@ -69,6 +69,7 @@
\xdef\PfCAddDenoSimp{\fpeval{\PfCAddDenoFin/\PfCAddPgcd}}%
\xdef\PfCAddSumSimp{\PfCAddNumSimp/\PfCAddDenoSimp}%
\IfValueT{#6}{\xdef#6{\PfCAddSumSimp}}%
+ \ifboolKV[CalculsFractions]{Seul}{}{%
% Partie affichage
\ensuremath{%
\IfValueTF{#3}{%
@@ -103,6 +104,7 @@
}{\tofrac{#4}\PfCFractionOp\tofrac{#5}
}%
}%
+ }%
}%
\NewDocumentCommand\SousFraction{oommo}{%
@@ -127,17 +129,18 @@
\xdef\PfCMulFoo{\PfCNumA/\PfCNumB,\PfCNumC/\PfCNumD}%
\setsepchar[*]{,*/}\ignoreemptyitems%
\readlist*\ListeFractions{\PfCMulFoo}%
- \reademptyitems
+ \reademptyitems%
\setsepchar{,}%
% Calculs
- \xdef\PfCMulNumFin{\fpeval{(\ListeFractions[1,1])*(\ListeFractions[2,1])}}
- \xdef\PfCMulDenoFin{\fpeval{\ListeFractions[1,2]*\ListeFractions[2,2]}}
+ \xdef\PfCMulNumFin{\fpeval{(\ListeFractions[1,1])*(\ListeFractions[2,1])}}%
+ \xdef\PfCMulDenoFin{\fpeval{\ListeFractions[1,2]*\ListeFractions[2,2]}}%
\PGCD{\fpeval{abs(\PfCMulNumFin)}}{\fpeval{abs(\PfCMulDenoFin)}}\xdef\PfCMulPgcd{\pgcd}%
\xdef\PfCMulNumSimp{\fpeval{\PfCMulNumFin/\PfCMulPgcd}}%
\xdef\PfCMulDenoSimp{\fpeval{\PfCMulDenoFin/\PfCMulPgcd}}%
\xdef\PfCMulPdtSimp{\PfCMulNumSimp/\PfCMulDenoSimp}%
\IfValueT{#5}{\xdef#5{\PfCMulPdtSimp}}%
- \ensuremath{%
+ \ifboolKV[CalculsFractions]{Seul}{}{%
+ \ensuremath{%
\IfValueTF{#2}{%
\ifnum#2=3\relax
\ifboolKV[CalculsFractions]{Negatif}{%
@@ -154,7 +157,8 @@
\fi
\fi
}{\tofrac{#3}\times\tofrac{#4}
- }
+ }%
+ }%
}%
}%
@@ -186,6 +190,7 @@
\xdef\PfCDivDenoSimp{\fpeval{\PfCDivDenoFin/\PfCDivPgcd}}%
\xdef\PfCDivPdtSimp{\PfCDivNumSimp/\PfCDivDenoSimp}%
\IfValueT{#5}{\xdef#5{\PfCDivPdtSimp}}%
+ \ifboolKV[CalculsFractions]{Seul}{}{%
\ensuremath{%
\IfValueTF{#2}{%
\ifnum#2=4\relax
@@ -207,4 +212,5 @@
}{\tofrac{#3}\div\tofrac{#4}
}
}%
+ }%
}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex
index 2b5ef28fbc2..e23001bbcca 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex
@@ -1,7 +1,7 @@
%%%
% Cartographie
%%%
-\setKVdefault[Cartographie]{Echelle=1,Carte=false,All=false,Europe=false,Asie=false,Amsud=false,Amnord=false,Amcentre=false,Caraibes=false,Afrique=false,AfficheEchelle=false,PaysSeul=false,VillesSup=false,VillesSupI=false,Capitales=false,Impression=false,Fleuves=false,CouleurFond=ciel,Largeur=12,Hauteur=12,Arborescence="/usr/local/texlive/2023/texmf-dist/metapost/profcollege/",Projection=false,TypeProjection="mercator",CouleurPays=Cornsilk,Pasl=2,PasL=2,Codes=false,Epaisseur=2,ModeleCouleur=5,Boussole=false,Allegee=1}
+\setKVdefault[Cartographie]{Echelle=1,Carte=false,All=false,Europe=false,Asie=false,Amsud=false,Amnord=false,Amcentre=false,Caraibes=false,Afrique=false,AfficheEchelle=false,PaysSeul=false,VillesSup=false,VillesSupI=false,Capitales=false,Impression=false,Fleuves=false,CouleurFond=ciel,Largeur=12,Hauteur=12,Arborescence="/usr/local/texlive/2023/texmf-dist/metapost/profcollege/",Projection=false,TypeProjection="mercator",CouleurPays=Cornsilk,Pasl=2,PasL=2,Codes=false,Epaisseur=2,ModeleCouleur=5,Boussole=false,Allegee=1,Maillage=false}
\defKV[Cartographie]{EchelleCarte=\setKV[Cartographie]{Carte}}
\defKV[Cartographie]{Pays=\setKV[Cartographie]{PaysSeul}}
\defKV[Cartographie]{Villes=\setKV[Cartographie]{VillesSup}}
@@ -13,8 +13,8 @@
\useKVdefault[Cartographie]%
\setKV[Cartographie]{#1}%
\mplibforcehmode%
+ \mplibnumbersystem{double}%
\ifboolKV[Cartographie]{Projection}{%
- \mplibnumbersystem{double}%
\begin{mplibcode}
input PfCMonde;
string arborescence;
@@ -217,9 +217,8 @@
Villes(\useKV[Cartographie]{VillesI});
fi;
\end{mplibcode}
- \mplibnumbersystem{scaled}%
}{%
-% \mplibforcehmode
+ % \mplibforcehmode
\begin{mplibcode}
input PfCMonde;
@@ -253,9 +252,11 @@
fi;
else:
couleurfond:=\useKV[Cartographie]{CouleurFond};
+ color couleurimpression;
+ couleurimpression:=Cornsilk;
if Impression:
noncolore:=true;
- payscolor:=0.85white;
+ payscolor:=couleurimpression;%0.85white
couleurfond:=white;
couleurfleuve:=couleurfond;
fi;
@@ -314,8 +315,7 @@
elseif t=8:lrt
fi
enddef;
-
-
+
if Carte:
Echelle:=\useKV[Cartographie]{AfficheEchelle};
figure(-0.5u*LargeurCadre,-0.5u*HauteurCadre,0.5u*LargeurCadre,0.5u*HauteurCadre);
@@ -365,11 +365,53 @@
fi;
else:
- draw(0,0)--(50,50);
- mappemonde(#2,#3);
+ boolean maillagecoord;
+ maillagecoord=\useKV[Cartographie]{Maillage};
+ if VillesSupI:
+ lacs:=false;
+ fi;
+
+ mappemonde(#2,#3);
+
+ vardef Villes(text t)=
+ pair CoordVille;
+ string NomVille;
+ n:=0;
+ for p_:=t:
+ n:=n+1;
+ if n=1:
+ %nblec:=p;
+ else:
+ if pair p_:
+ CoordVille:=Projgeo(rayon*(cosd(ypart(p_))*cosd(xpart(p_)),cosd(ypart(p_))*sind(xpart(p_)),sind(ypart(p_))));
+ elseif string p_:
+ NomVille:=p_;
+ else:
+ marque_p:="croix";
+ pointe(CoordVille);
+ label.position(p_)(TEX(""&NomVille&""),CoordVille);
+ fi;
+ fi;
+ endfor;
+ drawoptions();
+ enddef;
+
+
+ if Codes:
+ \useKV[Cartographie]{Traces};
+ fi;
+ if VillesSupI:
+ Villes(\useKV[Cartographie]{VillesI});
+ label.ulft(TEX("\tiny\ang{0}"),Projgeo(rayon*(1,0,0)));
+ label.ulft(TEX("\tiny\ang{10}"),Projgeo(rayon*(cosd(10),0,sind(10))));
+ fill (fullcircle scaled 0.75mm) shifted Projgeo(rayon*(cosd(10),0,sind(10)));
+ label.llft(TEX("\tiny\ang{10}"),Projgeo(rayon*(cosd(10),sind(10),0)));
+ fill (fullcircle scaled 0.75mm) shifted Projgeo(rayon*(cosd(10),sind(10),0));
+ fi;
fi;
\end{mplibcode}
}
+ \mplibnumbersystem{scaled}%
\else
\PackageWarning{ProfCollege}{"La commande Cartographie n'est compatible qu'avec LuaLaTeX."}
\fi
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex
index 6fc7a945935..f39b93ea469 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex
@@ -1,7 +1,7 @@
%%%
% QCM
%%%
-\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche},CouleurAlt=gray!15,Seul=false}%
+\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche},CouleurAlt=gray!15,Seul=false,ACompleter=false}%
\newlength{\LargeurQCM}%
\newlength{\PfCLargeurQCM}%
\newcounter{QuestionQCM}%
@@ -12,6 +12,8 @@
\setcounter{TotalQCMSeul}{0}%
\setcounter{TotalQCMSeulSol}{0}%
%
+\def\PfCTexteReponseEleve{Ma réponse}%
+%
\setKVdefault[QCMSeul]{Melange=false,Solution=false,EnColonne=false,LabelLettre=false}%
\defKV[QCMSeul]{Colonnes=\setKV[QCMSeul]{EnColonne}}%
%
@@ -90,150 +92,162 @@
%
\ifdef{\QCM}{%
\PackageWarning{ProfCollege}{La commande \noexpand\QCM étant définie par la classe du document, ProfCollege modifie sa commande \noexpand\QCM en \noexpand\QCMPfC.}%
- \newcommand\QCMPfC[2][]{%
- \useKVdefault[ClesQCM]%
- \setKV[ClesQCM]{#1}%
- \ifboolKV[ClesQCM]{Seul}{%
- \QCMSeul[#1]{#2}%
+\newcommand\QCMPfC[2][]{%
+ \useKVdefault[ClesQCM]%
+ \setKV[ClesQCM]{#1}%
+ \ifboolKV[ClesQCM]{Seul}{%
+ \QCMSeul[#1]{#2}%
+ }{%
+ \colorlet{PfCCouleurAlterneQCM}{\useKV[ClesQCM]{CouleurAlt}}%
+ \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
+ \setcounter{TitreQCM}{0}
+ \setsepchar[*]{,*&}\ignoreemptyitems%
+ \readlist*\ListeQCM{#2}%
+ \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
+ \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+ \ifboolKV[ClesQCM]{Multiple}{%
+ \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+ \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
+ \setsepchar[*]{/}%
+ \readlist*\ListeNomsMul{\ListeNom}%
+ \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+ \cline{2-\NBcases}%
+ \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ListeNomsMul[##2]}%
+ \\
+ \hline%
+ \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
+ }\\
+ }%
+ \hline%
+ \end{tabular}%
+ \renewcommand{\arraystretch}{1}%
}{%
- \colorlet{PfCCouleurAlterneQCM}{\useKV[ClesQCM]{CouleurAlt}}%
- \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
- \setcounter{TitreQCM}{0}
- \setsepchar[*]{,*&}\ignoreemptyitems%
- \readlist*\ListeQCM{#2}%
- \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
- \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
- \ifboolKV[ClesQCM]{Multiple}{%
- \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
- \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
- \setsepchar[*]{/}%
- \readlist*\ListeNomsMul{\ListeNom}%
+ \ifboolKV[ClesQCM]{VF}{%
+ \setKV[ClesQCM]{Reponses=2}%
+ \setlength{\PfCLargeurQCM}{\useKV[ClesQCM]{Largeur}}%
+ \setlength{\LargeurQCM}{\linewidth-6\tabcolsep-2\PfCLargeurQCM-4\arrayrulewidth}%
+ \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
\begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
\cline{2-\NBcases}%
- \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ListeNomsMul[##2]}%
- \\
+ \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
\stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
- }\\
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
+ }\\
}%
\hline%
- \end{tabular}%
- \renewcommand{\arraystretch}{1}%
+ \end{tabular}
}{%
- \ifboolKV[ClesQCM]{VF}{%
- \setKV[ClesQCM]{Reponses=2}%
- % \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
- \setlength{\PfCLargeurQCM}{\useKV[ClesQCM]{Largeur}}%
- \setlength{\LargeurQCM}{\linewidth-6\tabcolsep-2\PfCLargeurQCM-4\arrayrulewidth}%
- \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
- \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
- \cline{2-\NBcases}%
- \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
- \hline%
- \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
- }\\
- }%
- \hline%
- \end{tabular}
+ \ifboolKV[ClesQCM]{ACompleter}{%
+ \xdef\PfCTotalCases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
}{%
- \setlength{\LargeurQCM}{\fpeval{(\linewidth-2*\tabcolsep-\useKV[ClesQCM]{Reponses}*(2*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
- \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
- \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
- \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}%
- \\
- }{}
- \hline%
- \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,##2+1]%
- }\\
- }%
- \hline%
- \end{tabular}%
+ \xdef\PfCTotalCases{\useKV[ClesQCM]{Reponses}}%
}%
+ \setlength{\LargeurQCM}{\fpeval{(\linewidth-2*\tabcolsep-\PfCTotalCases*(2*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+ \xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}%
+ \begin{tabular}{|p{\LargeurQCM}|*{\PfCTotalCases}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+ % \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
+ \ifboolKV[ClesQCM]{Titre}{\cline{2-\fpeval{\PfCTotalCases+1}}%
+ \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}\ifnum\fpeval{\PfCTotalCases-\useKV[ClesQCM]{Reponses}}>0\relax\uppercase{&}\PfCTexteReponseEleve\fi%
+ \\
+ }{}%
+ \hline%
+ \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,\fpeval{##2+1}]
+ }\ifnum\fpeval{\PfCTotalCases-\useKV[ClesQCM]{Reponses}}>0\relax\uppercase{&}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\fi\\
+ }%
+ \hline%
+ \end{tabular}%
}%
- \renewcommand{\arraystretch}{1}%
}%
+ \renewcommand{\arraystretch}{1}%
}%
+}%
}{%
- \newcommand\QCM[2][]{%
- \useKVdefault[ClesQCM]%
- \setKV[ClesQCM]{#1}%
- \ifboolKV[ClesQCM]{Seul}{%
- \QCMSeul[#1]{#2}%
+\newcommand\QCM[2][]{%
+ \useKVdefault[ClesQCM]%
+ \setKV[ClesQCM]{#1}%
+ \ifboolKV[ClesQCM]{Seul}{%
+ \QCMSeul[#1]{#2}%
+ }{%
+ \colorlet{PfCCouleurAlterneQCM}{\useKV[ClesQCM]{CouleurAlt}}%
+ \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
+ \setcounter{TitreQCM}{0}
+ \setsepchar[*]{,*&}\ignoreemptyitems%
+ \readlist*\ListeQCM{#2}%
+ \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
+ \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+ \ifboolKV[ClesQCM]{Multiple}{%
+ \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+ \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
+ \setsepchar[*]{/}%
+ \readlist*\ListeNomsMul{\ListeNom}%
+ \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+ \cline{2-\NBcases}%
+ \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ListeNomsMul[##2]}%
+ \\
+ \hline%
+ \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
+ }\\
+ }%
+ \hline%
+ \end{tabular}%
+ \renewcommand{\arraystretch}{1}%
}{%
- \colorlet{PfCCouleurAlterneQCM}{\useKV[ClesQCM]{CouleurAlt}}%
- \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
- \setcounter{TitreQCM}{0}
- \setsepchar[*]{,*&}\ignoreemptyitems%
- \readlist*\ListeQCM{#2}%
- \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
- \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
- \ifboolKV[ClesQCM]{Multiple}{%
- \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
- \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
- \setsepchar[*]{/}%
- \readlist*\ListeNomsMul{\ListeNom}%
+ \ifboolKV[ClesQCM]{VF}{%
+ \setKV[ClesQCM]{Reponses=2}%
+ \setlength{\PfCLargeurQCM}{\useKV[ClesQCM]{Largeur}}%
+ \setlength{\LargeurQCM}{\linewidth-6\tabcolsep-2\PfCLargeurQCM-4\arrayrulewidth}%
+ \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
\begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
\cline{2-\NBcases}%
- \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ListeNomsMul[##2]}%
- \\
+ \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
\stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
- }\\
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
+ }\\
}%
\hline%
- \end{tabular}%
- \renewcommand{\arraystretch}{1}%
+ \end{tabular}
}{%
- \ifboolKV[ClesQCM]{VF}{%
- \setKV[ClesQCM]{Reponses=2}%
- \setlength{\PfCLargeurQCM}{\useKV[ClesQCM]{Largeur}}%
- \setlength{\LargeurQCM}{\linewidth-6\tabcolsep-2\PfCLargeurQCM-4\arrayrulewidth}%
- \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
- \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
- \cline{2-\NBcases}%
- \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
- \hline%
- \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
- }\\
- }%
- \hline%
- \end{tabular}
+ \ifboolKV[ClesQCM]{ACompleter}{%
+ \xdef\PfCTotalCases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
}{%
- \setlength{\LargeurQCM}{\fpeval{(\linewidth-2*\tabcolsep-\useKV[ClesQCM]{Reponses}*(2*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
- \xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}%
- \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
- \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
- \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}%
- \\
- }{}%
- \hline%
- \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,\fpeval{##2+1}]%
- }\\
- }%
- \hline%
- \end{tabular}%
+ \xdef\PfCTotalCases{\useKV[ClesQCM]{Reponses}}%
}%
+ \setlength{\LargeurQCM}{\fpeval{(\linewidth-2*\tabcolsep-\PfCTotalCases*(2*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+ \xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}%
+ \begin{tabular}{|p{\LargeurQCM}|*{\PfCTotalCases}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+ % \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
+ \ifboolKV[ClesQCM]{Titre}{\cline{2-\fpeval{\PfCTotalCases+1}}%
+ \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}\ifnum\fpeval{\PfCTotalCases-\useKV[ClesQCM]{Reponses}}>0\relax\uppercase{&}\PfCTexteReponseEleve\fi%
+ \\
+ }{}%
+ \hline%
+ \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,\fpeval{##2+1}]
+ }\ifnum\fpeval{\PfCTotalCases-\useKV[ClesQCM]{Reponses}}>0\relax\uppercase{&}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\fi\\
+ }%
+ \hline%
+ \end{tabular}%
}%
- \renewcommand{\arraystretch}{1}%
}%
+ \renewcommand{\arraystretch}{1}%
}%
}%
+}%
\NewDocumentCommand\PfCSolCellColor{mm}{%
\xdef\PfCFooSolColor{\ListeQCM[#1,\NumeroReponse]}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex
index df5743e4399..fc1674d37ff 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex
@@ -4,25 +4,27 @@
\newtoks\tokPfCEngrenages%
\def\UpdatetoksEngrenages#1/#2\nil{\addtotok\tokPfCEngrenages{#1,#2,}}%
-\setKVdefault[Engrenages]{Couleur=LightSteelBlue,Unite=3mm,ListeCouleurs={LightSteelBlue}}
+\setKVdefault[Engrenages]{Couleur=LightSteelBlue,Unite=3mm,ListeCouleurs={?}}%
+%\defKV[Engrenages]{Couleur=\setKV[Engrenages]{ListeCouleurs=#1}}%
\NewDocumentCommand\Engrenages{o m}{%
\newtoks\toklistecouleur%
\toklistecouleur{}%
- \tokPfCEngrenages{}
+ \tokPfCEngrenages{}%
\useKVdefault[Engrenages]%
\setKV[Engrenages]{#1}%
\setsepchar[*]{,*/}%
\ignoreemptyitems
\readlist*\ListePfCEngrenages{#2}%
- \setsepchar{,}
- \xdef\PfCFooEngrenages{}
+ \setsepchar{,}%
+ \xdef\PfCFooEngrenages{}%
\foreachitem\compteur\in\ListePfCEngrenages{%
\xdef\PfCFooEngrenages{\PfCFooEngrenages \ListePfCEngrenages[\compteurcnt,1],\ListePfCEngrenages[\compteurcnt,2],}%
}%
\xdef\ListeAvantCouleurs{\useKV[Engrenages]{ListeCouleurs}}%
\readlist*\ListeCouleur{\ListeAvantCouleurs}%
\foreachitem\couleur\in\ListeCouleur{\expandafter\UpdateCoul\couleur\nil}%
+ %\setKV[Engrenages]{Couleurs=\ListeCouleur[1]}%
\BuildEngrenages{\PfCFooEngrenages}{\the\toklistecouleur}%
}%
@@ -102,19 +104,19 @@
fi;
endfor;
);
-}
+}%
\NewDocumentCommand\BuildEngrenages{mm}{%
- \ifluatex
- \mplibforcehmode
- \begin{mplibcode}
+ \ifluatex%
+ \mplibforcehmode%
+ \begin{mplibcode}%
input PfCEngrenages;
\BuildEngrenagesCode{#1}{#2}
trace EngrenageFinal;
- \end{mplibcode}
- \else
+ \end{mplibcode}%
+ \else%
\begin{mpost}[mpsettings={input PfCEngrenages;\BuildEngrenagesCode{#1}{#2}}]
trace EngrenageFinal;
- \end{mpost}
- \fi
+ \end{mpost}%
+ \fi%
}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex
index 77c683b1486..5b95ddb02ec 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex
@@ -58,24 +58,30 @@
}%
}{%
\ifboolKV[ClesAffine]{Retrouve}{%
- On sait que $\useKV[ClesAffine]{Nom}$ est une fonction affine. Donc elle s'\'ecrit sous la forme : \[\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\useKV[ClesAffine]{CoefDir}\useKV[ClesAffine]{Variable}+\useKV[ClesAffine]{OrdoOrig}\]
- Or, $\useKV[ClesAffine]{Nom}(\num{#2})=\num{#3}$ et $\useKV[ClesAffine]{Nom}(\num{#4})=\num{#5}$. Par cons\'equent, d'apr\`es la propri\'et\'e des accroissements :
+ \xdef\OrdOrigine{\fpeval{#3-(#3-#5)*#2/(#2-#4)}}%%
+ On sait que $\useKV[ClesAffine]{Nom}$ est une fonction affine. Donc elle s'\'ecrit sous la forme : \[\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\useKV[ClesAffine]{CoefDir}\useKV[ClesAffine]{Variable}+\useKV[ClesAffine]{OrdoOrig}.\]
+ Or, $\useKV[ClesAffine]{Nom}(\num{#2})=\num{#3}$ et $\useKV[ClesAffine]{Nom}(\num{#4})=\num{#5}$. \ifnum\fpeval{#3-#5}=0
+ Les images de \num{#2} et \num{#4} sont égales à \num{#3}. La fonction affine cherchée est donc constante et s'écrit :
+ \[\useKV[ClesAffine]{Nom}:\useKV[ClesAffine]{Variable}\mapsto\num{\OrdOrigine}.\]
+ \else
+ Par cons\'equent, d'apr\`es la propri\'et\'e des accroissements :
\begin{align*}
\useKV[ClesAffine]{CoefDir}&=\frac{\useKV[ClesAffine]{Nom}(\num{#2})-\useKV[ClesAffine]{Nom}(\num{#4})}{\num{#2}-\xintifboolexpr{#4<0}{(\num{#4})}{\num{#4}}}\\
\useKV[ClesAffine]{CoefDir}&=\frac{\num{#3}-\xintifboolexpr{#5<0}{(\num{#5})}{\num{#5}}}{\num{\fpeval{#2-#4}}}\\
\useKV[ClesAffine]{CoefDir}&=\frac{\num{\fpeval{#3-#5}}}{\num{\fpeval{#2-#4}}}%\\
\SSimpliTest{\fpeval{#3-#5}}{\fpeval{#2-#4}}\ifthenelse{\boolean{Simplification}}{\\\useKV[ClesAffine]{CoefDir}&=\SSimplifie{\fpeval{#3-#5}}{\fpeval{#2-#4}}}{}%
\end{align*}
- La fonction $\useKV[ClesAffine]{Nom}$ s'\'ecrit alors sous la forme $\displaystyle\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\SSimplifie{\fpeval{#3-#5}}{\fpeval{#2-#4}}\useKV[ClesAffine]{Variable}+\useKV[ClesAffine]{OrdoOrig}$.
+ \def\PfCQuotientAffine{\fpeval{(#3-#5)/(#2-#4)}}%
+ La fonction $\useKV[ClesAffine]{Nom}$ s'\'ecrit alors sous la forme $\displaystyle\useKV[ClesAffine]{Nom}(\useKV[ClesAffine]{Variable})=\ifnum\fpeval{abs(\PfCQuotientAffine)}=1\relax\Affichage[Lettre={\useKV[ClesAffine]{Variable}}]{0}{\PfCQuotientAffine}{0}\else\SSimplifie{\fpeval{#3-#5}}{\fpeval{#2-#4}}\useKV[ClesAffine]{Variable}\fi+\useKV[ClesAffine]{OrdoOrig}$.
\\De plus, comme $\useKV[ClesAffine]{Nom}(\num{#2})=\num{#3}$, alors :
\begin{align*}
- \SSimplifie{\fpeval{#3-#5}}{\fpeval{#2-#4}}\times\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}+\useKV[ClesAffine]{OrdoOrig}&=\num{#3}\\
+ \ifnum\PfCQuotientAffine=1\relax\else\SSimplifie{\fpeval{#3-#5}}{\fpeval{#2-#4}}\times\xintifboolexpr{#2<0}{(\num{#2})}{\num{#2}}+\useKV[ClesAffine]{OrdoOrig}\uppercase{&}=\num{#3}\\\fi
\SSimplifie{\fpeval{(#3-#5)*#2}}{\fpeval{#2-#4}}+\useKV[ClesAffine]{OrdoOrig}&=\num{#3}\\
\useKV[ClesAffine]{OrdoOrig}&=\num{\fpeval{#3-(#3-#5)*#2/(#2-#4)}}
\end{align*}
- \xdef\OrdOrigine{\fpeval{#3-(#3-#5)*#2/(#2-#4)}}
La fonction affine $\useKV[ClesAffine]{Nom}$ cherch\'ee est :
- \[\useKV[ClesAffine]{Nom}:\useKV[ClesAffine]{Variable}\mapsto\SSimplifie{\fpeval{#3-#5}}{\fpeval{#2-#4}}\useKV[ClesAffine]{Variable}\xintifboolexpr{\OrdOrigine==0}{}{\xintifboolexpr{\OrdOrigine>0}{+\num{\OrdOrigine}}{-\num{\fpeval{0-\OrdOrigine}}}}\]
+ \[\useKV[ClesAffine]{Nom}:\useKV[ClesAffine]{Variable}\mapsto\ifnum\fpeval{abs(\PfCQuotientAffine)}=1\relax\Affichage[Lettre={\useKV[ClesAffine]{Variable}}]{0}{\PfCQuotientAffine}{\OrdOrigine}\else\SSimplifie{\fpeval{#3-#5}}{\fpeval{#2-#4}}\useKV[ClesAffine]{Variable}\xintifboolexpr{\OrdOrigine==0}{}{\xintifboolexpr{\OrdOrigine>0}{+\num{\OrdOrigine}}{-\num{\fpeval{0-\OrdOrigine}}}}\fi.\]
+ \fi
}{%
%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCInfixRPN.sty b/Master/texmf-dist/tex/latex/profcollege/PfCInfixRPN.sty
new file mode 100644
index 00000000000..a0851a5dd5e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCInfixRPN.sty
@@ -0,0 +1,538 @@
+%%
+%% This is file `infix-RPN.tex',
+%%
+%% IMPORTANT NOTICE:
+%%
+%% Package `infix-RPN.tex'
+%%
+%% Main code:
+%% Jean-Côme Charpentier <jean-come.charpentier@wanadoo.fr>
+%%
+%% Contributions by
+%% Christophe Jorssen <christophe.jorssen@libre.fr.invalid>
+%% `libre' is the french word for `free' :-)
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory CTAN:/macros/latex/base/lppl.txt.
+%%
+%% DESCRIPTION:
+%% `infix-RPN' is a package to convert infix expressions to
+%% Reverse Polish Notation
+%%
+%%
+\def\RCS$#1: #2 ${\expandafter\def\csname RCS#1\endcsname{#2}}
+\RCS$Revision: 1.7 $
+\RCS$Date: 2004-07-06 23:41:52+02 $
+
+\def\fileversion{0.11}
+\csname infixRPNLoaded\endcsname
+\let\infixRPNLoaded\endinput
+\message{`infix-RPN' v\fileversion\space (Rev \RCSRevision, \RCSDate), J.-C.Charpentier/C.Jorssen}
+
+\edef\PfCopAtCode{\the\catcode`\@}
+\edef\PfCopHatCode{\the\catcode`\^}
+\edef\PfCopUnderscoreCode{\the\catcode`\_}
+\catcode`\@=11\relax
+\catcode`\^=12\relax
+\catcode`\_=11\relax
+
+\def\s@pow{exp}
+\def\s@lpar{(}
+\def\s@rpar{)}
+\def\s@comma{,}
+
+\def\DeclareNewPSOperator{%
+ \bgroup
+ \catcode`\_=11\relax
+ \DeclareNewPSOperator@i
+}
+
+\def\DeclareNewPSOperator@i#1{%
+ \expandafter\ifx\csname PS@operator@list\endcsname\relax
+ \gdef\PS@operator@list{#1}%
+ \else
+ \xdef\PS@operator@list{#1,\PS@operator@list}%
+ \fi
+ \expandafter\gdef\csname s@#1\endcsname{#1}%
+ \egroup
+}
+
+\DeclareNewPSOperator{add}
+\DeclareNewPSOperator{sub}
+\DeclareNewPSOperator{mul}
+\DeclareNewPSOperator{div}
+\DeclareNewPSOperator{exp}
+\DeclareNewPSOperator{abs}
+\DeclareNewPSOperator{sin}
+\DeclareNewPSOperator{cos}
+\DeclareNewPSOperator{atan}
+\DeclareNewPSOperator{neg}
+\DeclareNewPSOperator{ceiling}
+\DeclareNewPSOperator{floor}
+\DeclareNewPSOperator{truncate}
+\DeclareNewPSOperator{sqrt}
+\DeclareNewPSOperator{ln}
+\DeclareNewPSOperator{log}
+
+
+\newcount\@parenthesis
+\newcount\token@cpt
+\newif\if@begin@token
+\newif\if@in@number
+\newif\if@in@decimal
+\newif\if@in@name
+\newif\if@sign
+\def\@tokencreate#1{%
+ \expandafter\xdef\csname PfCop@token\the\token@cpt\endcsname{#1}%
+ \global\advance\token@cpt\@ne
+ \expandafter\global
+ \expandafter\let\csname PfCop@token\the\token@cpt\endcsname\relax
+ \global\advance\token@cpt\m@ne
+}
+\def\@tokenappend#1{%
+ \expandafter\xdef\csname PfCop@token\the\token@cpt\endcsname
+ {\csname PfCop@token\the\token@cpt\endcsname#1}%
+}
+\def\@tokensingle#1{%
+ \edef\@arg{#1}%
+ \if@in@name
+ \global\advance\token@cpt\@ne
+ \@in@namefalse
+ \fi
+ \if@in@number
+ \global\advance\token@cpt\@ne
+ \@in@numberfalse
+ \@in@decimalfalse
+ \fi
+ \ifx\@arg\s@add
+ \if@sign
+ % ignore + sign
+ \global\advance\token@cpt\m@ne
+ \else
+ \@tokencreate{#1}%
+ \fi
+ \else\ifx\@arg\s@sub
+ \if@sign
+ \@tokencreate{\s@neg}%
+ \else
+ \@tokencreate{#1}%
+ \fi
+ \else
+ \@tokencreate{#1}%
+ \fi\fi
+ \global\advance\token@cpt\@ne
+}
+\def\@tokenuse#1{%
+ \expandafter\ifx\csname PfCop@token#1\endcsname\s@comma%
+ \else
+ \xdef\RPN{\RPN\space\csname PfCop@token#1\endcsname}%
+ \fi
+}
+
+\let\endscanline\relax
+\def\scan@line{%
+ \begingroup
+ \catcode`\ =12
+ \@parenthesis=\z@
+ \@in@numberfalse
+ \@in@decimalfalse
+ \@in@namefalse
+ \global\token@cpt=\@ne
+ \global\@signtrue
+ \scan@@line
+}
+\def\scan@@line#1{\scan@@@line#1\endscanline\endgroup}
+\def\scan@@@line#1#2\endscanline{%
+ \PfCop@testchar{#1}%
+ \ifPfCop@isdigit
+ \global\@signfalse
+ \if@in@number
+ \@tokenappend{#1}%
+ \else \if@in@name
+ \@in@namefalse
+ \@in@numbertrue
+ \@tokenappend{#1}%
+ \else
+ \@in@numbertrue
+ \@tokencreate{#1}%
+ \fi\fi
+ \fi
+ \ifPfCop@isplus
+ \@tokensingle{\s@add}%
+ \global\@signtrue
+ \fi
+ \ifPfCop@isminus
+ \@tokensingle{\s@sub}%
+ \global\@signtrue
+ \fi
+ \ifPfCop@ismultiply
+ \@tokensingle{\s@mul}%
+ \global\@signtrue
+ \fi
+ \ifPfCop@isdivide
+ \@tokensingle{\s@div}%
+ \global\@signtrue
+ \fi
+ \ifPfCop@ispower
+ \@tokensingle{\s@pow}%
+ \global\@signtrue
+ \fi
+ \ifPfCop@isdecimalsep
+ \global\@signfalse
+ \if@in@decimal
+ \errmessage{Syntax error: number with multiple separators!}%
+ \else \if@in@number
+ \@in@decimaltrue
+ \@tokenappend{.}%
+ \else
+ \@tokencreate{.}%
+ \@in@numbertrue
+ \@in@decimaltrue
+ \fi\fi
+ \fi
+ \ifPfCop@iscomma
+ \@tokensingle{,}%
+ \global\@signtrue
+ \fi
+ \ifPfCop@islparenthesis
+ \@tokensingle{(}%
+ \global\@signtrue
+ \fi
+ \ifPfCop@isrparenthesis
+ \global\@signfalse
+ \@tokensingle{)}%
+ \fi
+ \ifPfCop@isspace
+ \if@in@number
+ \@in@numberfalse
+ \@in@decimalfalse
+ \global\advance\token@cpt\@ne
+ \else \if@in@name
+ \@in@namefalse
+ \global\advance\token@cpt\@ne
+ \fi\fi
+ \fi
+ \ifPfCop@isother
+ \global\@signfalse
+ \if@in@name
+ \@tokenappend{#1}%
+ \else \if@in@number
+ \@in@numberfalse
+ \@in@decimalfalse
+ \@in@nametrue
+ \@tokenappend{#1}%
+ \else
+ \@in@nametrue
+ \@tokencreate{#1}%
+ \fi\fi
+ \fi
+ \def\arg{#2}%
+ \ifx\empty\arg
+ \let\next\relax
+ \else
+ \let\next\scan@@@line
+ \fi
+ \expandafter\next\arg\endscanline
+}
+\count255=`\0 \edef\PfCop@numbegin{\the\count255}
+\count255=`\9 \edef\PfCop@numend{\the\count255}
+\count255=`\+ \edef\PfCop@plus{\the\count255}
+\count255=`\- \edef\PfCop@minus{\the\count255}
+\count255=`\* \edef\PfCop@multiply{\the\count255}
+\count255=`\/ \edef\PfCop@divide{\the\count255}
+\count255=`\^ \edef\PfCop@power{\the\count255}
+\count255=`\. \edef\PfCop@dot{\the\count255}
+\count255=`\, \edef\PfCop@comma{\the\count255}
+\count255=`\( \edef\PfCop@lparenthesis{\the\count255}
+\count255=`\) \edef\PfCop@rparenthesis{\the\count255}
+\edef\PfCop@space{32}
+\newif\ifPfCop@isdigit
+\newif\ifPfCop@isplus
+\newif\ifPfCop@isminus
+\newif\ifPfCop@ismultiply
+\newif\ifPfCop@isdivide
+\newif\ifPfCop@ispower
+\newif\ifPfCop@isdecimalsep
+\newif\ifPfCop@iscomma
+\newif\ifPfCop@islparenthesis
+\newif\ifPfCop@isrparenthesis
+\newif\ifPfCop@isspace
+\newif\ifPfCop@isother
+\def\PfCop@testchar#1{%
+ \PfCop@isdigitfalse
+ \PfCop@isplusfalse
+ \PfCop@isminusfalse
+ \PfCop@ismultiplyfalse
+ \PfCop@isdividefalse
+ \PfCop@ispowerfalse
+ \PfCop@isdecimalsepfalse
+ \PfCop@iscommafalse
+ \PfCop@islparenthesisfalse
+ \PfCop@isrparenthesisfalse
+ \PfCop@isspacefalse
+ \PfCop@isotherfalse
+ \count255=`#1\relax
+ \ifnum\count255=\PfCop@plus \relax
+ \PfCop@isplustrue
+ \else \ifnum\count255=\PfCop@minus \relax
+ \PfCop@isminustrue
+ \else \ifnum\count255=\PfCop@multiply \relax
+ \PfCop@ismultiplytrue
+ \else \ifnum\count255=\PfCop@divide \relax
+ \PfCop@isdividetrue
+ \else \ifnum\count255=\PfCop@power \relax
+ \PfCop@ispowertrue
+ \else \ifnum\count255=\PfCop@dot \relax
+ \PfCop@isdecimalseptrue
+ \else \ifnum\count255=\PfCop@comma \relax
+ \PfCop@iscommatrue
+ \else \ifnum\count255=\PfCop@lparenthesis \relax
+ \PfCop@islparenthesistrue
+ \else \ifnum\count255=\PfCop@rparenthesis \relax
+ \PfCop@isrparenthesistrue
+ \else \ifnum\count255=\PfCop@space \relax
+ \PfCop@isspacetrue
+ \else \ifnum\count255<\PfCop@numbegin \relax
+ \PfCop@isothertrue
+ \else \ifnum\count255>\PfCop@numend \relax
+ \PfCop@isothertrue
+ \else \PfCop@isdigittrue
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+}
+
+\def\search@term#1#2{%
+ \begingroup
+ \count1=#1\relax
+ \count255=#2\relax
+ \ifnum\count1=\count255
+ \@tokenuse{#1}%
+ \else
+ \count5=\count255
+ \count7=\count1
+ \advance\count7\m@ne
+ \count3=\z@
+ \loop
+ \ifnum\count5>\count7
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@rpar\relax
+ \advance\@parenthesis\@ne
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@lpar\relax
+ \advance\@parenthesis\m@ne
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@add\relax
+ \ifnum\@parenthesis=\z@
+ \count3=\count5
+ \count5=\z@
+ \fi
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@sub\relax
+ \ifnum\@parenthesis=\z@
+ \count3=\count5
+ \count5=\z@
+ \fi
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@comma\relax
+ \ifnum\@parenthesis=\z@
+ \count3=\count5
+ \count5=\z@
+ \fi
+ \fi
+ \advance\count5\m@ne
+ \repeat
+ \ifnum\count3=\z@
+ \ifnum\@parenthesis=\z@
+ \search@factor{\the\count1}{\the\count255}%
+ \else
+ \errmessage{Syntax error: unbalanced parenthesis!}%
+ \fi
+ \else
+ \advance\count3\m@ne
+ \search@term{\the\count1}{\the\count3}%
+ \advance\count3\tw@
+ \search@term{\the\count3}{\the\count255}%
+ \advance\count3\m@ne
+ \@tokenuse{\the\count3}%
+ \fi
+ \fi
+ \endgroup
+}
+\def\search@factor#1#2{%
+ \begingroup
+ \count1=#1\relax
+ \count255=#2\relax
+ \ifnum\count1=\count255
+ \@tokenuse{\the\count1}%
+ \else
+ \count5=\count255
+ \count7=\count1
+ \advance\count7\m@ne
+ \count3=\z@
+ \loop
+ \ifnum\count5>\count7
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@rpar\relax
+ \advance\@parenthesis\@ne
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@lpar\relax
+ \advance\@parenthesis\m@ne
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@mul\relax
+ \ifnum\@parenthesis=\z@
+ \count3=\count5
+ \count5=\z@
+ \fi
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@div\relax
+ \ifnum\@parenthesis=\z@
+ \count3=\count5
+ \count5=\z@
+ \fi
+ \fi
+ \advance\count5\m@ne
+ \repeat
+ \ifnum\count3=\z@
+ \ifnum\@parenthesis=\z@
+ \search@power{\the\count1}{\the\count255}%
+ \else
+ \errmessage{! Syntax error: unbalanced parenthesis}%
+ \fi
+ \else
+ \advance\count3\m@ne
+ \search@factor{\the\count1}{\the\count3}%
+ \advance\count3\tw@
+ \search@factor{\the\count3}{\the\count255}%
+ \advance\count3\m@ne
+ \@tokenuse{\the\count3}%
+ \fi
+ \fi
+ \endgroup
+}
+\def\search@power#1#2{%
+ \begingroup
+ \count1=#1\relax
+ \count255=#2\relax
+ \ifnum\count1=\count255
+ \@tokenuse{#1}%
+ \else
+ \count5=\count255
+ \count7=\count1
+ \advance\count7\m@ne
+ \count3=\z@
+ \loop
+ \ifnum\count5>\count7
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@rpar\relax
+ \advance\@parenthesis\@ne
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@lpar\relax
+ \advance\@parenthesis\m@ne
+ \fi
+ \expandafter\ifx\csname PfCop@token\the\count5\endcsname\s@pow\relax
+ \ifnum\@parenthesis=\z@
+ \count3=\count5
+ \count5=\z@
+ \fi
+ \fi
+ \advance\count5\m@ne
+ \repeat
+ \ifnum\count3=\z@
+ \ifnum\@parenthesis=\z@
+ \search@primary{\the\count1}{\the\count255}%
+ \else
+ \errmessage{Syntax error: unbalanced parenthesis}%
+ \fi
+ \else
+ \advance\count3\m@ne
+ \search@power{\the\count1}{\the\count3}%
+ \advance\count3\tw@
+ \search@power{\the\count3}{\the\count255}%
+ \advance\count3\m@ne
+ \@tokenuse{\the\count3}%
+ \fi
+ \fi
+ \endgroup
+}
+\def\search@primary#1#2{%
+ \begingroup
+ \count1=#1\relax
+ \count255=#2\relax
+ \ifnum\count1=\count255
+ \@tokenuse{#1}%
+ \else
+ \edef\current@cnt{#1}%
+ \expandafter\compare@PS@operator\PS@operator@list,\@nil
+ \expandafter\ifx\csname PfCop@token#1\endcsname\s@lpar\relax
+ \expandafter\ifx\csname PfCop@token#2\endcsname\s@rpar\relax
+ \advance\count1\@ne
+ \advance\count255\m@ne
+ \search@term{\the\count1}{\the\count255}%
+ \else
+ \errmessage{Syntax error: Garbage after parenthesis
+ (tokens '#1' to '#2')}%
+ \fi
+ \fi
+ \fi
+ \endgroup
+}
+
+%\let\@nil\relax
+%\let\@nil\@empty
+
+%\def\compare@PS@operator#1,#2\@nil{%
+% \def\@tempa{#1}%
+% \def\@tempb{#2}%
+% \expandafter\ifx\csname PfCop@token\current@cnt\endcsname\@tempa%
+% \advance\count1\@ne
+% \search@primary{\the\count1}{\the\count255}%
+% \advance\count1\m@ne
+% \@tokenuse{\the\count1}%
+% \fi
+% \ifx\@tempb\empty
+% \let\next\relax
+% \let\@tempb\relax
+% \else
+% \let\next\compare@PS@operator
+% \fi
+% \expandafter\next\@tempb\@nil
+%}
+
+\let\@nil\undefined
+
+\def\compare@PS@operator#1,#2\@nil{%
+ \def\@tempa{#1}%
+ \def\@tempb{#2}%
+ \expandafter\ifx\csname PfCop@token\current@cnt\endcsname\@tempa%
+ \advance\count1\@ne
+ \search@primary{\the\count1}{\the\count255}%
+ \advance\count1\m@ne
+ \@tokenuse{\the\count1}%
+ \fi
+ \ifx\@tempb\empty
+ \let\next\@gobble
+ \else
+ \let\next\compare@PS@operator
+ \fi
+ \expandafter\next\@tempb\@nil
+}
+
+
+\def\infixtoRPN{%
+ \begingroup
+ \catcode`\ =12
+ \catcode`\^=12
+ \infixt@RPN
+}
+\def\infixt@RPN#1{%
+ \xdef\@expression{#1}%
+ \endgroup
+ \def\RPN{}%
+ \expandafter\scan@line\expandafter{\@expression}%
+ \expandafter\ifx\csname PfCop@token\the\token@cpt\endcsname\relax
+ \advance\token@cpt\m@ne
+ \fi
+ \search@term{1}{\the\token@cpt}%
+}
+
+\catcode`\@=\PfCopAtCode\relax
+\catcode`\^=\PfCopHatCode\relax
+\catcode`\_=\PfCopUnderscoreCode\relax
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex
index e0457471e18..bdb59526f0c 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex
@@ -229,5 +229,6 @@
endfor;
fi;
\end{mplibcode}
+ \mplibnumbersystem{scaled}
\fi
}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex
index 56a7ad6943b..7851f36ba79 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex
@@ -6,7 +6,7 @@
\def\UpdatetoksPuzzleA#1\nil{\addtotok\toklistepuzzlea{"#1",}}%
-\setKVdefault[ClesPuzzleMul]{Solution=false,Unite=1cm,Couleur=LightSteelBlue}
+\setKVdefault[ClesPuzzleMul]{Solution=false,Unite=1cm,Couleur=LightSteelBlue,Cube=false}
\NewDocumentCommand\PuzzleMul{om}{%
\useKVdefault[ClesPuzzleMul]%
@@ -17,8 +17,12 @@
\xdef\HauteurPuzzle{\PfCListePuzzlelen}%
\toklistepuzzlea{}%
\foreachitem\compteur\in\PfCListePuzzle{\expandafter\UpdatetoksPuzzleA\compteur\nil}%
- \BuildPuzzle{\the\toklistepuzzlea}%
-}
+ \ifboolKV[ClesPuzzleMul]{Cube}{%
+ \BuildPuzzleEspace{\the\toklistepuzzlea}%
+ }{%
+ \BuildPuzzle{\the\toklistepuzzlea}%
+ }%
+}%
\def\BuildPuzzleCode{%
def PreDrawPuzzle ( expr ww, hh, uu ) =
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex
index 117c2a09059..4fe05bc4d04 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex
@@ -22,18 +22,20 @@
\setKV[TraceG]{#1}%
\tokPfCListeDesFonctions{}%
\tokPfCListeDesNomsFonctions{}%
- \xdef\PfCFooFn{\useKV[ClesFonction]{Calcul}}
- \xdef\PfCFooNomFn{\useKV[TraceG]{NomCourbe}}
+ \xdef\PfCFooFn{\useKV[ClesFonction]{Calcul}}%
+ \xdef\PfCFooNomFn{\useKV[TraceG]{NomCourbe}}%
\ifx\bla\PfCFooFn\bla%
- \else
- \readlist*\ListeDesFonctions{\PfCFooFn}
+ \else%
+ \setsepchar{,}\ignoreemptyitems
+ \readlist*\ListeDesFonctions{\PfCFooFn}%
+ \reademptyitems
\foreachitem\compteur\in\ListeDesFonctions{\expandafter\UpdatePfCListeDesFonctions\compteur\nil}%
- \fi
- \ifx\bla\PfCFooNomFn\bla
- \else
- \readlist*\ListeDesNomsFonctions{\PfCFooNomFn}
+ \fi%
+ \ifx\bla\PfCFooNomFn\bla%
+ \else%
+ \readlist*\ListeDesNomsFonctions{\PfCFooNomFn}%
\foreachitem\compteur\in\ListeDesNomsFonctions{\expandafter\UpdatePfCListeDesNomsFonctions\compteur\nil}%
- \fi
+ \fi%
\tokPfCLabelX{}%
\tokPfCLabelY{}%
\addtotok\tokPfCLabelX{"\useKV[TraceG]{LabelX}"}%
@@ -79,7 +81,7 @@
\MPCourbeNew{\PfCFooListePoints}%
}%
}%
- }
+ }%
}{%
\setsepchar{,}\ignoreemptyitems%
\readlist*\ListeFonction{#2}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex
index dfbd3a5d233..6628d3d505a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex
@@ -1,7 +1,9 @@
%%%
% Patrons de pavés droits et cubes
%%%
-\setKVdefault[ClesPatron]{Cube,Arete=1cm,ListeCouleurs={white},Pave=false,Largeur=2cm,Hauteur=1.5cm,Profondeur=1cm,Codes=false}%
+\setKVdefault[ClesPatron]{Cube,Arete=1cm,ListeCouleurs={white},Pave=false,Largeur=2cm,Hauteur=1.5cm,Profondeur=1cm,Codes=false,AColorier=false}%
+%EcartColorier est en nombre de parts pour le cube, en mm pour le pavé.
+\defKV[ClesPatron]{EcartColorier=\setKV[ClesPatron]{AColorier}}%
\defKV[ClesPatron]{Traces=\setKV[ClesPatron]{Codes}}%
\newtoks\toklistepatron%
@@ -30,7 +32,7 @@
}%
}%
-\setsepchar{,}\ignoreemptyitems
+\setsepchar{,}\ignoreemptyitems%
\readlist*\ListePatronsCube{%
{ooxo,xxxx,ooxo},%
{oxoo,xxxx,xooo},%
@@ -78,7 +80,7 @@
{poho,lpho,poho,lohp},%
{poho,loho,plhl,loho},%
{poho,loho,plho,lohp},%
- {poho,loho,poho,lphp},%
+ {poho,loho,poho,lphp},%20
{phlh,holo,polo,holo},%
{phlo,holp,polo,holo},%
{phlo,holo,polh,holo},%
@@ -88,17 +90,17 @@
{polo,hplo,polo,holp},%
{polo,holo,phlh,holo},%
{polo,holo,phlo,holp},%
- {polo,holo,polo,hplp},%
+ {polo,holo,polo,hplp},%30
{hlpo,lopo,hopl,pool},%
{hopo,lhpo,hopl,pool},%
{hopo,lopo,hlph,pool},%
{lhpo,hopo,loph,pooh},%
{lopo,hlpo,loph,pooh},%
- {lopo,hopo,lhoh,pooh},%
+ {lopo,hopo,lhph,pooh},%
{plho,loho,pohl,hool},%
{poho,lpho,pohl,hool},%
{poho,loho,plhl,hool},%
- {lpho,poho,lohp,hoop},%
+ {lpho,poho,lohp,hoop},%40
{loho,plho,lohp,hoop},%
{loho,poho,lphp,hoop},%
{phlo,holo,polh,looh},%
@@ -108,23 +110,23 @@
{holo,phlo,holp,loop},%
{holo,polo,hplp,loop},%
{hpo,lpo,hpl,pol,hol},%
- {lpo,hpo,lph,poh,loh},%
- {pho,plo,phl,hol,pol},%
+ {lpo,hpo,lph,poh,loh},%50
+ {pho,lho,phl,hol,pol},%
{hpoo,lpho,pohl,hool},%
{lpoo,hplo,polh,looh},%
- {phoo,lhpo,hopl,pool}
-}
+ {phoo,lhpo,hopl,pool}%
+}%
\readlist*\ListePatronsPaveCouleurs{%
- {Orange,Crimson,Orange,LightGreen,Crimson,LightGreen},
- {Orange,Crimson,LightGreen,Orange,Crimson,LightGreen},
- {Orange,Crimson,LightGreen,Crimson,Orange,LightGreen},
- {Orange,Crimson,LightGreen,Crimson,LightGreen,Orange},
- {Crimson,Orange,LightGreen,Orange,Crimson,LightGreen},
- {Crimson,Orange,LightGreen,Crimson,Orange,LightGreen},
- {Crimson,Orange,LightGreen,Crimson,LightGreen,Orange},
- {Crimson,LightGreen,Orange,Crimson,Orange,LightGreen},
- {Crimson,LightGreen,Orange,Crimson,LightGreen,Orange},
+ {Orange,Crimson,Orange,LightGreen,Crimson,LightGreen},%
+ {Orange,Crimson,LightGreen,Orange,Crimson,LightGreen},%
+ {Orange,Crimson,LightGreen,Crimson,Orange,LightGreen},%
+ {Orange,Crimson,LightGreen,Crimson,LightGreen,Orange},%
+ {Crimson,Orange,LightGreen,Orange,Crimson,LightGreen},%
+ {Crimson,Orange,LightGreen,Crimson,Orange,LightGreen},%
+ {Crimson,Orange,LightGreen,Crimson,LightGreen,Orange},%
+ {Crimson,LightGreen,Orange,Crimson,Orange,LightGreen},%
+ {Crimson,LightGreen,Orange,Crimson,LightGreen,Orange},%
{Crimson,LightGreen,Crimson,Orange,LightGreen,Orange},%10
{LightGreen,Crimson,LightGreen,Orange,Crimson,Orange},%
{LightGreen,Crimson,Orange,LightGreen,Crimson,Orange},%
@@ -169,9 +171,277 @@
{Crimson,Orange,Crimson,LightGreen,Orange,LightGreen},%
{Crimson,LightGreen,Orange,Crimson,LightGreen,Orange},%
{LightGreen,Crimson,Orange,LightGreen,Crimson,Orange},%
- {Crimson,Orange,LightGreen,Crimson,Orange,LightGreen}%
+ {Crimson,Orange,LightGreen,Crimson,Orange,LightGreen}%
+}%
+\reademptyitems%
+
+\def\MPPatronPaveCode{%
+ Largeur=\useKV[ClesPatron]{Largeur};
+ Hauteur=\useKV[ClesPatron]{Hauteur};
+ Profondeur=\useKV[ClesPatron]{Profondeur};
+ %
+ pair C[],M[],N[],O[],P[];
+ %
+ color Col[],CoulDefaut;
+ CoulDefaut=white;
+ %
+ boolean Codes,Allume[][],AColorier;
+ Codes=\useKV[ClesPatron]{Codes};
+ AColorier=\useKV[ClesPatron]{AColorier};
+ if AColorier:
+ EcartColorier=\useKV[ClesPatron]{EcartColorier}*1mm;
+ fi;
+ %
+ numeric DecalCol[];
+ %
+ vardef Allumage(text t)=
+ nblignes:=0;
+ for p_=t:
+ Long:=length p_;
+ nblignes:=nblignes+1;
+ for k=0 upto Long-1:
+ Allume[nblignes][k]=false;
+ endfor;
+ endfor;
+ enddef;
+ %
+ vardef LectureLargeur(text t)=
+ for p_=t:
+ Long:=length p_;
+ endfor;
+ for k=1 upto Long-1:
+ for p_=t:
+ if substring(k,k+1) of p_="o":
+ if k=1:
+ if (substring(0,1) of p_="h") and (substring(1,2) of p_="p"):
+ DecalCol[k]:=Largeur;
+ fi;
+ if (substring(0,1) of p_="h") and (substring(1,2) of p_="l"):
+ DecalCol[k]:=Profondeur;
+ fi;
+ if (substring(0,1) of p_="p") and (substring(1,2) of p_="h"):
+ DecalCol[k]:=Largeur;
+ fi;
+ if (substring(0,1) of p_="p") and (substring(1,2) of p_="l"):
+ DecalCol[k]:=Hauteur;
+ fi;
+ if (substring(0,1) of p_="l") and (substring(1,2) of p_="h"):
+ DecalCol[k]:=Profondeur;
+ fi;
+ if (substring(0,1) of p_="l") and (substring(1,2) of p_="p"):
+ DecalCol[k]:=Hauteur;
+ fi;
+ fi;
+ elseif substring(k,k+1) of p_="l":
+ DecalCol[k]:=Largeur;
+ elseif substring(k,k+1) of p_="h":
+ DecalCol[k]:=Hauteur;
+ elseif substring(k,k+1) of p_="p":
+ DecalCol[k]:=Profondeur;
+ fi;
+ endfor;
+ endfor;
+ enddef;
+ %
+ vardef Patron(text t)=
+ path PathPave;
+ nblignes:=-1;
+ NBLignes:=0;
+ nbcol:=0;
+ nbfaces:=0;
+ for p_=t:
+ Long:=length p_;
+ nbcolonnes:=0;
+ NBColonnes:=0;
+ if substring(0,1) of p_="h":
+ YEchelle:=Hauteur;
+ elseif substring(0,1) of p_="l":
+ YEchelle:=Largeur;
+ elseif substring(0,1) of p_="p":
+ YEchelle:=Profondeur;
+ fi;
+ nblignes:=nblignes-YEchelle;
+ NBLignes:=NBLignes+1;
+ for k=1 upto Long-1:
+ if substring(k,k+1) of p_="o":
+ if k=1:
+ PathPave:=(unitsquare scaled 0) shifted ((0,-1));
+ fi;
+ elseif substring(k,k+1) of p_="l":
+ nbcol:=nbcol+1;
+ PathPave:=(unitsquare xscaled Largeur yscaled YEchelle) shifted ((nbcolonnes,nblignes));
+ Allume[NBLignes][NBColonnes]:=true;
+ nbfaces:=nbfaces+1;
+ C[nbfaces]=center PathPave;
+ M[nbfaces]=point(0) of PathPave;
+ N[nbfaces]=point(1) of PathPave;
+ O[nbfaces]=point(2) of PathPave;
+ P[nbfaces]=point(3) of PathPave;
+ elseif substring(k,k+1) of p_="h":
+ nbcol:=nbcol+1;
+ PathPave:=(unitsquare xscaled Hauteur yscaled YEchelle) shifted ((nbcolonnes,nblignes));
+ Allume[NBLignes][NBColonnes]:=true;
+ nbfaces:=nbfaces+1;
+ C[nbfaces]=center PathPave;
+ M[nbfaces]=point(0) of PathPave;
+ N[nbfaces]=point(1) of PathPave;
+ O[nbfaces]=point(2) of PathPave;
+ P[nbfaces]=point(3) of PathPave;
+ elseif substring(k,k+1) of p_="p":
+ nbcol:=nbcol+1;
+ PathPave:=(unitsquare xscaled Profondeur yscaled YEchelle) shifted ((nbcolonnes,nblignes));
+ Allume[NBLignes][NBColonnes]:=true;
+ nbfaces:=nbfaces+1;
+ C[nbfaces]=center PathPave;
+ M[nbfaces]=point(0) of PathPave;
+ N[nbfaces]=point(1) of PathPave;
+ O[nbfaces]=point(2) of PathPave;
+ P[nbfaces]=point(3) of PathPave;
+ fi;
+ if (unknown Col[nbcol]):
+ else:
+ if Col[nbcol]=white:
+ else:
+ if AColorier=false:
+ fill PathPave withcolor Col[nbcol];
+ fi;
+ fi;
+ fi;
+ if nbfaces>0:
+ trace M[nbfaces]--P[nbfaces];
+ trace N[nbfaces]--O[nbfaces];
+ trace P[nbfaces]--O[nbfaces];
+ trace M[nbfaces]--N[nbfaces];
+ fi;
+ nbcolonnes:=nbcolonnes+DecalCol[k];
+ NBColonnes:=NBColonnes+1;
+ endfor;
+ endfor;
+ enddef;
+ %
+ vardef EffectuerTraces=
+ if Codes:
+ \useKV[ClesPatron]{Traces};
+ fi;
+ enddef;
+}%
+
+\def\MPPatronPave#1#2{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ \MPPatronPaveCode
+ n:=0;
+ for p_=#2:
+ n:=n+1;
+ if color p_:
+ Col[n]=p_;
+ else:
+ Col[n]=CoulDefaut;
+ fi;
+ endfor;
+ %
+ LectureLargeur(#1);
+ Allumage(#1);
+ if AColorier:
+ drawoptions(dashed evenly);
+ fi;
+ Patron(#1);
+ if AColorier:
+ drawoptions();
+ toto:=0;
+ for l=1 upto NBLignes:
+ for k=0 upto NBColonnes-1:
+ if Allume[l][k]:
+ toto:=toto+1;
+ % trait vertical gauche
+ if k=0:
+% trace M[toto]--P[toto];
+ tpoints:=floor(abs(M[toto]-P[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[M[toto],P[toto]])--((t/tpoints)[M[toto],P[toto]]+(2*unitvector(P[toto]-M[toto])) rotated -90);
+ endfor;
+ else:
+ if Allume[l][k-1]=false:
+ % trace M[toto]--P[toto] dashed evenly;
+ tpoints:=floor(abs(M[toto]-P[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[M[toto],P[toto]])--((t/tpoints)[M[toto],P[toto]]+(2*unitvector(P[toto]-M[toto])) rotated -90);
+ endfor;
+ fi;
+ fi;
+% % trait vertical droit
+ if k=Long-1:
+ % trace N[toto]--O[toto] dashed evenly;
+ tpoints:=floor(abs(N[toto]-O[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[N[toto],O[toto]])--((t/tpoints)[N[toto],O[toto]]+(2*unitvector(O[toto]-N[toto])) rotated 90);
+ endfor;
+ else:
+ if Allume[l][k+1]=false:
+ %% trace N[toto]--O[toto] dashed evenly;
+ tpoints:=floor(abs(N[toto]-O[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[N[toto],O[toto]])--((t/tpoints)[N[toto],O[toto]]+(2*unitvector(O[toto]-N[toto])) rotated 90);
+ endfor;
+ fi;
+ fi;
+% % trait horizontal haut
+ if l=1:
+ % trace P[toto]--O[toto] dashed evenly;
+ tpoints:=floor(abs(P[toto]-O[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[P[toto],O[toto]])--((t/tpoints)[P[toto],O[toto]]+(2*unitvector(O[toto]-P[toto])) rotated -90);
+ endfor;
+ else:
+ if Allume[l-1][k]=false:
+ % trace P[toto]--O[toto] dashed evenly;
+ tpoints:=floor(abs(P[toto]-O[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[P[toto],O[toto]])--((t/tpoints)[P[toto],O[toto]]+(2*unitvector(O[toto]-P[toto])) rotated -90);
+ endfor;
+ fi;
+ fi;
+% % trait horizontal bas
+ if l=NBLignes:
+ %% trace M[toto]--N[toto] dashed evenly;
+ tpoints:=floor(abs(M[toto]-N[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[M[toto],N[toto]])--((t/tpoints)[M[toto],N[toto]]+(2*unitvector(M[toto]-N[toto])) rotated -90);
+ endfor;
+ else:
+ if Allume[l+1][k]=false:
+ %% trace M[toto]--N[toto] dashed evenly;
+ tpoints:=floor(abs(M[toto]-N[toto])/EcartColorier);
+ for t=1 upto tpoints-1:
+ trace ((t/tpoints)[M[toto],N[toto]])--((t/tpoints)[M[toto],N[toto]]+(2*unitvector(M[toto]-N[toto])) rotated -90);
+ endfor;
+ fi;
+ fi;
+ fi;
+ endfor;
+ endfor;
+ fi;
+ EffectuerTraces;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={\MPPatronPaveCode;}]
+ n:=0;
+ for p_=#2:
+ n:=n+1;
+ if color p_:
+ Col[n]=p_;
+ else:
+ Col[n]=CoulDefaut;
+ fi;
+ endfor;
+ %
+ LectureLargeur(#1);
+ Patron(#1);
+ EffectuerTraces;
+ \end{mpost}
+ \fi
}%
-\reademptyitems
\def\MPPatronCubeCode{%
Arete=\useKV[ClesPatron]{Arete};
@@ -181,6 +451,185 @@
color Col[],CoulDefaut;
CoulDefaut=white;
%
+ boolean Codes,Allume[][],AColorier;
+ Codes=\useKV[ClesPatron]{Codes};
+ AColorier=\useKV[ClesPatron]{AColorier};
+ if AColorier:
+ EcartColorier=\useKV[ClesPatron]{EcartColorier};
+ fi;
+ %
+ vardef Allumage(text t)=
+ nblignes:=-1;
+ for p_=t:
+ Long:=length p_;
+ nblignes:=nblignes+1;
+ for k=0 upto Long-1:
+ Allume[nblignes][k]=false;
+ endfor;
+ endfor;
+ enddef;
+ %
+ vardef Patron(text t)=
+ nblignes:=-1;
+ nbcol:=0;
+ nbfaces:=0;
+ for p_=t:
+ Long:=length p_;
+ nblignes:=nblignes+1;
+ nbcolonnes:=0;
+ for k=0 upto Long-1:
+ nbcolonnes:=nbcolonnes+1;
+ if substring(k,k+1) of p_="x":
+ Allume[nblignes][k]:=true;
+ nbfaces:=nbfaces+1;
+ nbcol:=nbcol+1;
+ if (unknown Col[nbcol]):
+ else:
+ if Col[nbcol]=white:
+ else:
+ if AColorier=false:
+ fill ((unitsquare scaled Arete) shifted (Arete*(nbcolonnes,-nblignes))) withcolor Col[nbcol];
+ fi;
+ fi;
+ fi;
+ C[nbfaces]=(center unitsquare scaled Arete) shifted (Arete*(nbcolonnes,-nblignes));
+ M[nbfaces]=point(0) of ((unitsquare scaled Arete) shifted (Arete*(nbcolonnes,-nblignes)));
+ N[nbfaces]=point(1) of ((unitsquare scaled Arete) shifted (Arete*(nbcolonnes,-nblignes)));
+ O[nbfaces]=point(2) of ((unitsquare scaled Arete) shifted (Arete*(nbcolonnes,-nblignes)));
+ P[nbfaces]=point(3) of ((unitsquare scaled Arete) shifted (Arete*(nbcolonnes,-nblignes)));
+ trace M[nbfaces]--P[nbfaces];
+ trace N[nbfaces]--O[nbfaces];
+ trace P[nbfaces]--O[nbfaces];
+ trace M[nbfaces]--N[nbfaces];
+ fi;
+ endfor;
+ endfor;
+ enddef;
+ %
+ vardef EffectuerTraces=
+ if Codes:
+ \useKV[ClesPatron]{Traces};
+ fi;
+ enddef;
+}%
+
+\def\MPPatronCube#1#2{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ \MPPatronCubeCode
+ %
+ n:=0;
+ for p_=#2:
+ n:=n+1;
+ if color p_:
+ Col[n]=p_;
+ else:
+ Col[n]=CoulDefaut;
+ fi;
+ endfor;
+ %
+ Allumage(#1);
+ if AColorier:
+ drawoptions(dashed withdots scaled 0.5);
+ fi;
+ Patron(#1);
+ if AColorier:
+ drawoptions();
+ toto:=0;
+ for l=0 upto nblignes:
+ for k=0 upto Long-1:
+ if Allume[l][k]:
+ toto:=toto+1;
+ % trait vertical gauche
+ if k=0:
+% trace M[toto]--P[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[M[toto],P[toto]])--((t/EcartColorier)[M[toto],P[toto]]+(2*unitvector(P[toto]-M[toto])) rotated -90);
+ endfor;
+ else:
+ if Allume[l][k-1]=false:
+% trace M[toto]--P[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[M[toto],P[toto]])--((t/EcartColorier)[M[toto],P[toto]]+(2*unitvector(P[toto]-M[toto])) rotated -90);
+ endfor;
+ fi;
+ fi;
+ % trait vertical droit
+ if k=Long-1:
+ % trace N[toto]--O[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[N[toto],O[toto]])--((t/EcartColorier)[N[toto],O[toto]]+(2*unitvector(O[toto]-N[toto])) rotated 90);
+ endfor;
+ else:
+ if Allume[l][k+1]=false:
+% trace N[toto]--O[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[N[toto],O[toto]])--((t/EcartColorier)[N[toto],O[toto]]+(2*unitvector(O[toto]-N[toto])) rotated 90);
+ endfor;
+ fi;
+ fi;
+ % trait horizontal haut
+ if l=0:
+% trace P[toto]--O[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[P[toto],O[toto]])--((t/EcartColorier)[P[toto],O[toto]]+(2*unitvector(O[toto]-P[toto])) rotated -90);
+ endfor;
+ else:
+ if Allume[l-1][k]=false:
+% trace P[toto]--O[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[P[toto],O[toto]])--((t/EcartColorier)[P[toto],O[toto]]+(2*unitvector(O[toto]-P[toto])) rotated -90);
+ endfor;
+ fi;
+ fi;
+ % trait horizontal bas
+ if l=nblignes:
+% trace M[toto]--N[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[M[toto],N[toto]])--((t/EcartColorier)[M[toto],N[toto]]+(2*unitvector(M[toto]-N[toto])) rotated -90);
+ endfor;
+ else:
+ if Allume[l+1][k]=false:
+% trace M[toto]--N[toto] dashed evenly;
+ for t=1 upto EcartColorier-1:
+ trace ((t/EcartColorier)[M[toto],N[toto]])--((t/EcartColorier)[M[toto],N[toto]]+(2*unitvector(M[toto]-N[toto])) rotated -90);
+ endfor;
+ fi;
+ fi;
+ fi;
+ endfor;
+ endfor;
+ fi;
+ EffectuerTraces;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={\MPPatronCubeCode;}]
+ %
+ n:=0;
+ for p_=#2:
+ n:=n+1;
+ if color p_:
+ Col[n]=p_;
+ else:
+ Col[n]=CoulDefaut;
+ fi;
+ endfor;
+ %
+ Patron(#1);
+ EffectuerTraces;
+ \end{mpost}
+ \fi
+}
+
+\def\MPPatronCubeCodeold{%
+ Arete=\useKV[ClesPatron]{Arete};
+ %
+ pair C[],M[],N[],O[],P[];
+ %
+ color Col[],CoulDefaut;
+ CoulDefaut=white;
+ %
boolean Codes;
Codes=\useKV[ClesPatron]{Codes};
vardef Patron(text t)=
@@ -221,7 +670,7 @@
enddef;
}%
-\def\MPPatronCube#1#2{%
+\def\MPPatronCubeold#1#2{%
\ifluatex
\mplibforcehmode
\begin{mplibcode}
@@ -259,7 +708,7 @@
\fi
}
-\def\MPPatronPaveCode{%
+\def\MPPatronPaveCodeold{%
Largeur=\useKV[ClesPatron]{Largeur};
Hauteur=\useKV[ClesPatron]{Hauteur};
Profondeur=\useKV[ClesPatron]{Profondeur};
@@ -330,7 +779,7 @@
for k=1 upto Long-1:
if substring(k,k+1) of p_="o":
if k=1:
- PathPave:=(unitsquare scaled 0);
+ PathPave:=(unitsquare scaled 0) shifted ((0,-1));
fi;
elseif substring(k,k+1) of p_="l":
nbcol:=nbcol+1;
@@ -380,7 +829,7 @@
enddef;
}%
-\def\MPPatronPave#1#2{%
+\def\MPPatronPaveold#1#2{%
\ifluatex
\mplibforcehmode
\begin{mplibcode}
@@ -397,7 +846,7 @@
%
LectureLargeur(#1);
Patron(#1);
- EffectuerTraces;
+ %EffectuerTraces;
\end{mplibcode}
\else
\begin{mpost}[mpsettings={\MPPatronPaveCode;}]
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex
index 77eecfcb428..df380d48ee4 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex
@@ -26,9 +26,11 @@
}%
}%
}{%
- \quotient{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}}}%
- \modulo{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}}}%
-% quotient = \the\intquotient -- remainder = \the\remainder :
+% \quotient{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}}}%
+% \modulo{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}}}%
+ \quotient{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Largeur}/\useKV[ClesPixelArt]{LargeurD}}}%
+ \modulo{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Largeur}/\useKV[ClesPixelArt]{LargeurD}}}%
+% quotient = \the\intquotient -- remainder = \the\remainder :\\
\BuildPixelArtGeant{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}{\the\intquotient}{\the\remainder}%
}%
}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex
new file mode 100644
index 00000000000..dc6a39b7a57
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex
@@ -0,0 +1,185 @@
+%%%
+% Probabilité et fréquence
+%%%
+\setKVdefault[PfCFrequence]{Couleur=false,Lancers=1,Legende=false}%
+\defKV[PfCFrequence]{ListeCouleurs=\setKV[PfCFrequence]{Couleur}}%
+\defKV[PfCFrequence]{Legendes=\setKV[PfCFrequence]{Legende}\setsepchar{,}\reademptyitems\readlist*\PfMListeLegendes{#1}\reademptyitems}%
+
+\newtoks\tokPfMListeObjets%
+\newtoks\tokPfMListeLegendes%
+\def\UpdatetoksObj#1\nil{\addtotok\tokPfMListeObjets{#1,}}%
+\def\UpdatetoksLegendes#1\nil{\addtotok\tokPfMListeLegendes{"#1",}}%
+
+\NewDocumentCommand\ProbaFrequence{om}{%
+ % #1 options
+ % #2 répartition
+ \tokPfMListeObjets{}%
+ \tokPfMListeLegendes{}%
+ \useKVdefault[PfCFrequence]%
+ \setKV[PfCFrequence]{#1}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\PfMListeObjets{#2}%
+ \reademptyitems%
+ \foreachitem\compteur\in\PfMListeObjets{\expandafter\UpdatetoksObj\compteur\nil}%
+ \ifboolKV[PfCFrequence]{Legende}{%
+ \foreachitem\compteur\in\PfMListeLegendes{\expandafter\UpdatetoksLegendes\compteur\nil}%
+ }{}%
+ \BuildFrequence{\the\tokPfMListeObjets}{\the\tokPfMListeLegendes}%
+}%
+
+\NewDocumentCommand\BuildFrequence{mm}{%
+ \ifluatex
+ \mplibnumbersystem{decimal}%
+ \begin{Geometrie}[CoinBG={u*(-5,0)},CoinHD={u*(7.5,7.5)}]%6 en ordonnee
+ Lancers = \useKV[PfCFrequence]{Lancers};
+ LegendeVide=0;
+ %
+ color Col[];
+ if \useKV[PfCFrequence]{Couleur}:
+ n:=0;
+ for p_=\useKV[PfCFrequence]{ListeCouleurs}:
+ n:=n+1;
+ if color p_:
+ Col[n]=p_;
+ else:
+ LegendeVide:=n;
+ fi;
+ endfor;
+ fi;
+ %
+ string Legende[];
+ vardef EcrireLegendes(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ if p_="":
+ LegendeVide:=n;
+ else:
+ Legende[n]=p_;
+ fi;
+ endfor;
+ n:=0;
+ enddef;
+ %
+ vardef LectureDonnees(text t)=
+ numeric A[];
+ numeric SommeTotale;
+ SommeTotale=0;
+ n:=0;
+ for p_=t:
+ n:=incr(n);
+ A[n]=p_;
+ SommeTotale:=SommeTotale+p_;
+ endfor;
+ total:=n;
+ enddef;
+ %
+ LectureDonnees(#1);
+ if \useKV[PfCFrequence]{Legende}:
+ EcrireLegendes(#2);
+ fi;
+ %
+ numeric borne[];
+ borne0=0;
+ for k=1 upto total:
+ borne[k]=borne[k-1]+A[k];
+ endfor;
+ %
+ x.u:=5mm;
+ y.u:=5mm;
+ quad.u:=5mm;
+ unites(1/(170*Lancers),5);
+ origine((1,4));
+ % grille
+ for k=1 upto 11:
+ draw (pp(0,0)--pp(0,1.1)) shifted(pp(k*Lancers*100,0)-pp(0,0)) withcolor gris;
+ draw (pp(0,0)--pp(Lancers*(1000+100),0)) shifted(pp(0,k/10)-pp(0,0)) withcolor gris;
+ endfor;
+ % axe
+ drawarrow pp(0,0)--pp(0,1.1);
+ drawarrow pp(0,0)--pp(Lancers*(1000+100),0);
+ % tiret
+ for k=1 upto 10:
+ draw (pp(k*Lancers*100,0)+u*(0,-0.05))--(pp(k*Lancers*100,0)+u*(0,0.05));
+ endfor;
+ numeric nb[],freq[];
+ pair Freq[][];
+ for k=1 upto total:
+ nb[k]:=0;
+ freq[k]=0;
+ endfor;
+ %
+ for k=1 upto (Lancers*1000):
+ nn:=floor(uniformdeviate(SommeTotale))+1;
+ if nn=0:
+ message("il est nul...");
+ fi;
+ for l=1 upto total:
+ if (nn>borne[l-1]) and (nn<borne[l]+1):
+ nb[l]:=nb[l]+1;
+ fi;
+ freq[l]:=nb[l]/k;
+ Freq[l][k]=pp(k,freq[l]);
+ endfor;
+ endfor;
+ %
+ def Style=enddef;
+ def Stylea=dashed evenly enddef;
+ def Styleb=dashed withdots scaled 1/2 enddef;
+ def Stylec=dashed dashpattern(on 1 off 1) enddef;
+ def Styled=dashed withdots scaled 1/4 enddef;
+ def Stylee=dashed dashpattern(on 6 off2) enddef;
+ parc:=0;
+ for l=1 upto total:
+ if \useKV[PfCFrequence]{Couleur}=false:
+ if (l mod 6)=1:
+ elseif (l mod 6)=2:
+ drawoptions(Stylea);
+ elseif (l mod 6)=3:
+ drawoptions(Styleb);
+ elseif (l mod 6)=4:
+ drawoptions(Stylec);
+ elseif (l mod 6)=5:
+ drawoptions(Styled);
+ else:
+ drawoptions(Stylee);
+ fi;
+ if \useKV[PfCFrequence]{Legende}:
+ parc:=incr(parc);
+ if l<>LegendeVide:
+ draw pp(Lancers*400*((parc-1) mod 3),-0.25-0.1*((parc-1) div 3))--pp(Lancers*400*((parc-1) mod 3)+125,-0.25-0.1*((parc-1) div 3));
+ label.rt(TEX(Legende[l]),pp(Lancers*400*((parc-1) mod 3)+125,-0.25-0.1*((parc-1) div 3)));
+ else:
+ parc:=parc-1;
+ fi;
+ fi;
+ fi;
+ %
+ if l<>LegendeVide:
+ if Lancers<1:
+ trace Freq[l][1]
+ for k=2 upto (1000*Lancers):
+ --Freq[l][k]
+ endfor withcolor if unknown Col[l]:black else:Col[l] fi;
+ else:
+ trace Freq[l][1]
+ for k=5 step 4 until (1000*Lancers):
+ --Freq[l][k]
+ endfor withcolor if unknown Col[l]:black else:Col[l] fi;
+ fi;
+ fi;
+ endfor;
+ drawoptions();
+ for k=1 upto 10 :
+ label.bot(TEX("\scriptsize\num{"&decimal((100*k)*Lancers)&"}"),pp(Lancers*100k,0));
+ endfor;
+ for k=2 step 2 until 10:
+ label.lft(TEX("\scriptsize\num{"&decimal(k/10)&"}"),pp(0,k/10));
+ endfor;
+ label.llft(TEX("\scriptsize 0"),pp(0,0));
+ label.urt(TEX("Fréquence"),pp(0,1));
+ label.bot(TEX("Nombre de lancers"),pp(0.5*Lancers*(1000+200),-0.075));
+ \end{Geometrie}
+ \mplibnumbersystem{scaled}
+ \fi
+}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex
index 9745bb144c1..aaf9a67f20b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex
@@ -4,6 +4,9 @@
\setKVdefault[ClesRelie]{Solution=false,LargeurG=5cm,LargeurD=2cm,Stretch=1.5,Ecart=2cm,Couleur=black}%
\defKV[ClesRelie]{Graine=\PfCGraineAlea{#1}}%
+\newcounter{NbRelie}%
+\newcounter{NbRelieD}
+
\NewDocumentCommand\Relie{som}{%
\useKVdefault[ClesRelie]%
\setKV[ClesRelie]{#2}%
@@ -33,7 +36,13 @@
\itemtomacro\ListeRelie[##1,1]\untest%
\ifx\bla\untest\bla%
\else%
- \tikz[remember picture,overlay]{\draw[PfCRelieCouleurTrace] (RelieG-##1) -- (RelieD-\ListeRelie[##1,3]);}%
+ \itemtomacro\ListeRelie[##1,3]\Foo
+ \setsepchar{-}\ignoreemptyitems%
+ \readlist*\ListeRelieReponses{\Foo}%
+ \reademptyitems
+ \foreachitem\compteur\in\ListeRelieReponses{%
+ \tikz[remember picture,overlay]{\draw[PfCRelieCouleurTrace] (RelieG-##1) -- (RelieD-\ListeRelieReponses[\compteurcnt]);}%
+ }
\fi
}%
}{%
@@ -41,49 +50,39 @@
}%
}%
-\newcommand\Relieold[2][]{%
- \useKVdefault[ClesRelie]%
- \setKV[ClesRelie]{#1}%
- \setsepchar[*]{,*/}\reademptyitems%
- \readlist*\ListeRelie{#2}%
- \ignoreemptyitems
- \buildtabrelie%
- \ifboolKV[ClesRelie]{Solution}{%
- \colorlet{PfCRelieCouleurTrace}{\useKV[ClesRelie]{Couleur}}%
- \xintFor* ##1 in {\xintSeq {1}{\ListeRelielen}}\do{%
- \itemtomacro\ListeRelie[##1,1]\untest
- \ifx\bla\untest\bla%
- \else
- \tikz[remember picture,overlay]{\draw[PfCRelieCouleurTrace] (RelieG-##1) -- (RelieD-\ListeRelie[##1,3]);}%
- \fi
- }%
- }{%
- }%
-}%
-
-\newcounter{NbRelie}%
-
\def\buildtabrelie{%
\setcounter{NbRelie}{0}%
+ \setcounter{NbRelieD}{0}%
\renewcommand{\arraystretch}{\useKV[ClesRelie]{Stretch}}%
- \begin{tabular}{p{\useKV[ClesRelie]{LargeurG}}cp{\useKV[ClesRelie]{Ecart}}>{\tikz[remember
- picture]{\node[name=RelieD-\theNbRelie,inner
- sep=0pt]{};\fill[] (RelieD-\theNbRelie) circle[radius=1.5pt]}}cp{\useKV[ClesRelie]{LargeurD}}}%
- \xintFor* ##1 in {\xintSeq {1}{\ListeRelielen}}\do{\ListeRelie[##1,1]\itemtomacro\ListeRelie[##1,1]\untest%
-\ifx\bla\untest\bla%
+ \begin{tabular}{p{\useKV[ClesRelie]{LargeurG}}cp{\useKV[ClesRelie]{Ecart}}cp{\useKV[ClesRelie]{LargeurD}}}%
+ \xintFor* ##1 in {\xintSeq {1}{\ListeRelielen}}\do{%
+ \ListeRelie[##1,1]\itemtomacro\ListeRelie[##1,1]\untest%
+ \ifx\bla\untest\bla%
\uppercase{&}\stepcounter{NbRelie}%
\else
\uppercase{&}\stepcounter{NbRelie}\tikz[remember
picture,overlay]{\node[name=RelieG-\theNbRelie,inner
sep=0pt]{};\fill[]
(RelieG-\theNbRelie) circle[radius=1.5pt];}
-\fi&&&\ListeRelie[##1,2]\\}%
+ \fi&&
+ \itemtomacro\ListeRelie[##1,2]\untest
+ \ifx\bla\untest\bla\else\stepcounter{NbRelieD}\tikz[remember
+ picture]{\node[name=RelieD-\theNbRelieD,inner
+ sep=0pt]{};\fill[] (RelieD-\theNbRelieD) circle[radius=1.5pt]}
+ \fi
+ &\itemtomacro\ListeRelie[##1,2]\untest%
+ \ifx\bla\untest\bla
+ \else
+ \ListeRelie[##1,2]
+ \fi\\}%
\end{tabular}%
- \setcounter{NbRelie}{0}%
+ %\setcounter{NbRelie}{0}%
+ %\setcounter{NbRelieD}{0}%
}%
\def\buildtabrelieauto{%
\setcounter{NbRelie}{0}%
+ \setcounter{NbRelieD}{0}%
\xdef\PfCFooListeNbQ{1}%
\xintFor* ##1 in{\xintSeq{2}{\ListeRelielen}}\do{%
\xdef\PfCFooListeNbQ{\PfCFooListeNbQ,##1}%
@@ -110,4 +109,5 @@
\fi&&&\itemtomacro\PfCListeReponsesMelangees[##1]\PfCNumReponses\ListeRelie[\PfCNumReponses,2]\\}%
\end{tabular}%
\setcounter{NbRelie}{0}%
-}% \ No newline at end of file
+}%
+
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex
index 9da7bce2594..037b80e50f0 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex
@@ -1,11 +1,118 @@
%%%
% Solide et sections
%%%
-\setKVdefault[ClesSolides]{Nom=cube,Aretes,Sommets,Pointilles,Largeur=1.5,Hauteur=1,Profondeur=0.75,ListeSommets={A,B,C,D,E,F,G,H},Rho=1500,Phi=30,Theta=20,Distance=50,Code=false,Couleur=white,Anglex=0,RayonCone=1,HauteurCone=2,HauteurPyramide=2,SommetsPyramide=5,Reguliere=false,DecalageSommet={(0,0,0)},RayonCylindre=1,HauteurCylindre=2,RayonSphere=1,AutoLabel=true,Sections=false,CoefSection=0.3,Axes=false,PointsSection={M,N,O,P},RemplisSection=false,ObjetSection={0.5,E,H,0.25,F,G,G,B}}%
+\setKVdefault[ClesSolides]{Nom=cube,Aretes,Sommets,Pointilles,Largeur=1.5,Hauteur=1,Profondeur=0.75,ListeSommets={A,B,C,D,E,F,G,H},Rho=1500,Phi=30,Theta=20,Distance=50,Code=false,Couleur=white,Anglex=0,Arete=1,RayonCone=1,HauteurCone=2,HauteurPrisme=2,SommetsPrisme=6,HauteurPyramide=2,SommetsPyramide=5,Reguliere=false,DecalageSommet={(0,0,0)},RayonCylindre=1,HauteurCylindre=2,RayonSphere=1,AutoLabel=true,Sections=false,CoefSection=0.3,Axes=false,PointsSection={M,N,O,P},RemplisSection=false,ObjetSection={0.5,E,H,0.25,F,G,G,B}}%
\defKV[ClesSolides]{Traces=\setKV[ClesSolides]{Code}}%
\defKV[ClesSolides]{Section=\setKV[ClesSolides]{Sections}}%
\defKV[ClesSolides]{CouleurSection=\setKV[ClesSolides]{RemplisSection}}%
+\newcommand\MPSolidePrisme[4]{%
+ \ifluatex
+ \mplibnumbersystem{double}
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ boolean Pointilles,TraceArete,NommeSommets,Code,AutoLabel,Sections,RemplisSection;
+ AutoLabel:=\useKV[ClesSolides]{AutoLabel};
+ Pointilles=\useKV[ClesSolides]{Pointilles};
+ TraceArete=\useKV[ClesSolides]{Aretes};
+ NommeSommets=\useKV[ClesSolides]{Sommets};
+ Code=\useKV[ClesSolides]{Code};
+ Sections:=\useKV[ClesSolides]{Sections};
+ RemplisSection=\useKV[ClesSolides]{RemplisSection};
+ if RemplisSection:color CouleurSection;CouleurSection=\useKV[ClesSolides]{CouleurSection};fi;
+
+ color PfCOutColor;
+ PfCOutColor=Cornsilk;%\useKV[ClesSolides]{Couleur};
+
+ string Section;
+ if Sections:Section=\useKV[ClesSolides]{Section};fi;
+
+ %Initialisation
+ PfCRho=\useKV[ClesSolides]{Rho};
+ PfCPhi=\useKV[ClesSolides]{Phi};
+ PfCTheta=\useKV[ClesSolides]{Theta};
+ PfCDistance=\useKV[ClesSolides]{Distance};
+ anglerotationx=\useKV[ClesSolides]{Anglex};
+ hauteurprisme=\useKV[ClesSolides]{HauteurPrisme};
+ nombresommets=\useKV[ClesSolides]{SommetsPrisme};
+ Initialisation(PfCRho,PfCPhi,PfCTheta,PfCDistance);
+ typetrace:="3D";
+ typerepre:="persp";
+ eclairage:=false;
+ incolor:=white;
+ outcolor:=white;
+ if Pointilles=false:
+ pointilles:="non";
+ fi;
+
+ Ferme1:=true;
+
+ color A,B,C,D,E,F,G,H;
+ color Sommet[];
+
+ NbS:=nombresommets;
+
+ color TS[];
+
+ ecartangle=360/(NbS/2);
+ for k=1 upto (NbS/2):
+ repereangle:=(k-2)*ecartangle+(ecartangle*0.25+uniformdeviate(floor(ecartangle/2)));
+ TS[k]:=(cosd(repereangle),-sind(repereangle),0);
+ endfor;
+ TS[NbS/2+1]:=TS[1];
+
+ for k=1 upto (NbS/2):
+ TS[NbS/2+1+k]:=TS[k]+(0,0,hauteurprisme);
+ endfor;
+ TS[NbS+2]:=TS[NbS/2+2];
+
+ angx:=anglerotationx;
+ for k=1 upto (NbS+2):
+ TS[k]:=RotXYZ(TS[k]);
+ endfor;
+ angx:=0;
+
+ ObjetNew1(%
+ TS1, for k=2 upto (NbS+1):TS[k], endfor TS[NbS+2]
+ )(%
+ NbS/2, for p_=1 upto NbS/2:p_, endfor
+ NbS/2, for p_=NbS/2+1 downto NbS+2:p_, endfor
+ for p=1 upto NbS/2:
+ 4,p,p+1,NbS/2+1+p+1,NbS/2+1+p,%
+ endfor
+ );
+ %AffichageObjet1;
+
+ NF:=(NbS/2+2);
+ Fc[100*(NbS/2+1)]:=NbS/2;
+ for k=1 upto NbS/2:
+ Fc[100*(NbS/2+1)+k]:=k;
+ endfor;
+ Fc[100*(NbS/2+2)]:=NbS/2;
+ for k=1 upto NbS/2:
+ Fc[100*(NbS/2+2)+k]:=NbS+2-k;
+ endfor;
+ for l=1 upto NbS/2:
+ Fc[l*100]:=4;
+ %for k=1 upto 4:
+ Fc[l*100+1]:=l;Fc[l*100+4]:=l+1;Fc[l*100+3]:=NbS/2+1+l+1;Fc[l*100+2]:=NbS/2+1+l;
+ %Fc[101]:=1;Fc[102]:=2;Fc[103]:=6;Fc[104]:=5;
+ %endfor;
+ endfor;
+ DessineObjet;
+% picture Depart;
+% Depart=currentpicture;
+% currentpicture:=nullpicture;
+% for k=1 upto 8:
+% dotlabel.top(decimal(k),Projette(TS[k]));
+% endfor;
+ \end{mplibcode}
+ \mplibnumbersystem{scaled}
+ \fi
+}
+
\newcommand\MPSolideCylindre[3]{%
\ifluatex
\mplibnumbersystem{double}
@@ -927,7 +1034,7 @@
\foreachitem\compteur\in\ListeNomSommet{\expandafter\UpdatetoksSolide\compteur\nil}%\the\toksolidelistesommets%
\IfStrEqCase{\useKV[ClesSolides]{Nom}}{%
{cube}{%
- \MPSolidePave{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{1,1,1}{\useKV[ClesSolides]{PointsSection}}{\useKV[ClesSolides]{ObjetSection}}%
+ \MPSolidePave{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{Arete},\useKV[ClesSolides]{Arete},\useKV[ClesSolides]{Arete}}{\useKV[ClesSolides]{PointsSection}}{\useKV[ClesSolides]{ObjetSection}}%
}%
{pave}{%
\MPSolidePave{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{Profondeur},\useKV[ClesSolides]{Largeur},\useKV[ClesSolides]{Hauteur}}{\useKV[ClesSolides]{PointsSection}}{\useKV[ClesSolides]{ObjetSection}}%
@@ -935,6 +1042,9 @@
{cone}{%
\MPSolideCone{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{PointsSection}}%
}%
+ {prisme}{%
+ \MPSolidePrisme{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{}{\useKV[ClesSolides]{PointsSection}}%
+ }%
{pyramide}{%
\MPSolidePyramide{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{DecalageSommet}}{\useKV[ClesSolides]{PointsSection}}%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex
index 949c781ce78..461a42fb717 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex
@@ -18,9 +18,10 @@
Axes=false,%Affichage des axes ou pas
Origine={(0,0)},%Origine des axes
Cases=false,%Se déplace-t-on sur des cases ?
+ Trace=false%
}
\defKV[Tortue]{Etape=\setKV[Tortue]{Etapes}}%choix de l'étape d'arrêt
-
+\defKV[Tortue]{Traces=\setKV[Tortue]{Trace}}%
\newcounter{PfCTortue}
\setcounter{PfCTortue}{0}
@@ -178,6 +179,9 @@
\ifboolKV[Tortue]{Etapes}{%
\immediate\write\turtle@out{drawoptions(withcolor DarkGreen);label(btex \noexpand\Large\noexpand\ding{40} etex rotated RetiensAngle[Total] scaled 1.5,A[Total]);}%
}{\ifboolKV[Tortue]{TortueF}{\immediate\write\turtle@out{drawoptions(withcolor DarkGreen);label(btex \noexpand\Large\noexpand\ding{40} etex rotated RetiensAngle[k] scaled 1.5,A[k]);}}{}}%
+ \ifboolKV[Tortue]{Trace}{%
+ \immediate\write\turtle@out{\useKV[Tortue]{Traces}}%
+ }{}%
\immediate\closeout\turtle@out%
\restorecomparemode%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex b/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex
new file mode 100644
index 00000000000..895f96136c2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex
@@ -0,0 +1,928 @@
+%%%
+% Urne et probabilités
+%%%
+\newtoks\tokUrneListeCouleurs%
+\newtoks\tokUrneListeColonnes%
+\newtoks\tokUrneListeNombres%
+
+\def\UpdatetoksUrneCouleurs#1\nil{\addtotok\tokUrneListeCouleurs{#1,}}%
+\def\UpdatetoksUrneNombres#1\nil{\addtotok\tokUrneListeNombres{"#1",}}%
+\def\UpdatetoksUrneColonnes#1\nil{\addtotok\tokUrneListeColonnes{"#1",}}%
+
+\setKVdefault[PfCUrne]{Couleurs=false,Nombres=false,Pas=4,Echelle=1,Repartition={1,2,3},Double=false,RepartitionC={1,2,3},RepartitionN={1,2,3},Roue=false,Rayon=3,Tableau=false,SansRemise=false,Solution=false,Codes=false,CouleurLigne=0.85white,CouleurColonne=0.85white,Different=false,RepartitionLigne={1,2,3},RepartitionColonne={1,2,3},Impression,Casino=false}%
+\defKV[PfCUrne]{Traces=\setKV[PfCUrne]{Codes}}%
+\defKV[PfCUrne]{ListeCouleurs=\setKV[PfCUrne]{Couleurs}\setsepchar{,}\ignoreemptyitems\readlist*\ListeCouleursAv{#1}\reademptyitems}%
+\defKV[PfCUrne]{ListeNombres=\setKV[PfCUrne]{Nombres}\setsepchar{,}\ignoreemptyitems\readlist*\ListeNombresAv{#1}\reademptyitems}%
+\defKV[PfCUrne]{ListeColonne=\setsepchar{,}\ignoreemptyitems\readlist*\ListeCouleursAv{#1}\reademptyitems}%
+\defKV[PfCUrne]{ListeLigne=\setsepchar{,}\ignoreemptyitems\readlist*\ListeNombresAv{#1}\reademptyitems}%
+
+\NewDocumentCommand\BuildRoulette{}{%
+ \ifluatex
+ \begin{Geometrie}[Cadre="aucun"]
+ u:=\useKV[PfCUrne]{Echelle}*1cm;
+
+ color colzero,colrouge,coltoura,coltourb,colbarre;
+
+ boolean Impression;
+ Impression=\useKV[PfCUrne]{Impression};
+
+ if Impression=false:
+ colzero=green;
+ colrouge=red;
+ coltoura=(179,103,0)/256;
+ coltourb=(179,111,48)/256;%(184,114,50)/256;
+ colbarre=0.7529white;
+ else:
+ colzero=white;
+ colrouge=white;
+ coltoura=black;
+ coltourb=black;
+ colbarre=black;
+ fi;
+ pair O,A[],B[],C[],D[];
+ path cc[];
+ O=(0,0);
+ cc1=cercles(O,2u);
+ cc2=cercles(O,2.75u);
+ cc3=cercles(O,3.5u);
+ cc4=cercles(O,3.7u);
+ cc5=cercles(O,4u);
+ cc6=cercles(O,3.125u);
+ cc7=cercles(O,2.375u);
+ if Impression=false:
+ fill cc5 withcolor coltoura;
+ fill cc4 withcolor coltourb;
+ fill cc1 withcolor coltoura;
+ trace cc1 withpen pencircle scaled 1.05;
+ trace cc5 withpen pencircle scaled 1.05;
+ trace cc4 withpen pencircle scaled 1.05;
+ trace cc3 withpen pencircle scaled 1.05;
+ else:
+ fill cc5;
+ fill cc4 withcolor white;
+ trace cc1;
+ trace cc3;
+ fi;
+ for k=0 upto 38:
+ A[k]=pointarc(cc3,90-k*(360/37));
+ B[k]=pointarc(cc1,90-k*(360/37));
+ endfor;
+ na:=1;
+ for p_=32,15,19,4,21,2,25,17,34,6,27,13,36,11,30,8,23,10,5,24,16,33,1,20,14,31,9,22,18,29,7,28,12,35,3,26,0:
+ if (na mod 2)=0:
+ fill arccercle(A[na],A[na-1],O)--B[na-1]--reverse(arccercle(B[na],B[na-1],O))--cycle;
+ drawoptions(withcolor white);
+ label(TEX("\textbf{"&decimal(p_)&"}") rotated (-na*(360/37)),pointarc(cc6,90+0.5*(360/37)-na*(360/37)));
+ drawoptions();
+ else:
+ if p_=0:
+ fill arccercle(A[na],A[na-1],O)--B[na-1]--reverse(arccercle(B[na],B[na-1],O))--cycle withcolor colzero;
+ else:
+ fill arccercle(A[na],A[na-1],O)--B[na-1]--reverse(arccercle(B[na],B[na-1],O))--cycle withcolor colrouge;
+ fi;
+ if Impression=false:
+ drawoptions(withcolor white);
+ fi;
+ label(TEX("\textbf{"&decimal(p_)&"}") rotated (-na*(360/37)),pointarc(cc6,90+0.5*(360/37)-na*(360/37)));
+ if Impression=false:
+ drawoptions();
+ fi;
+ fi;
+ trace arccercle(A[na],A[na-1],O)--B[na-1]--reverse(arccercle(B[na],B[na-1],O))--cycle;
+ na:=na+1;
+ endfor;
+ trace cc2;
+ fill cercles(pointarc(cc7,90+0.5*(360/37)),0.125u);%dotlabel("",);
+ % barre
+ cc8=cercles(O,1.5u);
+ cc9=cercles(O,0.25u);
+ fill cc9 withcolor colbarre;
+ pair E[];
+ anglebase=floor(uniformdeviate(360));
+ E1=pointarc(cc8,anglebase);
+ E4=pointarc(cc8,anglebase+6);
+ E3=symetrie(E1,O);
+ E2=symetrie(E4,O);
+ E5=pointarc(cc8,anglebase+90);
+ E8=pointarc(cc8,anglebase+6+90);
+ E7=symetrie(E5,O);
+ E6=symetrie(E8,O);
+ fill polygone(E1,E2,E3,E4) withcolor colbarre;
+ fill polygone(E5,E6,E7,E8) withcolor colbarre;
+ pair F[];
+ F1=(E1--iso(E1,E2)) intersectionpoint cc9;
+ F2=(E4--iso(E3,E4)) intersectionpoint cc9;
+ F3=(E5--iso(E6,E5)) intersectionpoint cc9;
+ F4=(E8--iso(E7,E8)) intersectionpoint cc9;
+ F5=(E3--iso(E4,E3)) intersectionpoint cc9;
+ F6=(E2--iso(E2,E1)) intersectionpoint cc9;
+ F7=(E7--iso(E8,E7)) intersectionpoint cc9;
+ F8=(E6--iso(E6,E5)) intersectionpoint cc9;
+ trace E1--E4--F2--arccercle(F2,F3,O)--E5--E8--F4--arccercle(F4,F5,O)--E3--E2--F6--arccercle(F6,F7,O)--E7--E6--F8--arccercle(F8,F1,O)--cycle;
+ \end{Geometrie}
+ \fi
+}%
+
+\NewDocumentCommand\BuildTableauDoubleEntreeDifferent{mmmm}{%
+ % #1 : les labels en colonne
+ % #2 : les labels en ligne
+ % #3 : la répartition en colonne
+ % #4 : la répartition en ligne
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ u:=\useKV[PfCUrne]{Echelle}*1cm;
+ numeric RetiensNumC[],RetiensNumL[];
+ %
+ vardef RecupRepartition(text t)=
+ n:=0;
+ for p_=t:
+ RetiensNumL[n]=p_;
+ n:=n+1;
+ endfor;
+ totallignes=n;
+ enddef;
+ %
+ vardef RecupRepartitionC(text t)=
+ n:=0;
+ for p_=t:
+ RetiensNumC[n]=p_;
+ n:=n+1;
+ endfor;
+ totalcolonnes=n;
+ enddef;
+ %
+ string Colonnes[];
+ vardef RecuperationColonnes(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Colonnes[n]=p_;
+ endfor;
+ enddef;
+ %
+ string Lignes[];
+ vardef RecuperationLignes(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Lignes[n]=p_;
+ endfor;
+ enddef;
+ %
+ boolean Solution, Codes;
+ Solution=\useKV[PfCUrne]{Solution};
+ Codes=\useKV[PfCUrne]{Codes};
+ %
+ color ColLigne,ColColonne;
+ ColLigne=\useKV[PfCUrne]{CouleurLigne};
+ ColColonne=\useKV[PfCUrne]{CouleurColonne};
+ %
+ RecupRepartitionC(#3);
+ RecupRepartition(#4);
+ RecuperationColonnes(#1);
+ RecuperationLignes(#2);
+
+ pair A[][],C[][];
+ for k=0 upto totallignes+1:
+ for l=0 upto totalcolonnes+1:
+ A[k][l]=(0,0) shifted(u*(l,-k));
+ C[k][l]=A[k][l] shifted(u*(0.5,-0.5));
+ endfor;
+ endfor;
+
+ fill polygone(A[0][1],A[0][totalcolonnes+1],A[1][totalcolonnes+1],A[1][1]) withcolor ColLigne;
+ fill polygone(A[1][0],A[totallignes+1][0],A[totallignes+1][1],A[1][1]) withcolor ColColonne;
+ for k=1 upto totalcolonnes:
+ label(TEX(Colonnes[RetiensNumC[k-1]]),iso(A[1][k],A[0][k+1]));
+ endfor;
+ for k=1 upto totallignes:
+ label(TEX(Lignes[RetiensNumL[k-1]]),iso(A[k][0],A[k+1][1]));
+ endfor;
+ %
+ for k=1 upto totallignes:
+ trace segment(A[k][0],A[k][totalcolonnes+1]);
+ endfor;
+ for k=1 upto totalcolonnes:
+ trace segment(A[0][k],A[totallignes+1][k]);
+ endfor;
+ trace A[1][0]--A[totallignes+1][0]--A[totallignes+1][totalcolonnes+1]--A[0][totalcolonnes+1]--A[0][1];
+ labeloffset:=labeloffset*4;
+ label.top(TEX("Tirage 1"),iso(A[0][1],A[0][totalcolonnes+1]));
+ label.lft(TEX("Tirage 2") rotated 90,iso(A[totallignes+1][0],A[1][0]));
+ labeloffset:=labeloffset/4;
+
+ path ccsol[][];
+
+ if Solution:
+ for k=1 upto totallignes:
+ for l=1 upto totalcolonnes:
+ label(TEX(Colonnes[RetiensNumC[l-1]]&"--"&Lignes[RetiensNumL[k-1]]),iso(A[k][l],A[k+1][l+1]));
+ endfor;
+ endfor;
+ fi;
+
+ if Codes:
+ \useKV[PfCUrne]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\BuildTableauDoubleEntree{mmm}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ u:=\useKV[PfCUrne]{Echelle}*1cm;
+ numeric RetiensNum[];
+ %
+ vardef RecupRepartition(text t)=
+ n:=0;
+ for p_=t:
+ RetiensNum[n]=p_;
+ n:=n+1;
+ endfor;
+ totalboules=n;
+ enddef;
+ %
+ color Col[];
+ vardef RecuperationCouleurs(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Col[n]=p_;
+ endfor;
+ enddef;
+ %
+ string Nombres[];
+ vardef RecuperationNombres(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Nombres[n]=p_;
+ endfor;
+ enddef;
+ %
+ numeric Pas,Rayon;
+ Pas=\useKV[PfCUrne]{Pas};
+ Rayon=\useKV[PfCUrne]{Rayon};
+ %
+ boolean Couleurs, Nombres, Roue, Solution, SansRemise, Codes;
+ Couleurs=\useKV[PfCUrne]{Couleurs};
+ Nombres=\useKV[PfCUrne]{Nombres};
+ Roue=\useKV[PfCUrne]{Roue};
+ Solution=\useKV[PfCUrne]{Solution};
+ SansRemise=\useKV[PfCUrne]{SansRemise};
+ Codes=\useKV[PfCUrne]{Codes};
+
+ color ColLigne,ColColonne;
+ ColLigne=\useKV[PfCUrne]{CouleurLigne};
+ ColColonne=\useKV[PfCUrne]{CouleurColonne};
+
+ RecupRepartition(#3);
+ if Couleurs:
+ RecuperationCouleurs(#1);
+ fi;
+ if Nombres:
+ RecuperationNombres(#2);
+ fi;
+
+ pair O;
+ pair A[][],C[][];
+ for k=0 upto totalboules+1:
+ for l=0 upto totalboules+1:
+ A[k][l]:=(0,0) shifted(u*(l,-k));
+ endfor;
+ endfor;
+
+ for k=0 upto totalboules:
+ for l=0 upto totalboules:
+ C[k][l]=A[k][l] shifted(u*(0.5,-0.5));
+ endfor;
+ endfor;
+
+ if Couleurs:
+ drawoptions(withpen pencircle scaled 0.75);
+ for k=1 upto totalboules:
+ fill cercles(iso(A[1][k],A[0][k+1]),0.35u) withcolor Col[RetiensNum[k-1]];
+ fill cercles(iso(A[k][0],A[k+1][1]),0.35u) withcolor Col[RetiensNum[k-1]];
+ trace cercles(iso(A[1][k],A[0][k+1]),0.35u);
+ trace cercles(iso(A[k][0],A[k+1][1]),0.35u);
+ endfor;
+ drawoptions();
+ else:
+ fill polygone(A[0][1],A[0][totalboules+1],A[1][totalboules+1],A[1][1]) withcolor ColLigne;
+ fill polygone(A[1][0],A[totalboules+1][0],A[totalboules+1][1],A[1][1]) withcolor ColColonne;
+ for k=1 upto totalboules:
+ label(TEX(Nombres[RetiensNum[k-1]]),iso(A[1][k],A[0][k+1]));
+ label(TEX(Nombres[RetiensNum[k-1]]),iso(A[k][0],A[k+1][1]));
+ endfor;
+ fi;
+ if SansRemise:
+ for k=1 upto totalboules:
+ draw 1/8[A[k][k],A[k+1][k+1]]--7/8[A[k][k],A[k+1][k+1]];
+ draw 1/8[A[k+1][k],A[k][k+1]]--7/8[A[k+1][k],A[k][k+1]];
+ endfor;
+ fi;
+ for k=1 upto totalboules:
+ trace segment(A[k][0],A[k][totalboules+1]);
+ trace segment(A[0][k],A[totalboules+1][k]);
+ endfor;
+ trace A[1][0]--A[totalboules+1][0]--A[totalboules+1][totalboules+1]--A[0][totalboules+1]--A[0][1];
+ labeloffset:=labeloffset*4;
+ label.top(TEX("Tirage 1"),iso(A[0][1],A[0][totalboules+1]));
+ label.lft(TEX("Tirage 2") rotated 90,iso(A[totalboules+1][0],A[1][0]));
+ labeloffset:=labeloffset/4;
+
+ path ccsol[][];
+
+ if Solution:
+ if Couleurs:
+ drawoptions(withpen pencircle scaled 0.75);
+ for k=1 upto totalboules:
+ for l=1 upto totalboules:
+ ccsol[k][l]=cercles(iso(A[k][l],A[k+1][l+1]),0.25u);
+ if SansRemise:
+ if k<>l:
+ fill arccercle(pointarc(ccsol[k][l],315),pointarc(ccsol[k][l],135),iso(A[k][l],A[k+1][l+1]))--iso(A[k][l],A[k+1][l+1])--cycle withcolor Col[RetiensNum[l-1]];
+ fill arccercle(pointarc(ccsol[k][l],135),pointarc(ccsol[k][l],315),iso(A[k][l],A[k+1][l+1]))--iso(A[k][l],A[k+1][l+1])--cycle withcolor Col[RetiensNum[k-1]];
+ trace segment(pointarc(ccsol[k][l],135),pointarc(ccsol[k][l],315));
+ trace ccsol[k][l];
+ fi;
+ else:
+ fill arccercle(pointarc(ccsol[k][l],315),pointarc(ccsol[k][l],135),iso(A[k][l],A[k+1][l+1]))--iso(A[k][l],A[k+1][l+1])--cycle withcolor Col[RetiensNum[l-1]];
+ fill arccercle(pointarc(ccsol[k][l],135),pointarc(ccsol[k][l],315),iso(A[k][l],A[k+1][l+1]))--iso(A[k][l],A[k+1][l+1])--cycle withcolor Col[RetiensNum[k-1]];
+ trace segment(pointarc(ccsol[k][l],135),pointarc(ccsol[k][l],315));
+ trace ccsol[k][l];
+ fi;
+ endfor;
+ endfor;
+ drawoptions();
+ else:
+ for k=1 upto totalboules:
+ for l=1 upto totalboules:
+ if SansRemise:
+ if k<>l:
+ label(TEX(Nombres[RetiensNum[l-1]]&"--"&Nombres[RetiensNum[k-1]]),iso(A[k][l],A[k+1][l+1]));
+ fi;
+ else:
+ label(TEX(Nombres[RetiensNum[l-1]]&"--"&Nombres[RetiensNum[k-1]]),iso(A[k][l],A[k+1][l+1]));
+ fi;
+ endfor;
+ endfor;
+ fi;
+ fi;
+
+ if Codes:
+ \useKV[PfCUrne]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\BuildUrne{mmm}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ u:=\useKV[PfCUrne]{Echelle}*1cm;
+ numeric RetiensNum[];
+ vardef RecupRepartition(text t)=
+ n:=0;
+ for p_=t:
+ RetiensNum[n]=p_;
+ n:=n+1;
+ endfor;
+ totalboules=n;
+ enddef;
+
+ color Col[];
+ vardef RecuperationCouleurs(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Col[n]=p_;
+ endfor;
+ enddef;
+
+ string Nombres[];
+ vardef RecuperationNombres(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Nombres[n]=p_;
+ endfor;
+ enddef;
+
+ numeric Pas,Rayon;
+ Pas=\useKV[PfCUrne]{Pas};
+ Rayon=\useKV[PfCUrne]{Rayon};
+
+ boolean Couleurs, Nombres, Roue;
+ Couleurs=\useKV[PfCUrne]{Couleurs};
+ Nombres=\useKV[PfCUrne]{Nombres};
+ Roue=\useKV[PfCUrne]{Roue};
+
+ RecupRepartition(#3);
+ if Couleurs:
+ RecuperationCouleurs(#1);
+ fi;
+ if Nombres:
+ RecuperationNombres(#2);
+ fi;
+
+ pair O;
+ pair A[],B[];
+
+ if Roue:
+ O=(0,0);
+ path cc;
+ cc=cercles(O,Rayon*u);
+ angd=180/totalboules;
+ angr=360/totalboules;
+ for k=1 upto totalboules:
+ A[k]=17/20[O,pointarc(cc,angd+(k-1)*angr)];
+ endfor;
+ drawarrow rotation((O+u*(0,1.35*Rayon))--(O+u*(0,1.1*Rayon)),O,angd);
+ % trace cc;
+ B[0]=pointarc(cc,0);
+ for k=1 upto totalboules:
+ B[k]=pointarc(cc,k*angr);
+ if Couleurs:
+ fill O--arccercle(B[k-1],B[k],O)--cycle withcolor if unknown Col[RetiensNum[k-1]]:white else: Col[RetiensNum[k-1]] fi;
+ else:
+ label(TEX(Nombres[RetiensNum[k-1]]),A[k]);
+ fi;
+ endfor;
+ trace cc;
+ for k=1 upto totalboules:
+ trace O--B[k];
+ endfor;
+ else:
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ A[rang]=u*(0.5,0.5)+u*(l,k);
+ if Couleurs:
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensNum[rang]]:white else: Col[RetiensNum[rang]] fi;
+ else:
+ label(TEX(Nombres[RetiensNum[rang]]),A[rang]);
+ fi;
+ %trace cercles(A[k*Pas+l],0.5u);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ A[rang]=u*(0.5,0.5)+u*(k+0.5,totalboules div Pas-1+cosd(30));
+ if Couleurs:
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensNum[rang]]:white else: Col[RetiensNum[rang]] fi;
+ else:
+ label(TEX(Nombres[RetiensNum[rang]]),A[rang]);
+ fi;
+ %trace cercles(A[(totalboules div Pas)*Pas+k],0.5u);
+ endfor;
+ %
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ %
+ drawoptions(withpen pencircle scaled 1.2);
+ if totalboules<Pas:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0-(1-cosd(30)))--u*(Pas,0-(1-cosd(30)))--u*(Pas,(totalboules div Pas)+1.15);
+ else:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0)--u*(Pas,0)--u*(Pas,(totalboules div Pas)+1.15);
+ fi;
+ fi;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={u:=\useKV[PfCUrne]{Echelle}*1cm;numeric Pas;Pas=\useKV[PfCUrne]{Pas}; boolean Couleurs, Nombres; Couleurs=\useKV[PfCUrne]{Couleurs}; Nombres=\useKV[PfCUrne]{Nombres};}]
+ numeric RetiensNum[];
+ vardef RecupRepartition(text t)=
+ n:=0;
+ for p_=t:
+ RetiensNum[n]=p_;
+ n:=n+1;
+ endfor;
+ totalboules=n;
+ enddef;
+
+ color Col[];
+ vardef RecuperationCouleurs(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Col[n]=p_;
+ endfor;
+ enddef;
+
+ string Nombres[];
+ vardef RecuperationNombres(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Nombres[n]=p_;
+ endfor;
+ enddef;
+
+ RecupRepartition(#3);
+ if Couleurs:
+ RecuperationCouleurs(#1);
+ fi;
+ if Nombres:
+ RecuperationNombres(#2);
+ fi;
+
+ pair A[];
+
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ A[rang]=u*(0.5,0.5)+u*(l,k);
+ if Couleurs:
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensNum[rang]]:white else: Col[RetiensNum[rang]] fi;
+ else:
+ label(LATEX(Nombres[RetiensNum[rang]]),A[rang]);
+ fi;
+ %trace cercles(A[k*Pas+l],0.5u);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ A[rang]=u*(0.5,0.5)+u*(k+0.5,totalboules div Pas-1+cosd(30));
+ if Couleurs:
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensNum[rang]]:white else: Col[RetiensNum[rang]] fi;
+ else:
+ label(LATEX(Nombres[RetiensNum[rang]]),A[rang]);
+ fi;
+ %trace cercles(A[(totalboules div Pas)*Pas+k],0.5u);
+ endfor;
+ %
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ %
+ drawoptions(withpen pencircle scaled 1.2);
+ if totalboules<Pas:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0-(1-cosd(30)))--u*(Pas,0-(1-cosd(30)))--u*(Pas,(totalboules div Pas)+1.15);
+ else:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0)--u*(Pas,0)--u*(Pas,(totalboules div Pas)+1.15);
+ fi;
+ \end{mpost}
+ \fi
+}%
+
+\NewDocumentCommand\BuildUrneDouble{mmmm}{%
+ % #1 Liste Couleurs
+ % #2 Liste Nombres
+ % #3 Repartition des couleurs
+ % #4 Repartition des nombres
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ u:=\useKV[PfCUrne]{Echelle}*1cm;
+ numeric RetiensC[],RetiensNum[];
+ vardef RecupRepartitionC(text t)=
+ n:=0;
+ for p_=t:
+ RetiensC[n]=p_;
+ n:=n+1;
+ endfor;
+ totalboules=n;
+ enddef;
+
+ vardef RecupRepartition(text t)=
+ n:=0;
+ for p_=t:
+ RetiensNum[n]=p_;
+ n:=n+1;
+ endfor;
+ enddef;
+
+ color Col[];
+ vardef RecuperationCouleurs(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Col[n]=p_;
+ endfor;
+ enddef;
+
+ string Nombres[];
+ vardef RecuperationNombres(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Nombres[n]=p_;
+ endfor;
+ enddef;
+
+ numeric Pas,Rayon;
+ Pas=\useKV[PfCUrne]{Pas};
+ Rayon=\useKV[PfCUrne]{Rayon};
+
+ boolean Roue;
+ Roue=\useKV[PfCUrne]{Roue};
+
+ RecupRepartitionC(#3);
+ RecupRepartition(#4);
+ RecuperationCouleurs(#1);
+ RecuperationNombres(#2);
+
+ pair O;
+ pair A[],B[];
+
+ if Roue:
+ O=(0,0);
+ path cc;
+ cc=cercles(O,Rayon*u);
+ angd=180/totalboules;
+ angr=360/totalboules;
+ for k=1 upto totalboules:
+ A[k]=17/20[O,pointarc(cc,angd+(k-1)*angr)];
+ endfor;
+ B[0]=pointarc(cc,0);
+ for k=1 upto totalboules:
+ B[k]=pointarc(cc,k*angr);
+ fill O--arccercle(B[k-1],B[k],O)--cycle withcolor if unknown Col[RetiensC[k-1]]:white else: Col[RetiensC[k-1]] fi;
+ label(TEX(Nombres[RetiensNum[k-1]]),A[k]);
+ endfor;
+ trace cc;
+ for k=1 upto totalboules:
+ trace O--B[k];
+ endfor;
+ drawarrow rotation((O+u*(0,1.35*Rayon))--(O+u*(0,1.1*Rayon)),O,angd);
+ else:
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ A[rang]=u*(0.5,0.5)+u*(l,k);
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensC[rang]]:white else: Col[RetiensC[rang]] fi;
+ label(TEX(Nombres[RetiensNum[rang]]),A[rang]);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ A[rang]=u*(0.5,0.5)+u*(k+0.5,totalboules div Pas-1+cosd(30));
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensC[rang]]:white else: Col[RetiensC[rang]] fi;
+ label(TEX(Nombres[RetiensNum[rang]]),A[rang]);
+ endfor;
+ %
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ %
+ drawoptions(withpen pencircle scaled 1.2);
+ if totalboules<Pas:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0-(1-cosd(30)))--u*(Pas,0-(1-cosd(30)))--u*(Pas,(totalboules div Pas)+1.15);
+ else:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0)--u*(Pas,0)--u*(Pas,(totalboules div Pas)+1.15);
+ fi;
+ fi;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={u:=\useKV[PfCUrne]{Echelle}*1cm;numeric RetiensC[],RetiensNum[];numeric Pas,Rayon;Pas=\useKV[PfCUrne]{Pas};Rayon=\useKV[PfCUrne]{Rayon};boolean Roue;Roue=\useKV[PfCUrne]{Roue};}]
+ vardef RecupRepartitionC(text t)=
+ n:=0;
+ for p_=t:
+ RetiensC[n]=p_;
+ n:=n+1;
+ endfor;
+ totalboules=n;
+ enddef;
+
+ vardef RecupRepartition(text t)=
+ n:=0;
+ for p_=t:
+ RetiensNum[n]=p_;
+ n:=n+1;
+ endfor;
+ enddef;
+
+ color Col[];
+ vardef RecuperationCouleurs(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Col[n]=p_;
+ endfor;
+ enddef;
+
+ string Nombres[];
+ vardef RecuperationNombres(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Nombres[n]=p_;
+ endfor;
+ enddef;
+
+ RecupRepartitionC(#3);
+ RecupRepartition(#4);
+ RecuperationCouleurs(#1);
+ RecuperationNombres(#2);
+
+ pair O;
+ pair A[],B[];
+
+ if Roue:
+ O=(0,0);
+ path cc;
+ cc=cercles(O,Rayon*1cm);
+ angd=180/totalboules;
+ angr=360/totalboules;
+ for k=1 upto totalboules:
+ A[k]=17/20[O,pointarc(cc,angd+(k-1)*angr)];
+ endfor;
+ B[0]=pointarc(cc,0);
+ for k=1 upto totalboules:
+ B[k]=pointarc(cc,k*angr);
+ fill O--arccercle(B[k-1],B[k],O)--cycle withcolor if unknown Col[RetiensC[k-1]]:white else: Col[RetiensC[k-1]] fi;
+ label(LATEX(Nombres[RetiensNum[k-1]]),A[k]);
+ endfor;
+ trace cc;
+ for k=1 upto totalboules:
+ trace O--B[k];
+ endfor;
+ else:
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ A[rang]=u*(0.5,0.5)+u*(l,k);
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensC[rang]]:white else: Col[RetiensC[rang]] fi;
+ label(LATEX(Nombres[RetiensNum[rang]]),A[rang]);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ A[rang]=u*(0.5,0.5)+u*(k+0.5,totalboules div Pas-1+cosd(30));
+ fill cercles(A[rang],0.5u) withcolor if unknown Col[RetiensC[rang]]:white else: Col[RetiensC[rang]] fi;
+ label(LATEX(Nombres[RetiensNum[rang]]),A[rang]);
+ endfor;
+ %
+ for k=0 upto (totalboules div Pas)-1:
+ for l=0 upto Pas-1:
+ rang:=k*Pas+l;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ endfor;
+ for k=0 upto (totalboules mod Pas)-1:
+ rang:=(totalboules div Pas)*Pas+k;
+ trace cercles(A[rang],0.5u);
+ endfor;
+ %
+ drawoptions(withpen pencircle scaled 1.2);
+ if totalboules<Pas:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0-(1-cosd(30)))--u*(Pas,0-(1-cosd(30)))--u*(Pas,(totalboules div Pas)+1.15);
+ else:
+ trace u*(0,(totalboules div Pas)+1.15)--u*(0,0)--u*(Pas,0)--u*(Pas,(totalboules div Pas)+1.15);
+ fi;
+ fi;
+ \end{mpost}
+ \fi
+}%
+
+\NewDocumentCommand\SchemaProba{o}{%
+ \useKVdefault[PfCUrne]%
+ \setKV[PfCUrne]{#1}%
+ \tokUrneListeCouleurs{}%
+ \tokUrneListeNombres{}%
+ \tokUrneListeColonnes{}%
+ \ifboolKV[PfCUrne]{Casino}{%
+ \BuildRoulette%
+ }{%
+ \ifboolKV[PfCUrne]{Tableau}{%
+ \ifboolKV[PfCUrne]{Different}{%
+ \xdef\PfCFooRepartitionC{\useKV[PfCUrne]{RepartitionColonne}}%
+ \xdef\PfCFooRepartitionL{\useKV[PfCUrne]{RepartitionLigne}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeRepartitionCAv{\PfCFooRepartitionC}%
+ \readlist*\ListeRepartitionLAv{\PfCFooRepartitionL}%
+ % Repartition : \showitems\ListeRepartitionAv[]%
+ \xdef\PfCFooListeRepartitionC{}%
+ \xdef\PfCFooListeRepartitionL{}%
+ \xdef\PfCTotalC{0}%
+ \xdef\PfCTotalL{0}%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeRepartitionCAvlen}}\do{%
+ \xintFor* ##2 in{\xintSeq{1}{\ListeRepartitionCAv[##1]}}\do{%
+ \xdef\PfCFooListeRepartitionC{\PfCFooListeRepartitionC,##1}%
+ \xdef\PfCTotalC{\fpeval{\PfCTotalC+1}}%
+ }%
+ }%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeRepartitionLAvlen}}\do{%
+ \xintFor* ##2 in{\xintSeq{1}{\ListeRepartitionLAv[##1]}}\do{%
+ \xdef\PfCFooListeRepartitionL{\PfCFooListeRepartitionL,##1}%
+ \xdef\PfCTotalL{\fpeval{\PfCTotalL+1}}%
+ }%
+ }%
+ \foreachitem\compteur\in\ListeCouleursAv{\expandafter\UpdatetoksUrneColonnes\compteur\nil}%
+ \foreachitem\compteur\in\ListeNombresAv{\expandafter\UpdatetoksUrneNombres\compteur\nil}%
+ \BuildTableauDoubleEntreeDifferent{\the\tokUrneListeColonnes}{\the\tokUrneListeNombres}{\PfCFooListeRepartitionC}{\PfCFooListeRepartitionL}%
+ }{%
+ \xdef\PfCFooRepartition{\useKV[PfCUrne]{Repartition}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeRepartitionAv{\PfCFooRepartition}%
+ \xdef\PfCFooListeRepartition{}%
+ \xdef\PfCTotal{0}%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeRepartitionAvlen}}\do{%
+ \xintFor* ##2 in{\xintSeq{1}{\ListeRepartitionAv[##1]}}\do{%
+ \xdef\PfCFooListeRepartition{\PfCFooListeRepartition,##1}%
+ \xdef\PfCTotal{\fpeval{\PfCTotal+1}}%
+ }%
+ }%
+ \ifboolKV[PfCUrne]{Couleurs}{%
+ \foreachitem\compteur\in\ListeCouleursAv{\expandafter\UpdatetoksUrneCouleurs\compteur\nil}%
+ \BuildTableauDoubleEntree{\the\tokUrneListeCouleurs}{}{\PfCFooListeRepartition}%
+ }{%
+ \ifboolKV[PfCUrne]{Nombres}{%
+ \foreachitem\compteur\in\ListeNombresAv{\expandafter\UpdatetoksUrneNombres\compteur\nil}%
+ \BuildTableauDoubleEntree{}{\the\tokUrneListeNombres}{\PfCFooListeRepartition}%
+ }{}%
+ }%
+ }%
+ }{%
+ \ifboolKV[PfCUrne]{Double}{%
+ \xdef\PfCFooRepartitionC{\useKV[PfCUrne]{RepartitionC}}%
+ \xdef\PfCFooRepartitionN{\useKV[PfCUrne]{RepartitionN}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeRepartitionCAv{\PfCFooRepartitionC}%
+ \readlist*\ListeRepartitionNAv{\PfCFooRepartitionN}%
+ % Repartition : \showitems\ListeRepartitionAv[]%
+ \xdef\PfCFooListeRepartitionC{}%
+ \xdef\PfCFooListeRepartitionN{}%
+ \xdef\PfCTotalC{0}%
+ \xdef\PfCTotalN{0}%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeRepartitionCAvlen}}\do{%
+ \xintFor* ##2 in{\xintSeq{1}{\ListeRepartitionCAv[##1]}}\do{%
+ \xdef\PfCFooListeRepartitionC{\PfCFooListeRepartitionC,##1}%
+ \xdef\PfCTotalC{\fpeval{\PfCTotalC+1}}%
+ }%
+ }%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeRepartitionNAvlen}}\do{%
+ \xintFor* ##2 in{\xintSeq{1}{\ListeRepartitionNAv[##1]}}\do{%
+ \xdef\PfCFooListeRepartitionN{\PfCFooListeRepartitionN,##1}%
+ \xdef\PfCTotalN{\fpeval{\PfCTotalN+1}}%
+ }%
+ }%
+ \MelangeListe{\PfCFooListeRepartitionC}{\PfCTotalC}%
+ \xdef\ListeRepartitionCouleurs{\faa}%
+ \foreachitem\compteur\in\ListeCouleursAv{\expandafter\UpdatetoksUrneCouleurs\compteur\nil}%
+ \MelangeListe{\PfCFooListeRepartitionN}{\PfCTotalN}%
+ \xdef\ListeRepartitionNombres{\faa}%
+ \foreachitem\compteur\in\ListeNombresAv{\expandafter\UpdatetoksUrneNombres\compteur\nil}%
+ \BuildUrneDouble{\the\tokUrneListeCouleurs}{\the\tokUrneListeNombres}{\ListeRepartitionCouleurs}{\ListeRepartitionNombres}%
+ }{%
+ \xdef\PfCFooRepartition{\useKV[PfCUrne]{Repartition}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeRepartitionAv{\PfCFooRepartition}%
+ % Repartition : \showitems\ListeRepartitionAv[]%
+ \xdef\PfCFooListeRepartition{}%
+ \xdef\PfCTotal{0}%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeRepartitionAvlen}}\do{%
+ \xintFor* ##2 in{\xintSeq{1}{\ListeRepartitionAv[##1]}}\do{%
+ \xdef\PfCFooListeRepartition{\PfCFooListeRepartition,##1}%
+ \xdef\PfCTotal{\fpeval{\PfCTotal+1}}%
+ }%
+ }%
+ \ifboolKV[PfCUrne]{Couleurs}{%
+ \MelangeListe{\PfCFooListeRepartition}{\PfCTotal}%
+ \xdef\ListeRepartitionCouleurs{\faa}%
+ \foreachitem\compteur\in\ListeCouleursAv{\expandafter\UpdatetoksUrneCouleurs\compteur\nil}%
+ % Couleurs :\\
+ % La répartition est : \ListeRepartitionCouleurs\\
+ % Les couleurs sont : \the\tokUrneListeCouleurs.\\
+ \BuildUrne{\the\tokUrneListeCouleurs}{}{\ListeRepartitionCouleurs}%
+ }{%
+ \ifboolKV[PfCUrne]{Nombres}{%
+ \MelangeListe{\PfCFooListeRepartition}{\PfCTotal}%
+ \xdef\ListeRepartitionNombres{\faa}%
+ \foreachitem\compteur\in\ListeNombresAv{\expandafter\UpdatetoksUrneNombres\compteur\nil}%
+ % Nombres :\\
+ % La répartition est : \ListeRepartitionNombres\\
+ % Les nombres sont : \the\tokUrneListeNombres.\\
+ \BuildUrne{}{\the\tokUrneListeNombres}{\ListeRepartitionNombres}%
+ }{}%
+ }%
+ }%
+}%
+}%
+}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
index ca3b52ba9ad..a6b767a3bf1 100644
--- a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
+++ b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
@@ -2,9 +2,9 @@
% licence : Released under the LaTeX Project Public License v1.3c
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}%
-\def\filedate{2024/05/18}%
+\def\filedate{2024/07/03}%
\let\PfCfiledate\filedate%
-\def\fileversion{0.99-A-f}%
+\def\fileversion{0.99-A-g}%
\let\PfCfileversion\fileversion%
\ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]%
@@ -124,7 +124,6 @@
\RequirePackage{listofitems}%
\RequirePackage{datatool}%
\RequirePackage{multido}%
-
\RequirePackage{xlop}%
\RequirePackage{tcolorbox}%
@@ -637,18 +636,18 @@
\tikzset{face/.style={shape=circle,minimum size=4ex,shading=radial,outer sep=0pt, inner color=white!50!yellow,outer color= yellow!70!orange}}
\newcommand\emoticon[2][]{%
-\scalebox{.5}{\begin{tikzpicture}
-\node[face,#1,draw,thick] (emoticon) {};
+\scalebox{.5}{\begin{tikzpicture}%
+\node[face,#1,draw,thick] (emoticon) {};%
%% The eyes are fixed.
\draw[fill=white] (-1ex,0ex) ..controls (-0.5ex,0.2ex)and(0.5ex,0.2ex)..(1ex,0.0ex) ..controls ( 1.5ex,1.5ex)and( 0.2ex,1.7ex)..(0ex,0.4ex) ..controls (-0.2ex,1.7ex)and(-1.5ex,1.5ex)..(-1ex,0ex)--cycle;
#2%
\end{tikzpicture}}%
-}
+}%
-\newcommand\pupils{
+\newcommand\pupils{%
%% standard pupils
-\fill[shift={(0.5ex,0.5ex)},rotate=80] (0,0) ellipse (0.3ex and 0.15ex);
-\fill[shift={(-0.5ex,0.5ex)},rotate=100] (0,0) ellipse (0.3ex and 0.15ex);}
+\fill[shift={(0.5ex,0.5ex)},rotate=80] (0,0) ellipse (0.3ex and 0.15ex);%
+\fill[shift={(-0.5ex,0.5ex)},rotate=100] (0,0) ellipse (0.3ex and 0.15ex);}%
\def\RKsmallsmile{%
\emoticon{%
@@ -656,14 +655,14 @@
%% mouth
\draw[thick] (-0.5ex,-1ex)..controls (-0.25ex,-1.25ex)and(0.25ex,-1.25ex)..(0.5ex,-1ex);
}%\emoticon
-}
+}%
\def\RKsmile{%
\emoticon{%
\pupils
\draw[thick] (-1ex,-1ex)..controls (-0.5ex,-1.5ex)and(0.5ex,-1.5ex)..(1ex,-1ex);
}%\emoticon
-}
+}%
\def\RKbigsmile{%
\emoticon{%
@@ -671,7 +670,7 @@
%% mouth
\draw[thick] (-1.5ex,-0.5ex)..controls (-0.7ex,-1.7ex)and(0.7ex,-1.7ex)..(1.5ex,-0.5ex);
}%\emoticon
-}
+}%
\def\RKsad{%
\emoticon{%
@@ -681,7 +680,7 @@
%% mouth
\draw[thick] (-1ex,-1ex)..controls(-0.5ex,-0.5ex)and(0.5ex,-0.5ex)..(1ex,-1ex);
}%\emoticon
-}
+}%
\def\RKneutral{%
\emoticon{%
@@ -691,7 +690,7 @@
%% mouth
\draw[thick] (-0.5ex,-1ex)--(0.5ex,-1ex);
}%\emoticon
-}
+}%
\def\RKconfused{%
\emoticon{%
@@ -716,19 +715,19 @@
(-1.00ex,1.00ex)--(-1.20ex,1.10ex)
(-0.35ex,1.15ex)--(-0.25ex,1.35ex);
}%\emoticon
-}
+}%
\def\RKangry{%
\emoticon{%
%% pupils
-\fill[shift={( 0.5ex,0.5ex)},rotate=90] (0,0) ellipse (0.3ex and 0.15ex);
-\fill[shift={(-0.5ex,0.5ex)},rotate=90] (0,0) ellipse (0.3ex and 0.15ex);
+\fill[shift={( 0.5ex,0.5ex)},rotate=90] (0,0) ellipse (0.3ex and 0.15ex);%
+\fill[shift={(-0.5ex,0.5ex)},rotate=90] (0,0) ellipse (0.3ex and 0.15ex);%
%% mouth
-\draw[thick] (-1ex,-1ex)..controls(-0.5ex,-0.5ex)and(0.5ex,-0.5ex)..(1ex,-1ex);
+\draw[thick] (-1ex,-1ex)..controls(-0.5ex,-0.5ex)and(0.5ex,-0.5ex)..(1ex,-1ex);%
%% eyebrows
-\draw[thick] (0.2ex,1.15ex)--(0.5ex,1.6ex)(-0.2ex,1.15ex)--(-0.5ex,1.6ex);
+\draw[thick] (0.2ex,1.15ex)--(0.5ex,1.6ex)(-0.2ex,1.15ex)--(-0.5ex,1.6ex);%
}%\emoticon
-}
+}%
\def\RKlookup{%
\emoticon{%
@@ -826,6 +825,8 @@
\def\PfCSymbolTimes{\times}%
\def\PfCSymbolDiv{\div}%
+\input{PfCUrneProba}
+\input{PfCProbaFrequence}
\input{PfCVisualisationMulDeci}
\input{PfCArbreChiffre}
\input{PfCAssemblagesSolides}
@@ -971,4 +972,11 @@
\input{PfCDomino}
\input{PfCProgrammeCalcul}
\input{PfCPapiers}
-\input{PfCScratch} \ No newline at end of file
+\input{PfCScratch}
+
+\RequirePackage{PfCInfixRPN}
+%\makeatletter
+%\let\@nil\@empty
+%\makeatother
+
+\input{PfCArbreCalcul} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
index c13d91729ab..e37ce44eeb0 100644
--- a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
+++ b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
@@ -3,7 +3,8 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2024/05/31 3.04c Aide pour l'utilisation de LaTeX en lycee]
+\ProvidesPackage{ProfLycee}[2024/07/13 3.04d Aide pour l'utilisation de LaTeX en lycee]
+% 3.04d PitonInputFile et styles
% 3.04c Max et min pour des fonctions
% 3.04b Travail sur la loi binomiale + Ajout de clés pour les environnements graphiques
% 3.04a Améliorations de la partie graphiques tikz (intégrales, axes) + Factorielle
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex
index 418c5aa8cca..0cb6600617a 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex
@@ -2,6 +2,7 @@
% Copyright 2023-2024 Cédric Pierquet
% Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+%3.04d PitonInputFile et styles, pour compatibilité pfm
%3.03c Thonny via piton + modification clé gobble ?
%3.01f PseudoCode via piton (?)
%3.01e Correction du comportement de la console repl piton/pyluatex
@@ -220,6 +221,57 @@
\endtcolorbox%
}
+%inputfile
+\NewDocumentCommand\CodePitonFichier{ O{} m D<>{} }{%
+ {\tcbset{reset}
+ \useKVdefault[envpiton]%
+ \setKV[envpiton]{#1}% on paramètres les nouvelles clés et on les simplifie
+ %------les styles piton
+ \SetPitonStyle{ Number = \color{\CODPITcolnb} }
+ \ifboolKV[envpiton]{Lignes}%si lignes=true
+ {\PitonOptions{left-margin=0.75em,line-numbers,line-numbers={skip-empty-lines=false,label-empty-lines=true,#3}}}%left-margin=auto,
+ {}%
+ \PitonOptions{break-lines,indent-broken-lines,continuation-symbol={\;}}%,numbers-sep=0.65em}%language=Python}
+ %------les styles tcbox
+ \IfEq{\CODPITstyle}{Moderne}%style Moderne (défaut)
+ {%
+ \tcbset{cadre/.style={}}
+ \tcbset{titre/.style={}}
+ \tcbset{stylebase/.style={stylepiton,colframe=CouleurVertForet,colback=CouleurVertForet!5,width=\CODPITlargeur,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign,leftupper=0.75em}}
+ \ifboolKV[envpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ }
+ {}%
+ \IfEq{\CODPITstyle}{Classique}%style Classique
+ {%
+ \ifboolKV[envpiton]{Lignes}%si lignes=true
+ {\tcbset{stylebase/.style={thonnystylelineos,leftupper=0.75em,width=\CODPITlargeur,colframe=darkgray!50!black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
+ {\tcbset{stylebase/.style={thonnystyle,leftupper=0.4em,width=\CODPITlargeur,colframe=darkgray!50!black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
+ \ifboolKV[envpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faPython},watermark opacity=0.25,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ \ifboolKV[envpiton]{BarreTitre}%
+ {%
+ \ifboolKV[envpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}%
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}%
+ \tcbset{titre/.style={lefttitle=0.4em,title={\CODPITtitre},fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black}}
+ }%
+ {%
+ \tcbset{titre/.style={notitle}}
+ \ifboolKV[envpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}
+ }
+ }
+ {}%
+ %on crée la boîte
+ \tcolorbox[stylebase,filigrane,cadre,titre]
+ \PitonInputFile{#2}
+ \endtcolorbox}%
+}
+
%piton >= 2.4
\NewPitonEnvironment{PseudoCodePiton}{ O{} m D<>{} }%
{%
@@ -317,6 +369,86 @@
\endtcolorbox%
}
+%--inputfile
+\NewDocumentCommand\PseudoCodePitonFichier{ O{} m D<>{} }{%
+ {\tcbset{reset}
+ \useKVdefault[envpcpiton]%
+ \setKV[envpcpiton]{#1}% on paramètres les nouvelles clés et on les simplifie
+ %------les styles piton
+ \ifboolKV[envpcpiton]{Lignes}%si lignes=true
+ {\PitonOptions{left-margin=0.75em,all-line-numbers}}%left-margin=auto,
+ {}%
+ \PitonOptions{break-lines,indent-broken-lines,language=minimal,continuation-symbol={\;}}%,numbers-sep=0.65em}%
+ \SetPitonStyle{ Number = }
+ \ifboolKV[envpcpiton]{Couleurs}%
+ {%
+ \SetPitonIdentifier[minimal]{Algorithme,Fonction,Début,Paramètre,Paramètres,Faire,Fin,Si,Pour,Tant,Que,que,alors,Alors,Sinon,SinonSi,FinSi,FinPour,FinTantQue,TantQue,Variable,Variables,Procédure}{\color{MotsClesPseudoCodeA}}
+ \SetPitonIdentifier[minimal]{Afficher,Renvoyer,Saisir}{\color{MotsClesPseudoCodeB}}
+ % \PitonOptions{
+ % identifiers =
+ % {
+ % names = {Algorithme,Fonction,Début,Paramètre,Paramètres,allant,Faire,Fin,Si,Pour,Tant,Que,que,alors,Alors,Sinon,SinonSi,FinSi,FinPour,FinTantQue,TantQue,Variable,Variables,Procédure},
+ % style = \color{MotsClesPseudoCodeA}
+ % } ,
+ % identifiers =
+ % {
+ % names = {Afficher,Retourner,Saisir},
+ % style = \color{MotsClesPseudoCodeB}
+ % }
+ % }%
+ \SetPitonStyle
+ {
+ String = \color{MotsClesPseudoCodeChaine},
+ Comment = \itshape\color{gray},
+ }
+ }%
+ {%
+ \SetPitonStyle
+ {
+ String = ,
+ Comment = \itshape
+ }
+ }%
+ %------les styles tcbox
+ \IfEq{\CODPITPCstyle}{Moderne}%style Moderne (défaut)
+ {%
+ \tcbset{cadre/.style={}}
+ \tcbset{titre/.style={}}
+ \tcbset{stylebase/.style={stylepcpiton,colframe=CouleurVertForet,colback=CouleurVertForet!5,width=\CODPITPClargeur,fontupper=\CODPITPCfonte,fontlower=\CODPITPCfonte,\CODPITPCalign,leftupper=0.75em}}
+ \ifboolKV[envpcpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faCode},watermark opacity=0.175,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ }
+ {}%
+ \IfEq{\CODPITPCstyle}{Classique}%style Classique
+ {%
+ \ifboolKV[envpcpiton]{Lignes}%si lignes=true
+ {\tcbset{stylebase/.style={thonnypcstylelineos,leftupper=0.75em,width=\CODPITPClargeur,colframe=darkgray!50!black,fontupper=\CODPITPCfonte,fontlower=\CODPITPCfonte,\CODPITPCalign}}}%
+ {\tcbset{stylebase/.style={thonnypcstyle,leftupper=0.4em,width=\CODPITPClargeur,colframe=darkgray!50!black,fontupper=\CODPITPCfonte,fontlower=\CODPITPCfonte,\CODPITPCalign}}}%
+ \ifboolKV[envpcpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faCode},watermark opacity=0.25,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ \ifboolKV[envpcpiton]{BarreTitre}%
+ {%
+ \ifboolKV[envpcpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}%
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}%
+ \tcbset{titre/.style={lefttitle=0.4em,title={\CODPITPCtitre},fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black}}
+ }%
+ {%
+ \tcbset{titre/.style={notitle}}
+ \ifboolKV[envpcpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}
+ }
+ }
+ {}%
+ %on crée la boîte
+ \tcolorbox[stylebase,filigrane,cadre,titre]
+ \PitonInputFile{#2}%
+ \endtcolorbox}%
+}
+
%======CONSOLE PYLUATEX (package à charger manuellement !!)
\tcbset{consolepylua/.style={%base de la boîte
enhanced,colback=white,colframe=CouleurVertForet,sharp corners,boxrule=1pt,%
@@ -428,6 +560,18 @@
\endtcolorbox%
}%
+\NewDocumentCommand\PitonThonnyEditorFichier{ D<>{} O{\linewidth} m }{%
+ {\restoreKV[pitonthonny]%
+ \setKV[pitonthonny]{#1}%
+ \settowidth{\LargeurNumbersThonny}{\footnotesize\texttt{00}}%
+ \PitonOptions{left-margin=\LargeurNumbersThonny+1mm,line-numbers,line-numbers={skip-empty-lines=false,label-empty-lines=true},break-lines,indent-broken-lines,continuation-symbol={}}%
+ \tcbset{tcbthonnypiton/.style={title=\vphantom{pf}\thonnypitonfilename\:\textcolor{gray}{×}},before skip=0.33\baselineskip,after skip=0.33\baselineskip}%
+ \tcolorbox[sharp corners=all,enhanced,size=small,width=#2,colframe=gray,colback=lightgray!5,tcbthonnypiton,fonttitle=\scriptsize\sffamily,coltitle=black,
+ attach boxed title to top left={yshift*=-0.4pt},fontupper=\footnotesize,bottom=-0.25mm,boxed title style={size=tight,colback=lightgray!15,sharp corners=all,boxrule=0.4pt,boxsep=2pt},boxrule=0.4pt,overlay={\begin{tcbclipinterior}\fill[draw=none,gray!25] ([shift={(0.4pt,0.4pt)}]frame.south west) rectangle ([shift={(\LargeurNumbersThonny+1mm+0.8pt,-0.4pt)}]frame.north west) ;\end{tcbclipinterior}}]%
+ \PitonInputFile{#3}
+ \endtcolorbox}%
+}%
+
\NewDocumentEnvironment{PitonThonnyConsole}{ D<>{} O{} m }%
{
\restoreKV[pitonthonny]%
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex
index cd01f4393b3..89fe8945032 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex
@@ -75,6 +75,69 @@
\expandafter\def\csname\RegLinCoeffrd\endcsname{\fpeval{\csname\RegLinCoeffr\endcsname*\csname\RegLinCoeffr\endcsname}}
}
+\defKV[coeffregquad]{%
+ NomCoeffa=\def\RegQuadCoeffa{#1},%
+ NomCoeffb=\def\RegQuadCoeffb{#1},%
+ NomCoeffc=\def\RegQuadCoeffc{#1},%
+ NomXmin=\def\RegQuadCoeffXmin{#1},%
+ NomXmax=\def\RegQuadCoeffXmax{#1}
+}
+
+\setKVdefault[coeffregquad]{%
+ NomCoeffa=COEFFa,%
+ NomCoeffb=COEFFb,%
+ NomCoeffc=COEFFc,%
+ NomXmin=LXmin,%
+ NomXmax=LXmax
+}
+
+\newcommand\CalculsRegQuad[3][]{%
+ \useKVdefault[coeffregquad]%
+ \setKV[coeffregquad]{#1}% on paramètres les nouvelles clés et on les simplifie
+ %xmin et xmax
+ \expandafter\def\csname\RegQuadCoeffXmin\endcsname{\xintfloateval{min(#2)}}%
+ \expandafter\def\csname\RegQuadCoeffXmax\endcsname{\xintfloateval{max(#2)}}%
+ %listes des données
+ \def\xliste{#2}%
+ \def\yliste{#3}%
+ \readlist*\LX{\xliste}%
+ \readlist*\LY{\yliste}%
+ %taille des listes
+ \def\LNB{\inteval{\LXlen}}
+ %somme importantes
+ \xdef\LXSomme{0}%
+ \xdef\LXCSomme{0}%
+ \xdef\LYSomme{0}%
+ \xdef\LXXSomme{0}%
+ \xdef\LXYSomme{0}%
+ \xdef\LXXCSomme{0}%
+ \xdef\LXCXCSomme{0}%
+ \xdef\LXCYSomme{0}%
+ %calculs
+ \foreach \i in {1,2,...,\LNB}{%
+ \xdef\LXSomme{\xintfloateval{\LXSomme+\LX[\i]}}%
+ \xdef\LXCSomme{\xintfloateval{\LXCSomme+(\LX[\i])^2}}%
+ }%
+ \foreach \i in {1,2,...,\LNB}{%
+ \xdef\LYSomme{\xintfloateval{\LYSomme+\LY[\i]}}%
+ }%
+ \xdef\LXmoy{\xintfloateval{\LXSomme/\LNB}}%
+ \xdef\LYmoy{\xintfloateval{\LYSomme/\LNB}}%
+ \xdef\LXCmoy{\xintfloateval{\LXCSomme/\LNB}}%
+ %calculs suites
+ \foreach \i in {1,2,...,\LNB}{%
+ \xdef\LXXSomme{\xintfloateval{\LXXSomme+(\LX[\i]-\LXmoy)^2}}%
+ \xdef\LXYSomme{\xintfloateval{\LXYSomme+(\LX[\i]-\LXmoy)*(\LY[\i]-\LYmoy)}}%
+ \xdef\LXXCSomme{\xintfloateval{\LXXCSomme+(\LX[\i]-\LXmoy)*((\LX[\i])*(\LX[\i])-\LXCmoy)}}%
+ \xdef\LXCXCSomme{\xintfloateval{\LXCXCSomme+((\LX[\i])^2-\LXCmoy)^2}}%
+ \xdef\LXCYSomme{\xintfloateval{\LXCYSomme+((\LX[\i])^2-\LXCmoy)*(\LY[\i]-\LYmoy)}}%
+ }%
+ %COEFFS OK
+ \expandafter\def\csname\RegQuadCoeffb\endcsname{\xintfloateval{(\LXYSomme*\LXCXCSomme-\LXCYSomme*\LXXCSomme)/(\LXXSomme*\LXCXCSomme-(\LXXCSomme)^2)}}%
+ \expandafter\def\csname\RegQuadCoeffa\endcsname{\xintfloateval{(\LXCYSomme*\LXXSomme-\LXYSomme*\LXXCSomme)/(\LXXSomme*\LXCXCSomme-(\LXXCSomme)^2)}}%
+ \expandafter\def\csname\RegQuadCoeffc\endcsname{\xintfloateval{\LYmoy-\csname\RegQuadCoeffb\endcsname*\LXmoy-\csname\RegQuadCoeffa\endcsname*\LXCmoy}}%
+}
+
%pour un nuage en TiKz
\defKV[nuagereglin]{%
Couleur=\def\RegLinNuageCouleur{#1},%
diff --git a/Master/texmf-dist/tex/latex/prtec/prtec.cls b/Master/texmf-dist/tex/latex/prtec/prtec.cls
index 9bd3af2237a..9bd46e5ba1c 100644
--- a/Master/texmf-dist/tex/latex/prtec/prtec.cls
+++ b/Master/texmf-dist/tex/latex/prtec/prtec.cls
@@ -1,12 +1,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% This file provides the prtec class for formatting conference papers according to
-%% the Pacific Rim Thermal Engineering Conference (PRTEC) requirements as of April 2019.
+%% the Pacific Rim Thermal Engineering Conference (PRTEC) requirements as of July 2024.
%%
%% The prtec.cls file should be used with the files prtec.bst (for citations) and prtec-template.tex.
%%
%%
-%% This file is version 1.06 dated 2019/08/20.
+%% This file is version and date:
+ \def\versionno{1.07}
+ \def\versiondate{2024/07/07\space}
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -34,7 +36,7 @@
%%
%% LICENSE:
%%
-%% Copyright (c) 2019 John H. Lienhard
+%% Copyright (c) 2024 John H. Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -54,33 +56,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{prtec}[2019/08/20 PRTEC paper format]
+\ProvidesClass{prtec}[\versiondate\ PRTEC paper format]
-\LoadClass[twoside,11pt]{article}
-% Two-sided layout not used in PRTEC's specs, but is included anyway.
+\LoadClass[11pt]{article}
%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{ifthen}
-\newboolean{DefaultSups}
-\setboolean{DefaultSups}{true}
-
-\RequirePackage{kvoptions}
-\RequirePackage{kvsetkeys}
-\SetupKeyvalOptions{
- family=prtec,
- prefix=prtec@,
- setkeys=\kvsetkeys,
-}
-
-%%% set key nodefaultsups to obtain newtx superiors font for footnotes.
-\define@key{prtec}{nodefaultsups}[false]{%
- \setboolean{DefaultSups}{#1}
-}
-
-\ProcessKeyvalOptions*
-
%% option to omit PRTEC footer and header
\DeclareOption{nofoot}{%
@@ -96,13 +79,10 @@
%% Access many options from newtxmath
%% See newtxmath documentation for details
-\DeclareOption{upint,smallerops,varvw,varg,slantedGreek,frenchmath,varbb,cmbraces}{\PassOptionsToPackage{}{newtxmath}}
+\DeclareOption{upint,smallerops,varvw,varg,slantedGreek,frenchmath,varbb,cmbraces,subscriptcorrection}{\PassOptionsToPackage{}{newtxmath}}
%% Option for slightly larger small capitals font
-\DeclareOption{largesc}{\PassOptionsToPackage{}{newtxtext}}
-
-%% Option not to use latex default superscripts, instead using the newtxtext superiors font [nodefaultsups]
-\ifthenelse{\boolean{DefaultSups}}{\PassOptionsToPackage{defaultsups}{newtxtext}}{\relax}
+\DeclareOption{largesc}{\PassOptionsToPackage{largesc=true}{newtxtext}}
%% Suppress warnings about any omitted keys as unused global options
\DeclareOption*{}
@@ -112,8 +92,8 @@
%%%%%%%%%%%%% end options %%%%%%%%%%%%%%%%%%%
-\RequirePackage[a4paper, left=20mm, right=20mm, top=20mm, bottom = 20mm, footskip=10mm, includefoot, headsep=2mm]{geometry}
-% conforms to PRTEC 19 required margins
+\RequirePackage[a4paper, left=20mm, right=20mm, top=20mm, bottom=20mm, headsep=3mm, includefoot ]{geometry}
+% conforms to PRTEC24 required margins
\RequirePackage{parskip}
@@ -122,8 +102,9 @@
\renewcommand*{\bibfont}{\footnotesize}
\RequirePackage{graphicx}
-\RequirePackage[hyperref,fixpdftex,dvipsnames,svgnames,x11names]{xcolor}
-\RequirePackage{xparse}
+\RequirePackage[dvipsnames,svgnames,x11names]{xcolor}
+
+\ifdefined\NewDocumentCommand\else\RequirePackage{xparse}\fi
%%%%%%%%%%%%%%%%%%%%%%%%
@@ -136,14 +117,10 @@
%%%% FONT related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{mathtools} % extends amsmath
-\RequirePackage[utf8]{inputenc}
\RequirePackage[]{newtxtext}
\RequirePackage[]{newtxmath}
% See package documentation
-%% override \textsu if using default superiors
-\ifthenelse{\boolean{DefaultSups}}{\let\textsu\textsuperscript}{\relax}
-
\RequirePackage{bm} % load after all other math packages, to give greater access to bold math
@@ -163,19 +140,19 @@
\RequirePackage{fancyhdr}
\pagestyle{fancy}
-\setlength{\headheight}{22.53pt}
+\setlength{\headheight}{24pt}
\fancyfoot{}
-\fancyfoot[CE,CO]{\thepage}
-\fancyfoot[RO,LE]{}
+\fancyfoot[C,C]{\thepage}
+\fancyfoot[R,L]{}
\fancyhead{}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
\fancypagestyle{title}{%
\fancyhf{} % clear all header and footer fields
-\fancyfoot[LO,RE]{Copyright~\textcopyright~\the\year\ The Author(s). Distributed by JSME, KSME, and ASTFE with permission.}
-\fancyfoot[LE,RO]{\thepage}
-\fancyhead[LE,RO]{\bfseries\sffamily \HeaderConfName}
+\fancyfoot[L]{Copyright~\textcopyright~\the\year\ The Author(s). Distributed by JSME, KSME, and ASTFE with permission.}
+\fancyfoot[R]{\thepage}
+\fancyhead[R]{\bfseries\sffamily \HeaderConfName}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}}
@@ -196,10 +173,9 @@
\noindent\makebox[2ex][r]{\@makefnmark}#1}
-
%%%%%%%%% CAPTION RELATED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage[labelfont={sf,bf},hypcap=false]{caption}
+\RequirePackage[labelfont={bf},hypcap=false]{caption}
\RequirePackage[hypcap=false,list=true]{subcaption}
\captionsetup[figure]{name=Fig.,labelfont={bf},textfont={}, labelsep=quad} %textformat=period,
@@ -207,15 +183,12 @@
%%%%%%%%%%%%%%%%%% Section headings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% wish to accommodate hyperref
-
-\RequirePackage{textcase} %% Allows uppercase titles and captions without errors from math and citations
\RequirePackage[raggedright,indentafter]{titlesec}
% PRTEC specifies 12 pt headings
-\titleformat{\section}{\bfseries\mathversion{bold}\large\centering}{\thesection.}{0.5em}{\MakeTextUppercase}
-\titleformat{name=\section,numberless}{\bfseries\mathversion{bold}\large\centering}{}{0em}{\MakeTextUppercase}
+\titleformat{\section}{\bfseries\mathversion{bold}\large\centering}{\thesection.}{0.5em}{\MakeUppercase}
+\titleformat{name=\section,numberless}{\bfseries\mathversion{bold}\large\centering}{}{0em}{\MakeUppercase}
\titleformat{\subsection}[runin]{\bfseries}{\thesubsection}{0.5em}{\mathversion{bold}\noindent}[\hspace*{0.5em}]
\titleformat{\subsubsection}[runin]{\itshape}{}{0em}{\noindent\underline}[.\hspace*{0.5em}]
@@ -230,88 +203,81 @@
\setcounter{section}{0}
\pdfbookmark[0]{Appendices}{appendices}
\renewcommand\thesection{\Alph{section}}
- \titleformat{\section}{\bfseries\mathversion{bold}\large\centering}{APPENDIX \thesection:}{0.5em}{\MakeTextUppercase}
+ \titleformat{\section}{\bfseries\mathversion{bold}\large\centering}{APPENDIX \thesection:}{0.5em}{\MakeUppercase}
}
%%%%%%%%%%%%% hyperref %%%%%%%%%%%%%%%%%%%
-\RequirePackage{hyperxmp} %% to fix transfer of metadata to Acrobat pdf
-
-\RequirePackage[%
- unicode, % Unicode encoded PDF strings
- psdextra, % additional support for math in pdf bookmarks
- pdfborder={0 0 0},%
- bookmarks=true, %
- bookmarksnumbered=true,%
- bookmarksopen=true,%
- bookmarksopenlevel=1,%
- colorlinks=true,%%% <=== set false to get black type, but do so in .tex file
+\RequirePackage[psdextra]{hyperref}
+
+\hypersetup{
+ colorlinks=true,
+ pdfborder={0 0 0},
+ bookmarksnumbered=true,
+ bookmarksopen=true,
+ bookmarksopenlevel=1,
+ pdfpagelayout=SinglePage,
+ pdfdisplaydoctitle=true,
+ pdfstartview=Fit,
+ pdfnewwindow=true,
linkcolor=blue, %
- citecolor=blue, % SeaGreen4,%
- urlcolor=blue, % Red3,%
- breaklinks=true,%
- pdftitle={}, % <=== add in .tex file
- pdfkeywords={}, % <=== add in .tex file
- pdfnewwindow=true,%
- pdfpagelayout=TwoPageRight,%
- pdfauthor={}, % <=== add in .tex file
- pdfdisplaydoctitle=true%
- ]{hyperref}
-
+ citecolor=blue, %
+ urlcolor=blue, %
+ filecolor=violet,%
+}
\urlstyle{same} % don't switch to typewriter font
\RequirePackage{doi} % provides hyperlinks for doi in bibliography
\renewcommand{\doitext}{doi:~} % change the default, {doi:}, to this for PRTEC specification
-%% Since \bm is useful in headings, this fix will reduce frequency with which
-%% alternate pdfstrings must be given in section command as \section[pdfstring]{texstring}
+%% Since \bm may be useful in headings, this fix will reduce frequency with which
+%% alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring}
\pdfstringdefDisableCommands{%
\def\bm#1#{\relax}%
}
-%% Let's also make sure \NoCaseChange in section headings won't break pdf bookmarks
+% Let's disable \( and \) in pdf bookmarks
+\pdfstringdefDisableCommands{%
+ \def\({\relax}%
+ \def\){\relax}%
+}
+
+% Let's also make sure \NoCaseChange in section headings won't break pdf bookmarks
\pdfstringdefDisableCommands{%
\let\NoCaseChange\relax%
}
-%% Let's just remove citations from pdf bookmarks
+% Let's just remove citations from pdf bookmarks
\pdfstringdefDisableCommands{%
\def\cite{\@gobble}%
}
-%% Let's make sure footnotes in section headings don't break pdf bookmarks.
+%% Ensure that tag color does not follow \eqref into bookmarks
+\pdfstringdefDisableCommands{%
+ \def\eqref#1{(\ref{#1})}%
+}
+
+% Let's make sure footnotes in section headings don't break pdf bookmarks.
+% Revised footnote command above is already robust
+
\RequirePackage{etoolbox}
-\robustify{\footnote}
+\robustify\footnote
\pdfstringdefDisableCommands{%
\def\footnote#1{}%
}
-
%% Let's also add \footnote to the \TextUppercase exception list, so that footnote text won't be capitalized
-%% if given in section headings
-\RequirePackage{xpatch}
-\xpatchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
-
-
-%%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline).
-%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref
-%%% errors when macros are in section titles.
-%%% There should not be errors for $$, \cite, \ref, \label, \footnote, or \bm with current construction.
-\let\svsection\section
-\RenewDocumentCommand{\section}{s o m}{%
- \IfBooleanTF {#1}
- {\svsection*{#3}\phantomsection
- {\IfNoValueTF {#2}
- {\addcontentsline{toc}{section}{#3} }
- {\addcontentsline{toc}{section}{#2} }
- }
- }
- {\IfNoValueTF {#2}
- {\svsection{#3}}
- {\svsection[#2]{#3}}
- }
-}
+%% if given in section headings. Ditto for \eqref
+%
+\ifx\AddToNoCaseChangeList\@undefined % see https://github.com/John02139/asmeconf/issues/5
+ \patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{\typeout{PRTEC patched textcase nonchangecase to include footnote.}}{}
+ \patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{\typeout{PRTEC patched textcase nonchangecase to include eqref.}}{}
+\else
+ \AddToNoCaseChangeList{\eqref \footnote}
+\fi
+
+%%% There should be no errors for section headings with \(, \), \cite, \ref, \eqref, \label, \footnote, \NoCaseChange, or \bm
%%%%%%%%%%%%% Define special environments %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -321,7 +287,7 @@
\providecommand{\@keywords}{\relax}
-\DeclareDocumentCommand{\keywords}{m}{%
+\NewDocumentCommand{\keywords}{m}{%
\IfNoValueTF{#1}{%
\relax}{%
\long\def\@keywords{\par\medskip\noindent{\bfseries\small KEYWORDS: }{\small #1}}%
@@ -331,7 +297,7 @@
\DeclareDocumentEnvironment{abstract}{}{%
\section*{Abstract}%
}
- {\@keywords\bigskip%
+ {\@keywords\ignorespacesafterend%
}
@@ -347,7 +313,7 @@
%% If the second argument of \entry is omitted, a bold section heading is produced, e.g. \entry{Greek Letters}
-\DeclareDocumentCommand{\entry}{m g}{%
+\NewDocumentCommand{\entry}{m g}{%
\IfNoValueTF{#2}{%
\item[\itshape#1\hfill]\smallskip
}{%
@@ -388,7 +354,7 @@
\providecommand\@ConfCity{\hbox{ }}
\newcommand{\HeaderConfName}{%
-\parbox{\linewidth}{\raggedleft\bfseries\sffamily%
+\parbox{\linewidth}{\raggedleft\bfseries\sffamily\small%
\@ConfName\linebreak[4]%\par%
\@ConfDate\@CDsep\@ConfCity%
}%
@@ -400,7 +366,7 @@
\newcommand{\PaperNo}{%
\vspace*{-4.7mm}%
\parbox{\linewidth}{\raggedleft\bfseries\sffamily\Large%
-\MakeTextUppercase{\@paperno}%
+\MakeUppercase{\@paperno}%
}%
}
@@ -410,7 +376,7 @@
\newcommand{\PaperTitle}{%
\par\vspace*{6mm}%
\parbox{\linewidth}{\centering{\bfseries\Large%
-\MakeTextUppercase{\@papertitle}%
+\MakeUppercase{\@papertitle}%
\thispagestyle{title}\par} %% <=== \par gets the font leading to stick so that lines space properly
}%
}
@@ -429,13 +395,13 @@
\NewCoffin{\AffiliationsBlock}
\SetHorizontalCoffin\AffiliationsBlock{}
-\DeclareDocumentCommand{\SetAuthors}{m}{%
+\NewDocumentCommand{\SetAuthors}{m}{%
\SetHorizontalCoffin\AuthorBlock{%
\parbox{\linewidth}{\centering\bfseries\ignorespaces#1\ignorespaces}%
}
}
-\DeclareDocumentCommand{\SetAffiliation}{m m}{%
+\NewDocumentCommand{\SetAffiliation}{m m}{%
\SetVerticalCoffin\AffiliationBlock{\textwidth}{%
\centering\footnotemark[#1]#2\ignorespaces%
}
@@ -448,7 +414,7 @@
\newif\ifCA\CAfalse
\newcommand{\CAemail}[1]{\gdef\@CAemail{#1}}
-\DeclareDocumentCommand{\CorrespondingAuthor}{m}{%
+\NewDocumentCommand{\CorrespondingAuthor}{m}{%
\global\CAtrue%
\CAemail{#1}%
$^\ast$%
@@ -457,13 +423,13 @@
%%% flag for joint first authors (two or more)
\newif\ifJA\JAfalse
-\DeclareDocumentCommand{\JointFirstAuthor}{}{%
+\NewDocumentCommand{\JointFirstAuthor}{}{%
\global\JAtrue%
$^\dagger$%
}
%%% Affiliation mark
-\DeclareDocumentCommand{\affil}{m}{%
+\NewDocumentCommand{\affil}{m}{%
{\mdseries\footnotemark[#1]}%
}
@@ -475,11 +441,11 @@
\oldaffil{#1}\futurelet\nextToken\isOthernote}
\newcommand\isOthernote{%
- \ifx\CorrespondingAuthor\nextToken\textsu{\mdseries,}%
+ \ifx\CorrespondingAuthor\nextToken\textsuperscript{\mdseries,}%
\else%
- \ifx\JointFirstAuthor\nextToken\textsu{\mdseries,}%
+ \ifx\JointFirstAuthor\nextToken\textsuperscript{\mdseries,}%
\else
- \ifx\affil\nextToken\textsu{\mdseries,}%
+ \ifx\affil\nextToken\textsuperscript{\mdseries,}%
\fi%
\fi%
\fi%
@@ -494,7 +460,7 @@
\renewcommand\JointFirstAuthor{%
\oldJointFirstAuthor\futurelet\nextToken\isOthernote}
-\DeclareDocumentCommand{\SetAuthorBlock}{}{%
+\NewDocumentCommand{\SetAuthorBlock}{}{%
\let\savethefootnote\thefootnote
\JoinCoffins\AuthorBlock[hc,b]\AffiliationsBlock[hc,t](0pt,-\baselineskip)
\centerline{\TypesetCoffin\AuthorBlock}
@@ -511,7 +477,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% Make the title section
-\DeclareDocumentCommand{\MakeTitlePage}{}{%
+\NewDocumentCommand{\MakeTitlePage}{}{%
\PaperNo
\PaperTitle
\vspace*{2\baselineskip}
diff --git a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
index 43edb5aa2b0..4fe6a63aa2c 100644
--- a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
+++ b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
@@ -1,10 +1,10 @@
-% $Id: pst-node.sty 438 2022-01-31 17:45:26Z herbert $
+% $Id: pst-node.sty 919 2024-07-10 18:31:27Z herbert $
%%
%% This is file `pst-node.sty'.
%%
%% IMPORTANT NOTICE:
%%
-%% pst-node.sty Copyright (C) 2004-2017 Herbert Voss <voss@perce.de>
+%% pst-node.sty Copyright (C) 2004-2024 Herbert Voss <voss@perce.de>
%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pst-node}
- [2012/09/18 v1.01 LaTeX wrapper for `pst-node' (HV)]
+ [2024/07/10 v1.02 LaTeX wrapper for `pst-node' (HV)]
%
\newif\ifpst@OldVersion\pst@OldVersionfalse
\DeclareOption{97}{\pst@OldVersiontrue}
@@ -32,13 +32,14 @@
\@addtofilelist{pst-node97.pro}}{}%
\else
\RequirePackage{pstricks}
-\ProvidesPackage{pst-node}[2010/04/22 package wrapper for pst-node.tex]
+\ProvidesPackage{pst-node}[2024/07/10 package wrapper for pst-node.tex]
\input{pst-node.tex}
\ProvidesFile{pst-node.tex}
[\filedate\space \fileversion\space `pst-node' (tvz,hv)]
\IfFileExists{pst-node.pro}{%
\ProvidesFile{pst-node.pro}
- [2011/09/18 v. 1.14, PostScript prologue file (hv)]
+ [2024/07/10 v. 1.15a, PostScript prologue file (hv)]
\@addtofilelist{pst-node.pro}}{}%
\fi
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/randexam/randexam.cls b/Master/texmf-dist/tex/latex/randexam/randexam.cls
index ec5d1c43c27..dacc079cb0a 100644
--- a/Master/texmf-dist/tex/latex/randexam/randexam.cls
+++ b/Master/texmf-dist/tex/latex/randexam/randexam.cls
@@ -6,7 +6,7 @@
% ----------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{randexam}[2024-02-18 v2024E Make an exam paper and its randomized variants]
+\ProvidesClass{randexam}[2024-07-09 v2024F Make an exam paper and its randomized variants]
%% Old LaTeX release could not recognize date format like 2022-11-01
%\@ifl@t@r\fmtversion{2022-11-01}{}{
@@ -786,7 +786,8 @@
\UseExamTemplate{examdata}{default}
}
-\preto{\@enddocumenthook}{\printquestions\rdxm@stop@random}
+%% this equals to \AddToHook{enddocument}[randexam]{...}
+\AtEndDocument{\printquestions\rdxm@stop@random}
\newcommand\ignorepars{\@ifnextchar\par{\expandafter\ignorepars\@gobble}{}}
@@ -1228,6 +1229,11 @@
\mbox{}\nobreak\hfill$\cdots\cdots$\solutionpointstext{#1}
\par\noindent\ignorespaces
}
+
+%% \eqno would cause extra space after a $$...$$ equation
+%% this bug was fixed in latex release 2023-06-01
+%% see https://github.com/latex3/latex2e/issues/1059
+%% \tag is used in a \[...\] equation hence no problem with it
\newcommand{\pointseqno}[1]{\eqno{\cdots\cdots\text{\solutionpointstext{#1}}}}
\newcommand{\pointstag}[1]{\tag*{$\cdots\cdots$\solutionpointstext{#1}}}
@@ -1374,6 +1380,9 @@
\RequirePackage{extarrows}
\newcommand{\e}{\mathrm{e}}
\newcommand{\R}{\mathbb{R}}
+ \newcommand{\jacobi}[2]{{\left(\frac{##1}{##2}\right)}}
+ \newcommand{\ii}{\mathrm{i}}
+ \newcommand{\Zi}{\mathbb{Z}[\ii]}
\DeclareMathOperator{\arccot}{arccot}
\DeclareMathOperator{\Corr}{\rho}
\DeclareMathOperator{\Cov}{Cov}
diff --git a/Master/texmf-dist/tex/latex/resolsysteme/ResolSysteme.sty b/Master/texmf-dist/tex/latex/resolsysteme/ResolSysteme.sty
index a7e95078fa9..5a8d27b31c6 100644
--- a/Master/texmf-dist/tex/latex/resolsysteme/ResolSysteme.sty
+++ b/Master/texmf-dist/tex/latex/resolsysteme/ResolSysteme.sty
@@ -2,7 +2,8 @@
% licence........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ResolSysteme}[2024/06/22 v0.1.7 Quelques commandes pour travailler avec des matrices et des sytemes lineaires]
+\ProvidesPackage{ResolSysteme}[2024/07/04 v0.1.8 Quelques commandes pour travailler avec des matrices et des sytemes lineaires]
+% 0.1.8 Correction de bugs dans certains calculs, amélioration de la documentation
% 0.1.7 Correction de bugs dans certains calculs
% 0.1.6 Correction de bugs dans certains calculs
% 0.1.5 Inverse d'une matrice en 4x4 (même en normal !) + Système 4x4 (en normal !)
diff --git a/Master/texmf-dist/tex/latex/responsive/responsive.sty b/Master/texmf-dist/tex/latex/responsive/responsive.sty
index 65e5061f455..289f04ca8bb 100644
--- a/Master/texmf-dist/tex/latex/responsive/responsive.sty
+++ b/Master/texmf-dist/tex/latex/responsive/responsive.sty
@@ -3,7 +3,7 @@
\RequirePackage{expl3,l3keys2e}
\RequirePackage{kvoptions}
\ProvidesExplPackage{responsive}
-{2023-12-15}{0.1}{Responsive design for LaTeX}
+{2024-07-14}{v0.1a}{Responsive design for LaTeX}
%%%%%%%%%%%%%%%%%%%%%%
% keyval processing %
@@ -168,6 +168,10 @@
\@setfontsize#1{\resp_multiply_note:nnn\resp_font_size{#2}{1}}{\resp_multiply_note:nnn\resp_line_skip{#2}{\l_resp_lineheight_multiplier}}
}
+% This is a dummy definition. It should restore page dimensions using the Geometry package if it is loaded.
+% The correct definition is added in \AtBeginDocument
+\cs_set:Npn\resp_reset_geometry{}
+
% recalculate \textheight and \headheight with the changed font size
% this is necessary to prevent the underfull \vbox messages from the output rutine
\cs_set:Npn\resp_textheight:n {
@@ -182,6 +186,9 @@
\setlength\headheight{\resp_font_size}
\setlength\headsep {1.5\resp_font_size}
\setlength\footskip{\fp_to_dim:n{2*\resp_font_size+1}}
+ \setlength\topmargin{\fp_to_dim:n{(\paperheight-\textheight -\headheight-\headsep-\footskip)/2 - 1in}}
+ \resp_reset_geometry
+ % \addtolength\topmargin{\topskip}
}
% the functionality to fix the textheight should be available as a document command
@@ -355,6 +362,9 @@
% setup font sizes at the begin document, in order to support Geometry etc.
\AtBeginDocument{
+ \@ifpackageloaded{geometry}{
+ \cs_set:Npn\resp_reset_geometry{\Gm@process}
+ }{}
% set the default font size, based on numbers of characters we want to show on a line of text
% \fonttobox[32]\textwidth{\tl_range:Nnn\l_resp_charlist_tl{1}{\l_resp_charlines_int}}%
\bool_if:NTF\l_resp_no_execute {}{
diff --git a/Master/texmf-dist/tex/latex/sepfootnotes/sepfootnotes.sty b/Master/texmf-dist/tex/latex/sepfootnotes/sepfootnotes.sty
index d953d300226..f99b9770c0a 100644
--- a/Master/texmf-dist/tex/latex/sepfootnotes/sepfootnotes.sty
+++ b/Master/texmf-dist/tex/latex/sepfootnotes/sepfootnotes.sty
@@ -1,4 +1,4 @@
-%% Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima
+%% Copyright (C) 2013-2024 Eduardo C. Lourenço de Lima
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -11,19 +11,23 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat {LaTeX2e} [1996/06/01]
-\ProvidesPackage {sepfootnotes} [2016/07/18 v0.3c Footnotes in separate file]
+\ProvidesPackage {sepfootnotes} [2024/07/05 v0.3d Footnotes in separate file]
\newcommand\sep@packagename{sepfootnotes}
+%{% options
+
\DeclareOption {quiet} {\sep@opt@quiettrue}
\DeclareOption {warn} {\sep@opt@warntrue}
\DeclareOption {error} {\sep@opt@errortrue}
\DeclareOption {global} {\sep@opt@globaltrue}
+\DeclareOption {after} {\sep@opt@aftertrue}
\newif \ifsep@opt@quiet
\newif \ifsep@opt@warn
\newif \ifsep@opt@error
\newif \ifsep@opt@global
+\newif \ifsep@opt@after
\sep@opt@warntrue
@@ -38,10 +42,10 @@
\sep@opt@warnfalse
\fi
+%}%
+%{% public
-% ********************************* Public ************************************
-
-% ==================== shared by footnotes and endnotes =======================
+%{% footnotes and endnotes
\newcommand\sep@new [1]
{\newcounter{#1note}%
@@ -52,7 +56,8 @@
\expandafter\newcommand\csname #1quicknote\endcsname [1] {\sep@namereplace {#1} {sepfootnotes@tmp@quick} {##1}\csname #1note\endcsname{sepfootnotes@tmp@quick}}\relax
}
-% -------------------------------- footnotes ----------------------------------
+%}%
+%{% footnotes
\newcommand\newfootnotes{\@ifstar\sep@newfootnotesfree\sep@newfootnotes}
@@ -73,7 +78,8 @@
\@addtoreset {#2note} {#1}%
\expandafter\renewcommand\csname the#2mark\endcsname {\fnsymbol {#2note}}}
-% -------------------------------- endnotes -----------------------------------
+%}%
+%{% endnotes
\newcommand\newendnotes [1]
{\sep@new {#1}%
@@ -88,8 +94,8 @@
\expandafter\newcommand\csname #1notesize\endcsname {\footnotesize}%
\newenvironment {#1notes} {\csname #1notesize\endcsname\setlength\parskip\footnotesep} {}}
-
-% ------------------------------ commentnotes --------------------------------
+%}%
+%{% commentnotes
\newcommand\newcommentnotes [1]
{\newfootnotes*{#1}\relax
@@ -107,62 +113,114 @@
\@addtoreset {#2note} {#1}\relax
\expandafter\renewcommand\csname the#2mark\endcsname {\fnsymbol {#2note}}}
-% ********************************* Private ***********************************
+%}%
+
+%}%
+%{% private
-% ---------------------------------- files ------------------------------------
+%{% files
\newcommand\sep@filename [1] {\jobname.ent-#1}
\newcommand\sep@openout [1] {\expandafter \newwrite\csname sep@fileout#1\endcsname\immediate\expandafter\openout\csname sep@fileout#1\endcsname=\sep@filename#1\relax}
\newcommand\sep@write [2] {\immediate \write\csname sep@fileout#1\endcsname {#2}}
\newcommand\sep@close [1] {\immediate\expandafter\closeout\csname sep@fileout#1\endcsname\relax}
-% ---------------------------------- table ------------------------------------
+%}%
+%{% names
+
+%{% \sep@nameuse <prefix> <key>
\newcommand\sep@nameuse [2]
{\@ifundefined{sepfootnotes@text@#1@#2}
- {\ifsep@opt@error
- \PackageError {\sep@packagename} {`#2' has not been assigned a content}
- {`#2' has not been assigned a content.\MessageBreak
- Solution: Define `#2'\MessageBreak
- Try: \@backslashchar #1notecontent{#2}{<content>}}\relax
- \fi
- \ifsep@opt@warn
- \PackageWarning {\sep@packagename} {`#2' has not been assigned a content}\relax
- \fi}
+ {\sep@warning@undefined{#1}{#2}}
{\@nameuse{sepfootnotes@text@#1@#2}}}
+%}%
+%{% \sep@namedef <prefix> <key> <content>
+
\newcommand\sep@namedef [3]
-{\@ifundefined{sepfootnotes@text@#1@#2}
+{\ifsep@opt@after\sep@namereplace{#1}{#2}{#3}\else
+ \@ifundefined{sepfootnotes@text@#1@#2}
{\ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}}
- {\ifsep@opt@error
- \PackageError {\sep@packagename} {`#2' is already in use}
- {`#2' is already in use.\MessageBreak
- Solution: Use another key.\MessageBreak
- Try: \@backslashchar #1notecontent{<key>}{<content>}}\relax
- \fi
- \ifsep@opt@warn
- \PackageWarning {\sep@packagename} {`#2' is already in use}
- \fi}}
+ {\sep@warning@already{#1}{#2}}\fi}
+
+%}%
+%{% \sep@namereplace <prefix> <key> <content>
+
+\newcommand\sep@namereplace [3]
+{%
+ \ifsep@opt@after
+ \global\@namedef{sepfootnotes@text@#1@#2}{#3}%
+ \write\@auxout{\expandafter\unexpanded\expandafter{\global\@namedef {sepfootnotes@text@#1@#2}{#3}}}%
+ \else
+ \ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}%
+ \fi
+}
+
+%}%
+
+%{% \sep@warning@undefined <prefix> <key>
+
+\newcommand \sep@warning@undefined [2]
+{\ifsep@opt@error
+ \PackageError
+ {\sep@packagename}
+ {`#2' has not been assigned a content}
+ {`#2' has not been assigned a content.\MessageBreak
+ Solution: Define `#2'\MessageBreak
+ Try: \@backslashchar #1notecontent{#2}{<content>}}%
+ \fi
+ \ifsep@opt@warn
+ \PackageWarning
+ {\sep@packagename}
+ {`#2' has not been assigned a content}%
+ \fi
+}
-\newcommand\sep@namereplace [3] {\ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}}
+%}%
+%{% \sep@warning@already <prefix> <key>
+
+\newcommand \sep@warning@already [2]
+{\ifsep@opt@error
+ \PackageError
+ {\sep@packagename}
+ {`#2' is already in use}
+ {`#2' is already in use.\MessageBreak
+ Solution: Use another key.\MessageBreak
+ Try: \@backslashchar #1notecontent{<key>}{<content>}}%
+ \fi
+ \ifsep@opt@warn
+ \PackageWarning
+ {\sep@packagename}
+ {`#2' is already in use}%
+ \fi
+}
-% ---------------------------------- marks ------------------------------------
+%}%
+
+%}%
+%{% marks
\newcommand\sep@markset [1] {\protected@xdef\@thefnmark{\csname the#1mark\endcsname}}
\newcommand\sep@mark [2] {\stepcounter {#1note}\sep@markset {#1}\@footnotemark}
-% ---------------------- cross-references and counters ------------------------
+%}%
+%{% cross-references and counters
\newcommand\sep@refsetcounter [2] {\setcounter{#1}{#2}\protected@edef\@currentlabel{\csname p@#1\endcsname\csname the#1\endcsname}}
\newcommand\sep@refstepcounter [1] {\stepcounter {#1}\protected@edef\@currentlabel{\csname p@#1\endcsname\csname the#1\endcsname}}
-% ********************************* Default ***********************************
+%}%
+
+%}%
+%{% default
-% ------------------------- footnotes: \sepfootnote ---------------------------
+%% The default \sepfootnote apparatus relies on \footnote
-%% Default: The default \sepfootnote family relies on \footnote
\newfootnotes{sepfoot}
+%}%
+
\endinput
%%
%% End of file `sepfootnotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty
index 38f443abb0b..bcbe536096d 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{simpleicons}[2024/06/28 12.4.0 Simple Icons 12.4.0 Logos]
+\ProvidesPackage{simpleicons}[2024/07/12 13.1.0 Simple Icons 13.1.0 Logos]
\RequirePackage{iftex}
diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
index 5d38055f8e5..e0ea8e79ccc 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
@@ -300,2910 +300,2855 @@
\expandafter\def\csname simpleicon@awssecretsmanagericon\endcsname {\simpleiconsmaptwo\symbol{42}}
\expandafter\def\csname simpleicon@awwwardsicon\endcsname {\simpleiconsmaptwo\symbol{43}}
\expandafter\def\csname simpleicon@axiosicon\endcsname {\simpleiconsmaptwo\symbol{44}}
- \expandafter\def\csname simpleicon@azureartifactsicon\endcsname {\simpleiconsmaptwo\symbol{45}}
- \expandafter\def\csname simpleicon@azuredataexplorericon\endcsname {\simpleiconsmaptwo\symbol{46}}
- \expandafter\def\csname simpleicon@azuredevopsicon\endcsname {\simpleiconsmaptwo\symbol{47}}
- \expandafter\def\csname simpleicon@azurefunctionsicon\endcsname {\simpleiconsmaptwo\symbol{48}}
- \expandafter\def\csname simpleicon@azurepipelinesicon\endcsname {\simpleiconsmaptwo\symbol{49}}
- \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmaptwo\symbol{50}}
- \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmaptwo\symbol{51}}
- \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmaptwo\symbol{52}}
- \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmaptwo\symbol{53}}
- \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmaptwo\symbol{54}}
- \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmaptwo\symbol{55}}
- \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmaptwo\symbol{56}}
- \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmaptwo\symbol{57}}
- \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmaptwo\symbol{58}}
- \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmaptwo\symbol{59}}
- \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmaptwo\symbol{60}}
- \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmaptwo\symbol{61}}
- \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmaptwo\symbol{62}}
- \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmaptwo\symbol{63}}
- \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmaptwo\symbol{64}}
- \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmaptwo\symbol{65}}
- \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmaptwo\symbol{66}}
- \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmaptwo\symbol{67}}
- \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmaptwo\symbol{68}}
- \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmaptwo\symbol{69}}
- \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmaptwo\symbol{70}}
- \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmaptwo\symbol{71}}
- \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmaptwo\symbol{72}}
- \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmaptwo\symbol{73}}
- \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmaptwo\symbol{74}}
- \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmaptwo\symbol{75}}
- \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmaptwo\symbol{76}}
- \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmaptwo\symbol{77}}
- \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmaptwo\symbol{78}}
- \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmaptwo\symbol{79}}
- \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmaptwo\symbol{80}}
- \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmaptwo\symbol{81}}
- \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmaptwo\symbol{82}}
- \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmaptwo\symbol{83}}
- \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmaptwo\symbol{84}}
- \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmaptwo\symbol{85}}
- \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmaptwo\symbol{86}}
- \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmaptwo\symbol{87}}
- \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmaptwo\symbol{88}}
- \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmaptwo\symbol{89}}
- \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmaptwo\symbol{90}}
- \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmaptwo\symbol{91}}
- \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmaptwo\symbol{92}}
- \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmaptwo\symbol{93}}
- \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmaptwo\symbol{94}}
- \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmaptwo\symbol{95}}
- \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmaptwo\symbol{96}}
- \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmaptwo\symbol{97}}
- \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmaptwo\symbol{98}}
- \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmaptwo\symbol{99}}
- \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmaptwo\symbol{100}}
- \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmaptwo\symbol{101}}
- \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmaptwo\symbol{102}}
- \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmaptwo\symbol{103}}
- \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmaptwo\symbol{104}}
- \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmaptwo\symbol{105}}
- \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmaptwo\symbol{106}}
- \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmaptwo\symbol{107}}
- \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmaptwo\symbol{108}}
- \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmaptwo\symbol{109}}
- \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmaptwo\symbol{110}}
- \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmaptwo\symbol{111}}
- \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmaptwo\symbol{112}}
- \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmaptwo\symbol{113}}
- \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmaptwo\symbol{114}}
- \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmaptwo\symbol{115}}
- \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmaptwo\symbol{116}}
- \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmaptwo\symbol{117}}
- \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmaptwo\symbol{118}}
- \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmaptwo\symbol{119}}
- \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmaptwo\symbol{120}}
- \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmaptwo\symbol{121}}
- \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmaptwo\symbol{122}}
- \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmaptwo\symbol{123}}
- \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmaptwo\symbol{124}}
- \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmaptwo\symbol{125}}
- \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmaptwo\symbol{126}}
- \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmaptwo\symbol{127}}
- \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmaptwo\symbol{128}}
- \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmaptwo\symbol{129}}
- \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmaptwo\symbol{130}}
- \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmaptwo\symbol{131}}
- \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmaptwo\symbol{132}}
- \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmaptwo\symbol{133}}
- \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmaptwo\symbol{134}}
- \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmaptwo\symbol{135}}
- \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmaptwo\symbol{136}}
- \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmaptwo\symbol{137}}
- \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmaptwo\symbol{138}}
- \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmaptwo\symbol{139}}
- \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmaptwo\symbol{140}}
- \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmaptwo\symbol{141}}
- \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmaptwo\symbol{142}}
- \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmaptwo\symbol{143}}
- \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmaptwo\symbol{144}}
- \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmaptwo\symbol{145}}
- \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmaptwo\symbol{146}}
- \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmaptwo\symbol{147}}
- \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmaptwo\symbol{148}}
- \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmaptwo\symbol{149}}
- \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmaptwo\symbol{150}}
- \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmaptwo\symbol{151}}
- \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmaptwo\symbol{152}}
- \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmaptwo\symbol{153}}
- \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmaptwo\symbol{154}}
- \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmaptwo\symbol{155}}
- \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmaptwo\symbol{156}}
- \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmaptwo\symbol{157}}
- \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmaptwo\symbol{158}}
- \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmaptwo\symbol{159}}
- \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmaptwo\symbol{160}}
- \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmaptwo\symbol{161}}
- \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmaptwo\symbol{162}}
- \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmaptwo\symbol{163}}
- \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmaptwo\symbol{164}}
- \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmaptwo\symbol{165}}
- \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmaptwo\symbol{166}}
- \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmaptwo\symbol{167}}
- \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmaptwo\symbol{168}}
- \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmaptwo\symbol{169}}
- \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmaptwo\symbol{170}}
- \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmaptwo\symbol{171}}
- \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmaptwo\symbol{172}}
- \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmaptwo\symbol{173}}
- \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmaptwo\symbol{174}}
- \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmaptwo\symbol{175}}
- \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmaptwo\symbol{176}}
- \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmaptwo\symbol{177}}
- \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmaptwo\symbol{178}}
- \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmaptwo\symbol{179}}
- \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmaptwo\symbol{180}}
- \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmaptwo\symbol{181}}
- \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmaptwo\symbol{182}}
- \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmaptwo\symbol{183}}
- \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmaptwo\symbol{184}}
- \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmaptwo\symbol{185}}
- \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmaptwo\symbol{186}}
- \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmaptwo\symbol{187}}
- \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmaptwo\symbol{188}}
- \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmaptwo\symbol{189}}
- \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmaptwo\symbol{190}}
- \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmaptwo\symbol{191}}
- \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmaptwo\symbol{192}}
- \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmaptwo\symbol{193}}
- \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmaptwo\symbol{194}}
- \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmaptwo\symbol{195}}
- \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmaptwo\symbol{196}}
- \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmaptwo\symbol{197}}
- \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmaptwo\symbol{198}}
- \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmaptwo\symbol{199}}
- \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmaptwo\symbol{200}}
- \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmaptwo\symbol{201}}
- \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmaptwo\symbol{202}}
- \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmaptwo\symbol{203}}
- \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmaptwo\symbol{204}}
- \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmaptwo\symbol{205}}
- \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmaptwo\symbol{206}}
- \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmaptwo\symbol{207}}
- \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmaptwo\symbol{208}}
- \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmaptwo\symbol{209}}
- \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmaptwo\symbol{210}}
- \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmaptwo\symbol{211}}
- \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmaptwo\symbol{212}}
- \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmaptwo\symbol{213}}
- \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmaptwo\symbol{214}}
- \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmaptwo\symbol{215}}
- \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmaptwo\symbol{216}}
- \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmaptwo\symbol{217}}
- \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmaptwo\symbol{218}}
- \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmaptwo\symbol{219}}
- \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmaptwo\symbol{220}}
- \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmaptwo\symbol{221}}
- \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmaptwo\symbol{222}}
- \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmaptwo\symbol{223}}
- \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmaptwo\symbol{224}}
- \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmaptwo\symbol{225}}
- \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmaptwo\symbol{226}}
- \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmaptwo\symbol{227}}
- \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmaptwo\symbol{228}}
- \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmaptwo\symbol{229}}
- \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmaptwo\symbol{230}}
- \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmaptwo\symbol{231}}
- \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmaptwo\symbol{232}}
- \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmaptwo\symbol{233}}
- \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmaptwo\symbol{234}}
- \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmaptwo\symbol{235}}
- \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmaptwo\symbol{236}}
- \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmaptwo\symbol{237}}
- \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmaptwo\symbol{238}}
- \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmaptwo\symbol{239}}
- \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmaptwo\symbol{240}}
- \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmaptwo\symbol{241}}
- \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmaptwo\symbol{242}}
- \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmaptwo\symbol{243}}
- \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmaptwo\symbol{244}}
- \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmaptwo\symbol{245}}
- \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmaptwo\symbol{246}}
- \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmaptwo\symbol{247}}
- \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmaptwo\symbol{248}}
- \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmaptwo\symbol{249}}
- \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmaptwo\symbol{250}}
- \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmaptwo\symbol{251}}
- \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmaptwo\symbol{252}}
- \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmaptwo\symbol{253}}
- \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmaptwo\symbol{254}}
- \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmaptwo\symbol{255}}
- \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmapthree\symbol{0}}
- \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmapthree\symbol{1}}
- \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmapthree\symbol{2}}
- \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmapthree\symbol{3}}
- \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmapthree\symbol{4}}
- \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmapthree\symbol{5}}
- \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmapthree\symbol{6}}
- \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmapthree\symbol{7}}
- \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmapthree\symbol{8}}
- \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmapthree\symbol{9}}
- \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmapthree\symbol{10}}
- \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmapthree\symbol{11}}
- \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmapthree\symbol{12}}
- \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmapthree\symbol{13}}
- \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmapthree\symbol{14}}
- \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmapthree\symbol{15}}
- \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmapthree\symbol{16}}
- \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmapthree\symbol{17}}
- \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmapthree\symbol{18}}
- \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmapthree\symbol{19}}
- \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmapthree\symbol{20}}
- \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmapthree\symbol{21}}
- \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmapthree\symbol{22}}
- \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmapthree\symbol{23}}
- \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmapthree\symbol{24}}
- \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmapthree\symbol{25}}
- \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmapthree\symbol{26}}
- \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmapthree\symbol{27}}
- \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmapthree\symbol{28}}
- \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmapthree\symbol{29}}
- \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmapthree\symbol{30}}
- \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmapthree\symbol{31}}
- \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmapthree\symbol{32}}
- \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmapthree\symbol{33}}
- \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmapthree\symbol{34}}
- \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmapthree\symbol{35}}
- \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmapthree\symbol{36}}
- \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmapthree\symbol{37}}
- \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmapthree\symbol{38}}
- \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmapthree\symbol{39}}
- \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmapthree\symbol{40}}
- \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmapthree\symbol{41}}
- \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmapthree\symbol{42}}
- \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmapthree\symbol{43}}
- \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmapthree\symbol{44}}
- \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmapthree\symbol{45}}
- \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmapthree\symbol{46}}
- \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmapthree\symbol{47}}
- \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmapthree\symbol{48}}
- \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmapthree\symbol{49}}
- \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmapthree\symbol{50}}
- \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmapthree\symbol{51}}
- \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmapthree\symbol{52}}
- \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmapthree\symbol{53}}
- \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmapthree\symbol{54}}
- \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmapthree\symbol{55}}
- \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmapthree\symbol{56}}
- \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmapthree\symbol{57}}
- \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmapthree\symbol{58}}
- \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmapthree\symbol{59}}
- \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmapthree\symbol{60}}
- \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmapthree\symbol{61}}
- \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmapthree\symbol{62}}
- \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmapthree\symbol{63}}
- \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmapthree\symbol{64}}
- \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmapthree\symbol{65}}
- \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmapthree\symbol{66}}
- \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmapthree\symbol{67}}
- \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmapthree\symbol{68}}
- \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmapthree\symbol{69}}
- \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmapthree\symbol{70}}
- \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmapthree\symbol{71}}
- \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmapthree\symbol{72}}
- \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmapthree\symbol{73}}
- \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmapthree\symbol{74}}
- \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmapthree\symbol{75}}
- \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmapthree\symbol{76}}
- \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmapthree\symbol{77}}
- \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmapthree\symbol{78}}
- \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmapthree\symbol{79}}
- \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmapthree\symbol{80}}
- \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmapthree\symbol{81}}
- \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmapthree\symbol{82}}
- \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmapthree\symbol{83}}
- \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmapthree\symbol{84}}
- \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmapthree\symbol{85}}
- \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmapthree\symbol{86}}
- \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmapthree\symbol{87}}
- \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmapthree\symbol{88}}
- \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmapthree\symbol{89}}
- \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmapthree\symbol{90}}
- \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmapthree\symbol{91}}
- \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmapthree\symbol{92}}
- \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmapthree\symbol{93}}
- \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmapthree\symbol{94}}
- \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmapthree\symbol{95}}
- \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmapthree\symbol{96}}
- \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmapthree\symbol{97}}
- \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmapthree\symbol{98}}
- \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmapthree\symbol{99}}
- \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmapthree\symbol{100}}
- \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmapthree\symbol{101}}
- \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmapthree\symbol{102}}
- \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmapthree\symbol{103}}
- \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmapthree\symbol{104}}
- \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmapthree\symbol{105}}
- \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmapthree\symbol{106}}
- \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmapthree\symbol{107}}
- \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmapthree\symbol{108}}
- \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmapthree\symbol{109}}
- \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmapthree\symbol{110}}
- \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmapthree\symbol{111}}
- \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmapthree\symbol{112}}
- \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmapthree\symbol{113}}
- \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmapthree\symbol{114}}
- \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmapthree\symbol{115}}
- \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmapthree\symbol{116}}
- \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmapthree\symbol{117}}
- \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmapthree\symbol{118}}
- \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmapthree\symbol{119}}
- \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmapthree\symbol{120}}
- \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmapthree\symbol{121}}
- \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmapthree\symbol{122}}
- \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmapthree\symbol{123}}
- \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmapthree\symbol{124}}
- \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmapthree\symbol{125}}
- \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmapthree\symbol{126}}
- \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmapthree\symbol{127}}
- \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmapthree\symbol{128}}
- \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmapthree\symbol{129}}
- \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmapthree\symbol{130}}
- \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmapthree\symbol{131}}
- \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmapthree\symbol{132}}
- \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmapthree\symbol{133}}
- \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmapthree\symbol{134}}
- \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmapthree\symbol{135}}
- \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmapthree\symbol{136}}
- \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmapthree\symbol{137}}
- \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmapthree\symbol{138}}
- \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmapthree\symbol{139}}
- \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmapthree\symbol{140}}
- \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmapthree\symbol{141}}
- \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmapthree\symbol{142}}
- \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmapthree\symbol{143}}
- \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmapthree\symbol{144}}
- \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmapthree\symbol{145}}
- \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmapthree\symbol{146}}
- \expandafter\def\csname simpleicon@csharpicon\endcsname {\simpleiconsmapthree\symbol{147}}
- \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmapthree\symbol{148}}
- \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmapthree\symbol{149}}
- \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmapthree\symbol{150}}
- \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmapthree\symbol{151}}
- \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmapthree\symbol{152}}
- \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmapthree\symbol{153}}
- \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmapthree\symbol{154}}
- \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmapthree\symbol{155}}
- \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmapthree\symbol{156}}
- \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmapthree\symbol{157}}
- \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmapthree\symbol{158}}
- \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmapthree\symbol{159}}
- \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmapthree\symbol{160}}
- \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmapthree\symbol{161}}
- \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmapthree\symbol{162}}
- \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmapthree\symbol{163}}
- \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmapthree\symbol{164}}
- \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmapthree\symbol{165}}
- \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmapthree\symbol{166}}
- \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmapthree\symbol{167}}
- \expandafter\def\csname simpleicon@daimlericon\endcsname {\simpleiconsmapthree\symbol{168}}
- \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmapthree\symbol{169}}
- \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmapthree\symbol{170}}
- \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmapthree\symbol{171}}
- \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmapthree\symbol{172}}
- \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmapthree\symbol{173}}
- \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmapthree\symbol{174}}
- \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmapthree\symbol{175}}
- \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmapthree\symbol{176}}
- \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmapthree\symbol{177}}
- \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmapthree\symbol{178}}
- \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmapthree\symbol{179}}
- \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmapthree\symbol{180}}
- \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmapthree\symbol{181}}
- \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmapthree\symbol{182}}
- \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmapthree\symbol{183}}
- \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmapthree\symbol{184}}
- \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmapthree\symbol{185}}
- \expandafter\def\csname simpleicon@dataverseicon\endcsname {\simpleiconsmapthree\symbol{186}}
- \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmapthree\symbol{187}}
- \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmapthree\symbol{188}}
- \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmapthree\symbol{189}}
- \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmapthree\symbol{190}}
- \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmapthree\symbol{191}}
- \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmapthree\symbol{192}}
- \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmapthree\symbol{193}}
- \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmapthree\symbol{194}}
- \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmapthree\symbol{195}}
- \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmapthree\symbol{196}}
- \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmapthree\symbol{197}}
- \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmapthree\symbol{198}}
- \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmapthree\symbol{199}}
- \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmapthree\symbol{200}}
- \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmapthree\symbol{201}}
- \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmapthree\symbol{202}}
- \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmapthree\symbol{203}}
- \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmapthree\symbol{204}}
- \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmapthree\symbol{205}}
- \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmapthree\symbol{206}}
- \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmapthree\symbol{207}}
- \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmapthree\symbol{208}}
- \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmapthree\symbol{209}}
- \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmapthree\symbol{210}}
- \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmapthree\symbol{211}}
- \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmapthree\symbol{212}}
- \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmapthree\symbol{213}}
- \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmapthree\symbol{214}}
- \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmapthree\symbol{215}}
- \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmapthree\symbol{216}}
- \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmapthree\symbol{217}}
- \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmapthree\symbol{218}}
- \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmapthree\symbol{219}}
- \expandafter\def\csname simpleicon@designernewsicon\endcsname {\simpleiconsmapthree\symbol{220}}
- \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmapthree\symbol{221}}
- \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmapthree\symbol{222}}
- \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmapthree\symbol{223}}
- \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmapthree\symbol{224}}
- \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmapthree\symbol{225}}
- \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmapthree\symbol{226}}
- \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmapthree\symbol{227}}
- \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmapthree\symbol{228}}
- \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmapthree\symbol{229}}
- \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmapthree\symbol{230}}
- \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmapthree\symbol{231}}
- \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmapthree\symbol{232}}
- \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmapthree\symbol{233}}
- \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmapthree\symbol{234}}
- \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmapthree\symbol{235}}
- \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmapthree\symbol{236}}
- \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmapthree\symbol{237}}
- \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmapthree\symbol{238}}
- \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmapthree\symbol{239}}
- \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmapthree\symbol{240}}
- \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmapthree\symbol{241}}
- \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmapthree\symbol{242}}
- \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmapthree\symbol{243}}
- \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmapthree\symbol{244}}
- \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmapthree\symbol{245}}
- \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmapthree\symbol{246}}
- \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmapthree\symbol{247}}
- \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmapthree\symbol{248}}
- \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmapthree\symbol{249}}
- \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmapthree\symbol{250}}
- \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmapthree\symbol{251}}
- \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmapthree\symbol{252}}
- \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmapthree\symbol{253}}
- \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmapthree\symbol{254}}
- \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmapthree\symbol{255}}
- \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmapfour\symbol{0}}
- \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmapfour\symbol{1}}
- \expandafter\def\csname simpleicon@docusignicon\endcsname {\simpleiconsmapfour\symbol{2}}
- \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmapfour\symbol{3}}
- \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmapfour\symbol{4}}
- \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmapfour\symbol{5}}
- \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmapfour\symbol{6}}
- \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmapfour\symbol{7}}
- \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmapfour\symbol{8}}
- \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmapfour\symbol{9}}
- \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmapfour\symbol{10}}
- \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmapfour\symbol{11}}
- \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmapfour\symbol{12}}
- \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmapfour\symbol{13}}
- \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmapfour\symbol{14}}
- \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmapfour\symbol{15}}
- \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmapfour\symbol{16}}
- \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmapfour\symbol{17}}
- \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmapfour\symbol{18}}
- \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmapfour\symbol{19}}
- \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmapfour\symbol{20}}
- \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmapfour\symbol{21}}
- \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmapfour\symbol{22}}
- \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmapfour\symbol{23}}
- \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmapfour\symbol{24}}
- \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmapfour\symbol{25}}
- \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmapfour\symbol{26}}
- \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmapfour\symbol{27}}
- \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmapfour\symbol{28}}
- \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmapfour\symbol{29}}
- \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmapfour\symbol{30}}
- \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmapfour\symbol{31}}
- \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmapfour\symbol{32}}
- \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmapfour\symbol{33}}
- \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmapfour\symbol{34}}
- \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmapfour\symbol{35}}
- \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmapfour\symbol{36}}
- \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmapfour\symbol{37}}
- \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmapfour\symbol{38}}
- \expandafter\def\csname simpleicon@dynamics365icon\endcsname {\simpleiconsmapfour\symbol{39}}
- \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmapfour\symbol{40}}
- \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmapfour\symbol{41}}
- \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmapfour\symbol{42}}
- \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmapfour\symbol{43}}
- \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmapfour\symbol{44}}
- \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmapfour\symbol{45}}
- \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmapfour\symbol{46}}
- \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmapfour\symbol{47}}
- \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmapfour\symbol{48}}
- \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmapfour\symbol{49}}
- \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmapfour\symbol{50}}
- \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmapfour\symbol{51}}
- \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmapfour\symbol{52}}
- \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmapfour\symbol{53}}
- \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmapfour\symbol{54}}
- \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmapfour\symbol{55}}
- \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmapfour\symbol{56}}
- \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmapfour\symbol{57}}
- \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmapfour\symbol{58}}
- \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmapfour\symbol{59}}
- \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmapfour\symbol{60}}
- \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmapfour\symbol{61}}
- \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmapfour\symbol{62}}
- \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmapfour\symbol{63}}
- \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmapfour\symbol{64}}
- \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmapfour\symbol{65}}
- \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmapfour\symbol{66}}
- \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmapfour\symbol{67}}
- \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmapfour\symbol{68}}
- \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmapfour\symbol{69}}
- \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmapfour\symbol{70}}
- \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmapfour\symbol{71}}
- \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmapfour\symbol{72}}
- \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmapfour\symbol{73}}
- \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmapfour\symbol{74}}
- \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmapfour\symbol{75}}
- \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmapfour\symbol{76}}
- \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmapfour\symbol{77}}
- \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmapfour\symbol{78}}
- \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmapfour\symbol{79}}
- \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmapfour\symbol{80}}
- \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmapfour\symbol{81}}
- \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmapfour\symbol{82}}
- \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmapfour\symbol{83}}
- \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmapfour\symbol{84}}
- \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmapfour\symbol{85}}
- \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmapfour\symbol{86}}
- \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmapfour\symbol{87}}
- \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmapfour\symbol{88}}
- \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmapfour\symbol{89}}
- \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmapfour\symbol{90}}
- \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmapfour\symbol{91}}
- \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmapfour\symbol{92}}
- \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmapfour\symbol{93}}
- \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmapfour\symbol{94}}
- \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmapfour\symbol{95}}
- \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmapfour\symbol{96}}
- \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmapfour\symbol{97}}
- \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmapfour\symbol{98}}
- \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmapfour\symbol{99}}
- \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmapfour\symbol{100}}
- \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmapfour\symbol{101}}
- \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmapfour\symbol{102}}
- \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmapfour\symbol{103}}
- \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmapfour\symbol{104}}
- \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmapfour\symbol{105}}
- \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmapfour\symbol{106}}
- \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmapfour\symbol{107}}
- \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmapfour\symbol{108}}
- \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmapfour\symbol{109}}
- \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmapfour\symbol{110}}
- \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmapfour\symbol{111}}
- \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmapfour\symbol{112}}
- \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmapfour\symbol{113}}
- \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmapfour\symbol{114}}
- \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmapfour\symbol{115}}
- \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmapfour\symbol{116}}
- \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmapfour\symbol{117}}
- \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmapfour\symbol{118}}
- \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmapfour\symbol{119}}
- \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmapfour\symbol{120}}
- \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmapfour\symbol{121}}
- \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmapfour\symbol{122}}
- \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmapfour\symbol{123}}
- \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmapfour\symbol{124}}
- \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmapfour\symbol{125}}
- \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmapfour\symbol{126}}
- \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmapfour\symbol{127}}
- \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmapfour\symbol{128}}
- \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmapfour\symbol{129}}
- \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmapfour\symbol{130}}
- \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmapfour\symbol{131}}
- \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmapfour\symbol{132}}
- \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmapfour\symbol{133}}
- \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmapfour\symbol{134}}
- \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmapfour\symbol{135}}
- \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmapfour\symbol{136}}
- \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmapfour\symbol{137}}
- \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmapfour\symbol{138}}
- \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmapfour\symbol{139}}
- \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmapfour\symbol{140}}
- \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmapfour\symbol{141}}
- \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmapfour\symbol{142}}
- \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmapfour\symbol{143}}
- \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmapfour\symbol{144}}
- \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmapfour\symbol{145}}
- \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmapfour\symbol{146}}
- \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmapfour\symbol{147}}
- \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmapfour\symbol{148}}
- \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmapfour\symbol{149}}
- \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmapfour\symbol{150}}
- \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmapfour\symbol{151}}
- \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmapfour\symbol{152}}
- \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmapfour\symbol{153}}
- \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmapfour\symbol{154}}
- \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmapfour\symbol{155}}
- \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmapfour\symbol{156}}
- \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmapfour\symbol{157}}
- \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmapfour\symbol{158}}
- \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmapfour\symbol{159}}
- \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmapfour\symbol{160}}
- \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmapfour\symbol{161}}
- \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmapfour\symbol{162}}
- \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmapfour\symbol{163}}
- \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmapfour\symbol{164}}
- \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmapfour\symbol{165}}
- \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmapfour\symbol{166}}
- \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmapfour\symbol{167}}
- \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmapfour\symbol{168}}
- \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmapfour\symbol{169}}
- \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmapfour\symbol{170}}
- \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmapfour\symbol{171}}
- \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmapfour\symbol{172}}
- \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmapfour\symbol{173}}
- \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmapfour\symbol{174}}
- \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmapfour\symbol{175}}
- \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmapfour\symbol{176}}
- \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmapfour\symbol{177}}
- \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmapfour\symbol{178}}
- \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmapfour\symbol{179}}
- \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmapfour\symbol{180}}
- \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmapfour\symbol{181}}
- \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmapfour\symbol{182}}
- \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmapfour\symbol{183}}
- \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmapfour\symbol{184}}
- \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmapfour\symbol{185}}
- \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmapfour\symbol{186}}
- \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmapfour\symbol{187}}
- \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmapfour\symbol{188}}
- \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmapfour\symbol{189}}
- \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmapfour\symbol{190}}
- \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmapfour\symbol{191}}
- \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmapfour\symbol{192}}
- \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmapfour\symbol{193}}
- \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmapfour\symbol{194}}
- \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmapfour\symbol{195}}
- \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmapfour\symbol{196}}
- \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmapfour\symbol{197}}
- \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmapfour\symbol{198}}
- \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmapfour\symbol{199}}
- \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmapfour\symbol{200}}
- \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmapfour\symbol{201}}
- \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmapfour\symbol{202}}
- \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmapfour\symbol{203}}
- \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmapfour\symbol{204}}
- \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmapfour\symbol{205}}
- \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmapfour\symbol{206}}
- \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmapfour\symbol{207}}
- \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmapfour\symbol{208}}
- \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmapfour\symbol{209}}
- \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmapfour\symbol{210}}
- \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmapfour\symbol{211}}
- \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmapfour\symbol{212}}
- \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmapfour\symbol{213}}
- \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmapfour\symbol{214}}
- \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmapfour\symbol{215}}
- \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmapfour\symbol{216}}
- \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmapfour\symbol{217}}
- \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmapfour\symbol{218}}
- \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmapfour\symbol{219}}
- \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmapfour\symbol{220}}
- \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmapfour\symbol{221}}
- \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmapfour\symbol{222}}
- \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmapfour\symbol{223}}
- \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmapfour\symbol{224}}
- \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmapfour\symbol{225}}
- \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmapfour\symbol{226}}
- \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmapfour\symbol{227}}
- \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmapfour\symbol{228}}
- \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmapfour\symbol{229}}
- \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmapfour\symbol{230}}
- \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmapfour\symbol{231}}
- \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmapfour\symbol{232}}
- \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmapfour\symbol{233}}
- \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmapfour\symbol{234}}
- \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmapfour\symbol{235}}
- \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmapfour\symbol{236}}
- \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmapfour\symbol{237}}
- \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmapfour\symbol{238}}
- \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmapfour\symbol{239}}
- \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmapfour\symbol{240}}
- \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmapfour\symbol{241}}
- \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmapfour\symbol{242}}
- \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmapfour\symbol{243}}
- \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmapfour\symbol{244}}
- \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmapfour\symbol{245}}
- \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmapfour\symbol{246}}
- \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmapfour\symbol{247}}
- \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmapfour\symbol{248}}
- \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmapfour\symbol{249}}
- \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmapfour\symbol{250}}
- \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmapfour\symbol{251}}
- \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmapfour\symbol{252}}
- \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmapfour\symbol{253}}
- \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmapfour\symbol{254}}
- \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmapfour\symbol{255}}
- \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmapfive\symbol{0}}
- \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmapfive\symbol{1}}
- \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmapfive\symbol{2}}
- \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmapfive\symbol{3}}
- \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmapfive\symbol{4}}
- \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmapfive\symbol{5}}
- \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmapfive\symbol{6}}
- \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmapfive\symbol{7}}
- \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmapfive\symbol{8}}
- \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmapfive\symbol{9}}
- \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmapfive\symbol{10}}
- \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmapfive\symbol{11}}
- \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmapfive\symbol{12}}
- \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmapfive\symbol{13}}
- \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmapfive\symbol{14}}
- \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmapfive\symbol{15}}
- \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmapfive\symbol{16}}
- \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmapfive\symbol{17}}
- \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmapfive\symbol{18}}
- \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmapfive\symbol{19}}
- \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmapfive\symbol{20}}
- \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmapfive\symbol{21}}
- \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmapfive\symbol{22}}
- \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmapfive\symbol{23}}
- \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmapfive\symbol{24}}
- \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmapfive\symbol{25}}
- \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmapfive\symbol{26}}
- \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmapfive\symbol{27}}
- \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmapfive\symbol{28}}
- \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmapfive\symbol{29}}
- \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmapfive\symbol{30}}
- \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmapfive\symbol{31}}
- \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmapfive\symbol{32}}
- \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmapfive\symbol{33}}
- \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmapfive\symbol{34}}
- \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmapfive\symbol{35}}
- \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmapfive\symbol{36}}
- \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmapfive\symbol{37}}
- \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmapfive\symbol{38}}
- \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmapfive\symbol{39}}
- \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmapfive\symbol{40}}
- \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmapfive\symbol{41}}
- \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmapfive\symbol{42}}
- \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmapfive\symbol{43}}
- \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmapfive\symbol{44}}
- \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmapfive\symbol{45}}
- \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmapfive\symbol{46}}
- \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmapfive\symbol{47}}
- \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmapfive\symbol{48}}
- \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmapfive\symbol{49}}
- \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmapfive\symbol{50}}
- \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmapfive\symbol{51}}
- \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmapfive\symbol{52}}
- \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmapfive\symbol{53}}
- \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmapfive\symbol{54}}
- \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmapfive\symbol{55}}
- \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmapfive\symbol{56}}
- \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmapfive\symbol{57}}
- \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmapfive\symbol{58}}
- \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmapfive\symbol{59}}
- \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmapfive\symbol{60}}
- \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmapfive\symbol{61}}
- \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmapfive\symbol{62}}
- \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmapfive\symbol{63}}
- \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmapfive\symbol{64}}
- \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmapfive\symbol{65}}
- \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmapfive\symbol{66}}
- \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmapfive\symbol{67}}
- \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmapfive\symbol{68}}
- \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmapfive\symbol{69}}
- \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmapfive\symbol{70}}
- \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmapfive\symbol{71}}
- \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmapfive\symbol{72}}
- \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmapfive\symbol{73}}
- \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmapfive\symbol{74}}
- \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmapfive\symbol{75}}
- \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmapfive\symbol{76}}
- \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmapfive\symbol{77}}
- \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmapfive\symbol{78}}
- \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmapfive\symbol{79}}
- \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmapfive\symbol{80}}
- \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmapfive\symbol{81}}
- \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmapfive\symbol{82}}
- \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmapfive\symbol{83}}
- \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmapfive\symbol{84}}
- \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmapfive\symbol{85}}
- \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmapfive\symbol{86}}
- \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmapfive\symbol{87}}
- \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmapfive\symbol{88}}
- \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmapfive\symbol{89}}
- \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmapfive\symbol{90}}
- \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmapfive\symbol{91}}
- \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmapfive\symbol{92}}
- \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmapfive\symbol{93}}
- \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmapfive\symbol{94}}
- \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmapfive\symbol{95}}
- \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmapfive\symbol{96}}
- \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmapfive\symbol{97}}
- \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmapfive\symbol{98}}
- \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmapfive\symbol{99}}
- \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmapfive\symbol{100}}
- \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmapfive\symbol{101}}
- \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmapfive\symbol{102}}
- \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmapfive\symbol{103}}
- \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmapfive\symbol{104}}
- \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmapfive\symbol{105}}
- \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmapfive\symbol{106}}
- \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmapfive\symbol{107}}
- \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmapfive\symbol{108}}
- \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmapfive\symbol{109}}
- \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmapfive\symbol{110}}
- \expandafter\def\csname simpleicon@googledomainsicon\endcsname {\simpleiconsmapfive\symbol{111}}
- \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmapfive\symbol{112}}
- \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmapfive\symbol{113}}
- \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmapfive\symbol{114}}
- \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmapfive\symbol{115}}
- \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmapfive\symbol{116}}
- \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmapfive\symbol{117}}
- \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmapfive\symbol{118}}
- \expandafter\def\csname simpleicon@googlehangoutsicon\endcsname {\simpleiconsmapfive\symbol{119}}
- \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmapfive\symbol{120}}
- \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmapfive\symbol{121}}
- \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmapfive\symbol{122}}
- \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmapfive\symbol{123}}
- \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmapfive\symbol{124}}
- \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmapfive\symbol{125}}
- \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmapfive\symbol{126}}
- \expandafter\def\csname simpleicon@googlemybusinessicon\endcsname {\simpleiconsmapfive\symbol{127}}
- \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmapfive\symbol{128}}
- \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmapfive\symbol{129}}
- \expandafter\def\csname simpleicon@googleoptimizeicon\endcsname {\simpleiconsmapfive\symbol{130}}
- \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmapfive\symbol{131}}
- \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmapfive\symbol{132}}
- \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmapfive\symbol{133}}
- \expandafter\def\csname simpleicon@googlepodcastsicon\endcsname {\simpleiconsmapfive\symbol{134}}
- \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmapfive\symbol{135}}
- \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmapfive\symbol{136}}
- \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmapfive\symbol{137}}
- \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmapfive\symbol{138}}
- \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmapfive\symbol{139}}
- \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmapfive\symbol{140}}
- \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmapfive\symbol{141}}
- \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmapfive\symbol{142}}
- \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmapfive\symbol{143}}
- \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmapfive\symbol{144}}
- \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmapfive\symbol{145}}
- \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmapfive\symbol{146}}
- \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmapfive\symbol{147}}
- \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmapfive\symbol{148}}
- \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmapfive\symbol{149}}
- \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmapfive\symbol{150}}
- \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmapfive\symbol{151}}
- \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmapfive\symbol{152}}
- \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmapfive\symbol{153}}
- \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmapfive\symbol{154}}
- \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmapfive\symbol{155}}
- \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmapfive\symbol{156}}
- \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmapfive\symbol{157}}
- \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmapfive\symbol{158}}
- \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmapfive\symbol{159}}
- \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmapfive\symbol{160}}
- \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmapfive\symbol{161}}
- \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmapfive\symbol{162}}
- \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmapfive\symbol{163}}
- \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmapfive\symbol{164}}
- \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmapfive\symbol{165}}
- \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmapfive\symbol{166}}
- \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmapfive\symbol{167}}
- \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmapfive\symbol{168}}
- \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmapfive\symbol{169}}
- \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmapfive\symbol{170}}
- \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmapfive\symbol{171}}
- \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmapfive\symbol{172}}
- \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmapfive\symbol{173}}
- \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmapfive\symbol{174}}
- \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmapfive\symbol{175}}
- \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmapfive\symbol{176}}
- \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmapfive\symbol{177}}
- \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmapfive\symbol{178}}
- \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmapfive\symbol{179}}
- \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmapfive\symbol{180}}
- \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmapfive\symbol{181}}
- \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmapfive\symbol{182}}
- \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmapfive\symbol{183}}
- \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmapfive\symbol{184}}
- \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmapfive\symbol{185}}
- \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmapfive\symbol{186}}
- \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmapfive\symbol{187}}
- \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmapfive\symbol{188}}
- \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmapfive\symbol{189}}
- \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmapfive\symbol{190}}
- \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmapfive\symbol{191}}
- \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmapfive\symbol{192}}
- \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmapfive\symbol{193}}
- \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmapfive\symbol{194}}
- \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmapfive\symbol{195}}
- \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmapfive\symbol{196}}
- \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmapfive\symbol{197}}
- \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmapfive\symbol{198}}
- \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmapfive\symbol{199}}
- \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmapfive\symbol{200}}
- \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmapfive\symbol{201}}
- \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmapfive\symbol{202}}
- \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmapfive\symbol{203}}
- \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmapfive\symbol{204}}
- \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmapfive\symbol{205}}
- \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmapfive\symbol{206}}
- \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmapfive\symbol{207}}
- \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmapfive\symbol{208}}
- \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmapfive\symbol{209}}
- \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmapfive\symbol{210}}
- \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmapfive\symbol{211}}
- \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmapfive\symbol{212}}
- \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmapfive\symbol{213}}
- \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmapfive\symbol{214}}
- \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmapfive\symbol{215}}
- \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmapfive\symbol{216}}
- \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmapfive\symbol{217}}
- \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmapfive\symbol{218}}
- \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmapfive\symbol{219}}
- \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmapfive\symbol{220}}
- \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmapfive\symbol{221}}
- \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmapfive\symbol{222}}
- \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmapfive\symbol{223}}
- \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmapfive\symbol{224}}
- \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmapfive\symbol{225}}
- \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmapfive\symbol{226}}
- \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmapfive\symbol{227}}
- \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmapfive\symbol{228}}
- \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmapfive\symbol{229}}
- \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmapfive\symbol{230}}
- \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmapfive\symbol{231}}
- \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmapfive\symbol{232}}
- \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmapfive\symbol{233}}
- \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmapfive\symbol{234}}
- \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmapfive\symbol{235}}
- \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmapfive\symbol{236}}
- \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmapfive\symbol{237}}
- \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmapfive\symbol{238}}
- \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmapfive\symbol{239}}
- \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmapfive\symbol{240}}
- \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmapfive\symbol{241}}
- \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmapfive\symbol{242}}
- \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmapfive\symbol{243}}
- \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmapfive\symbol{244}}
- \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmapfive\symbol{245}}
- \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmapfive\symbol{246}}
- \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmapfive\symbol{247}}
- \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmapfive\symbol{248}}
- \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmapfive\symbol{249}}
- \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmapfive\symbol{250}}
- \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmapfive\symbol{251}}
- \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmapfive\symbol{252}}
- \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmapfive\symbol{253}}
- \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmapfive\symbol{254}}
- \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmapfive\symbol{255}}
- \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmapsix\symbol{0}}
- \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmapsix\symbol{1}}
- \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmapsix\symbol{2}}
- \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmapsix\symbol{3}}
- \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmapsix\symbol{4}}
- \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmapsix\symbol{5}}
- \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmapsix\symbol{6}}
- \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmapsix\symbol{7}}
- \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmapsix\symbol{8}}
- \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmapsix\symbol{9}}
- \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmapsix\symbol{10}}
- \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmapsix\symbol{11}}
- \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmapsix\symbol{12}}
- \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmapsix\symbol{13}}
- \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmapsix\symbol{14}}
- \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmapsix\symbol{15}}
- \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmapsix\symbol{16}}
- \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmapsix\symbol{17}}
- \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmapsix\symbol{18}}
- \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmapsix\symbol{19}}
- \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmapsix\symbol{20}}
- \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmapsix\symbol{21}}
- \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmapsix\symbol{22}}
- \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmapsix\symbol{23}}
- \expandafter\def\csname simpleicon@ibmicon\endcsname {\simpleiconsmapsix\symbol{24}}
- \expandafter\def\csname simpleicon@ibmcloudicon\endcsname {\simpleiconsmapsix\symbol{25}}
- \expandafter\def\csname simpleicon@ibmwatsonicon\endcsname {\simpleiconsmapsix\symbol{26}}
- \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmapsix\symbol{27}}
- \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmapsix\symbol{28}}
- \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmapsix\symbol{29}}
- \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmapsix\symbol{30}}
- \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmapsix\symbol{31}}
- \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmapsix\symbol{32}}
- \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmapsix\symbol{33}}
- \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmapsix\symbol{34}}
- \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmapsix\symbol{35}}
- \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmapsix\symbol{36}}
- \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmapsix\symbol{37}}
- \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmapsix\symbol{38}}
- \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmapsix\symbol{39}}
- \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmapsix\symbol{40}}
- \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmapsix\symbol{41}}
- \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmapsix\symbol{42}}
- \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmapsix\symbol{43}}
- \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmapsix\symbol{44}}
- \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmapsix\symbol{45}}
- \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmapsix\symbol{46}}
- \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmapsix\symbol{47}}
- \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmapsix\symbol{48}}
- \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmapsix\symbol{49}}
- \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmapsix\symbol{50}}
- \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmapsix\symbol{51}}
- \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmapsix\symbol{52}}
- \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmapsix\symbol{53}}
- \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmapsix\symbol{54}}
- \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmapsix\symbol{55}}
- \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmapsix\symbol{56}}
- \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmapsix\symbol{57}}
- \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmapsix\symbol{58}}
- \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmapsix\symbol{59}}
- \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmapsix\symbol{60}}
- \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmapsix\symbol{61}}
- \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmapsix\symbol{62}}
- \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmapsix\symbol{63}}
- \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmapsix\symbol{64}}
- \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmapsix\symbol{65}}
- \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmapsix\symbol{66}}
- \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmapsix\symbol{67}}
- \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmapsix\symbol{68}}
- \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmapsix\symbol{69}}
- \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmapsix\symbol{70}}
- \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmapsix\symbol{71}}
- \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmapsix\symbol{72}}
- \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmapsix\symbol{73}}
- \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmapsix\symbol{74}}
- \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmapsix\symbol{75}}
- \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmapsix\symbol{76}}
- \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmapsix\symbol{77}}
- \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmapsix\symbol{78}}
- \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmapsix\symbol{79}}
- \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmapsix\symbol{80}}
- \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmapsix\symbol{81}}
- \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmapsix\symbol{82}}
- \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmapsix\symbol{83}}
- \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmapsix\symbol{84}}
- \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmapsix\symbol{85}}
- \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmapsix\symbol{86}}
- \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmapsix\symbol{87}}
- \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmapsix\symbol{88}}
- \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmapsix\symbol{89}}
- \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmapsix\symbol{90}}
- \expandafter\def\csname simpleicon@internetexplorericon\endcsname {\simpleiconsmapsix\symbol{91}}
- \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmapsix\symbol{92}}
- \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmapsix\symbol{93}}
- \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmapsix\symbol{94}}
- \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmapsix\symbol{95}}
- \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmapsix\symbol{96}}
- \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmapsix\symbol{97}}
- \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmapsix\symbol{98}}
- \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmapsix\symbol{99}}
- \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmapsix\symbol{100}}
- \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmapsix\symbol{101}}
- \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmapsix\symbol{102}}
- \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmapsix\symbol{103}}
- \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmapsix\symbol{104}}
- \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmapsix\symbol{105}}
- \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmapsix\symbol{106}}
- \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmapsix\symbol{107}}
- \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmapsix\symbol{108}}
- \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmapsix\symbol{109}}
- \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmapsix\symbol{110}}
- \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmapsix\symbol{111}}
- \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmapsix\symbol{112}}
- \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmapsix\symbol{113}}
- \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmapsix\symbol{114}}
- \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmapsix\symbol{115}}
- \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmapsix\symbol{116}}
- \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmapsix\symbol{117}}
- \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmapsix\symbol{118}}
- \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmapsix\symbol{119}}
- \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmapsix\symbol{120}}
- \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmapsix\symbol{121}}
- \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmapsix\symbol{122}}
- \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmapsix\symbol{123}}
- \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmapsix\symbol{124}}
- \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmapsix\symbol{125}}
- \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmapsix\symbol{126}}
- \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmapsix\symbol{127}}
- \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmapsix\symbol{128}}
- \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmapsix\symbol{129}}
- \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmapsix\symbol{130}}
- \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmapsix\symbol{131}}
- \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmapsix\symbol{132}}
- \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmapsix\symbol{133}}
- \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmapsix\symbol{134}}
- \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmapsix\symbol{135}}
- \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmapsix\symbol{136}}
- \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmapsix\symbol{137}}
- \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmapsix\symbol{138}}
- \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmapsix\symbol{139}}
- \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmapsix\symbol{140}}
- \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmapsix\symbol{141}}
- \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmapsix\symbol{142}}
- \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmapsix\symbol{143}}
- \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmapsix\symbol{144}}
- \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmapsix\symbol{145}}
- \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmapsix\symbol{146}}
- \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmapsix\symbol{147}}
- \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmapsix\symbol{148}}
- \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmapsix\symbol{149}}
- \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmapsix\symbol{150}}
- \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmapsix\symbol{151}}
- \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmapsix\symbol{152}}
- \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmapsix\symbol{153}}
- \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmapsix\symbol{154}}
- \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmapsix\symbol{155}}
- \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmapsix\symbol{156}}
- \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmapsix\symbol{157}}
- \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmapsix\symbol{158}}
- \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmapsix\symbol{159}}
- \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmapsix\symbol{160}}
- \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmapsix\symbol{161}}
- \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmapsix\symbol{162}}
- \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmapsix\symbol{163}}
- \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmapsix\symbol{164}}
- \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmapsix\symbol{165}}
- \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmapsix\symbol{166}}
- \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmapsix\symbol{167}}
- \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmapsix\symbol{168}}
- \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmapsix\symbol{169}}
- \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmapsix\symbol{170}}
- \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmapsix\symbol{171}}
- \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmapsix\symbol{172}}
- \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmapsix\symbol{173}}
- \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmapsix\symbol{174}}
- \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmapsix\symbol{175}}
- \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmapsix\symbol{176}}
- \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmapsix\symbol{177}}
- \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmapsix\symbol{178}}
- \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmapsix\symbol{179}}
- \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmapsix\symbol{180}}
- \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmapsix\symbol{181}}
- \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmapsix\symbol{182}}
- \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmapsix\symbol{183}}
- \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmapsix\symbol{184}}
- \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmapsix\symbol{185}}
- \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmapsix\symbol{186}}
- \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmapsix\symbol{187}}
- \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmapsix\symbol{188}}
- \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmapsix\symbol{189}}
- \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmapsix\symbol{190}}
- \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmapsix\symbol{191}}
- \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmapsix\symbol{192}}
- \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmapsix\symbol{193}}
- \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmapsix\symbol{194}}
- \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmapsix\symbol{195}}
- \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmapsix\symbol{196}}
- \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmapsix\symbol{197}}
- \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmapsix\symbol{198}}
- \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmapsix\symbol{199}}
- \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmapsix\symbol{200}}
- \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmapsix\symbol{201}}
- \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmapsix\symbol{202}}
- \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmapsix\symbol{203}}
- \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmapsix\symbol{204}}
- \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmapsix\symbol{205}}
- \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmapsix\symbol{206}}
- \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmapsix\symbol{207}}
- \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmapsix\symbol{208}}
- \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmapsix\symbol{209}}
- \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmapsix\symbol{210}}
- \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmapsix\symbol{211}}
- \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmapsix\symbol{212}}
- \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmapsix\symbol{213}}
- \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmapsix\symbol{214}}
- \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmapsix\symbol{215}}
- \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmapsix\symbol{216}}
- \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmapsix\symbol{217}}
- \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmapsix\symbol{218}}
- \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmapsix\symbol{219}}
- \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmapsix\symbol{220}}
- \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmapsix\symbol{221}}
- \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmapsix\symbol{222}}
- \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmapsix\symbol{223}}
- \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmapsix\symbol{224}}
- \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmapsix\symbol{225}}
- \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmapsix\symbol{226}}
- \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmapsix\symbol{227}}
- \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmapsix\symbol{228}}
- \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmapsix\symbol{229}}
- \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmapsix\symbol{230}}
- \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmapsix\symbol{231}}
- \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmapsix\symbol{232}}
- \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmapsix\symbol{233}}
- \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmapsix\symbol{234}}
- \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmapsix\symbol{235}}
- \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmapsix\symbol{236}}
- \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmapsix\symbol{237}}
- \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmapsix\symbol{238}}
- \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmapsix\symbol{239}}
- \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmapsix\symbol{240}}
- \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmapsix\symbol{241}}
- \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmapsix\symbol{242}}
- \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmapsix\symbol{243}}
- \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmapsix\symbol{244}}
- \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmapsix\symbol{245}}
- \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmapsix\symbol{246}}
- \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{247}}
- \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{248}}
- \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{249}}
- \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{250}}
- \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{251}}
- \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{252}}
- \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{253}}
- \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{254}}
- \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{255}}
- \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapseven\symbol{0}}
- \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapseven\symbol{1}}
- \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapseven\symbol{2}}
- \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapseven\symbol{3}}
- \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapseven\symbol{4}}
- \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapseven\symbol{5}}
- \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapseven\symbol{6}}
- \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapseven\symbol{7}}
- \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapseven\symbol{8}}
- \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapseven\symbol{9}}
- \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapseven\symbol{10}}
- \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapseven\symbol{11}}
- \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapseven\symbol{12}}
- \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapseven\symbol{13}}
- \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapseven\symbol{14}}
- \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapseven\symbol{15}}
- \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapseven\symbol{16}}
- \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapseven\symbol{17}}
- \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{18}}
- \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{19}}
- \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{20}}
- \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{21}}
- \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{22}}
- \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{23}}
- \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{24}}
- \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{25}}
- \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{26}}
- \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{27}}
- \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{28}}
- \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{29}}
- \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{30}}
- \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{31}}
- \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{32}}
- \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{33}}
- \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{34}}
- \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{35}}
- \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{36}}
- \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{37}}
- \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{38}}
- \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{39}}
- \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{40}}
- \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{41}}
- \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{42}}
- \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{43}}
- \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{44}}
- \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{45}}
- \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{46}}
- \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{47}}
- \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{48}}
- \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{49}}
- \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{50}}
- \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{51}}
- \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{52}}
- \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{53}}
- \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{54}}
- \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{55}}
- \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{56}}
- \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{57}}
- \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{58}}
- \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{59}}
- \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{60}}
- \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{61}}
- \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{62}}
- \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{63}}
- \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{64}}
- \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{65}}
- \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{66}}
- \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{67}}
- \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{68}}
- \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{69}}
- \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{70}}
- \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{71}}
- \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{72}}
- \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{73}}
- \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{74}}
- \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{75}}
- \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{76}}
- \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{77}}
- \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{78}}
- \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{79}}
- \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{80}}
- \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{81}}
- \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{82}}
- \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{83}}
- \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{84}}
- \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{85}}
- \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{86}}
- \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{87}}
- \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{88}}
- \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{89}}
- \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{90}}
- \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{91}}
- \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{92}}
- \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{93}}
- \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{94}}
- \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{95}}
- \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{96}}
- \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{97}}
- \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{98}}
- \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{99}}
- \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{100}}
- \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{101}}
- \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{102}}
- \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{103}}
- \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{104}}
- \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{105}}
- \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{106}}
- \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{107}}
- \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{108}}
- \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{109}}
- \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{110}}
- \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{111}}
- \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{112}}
- \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{113}}
- \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{114}}
- \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{115}}
- \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{116}}
- \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{117}}
- \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{118}}
- \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{119}}
- \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{120}}
- \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{121}}
- \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{122}}
- \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{123}}
- \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{124}}
- \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{125}}
- \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{126}}
- \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{127}}
- \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{128}}
- \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{129}}
- \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{130}}
- \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{131}}
- \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{132}}
- \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{133}}
- \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{134}}
- \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{135}}
- \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{136}}
- \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{137}}
- \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{138}}
- \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{139}}
- \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{140}}
- \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{141}}
- \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{142}}
- \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{143}}
- \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{144}}
- \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{145}}
- \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{146}}
- \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{147}}
- \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{148}}
- \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{149}}
- \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{150}}
- \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{151}}
- \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{152}}
- \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{153}}
- \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{154}}
- \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{155}}
- \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{156}}
- \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{157}}
- \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{158}}
- \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{159}}
- \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{160}}
- \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{161}}
- \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{162}}
- \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{163}}
- \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{164}}
- \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{165}}
- \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{166}}
- \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{167}}
- \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{168}}
- \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{169}}
- \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{170}}
- \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{171}}
- \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{172}}
- \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{173}}
- \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{174}}
- \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{175}}
- \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{176}}
- \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{177}}
- \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{178}}
- \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{179}}
- \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{180}}
- \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{181}}
- \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{182}}
- \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{183}}
- \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{184}}
- \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{185}}
- \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{186}}
- \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{187}}
- \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{188}}
- \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{189}}
- \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{190}}
- \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{191}}
- \expandafter\def\csname simpleicon@microsofticon\endcsname {\simpleiconsmapseven\symbol{192}}
- \expandafter\def\csname simpleicon@microsoftacademicicon\endcsname {\simpleiconsmapseven\symbol{193}}
- \expandafter\def\csname simpleicon@microsoftaccessicon\endcsname {\simpleiconsmapseven\symbol{194}}
- \expandafter\def\csname simpleicon@microsoftazureicon\endcsname {\simpleiconsmapseven\symbol{195}}
- \expandafter\def\csname simpleicon@microsoftbingicon\endcsname {\simpleiconsmapseven\symbol{196}}
- \expandafter\def\csname simpleicon@microsoftedgeicon\endcsname {\simpleiconsmapseven\symbol{197}}
- \expandafter\def\csname simpleicon@microsoftexcelicon\endcsname {\simpleiconsmapseven\symbol{198}}
- \expandafter\def\csname simpleicon@microsoftexchangeicon\endcsname {\simpleiconsmapseven\symbol{199}}
- \expandafter\def\csname simpleicon@microsoftonedriveicon\endcsname {\simpleiconsmapseven\symbol{200}}
- \expandafter\def\csname simpleicon@microsoftonenoteicon\endcsname {\simpleiconsmapseven\symbol{201}}
- \expandafter\def\csname simpleicon@microsoftoutlookicon\endcsname {\simpleiconsmapseven\symbol{202}}
- \expandafter\def\csname simpleicon@microsoftpowerpointicon\endcsname {\simpleiconsmapseven\symbol{203}}
- \expandafter\def\csname simpleicon@microsoftsharepointicon\endcsname {\simpleiconsmapseven\symbol{204}}
- \expandafter\def\csname simpleicon@microsoftsqlservericon\endcsname {\simpleiconsmapseven\symbol{205}}
- \expandafter\def\csname simpleicon@microsoftstoreicon\endcsname {\simpleiconsmapseven\symbol{206}}
- \expandafter\def\csname simpleicon@microsoftteamsicon\endcsname {\simpleiconsmapseven\symbol{207}}
- \expandafter\def\csname simpleicon@microsofttranslatoricon\endcsname {\simpleiconsmapseven\symbol{208}}
- \expandafter\def\csname simpleicon@microsoftvisioicon\endcsname {\simpleiconsmapseven\symbol{209}}
- \expandafter\def\csname simpleicon@microsoftwordicon\endcsname {\simpleiconsmapseven\symbol{210}}
- \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{211}}
- \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{212}}
- \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{213}}
- \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{214}}
- \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{215}}
- \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{216}}
- \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{217}}
- \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{218}}
- \expandafter\def\csname simpleicon@minecrafticon\endcsname {\simpleiconsmapseven\symbol{219}}
- \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{220}}
- \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{221}}
- \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{222}}
- \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{223}}
- \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{224}}
- \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{225}}
- \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{226}}
- \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{227}}
- \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{228}}
- \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{229}}
- \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{230}}
- \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{231}}
- \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{232}}
- \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{233}}
- \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{234}}
- \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{235}}
- \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{236}}
- \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{237}}
- \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{238}}
- \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{239}}
- \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{240}}
- \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{241}}
- \expandafter\def\csname simpleicon@mojangstudiosicon\endcsname {\simpleiconsmapseven\symbol{242}}
- \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{243}}
- \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{244}}
- \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{245}}
- \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{246}}
- \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{247}}
- \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{248}}
- \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{249}}
- \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{250}}
- \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{251}}
- \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{252}}
- \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{253}}
- \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{254}}
- \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{255}}
- \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapeight\symbol{0}}
- \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapeight\symbol{1}}
- \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapeight\symbol{2}}
- \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapeight\symbol{3}}
- \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapeight\symbol{4}}
- \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapeight\symbol{5}}
- \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapeight\symbol{6}}
- \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapeight\symbol{7}}
- \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapeight\symbol{8}}
- \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapeight\symbol{9}}
- \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapeight\symbol{10}}
- \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapeight\symbol{11}}
- \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapeight\symbol{12}}
- \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapeight\symbol{13}}
- \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapeight\symbol{14}}
- \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapeight\symbol{15}}
- \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapeight\symbol{16}}
- \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapeight\symbol{17}}
- \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapeight\symbol{18}}
- \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapeight\symbol{19}}
- \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapeight\symbol{20}}
- \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapeight\symbol{21}}
- \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapeight\symbol{22}}
- \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapeight\symbol{23}}
- \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapeight\symbol{24}}
- \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapeight\symbol{25}}
- \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapeight\symbol{26}}
- \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapeight\symbol{27}}
- \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapeight\symbol{28}}
- \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapeight\symbol{29}}
- \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapeight\symbol{30}}
- \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapeight\symbol{31}}
- \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapeight\symbol{32}}
- \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapeight\symbol{33}}
- \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapeight\symbol{34}}
- \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{35}}
- \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{36}}
- \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{37}}
- \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{38}}
- \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{39}}
- \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{40}}
- \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{41}}
- \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{42}}
- \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{43}}
- \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{44}}
- \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{45}}
- \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{46}}
- \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{47}}
- \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{48}}
- \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{49}}
- \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{50}}
- \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{51}}
- \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{52}}
- \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{53}}
- \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{54}}
- \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{55}}
- \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{56}}
- \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{57}}
- \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{58}}
- \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{59}}
- \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{60}}
- \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{61}}
- \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{62}}
- \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{63}}
- \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{64}}
- \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{65}}
- \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{66}}
- \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{67}}
- \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{68}}
- \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{69}}
- \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{70}}
- \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{71}}
- \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{72}}
- \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{73}}
- \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{74}}
- \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{75}}
- \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{76}}
- \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{77}}
- \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{78}}
- \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{79}}
- \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{80}}
- \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{81}}
- \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{82}}
- \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{83}}
- \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{84}}
- \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{85}}
- \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{86}}
- \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{87}}
- \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{88}}
- \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{89}}
- \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{90}}
- \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{91}}
- \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{92}}
- \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{93}}
- \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{94}}
- \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{95}}
- \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{96}}
- \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{97}}
- \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{98}}
- \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{99}}
- \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{100}}
- \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{101}}
- \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{102}}
- \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{103}}
- \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{104}}
- \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{105}}
- \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{106}}
- \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{107}}
- \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{108}}
- \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{109}}
- \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{110}}
- \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{111}}
- \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{112}}
- \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{113}}
- \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{114}}
- \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{115}}
- \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{116}}
- \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{117}}
- \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{118}}
- \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{119}}
- \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{120}}
- \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{121}}
- \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{122}}
- \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{123}}
- \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{124}}
- \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{125}}
- \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{126}}
- \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{127}}
- \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{128}}
- \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{129}}
- \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{130}}
- \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{131}}
- \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{132}}
- \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{133}}
- \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{134}}
- \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{135}}
- \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{136}}
- \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{137}}
- \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{138}}
- \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{139}}
- \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{140}}
- \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{141}}
- \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{142}}
- \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{143}}
- \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{144}}
- \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{145}}
- \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{146}}
- \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{147}}
- \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{148}}
- \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{149}}
- \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{150}}
- \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{151}}
- \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{152}}
- \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{153}}
- \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{154}}
- \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{155}}
- \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{156}}
- \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{157}}
- \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{158}}
- \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{159}}
- \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{160}}
- \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{161}}
- \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{162}}
- \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{163}}
- \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{164}}
- \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{165}}
- \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{166}}
- \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{167}}
- \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{168}}
- \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{169}}
- \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{170}}
- \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{171}}
- \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{172}}
- \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{173}}
- \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{174}}
- \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{175}}
- \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{176}}
- \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{177}}
- \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{178}}
- \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{179}}
- \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{180}}
- \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{181}}
- \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{182}}
- \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{183}}
- \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{184}}
- \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{185}}
- \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{186}}
- \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{187}}
- \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{188}}
- \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{189}}
- \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{190}}
- \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{191}}
- \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{192}}
- \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{193}}
- \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{194}}
- \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{195}}
- \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{196}}
- \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{197}}
- \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{198}}
- \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{199}}
- \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{200}}
- \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{201}}
- \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{202}}
- \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{203}}
- \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{204}}
- \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{205}}
- \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{206}}
- \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{207}}
- \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{208}}
- \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{209}}
- \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{210}}
- \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{211}}
- \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{212}}
- \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{213}}
- \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{214}}
- \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{215}}
- \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{216}}
- \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{217}}
- \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{218}}
- \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{219}}
- \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{220}}
- \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{221}}
- \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{222}}
- \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{223}}
- \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{224}}
- \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{225}}
- \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{226}}
- \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{227}}
- \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{228}}
- \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{229}}
- \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{230}}
- \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{231}}
- \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{232}}
- \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{233}}
- \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{234}}
- \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{235}}
- \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{236}}
- \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{237}}
- \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{238}}
- \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{239}}
- \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{240}}
- \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{241}}
- \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{242}}
- \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{243}}
- \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{244}}
- \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{245}}
- \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{246}}
- \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{247}}
- \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{248}}
- \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{249}}
- \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{250}}
- \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{251}}
- \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{252}}
- \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{253}}
- \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{254}}
- \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{255}}
- \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapnine\symbol{0}}
- \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapnine\symbol{1}}
- \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapnine\symbol{2}}
- \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapnine\symbol{3}}
- \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapnine\symbol{4}}
- \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapnine\symbol{5}}
- \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapnine\symbol{6}}
- \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapnine\symbol{7}}
- \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapnine\symbol{8}}
- \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapnine\symbol{9}}
- \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapnine\symbol{10}}
- \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapnine\symbol{11}}
- \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapnine\symbol{12}}
- \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapnine\symbol{13}}
- \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapnine\symbol{14}}
- \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapnine\symbol{15}}
- \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapnine\symbol{16}}
- \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapnine\symbol{17}}
- \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapnine\symbol{18}}
- \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapnine\symbol{19}}
- \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapnine\symbol{20}}
- \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapnine\symbol{21}}
- \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapnine\symbol{22}}
- \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapnine\symbol{23}}
- \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapnine\symbol{24}}
- \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapnine\symbol{25}}
- \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapnine\symbol{26}}
- \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapnine\symbol{27}}
- \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapnine\symbol{28}}
- \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapnine\symbol{29}}
- \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapnine\symbol{30}}
- \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapnine\symbol{31}}
- \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapnine\symbol{32}}
- \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{33}}
- \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{34}}
- \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{35}}
- \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{36}}
- \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{37}}
- \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{38}}
- \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{39}}
- \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{40}}
- \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{41}}
- \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{42}}
- \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{43}}
- \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{44}}
- \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{45}}
- \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{46}}
- \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{47}}
- \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{48}}
- \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{49}}
- \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{50}}
- \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{51}}
- \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{52}}
- \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{53}}
- \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{54}}
- \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{55}}
- \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{56}}
- \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{57}}
- \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{58}}
- \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{59}}
- \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{60}}
- \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{61}}
- \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{62}}
- \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{63}}
- \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{64}}
- \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{65}}
- \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{66}}
- \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{67}}
- \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{68}}
- \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{69}}
- \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{70}}
- \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{71}}
- \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{72}}
- \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{73}}
- \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{74}}
- \expandafter\def\csname simpleicon@playwrighticon\endcsname {\simpleiconsmapnine\symbol{75}}
- \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{76}}
- \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{77}}
- \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{78}}
- \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{79}}
- \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{80}}
- \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{81}}
- \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{82}}
- \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{83}}
- \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{84}}
- \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{85}}
- \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{86}}
- \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{87}}
- \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{88}}
- \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{89}}
- \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{90}}
- \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{91}}
- \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{92}}
- \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{93}}
- \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{94}}
- \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{95}}
- \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{96}}
- \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{97}}
- \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{98}}
- \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{99}}
- \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{100}}
- \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{101}}
- \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{102}}
- \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{103}}
- \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{104}}
- \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{105}}
- \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{106}}
- \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{107}}
- \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{108}}
- \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{109}}
- \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{110}}
- \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{111}}
- \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{112}}
- \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{113}}
- \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{114}}
- \expandafter\def\csname simpleicon@powerappsicon\endcsname {\simpleiconsmapnine\symbol{115}}
- \expandafter\def\csname simpleicon@powerautomateicon\endcsname {\simpleiconsmapnine\symbol{116}}
- \expandafter\def\csname simpleicon@powerbiicon\endcsname {\simpleiconsmapnine\symbol{117}}
- \expandafter\def\csname simpleicon@powerfxicon\endcsname {\simpleiconsmapnine\symbol{118}}
- \expandafter\def\csname simpleicon@powerpagesicon\endcsname {\simpleiconsmapnine\symbol{119}}
- \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{120}}
- \expandafter\def\csname simpleicon@powershellicon\endcsname {\simpleiconsmapnine\symbol{121}}
- \expandafter\def\csname simpleicon@powervirtualagentsicon\endcsname {\simpleiconsmapnine\symbol{122}}
- \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{123}}
- \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{124}}
- \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{125}}
- \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{126}}
- \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{127}}
- \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{128}}
- \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{129}}
- \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{130}}
- \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{131}}
- \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{132}}
- \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{133}}
- \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{134}}
- \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{135}}
- \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{136}}
- \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{137}}
- \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{138}}
- \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{139}}
- \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{140}}
- \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{141}}
- \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{142}}
- \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{143}}
- \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{144}}
- \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{145}}
- \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{146}}
- \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{147}}
- \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{148}}
- \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{149}}
- \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{150}}
- \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{151}}
- \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{152}}
- \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{153}}
- \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{154}}
- \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{155}}
- \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{156}}
- \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{157}}
- \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{158}}
- \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{159}}
- \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{160}}
- \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{161}}
- \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{162}}
- \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{163}}
- \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{164}}
- \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{165}}
- \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{166}}
- \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{167}}
- \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{168}}
- \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{169}}
- \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{170}}
- \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{171}}
- \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{172}}
- \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{173}}
- \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{174}}
- \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{175}}
- \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{176}}
- \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{177}}
- \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{178}}
- \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{179}}
- \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{180}}
- \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{181}}
- \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{182}}
- \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{183}}
- \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{184}}
- \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{185}}
- \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{186}}
- \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{187}}
- \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{188}}
- \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{189}}
- \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{190}}
- \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{191}}
- \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{192}}
- \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{193}}
- \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{194}}
- \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{195}}
- \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{196}}
- \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{197}}
- \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{198}}
- \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{199}}
- \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{200}}
- \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{201}}
- \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{202}}
- \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{203}}
- \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{204}}
- \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{205}}
- \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{206}}
- \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{207}}
- \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{208}}
- \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{209}}
- \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{210}}
- \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{211}}
- \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{212}}
- \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{213}}
- \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{214}}
- \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{215}}
- \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{216}}
- \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{217}}
- \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{218}}
- \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{219}}
- \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{220}}
- \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{221}}
- \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{222}}
- \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{223}}
- \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{224}}
- \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{225}}
- \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{226}}
- \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{227}}
- \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{228}}
- \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{229}}
- \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{230}}
- \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{231}}
- \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{232}}
- \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{233}}
- \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{234}}
- \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{235}}
- \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{236}}
- \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{237}}
- \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{238}}
- \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{239}}
- \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{240}}
- \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{241}}
- \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{242}}
- \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{243}}
- \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{244}}
- \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{245}}
- \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{246}}
- \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{247}}
- \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{248}}
- \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{249}}
- \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{250}}
- \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{251}}
- \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{252}}
- \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{253}}
- \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{254}}
- \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{255}}
- \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmaponezero\symbol{0}}
- \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmaponezero\symbol{1}}
- \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmaponezero\symbol{2}}
- \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmaponezero\symbol{3}}
- \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmaponezero\symbol{4}}
- \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmaponezero\symbol{5}}
- \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmaponezero\symbol{6}}
- \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmaponezero\symbol{7}}
- \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmaponezero\symbol{8}}
- \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmaponezero\symbol{9}}
- \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmaponezero\symbol{10}}
- \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmaponezero\symbol{11}}
- \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmaponezero\symbol{12}}
- \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmaponezero\symbol{13}}
- \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmaponezero\symbol{14}}
- \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmaponezero\symbol{15}}
- \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmaponezero\symbol{16}}
- \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmaponezero\symbol{17}}
- \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmaponezero\symbol{18}}
- \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmaponezero\symbol{19}}
- \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmaponezero\symbol{20}}
- \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmaponezero\symbol{21}}
- \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmaponezero\symbol{22}}
- \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmaponezero\symbol{23}}
- \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmaponezero\symbol{24}}
- \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmaponezero\symbol{25}}
- \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmaponezero\symbol{26}}
- \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmaponezero\symbol{27}}
- \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmaponezero\symbol{28}}
- \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmaponezero\symbol{29}}
- \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmaponezero\symbol{30}}
- \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmaponezero\symbol{31}}
- \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmaponezero\symbol{32}}
- \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmaponezero\symbol{33}}
- \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmaponezero\symbol{34}}
- \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmaponezero\symbol{35}}
- \expandafter\def\csname simpleicon@renovateboticon\endcsname {\simpleiconsmaponezero\symbol{36}}
- \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmaponezero\symbol{37}}
- \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmaponezero\symbol{38}}
- \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{39}}
- \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{40}}
- \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{41}}
- \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{42}}
- \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{43}}
- \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{44}}
- \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{45}}
- \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{46}}
- \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{47}}
- \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{48}}
- \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{49}}
- \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{50}}
- \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{51}}
- \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{52}}
- \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{53}}
- \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{54}}
- \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{55}}
- \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{56}}
- \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{57}}
- \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{58}}
- \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{59}}
- \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{60}}
- \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{61}}
- \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{62}}
- \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{63}}
- \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{64}}
- \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{65}}
- \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{66}}
- \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{67}}
- \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{68}}
- \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{69}}
- \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{70}}
- \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{71}}
- \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{72}}
- \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{73}}
- \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{74}}
- \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{75}}
- \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{76}}
- \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{77}}
- \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{78}}
- \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{79}}
- \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{80}}
- \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{81}}
- \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{82}}
- \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{83}}
- \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{84}}
- \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{85}}
- \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{86}}
- \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{87}}
- \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{88}}
- \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{89}}
- \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{90}}
- \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{91}}
- \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{92}}
- \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{93}}
- \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{94}}
- \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{95}}
- \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{96}}
- \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{97}}
- \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{98}}
- \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{99}}
- \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{100}}
- \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{101}}
- \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{102}}
- \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{103}}
- \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{104}}
- \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{105}}
- \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{106}}
- \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{107}}
- \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{108}}
- \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{109}}
- \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{110}}
- \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{111}}
- \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{112}}
- \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{113}}
- \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{114}}
- \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{115}}
- \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{116}}
- \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{117}}
- \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{118}}
- \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{119}}
- \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{120}}
- \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{121}}
- \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{122}}
- \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{123}}
- \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{124}}
- \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{125}}
- \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{126}}
- \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{127}}
- \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{128}}
- \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{129}}
- \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{130}}
- \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{131}}
- \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{132}}
- \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{133}}
- \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{134}}
- \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{135}}
- \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{136}}
- \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{137}}
- \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{138}}
- \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{139}}
- \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{140}}
- \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{141}}
- \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{142}}
- \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{143}}
- \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{144}}
- \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{145}}
- \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{146}}
- \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{147}}
- \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{148}}
- \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{149}}
- \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{150}}
- \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{151}}
- \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{152}}
- \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{153}}
- \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{154}}
- \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{155}}
- \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{156}}
- \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{157}}
- \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{158}}
- \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{159}}
- \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{160}}
- \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{161}}
- \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{162}}
- \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{163}}
- \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{164}}
- \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{165}}
- \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{166}}
- \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{167}}
- \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{168}}
- \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{169}}
- \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{170}}
- \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{171}}
- \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{172}}
- \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{173}}
- \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{174}}
- \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{175}}
- \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{176}}
- \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{177}}
- \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{178}}
- \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{179}}
- \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{180}}
- \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{181}}
- \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{182}}
- \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{183}}
- \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{184}}
- \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{185}}
- \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{186}}
- \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{187}}
- \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{188}}
- \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{189}}
- \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{190}}
- \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{191}}
- \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{192}}
- \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{193}}
- \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{194}}
- \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{195}}
- \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{196}}
- \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{197}}
- \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{198}}
- \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{199}}
- \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{200}}
- \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{201}}
- \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{202}}
- \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{203}}
- \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{204}}
- \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{205}}
- \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{206}}
- \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{207}}
- \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{208}}
- \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{209}}
- \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{210}}
- \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{211}}
- \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{212}}
- \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{213}}
- \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{214}}
- \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{215}}
- \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{216}}
- \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{217}}
- \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{218}}
- \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{219}}
- \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{220}}
- \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{221}}
- \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{222}}
- \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{223}}
- \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{224}}
- \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{225}}
- \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{226}}
- \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{227}}
- \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{228}}
- \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{229}}
- \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{230}}
- \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{231}}
- \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{232}}
- \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{233}}
- \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{234}}
- \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{235}}
- \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{236}}
- \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{237}}
- \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{238}}
- \expandafter\def\csname simpleicon@skypeicon\endcsname {\simpleiconsmaponezero\symbol{239}}
- \expandafter\def\csname simpleicon@skypeforbusinessicon\endcsname {\simpleiconsmaponezero\symbol{240}}
- \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{241}}
- \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{242}}
- \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{243}}
- \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{244}}
- \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{245}}
- \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{246}}
- \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{247}}
- \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{248}}
- \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{249}}
- \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{250}}
- \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{251}}
- \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{252}}
- \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{253}}
- \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{254}}
- \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{255}}
- \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponeone\symbol{0}}
- \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponeone\symbol{1}}
- \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponeone\symbol{2}}
- \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponeone\symbol{3}}
- \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponeone\symbol{4}}
- \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponeone\symbol{5}}
- \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponeone\symbol{6}}
- \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponeone\symbol{7}}
- \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponeone\symbol{8}}
- \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponeone\symbol{9}}
- \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponeone\symbol{10}}
- \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponeone\symbol{11}}
- \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponeone\symbol{12}}
- \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponeone\symbol{13}}
- \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponeone\symbol{14}}
- \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponeone\symbol{15}}
- \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponeone\symbol{16}}
- \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponeone\symbol{17}}
- \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponeone\symbol{18}}
- \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponeone\symbol{19}}
- \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponeone\symbol{20}}
- \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponeone\symbol{21}}
- \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponeone\symbol{22}}
- \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponeone\symbol{23}}
- \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponeone\symbol{24}}
- \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponeone\symbol{25}}
- \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponeone\symbol{26}}
- \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponeone\symbol{27}}
- \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponeone\symbol{28}}
- \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponeone\symbol{29}}
- \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponeone\symbol{30}}
- \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponeone\symbol{31}}
- \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponeone\symbol{32}}
- \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponeone\symbol{33}}
- \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponeone\symbol{34}}
- \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponeone\symbol{35}}
- \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponeone\symbol{36}}
- \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponeone\symbol{37}}
- \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponeone\symbol{38}}
- \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponeone\symbol{39}}
- \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponeone\symbol{40}}
- \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{41}}
- \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{42}}
- \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{43}}
- \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{44}}
- \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{45}}
- \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{46}}
- \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{47}}
- \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{48}}
- \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{49}}
- \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{50}}
- \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{51}}
- \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{52}}
- \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{53}}
- \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{54}}
- \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{55}}
- \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{56}}
- \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{57}}
- \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{58}}
- \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{59}}
- \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{60}}
- \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{61}}
- \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{62}}
- \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{63}}
- \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{64}}
- \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{65}}
- \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{66}}
- \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{67}}
- \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{68}}
- \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{69}}
- \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{70}}
- \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{71}}
- \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{72}}
- \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{73}}
- \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{74}}
- \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{75}}
- \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{76}}
- \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{77}}
- \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{78}}
- \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{79}}
- \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{80}}
- \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{81}}
- \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{82}}
- \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{83}}
- \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{84}}
- \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{85}}
- \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{86}}
- \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{87}}
- \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{88}}
- \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{89}}
- \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{90}}
- \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{91}}
- \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{92}}
- \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{93}}
- \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{94}}
- \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{95}}
- \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{96}}
- \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{97}}
- \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{98}}
- \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{99}}
- \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{100}}
- \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{101}}
- \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{102}}
- \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{103}}
- \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{104}}
- \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{105}}
- \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{106}}
- \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{107}}
- \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{108}}
- \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{109}}
- \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{110}}
- \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{111}}
- \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{112}}
- \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{113}}
- \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{114}}
- \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{115}}
- \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{116}}
- \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{117}}
- \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{118}}
- \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{119}}
- \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{120}}
- \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{121}}
- \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{122}}
- \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{123}}
- \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{124}}
- \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{125}}
- \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{126}}
- \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{127}}
- \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{128}}
- \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{129}}
- \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{130}}
- \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{131}}
- \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{132}}
- \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{133}}
- \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{134}}
- \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{135}}
- \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{136}}
- \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{137}}
- \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{138}}
- \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{139}}
- \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{140}}
- \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{141}}
- \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{142}}
- \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{143}}
- \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{144}}
- \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{145}}
- \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{146}}
- \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{147}}
- \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{148}}
- \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{149}}
- \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{150}}
- \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{151}}
- \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{152}}
- \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{153}}
- \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{154}}
- \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{155}}
- \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{156}}
- \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{157}}
- \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{158}}
- \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{159}}
- \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{160}}
- \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{161}}
- \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{162}}
- \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{163}}
- \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{164}}
- \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{165}}
- \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{166}}
- \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{167}}
- \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{168}}
- \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{169}}
- \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{170}}
- \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{171}}
- \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{172}}
- \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{173}}
- \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{174}}
- \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{175}}
- \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{176}}
- \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{177}}
- \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{178}}
- \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{179}}
- \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{180}}
- \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{181}}
- \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{182}}
- \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{183}}
- \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{184}}
- \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{185}}
- \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{186}}
- \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{187}}
- \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{188}}
- \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{189}}
- \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{190}}
- \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{191}}
- \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{192}}
- \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{193}}
- \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{194}}
- \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{195}}
- \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{196}}
- \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{197}}
- \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{198}}
- \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{199}}
- \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{200}}
- \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{201}}
- \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{202}}
- \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{203}}
- \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{204}}
- \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{205}}
- \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{206}}
- \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{207}}
- \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{208}}
- \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{209}}
- \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{210}}
- \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{211}}
- \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{212}}
- \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{213}}
- \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{214}}
- \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{215}}
- \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{216}}
- \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{217}}
- \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{218}}
- \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{219}}
- \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{220}}
- \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{221}}
- \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{222}}
- \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{223}}
- \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{224}}
- \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{225}}
- \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{226}}
- \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{227}}
- \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{228}}
- \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{229}}
- \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{230}}
- \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{231}}
- \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{232}}
- \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{233}}
- \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{234}}
- \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{235}}
- \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{236}}
- \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{237}}
- \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{238}}
- \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{239}}
- \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{240}}
- \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{241}}
- \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{242}}
- \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{243}}
- \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{244}}
- \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{245}}
- \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{246}}
- \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{247}}
- \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{248}}
- \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{249}}
- \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{250}}
- \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{251}}
- \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{252}}
- \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{253}}
- \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{254}}
- \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{255}}
- \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponetwo\symbol{0}}
- \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponetwo\symbol{1}}
- \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponetwo\symbol{2}}
- \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponetwo\symbol{3}}
- \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponetwo\symbol{4}}
- \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponetwo\symbol{5}}
- \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponetwo\symbol{6}}
- \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponetwo\symbol{7}}
- \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponetwo\symbol{8}}
- \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponetwo\symbol{9}}
- \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponetwo\symbol{10}}
- \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponetwo\symbol{11}}
- \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponetwo\symbol{12}}
- \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponetwo\symbol{13}}
- \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponetwo\symbol{14}}
- \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponetwo\symbol{15}}
- \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponetwo\symbol{16}}
- \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponetwo\symbol{17}}
- \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponetwo\symbol{18}}
- \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponetwo\symbol{19}}
- \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponetwo\symbol{20}}
- \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponetwo\symbol{21}}
- \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponetwo\symbol{22}}
- \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponetwo\symbol{23}}
- \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponetwo\symbol{24}}
- \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponetwo\symbol{25}}
- \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponetwo\symbol{26}}
- \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponetwo\symbol{27}}
- \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponetwo\symbol{28}}
- \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponetwo\symbol{29}}
- \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponetwo\symbol{30}}
- \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponetwo\symbol{31}}
- \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponetwo\symbol{32}}
- \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponetwo\symbol{33}}
- \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponetwo\symbol{34}}
- \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponetwo\symbol{35}}
- \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponetwo\symbol{36}}
- \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponetwo\symbol{37}}
- \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponetwo\symbol{38}}
- \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponetwo\symbol{39}}
- \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{40}}
- \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{41}}
- \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{42}}
- \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{43}}
- \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{44}}
- \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{45}}
- \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{46}}
- \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{47}}
- \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{48}}
- \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{49}}
- \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{50}}
- \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{51}}
- \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{52}}
- \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{53}}
- \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{54}}
- \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{55}}
- \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{56}}
- \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{57}}
- \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{58}}
- \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{59}}
- \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{60}}
- \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{61}}
- \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{62}}
- \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{63}}
- \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{64}}
- \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{65}}
- \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{66}}
- \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{67}}
- \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{68}}
- \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{69}}
- \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{70}}
- \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{71}}
- \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{72}}
- \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{73}}
- \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{74}}
- \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{75}}
- \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{76}}
- \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{77}}
- \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{78}}
- \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{79}}
- \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{80}}
- \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{81}}
- \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{82}}
- \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{83}}
- \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{84}}
- \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{85}}
- \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{86}}
- \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{87}}
- \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{88}}
- \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{89}}
- \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{90}}
- \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{91}}
- \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{92}}
- \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{93}}
- \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{94}}
- \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{95}}
- \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{96}}
- \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{97}}
- \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{98}}
- \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{99}}
- \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{100}}
- \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{101}}
- \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{102}}
- \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{103}}
- \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{104}}
- \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{105}}
- \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{106}}
- \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{107}}
- \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{108}}
- \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{109}}
- \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{110}}
- \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{111}}
- \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{112}}
- \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{113}}
- \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{114}}
- \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{115}}
- \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{116}}
- \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{117}}
- \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{118}}
- \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{119}}
- \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{120}}
- \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{121}}
- \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{122}}
- \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{123}}
- \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{124}}
- \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{125}}
- \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{126}}
- \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{127}}
- \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{128}}
- \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{129}}
- \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{130}}
- \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{131}}
- \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{132}}
- \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{133}}
- \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{134}}
- \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{135}}
- \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{136}}
- \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{137}}
- \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{138}}
- \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{139}}
- \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{140}}
- \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{141}}
- \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{142}}
- \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{143}}
- \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{144}}
- \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{145}}
- \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{146}}
- \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{147}}
- \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{148}}
- \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{149}}
- \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{150}}
- \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{151}}
- \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{152}}
- \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{153}}
- \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{154}}
- \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{155}}
- \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{156}}
- \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{157}}
- \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{158}}
- \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{159}}
- \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{160}}
- \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{161}}
- \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{162}}
- \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{163}}
- \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{164}}
- \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{165}}
- \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{166}}
- \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{167}}
- \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{168}}
- \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{169}}
- \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{170}}
- \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{171}}
- \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{172}}
- \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{173}}
- \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{174}}
- \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{175}}
- \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{176}}
- \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{177}}
- \expandafter\def\csname simpleicon@visualbasicicon\endcsname {\simpleiconsmaponetwo\symbol{178}}
- \expandafter\def\csname simpleicon@visualstudioicon\endcsname {\simpleiconsmaponetwo\symbol{179}}
- \expandafter\def\csname simpleicon@visualstudioappcentericon\endcsname {\simpleiconsmaponetwo\symbol{180}}
- \expandafter\def\csname simpleicon@visualstudiocodeicon\endcsname {\simpleiconsmaponetwo\symbol{181}}
- \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{182}}
- \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{183}}
- \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{184}}
- \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{185}}
- \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{186}}
- \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{187}}
- \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{188}}
- \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{189}}
- \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{190}}
- \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{191}}
- \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{192}}
- \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{193}}
- \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{194}}
- \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{195}}
- \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{196}}
- \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{197}}
- \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{198}}
- \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{199}}
- \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{200}}
- \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{201}}
- \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{202}}
- \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{203}}
- \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{204}}
- \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{205}}
- \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{206}}
- \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{207}}
- \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{208}}
- \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{209}}
- \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{210}}
- \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{211}}
- \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{212}}
- \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{213}}
- \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{214}}
- \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{215}}
- \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{216}}
- \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{217}}
- \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{218}}
- \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{219}}
- \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{220}}
- \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{221}}
- \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{222}}
- \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{223}}
- \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{224}}
- \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{225}}
- \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{226}}
- \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{227}}
- \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{228}}
- \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{229}}
- \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{230}}
- \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{231}}
- \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{232}}
- \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{233}}
- \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{234}}
- \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{235}}
- \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{236}}
- \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{237}}
- \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{238}}
- \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{239}}
- \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{240}}
- \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{241}}
- \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{242}}
- \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{243}}
- \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{244}}
- \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{245}}
- \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{246}}
- \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{247}}
- \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{248}}
- \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{249}}
- \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{250}}
- \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{251}}
- \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{252}}
- \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{253}}
- \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{254}}
- \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{255}}
- \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponethree\symbol{0}}
- \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponethree\symbol{1}}
- \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponethree\symbol{2}}
- \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponethree\symbol{3}}
- \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponethree\symbol{4}}
- \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponethree\symbol{5}}
- \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponethree\symbol{6}}
- \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponethree\symbol{7}}
- \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponethree\symbol{8}}
- \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponethree\symbol{9}}
- \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponethree\symbol{10}}
- \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponethree\symbol{11}}
- \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponethree\symbol{12}}
- \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponethree\symbol{13}}
- \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponethree\symbol{14}}
- \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponethree\symbol{15}}
- \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponethree\symbol{16}}
- \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponethree\symbol{17}}
- \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponethree\symbol{18}}
- \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponethree\symbol{19}}
- \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponethree\symbol{20}}
- \expandafter\def\csname simpleicon@windowsicon\endcsname {\simpleiconsmaponethree\symbol{21}}
- \expandafter\def\csname simpleicon@windows10icon\endcsname {\simpleiconsmaponethree\symbol{22}}
- \expandafter\def\csname simpleicon@windows95icon\endcsname {\simpleiconsmaponethree\symbol{23}}
- \expandafter\def\csname simpleicon@windowsterminalicon\endcsname {\simpleiconsmaponethree\symbol{24}}
- \expandafter\def\csname simpleicon@windowsxpicon\endcsname {\simpleiconsmaponethree\symbol{25}}
- \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponethree\symbol{26}}
- \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponethree\symbol{27}}
- \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponethree\symbol{28}}
- \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponethree\symbol{29}}
- \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponethree\symbol{30}}
- \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponethree\symbol{31}}
- \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponethree\symbol{32}}
- \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponethree\symbol{33}}
- \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponethree\symbol{34}}
- \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponethree\symbol{35}}
- \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponethree\symbol{36}}
- \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponethree\symbol{37}}
- \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponethree\symbol{38}}
- \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponethree\symbol{39}}
- \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponethree\symbol{40}}
- \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponethree\symbol{41}}
- \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponethree\symbol{42}}
- \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponethree\symbol{43}}
- \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponethree\symbol{44}}
- \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponethree\symbol{45}}
- \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponethree\symbol{46}}
- \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{47}}
- \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{48}}
- \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{49}}
- \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{50}}
- \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{51}}
- \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{52}}
- \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{53}}
- \expandafter\def\csname simpleicon@xamarinicon\endcsname {\simpleiconsmaponethree\symbol{54}}
- \expandafter\def\csname simpleicon@xamlicon\endcsname {\simpleiconsmaponethree\symbol{55}}
- \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{56}}
- \expandafter\def\csname simpleicon@xboxicon\endcsname {\simpleiconsmaponethree\symbol{57}}
- \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{58}}
- \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{59}}
- \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{60}}
- \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{61}}
- \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{62}}
- \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{63}}
- \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{64}}
- \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{65}}
- \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{66}}
- \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{67}}
- \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{68}}
- \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{69}}
- \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{70}}
- \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{71}}
- \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{72}}
- \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{73}}
- \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{74}}
- \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{75}}
- \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{76}}
- \expandafter\def\csname simpleicon@yammericon\endcsname {\simpleiconsmaponethree\symbol{77}}
- \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{78}}
- \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{79}}
- \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{80}}
- \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{81}}
- \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{82}}
- \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{83}}
- \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{84}}
- \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{85}}
- \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{86}}
- \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{87}}
- \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{88}}
- \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{89}}
- \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{90}}
- \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{91}}
- \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{92}}
- \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{93}}
- \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{94}}
- \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{95}}
- \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{96}}
- \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{97}}
- \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{98}}
- \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{99}}
- \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{100}}
- \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{101}}
- \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{102}}
- \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{103}}
- \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{104}}
- \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{105}}
- \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{106}}
- \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{107}}
- \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{108}}
- \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{109}}
- \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{110}}
- \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{111}}
- \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{112}}
- \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{113}}
- \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{114}}
- \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{115}}
- \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{116}}
- \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{117}}
- \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{118}}
- \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{119}}
- \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{120}}
- \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{121}}
- \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{122}}
- \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{123}}
- \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{124}}
- \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{125}}
- \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{126}}
- \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{127}}
- \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{128}}
- \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{129}}
- \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{130}}
- \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{131}}
- \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{132}}
- \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{133}}
- \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{134}}
- \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{135}} \ No newline at end of file
+ \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmaptwo\symbol{45}}
+ \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmaptwo\symbol{46}}
+ \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmaptwo\symbol{47}}
+ \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmaptwo\symbol{48}}
+ \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmaptwo\symbol{49}}
+ \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmaptwo\symbol{50}}
+ \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmaptwo\symbol{51}}
+ \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmaptwo\symbol{52}}
+ \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmaptwo\symbol{53}}
+ \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmaptwo\symbol{54}}
+ \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmaptwo\symbol{55}}
+ \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmaptwo\symbol{56}}
+ \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmaptwo\symbol{57}}
+ \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmaptwo\symbol{58}}
+ \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmaptwo\symbol{59}}
+ \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmaptwo\symbol{60}}
+ \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmaptwo\symbol{61}}
+ \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmaptwo\symbol{62}}
+ \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmaptwo\symbol{63}}
+ \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmaptwo\symbol{64}}
+ \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmaptwo\symbol{65}}
+ \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmaptwo\symbol{66}}
+ \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmaptwo\symbol{67}}
+ \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmaptwo\symbol{68}}
+ \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmaptwo\symbol{69}}
+ \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmaptwo\symbol{70}}
+ \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmaptwo\symbol{71}}
+ \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmaptwo\symbol{72}}
+ \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmaptwo\symbol{73}}
+ \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmaptwo\symbol{74}}
+ \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmaptwo\symbol{75}}
+ \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmaptwo\symbol{76}}
+ \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmaptwo\symbol{77}}
+ \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmaptwo\symbol{78}}
+ \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmaptwo\symbol{79}}
+ \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmaptwo\symbol{80}}
+ \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmaptwo\symbol{81}}
+ \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmaptwo\symbol{82}}
+ \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmaptwo\symbol{83}}
+ \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmaptwo\symbol{84}}
+ \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmaptwo\symbol{85}}
+ \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmaptwo\symbol{86}}
+ \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmaptwo\symbol{87}}
+ \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmaptwo\symbol{88}}
+ \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmaptwo\symbol{89}}
+ \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmaptwo\symbol{90}}
+ \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmaptwo\symbol{91}}
+ \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmaptwo\symbol{92}}
+ \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmaptwo\symbol{93}}
+ \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmaptwo\symbol{94}}
+ \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmaptwo\symbol{95}}
+ \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmaptwo\symbol{96}}
+ \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmaptwo\symbol{97}}
+ \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmaptwo\symbol{98}}
+ \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmaptwo\symbol{99}}
+ \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmaptwo\symbol{100}}
+ \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmaptwo\symbol{101}}
+ \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmaptwo\symbol{102}}
+ \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmaptwo\symbol{103}}
+ \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmaptwo\symbol{104}}
+ \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmaptwo\symbol{105}}
+ \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmaptwo\symbol{106}}
+ \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmaptwo\symbol{107}}
+ \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmaptwo\symbol{108}}
+ \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmaptwo\symbol{109}}
+ \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmaptwo\symbol{110}}
+ \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmaptwo\symbol{111}}
+ \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmaptwo\symbol{112}}
+ \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmaptwo\symbol{113}}
+ \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmaptwo\symbol{114}}
+ \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmaptwo\symbol{115}}
+ \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmaptwo\symbol{116}}
+ \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmaptwo\symbol{117}}
+ \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmaptwo\symbol{118}}
+ \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmaptwo\symbol{119}}
+ \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmaptwo\symbol{120}}
+ \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmaptwo\symbol{121}}
+ \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmaptwo\symbol{122}}
+ \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmaptwo\symbol{123}}
+ \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmaptwo\symbol{124}}
+ \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmaptwo\symbol{125}}
+ \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmaptwo\symbol{126}}
+ \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmaptwo\symbol{127}}
+ \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmaptwo\symbol{128}}
+ \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmaptwo\symbol{129}}
+ \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmaptwo\symbol{130}}
+ \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmaptwo\symbol{131}}
+ \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmaptwo\symbol{132}}
+ \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmaptwo\symbol{133}}
+ \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmaptwo\symbol{134}}
+ \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmaptwo\symbol{135}}
+ \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmaptwo\symbol{136}}
+ \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmaptwo\symbol{137}}
+ \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmaptwo\symbol{138}}
+ \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmaptwo\symbol{139}}
+ \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmaptwo\symbol{140}}
+ \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmaptwo\symbol{141}}
+ \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmaptwo\symbol{142}}
+ \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmaptwo\symbol{143}}
+ \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmaptwo\symbol{144}}
+ \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmaptwo\symbol{145}}
+ \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmaptwo\symbol{146}}
+ \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmaptwo\symbol{147}}
+ \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmaptwo\symbol{148}}
+ \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmaptwo\symbol{149}}
+ \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmaptwo\symbol{150}}
+ \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmaptwo\symbol{151}}
+ \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmaptwo\symbol{152}}
+ \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmaptwo\symbol{153}}
+ \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmaptwo\symbol{154}}
+ \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmaptwo\symbol{155}}
+ \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmaptwo\symbol{156}}
+ \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmaptwo\symbol{157}}
+ \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmaptwo\symbol{158}}
+ \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmaptwo\symbol{159}}
+ \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmaptwo\symbol{160}}
+ \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmaptwo\symbol{161}}
+ \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmaptwo\symbol{162}}
+ \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmaptwo\symbol{163}}
+ \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmaptwo\symbol{164}}
+ \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmaptwo\symbol{165}}
+ \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmaptwo\symbol{166}}
+ \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmaptwo\symbol{167}}
+ \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmaptwo\symbol{168}}
+ \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmaptwo\symbol{169}}
+ \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmaptwo\symbol{170}}
+ \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmaptwo\symbol{171}}
+ \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmaptwo\symbol{172}}
+ \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmaptwo\symbol{173}}
+ \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmaptwo\symbol{174}}
+ \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmaptwo\symbol{175}}
+ \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmaptwo\symbol{176}}
+ \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmaptwo\symbol{177}}
+ \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmaptwo\symbol{178}}
+ \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmaptwo\symbol{179}}
+ \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmaptwo\symbol{180}}
+ \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmaptwo\symbol{181}}
+ \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmaptwo\symbol{182}}
+ \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmaptwo\symbol{183}}
+ \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmaptwo\symbol{184}}
+ \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmaptwo\symbol{185}}
+ \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmaptwo\symbol{186}}
+ \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmaptwo\symbol{187}}
+ \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmaptwo\symbol{188}}
+ \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmaptwo\symbol{189}}
+ \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmaptwo\symbol{190}}
+ \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmaptwo\symbol{191}}
+ \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmaptwo\symbol{192}}
+ \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmaptwo\symbol{193}}
+ \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmaptwo\symbol{194}}
+ \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmaptwo\symbol{195}}
+ \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmaptwo\symbol{196}}
+ \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmaptwo\symbol{197}}
+ \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmaptwo\symbol{198}}
+ \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmaptwo\symbol{199}}
+ \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmaptwo\symbol{200}}
+ \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmaptwo\symbol{201}}
+ \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmaptwo\symbol{202}}
+ \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmaptwo\symbol{203}}
+ \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmaptwo\symbol{204}}
+ \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmaptwo\symbol{205}}
+ \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmaptwo\symbol{206}}
+ \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmaptwo\symbol{207}}
+ \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmaptwo\symbol{208}}
+ \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmaptwo\symbol{209}}
+ \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmaptwo\symbol{210}}
+ \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmaptwo\symbol{211}}
+ \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmaptwo\symbol{212}}
+ \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmaptwo\symbol{213}}
+ \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmaptwo\symbol{214}}
+ \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmaptwo\symbol{215}}
+ \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmaptwo\symbol{216}}
+ \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmaptwo\symbol{217}}
+ \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmaptwo\symbol{218}}
+ \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmaptwo\symbol{219}}
+ \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmaptwo\symbol{220}}
+ \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmaptwo\symbol{221}}
+ \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmaptwo\symbol{222}}
+ \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmaptwo\symbol{223}}
+ \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmaptwo\symbol{224}}
+ \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmaptwo\symbol{225}}
+ \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmaptwo\symbol{226}}
+ \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmaptwo\symbol{227}}
+ \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmaptwo\symbol{228}}
+ \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmaptwo\symbol{229}}
+ \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmaptwo\symbol{230}}
+ \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmaptwo\symbol{231}}
+ \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmaptwo\symbol{232}}
+ \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmaptwo\symbol{233}}
+ \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmaptwo\symbol{234}}
+ \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmaptwo\symbol{235}}
+ \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmaptwo\symbol{236}}
+ \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmaptwo\symbol{237}}
+ \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmaptwo\symbol{238}}
+ \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmaptwo\symbol{239}}
+ \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmaptwo\symbol{240}}
+ \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmaptwo\symbol{241}}
+ \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmaptwo\symbol{242}}
+ \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmaptwo\symbol{243}}
+ \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmaptwo\symbol{244}}
+ \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmaptwo\symbol{245}}
+ \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmaptwo\symbol{246}}
+ \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmaptwo\symbol{247}}
+ \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmaptwo\symbol{248}}
+ \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmaptwo\symbol{249}}
+ \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmaptwo\symbol{250}}
+ \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmaptwo\symbol{251}}
+ \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmaptwo\symbol{252}}
+ \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmaptwo\symbol{253}}
+ \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmaptwo\symbol{254}}
+ \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmaptwo\symbol{255}}
+ \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmapthree\symbol{0}}
+ \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmapthree\symbol{1}}
+ \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmapthree\symbol{2}}
+ \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmapthree\symbol{3}}
+ \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmapthree\symbol{4}}
+ \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmapthree\symbol{5}}
+ \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmapthree\symbol{6}}
+ \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmapthree\symbol{7}}
+ \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmapthree\symbol{8}}
+ \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmapthree\symbol{9}}
+ \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmapthree\symbol{10}}
+ \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmapthree\symbol{11}}
+ \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmapthree\symbol{12}}
+ \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmapthree\symbol{13}}
+ \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmapthree\symbol{14}}
+ \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmapthree\symbol{15}}
+ \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmapthree\symbol{16}}
+ \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmapthree\symbol{17}}
+ \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmapthree\symbol{18}}
+ \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmapthree\symbol{19}}
+ \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmapthree\symbol{20}}
+ \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmapthree\symbol{21}}
+ \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmapthree\symbol{22}}
+ \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmapthree\symbol{23}}
+ \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmapthree\symbol{24}}
+ \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmapthree\symbol{25}}
+ \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmapthree\symbol{26}}
+ \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmapthree\symbol{27}}
+ \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmapthree\symbol{28}}
+ \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmapthree\symbol{29}}
+ \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmapthree\symbol{30}}
+ \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmapthree\symbol{31}}
+ \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmapthree\symbol{32}}
+ \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmapthree\symbol{33}}
+ \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmapthree\symbol{34}}
+ \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmapthree\symbol{35}}
+ \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmapthree\symbol{36}}
+ \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmapthree\symbol{37}}
+ \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmapthree\symbol{38}}
+ \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmapthree\symbol{39}}
+ \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmapthree\symbol{40}}
+ \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmapthree\symbol{41}}
+ \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmapthree\symbol{42}}
+ \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmapthree\symbol{43}}
+ \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmapthree\symbol{44}}
+ \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmapthree\symbol{45}}
+ \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmapthree\symbol{46}}
+ \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmapthree\symbol{47}}
+ \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmapthree\symbol{48}}
+ \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmapthree\symbol{49}}
+ \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmapthree\symbol{50}}
+ \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmapthree\symbol{51}}
+ \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmapthree\symbol{52}}
+ \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmapthree\symbol{53}}
+ \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmapthree\symbol{54}}
+ \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmapthree\symbol{55}}
+ \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmapthree\symbol{56}}
+ \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmapthree\symbol{57}}
+ \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmapthree\symbol{58}}
+ \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmapthree\symbol{59}}
+ \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmapthree\symbol{60}}
+ \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmapthree\symbol{61}}
+ \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmapthree\symbol{62}}
+ \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmapthree\symbol{63}}
+ \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmapthree\symbol{64}}
+ \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmapthree\symbol{65}}
+ \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmapthree\symbol{66}}
+ \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmapthree\symbol{67}}
+ \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmapthree\symbol{68}}
+ \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmapthree\symbol{69}}
+ \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmapthree\symbol{70}}
+ \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmapthree\symbol{71}}
+ \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmapthree\symbol{72}}
+ \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmapthree\symbol{73}}
+ \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmapthree\symbol{74}}
+ \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmapthree\symbol{75}}
+ \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmapthree\symbol{76}}
+ \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmapthree\symbol{77}}
+ \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmapthree\symbol{78}}
+ \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmapthree\symbol{79}}
+ \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmapthree\symbol{80}}
+ \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmapthree\symbol{81}}
+ \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmapthree\symbol{82}}
+ \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmapthree\symbol{83}}
+ \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmapthree\symbol{84}}
+ \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmapthree\symbol{85}}
+ \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmapthree\symbol{86}}
+ \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmapthree\symbol{87}}
+ \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmapthree\symbol{88}}
+ \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmapthree\symbol{89}}
+ \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmapthree\symbol{90}}
+ \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmapthree\symbol{91}}
+ \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmapthree\symbol{92}}
+ \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmapthree\symbol{93}}
+ \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmapthree\symbol{94}}
+ \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmapthree\symbol{95}}
+ \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmapthree\symbol{96}}
+ \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmapthree\symbol{97}}
+ \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmapthree\symbol{98}}
+ \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmapthree\symbol{99}}
+ \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmapthree\symbol{100}}
+ \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmapthree\symbol{101}}
+ \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmapthree\symbol{102}}
+ \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmapthree\symbol{103}}
+ \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmapthree\symbol{104}}
+ \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmapthree\symbol{105}}
+ \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmapthree\symbol{106}}
+ \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmapthree\symbol{107}}
+ \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmapthree\symbol{108}}
+ \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmapthree\symbol{109}}
+ \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmapthree\symbol{110}}
+ \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmapthree\symbol{111}}
+ \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmapthree\symbol{112}}
+ \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmapthree\symbol{113}}
+ \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmapthree\symbol{114}}
+ \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmapthree\symbol{115}}
+ \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmapthree\symbol{116}}
+ \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmapthree\symbol{117}}
+ \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmapthree\symbol{118}}
+ \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmapthree\symbol{119}}
+ \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmapthree\symbol{120}}
+ \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmapthree\symbol{121}}
+ \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmapthree\symbol{122}}
+ \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmapthree\symbol{123}}
+ \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmapthree\symbol{124}}
+ \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmapthree\symbol{125}}
+ \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmapthree\symbol{126}}
+ \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmapthree\symbol{127}}
+ \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmapthree\symbol{128}}
+ \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmapthree\symbol{129}}
+ \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmapthree\symbol{130}}
+ \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmapthree\symbol{131}}
+ \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmapthree\symbol{132}}
+ \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmapthree\symbol{133}}
+ \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmapthree\symbol{134}}
+ \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmapthree\symbol{135}}
+ \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmapthree\symbol{136}}
+ \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmapthree\symbol{137}}
+ \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmapthree\symbol{138}}
+ \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmapthree\symbol{139}}
+ \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmapthree\symbol{140}}
+ \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmapthree\symbol{141}}
+ \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmapthree\symbol{142}}
+ \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmapthree\symbol{143}}
+ \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmapthree\symbol{144}}
+ \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmapthree\symbol{145}}
+ \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmapthree\symbol{146}}
+ \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmapthree\symbol{147}}
+ \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmapthree\symbol{148}}
+ \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmapthree\symbol{149}}
+ \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmapthree\symbol{150}}
+ \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmapthree\symbol{151}}
+ \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmapthree\symbol{152}}
+ \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmapthree\symbol{153}}
+ \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmapthree\symbol{154}}
+ \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmapthree\symbol{155}}
+ \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmapthree\symbol{156}}
+ \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmapthree\symbol{157}}
+ \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmapthree\symbol{158}}
+ \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmapthree\symbol{159}}
+ \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmapthree\symbol{160}}
+ \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmapthree\symbol{161}}
+ \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmapthree\symbol{162}}
+ \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmapthree\symbol{163}}
+ \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmapthree\symbol{164}}
+ \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmapthree\symbol{165}}
+ \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmapthree\symbol{166}}
+ \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmapthree\symbol{167}}
+ \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmapthree\symbol{168}}
+ \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmapthree\symbol{169}}
+ \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmapthree\symbol{170}}
+ \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmapthree\symbol{171}}
+ \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmapthree\symbol{172}}
+ \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmapthree\symbol{173}}
+ \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmapthree\symbol{174}}
+ \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmapthree\symbol{175}}
+ \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmapthree\symbol{176}}
+ \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmapthree\symbol{177}}
+ \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmapthree\symbol{178}}
+ \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmapthree\symbol{179}}
+ \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmapthree\symbol{180}}
+ \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmapthree\symbol{181}}
+ \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmapthree\symbol{182}}
+ \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmapthree\symbol{183}}
+ \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmapthree\symbol{184}}
+ \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmapthree\symbol{185}}
+ \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmapthree\symbol{186}}
+ \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmapthree\symbol{187}}
+ \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmapthree\symbol{188}}
+ \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmapthree\symbol{189}}
+ \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmapthree\symbol{190}}
+ \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmapthree\symbol{191}}
+ \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmapthree\symbol{192}}
+ \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmapthree\symbol{193}}
+ \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmapthree\symbol{194}}
+ \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmapthree\symbol{195}}
+ \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmapthree\symbol{196}}
+ \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmapthree\symbol{197}}
+ \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmapthree\symbol{198}}
+ \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmapthree\symbol{199}}
+ \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmapthree\symbol{200}}
+ \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmapthree\symbol{201}}
+ \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmapthree\symbol{202}}
+ \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmapthree\symbol{203}}
+ \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmapthree\symbol{204}}
+ \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmapthree\symbol{205}}
+ \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmapthree\symbol{206}}
+ \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmapthree\symbol{207}}
+ \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmapthree\symbol{208}}
+ \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmapthree\symbol{209}}
+ \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmapthree\symbol{210}}
+ \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmapthree\symbol{211}}
+ \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmapthree\symbol{212}}
+ \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmapthree\symbol{213}}
+ \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmapthree\symbol{214}}
+ \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmapthree\symbol{215}}
+ \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmapthree\symbol{216}}
+ \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmapthree\symbol{217}}
+ \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmapthree\symbol{218}}
+ \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmapthree\symbol{219}}
+ \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmapthree\symbol{220}}
+ \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmapthree\symbol{221}}
+ \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmapthree\symbol{222}}
+ \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmapthree\symbol{223}}
+ \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmapthree\symbol{224}}
+ \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmapthree\symbol{225}}
+ \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmapthree\symbol{226}}
+ \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmapthree\symbol{227}}
+ \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmapthree\symbol{228}}
+ \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmapthree\symbol{229}}
+ \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmapthree\symbol{230}}
+ \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmapthree\symbol{231}}
+ \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmapthree\symbol{232}}
+ \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmapthree\symbol{233}}
+ \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmapthree\symbol{234}}
+ \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmapthree\symbol{235}}
+ \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmapthree\symbol{236}}
+ \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmapthree\symbol{237}}
+ \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmapthree\symbol{238}}
+ \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmapthree\symbol{239}}
+ \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmapthree\symbol{240}}
+ \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmapthree\symbol{241}}
+ \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmapthree\symbol{242}}
+ \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmapthree\symbol{243}}
+ \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmapthree\symbol{244}}
+ \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmapthree\symbol{245}}
+ \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmapthree\symbol{246}}
+ \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmapthree\symbol{247}}
+ \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmapthree\symbol{248}}
+ \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmapthree\symbol{249}}
+ \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmapthree\symbol{250}}
+ \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmapthree\symbol{251}}
+ \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmapthree\symbol{252}}
+ \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmapthree\symbol{253}}
+ \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmapthree\symbol{254}}
+ \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmapthree\symbol{255}}
+ \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmapfour\symbol{0}}
+ \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmapfour\symbol{1}}
+ \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmapfour\symbol{2}}
+ \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmapfour\symbol{3}}
+ \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmapfour\symbol{4}}
+ \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmapfour\symbol{5}}
+ \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmapfour\symbol{6}}
+ \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmapfour\symbol{7}}
+ \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmapfour\symbol{8}}
+ \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmapfour\symbol{9}}
+ \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmapfour\symbol{10}}
+ \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmapfour\symbol{11}}
+ \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmapfour\symbol{12}}
+ \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmapfour\symbol{13}}
+ \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmapfour\symbol{14}}
+ \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmapfour\symbol{15}}
+ \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmapfour\symbol{16}}
+ \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmapfour\symbol{17}}
+ \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmapfour\symbol{18}}
+ \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmapfour\symbol{19}}
+ \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmapfour\symbol{20}}
+ \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmapfour\symbol{21}}
+ \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmapfour\symbol{22}}
+ \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmapfour\symbol{23}}
+ \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmapfour\symbol{24}}
+ \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmapfour\symbol{25}}
+ \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmapfour\symbol{26}}
+ \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmapfour\symbol{27}}
+ \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmapfour\symbol{28}}
+ \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmapfour\symbol{29}}
+ \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmapfour\symbol{30}}
+ \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmapfour\symbol{31}}
+ \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmapfour\symbol{32}}
+ \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmapfour\symbol{33}}
+ \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmapfour\symbol{34}}
+ \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmapfour\symbol{35}}
+ \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmapfour\symbol{36}}
+ \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmapfour\symbol{37}}
+ \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmapfour\symbol{38}}
+ \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmapfour\symbol{39}}
+ \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmapfour\symbol{40}}
+ \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmapfour\symbol{41}}
+ \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmapfour\symbol{42}}
+ \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmapfour\symbol{43}}
+ \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmapfour\symbol{44}}
+ \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmapfour\symbol{45}}
+ \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmapfour\symbol{46}}
+ \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmapfour\symbol{47}}
+ \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmapfour\symbol{48}}
+ \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmapfour\symbol{49}}
+ \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmapfour\symbol{50}}
+ \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmapfour\symbol{51}}
+ \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmapfour\symbol{52}}
+ \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmapfour\symbol{53}}
+ \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmapfour\symbol{54}}
+ \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmapfour\symbol{55}}
+ \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmapfour\symbol{56}}
+ \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmapfour\symbol{57}}
+ \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmapfour\symbol{58}}
+ \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmapfour\symbol{59}}
+ \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmapfour\symbol{60}}
+ \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmapfour\symbol{61}}
+ \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmapfour\symbol{62}}
+ \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmapfour\symbol{63}}
+ \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmapfour\symbol{64}}
+ \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmapfour\symbol{65}}
+ \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmapfour\symbol{66}}
+ \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmapfour\symbol{67}}
+ \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmapfour\symbol{68}}
+ \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmapfour\symbol{69}}
+ \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmapfour\symbol{70}}
+ \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmapfour\symbol{71}}
+ \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmapfour\symbol{72}}
+ \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmapfour\symbol{73}}
+ \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmapfour\symbol{74}}
+ \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmapfour\symbol{75}}
+ \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmapfour\symbol{76}}
+ \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmapfour\symbol{77}}
+ \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmapfour\symbol{78}}
+ \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmapfour\symbol{79}}
+ \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmapfour\symbol{80}}
+ \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmapfour\symbol{81}}
+ \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmapfour\symbol{82}}
+ \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmapfour\symbol{83}}
+ \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmapfour\symbol{84}}
+ \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmapfour\symbol{85}}
+ \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmapfour\symbol{86}}
+ \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmapfour\symbol{87}}
+ \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmapfour\symbol{88}}
+ \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmapfour\symbol{89}}
+ \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmapfour\symbol{90}}
+ \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmapfour\symbol{91}}
+ \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmapfour\symbol{92}}
+ \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmapfour\symbol{93}}
+ \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmapfour\symbol{94}}
+ \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmapfour\symbol{95}}
+ \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmapfour\symbol{96}}
+ \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmapfour\symbol{97}}
+ \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmapfour\symbol{98}}
+ \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmapfour\symbol{99}}
+ \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmapfour\symbol{100}}
+ \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmapfour\symbol{101}}
+ \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmapfour\symbol{102}}
+ \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmapfour\symbol{103}}
+ \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmapfour\symbol{104}}
+ \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmapfour\symbol{105}}
+ \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmapfour\symbol{106}}
+ \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmapfour\symbol{107}}
+ \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmapfour\symbol{108}}
+ \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmapfour\symbol{109}}
+ \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmapfour\symbol{110}}
+ \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmapfour\symbol{111}}
+ \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmapfour\symbol{112}}
+ \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmapfour\symbol{113}}
+ \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmapfour\symbol{114}}
+ \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmapfour\symbol{115}}
+ \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmapfour\symbol{116}}
+ \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmapfour\symbol{117}}
+ \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmapfour\symbol{118}}
+ \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmapfour\symbol{119}}
+ \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmapfour\symbol{120}}
+ \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmapfour\symbol{121}}
+ \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmapfour\symbol{122}}
+ \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmapfour\symbol{123}}
+ \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmapfour\symbol{124}}
+ \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmapfour\symbol{125}}
+ \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmapfour\symbol{126}}
+ \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmapfour\symbol{127}}
+ \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmapfour\symbol{128}}
+ \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmapfour\symbol{129}}
+ \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmapfour\symbol{130}}
+ \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmapfour\symbol{131}}
+ \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmapfour\symbol{132}}
+ \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmapfour\symbol{133}}
+ \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmapfour\symbol{134}}
+ \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmapfour\symbol{135}}
+ \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmapfour\symbol{136}}
+ \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmapfour\symbol{137}}
+ \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmapfour\symbol{138}}
+ \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmapfour\symbol{139}}
+ \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmapfour\symbol{140}}
+ \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmapfour\symbol{141}}
+ \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmapfour\symbol{142}}
+ \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmapfour\symbol{143}}
+ \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmapfour\symbol{144}}
+ \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmapfour\symbol{145}}
+ \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmapfour\symbol{146}}
+ \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmapfour\symbol{147}}
+ \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmapfour\symbol{148}}
+ \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmapfour\symbol{149}}
+ \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmapfour\symbol{150}}
+ \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmapfour\symbol{151}}
+ \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmapfour\symbol{152}}
+ \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmapfour\symbol{153}}
+ \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmapfour\symbol{154}}
+ \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmapfour\symbol{155}}
+ \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmapfour\symbol{156}}
+ \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmapfour\symbol{157}}
+ \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmapfour\symbol{158}}
+ \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmapfour\symbol{159}}
+ \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmapfour\symbol{160}}
+ \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmapfour\symbol{161}}
+ \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmapfour\symbol{162}}
+ \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmapfour\symbol{163}}
+ \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmapfour\symbol{164}}
+ \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmapfour\symbol{165}}
+ \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmapfour\symbol{166}}
+ \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmapfour\symbol{167}}
+ \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmapfour\symbol{168}}
+ \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmapfour\symbol{169}}
+ \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmapfour\symbol{170}}
+ \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmapfour\symbol{171}}
+ \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmapfour\symbol{172}}
+ \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmapfour\symbol{173}}
+ \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmapfour\symbol{174}}
+ \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmapfour\symbol{175}}
+ \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmapfour\symbol{176}}
+ \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmapfour\symbol{177}}
+ \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmapfour\symbol{178}}
+ \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmapfour\symbol{179}}
+ \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmapfour\symbol{180}}
+ \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmapfour\symbol{181}}
+ \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmapfour\symbol{182}}
+ \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmapfour\symbol{183}}
+ \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmapfour\symbol{184}}
+ \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmapfour\symbol{185}}
+ \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmapfour\symbol{186}}
+ \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmapfour\symbol{187}}
+ \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmapfour\symbol{188}}
+ \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmapfour\symbol{189}}
+ \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmapfour\symbol{190}}
+ \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmapfour\symbol{191}}
+ \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmapfour\symbol{192}}
+ \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmapfour\symbol{193}}
+ \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmapfour\symbol{194}}
+ \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmapfour\symbol{195}}
+ \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmapfour\symbol{196}}
+ \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmapfour\symbol{197}}
+ \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmapfour\symbol{198}}
+ \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmapfour\symbol{199}}
+ \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmapfour\symbol{200}}
+ \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmapfour\symbol{201}}
+ \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmapfour\symbol{202}}
+ \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmapfour\symbol{203}}
+ \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmapfour\symbol{204}}
+ \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmapfour\symbol{205}}
+ \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmapfour\symbol{206}}
+ \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmapfour\symbol{207}}
+ \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmapfour\symbol{208}}
+ \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmapfour\symbol{209}}
+ \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmapfour\symbol{210}}
+ \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmapfour\symbol{211}}
+ \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmapfour\symbol{212}}
+ \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmapfour\symbol{213}}
+ \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmapfour\symbol{214}}
+ \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmapfour\symbol{215}}
+ \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmapfour\symbol{216}}
+ \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmapfour\symbol{217}}
+ \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmapfour\symbol{218}}
+ \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmapfour\symbol{219}}
+ \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmapfour\symbol{220}}
+ \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmapfour\symbol{221}}
+ \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmapfour\symbol{222}}
+ \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmapfour\symbol{223}}
+ \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmapfour\symbol{224}}
+ \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmapfour\symbol{225}}
+ \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmapfour\symbol{226}}
+ \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmapfour\symbol{227}}
+ \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmapfour\symbol{228}}
+ \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmapfour\symbol{229}}
+ \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmapfour\symbol{230}}
+ \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmapfour\symbol{231}}
+ \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmapfour\symbol{232}}
+ \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmapfour\symbol{233}}
+ \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmapfour\symbol{234}}
+ \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmapfour\symbol{235}}
+ \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmapfour\symbol{236}}
+ \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmapfour\symbol{237}}
+ \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmapfour\symbol{238}}
+ \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmapfour\symbol{239}}
+ \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmapfour\symbol{240}}
+ \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmapfour\symbol{241}}
+ \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmapfour\symbol{242}}
+ \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmapfour\symbol{243}}
+ \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmapfour\symbol{244}}
+ \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmapfour\symbol{245}}
+ \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmapfour\symbol{246}}
+ \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmapfour\symbol{247}}
+ \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmapfour\symbol{248}}
+ \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmapfour\symbol{249}}
+ \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmapfour\symbol{250}}
+ \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmapfour\symbol{251}}
+ \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmapfour\symbol{252}}
+ \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmapfour\symbol{253}}
+ \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmapfour\symbol{254}}
+ \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmapfour\symbol{255}}
+ \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmapfive\symbol{0}}
+ \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmapfive\symbol{1}}
+ \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmapfive\symbol{2}}
+ \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmapfive\symbol{3}}
+ \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmapfive\symbol{4}}
+ \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmapfive\symbol{5}}
+ \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmapfive\symbol{6}}
+ \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmapfive\symbol{7}}
+ \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmapfive\symbol{8}}
+ \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmapfive\symbol{9}}
+ \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmapfive\symbol{10}}
+ \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmapfive\symbol{11}}
+ \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmapfive\symbol{12}}
+ \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmapfive\symbol{13}}
+ \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmapfive\symbol{14}}
+ \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmapfive\symbol{15}}
+ \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmapfive\symbol{16}}
+ \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmapfive\symbol{17}}
+ \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmapfive\symbol{18}}
+ \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmapfive\symbol{19}}
+ \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmapfive\symbol{20}}
+ \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmapfive\symbol{21}}
+ \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmapfive\symbol{22}}
+ \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmapfive\symbol{23}}
+ \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmapfive\symbol{24}}
+ \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmapfive\symbol{25}}
+ \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmapfive\symbol{26}}
+ \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmapfive\symbol{27}}
+ \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmapfive\symbol{28}}
+ \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmapfive\symbol{29}}
+ \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmapfive\symbol{30}}
+ \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmapfive\symbol{31}}
+ \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmapfive\symbol{32}}
+ \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmapfive\symbol{33}}
+ \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmapfive\symbol{34}}
+ \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmapfive\symbol{35}}
+ \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmapfive\symbol{36}}
+ \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmapfive\symbol{37}}
+ \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmapfive\symbol{38}}
+ \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmapfive\symbol{39}}
+ \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmapfive\symbol{40}}
+ \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmapfive\symbol{41}}
+ \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmapfive\symbol{42}}
+ \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmapfive\symbol{43}}
+ \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmapfive\symbol{44}}
+ \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmapfive\symbol{45}}
+ \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmapfive\symbol{46}}
+ \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmapfive\symbol{47}}
+ \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmapfive\symbol{48}}
+ \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmapfive\symbol{49}}
+ \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmapfive\symbol{50}}
+ \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmapfive\symbol{51}}
+ \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmapfive\symbol{52}}
+ \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmapfive\symbol{53}}
+ \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmapfive\symbol{54}}
+ \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmapfive\symbol{55}}
+ \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmapfive\symbol{56}}
+ \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmapfive\symbol{57}}
+ \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmapfive\symbol{58}}
+ \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmapfive\symbol{59}}
+ \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmapfive\symbol{60}}
+ \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmapfive\symbol{61}}
+ \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmapfive\symbol{62}}
+ \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmapfive\symbol{63}}
+ \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmapfive\symbol{64}}
+ \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmapfive\symbol{65}}
+ \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmapfive\symbol{66}}
+ \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmapfive\symbol{67}}
+ \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmapfive\symbol{68}}
+ \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmapfive\symbol{69}}
+ \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmapfive\symbol{70}}
+ \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmapfive\symbol{71}}
+ \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmapfive\symbol{72}}
+ \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmapfive\symbol{73}}
+ \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmapfive\symbol{74}}
+ \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmapfive\symbol{75}}
+ \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmapfive\symbol{76}}
+ \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmapfive\symbol{77}}
+ \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmapfive\symbol{78}}
+ \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmapfive\symbol{79}}
+ \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmapfive\symbol{80}}
+ \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmapfive\symbol{81}}
+ \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmapfive\symbol{82}}
+ \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmapfive\symbol{83}}
+ \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmapfive\symbol{84}}
+ \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmapfive\symbol{85}}
+ \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmapfive\symbol{86}}
+ \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmapfive\symbol{87}}
+ \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmapfive\symbol{88}}
+ \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmapfive\symbol{89}}
+ \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmapfive\symbol{90}}
+ \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmapfive\symbol{91}}
+ \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmapfive\symbol{92}}
+ \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmapfive\symbol{93}}
+ \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmapfive\symbol{94}}
+ \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmapfive\symbol{95}}
+ \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmapfive\symbol{96}}
+ \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmapfive\symbol{97}}
+ \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmapfive\symbol{98}}
+ \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmapfive\symbol{99}}
+ \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmapfive\symbol{100}}
+ \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmapfive\symbol{101}}
+ \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmapfive\symbol{102}}
+ \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmapfive\symbol{103}}
+ \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmapfive\symbol{104}}
+ \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmapfive\symbol{105}}
+ \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmapfive\symbol{106}}
+ \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmapfive\symbol{107}}
+ \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmapfive\symbol{108}}
+ \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmapfive\symbol{109}}
+ \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmapfive\symbol{110}}
+ \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmapfive\symbol{111}}
+ \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmapfive\symbol{112}}
+ \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmapfive\symbol{113}}
+ \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmapfive\symbol{114}}
+ \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmapfive\symbol{115}}
+ \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmapfive\symbol{116}}
+ \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmapfive\symbol{117}}
+ \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmapfive\symbol{118}}
+ \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmapfive\symbol{119}}
+ \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmapfive\symbol{120}}
+ \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmapfive\symbol{121}}
+ \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmapfive\symbol{122}}
+ \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmapfive\symbol{123}}
+ \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmapfive\symbol{124}}
+ \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmapfive\symbol{125}}
+ \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmapfive\symbol{126}}
+ \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmapfive\symbol{127}}
+ \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmapfive\symbol{128}}
+ \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmapfive\symbol{129}}
+ \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmapfive\symbol{130}}
+ \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmapfive\symbol{131}}
+ \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmapfive\symbol{132}}
+ \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmapfive\symbol{133}}
+ \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmapfive\symbol{134}}
+ \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmapfive\symbol{135}}
+ \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmapfive\symbol{136}}
+ \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmapfive\symbol{137}}
+ \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmapfive\symbol{138}}
+ \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmapfive\symbol{139}}
+ \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmapfive\symbol{140}}
+ \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmapfive\symbol{141}}
+ \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmapfive\symbol{142}}
+ \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmapfive\symbol{143}}
+ \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmapfive\symbol{144}}
+ \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmapfive\symbol{145}}
+ \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmapfive\symbol{146}}
+ \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmapfive\symbol{147}}
+ \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmapfive\symbol{148}}
+ \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmapfive\symbol{149}}
+ \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmapfive\symbol{150}}
+ \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmapfive\symbol{151}}
+ \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmapfive\symbol{152}}
+ \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmapfive\symbol{153}}
+ \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmapfive\symbol{154}}
+ \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmapfive\symbol{155}}
+ \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmapfive\symbol{156}}
+ \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmapfive\symbol{157}}
+ \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmapfive\symbol{158}}
+ \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmapfive\symbol{159}}
+ \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmapfive\symbol{160}}
+ \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmapfive\symbol{161}}
+ \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmapfive\symbol{162}}
+ \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmapfive\symbol{163}}
+ \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmapfive\symbol{164}}
+ \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmapfive\symbol{165}}
+ \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmapfive\symbol{166}}
+ \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmapfive\symbol{167}}
+ \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmapfive\symbol{168}}
+ \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmapfive\symbol{169}}
+ \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmapfive\symbol{170}}
+ \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmapfive\symbol{171}}
+ \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmapfive\symbol{172}}
+ \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmapfive\symbol{173}}
+ \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmapfive\symbol{174}}
+ \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmapfive\symbol{175}}
+ \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmapfive\symbol{176}}
+ \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmapfive\symbol{177}}
+ \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmapfive\symbol{178}}
+ \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmapfive\symbol{179}}
+ \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmapfive\symbol{180}}
+ \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmapfive\symbol{181}}
+ \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmapfive\symbol{182}}
+ \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmapfive\symbol{183}}
+ \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmapfive\symbol{184}}
+ \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmapfive\symbol{185}}
+ \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmapfive\symbol{186}}
+ \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmapfive\symbol{187}}
+ \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmapfive\symbol{188}}
+ \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmapfive\symbol{189}}
+ \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmapfive\symbol{190}}
+ \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmapfive\symbol{191}}
+ \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmapfive\symbol{192}}
+ \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmapfive\symbol{193}}
+ \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmapfive\symbol{194}}
+ \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmapfive\symbol{195}}
+ \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmapfive\symbol{196}}
+ \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmapfive\symbol{197}}
+ \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmapfive\symbol{198}}
+ \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmapfive\symbol{199}}
+ \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmapfive\symbol{200}}
+ \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmapfive\symbol{201}}
+ \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmapfive\symbol{202}}
+ \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmapfive\symbol{203}}
+ \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmapfive\symbol{204}}
+ \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmapfive\symbol{205}}
+ \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmapfive\symbol{206}}
+ \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmapfive\symbol{207}}
+ \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmapfive\symbol{208}}
+ \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmapfive\symbol{209}}
+ \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmapfive\symbol{210}}
+ \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmapfive\symbol{211}}
+ \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmapfive\symbol{212}}
+ \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmapfive\symbol{213}}
+ \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmapfive\symbol{214}}
+ \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmapfive\symbol{215}}
+ \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmapfive\symbol{216}}
+ \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmapfive\symbol{217}}
+ \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmapfive\symbol{218}}
+ \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmapfive\symbol{219}}
+ \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmapfive\symbol{220}}
+ \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmapfive\symbol{221}}
+ \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmapfive\symbol{222}}
+ \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmapfive\symbol{223}}
+ \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmapfive\symbol{224}}
+ \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmapfive\symbol{225}}
+ \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmapfive\symbol{226}}
+ \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmapfive\symbol{227}}
+ \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmapfive\symbol{228}}
+ \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmapfive\symbol{229}}
+ \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmapfive\symbol{230}}
+ \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmapfive\symbol{231}}
+ \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmapfive\symbol{232}}
+ \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmapfive\symbol{233}}
+ \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmapfive\symbol{234}}
+ \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmapfive\symbol{235}}
+ \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmapfive\symbol{236}}
+ \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmapfive\symbol{237}}
+ \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmapfive\symbol{238}}
+ \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmapfive\symbol{239}}
+ \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmapfive\symbol{240}}
+ \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmapfive\symbol{241}}
+ \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmapfive\symbol{242}}
+ \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmapfive\symbol{243}}
+ \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmapfive\symbol{244}}
+ \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmapfive\symbol{245}}
+ \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmapfive\symbol{246}}
+ \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmapfive\symbol{247}}
+ \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmapfive\symbol{248}}
+ \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmapfive\symbol{249}}
+ \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmapfive\symbol{250}}
+ \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmapfive\symbol{251}}
+ \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmapfive\symbol{252}}
+ \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmapfive\symbol{253}}
+ \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmapfive\symbol{254}}
+ \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmapfive\symbol{255}}
+ \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmapsix\symbol{0}}
+ \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmapsix\symbol{1}}
+ \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmapsix\symbol{2}}
+ \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmapsix\symbol{3}}
+ \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmapsix\symbol{4}}
+ \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmapsix\symbol{5}}
+ \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmapsix\symbol{6}}
+ \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmapsix\symbol{7}}
+ \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmapsix\symbol{8}}
+ \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmapsix\symbol{9}}
+ \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmapsix\symbol{10}}
+ \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmapsix\symbol{11}}
+ \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmapsix\symbol{12}}
+ \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmapsix\symbol{13}}
+ \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmapsix\symbol{14}}
+ \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmapsix\symbol{15}}
+ \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmapsix\symbol{16}}
+ \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmapsix\symbol{17}}
+ \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmapsix\symbol{18}}
+ \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmapsix\symbol{19}}
+ \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmapsix\symbol{20}}
+ \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmapsix\symbol{21}}
+ \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmapsix\symbol{22}}
+ \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmapsix\symbol{23}}
+ \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmapsix\symbol{24}}
+ \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmapsix\symbol{25}}
+ \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmapsix\symbol{26}}
+ \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmapsix\symbol{27}}
+ \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmapsix\symbol{28}}
+ \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmapsix\symbol{29}}
+ \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmapsix\symbol{30}}
+ \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmapsix\symbol{31}}
+ \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmapsix\symbol{32}}
+ \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmapsix\symbol{33}}
+ \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmapsix\symbol{34}}
+ \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmapsix\symbol{35}}
+ \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmapsix\symbol{36}}
+ \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmapsix\symbol{37}}
+ \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmapsix\symbol{38}}
+ \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmapsix\symbol{39}}
+ \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmapsix\symbol{40}}
+ \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmapsix\symbol{41}}
+ \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmapsix\symbol{42}}
+ \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmapsix\symbol{43}}
+ \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmapsix\symbol{44}}
+ \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmapsix\symbol{45}}
+ \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmapsix\symbol{46}}
+ \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmapsix\symbol{47}}
+ \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmapsix\symbol{48}}
+ \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmapsix\symbol{49}}
+ \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmapsix\symbol{50}}
+ \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmapsix\symbol{51}}
+ \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmapsix\symbol{52}}
+ \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmapsix\symbol{53}}
+ \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmapsix\symbol{54}}
+ \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmapsix\symbol{55}}
+ \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmapsix\symbol{56}}
+ \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmapsix\symbol{57}}
+ \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmapsix\symbol{58}}
+ \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmapsix\symbol{59}}
+ \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmapsix\symbol{60}}
+ \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmapsix\symbol{61}}
+ \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmapsix\symbol{62}}
+ \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmapsix\symbol{63}}
+ \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmapsix\symbol{64}}
+ \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmapsix\symbol{65}}
+ \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmapsix\symbol{66}}
+ \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmapsix\symbol{67}}
+ \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmapsix\symbol{68}}
+ \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmapsix\symbol{69}}
+ \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmapsix\symbol{70}}
+ \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmapsix\symbol{71}}
+ \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmapsix\symbol{72}}
+ \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmapsix\symbol{73}}
+ \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmapsix\symbol{74}}
+ \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmapsix\symbol{75}}
+ \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmapsix\symbol{76}}
+ \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmapsix\symbol{77}}
+ \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmapsix\symbol{78}}
+ \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmapsix\symbol{79}}
+ \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmapsix\symbol{80}}
+ \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmapsix\symbol{81}}
+ \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmapsix\symbol{82}}
+ \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmapsix\symbol{83}}
+ \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmapsix\symbol{84}}
+ \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmapsix\symbol{85}}
+ \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmapsix\symbol{86}}
+ \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmapsix\symbol{87}}
+ \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmapsix\symbol{88}}
+ \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmapsix\symbol{89}}
+ \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmapsix\symbol{90}}
+ \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmapsix\symbol{91}}
+ \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmapsix\symbol{92}}
+ \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmapsix\symbol{93}}
+ \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmapsix\symbol{94}}
+ \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmapsix\symbol{95}}
+ \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmapsix\symbol{96}}
+ \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmapsix\symbol{97}}
+ \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmapsix\symbol{98}}
+ \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmapsix\symbol{99}}
+ \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmapsix\symbol{100}}
+ \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmapsix\symbol{101}}
+ \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmapsix\symbol{102}}
+ \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmapsix\symbol{103}}
+ \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmapsix\symbol{104}}
+ \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmapsix\symbol{105}}
+ \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmapsix\symbol{106}}
+ \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmapsix\symbol{107}}
+ \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmapsix\symbol{108}}
+ \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmapsix\symbol{109}}
+ \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmapsix\symbol{110}}
+ \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmapsix\symbol{111}}
+ \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmapsix\symbol{112}}
+ \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmapsix\symbol{113}}
+ \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmapsix\symbol{114}}
+ \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmapsix\symbol{115}}
+ \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmapsix\symbol{116}}
+ \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmapsix\symbol{117}}
+ \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmapsix\symbol{118}}
+ \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmapsix\symbol{119}}
+ \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmapsix\symbol{120}}
+ \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmapsix\symbol{121}}
+ \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmapsix\symbol{122}}
+ \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmapsix\symbol{123}}
+ \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmapsix\symbol{124}}
+ \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmapsix\symbol{125}}
+ \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmapsix\symbol{126}}
+ \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmapsix\symbol{127}}
+ \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmapsix\symbol{128}}
+ \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmapsix\symbol{129}}
+ \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmapsix\symbol{130}}
+ \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmapsix\symbol{131}}
+ \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmapsix\symbol{132}}
+ \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmapsix\symbol{133}}
+ \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmapsix\symbol{134}}
+ \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmapsix\symbol{135}}
+ \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmapsix\symbol{136}}
+ \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmapsix\symbol{137}}
+ \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmapsix\symbol{138}}
+ \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmapsix\symbol{139}}
+ \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmapsix\symbol{140}}
+ \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmapsix\symbol{141}}
+ \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmapsix\symbol{142}}
+ \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmapsix\symbol{143}}
+ \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmapsix\symbol{144}}
+ \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmapsix\symbol{145}}
+ \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmapsix\symbol{146}}
+ \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmapsix\symbol{147}}
+ \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmapsix\symbol{148}}
+ \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmapsix\symbol{149}}
+ \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmapsix\symbol{150}}
+ \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmapsix\symbol{151}}
+ \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmapsix\symbol{152}}
+ \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmapsix\symbol{153}}
+ \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmapsix\symbol{154}}
+ \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmapsix\symbol{155}}
+ \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmapsix\symbol{156}}
+ \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmapsix\symbol{157}}
+ \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmapsix\symbol{158}}
+ \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmapsix\symbol{159}}
+ \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmapsix\symbol{160}}
+ \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmapsix\symbol{161}}
+ \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmapsix\symbol{162}}
+ \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmapsix\symbol{163}}
+ \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmapsix\symbol{164}}
+ \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmapsix\symbol{165}}
+ \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmapsix\symbol{166}}
+ \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmapsix\symbol{167}}
+ \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmapsix\symbol{168}}
+ \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmapsix\symbol{169}}
+ \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmapsix\symbol{170}}
+ \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmapsix\symbol{171}}
+ \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmapsix\symbol{172}}
+ \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmapsix\symbol{173}}
+ \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmapsix\symbol{174}}
+ \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmapsix\symbol{175}}
+ \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmapsix\symbol{176}}
+ \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmapsix\symbol{177}}
+ \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmapsix\symbol{178}}
+ \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmapsix\symbol{179}}
+ \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmapsix\symbol{180}}
+ \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmapsix\symbol{181}}
+ \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmapsix\symbol{182}}
+ \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmapsix\symbol{183}}
+ \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmapsix\symbol{184}}
+ \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmapsix\symbol{185}}
+ \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmapsix\symbol{186}}
+ \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmapsix\symbol{187}}
+ \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmapsix\symbol{188}}
+ \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmapsix\symbol{189}}
+ \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmapsix\symbol{190}}
+ \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmapsix\symbol{191}}
+ \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmapsix\symbol{192}}
+ \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmapsix\symbol{193}}
+ \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmapsix\symbol{194}}
+ \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmapsix\symbol{195}}
+ \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmapsix\symbol{196}}
+ \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmapsix\symbol{197}}
+ \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmapsix\symbol{198}}
+ \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmapsix\symbol{199}}
+ \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmapsix\symbol{200}}
+ \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmapsix\symbol{201}}
+ \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmapsix\symbol{202}}
+ \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmapsix\symbol{203}}
+ \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmapsix\symbol{204}}
+ \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmapsix\symbol{205}}
+ \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmapsix\symbol{206}}
+ \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmapsix\symbol{207}}
+ \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmapsix\symbol{208}}
+ \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmapsix\symbol{209}}
+ \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmapsix\symbol{210}}
+ \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmapsix\symbol{211}}
+ \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmapsix\symbol{212}}
+ \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmapsix\symbol{213}}
+ \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmapsix\symbol{214}}
+ \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmapsix\symbol{215}}
+ \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmapsix\symbol{216}}
+ \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmapsix\symbol{217}}
+ \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmapsix\symbol{218}}
+ \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmapsix\symbol{219}}
+ \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmapsix\symbol{220}}
+ \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmapsix\symbol{221}}
+ \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmapsix\symbol{222}}
+ \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmapsix\symbol{223}}
+ \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmapsix\symbol{224}}
+ \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmapsix\symbol{225}}
+ \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmapsix\symbol{226}}
+ \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmapsix\symbol{227}}
+ \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmapsix\symbol{228}}
+ \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{229}}
+ \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{230}}
+ \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{231}}
+ \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{232}}
+ \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{233}}
+ \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{234}}
+ \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{235}}
+ \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{236}}
+ \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{237}}
+ \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapsix\symbol{238}}
+ \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapsix\symbol{239}}
+ \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapsix\symbol{240}}
+ \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapsix\symbol{241}}
+ \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapsix\symbol{242}}
+ \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapsix\symbol{243}}
+ \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapsix\symbol{244}}
+ \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapsix\symbol{245}}
+ \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapsix\symbol{246}}
+ \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapsix\symbol{247}}
+ \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapsix\symbol{248}}
+ \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapsix\symbol{249}}
+ \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapsix\symbol{250}}
+ \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapsix\symbol{251}}
+ \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapsix\symbol{252}}
+ \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapsix\symbol{253}}
+ \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapsix\symbol{254}}
+ \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapsix\symbol{255}}
+ \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{0}}
+ \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{1}}
+ \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{2}}
+ \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{3}}
+ \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{4}}
+ \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{5}}
+ \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{6}}
+ \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{7}}
+ \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{8}}
+ \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{9}}
+ \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{10}}
+ \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{11}}
+ \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{12}}
+ \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{13}}
+ \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{14}}
+ \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{15}}
+ \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{16}}
+ \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{17}}
+ \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{18}}
+ \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{19}}
+ \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{20}}
+ \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{21}}
+ \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{22}}
+ \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{23}}
+ \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{24}}
+ \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{25}}
+ \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{26}}
+ \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{27}}
+ \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{28}}
+ \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{29}}
+ \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{30}}
+ \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{31}}
+ \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{32}}
+ \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{33}}
+ \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{34}}
+ \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{35}}
+ \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{36}}
+ \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{37}}
+ \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{38}}
+ \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{39}}
+ \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{40}}
+ \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{41}}
+ \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{42}}
+ \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{43}}
+ \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{44}}
+ \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{45}}
+ \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{46}}
+ \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{47}}
+ \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{48}}
+ \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{49}}
+ \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{50}}
+ \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{51}}
+ \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{52}}
+ \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{53}}
+ \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{54}}
+ \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{55}}
+ \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{56}}
+ \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{57}}
+ \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{58}}
+ \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{59}}
+ \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{60}}
+ \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{61}}
+ \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{62}}
+ \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{63}}
+ \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{64}}
+ \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{65}}
+ \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{66}}
+ \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{67}}
+ \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{68}}
+ \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{69}}
+ \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{70}}
+ \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{71}}
+ \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{72}}
+ \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{73}}
+ \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{74}}
+ \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{75}}
+ \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{76}}
+ \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{77}}
+ \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{78}}
+ \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{79}}
+ \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{80}}
+ \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{81}}
+ \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{82}}
+ \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{83}}
+ \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{84}}
+ \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{85}}
+ \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{86}}
+ \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{87}}
+ \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{88}}
+ \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{89}}
+ \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{90}}
+ \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{91}}
+ \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{92}}
+ \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{93}}
+ \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{94}}
+ \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{95}}
+ \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{96}}
+ \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{97}}
+ \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{98}}
+ \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{99}}
+ \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{100}}
+ \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{101}}
+ \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{102}}
+ \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{103}}
+ \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{104}}
+ \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{105}}
+ \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{106}}
+ \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{107}}
+ \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{108}}
+ \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{109}}
+ \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{110}}
+ \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{111}}
+ \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{112}}
+ \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{113}}
+ \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{114}}
+ \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{115}}
+ \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{116}}
+ \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{117}}
+ \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{118}}
+ \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{119}}
+ \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{120}}
+ \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{121}}
+ \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{122}}
+ \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{123}}
+ \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{124}}
+ \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{125}}
+ \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{126}}
+ \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{127}}
+ \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{128}}
+ \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{129}}
+ \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{130}}
+ \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{131}}
+ \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{132}}
+ \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{133}}
+ \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{134}}
+ \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{135}}
+ \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{136}}
+ \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{137}}
+ \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{138}}
+ \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{139}}
+ \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{140}}
+ \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{141}}
+ \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{142}}
+ \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{143}}
+ \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{144}}
+ \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{145}}
+ \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{146}}
+ \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{147}}
+ \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{148}}
+ \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{149}}
+ \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{150}}
+ \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{151}}
+ \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{152}}
+ \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{153}}
+ \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{154}}
+ \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{155}}
+ \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{156}}
+ \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{157}}
+ \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{158}}
+ \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{159}}
+ \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{160}}
+ \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{161}}
+ \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{162}}
+ \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{163}}
+ \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{164}}
+ \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{165}}
+ \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{166}}
+ \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{167}}
+ \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{168}}
+ \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{169}}
+ \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{170}}
+ \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{171}}
+ \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{172}}
+ \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{173}}
+ \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{174}}
+ \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{175}}
+ \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{176}}
+ \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{177}}
+ \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{178}}
+ \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{179}}
+ \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{180}}
+ \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{181}}
+ \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{182}}
+ \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{183}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{184}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{185}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{186}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{187}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{188}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{189}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{190}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{191}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{192}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{193}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{194}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{195}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{196}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{197}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{198}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{199}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{200}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{201}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{202}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{203}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{204}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{205}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{206}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{207}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{208}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{209}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{210}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{211}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{212}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{213}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{214}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{215}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{216}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{217}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{218}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{219}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{220}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{221}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{222}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{223}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{224}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{225}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{226}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{227}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{228}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{229}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{230}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{231}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{232}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{233}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{234}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{235}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{236}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{237}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{238}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{239}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{240}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{241}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{242}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{243}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{244}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{245}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapseven\symbol{246}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapseven\symbol{247}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapseven\symbol{248}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapseven\symbol{249}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapseven\symbol{250}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapseven\symbol{251}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapseven\symbol{252}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapseven\symbol{253}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapseven\symbol{254}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapseven\symbol{255}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{0}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{1}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{2}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{3}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{4}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{5}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{6}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{7}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{8}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{9}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{10}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{11}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{12}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{13}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{14}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{15}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{16}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{17}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{18}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{19}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{20}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{21}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{22}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{23}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{24}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{25}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{26}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{27}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{28}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{29}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{30}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{31}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{32}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{33}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{34}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{35}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{36}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{37}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{38}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{39}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{40}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{41}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{42}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{43}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{44}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{45}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{46}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{47}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{48}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{49}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{50}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{51}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{52}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{53}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{54}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{55}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{56}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{57}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{58}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{59}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{60}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{61}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{62}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{63}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{64}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{65}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{66}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{67}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{68}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{69}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{70}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{71}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{72}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{73}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{74}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{75}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{76}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{77}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{78}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{79}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{80}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{81}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{82}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{83}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{84}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{85}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{86}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{87}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{88}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{89}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{90}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{91}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{92}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{93}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{94}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{95}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{96}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{97}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{98}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{99}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{100}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{101}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{102}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{103}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{104}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{105}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{106}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{107}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{108}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{109}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{110}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{111}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{112}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{113}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{114}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{115}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{116}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{117}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{118}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{119}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{120}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{121}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{122}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{123}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{124}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{125}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{126}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{127}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{128}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{129}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{130}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{131}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{132}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{133}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{134}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{135}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{136}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{137}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{138}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{139}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{140}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{141}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{142}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{143}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{144}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{145}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{146}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{147}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{148}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{149}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{150}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{151}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{152}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{153}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{154}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{155}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{156}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{157}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{158}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{159}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{160}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{161}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{162}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{163}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{164}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{165}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{166}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{167}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{168}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{169}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{170}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{171}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{172}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{173}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{174}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{175}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{176}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{177}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{178}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{179}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{180}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{181}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{182}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{183}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{184}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{185}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{186}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{187}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{188}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{189}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{190}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{191}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{192}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{193}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{194}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{195}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{196}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{197}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{198}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{199}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{200}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{201}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{202}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{203}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{204}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{205}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{206}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{207}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{208}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{209}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{210}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{211}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{212}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{213}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{214}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{215}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{216}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{217}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{218}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{219}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{220}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{221}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{222}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{223}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{224}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{225}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{226}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{227}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{228}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{229}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{230}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{231}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{232}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{233}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{234}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{235}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{236}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{237}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{238}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{239}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{240}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{241}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{242}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{243}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapeight\symbol{244}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapeight\symbol{245}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapeight\symbol{246}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapeight\symbol{247}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapeight\symbol{248}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapeight\symbol{249}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapeight\symbol{250}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapeight\symbol{251}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapeight\symbol{252}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapeight\symbol{253}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapeight\symbol{254}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapeight\symbol{255}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{0}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{1}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{2}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{3}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{4}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{5}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{6}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{7}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{8}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{9}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{10}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{11}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{12}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{13}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{14}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{15}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{16}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{17}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{18}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{19}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{20}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{21}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{22}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{23}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{24}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{25}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{26}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{27}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{28}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{29}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{30}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{31}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{32}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{33}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{34}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{35}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{36}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{37}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{38}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{39}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{40}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{41}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{42}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{43}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{44}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{45}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{46}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{47}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{48}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{49}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{50}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{51}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{52}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{53}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{54}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{55}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{56}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{57}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{58}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{59}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{60}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{61}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{62}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{63}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{64}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{65}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{66}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{67}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{68}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{69}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{70}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{71}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{72}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{73}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{74}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{75}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{76}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{77}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{78}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{79}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{80}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{81}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{82}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{83}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{84}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{85}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{86}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{87}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{88}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{89}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{90}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{91}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{92}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{93}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{94}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{95}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{96}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{97}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{98}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{99}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{100}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{101}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{102}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{103}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{104}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{105}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{106}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{107}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{108}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{109}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{110}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{111}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{112}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{113}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{114}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{115}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{116}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{117}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{118}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{119}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{120}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{121}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{122}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{123}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{124}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{125}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{126}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{127}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{128}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{129}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{130}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{131}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{132}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{133}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{134}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{135}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{136}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{137}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{138}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{139}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{140}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{141}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{142}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{143}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{144}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{145}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{146}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{147}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{148}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{149}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{150}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{151}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{152}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{153}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{154}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{155}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{156}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{157}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{158}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{159}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{160}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{161}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{162}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{163}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{164}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{165}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{166}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{167}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{168}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{169}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{170}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{171}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{172}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{173}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{174}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{175}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{176}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{177}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{178}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{179}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{180}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{181}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{182}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{183}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{184}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{185}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{186}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{187}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{188}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{189}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{190}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{191}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{192}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{193}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{194}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{195}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{196}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{197}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{198}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{199}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{200}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{201}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{202}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{203}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{204}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{205}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{206}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{207}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{208}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{209}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{210}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{211}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{212}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{213}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{214}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{215}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{216}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{217}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{218}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{219}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{220}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{221}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{222}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{223}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{224}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{225}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{226}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{227}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{228}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{229}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{230}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{231}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{232}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{233}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{234}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{235}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{236}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{237}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{238}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{239}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{240}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{241}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{242}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{243}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{244}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{245}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{246}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{247}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{248}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmapnine\symbol{249}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmapnine\symbol{250}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmapnine\symbol{251}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmapnine\symbol{252}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmapnine\symbol{253}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmapnine\symbol{254}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmapnine\symbol{255}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{0}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{1}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{2}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{3}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{4}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{5}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{6}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{7}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{8}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{9}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{10}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{11}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{12}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{13}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{14}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{15}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{16}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{17}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{18}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{19}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{20}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{21}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{22}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{23}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{24}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{25}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{26}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{27}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{28}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{29}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{30}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{31}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{32}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{33}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{34}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{35}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{36}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{37}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{38}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{39}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{40}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{41}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{42}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{43}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{44}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{45}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{46}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{47}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{48}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{49}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{50}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{51}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{52}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{53}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{54}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{55}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{56}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{57}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{58}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{59}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{60}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{61}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{62}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{63}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{64}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{65}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{66}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{67}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{68}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{69}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{70}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{71}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{72}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{73}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{74}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{75}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{76}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{77}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{78}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{79}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{80}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{81}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{82}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{83}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{84}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{85}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{86}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{87}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{88}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{89}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{90}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{91}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{92}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{93}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{94}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{95}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{96}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{97}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{98}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{99}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{100}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{101}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{102}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{103}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{104}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{105}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{106}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{107}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{108}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{109}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{110}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{111}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{112}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{113}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{114}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{115}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{116}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{117}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{118}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{119}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{120}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{121}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{122}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{123}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{124}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{125}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{126}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{127}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{128}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{129}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{130}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{131}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{132}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{133}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{134}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{135}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{136}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{137}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{138}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{139}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{140}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{141}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{142}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{143}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{144}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{145}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{146}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{147}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{148}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{149}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{150}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{151}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{152}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{153}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{154}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{155}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{156}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{157}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{158}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{159}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{160}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{161}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{162}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{163}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{164}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{165}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{166}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{167}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{168}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{169}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{170}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{171}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{172}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{173}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{174}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{175}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{176}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{177}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{178}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{179}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{180}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{181}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{182}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{183}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{184}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{185}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{186}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{187}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{188}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{189}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{190}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{191}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{192}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{193}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{194}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{195}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{196}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{197}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{198}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{199}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{200}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{201}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{202}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{203}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{204}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{205}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{206}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{207}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{208}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{209}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{210}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{211}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{212}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{213}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{214}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{215}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{216}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{217}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{218}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{219}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{220}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{221}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{222}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{223}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{224}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{225}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{226}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{227}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{228}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{229}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{230}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{231}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{232}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{233}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{234}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{235}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{236}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{237}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{238}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{239}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{240}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{241}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{242}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{243}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{244}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{245}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{246}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{247}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{248}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponezero\symbol{249}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponezero\symbol{250}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponezero\symbol{251}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponezero\symbol{252}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponezero\symbol{253}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponezero\symbol{254}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponezero\symbol{255}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{0}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{1}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{2}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{3}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{4}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{5}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{6}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{7}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{8}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{9}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{10}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{11}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{12}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{13}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{14}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{15}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{16}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{17}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{18}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{19}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{20}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{21}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{22}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{23}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{24}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{25}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{26}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{27}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{28}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{29}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{30}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{31}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{32}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{33}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{34}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{35}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{36}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{37}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{38}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{39}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{40}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{41}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{42}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{43}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{44}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{45}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{46}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{47}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{48}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{49}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{50}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{51}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{52}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{53}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{54}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{55}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{56}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{57}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{58}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{59}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{60}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{61}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{62}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{63}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{64}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{65}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{66}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{67}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{68}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{69}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{70}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{71}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{72}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{73}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{74}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{75}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{76}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{77}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{78}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{79}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{80}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{81}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{82}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{83}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{84}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{85}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{86}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{87}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{88}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{89}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{90}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{91}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{92}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{93}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{94}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{95}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{96}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{97}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{98}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{99}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{100}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{101}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{102}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{103}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{104}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{105}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{106}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{107}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{108}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{109}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{110}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{111}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{112}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{113}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{114}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{115}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{116}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{117}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{118}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{119}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{120}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{121}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{122}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{123}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{124}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{125}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{126}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{127}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{128}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{129}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{130}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{131}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{132}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{133}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{134}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{135}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{136}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{137}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{138}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{139}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{140}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{141}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{142}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{143}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{144}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{145}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{146}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{147}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{148}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{149}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{150}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{151}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{152}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{153}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{154}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{155}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{156}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{157}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{158}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{159}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{160}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{161}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{162}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{163}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{164}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{165}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{166}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{167}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{168}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{169}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{170}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{171}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{172}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{173}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{174}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{175}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{176}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{177}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{178}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{179}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{180}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{181}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{182}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{183}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{184}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{185}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{186}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{187}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{188}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{189}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{190}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{191}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{192}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{193}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{194}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{195}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{196}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{197}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{198}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{199}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{200}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{201}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{202}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{203}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{204}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{205}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{206}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{207}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{208}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{209}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{210}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{211}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{212}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{213}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{214}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{215}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{216}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{217}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{218}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{219}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{220}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{221}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{222}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{223}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{224}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{225}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{226}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{227}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{228}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{229}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{230}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{231}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{232}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{233}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{234}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{235}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{236}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{237}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{238}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{239}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{240}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{241}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{242}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{243}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{244}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{245}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{246}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{247}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{248}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponeone\symbol{249}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponeone\symbol{250}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponeone\symbol{251}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponeone\symbol{252}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponeone\symbol{253}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponeone\symbol{254}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponeone\symbol{255}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{0}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{1}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{2}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{3}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{4}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{5}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{6}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{7}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{8}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{9}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{10}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{11}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{12}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{13}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{14}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{15}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{16}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{17}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{18}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{19}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{20}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{21}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{22}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{23}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{24}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{25}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{26}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{27}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{28}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{29}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{30}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{31}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{32}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{33}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{34}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{35}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{36}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{37}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{38}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{39}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{40}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{41}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{42}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{43}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{44}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{45}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{46}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{47}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{48}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{49}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{50}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{51}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{52}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{53}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{54}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{55}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{56}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{57}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{58}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{59}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{60}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{61}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{62}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{63}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{64}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{65}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{66}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{67}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{68}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{69}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{70}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{71}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{72}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{73}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{74}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{75}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{76}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{77}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{78}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{79}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{80}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{81}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{82}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{83}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{84}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{85}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{86}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{87}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{88}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{89}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{90}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{91}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{92}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{93}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{94}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{95}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{96}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{97}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{98}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{99}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{100}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{101}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{102}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{103}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{104}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{105}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{106}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{107}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{108}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{109}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{110}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{111}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{112}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{113}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{114}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{115}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{116}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{117}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{118}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{119}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{120}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{121}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{122}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{123}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{124}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{125}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{126}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{127}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{128}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{129}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{130}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{131}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{132}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{133}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{134}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{135}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{136}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{137}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{138}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{139}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{140}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{141}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{142}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{143}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{144}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{145}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{146}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{147}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{148}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{149}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{150}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{151}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{152}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{153}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{154}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{155}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{156}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{157}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{158}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{159}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{160}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{161}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{162}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{163}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{164}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{165}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{166}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{167}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{168}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{169}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{170}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{171}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{172}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{173}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{174}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{175}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{176}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{177}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{178}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{179}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{180}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{181}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{182}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{183}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{184}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{185}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{186}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{187}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{188}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{189}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{190}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{191}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{192}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{193}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{194}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{195}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{196}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{197}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{198}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{199}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{200}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{201}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{202}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{203}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{204}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{205}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{206}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{207}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{208}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{209}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{210}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{211}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{212}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{213}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{214}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{215}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{216}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{217}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{218}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{219}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{220}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{221}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{222}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{223}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{224}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{225}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{226}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{227}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{228}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{229}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{230}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{231}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{232}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{233}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{234}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{235}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{236}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{237}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{238}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{239}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{240}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{241}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{242}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{243}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{244}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{245}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{246}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{247}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{248}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponetwo\symbol{249}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponetwo\symbol{250}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponetwo\symbol{251}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponetwo\symbol{252}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponetwo\symbol{253}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponetwo\symbol{254}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponetwo\symbol{255}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{0}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{1}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{2}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{3}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{4}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{5}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{6}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{7}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{8}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{9}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{10}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{11}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{12}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{13}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{14}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{15}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{16}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{17}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{18}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{19}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{20}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{21}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{22}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{23}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{24}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{25}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{26}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{27}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{28}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{29}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{30}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{31}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{32}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{33}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{34}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{35}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{36}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{37}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{38}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{39}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{40}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{41}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{42}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{43}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{44}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{45}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{46}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{47}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{48}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{49}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{50}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{51}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{52}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{53}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{54}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{55}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{56}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{57}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{58}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{59}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{60}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{61}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{62}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{63}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{64}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{65}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{66}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{67}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{68}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{69}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{70}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{71}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{72}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{73}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{74}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{75}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{76}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{77}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{78}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{79}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{80}} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
index 51420df206f..7ff9b4ef295 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
@@ -300,2910 +300,2855 @@
\expandafter\def\csname simpleicon@awssecretsmanagericon\endcsname {\simpleiconsmap\symbol{"EB2B}}
\expandafter\def\csname simpleicon@awwwardsicon\endcsname {\simpleiconsmap\symbol{"EB2C}}
\expandafter\def\csname simpleicon@axiosicon\endcsname {\simpleiconsmap\symbol{"EB2D}}
- \expandafter\def\csname simpleicon@azureartifactsicon\endcsname {\simpleiconsmap\symbol{"EB2E}}
- \expandafter\def\csname simpleicon@azuredataexplorericon\endcsname {\simpleiconsmap\symbol{"EB2F}}
- \expandafter\def\csname simpleicon@azuredevopsicon\endcsname {\simpleiconsmap\symbol{"EB30}}
- \expandafter\def\csname simpleicon@azurefunctionsicon\endcsname {\simpleiconsmap\symbol{"EB31}}
- \expandafter\def\csname simpleicon@azurepipelinesicon\endcsname {\simpleiconsmap\symbol{"EB32}}
- \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmap\symbol{"EB33}}
- \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmap\symbol{"EB34}}
- \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmap\symbol{"EB35}}
- \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmap\symbol{"EB36}}
- \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmap\symbol{"EB37}}
- \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmap\symbol{"EB38}}
- \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmap\symbol{"EB39}}
- \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmap\symbol{"EB3A}}
- \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmap\symbol{"EB3B}}
- \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmap\symbol{"EB3C}}
- \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmap\symbol{"EB3D}}
- \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmap\symbol{"EB3E}}
- \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmap\symbol{"EB3F}}
- \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmap\symbol{"EB40}}
- \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmap\symbol{"EB41}}
- \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmap\symbol{"EB42}}
- \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmap\symbol{"EB43}}
- \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmap\symbol{"EB44}}
- \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmap\symbol{"EB45}}
- \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmap\symbol{"EB46}}
- \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmap\symbol{"EB47}}
- \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmap\symbol{"EB48}}
- \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmap\symbol{"EB49}}
- \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmap\symbol{"EB4A}}
- \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmap\symbol{"EB4B}}
- \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmap\symbol{"EB4C}}
- \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmap\symbol{"EB4D}}
- \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmap\symbol{"EB4E}}
- \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmap\symbol{"EB4F}}
- \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmap\symbol{"EB50}}
- \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmap\symbol{"EB51}}
- \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmap\symbol{"EB52}}
- \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmap\symbol{"EB53}}
- \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmap\symbol{"EB54}}
- \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmap\symbol{"EB55}}
- \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmap\symbol{"EB56}}
- \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmap\symbol{"EB57}}
- \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmap\symbol{"EB58}}
- \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmap\symbol{"EB59}}
- \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmap\symbol{"EB5A}}
- \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmap\symbol{"EB5B}}
- \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmap\symbol{"EB5C}}
- \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmap\symbol{"EB5D}}
- \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmap\symbol{"EB5E}}
- \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmap\symbol{"EB5F}}
- \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmap\symbol{"EB60}}
- \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmap\symbol{"EB61}}
- \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmap\symbol{"EB62}}
- \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmap\symbol{"EB63}}
- \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmap\symbol{"EB64}}
- \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmap\symbol{"EB65}}
- \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmap\symbol{"EB66}}
- \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmap\symbol{"EB67}}
- \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmap\symbol{"EB68}}
- \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmap\symbol{"EB69}}
- \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmap\symbol{"EB6A}}
- \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmap\symbol{"EB6B}}
- \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmap\symbol{"EB6C}}
- \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmap\symbol{"EB6D}}
- \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmap\symbol{"EB6E}}
- \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmap\symbol{"EB6F}}
- \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmap\symbol{"EB70}}
- \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmap\symbol{"EB71}}
- \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmap\symbol{"EB72}}
- \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmap\symbol{"EB73}}
- \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmap\symbol{"EB74}}
- \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmap\symbol{"EB75}}
- \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmap\symbol{"EB76}}
- \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmap\symbol{"EB77}}
- \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmap\symbol{"EB78}}
- \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmap\symbol{"EB79}}
- \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmap\symbol{"EB7A}}
- \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmap\symbol{"EB7B}}
- \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmap\symbol{"EB7C}}
- \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmap\symbol{"EB7D}}
- \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmap\symbol{"EB7E}}
- \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmap\symbol{"EB7F}}
- \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmap\symbol{"EB80}}
- \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmap\symbol{"EB81}}
- \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmap\symbol{"EB82}}
- \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmap\symbol{"EB83}}
- \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmap\symbol{"EB84}}
- \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmap\symbol{"EB85}}
- \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmap\symbol{"EB86}}
- \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmap\symbol{"EB87}}
- \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmap\symbol{"EB88}}
- \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmap\symbol{"EB89}}
- \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmap\symbol{"EB8A}}
- \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmap\symbol{"EB8B}}
- \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmap\symbol{"EB8C}}
- \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmap\symbol{"EB8D}}
- \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmap\symbol{"EB8E}}
- \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmap\symbol{"EB8F}}
- \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmap\symbol{"EB90}}
- \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmap\symbol{"EB91}}
- \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmap\symbol{"EB92}}
- \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmap\symbol{"EB93}}
- \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmap\symbol{"EB94}}
- \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmap\symbol{"EB95}}
- \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmap\symbol{"EB96}}
- \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmap\symbol{"EB97}}
- \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmap\symbol{"EB98}}
- \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmap\symbol{"EB99}}
- \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmap\symbol{"EB9A}}
- \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmap\symbol{"EB9B}}
- \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmap\symbol{"EB9C}}
- \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmap\symbol{"EB9D}}
- \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmap\symbol{"EB9E}}
- \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmap\symbol{"EB9F}}
- \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmap\symbol{"EBA0}}
- \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmap\symbol{"EBA1}}
- \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmap\symbol{"EBA2}}
- \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmap\symbol{"EBA3}}
- \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmap\symbol{"EBA4}}
- \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmap\symbol{"EBA5}}
- \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmap\symbol{"EBA6}}
- \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmap\symbol{"EBA7}}
- \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmap\symbol{"EBA8}}
- \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmap\symbol{"EBA9}}
- \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmap\symbol{"EBAA}}
- \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmap\symbol{"EBAB}}
- \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmap\symbol{"EBAC}}
- \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmap\symbol{"EBAD}}
- \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmap\symbol{"EBAE}}
- \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmap\symbol{"EBAF}}
- \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmap\symbol{"EBB0}}
- \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmap\symbol{"EBB1}}
- \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmap\symbol{"EBB2}}
- \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmap\symbol{"EBB3}}
- \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmap\symbol{"EBB4}}
- \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmap\symbol{"EBB5}}
- \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmap\symbol{"EBB6}}
- \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmap\symbol{"EBB7}}
- \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmap\symbol{"EBB8}}
- \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmap\symbol{"EBB9}}
- \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmap\symbol{"EBBA}}
- \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmap\symbol{"EBBB}}
- \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmap\symbol{"EBBC}}
- \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmap\symbol{"EBBD}}
- \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmap\symbol{"EBBE}}
- \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmap\symbol{"EBBF}}
- \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmap\symbol{"EBC0}}
- \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmap\symbol{"EBC1}}
- \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmap\symbol{"EBC2}}
- \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmap\symbol{"EBC3}}
- \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmap\symbol{"EBC4}}
- \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmap\symbol{"EBC5}}
- \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmap\symbol{"EBC6}}
- \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmap\symbol{"EBC7}}
- \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmap\symbol{"EBC8}}
- \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmap\symbol{"EBC9}}
- \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmap\symbol{"EBCA}}
- \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmap\symbol{"EBCB}}
- \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmap\symbol{"EBCC}}
- \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmap\symbol{"EBCD}}
- \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmap\symbol{"EBCE}}
- \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmap\symbol{"EBCF}}
- \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmap\symbol{"EBD0}}
- \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmap\symbol{"EBD1}}
- \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmap\symbol{"EBD2}}
- \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmap\symbol{"EBD3}}
- \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmap\symbol{"EBD4}}
- \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmap\symbol{"EBD5}}
- \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmap\symbol{"EBD6}}
- \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmap\symbol{"EBD7}}
- \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmap\symbol{"EBD8}}
- \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmap\symbol{"EBD9}}
- \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmap\symbol{"EBDA}}
- \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmap\symbol{"EBDB}}
- \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmap\symbol{"EBDC}}
- \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmap\symbol{"EBDD}}
- \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmap\symbol{"EBDE}}
- \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmap\symbol{"EBDF}}
- \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmap\symbol{"EBE0}}
- \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmap\symbol{"EBE1}}
- \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmap\symbol{"EBE2}}
- \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmap\symbol{"EBE3}}
- \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmap\symbol{"EBE4}}
- \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmap\symbol{"EBE5}}
- \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmap\symbol{"EBE6}}
- \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmap\symbol{"EBE7}}
- \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmap\symbol{"EBE8}}
- \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmap\symbol{"EBE9}}
- \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmap\symbol{"EBEA}}
- \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmap\symbol{"EBEB}}
- \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmap\symbol{"EBEC}}
- \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmap\symbol{"EBED}}
- \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmap\symbol{"EBEE}}
- \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmap\symbol{"EBEF}}
- \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmap\symbol{"EBF0}}
- \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmap\symbol{"EBF1}}
- \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmap\symbol{"EBF2}}
- \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmap\symbol{"EBF3}}
- \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmap\symbol{"EBF4}}
- \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmap\symbol{"EBF5}}
- \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmap\symbol{"EBF6}}
- \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmap\symbol{"EBF7}}
- \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmap\symbol{"EBF8}}
- \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmap\symbol{"EBF9}}
- \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmap\symbol{"EBFA}}
- \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmap\symbol{"EBFB}}
- \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmap\symbol{"EBFC}}
- \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmap\symbol{"EBFD}}
- \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmap\symbol{"EBFE}}
- \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmap\symbol{"EBFF}}
- \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmap\symbol{"EC00}}
- \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmap\symbol{"EC01}}
- \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmap\symbol{"EC02}}
- \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmap\symbol{"EC03}}
- \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmap\symbol{"EC04}}
- \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmap\symbol{"EC05}}
- \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmap\symbol{"EC06}}
- \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmap\symbol{"EC07}}
- \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmap\symbol{"EC08}}
- \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmap\symbol{"EC09}}
- \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmap\symbol{"EC0A}}
- \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmap\symbol{"EC0B}}
- \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmap\symbol{"EC0C}}
- \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmap\symbol{"EC0D}}
- \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmap\symbol{"EC0E}}
- \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmap\symbol{"EC0F}}
- \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmap\symbol{"EC10}}
- \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmap\symbol{"EC11}}
- \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmap\symbol{"EC12}}
- \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmap\symbol{"EC13}}
- \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmap\symbol{"EC14}}
- \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmap\symbol{"EC15}}
- \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmap\symbol{"EC16}}
- \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmap\symbol{"EC17}}
- \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmap\symbol{"EC18}}
- \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmap\symbol{"EC19}}
- \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmap\symbol{"EC1A}}
- \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmap\symbol{"EC1B}}
- \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmap\symbol{"EC1C}}
- \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmap\symbol{"EC1D}}
- \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmap\symbol{"EC1E}}
- \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmap\symbol{"EC1F}}
- \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmap\symbol{"EC20}}
- \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmap\symbol{"EC21}}
- \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmap\symbol{"EC22}}
- \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmap\symbol{"EC23}}
- \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmap\symbol{"EC24}}
- \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmap\symbol{"EC25}}
- \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmap\symbol{"EC26}}
- \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmap\symbol{"EC27}}
- \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmap\symbol{"EC28}}
- \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmap\symbol{"EC29}}
- \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmap\symbol{"EC2A}}
- \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmap\symbol{"EC2B}}
- \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmap\symbol{"EC2C}}
- \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmap\symbol{"EC2D}}
- \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmap\symbol{"EC2E}}
- \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmap\symbol{"EC2F}}
- \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmap\symbol{"EC30}}
- \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmap\symbol{"EC31}}
- \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmap\symbol{"EC32}}
- \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmap\symbol{"EC33}}
- \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmap\symbol{"EC34}}
- \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmap\symbol{"EC35}}
- \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmap\symbol{"EC36}}
- \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmap\symbol{"EC37}}
- \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmap\symbol{"EC38}}
- \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmap\symbol{"EC39}}
- \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmap\symbol{"EC3A}}
- \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmap\symbol{"EC3B}}
- \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmap\symbol{"EC3C}}
- \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmap\symbol{"EC3D}}
- \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmap\symbol{"EC3E}}
- \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmap\symbol{"EC3F}}
- \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmap\symbol{"EC40}}
- \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmap\symbol{"EC41}}
- \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmap\symbol{"EC42}}
- \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmap\symbol{"EC43}}
- \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmap\symbol{"EC44}}
- \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmap\symbol{"EC45}}
- \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmap\symbol{"EC46}}
- \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmap\symbol{"EC47}}
- \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmap\symbol{"EC48}}
- \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmap\symbol{"EC49}}
- \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmap\symbol{"EC4A}}
- \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmap\symbol{"EC4B}}
- \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmap\symbol{"EC4C}}
- \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmap\symbol{"EC4D}}
- \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmap\symbol{"EC4E}}
- \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmap\symbol{"EC4F}}
- \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmap\symbol{"EC50}}
- \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmap\symbol{"EC51}}
- \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmap\symbol{"EC52}}
- \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmap\symbol{"EC53}}
- \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmap\symbol{"EC54}}
- \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmap\symbol{"EC55}}
- \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmap\symbol{"EC56}}
- \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmap\symbol{"EC57}}
- \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmap\symbol{"EC58}}
- \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmap\symbol{"EC59}}
- \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmap\symbol{"EC5A}}
- \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmap\symbol{"EC5B}}
- \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmap\symbol{"EC5C}}
- \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmap\symbol{"EC5D}}
- \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmap\symbol{"EC5E}}
- \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmap\symbol{"EC5F}}
- \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmap\symbol{"EC60}}
- \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmap\symbol{"EC61}}
- \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmap\symbol{"EC62}}
- \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmap\symbol{"EC63}}
- \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmap\symbol{"EC64}}
- \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmap\symbol{"EC65}}
- \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmap\symbol{"EC66}}
- \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmap\symbol{"EC67}}
- \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmap\symbol{"EC68}}
- \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmap\symbol{"EC69}}
- \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmap\symbol{"EC6A}}
- \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmap\symbol{"EC6B}}
- \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmap\symbol{"EC6C}}
- \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmap\symbol{"EC6D}}
- \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmap\symbol{"EC6E}}
- \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmap\symbol{"EC6F}}
- \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmap\symbol{"EC70}}
- \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmap\symbol{"EC71}}
- \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmap\symbol{"EC72}}
- \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmap\symbol{"EC73}}
- \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmap\symbol{"EC74}}
- \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmap\symbol{"EC75}}
- \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmap\symbol{"EC76}}
- \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmap\symbol{"EC77}}
- \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmap\symbol{"EC78}}
- \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmap\symbol{"EC79}}
- \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmap\symbol{"EC7A}}
- \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmap\symbol{"EC7B}}
- \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmap\symbol{"EC7C}}
- \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmap\symbol{"EC7D}}
- \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmap\symbol{"EC7E}}
- \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmap\symbol{"EC7F}}
- \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmap\symbol{"EC80}}
- \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmap\symbol{"EC81}}
- \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmap\symbol{"EC82}}
- \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmap\symbol{"EC83}}
- \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmap\symbol{"EC84}}
- \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmap\symbol{"EC85}}
- \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmap\symbol{"EC86}}
- \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmap\symbol{"EC87}}
- \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmap\symbol{"EC88}}
- \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmap\symbol{"EC89}}
- \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmap\symbol{"EC8A}}
- \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmap\symbol{"EC8B}}
- \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmap\symbol{"EC8C}}
- \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmap\symbol{"EC8D}}
- \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmap\symbol{"EC8E}}
- \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmap\symbol{"EC8F}}
- \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmap\symbol{"EC90}}
- \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmap\symbol{"EC91}}
- \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmap\symbol{"EC92}}
- \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmap\symbol{"EC93}}
- \expandafter\def\csname simpleicon@csharpicon\endcsname {\simpleiconsmap\symbol{"EC94}}
- \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmap\symbol{"EC95}}
- \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmap\symbol{"EC96}}
- \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmap\symbol{"EC97}}
- \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmap\symbol{"EC98}}
- \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmap\symbol{"EC99}}
- \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmap\symbol{"EC9A}}
- \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmap\symbol{"EC9B}}
- \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmap\symbol{"EC9C}}
- \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmap\symbol{"EC9D}}
- \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmap\symbol{"EC9E}}
- \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmap\symbol{"EC9F}}
- \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmap\symbol{"ECA0}}
- \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmap\symbol{"ECA1}}
- \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmap\symbol{"ECA2}}
- \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmap\symbol{"ECA3}}
- \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmap\symbol{"ECA4}}
- \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmap\symbol{"ECA5}}
- \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmap\symbol{"ECA6}}
- \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmap\symbol{"ECA7}}
- \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmap\symbol{"ECA8}}
- \expandafter\def\csname simpleicon@daimlericon\endcsname {\simpleiconsmap\symbol{"ECA9}}
- \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmap\symbol{"ECAA}}
- \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmap\symbol{"ECAB}}
- \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmap\symbol{"ECAC}}
- \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmap\symbol{"ECAD}}
- \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmap\symbol{"ECAE}}
- \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmap\symbol{"ECAF}}
- \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmap\symbol{"ECB0}}
- \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmap\symbol{"ECB1}}
- \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmap\symbol{"ECB2}}
- \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmap\symbol{"ECB3}}
- \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmap\symbol{"ECB4}}
- \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmap\symbol{"ECB5}}
- \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmap\symbol{"ECB6}}
- \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmap\symbol{"ECB7}}
- \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmap\symbol{"ECB8}}
- \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmap\symbol{"ECB9}}
- \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmap\symbol{"ECBA}}
- \expandafter\def\csname simpleicon@dataverseicon\endcsname {\simpleiconsmap\symbol{"ECBB}}
- \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmap\symbol{"ECBC}}
- \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmap\symbol{"ECBD}}
- \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmap\symbol{"ECBE}}
- \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmap\symbol{"ECBF}}
- \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmap\symbol{"ECC0}}
- \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmap\symbol{"ECC1}}
- \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmap\symbol{"ECC2}}
- \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmap\symbol{"ECC3}}
- \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmap\symbol{"ECC4}}
- \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmap\symbol{"ECC5}}
- \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmap\symbol{"ECC6}}
- \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmap\symbol{"ECC7}}
- \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmap\symbol{"ECC8}}
- \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmap\symbol{"ECC9}}
- \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmap\symbol{"ECCA}}
- \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmap\symbol{"ECCB}}
- \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmap\symbol{"ECCC}}
- \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmap\symbol{"ECCD}}
- \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmap\symbol{"ECCE}}
- \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmap\symbol{"ECCF}}
- \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmap\symbol{"ECD0}}
- \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmap\symbol{"ECD1}}
- \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmap\symbol{"ECD2}}
- \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmap\symbol{"ECD3}}
- \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmap\symbol{"ECD4}}
- \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmap\symbol{"ECD5}}
- \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmap\symbol{"ECD6}}
- \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmap\symbol{"ECD7}}
- \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmap\symbol{"ECD8}}
- \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmap\symbol{"ECD9}}
- \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmap\symbol{"ECDA}}
- \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmap\symbol{"ECDB}}
- \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmap\symbol{"ECDC}}
- \expandafter\def\csname simpleicon@designernewsicon\endcsname {\simpleiconsmap\symbol{"ECDD}}
- \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmap\symbol{"ECDE}}
- \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmap\symbol{"ECDF}}
- \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmap\symbol{"ECE0}}
- \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmap\symbol{"ECE1}}
- \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmap\symbol{"ECE2}}
- \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmap\symbol{"ECE3}}
- \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmap\symbol{"ECE4}}
- \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmap\symbol{"ECE5}}
- \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmap\symbol{"ECE6}}
- \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmap\symbol{"ECE7}}
- \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmap\symbol{"ECE8}}
- \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmap\symbol{"ECE9}}
- \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmap\symbol{"ECEA}}
- \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmap\symbol{"ECEB}}
- \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmap\symbol{"ECEC}}
- \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmap\symbol{"ECED}}
- \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmap\symbol{"ECEE}}
- \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmap\symbol{"ECEF}}
- \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmap\symbol{"ECF0}}
- \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmap\symbol{"ECF1}}
- \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmap\symbol{"ECF2}}
- \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmap\symbol{"ECF3}}
- \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmap\symbol{"ECF4}}
- \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmap\symbol{"ECF5}}
- \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmap\symbol{"ECF6}}
- \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmap\symbol{"ECF7}}
- \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmap\symbol{"ECF8}}
- \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmap\symbol{"ECF9}}
- \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmap\symbol{"ECFA}}
- \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmap\symbol{"ECFB}}
- \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmap\symbol{"ECFC}}
- \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmap\symbol{"ECFD}}
- \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmap\symbol{"ECFE}}
- \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmap\symbol{"ECFF}}
- \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmap\symbol{"ED00}}
- \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmap\symbol{"ED01}}
- \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmap\symbol{"ED02}}
- \expandafter\def\csname simpleicon@docusignicon\endcsname {\simpleiconsmap\symbol{"ED03}}
- \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmap\symbol{"ED04}}
- \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmap\symbol{"ED05}}
- \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmap\symbol{"ED06}}
- \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmap\symbol{"ED07}}
- \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmap\symbol{"ED08}}
- \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmap\symbol{"ED09}}
- \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmap\symbol{"ED0A}}
- \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmap\symbol{"ED0B}}
- \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmap\symbol{"ED0C}}
- \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmap\symbol{"ED0D}}
- \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmap\symbol{"ED0E}}
- \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmap\symbol{"ED0F}}
- \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmap\symbol{"ED10}}
- \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmap\symbol{"ED11}}
- \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmap\symbol{"ED12}}
- \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmap\symbol{"ED13}}
- \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmap\symbol{"ED14}}
- \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmap\symbol{"ED15}}
- \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmap\symbol{"ED16}}
- \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmap\symbol{"ED17}}
- \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmap\symbol{"ED18}}
- \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmap\symbol{"ED19}}
- \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmap\symbol{"ED1A}}
- \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmap\symbol{"ED1B}}
- \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmap\symbol{"ED1C}}
- \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmap\symbol{"ED1D}}
- \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmap\symbol{"ED1E}}
- \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmap\symbol{"ED1F}}
- \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmap\symbol{"ED20}}
- \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmap\symbol{"ED21}}
- \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmap\symbol{"ED22}}
- \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmap\symbol{"ED23}}
- \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmap\symbol{"ED24}}
- \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmap\symbol{"ED25}}
- \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmap\symbol{"ED26}}
- \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmap\symbol{"ED27}}
- \expandafter\def\csname simpleicon@dynamics365icon\endcsname {\simpleiconsmap\symbol{"ED28}}
- \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmap\symbol{"ED29}}
- \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmap\symbol{"ED2A}}
- \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmap\symbol{"ED2B}}
- \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmap\symbol{"ED2C}}
- \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmap\symbol{"ED2D}}
- \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmap\symbol{"ED2E}}
- \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmap\symbol{"ED2F}}
- \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmap\symbol{"ED30}}
- \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmap\symbol{"ED31}}
- \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmap\symbol{"ED32}}
- \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmap\symbol{"ED33}}
- \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmap\symbol{"ED34}}
- \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmap\symbol{"ED35}}
- \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmap\symbol{"ED36}}
- \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmap\symbol{"ED37}}
- \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmap\symbol{"ED38}}
- \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmap\symbol{"ED39}}
- \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmap\symbol{"ED3A}}
- \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmap\symbol{"ED3B}}
- \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmap\symbol{"ED3C}}
- \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmap\symbol{"ED3D}}
- \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmap\symbol{"ED3E}}
- \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmap\symbol{"ED3F}}
- \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmap\symbol{"ED40}}
- \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmap\symbol{"ED41}}
- \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmap\symbol{"ED42}}
- \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmap\symbol{"ED43}}
- \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmap\symbol{"ED44}}
- \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmap\symbol{"ED45}}
- \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmap\symbol{"ED46}}
- \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmap\symbol{"ED47}}
- \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmap\symbol{"ED48}}
- \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmap\symbol{"ED49}}
- \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmap\symbol{"ED4A}}
- \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmap\symbol{"ED4B}}
- \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmap\symbol{"ED4C}}
- \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmap\symbol{"ED4D}}
- \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmap\symbol{"ED4E}}
- \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmap\symbol{"ED4F}}
- \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmap\symbol{"ED50}}
- \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmap\symbol{"ED51}}
- \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmap\symbol{"ED52}}
- \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmap\symbol{"ED53}}
- \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmap\symbol{"ED54}}
- \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmap\symbol{"ED55}}
- \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmap\symbol{"ED56}}
- \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmap\symbol{"ED57}}
- \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmap\symbol{"ED58}}
- \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmap\symbol{"ED59}}
- \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmap\symbol{"ED5A}}
- \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmap\symbol{"ED5B}}
- \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmap\symbol{"ED5C}}
- \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmap\symbol{"ED5D}}
- \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmap\symbol{"ED5E}}
- \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmap\symbol{"ED5F}}
- \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmap\symbol{"ED60}}
- \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmap\symbol{"ED61}}
- \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmap\symbol{"ED62}}
- \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmap\symbol{"ED63}}
- \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmap\symbol{"ED64}}
- \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmap\symbol{"ED65}}
- \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmap\symbol{"ED66}}
- \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmap\symbol{"ED67}}
- \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmap\symbol{"ED68}}
- \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmap\symbol{"ED69}}
- \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmap\symbol{"ED6A}}
- \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmap\symbol{"ED6B}}
- \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmap\symbol{"ED6C}}
- \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmap\symbol{"ED6D}}
- \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmap\symbol{"ED6E}}
- \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmap\symbol{"ED6F}}
- \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmap\symbol{"ED70}}
- \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmap\symbol{"ED71}}
- \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmap\symbol{"ED72}}
- \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmap\symbol{"ED73}}
- \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmap\symbol{"ED74}}
- \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmap\symbol{"ED75}}
- \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmap\symbol{"ED76}}
- \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmap\symbol{"ED77}}
- \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmap\symbol{"ED78}}
- \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmap\symbol{"ED79}}
- \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmap\symbol{"ED7A}}
- \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmap\symbol{"ED7B}}
- \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmap\symbol{"ED7C}}
- \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmap\symbol{"ED7D}}
- \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmap\symbol{"ED7E}}
- \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmap\symbol{"ED7F}}
- \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmap\symbol{"ED80}}
- \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmap\symbol{"ED81}}
- \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmap\symbol{"ED82}}
- \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmap\symbol{"ED83}}
- \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmap\symbol{"ED84}}
- \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmap\symbol{"ED85}}
- \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmap\symbol{"ED86}}
- \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmap\symbol{"ED87}}
- \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmap\symbol{"ED88}}
- \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmap\symbol{"ED89}}
- \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmap\symbol{"ED8A}}
- \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmap\symbol{"ED8B}}
- \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmap\symbol{"ED8C}}
- \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmap\symbol{"ED8D}}
- \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmap\symbol{"ED8E}}
- \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmap\symbol{"ED8F}}
- \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmap\symbol{"ED90}}
- \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmap\symbol{"ED91}}
- \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmap\symbol{"ED92}}
- \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmap\symbol{"ED93}}
- \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmap\symbol{"ED94}}
- \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmap\symbol{"ED95}}
- \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmap\symbol{"ED96}}
- \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmap\symbol{"ED97}}
- \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmap\symbol{"ED98}}
- \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmap\symbol{"ED99}}
- \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmap\symbol{"ED9A}}
- \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmap\symbol{"ED9B}}
- \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmap\symbol{"ED9C}}
- \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmap\symbol{"ED9D}}
- \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmap\symbol{"ED9E}}
- \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmap\symbol{"ED9F}}
- \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmap\symbol{"EDA0}}
- \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmap\symbol{"EDA1}}
- \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmap\symbol{"EDA2}}
- \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmap\symbol{"EDA3}}
- \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmap\symbol{"EDA4}}
- \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmap\symbol{"EDA5}}
- \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmap\symbol{"EDA6}}
- \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmap\symbol{"EDA7}}
- \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmap\symbol{"EDA8}}
- \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmap\symbol{"EDA9}}
- \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmap\symbol{"EDAA}}
- \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmap\symbol{"EDAB}}
- \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmap\symbol{"EDAC}}
- \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmap\symbol{"EDAD}}
- \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmap\symbol{"EDAE}}
- \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmap\symbol{"EDAF}}
- \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmap\symbol{"EDB0}}
- \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmap\symbol{"EDB1}}
- \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmap\symbol{"EDB2}}
- \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmap\symbol{"EDB3}}
- \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmap\symbol{"EDB4}}
- \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmap\symbol{"EDB5}}
- \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmap\symbol{"EDB6}}
- \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmap\symbol{"EDB7}}
- \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmap\symbol{"EDB8}}
- \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmap\symbol{"EDB9}}
- \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmap\symbol{"EDBA}}
- \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmap\symbol{"EDBB}}
- \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmap\symbol{"EDBC}}
- \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmap\symbol{"EDBD}}
- \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmap\symbol{"EDBE}}
- \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmap\symbol{"EDBF}}
- \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmap\symbol{"EDC0}}
- \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmap\symbol{"EDC1}}
- \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmap\symbol{"EDC2}}
- \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmap\symbol{"EDC3}}
- \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmap\symbol{"EDC4}}
- \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmap\symbol{"EDC5}}
- \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmap\symbol{"EDC6}}
- \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmap\symbol{"EDC7}}
- \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmap\symbol{"EDC8}}
- \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmap\symbol{"EDC9}}
- \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmap\symbol{"EDCA}}
- \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmap\symbol{"EDCB}}
- \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmap\symbol{"EDCC}}
- \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmap\symbol{"EDCD}}
- \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmap\symbol{"EDCE}}
- \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmap\symbol{"EDCF}}
- \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmap\symbol{"EDD0}}
- \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmap\symbol{"EDD1}}
- \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmap\symbol{"EDD2}}
- \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmap\symbol{"EDD3}}
- \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmap\symbol{"EDD4}}
- \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmap\symbol{"EDD5}}
- \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmap\symbol{"EDD6}}
- \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmap\symbol{"EDD7}}
- \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmap\symbol{"EDD8}}
- \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmap\symbol{"EDD9}}
- \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmap\symbol{"EDDA}}
- \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmap\symbol{"EDDB}}
- \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmap\symbol{"EDDC}}
- \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmap\symbol{"EDDD}}
- \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmap\symbol{"EDDE}}
- \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmap\symbol{"EDDF}}
- \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmap\symbol{"EDE0}}
- \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmap\symbol{"EDE1}}
- \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmap\symbol{"EDE2}}
- \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmap\symbol{"EDE3}}
- \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmap\symbol{"EDE4}}
- \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmap\symbol{"EDE5}}
- \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmap\symbol{"EDE6}}
- \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmap\symbol{"EDE7}}
- \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmap\symbol{"EDE8}}
- \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmap\symbol{"EDE9}}
- \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmap\symbol{"EDEA}}
- \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmap\symbol{"EDEB}}
- \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmap\symbol{"EDEC}}
- \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmap\symbol{"EDED}}
- \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmap\symbol{"EDEE}}
- \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmap\symbol{"EDEF}}
- \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmap\symbol{"EDF0}}
- \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmap\symbol{"EDF1}}
- \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmap\symbol{"EDF2}}
- \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmap\symbol{"EDF3}}
- \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmap\symbol{"EDF4}}
- \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmap\symbol{"EDF5}}
- \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmap\symbol{"EDF6}}
- \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmap\symbol{"EDF7}}
- \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmap\symbol{"EDF8}}
- \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmap\symbol{"EDF9}}
- \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmap\symbol{"EDFA}}
- \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmap\symbol{"EDFB}}
- \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmap\symbol{"EDFC}}
- \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmap\symbol{"EDFD}}
- \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmap\symbol{"EDFE}}
- \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmap\symbol{"EDFF}}
- \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmap\symbol{"EE00}}
- \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmap\symbol{"EE01}}
- \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmap\symbol{"EE02}}
- \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmap\symbol{"EE03}}
- \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmap\symbol{"EE04}}
- \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmap\symbol{"EE05}}
- \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmap\symbol{"EE06}}
- \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmap\symbol{"EE07}}
- \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmap\symbol{"EE08}}
- \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmap\symbol{"EE09}}
- \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmap\symbol{"EE0A}}
- \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmap\symbol{"EE0B}}
- \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmap\symbol{"EE0C}}
- \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmap\symbol{"EE0D}}
- \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmap\symbol{"EE0E}}
- \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmap\symbol{"EE0F}}
- \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmap\symbol{"EE10}}
- \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmap\symbol{"EE11}}
- \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmap\symbol{"EE12}}
- \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmap\symbol{"EE13}}
- \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmap\symbol{"EE14}}
- \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmap\symbol{"EE15}}
- \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmap\symbol{"EE16}}
- \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmap\symbol{"EE17}}
- \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmap\symbol{"EE18}}
- \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmap\symbol{"EE19}}
- \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmap\symbol{"EE1A}}
- \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmap\symbol{"EE1B}}
- \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmap\symbol{"EE1C}}
- \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmap\symbol{"EE1D}}
- \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmap\symbol{"EE1E}}
- \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmap\symbol{"EE1F}}
- \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmap\symbol{"EE20}}
- \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmap\symbol{"EE21}}
- \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmap\symbol{"EE22}}
- \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmap\symbol{"EE23}}
- \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmap\symbol{"EE24}}
- \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmap\symbol{"EE25}}
- \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmap\symbol{"EE26}}
- \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmap\symbol{"EE27}}
- \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmap\symbol{"EE28}}
- \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmap\symbol{"EE29}}
- \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmap\symbol{"EE2A}}
- \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmap\symbol{"EE2B}}
- \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmap\symbol{"EE2C}}
- \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmap\symbol{"EE2D}}
- \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmap\symbol{"EE2E}}
- \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmap\symbol{"EE2F}}
- \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmap\symbol{"EE30}}
- \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmap\symbol{"EE31}}
- \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmap\symbol{"EE32}}
- \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmap\symbol{"EE33}}
- \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmap\symbol{"EE34}}
- \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmap\symbol{"EE35}}
- \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmap\symbol{"EE36}}
- \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmap\symbol{"EE37}}
- \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmap\symbol{"EE38}}
- \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmap\symbol{"EE39}}
- \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmap\symbol{"EE3A}}
- \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmap\symbol{"EE3B}}
- \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmap\symbol{"EE3C}}
- \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmap\symbol{"EE3D}}
- \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmap\symbol{"EE3E}}
- \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmap\symbol{"EE3F}}
- \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmap\symbol{"EE40}}
- \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmap\symbol{"EE41}}
- \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmap\symbol{"EE42}}
- \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmap\symbol{"EE43}}
- \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmap\symbol{"EE44}}
- \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmap\symbol{"EE45}}
- \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmap\symbol{"EE46}}
- \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmap\symbol{"EE47}}
- \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmap\symbol{"EE48}}
- \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmap\symbol{"EE49}}
- \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmap\symbol{"EE4A}}
- \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmap\symbol{"EE4B}}
- \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmap\symbol{"EE4C}}
- \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmap\symbol{"EE4D}}
- \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmap\symbol{"EE4E}}
- \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmap\symbol{"EE4F}}
- \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmap\symbol{"EE50}}
- \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmap\symbol{"EE51}}
- \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmap\symbol{"EE52}}
- \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmap\symbol{"EE53}}
- \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmap\symbol{"EE54}}
- \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmap\symbol{"EE55}}
- \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmap\symbol{"EE56}}
- \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmap\symbol{"EE57}}
- \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmap\symbol{"EE58}}
- \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmap\symbol{"EE59}}
- \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmap\symbol{"EE5A}}
- \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EE5B}}
- \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmap\symbol{"EE5C}}
- \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmap\symbol{"EE5D}}
- \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmap\symbol{"EE5E}}
- \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmap\symbol{"EE5F}}
- \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmap\symbol{"EE60}}
- \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmap\symbol{"EE61}}
- \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmap\symbol{"EE62}}
- \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmap\symbol{"EE63}}
- \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmap\symbol{"EE64}}
- \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmap\symbol{"EE65}}
- \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmap\symbol{"EE66}}
- \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmap\symbol{"EE67}}
- \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmap\symbol{"EE68}}
- \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmap\symbol{"EE69}}
- \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmap\symbol{"EE6A}}
- \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmap\symbol{"EE6B}}
- \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmap\symbol{"EE6C}}
- \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmap\symbol{"EE6D}}
- \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmap\symbol{"EE6E}}
- \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmap\symbol{"EE6F}}
- \expandafter\def\csname simpleicon@googledomainsicon\endcsname {\simpleiconsmap\symbol{"EE70}}
- \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmap\symbol{"EE71}}
- \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmap\symbol{"EE72}}
- \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmap\symbol{"EE73}}
- \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmap\symbol{"EE74}}
- \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmap\symbol{"EE75}}
- \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmap\symbol{"EE76}}
- \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmap\symbol{"EE77}}
- \expandafter\def\csname simpleicon@googlehangoutsicon\endcsname {\simpleiconsmap\symbol{"EE78}}
- \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmap\symbol{"EE79}}
- \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmap\symbol{"EE7A}}
- \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmap\symbol{"EE7B}}
- \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmap\symbol{"EE7C}}
- \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmap\symbol{"EE7D}}
- \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmap\symbol{"EE7E}}
- \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmap\symbol{"EE7F}}
- \expandafter\def\csname simpleicon@googlemybusinessicon\endcsname {\simpleiconsmap\symbol{"EE80}}
- \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmap\symbol{"EE81}}
- \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmap\symbol{"EE82}}
- \expandafter\def\csname simpleicon@googleoptimizeicon\endcsname {\simpleiconsmap\symbol{"EE83}}
- \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmap\symbol{"EE84}}
- \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmap\symbol{"EE85}}
- \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmap\symbol{"EE86}}
- \expandafter\def\csname simpleicon@googlepodcastsicon\endcsname {\simpleiconsmap\symbol{"EE87}}
- \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmap\symbol{"EE88}}
- \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmap\symbol{"EE89}}
- \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmap\symbol{"EE8A}}
- \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmap\symbol{"EE8B}}
- \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmap\symbol{"EE8C}}
- \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmap\symbol{"EE8D}}
- \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmap\symbol{"EE8E}}
- \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmap\symbol{"EE8F}}
- \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmap\symbol{"EE90}}
- \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmap\symbol{"EE91}}
- \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmap\symbol{"EE92}}
- \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmap\symbol{"EE93}}
- \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmap\symbol{"EE94}}
- \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmap\symbol{"EE95}}
- \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmap\symbol{"EE96}}
- \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmap\symbol{"EE97}}
- \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmap\symbol{"EE98}}
- \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmap\symbol{"EE99}}
- \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmap\symbol{"EE9A}}
- \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmap\symbol{"EE9B}}
- \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmap\symbol{"EE9C}}
- \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmap\symbol{"EE9D}}
- \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmap\symbol{"EE9E}}
- \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmap\symbol{"EE9F}}
- \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmap\symbol{"EEA0}}
- \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmap\symbol{"EEA1}}
- \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmap\symbol{"EEA2}}
- \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmap\symbol{"EEA3}}
- \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmap\symbol{"EEA4}}
- \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmap\symbol{"EEA5}}
- \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmap\symbol{"EEA6}}
- \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmap\symbol{"EEA7}}
- \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmap\symbol{"EEA8}}
- \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmap\symbol{"EEA9}}
- \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmap\symbol{"EEAA}}
- \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmap\symbol{"EEAB}}
- \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmap\symbol{"EEAC}}
- \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmap\symbol{"EEAD}}
- \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmap\symbol{"EEAE}}
- \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmap\symbol{"EEAF}}
- \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmap\symbol{"EEB0}}
- \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmap\symbol{"EEB1}}
- \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmap\symbol{"EEB2}}
- \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmap\symbol{"EEB3}}
- \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmap\symbol{"EEB4}}
- \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmap\symbol{"EEB5}}
- \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmap\symbol{"EEB6}}
- \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmap\symbol{"EEB7}}
- \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmap\symbol{"EEB8}}
- \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmap\symbol{"EEB9}}
- \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmap\symbol{"EEBA}}
- \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmap\symbol{"EEBB}}
- \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmap\symbol{"EEBC}}
- \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmap\symbol{"EEBD}}
- \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmap\symbol{"EEBE}}
- \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmap\symbol{"EEBF}}
- \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmap\symbol{"EEC0}}
- \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmap\symbol{"EEC1}}
- \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmap\symbol{"EEC2}}
- \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmap\symbol{"EEC3}}
- \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmap\symbol{"EEC4}}
- \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmap\symbol{"EEC5}}
- \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmap\symbol{"EEC6}}
- \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmap\symbol{"EEC7}}
- \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmap\symbol{"EEC8}}
- \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmap\symbol{"EEC9}}
- \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmap\symbol{"EECA}}
- \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmap\symbol{"EECB}}
- \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmap\symbol{"EECC}}
- \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmap\symbol{"EECD}}
- \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmap\symbol{"EECE}}
- \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmap\symbol{"EECF}}
- \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmap\symbol{"EED0}}
- \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmap\symbol{"EED1}}
- \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmap\symbol{"EED2}}
- \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmap\symbol{"EED3}}
- \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmap\symbol{"EED4}}
- \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmap\symbol{"EED5}}
- \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmap\symbol{"EED6}}
- \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmap\symbol{"EED7}}
- \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmap\symbol{"EED8}}
- \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmap\symbol{"EED9}}
- \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmap\symbol{"EEDA}}
- \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmap\symbol{"EEDB}}
- \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmap\symbol{"EEDC}}
- \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmap\symbol{"EEDD}}
- \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmap\symbol{"EEDE}}
- \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmap\symbol{"EEDF}}
- \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmap\symbol{"EEE0}}
- \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmap\symbol{"EEE1}}
- \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmap\symbol{"EEE2}}
- \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmap\symbol{"EEE3}}
- \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmap\symbol{"EEE4}}
- \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmap\symbol{"EEE5}}
- \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmap\symbol{"EEE6}}
- \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmap\symbol{"EEE7}}
- \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmap\symbol{"EEE8}}
- \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmap\symbol{"EEE9}}
- \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmap\symbol{"EEEA}}
- \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmap\symbol{"EEEB}}
- \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmap\symbol{"EEEC}}
- \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmap\symbol{"EEED}}
- \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmap\symbol{"EEEE}}
- \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmap\symbol{"EEEF}}
- \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmap\symbol{"EEF0}}
- \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmap\symbol{"EEF1}}
- \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmap\symbol{"EEF2}}
- \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmap\symbol{"EEF3}}
- \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmap\symbol{"EEF4}}
- \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmap\symbol{"EEF5}}
- \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmap\symbol{"EEF6}}
- \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmap\symbol{"EEF7}}
- \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmap\symbol{"EEF8}}
- \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmap\symbol{"EEF9}}
- \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmap\symbol{"EEFA}}
- \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmap\symbol{"EEFB}}
- \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmap\symbol{"EEFC}}
- \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmap\symbol{"EEFD}}
- \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmap\symbol{"EEFE}}
- \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmap\symbol{"EEFF}}
- \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmap\symbol{"EF00}}
- \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmap\symbol{"EF01}}
- \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmap\symbol{"EF02}}
- \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmap\symbol{"EF03}}
- \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmap\symbol{"EF04}}
- \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmap\symbol{"EF05}}
- \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmap\symbol{"EF06}}
- \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmap\symbol{"EF07}}
- \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmap\symbol{"EF08}}
- \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmap\symbol{"EF09}}
- \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmap\symbol{"EF0A}}
- \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmap\symbol{"EF0B}}
- \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmap\symbol{"EF0C}}
- \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmap\symbol{"EF0D}}
- \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmap\symbol{"EF0E}}
- \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmap\symbol{"EF0F}}
- \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmap\symbol{"EF10}}
- \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmap\symbol{"EF11}}
- \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmap\symbol{"EF12}}
- \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmap\symbol{"EF13}}
- \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmap\symbol{"EF14}}
- \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmap\symbol{"EF15}}
- \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmap\symbol{"EF16}}
- \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmap\symbol{"EF17}}
- \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmap\symbol{"EF18}}
- \expandafter\def\csname simpleicon@ibmicon\endcsname {\simpleiconsmap\symbol{"EF19}}
- \expandafter\def\csname simpleicon@ibmcloudicon\endcsname {\simpleiconsmap\symbol{"EF1A}}
- \expandafter\def\csname simpleicon@ibmwatsonicon\endcsname {\simpleiconsmap\symbol{"EF1B}}
- \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmap\symbol{"EF1C}}
- \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmap\symbol{"EF1D}}
- \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmap\symbol{"EF1E}}
- \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmap\symbol{"EF1F}}
- \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmap\symbol{"EF20}}
- \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmap\symbol{"EF21}}
- \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmap\symbol{"EF22}}
- \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmap\symbol{"EF23}}
- \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmap\symbol{"EF24}}
- \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmap\symbol{"EF25}}
- \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmap\symbol{"EF26}}
- \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmap\symbol{"EF27}}
- \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmap\symbol{"EF28}}
- \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmap\symbol{"EF29}}
- \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmap\symbol{"EF2A}}
- \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmap\symbol{"EF2B}}
- \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmap\symbol{"EF2C}}
- \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmap\symbol{"EF2D}}
- \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmap\symbol{"EF2E}}
- \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmap\symbol{"EF2F}}
- \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmap\symbol{"EF30}}
- \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmap\symbol{"EF31}}
- \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmap\symbol{"EF32}}
- \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmap\symbol{"EF33}}
- \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmap\symbol{"EF34}}
- \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmap\symbol{"EF35}}
- \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmap\symbol{"EF36}}
- \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmap\symbol{"EF37}}
- \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmap\symbol{"EF38}}
- \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmap\symbol{"EF39}}
- \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmap\symbol{"EF3A}}
- \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmap\symbol{"EF3B}}
- \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmap\symbol{"EF3C}}
- \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmap\symbol{"EF3D}}
- \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmap\symbol{"EF3E}}
- \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmap\symbol{"EF3F}}
- \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmap\symbol{"EF40}}
- \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmap\symbol{"EF41}}
- \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmap\symbol{"EF42}}
- \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmap\symbol{"EF43}}
- \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmap\symbol{"EF44}}
- \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmap\symbol{"EF45}}
- \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmap\symbol{"EF46}}
- \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmap\symbol{"EF47}}
- \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmap\symbol{"EF48}}
- \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmap\symbol{"EF49}}
- \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmap\symbol{"EF4A}}
- \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmap\symbol{"EF4B}}
- \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmap\symbol{"EF4C}}
- \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmap\symbol{"EF4D}}
- \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmap\symbol{"EF4E}}
- \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmap\symbol{"EF4F}}
- \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmap\symbol{"EF50}}
- \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmap\symbol{"EF51}}
- \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmap\symbol{"EF52}}
- \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmap\symbol{"EF53}}
- \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmap\symbol{"EF54}}
- \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmap\symbol{"EF55}}
- \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmap\symbol{"EF56}}
- \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmap\symbol{"EF57}}
- \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmap\symbol{"EF58}}
- \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmap\symbol{"EF59}}
- \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmap\symbol{"EF5A}}
- \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmap\symbol{"EF5B}}
- \expandafter\def\csname simpleicon@internetexplorericon\endcsname {\simpleiconsmap\symbol{"EF5C}}
- \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmap\symbol{"EF5D}}
- \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmap\symbol{"EF5E}}
- \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmap\symbol{"EF5F}}
- \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmap\symbol{"EF60}}
- \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmap\symbol{"EF61}}
- \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmap\symbol{"EF62}}
- \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmap\symbol{"EF63}}
- \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmap\symbol{"EF64}}
- \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmap\symbol{"EF65}}
- \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmap\symbol{"EF66}}
- \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmap\symbol{"EF67}}
- \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmap\symbol{"EF68}}
- \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmap\symbol{"EF69}}
- \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmap\symbol{"EF6A}}
- \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmap\symbol{"EF6B}}
- \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmap\symbol{"EF6C}}
- \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmap\symbol{"EF6D}}
- \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmap\symbol{"EF6E}}
- \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmap\symbol{"EF6F}}
- \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmap\symbol{"EF70}}
- \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmap\symbol{"EF71}}
- \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmap\symbol{"EF72}}
- \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmap\symbol{"EF73}}
- \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmap\symbol{"EF74}}
- \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmap\symbol{"EF75}}
- \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmap\symbol{"EF76}}
- \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmap\symbol{"EF77}}
- \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmap\symbol{"EF78}}
- \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmap\symbol{"EF79}}
- \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmap\symbol{"EF7A}}
- \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmap\symbol{"EF7B}}
- \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmap\symbol{"EF7C}}
- \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmap\symbol{"EF7D}}
- \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmap\symbol{"EF7E}}
- \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmap\symbol{"EF7F}}
- \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmap\symbol{"EF80}}
- \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmap\symbol{"EF81}}
- \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmap\symbol{"EF82}}
- \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmap\symbol{"EF83}}
- \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmap\symbol{"EF84}}
- \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmap\symbol{"EF85}}
- \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmap\symbol{"EF86}}
- \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmap\symbol{"EF87}}
- \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmap\symbol{"EF88}}
- \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmap\symbol{"EF89}}
- \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmap\symbol{"EF8A}}
- \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmap\symbol{"EF8B}}
- \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmap\symbol{"EF8C}}
- \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmap\symbol{"EF8D}}
- \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmap\symbol{"EF8E}}
- \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmap\symbol{"EF8F}}
- \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmap\symbol{"EF90}}
- \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmap\symbol{"EF91}}
- \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmap\symbol{"EF92}}
- \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmap\symbol{"EF93}}
- \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmap\symbol{"EF94}}
- \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmap\symbol{"EF95}}
- \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmap\symbol{"EF96}}
- \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmap\symbol{"EF97}}
- \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmap\symbol{"EF98}}
- \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmap\symbol{"EF99}}
- \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmap\symbol{"EF9A}}
- \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmap\symbol{"EF9B}}
- \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmap\symbol{"EF9C}}
- \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmap\symbol{"EF9D}}
- \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmap\symbol{"EF9E}}
- \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmap\symbol{"EF9F}}
- \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmap\symbol{"EFA0}}
- \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmap\symbol{"EFA1}}
- \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmap\symbol{"EFA2}}
- \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmap\symbol{"EFA3}}
- \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmap\symbol{"EFA4}}
- \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmap\symbol{"EFA5}}
- \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmap\symbol{"EFA6}}
- \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmap\symbol{"EFA7}}
- \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmap\symbol{"EFA8}}
- \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmap\symbol{"EFA9}}
- \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmap\symbol{"EFAA}}
- \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmap\symbol{"EFAB}}
- \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmap\symbol{"EFAC}}
- \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmap\symbol{"EFAD}}
- \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmap\symbol{"EFAE}}
- \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmap\symbol{"EFAF}}
- \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmap\symbol{"EFB0}}
- \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmap\symbol{"EFB1}}
- \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmap\symbol{"EFB2}}
- \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmap\symbol{"EFB3}}
- \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmap\symbol{"EFB4}}
- \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmap\symbol{"EFB5}}
- \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmap\symbol{"EFB6}}
- \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmap\symbol{"EFB7}}
- \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmap\symbol{"EFB8}}
- \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmap\symbol{"EFB9}}
- \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmap\symbol{"EFBA}}
- \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmap\symbol{"EFBB}}
- \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmap\symbol{"EFBC}}
- \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmap\symbol{"EFBD}}
- \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmap\symbol{"EFBE}}
- \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmap\symbol{"EFBF}}
- \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmap\symbol{"EFC0}}
- \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmap\symbol{"EFC1}}
- \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmap\symbol{"EFC2}}
- \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmap\symbol{"EFC3}}
- \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmap\symbol{"EFC4}}
- \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmap\symbol{"EFC5}}
- \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmap\symbol{"EFC6}}
- \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmap\symbol{"EFC7}}
- \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmap\symbol{"EFC8}}
- \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmap\symbol{"EFC9}}
- \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmap\symbol{"EFCA}}
- \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmap\symbol{"EFCB}}
- \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmap\symbol{"EFCC}}
- \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmap\symbol{"EFCD}}
- \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmap\symbol{"EFCE}}
- \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmap\symbol{"EFCF}}
- \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmap\symbol{"EFD0}}
- \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmap\symbol{"EFD1}}
- \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmap\symbol{"EFD2}}
- \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmap\symbol{"EFD3}}
- \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmap\symbol{"EFD4}}
- \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmap\symbol{"EFD5}}
- \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmap\symbol{"EFD6}}
- \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmap\symbol{"EFD7}}
- \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmap\symbol{"EFD8}}
- \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmap\symbol{"EFD9}}
- \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmap\symbol{"EFDA}}
- \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmap\symbol{"EFDB}}
- \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmap\symbol{"EFDC}}
- \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmap\symbol{"EFDD}}
- \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmap\symbol{"EFDE}}
- \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmap\symbol{"EFDF}}
- \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmap\symbol{"EFE0}}
- \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmap\symbol{"EFE1}}
- \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmap\symbol{"EFE2}}
- \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmap\symbol{"EFE3}}
- \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmap\symbol{"EFE4}}
- \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmap\symbol{"EFE5}}
- \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmap\symbol{"EFE6}}
- \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmap\symbol{"EFE7}}
- \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmap\symbol{"EFE8}}
- \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmap\symbol{"EFE9}}
- \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmap\symbol{"EFEA}}
- \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmap\symbol{"EFEB}}
- \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmap\symbol{"EFEC}}
- \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmap\symbol{"EFED}}
- \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmap\symbol{"EFEE}}
- \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmap\symbol{"EFEF}}
- \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmap\symbol{"EFF0}}
- \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmap\symbol{"EFF1}}
- \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmap\symbol{"EFF2}}
- \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmap\symbol{"EFF3}}
- \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmap\symbol{"EFF4}}
- \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmap\symbol{"EFF5}}
- \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmap\symbol{"EFF6}}
- \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmap\symbol{"EFF7}}
- \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFF8}}
- \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFF9}}
- \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFFA}}
- \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFFB}}
- \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFFC}}
- \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFFD}}
- \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFFE}}
- \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFFF}}
- \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"F000}}
- \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"F001}}
- \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"F002}}
- \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"F003}}
- \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"F004}}
- \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"F005}}
- \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"F006}}
- \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"F007}}
- \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"F008}}
- \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"F009}}
- \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"F00A}}
- \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"F00B}}
- \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"F00C}}
- \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"F00D}}
- \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"F00E}}
- \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"F00F}}
- \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"F010}}
- \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"F011}}
- \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F012}}
- \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F013}}
- \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F014}}
- \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F015}}
- \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F016}}
- \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F017}}
- \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F018}}
- \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F019}}
- \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F01A}}
- \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F01B}}
- \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F01C}}
- \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F01D}}
- \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F01E}}
- \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F01F}}
- \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F020}}
- \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F021}}
- \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F022}}
- \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F023}}
- \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F024}}
- \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F025}}
- \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F026}}
- \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F027}}
- \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F028}}
- \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F029}}
- \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F02A}}
- \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F02B}}
- \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F02C}}
- \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F02D}}
- \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F02E}}
- \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F02F}}
- \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F030}}
- \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F031}}
- \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F032}}
- \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F033}}
- \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F034}}
- \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F035}}
- \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F036}}
- \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F037}}
- \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F038}}
- \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F039}}
- \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F03A}}
- \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F03B}}
- \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F03C}}
- \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F03D}}
- \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F03E}}
- \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F03F}}
- \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F040}}
- \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F041}}
- \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F042}}
- \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F043}}
- \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F044}}
- \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F045}}
- \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F046}}
- \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F047}}
- \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F048}}
- \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F049}}
- \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F04A}}
- \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F04B}}
- \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F04C}}
- \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F04D}}
- \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F04E}}
- \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F04F}}
- \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F050}}
- \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F051}}
- \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F052}}
- \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F053}}
- \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F054}}
- \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F055}}
- \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F056}}
- \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F057}}
- \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F058}}
- \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F059}}
- \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F05A}}
- \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F05B}}
- \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F05C}}
- \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F05D}}
- \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F05E}}
- \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F05F}}
- \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F060}}
- \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F061}}
- \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F062}}
- \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F063}}
- \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F064}}
- \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F065}}
- \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F066}}
- \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F067}}
- \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F068}}
- \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F069}}
- \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F06A}}
- \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F06B}}
- \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F06C}}
- \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F06D}}
- \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F06E}}
- \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F06F}}
- \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F070}}
- \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F071}}
- \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F072}}
- \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F073}}
- \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F074}}
- \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F075}}
- \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F076}}
- \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F077}}
- \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F078}}
- \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F079}}
- \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F07A}}
- \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F07B}}
- \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F07C}}
- \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F07D}}
- \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F07E}}
- \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F07F}}
- \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F080}}
- \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F081}}
- \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F082}}
- \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F083}}
- \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F084}}
- \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F085}}
- \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F086}}
- \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F087}}
- \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F088}}
- \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F089}}
- \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F08A}}
- \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F08B}}
- \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F08C}}
- \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F08D}}
- \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F08E}}
- \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F08F}}
- \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F090}}
- \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F091}}
- \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F092}}
- \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F093}}
- \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F094}}
- \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F095}}
- \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F096}}
- \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F097}}
- \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F098}}
- \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F099}}
- \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F09A}}
- \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F09B}}
- \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F09C}}
- \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F09D}}
- \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F09E}}
- \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F09F}}
- \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F0A0}}
- \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F0A1}}
- \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F0A2}}
- \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F0A3}}
- \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F0A4}}
- \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F0A5}}
- \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F0A6}}
- \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F0A7}}
- \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F0A8}}
- \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F0A9}}
- \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F0AA}}
- \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F0AB}}
- \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F0AC}}
- \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F0AD}}
- \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F0AE}}
- \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F0AF}}
- \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F0B0}}
- \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F0B1}}
- \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0B2}}
- \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0B3}}
- \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0B4}}
- \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0B5}}
- \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0B6}}
- \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0B7}}
- \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0B8}}
- \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0B9}}
- \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0BA}}
- \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0BB}}
- \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0BC}}
- \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0BD}}
- \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0BE}}
- \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0BF}}
- \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0C0}}
- \expandafter\def\csname simpleicon@microsofticon\endcsname {\simpleiconsmap\symbol{"F0C1}}
- \expandafter\def\csname simpleicon@microsoftacademicicon\endcsname {\simpleiconsmap\symbol{"F0C2}}
- \expandafter\def\csname simpleicon@microsoftaccessicon\endcsname {\simpleiconsmap\symbol{"F0C3}}
- \expandafter\def\csname simpleicon@microsoftazureicon\endcsname {\simpleiconsmap\symbol{"F0C4}}
- \expandafter\def\csname simpleicon@microsoftbingicon\endcsname {\simpleiconsmap\symbol{"F0C5}}
- \expandafter\def\csname simpleicon@microsoftedgeicon\endcsname {\simpleiconsmap\symbol{"F0C6}}
- \expandafter\def\csname simpleicon@microsoftexcelicon\endcsname {\simpleiconsmap\symbol{"F0C7}}
- \expandafter\def\csname simpleicon@microsoftexchangeicon\endcsname {\simpleiconsmap\symbol{"F0C8}}
- \expandafter\def\csname simpleicon@microsoftonedriveicon\endcsname {\simpleiconsmap\symbol{"F0C9}}
- \expandafter\def\csname simpleicon@microsoftonenoteicon\endcsname {\simpleiconsmap\symbol{"F0CA}}
- \expandafter\def\csname simpleicon@microsoftoutlookicon\endcsname {\simpleiconsmap\symbol{"F0CB}}
- \expandafter\def\csname simpleicon@microsoftpowerpointicon\endcsname {\simpleiconsmap\symbol{"F0CC}}
- \expandafter\def\csname simpleicon@microsoftsharepointicon\endcsname {\simpleiconsmap\symbol{"F0CD}}
- \expandafter\def\csname simpleicon@microsoftsqlservericon\endcsname {\simpleiconsmap\symbol{"F0CE}}
- \expandafter\def\csname simpleicon@microsoftstoreicon\endcsname {\simpleiconsmap\symbol{"F0CF}}
- \expandafter\def\csname simpleicon@microsoftteamsicon\endcsname {\simpleiconsmap\symbol{"F0D0}}
- \expandafter\def\csname simpleicon@microsofttranslatoricon\endcsname {\simpleiconsmap\symbol{"F0D1}}
- \expandafter\def\csname simpleicon@microsoftvisioicon\endcsname {\simpleiconsmap\symbol{"F0D2}}
- \expandafter\def\csname simpleicon@microsoftwordicon\endcsname {\simpleiconsmap\symbol{"F0D3}}
- \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0D4}}
- \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0D5}}
- \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0D6}}
- \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0D7}}
- \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0D8}}
- \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0D9}}
- \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0DA}}
- \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0DB}}
- \expandafter\def\csname simpleicon@minecrafticon\endcsname {\simpleiconsmap\symbol{"F0DC}}
- \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0DD}}
- \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0DE}}
- \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0DF}}
- \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0E0}}
- \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0E1}}
- \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0E2}}
- \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0E3}}
- \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0E4}}
- \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0E5}}
- \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0E6}}
- \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0E7}}
- \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0E8}}
- \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0E9}}
- \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0EA}}
- \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0EB}}
- \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0EC}}
- \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0ED}}
- \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0EE}}
- \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0EF}}
- \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0F0}}
- \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0F1}}
- \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0F2}}
- \expandafter\def\csname simpleicon@mojangstudiosicon\endcsname {\simpleiconsmap\symbol{"F0F3}}
- \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0F4}}
- \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0F5}}
- \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0F6}}
- \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0F7}}
- \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0F8}}
- \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0F9}}
- \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0FA}}
- \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0FB}}
- \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0FC}}
- \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0FD}}
- \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0FE}}
- \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0FF}}
- \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F100}}
- \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F101}}
- \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F102}}
- \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F103}}
- \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F104}}
- \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F105}}
- \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F106}}
- \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F107}}
- \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F108}}
- \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F109}}
- \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F10A}}
- \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F10B}}
- \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F10C}}
- \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F10D}}
- \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F10E}}
- \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F10F}}
- \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F110}}
- \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F111}}
- \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F112}}
- \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F113}}
- \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F114}}
- \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F115}}
- \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F116}}
- \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F117}}
- \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F118}}
- \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F119}}
- \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F11A}}
- \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F11B}}
- \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F11C}}
- \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F11D}}
- \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F11E}}
- \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F11F}}
- \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F120}}
- \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F121}}
- \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F122}}
- \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F123}}
- \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F124}}
- \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F125}}
- \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F126}}
- \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F127}}
- \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F128}}
- \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F129}}
- \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F12A}}
- \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F12B}}
- \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F12C}}
- \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F12D}}
- \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F12E}}
- \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F12F}}
- \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F130}}
- \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F131}}
- \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F132}}
- \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F133}}
- \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F134}}
- \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F135}}
- \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F136}}
- \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F137}}
- \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F138}}
- \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F139}}
- \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F13A}}
- \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F13B}}
- \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F13C}}
- \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F13D}}
- \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F13E}}
- \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F13F}}
- \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F140}}
- \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F141}}
- \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F142}}
- \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F143}}
- \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F144}}
- \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F145}}
- \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F146}}
- \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F147}}
- \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F148}}
- \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F149}}
- \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F14A}}
- \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F14B}}
- \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F14C}}
- \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F14D}}
- \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F14E}}
- \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F14F}}
- \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F150}}
- \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F151}}
- \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F152}}
- \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F153}}
- \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F154}}
- \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F155}}
- \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F156}}
- \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F157}}
- \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F158}}
- \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F159}}
- \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F15A}}
- \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F15B}}
- \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F15C}}
- \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F15D}}
- \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F15E}}
- \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F15F}}
- \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F160}}
- \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F161}}
- \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F162}}
- \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F163}}
- \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F164}}
- \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F165}}
- \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F166}}
- \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F167}}
- \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F168}}
- \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F169}}
- \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F16A}}
- \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F16B}}
- \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F16C}}
- \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F16D}}
- \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F16E}}
- \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F16F}}
- \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F170}}
- \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F171}}
- \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F172}}
- \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F173}}
- \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F174}}
- \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F175}}
- \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F176}}
- \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F177}}
- \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F178}}
- \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F179}}
- \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F17A}}
- \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F17B}}
- \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F17C}}
- \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F17D}}
- \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F17E}}
- \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F17F}}
- \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F180}}
- \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F181}}
- \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F182}}
- \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F183}}
- \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F184}}
- \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F185}}
- \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F186}}
- \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F187}}
- \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F188}}
- \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F189}}
- \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F18A}}
- \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F18B}}
- \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F18C}}
- \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F18D}}
- \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F18E}}
- \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F18F}}
- \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F190}}
- \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F191}}
- \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F192}}
- \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F193}}
- \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F194}}
- \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F195}}
- \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F196}}
- \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F197}}
- \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F198}}
- \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F199}}
- \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F19A}}
- \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F19B}}
- \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F19C}}
- \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F19D}}
- \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F19E}}
- \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F19F}}
- \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F1A0}}
- \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F1A1}}
- \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F1A2}}
- \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F1A3}}
- \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F1A4}}
- \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F1A5}}
- \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F1A6}}
- \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F1A7}}
- \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F1A8}}
- \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F1A9}}
- \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F1AA}}
- \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F1AB}}
- \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F1AC}}
- \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F1AD}}
- \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F1AE}}
- \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F1AF}}
- \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F1B0}}
- \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F1B1}}
- \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F1B2}}
- \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F1B3}}
- \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F1B4}}
- \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F1B5}}
- \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F1B6}}
- \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F1B7}}
- \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F1B8}}
- \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F1B9}}
- \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F1BA}}
- \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F1BB}}
- \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F1BC}}
- \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F1BD}}
- \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F1BE}}
- \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F1BF}}
- \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F1C0}}
- \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F1C1}}
- \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F1C2}}
- \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1C3}}
- \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1C4}}
- \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1C5}}
- \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1C6}}
- \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1C7}}
- \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1C8}}
- \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1C9}}
- \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1CA}}
- \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1CB}}
- \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1CC}}
- \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1CD}}
- \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1CE}}
- \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1CF}}
- \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1D0}}
- \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1D1}}
- \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1D2}}
- \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1D3}}
- \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1D4}}
- \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1D5}}
- \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1D6}}
- \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1D7}}
- \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1D8}}
- \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1D9}}
- \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1DA}}
- \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1DB}}
- \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1DC}}
- \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1DD}}
- \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1DE}}
- \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1DF}}
- \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1E0}}
- \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1E1}}
- \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1E2}}
- \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1E3}}
- \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1E4}}
- \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1E5}}
- \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1E6}}
- \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1E7}}
- \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1E8}}
- \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1E9}}
- \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1EA}}
- \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1EB}}
- \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1EC}}
- \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1ED}}
- \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1EE}}
- \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1EF}}
- \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1F0}}
- \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1F1}}
- \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1F2}}
- \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1F3}}
- \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1F4}}
- \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1F5}}
- \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1F6}}
- \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1F7}}
- \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1F8}}
- \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1F9}}
- \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1FA}}
- \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1FB}}
- \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1FC}}
- \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1FD}}
- \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1FE}}
- \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1FF}}
- \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F200}}
- \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F201}}
- \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F202}}
- \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F203}}
- \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F204}}
- \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F205}}
- \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F206}}
- \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F207}}
- \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F208}}
- \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F209}}
- \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F20A}}
- \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F20B}}
- \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F20C}}
- \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F20D}}
- \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F20E}}
- \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F20F}}
- \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F210}}
- \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F211}}
- \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F212}}
- \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F213}}
- \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F214}}
- \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F215}}
- \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F216}}
- \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F217}}
- \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F218}}
- \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F219}}
- \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F21A}}
- \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F21B}}
- \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F21C}}
- \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F21D}}
- \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F21E}}
- \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F21F}}
- \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F220}}
- \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F221}}
- \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F222}}
- \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F223}}
- \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F224}}
- \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F225}}
- \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F226}}
- \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F227}}
- \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F228}}
- \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F229}}
- \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F22A}}
- \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F22B}}
- \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F22C}}
- \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F22D}}
- \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F22E}}
- \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F22F}}
- \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F230}}
- \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F231}}
- \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F232}}
- \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F233}}
- \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F234}}
- \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F235}}
- \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F236}}
- \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F237}}
- \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F238}}
- \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F239}}
- \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F23A}}
- \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F23B}}
- \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F23C}}
- \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F23D}}
- \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F23E}}
- \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F23F}}
- \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F240}}
- \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F241}}
- \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F242}}
- \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F243}}
- \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F244}}
- \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F245}}
- \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F246}}
- \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F247}}
- \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F248}}
- \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F249}}
- \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F24A}}
- \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F24B}}
- \expandafter\def\csname simpleicon@playwrighticon\endcsname {\simpleiconsmap\symbol{"F24C}}
- \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F24D}}
- \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F24E}}
- \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F24F}}
- \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F250}}
- \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F251}}
- \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F252}}
- \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F253}}
- \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F254}}
- \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F255}}
- \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F256}}
- \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F257}}
- \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F258}}
- \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F259}}
- \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F25A}}
- \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F25B}}
- \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F25C}}
- \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F25D}}
- \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F25E}}
- \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F25F}}
- \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F260}}
- \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F261}}
- \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F262}}
- \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F263}}
- \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F264}}
- \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F265}}
- \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F266}}
- \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F267}}
- \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F268}}
- \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F269}}
- \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F26A}}
- \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F26B}}
- \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F26C}}
- \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F26D}}
- \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F26E}}
- \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F26F}}
- \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F270}}
- \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F271}}
- \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F272}}
- \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F273}}
- \expandafter\def\csname simpleicon@powerappsicon\endcsname {\simpleiconsmap\symbol{"F274}}
- \expandafter\def\csname simpleicon@powerautomateicon\endcsname {\simpleiconsmap\symbol{"F275}}
- \expandafter\def\csname simpleicon@powerbiicon\endcsname {\simpleiconsmap\symbol{"F276}}
- \expandafter\def\csname simpleicon@powerfxicon\endcsname {\simpleiconsmap\symbol{"F277}}
- \expandafter\def\csname simpleicon@powerpagesicon\endcsname {\simpleiconsmap\symbol{"F278}}
- \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F279}}
- \expandafter\def\csname simpleicon@powershellicon\endcsname {\simpleiconsmap\symbol{"F27A}}
- \expandafter\def\csname simpleicon@powervirtualagentsicon\endcsname {\simpleiconsmap\symbol{"F27B}}
- \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F27C}}
- \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F27D}}
- \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F27E}}
- \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F27F}}
- \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F280}}
- \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F281}}
- \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F282}}
- \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F283}}
- \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F284}}
- \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F285}}
- \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F286}}
- \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F287}}
- \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F288}}
- \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F289}}
- \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F28A}}
- \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F28B}}
- \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F28C}}
- \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F28D}}
- \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F28E}}
- \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F28F}}
- \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F290}}
- \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F291}}
- \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F292}}
- \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F293}}
- \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F294}}
- \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F295}}
- \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F296}}
- \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F297}}
- \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F298}}
- \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F299}}
- \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F29A}}
- \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F29B}}
- \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F29C}}
- \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F29D}}
- \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F29E}}
- \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F29F}}
- \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F2A0}}
- \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F2A1}}
- \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F2A2}}
- \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F2A3}}
- \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F2A4}}
- \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F2A5}}
- \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F2A6}}
- \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F2A7}}
- \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F2A8}}
- \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F2A9}}
- \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F2AA}}
- \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F2AB}}
- \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F2AC}}
- \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F2AD}}
- \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F2AE}}
- \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F2AF}}
- \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F2B0}}
- \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F2B1}}
- \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F2B2}}
- \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F2B3}}
- \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F2B4}}
- \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F2B5}}
- \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F2B6}}
- \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F2B7}}
- \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F2B8}}
- \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F2B9}}
- \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F2BA}}
- \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F2BB}}
- \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F2BC}}
- \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F2BD}}
- \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F2BE}}
- \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F2BF}}
- \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F2C0}}
- \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F2C1}}
- \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F2C2}}
- \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F2C3}}
- \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F2C4}}
- \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F2C5}}
- \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F2C6}}
- \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F2C7}}
- \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2C8}}
- \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2C9}}
- \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2CA}}
- \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2CB}}
- \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2CC}}
- \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2CD}}
- \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2CE}}
- \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2CF}}
- \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2D0}}
- \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2D1}}
- \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2D2}}
- \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2D3}}
- \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2D4}}
- \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2D5}}
- \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2D6}}
- \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2D7}}
- \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2D8}}
- \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2D9}}
- \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2DA}}
- \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2DB}}
- \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2DC}}
- \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2DD}}
- \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2DE}}
- \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2DF}}
- \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2E0}}
- \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2E1}}
- \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2E2}}
- \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2E3}}
- \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2E4}}
- \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2E5}}
- \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2E6}}
- \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2E7}}
- \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2E8}}
- \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2E9}}
- \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2EA}}
- \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2EB}}
- \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2EC}}
- \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2ED}}
- \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2EE}}
- \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2EF}}
- \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2F0}}
- \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2F1}}
- \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2F2}}
- \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2F3}}
- \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2F4}}
- \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2F5}}
- \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2F6}}
- \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2F7}}
- \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2F8}}
- \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2F9}}
- \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2FA}}
- \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2FB}}
- \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2FC}}
- \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2FD}}
- \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2FE}}
- \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2FF}}
- \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F300}}
- \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F301}}
- \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F302}}
- \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F303}}
- \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F304}}
- \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F305}}
- \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F306}}
- \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F307}}
- \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F308}}
- \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F309}}
- \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F30A}}
- \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F30B}}
- \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F30C}}
- \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F30D}}
- \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F30E}}
- \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F30F}}
- \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F310}}
- \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F311}}
- \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F312}}
- \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F313}}
- \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F314}}
- \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F315}}
- \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F316}}
- \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F317}}
- \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F318}}
- \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F319}}
- \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F31A}}
- \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F31B}}
- \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F31C}}
- \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F31D}}
- \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F31E}}
- \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F31F}}
- \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F320}}
- \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F321}}
- \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F322}}
- \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F323}}
- \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F324}}
- \expandafter\def\csname simpleicon@renovateboticon\endcsname {\simpleiconsmap\symbol{"F325}}
- \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F326}}
- \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F327}}
- \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F328}}
- \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F329}}
- \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F32A}}
- \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F32B}}
- \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F32C}}
- \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F32D}}
- \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F32E}}
- \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F32F}}
- \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F330}}
- \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F331}}
- \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F332}}
- \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F333}}
- \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F334}}
- \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F335}}
- \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F336}}
- \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F337}}
- \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F338}}
- \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F339}}
- \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F33A}}
- \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F33B}}
- \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F33C}}
- \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F33D}}
- \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F33E}}
- \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F33F}}
- \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F340}}
- \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F341}}
- \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F342}}
- \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F343}}
- \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F344}}
- \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F345}}
- \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F346}}
- \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F347}}
- \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F348}}
- \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F349}}
- \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F34A}}
- \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F34B}}
- \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F34C}}
- \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F34D}}
- \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F34E}}
- \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F34F}}
- \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F350}}
- \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F351}}
- \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F352}}
- \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F353}}
- \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F354}}
- \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F355}}
- \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F356}}
- \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F357}}
- \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F358}}
- \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F359}}
- \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F35A}}
- \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F35B}}
- \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F35C}}
- \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F35D}}
- \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F35E}}
- \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F35F}}
- \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F360}}
- \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F361}}
- \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F362}}
- \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F363}}
- \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F364}}
- \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F365}}
- \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F366}}
- \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F367}}
- \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F368}}
- \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F369}}
- \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F36A}}
- \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F36B}}
- \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F36C}}
- \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F36D}}
- \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F36E}}
- \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F36F}}
- \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F370}}
- \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F371}}
- \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F372}}
- \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F373}}
- \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F374}}
- \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F375}}
- \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F376}}
- \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F377}}
- \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F378}}
- \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F379}}
- \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F37A}}
- \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F37B}}
- \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F37C}}
- \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F37D}}
- \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F37E}}
- \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F37F}}
- \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F380}}
- \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F381}}
- \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F382}}
- \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F383}}
- \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F384}}
- \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F385}}
- \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F386}}
- \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F387}}
- \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F388}}
- \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F389}}
- \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F38A}}
- \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F38B}}
- \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F38C}}
- \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F38D}}
- \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F38E}}
- \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F38F}}
- \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F390}}
- \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F391}}
- \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F392}}
- \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F393}}
- \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F394}}
- \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F395}}
- \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F396}}
- \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F397}}
- \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F398}}
- \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F399}}
- \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F39A}}
- \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F39B}}
- \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F39C}}
- \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F39D}}
- \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F39E}}
- \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F39F}}
- \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F3A0}}
- \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F3A1}}
- \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F3A2}}
- \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F3A3}}
- \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F3A4}}
- \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F3A5}}
- \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F3A6}}
- \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F3A7}}
- \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F3A8}}
- \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F3A9}}
- \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F3AA}}
- \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F3AB}}
- \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F3AC}}
- \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F3AD}}
- \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F3AE}}
- \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F3AF}}
- \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F3B0}}
- \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F3B1}}
- \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F3B2}}
- \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F3B3}}
- \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F3B4}}
- \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F3B5}}
- \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F3B6}}
- \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F3B7}}
- \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F3B8}}
- \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F3B9}}
- \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F3BA}}
- \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F3BB}}
- \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F3BC}}
- \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F3BD}}
- \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F3BE}}
- \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F3BF}}
- \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F3C0}}
- \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F3C1}}
- \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F3C2}}
- \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F3C3}}
- \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F3C4}}
- \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F3C5}}
- \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F3C6}}
- \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3C7}}
- \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3C8}}
- \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3C9}}
- \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3CA}}
- \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3CB}}
- \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3CC}}
- \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3CD}}
- \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3CE}}
- \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3CF}}
- \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3D0}}
- \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3D1}}
- \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3D2}}
- \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3D3}}
- \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3D4}}
- \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3D5}}
- \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3D6}}
- \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3D7}}
- \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3D8}}
- \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3D9}}
- \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3DA}}
- \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3DB}}
- \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3DC}}
- \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3DD}}
- \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3DE}}
- \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3DF}}
- \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3E0}}
- \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3E1}}
- \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3E2}}
- \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3E3}}
- \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3E4}}
- \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3E5}}
- \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3E6}}
- \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3E7}}
- \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3E8}}
- \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3E9}}
- \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3EA}}
- \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3EB}}
- \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3EC}}
- \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3ED}}
- \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3EE}}
- \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3EF}}
- \expandafter\def\csname simpleicon@skypeicon\endcsname {\simpleiconsmap\symbol{"F3F0}}
- \expandafter\def\csname simpleicon@skypeforbusinessicon\endcsname {\simpleiconsmap\symbol{"F3F1}}
- \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3F2}}
- \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3F3}}
- \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3F4}}
- \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3F5}}
- \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3F6}}
- \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3F7}}
- \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3F8}}
- \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3F9}}
- \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3FA}}
- \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3FB}}
- \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3FC}}
- \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3FD}}
- \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3FE}}
- \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3FF}}
- \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F400}}
- \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F401}}
- \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F402}}
- \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F403}}
- \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F404}}
- \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F405}}
- \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F406}}
- \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F407}}
- \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F408}}
- \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F409}}
- \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F40A}}
- \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F40B}}
- \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F40C}}
- \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F40D}}
- \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F40E}}
- \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F40F}}
- \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F410}}
- \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F411}}
- \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F412}}
- \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F413}}
- \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F414}}
- \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F415}}
- \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F416}}
- \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F417}}
- \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F418}}
- \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F419}}
- \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F41A}}
- \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F41B}}
- \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F41C}}
- \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F41D}}
- \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F41E}}
- \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F41F}}
- \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F420}}
- \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F421}}
- \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F422}}
- \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F423}}
- \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F424}}
- \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F425}}
- \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F426}}
- \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F427}}
- \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F428}}
- \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F429}}
- \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F42A}}
- \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F42B}}
- \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F42C}}
- \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F42D}}
- \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F42E}}
- \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F42F}}
- \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F430}}
- \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F431}}
- \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F432}}
- \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F433}}
- \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F434}}
- \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F435}}
- \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F436}}
- \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F437}}
- \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F438}}
- \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F439}}
- \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F43A}}
- \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F43B}}
- \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F43C}}
- \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F43D}}
- \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F43E}}
- \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F43F}}
- \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F440}}
- \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F441}}
- \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F442}}
- \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F443}}
- \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F444}}
- \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F445}}
- \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F446}}
- \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F447}}
- \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F448}}
- \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F449}}
- \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F44A}}
- \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F44B}}
- \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F44C}}
- \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F44D}}
- \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F44E}}
- \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F44F}}
- \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F450}}
- \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F451}}
- \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F452}}
- \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F453}}
- \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F454}}
- \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F455}}
- \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F456}}
- \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F457}}
- \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F458}}
- \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F459}}
- \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F45A}}
- \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F45B}}
- \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F45C}}
- \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F45D}}
- \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F45E}}
- \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F45F}}
- \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F460}}
- \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F461}}
- \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F462}}
- \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F463}}
- \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F464}}
- \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F465}}
- \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F466}}
- \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F467}}
- \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F468}}
- \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F469}}
- \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F46A}}
- \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F46B}}
- \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F46C}}
- \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F46D}}
- \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F46E}}
- \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F46F}}
- \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F470}}
- \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F471}}
- \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F472}}
- \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F473}}
- \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F474}}
- \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F475}}
- \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F476}}
- \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F477}}
- \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F478}}
- \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F479}}
- \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F47A}}
- \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F47B}}
- \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F47C}}
- \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F47D}}
- \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F47E}}
- \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F47F}}
- \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F480}}
- \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F481}}
- \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F482}}
- \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F483}}
- \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F484}}
- \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F485}}
- \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F486}}
- \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F487}}
- \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F488}}
- \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F489}}
- \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F48A}}
- \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F48B}}
- \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F48C}}
- \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F48D}}
- \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F48E}}
- \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F48F}}
- \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F490}}
- \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F491}}
- \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F492}}
- \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F493}}
- \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F494}}
- \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F495}}
- \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F496}}
- \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F497}}
- \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F498}}
- \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F499}}
- \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F49A}}
- \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F49B}}
- \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F49C}}
- \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F49D}}
- \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F49E}}
- \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F49F}}
- \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F4A0}}
- \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F4A1}}
- \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F4A2}}
- \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F4A3}}
- \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F4A4}}
- \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F4A5}}
- \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F4A6}}
- \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F4A7}}
- \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F4A8}}
- \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F4A9}}
- \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F4AA}}
- \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F4AB}}
- \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F4AC}}
- \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F4AD}}
- \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F4AE}}
- \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F4AF}}
- \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F4B0}}
- \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F4B1}}
- \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F4B2}}
- \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F4B3}}
- \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F4B4}}
- \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F4B5}}
- \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F4B6}}
- \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F4B7}}
- \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F4B8}}
- \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F4B9}}
- \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F4BA}}
- \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F4BB}}
- \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F4BC}}
- \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F4BD}}
- \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F4BE}}
- \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F4BF}}
- \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F4C0}}
- \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F4C1}}
- \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F4C2}}
- \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F4C3}}
- \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F4C4}}
- \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F4C5}}
- \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F4C6}}
- \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F4C7}}
- \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4C8}}
- \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4C9}}
- \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4CA}}
- \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4CB}}
- \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4CC}}
- \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4CD}}
- \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4CE}}
- \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4CF}}
- \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4D0}}
- \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4D1}}
- \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4D2}}
- \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4D3}}
- \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4D4}}
- \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4D5}}
- \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4D6}}
- \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4D7}}
- \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4D8}}
- \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4D9}}
- \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4DA}}
- \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4DB}}
- \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4DC}}
- \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4DD}}
- \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4DE}}
- \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4DF}}
- \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4E0}}
- \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4E1}}
- \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4E2}}
- \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4E3}}
- \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4E4}}
- \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4E5}}
- \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4E6}}
- \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4E7}}
- \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4E8}}
- \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4E9}}
- \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4EA}}
- \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4EB}}
- \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4EC}}
- \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4ED}}
- \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4EE}}
- \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4EF}}
- \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4F0}}
- \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4F1}}
- \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4F2}}
- \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4F3}}
- \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4F4}}
- \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4F5}}
- \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4F6}}
- \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4F7}}
- \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4F8}}
- \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4F9}}
- \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4FA}}
- \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4FB}}
- \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4FC}}
- \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4FD}}
- \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4FE}}
- \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4FF}}
- \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F500}}
- \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F501}}
- \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F502}}
- \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F503}}
- \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F504}}
- \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F505}}
- \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F506}}
- \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F507}}
- \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F508}}
- \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F509}}
- \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F50A}}
- \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F50B}}
- \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F50C}}
- \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F50D}}
- \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F50E}}
- \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F50F}}
- \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F510}}
- \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F511}}
- \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F512}}
- \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F513}}
- \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F514}}
- \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F515}}
- \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F516}}
- \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F517}}
- \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F518}}
- \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F519}}
- \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F51A}}
- \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F51B}}
- \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F51C}}
- \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F51D}}
- \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F51E}}
- \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F51F}}
- \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F520}}
- \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F521}}
- \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F522}}
- \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F523}}
- \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F524}}
- \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F525}}
- \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F526}}
- \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F527}}
- \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F528}}
- \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F529}}
- \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F52A}}
- \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F52B}}
- \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F52C}}
- \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F52D}}
- \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F52E}}
- \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F52F}}
- \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F530}}
- \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F531}}
- \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F532}}
- \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F533}}
- \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F534}}
- \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F535}}
- \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F536}}
- \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F537}}
- \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F538}}
- \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F539}}
- \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F53A}}
- \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F53B}}
- \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F53C}}
- \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F53D}}
- \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F53E}}
- \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F53F}}
- \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F540}}
- \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F541}}
- \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F542}}
- \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F543}}
- \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F544}}
- \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F545}}
- \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F546}}
- \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F547}}
- \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F548}}
- \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F549}}
- \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F54A}}
- \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F54B}}
- \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F54C}}
- \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F54D}}
- \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F54E}}
- \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F54F}}
- \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F550}}
- \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F551}}
- \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F552}}
- \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F553}}
- \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F554}}
- \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F555}}
- \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F556}}
- \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F557}}
- \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F558}}
- \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F559}}
- \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F55A}}
- \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F55B}}
- \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F55C}}
- \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F55D}}
- \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F55E}}
- \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F55F}}
- \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F560}}
- \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F561}}
- \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F562}}
- \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F563}}
- \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F564}}
- \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F565}}
- \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F566}}
- \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F567}}
- \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F568}}
- \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F569}}
- \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F56A}}
- \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F56B}}
- \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F56C}}
- \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F56D}}
- \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F56E}}
- \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F56F}}
- \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F570}}
- \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F571}}
- \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F572}}
- \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F573}}
- \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F574}}
- \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F575}}
- \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F576}}
- \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F577}}
- \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F578}}
- \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F579}}
- \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F57A}}
- \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F57B}}
- \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F57C}}
- \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F57D}}
- \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F57E}}
- \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F57F}}
- \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F580}}
- \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F581}}
- \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F582}}
- \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F583}}
- \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F584}}
- \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F585}}
- \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F586}}
- \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F587}}
- \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F588}}
- \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F589}}
- \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F58A}}
- \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F58B}}
- \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F58C}}
- \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F58D}}
- \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F58E}}
- \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F58F}}
- \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F590}}
- \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F591}}
- \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F592}}
- \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F593}}
- \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F594}}
- \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F595}}
- \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F596}}
- \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F597}}
- \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F598}}
- \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F599}}
- \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F59A}}
- \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F59B}}
- \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F59C}}
- \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F59D}}
- \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F59E}}
- \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F59F}}
- \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F5A0}}
- \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F5A1}}
- \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F5A2}}
- \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F5A3}}
- \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F5A4}}
- \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F5A5}}
- \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F5A6}}
- \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F5A7}}
- \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F5A8}}
- \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F5A9}}
- \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F5AA}}
- \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F5AB}}
- \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F5AC}}
- \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F5AD}}
- \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F5AE}}
- \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F5AF}}
- \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F5B0}}
- \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F5B1}}
- \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F5B2}}
- \expandafter\def\csname simpleicon@visualbasicicon\endcsname {\simpleiconsmap\symbol{"F5B3}}
- \expandafter\def\csname simpleicon@visualstudioicon\endcsname {\simpleiconsmap\symbol{"F5B4}}
- \expandafter\def\csname simpleicon@visualstudioappcentericon\endcsname {\simpleiconsmap\symbol{"F5B5}}
- \expandafter\def\csname simpleicon@visualstudiocodeicon\endcsname {\simpleiconsmap\symbol{"F5B6}}
- \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F5B7}}
- \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F5B8}}
- \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F5B9}}
- \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F5BA}}
- \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F5BB}}
- \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F5BC}}
- \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F5BD}}
- \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F5BE}}
- \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F5BF}}
- \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F5C0}}
- \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F5C1}}
- \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F5C2}}
- \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F5C3}}
- \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F5C4}}
- \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F5C5}}
- \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F5C6}}
- \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F5C7}}
- \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F5C8}}
- \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F5C9}}
- \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F5CA}}
- \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5CB}}
- \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5CC}}
- \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5CD}}
- \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5CE}}
- \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5CF}}
- \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5D0}}
- \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5D1}}
- \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5D2}}
- \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5D3}}
- \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5D4}}
- \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5D5}}
- \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5D6}}
- \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5D7}}
- \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5D8}}
- \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5D9}}
- \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5DA}}
- \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5DB}}
- \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5DC}}
- \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5DD}}
- \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5DE}}
- \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5DF}}
- \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5E0}}
- \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5E1}}
- \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5E2}}
- \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5E3}}
- \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5E4}}
- \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5E5}}
- \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5E6}}
- \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5E7}}
- \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5E8}}
- \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5E9}}
- \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5EA}}
- \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5EB}}
- \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5EC}}
- \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5ED}}
- \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5EE}}
- \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5EF}}
- \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5F0}}
- \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5F1}}
- \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5F2}}
- \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5F3}}
- \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5F4}}
- \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5F5}}
- \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5F6}}
- \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5F7}}
- \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5F8}}
- \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5F9}}
- \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5FA}}
- \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5FB}}
- \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5FC}}
- \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5FD}}
- \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5FE}}
- \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5FF}}
- \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F600}}
- \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F601}}
- \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F602}}
- \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F603}}
- \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F604}}
- \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F605}}
- \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F606}}
- \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F607}}
- \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F608}}
- \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F609}}
- \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F60A}}
- \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F60B}}
- \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F60C}}
- \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F60D}}
- \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F60E}}
- \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F60F}}
- \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F610}}
- \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F611}}
- \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F612}}
- \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F613}}
- \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F614}}
- \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F615}}
- \expandafter\def\csname simpleicon@windowsicon\endcsname {\simpleiconsmap\symbol{"F616}}
- \expandafter\def\csname simpleicon@windows10icon\endcsname {\simpleiconsmap\symbol{"F617}}
- \expandafter\def\csname simpleicon@windows95icon\endcsname {\simpleiconsmap\symbol{"F619}}
- \expandafter\def\csname simpleicon@windowsterminalicon\endcsname {\simpleiconsmap\symbol{"F61A}}
- \expandafter\def\csname simpleicon@windowsxpicon\endcsname {\simpleiconsmap\symbol{"F61B}}
- \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F61C}}
- \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F61D}}
- \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F61E}}
- \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F61F}}
- \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F620}}
- \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F621}}
- \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F622}}
- \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F623}}
- \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F624}}
- \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F625}}
- \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F626}}
- \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F627}}
- \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F628}}
- \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F629}}
- \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F62A}}
- \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F62B}}
- \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F62C}}
- \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F62D}}
- \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F62E}}
- \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F62F}}
- \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F630}}
- \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F631}}
- \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F632}}
- \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F633}}
- \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F634}}
- \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F635}}
- \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F636}}
- \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F637}}
- \expandafter\def\csname simpleicon@xamarinicon\endcsname {\simpleiconsmap\symbol{"F638}}
- \expandafter\def\csname simpleicon@xamlicon\endcsname {\simpleiconsmap\symbol{"F639}}
- \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F63A}}
- \expandafter\def\csname simpleicon@xboxicon\endcsname {\simpleiconsmap\symbol{"F63B}}
- \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F63C}}
- \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F63D}}
- \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F63E}}
- \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F63F}}
- \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F640}}
- \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F641}}
- \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F642}}
- \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F643}}
- \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F644}}
- \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F645}}
- \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F646}}
- \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F647}}
- \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F648}}
- \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F649}}
- \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F64A}}
- \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F64B}}
- \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F64C}}
- \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F64D}}
- \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F64E}}
- \expandafter\def\csname simpleicon@yammericon\endcsname {\simpleiconsmap\symbol{"F64F}}
- \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F650}}
- \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F651}}
- \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F652}}
- \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F653}}
- \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F654}}
- \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F655}}
- \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F656}}
- \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F657}}
- \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F658}}
- \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F659}}
- \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F65A}}
- \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F65B}}
- \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F65C}}
- \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F65D}}
- \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F65E}}
- \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F65F}}
- \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F660}}
- \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F661}}
- \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F662}}
- \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F663}}
- \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F664}}
- \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F665}}
- \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F666}}
- \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F667}}
- \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F668}}
- \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F669}}
- \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F66A}}
- \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F66B}}
- \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F66C}}
- \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F66D}}
- \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F66E}}
- \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F66F}}
- \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F670}}
- \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F671}}
- \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F672}}
- \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F673}}
- \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F674}}
- \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F675}}
- \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F676}}
- \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F677}}
- \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F678}}
- \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F679}}
- \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F67A}}
- \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F67B}}
- \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F67C}}
- \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F67D}}
- \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F67E}}
- \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F67F}}
- \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F680}}
- \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F681}}
- \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F682}}
- \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F683}}
- \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F684}}
- \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F685}}
- \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F686}}
- \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F687}}
- \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F688}}
- \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F689}} \ No newline at end of file
+ \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmap\symbol{"EB2E}}
+ \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmap\symbol{"EB2F}}
+ \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmap\symbol{"EB30}}
+ \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmap\symbol{"EB31}}
+ \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmap\symbol{"EB32}}
+ \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmap\symbol{"EB33}}
+ \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmap\symbol{"EB34}}
+ \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmap\symbol{"EB35}}
+ \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmap\symbol{"EB36}}
+ \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmap\symbol{"EB37}}
+ \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmap\symbol{"EB38}}
+ \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmap\symbol{"EB39}}
+ \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmap\symbol{"EB3A}}
+ \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmap\symbol{"EB3B}}
+ \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmap\symbol{"EB3C}}
+ \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmap\symbol{"EB3D}}
+ \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmap\symbol{"EB3E}}
+ \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmap\symbol{"EB3F}}
+ \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmap\symbol{"EB40}}
+ \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmap\symbol{"EB41}}
+ \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmap\symbol{"EB42}}
+ \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmap\symbol{"EB43}}
+ \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmap\symbol{"EB44}}
+ \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmap\symbol{"EB45}}
+ \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmap\symbol{"EB46}}
+ \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmap\symbol{"EB47}}
+ \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmap\symbol{"EB48}}
+ \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmap\symbol{"EB49}}
+ \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmap\symbol{"EB4A}}
+ \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmap\symbol{"EB4B}}
+ \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmap\symbol{"EB4C}}
+ \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmap\symbol{"EB4D}}
+ \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmap\symbol{"EB4E}}
+ \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmap\symbol{"EB4F}}
+ \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmap\symbol{"EB50}}
+ \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmap\symbol{"EB51}}
+ \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmap\symbol{"EB52}}
+ \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmap\symbol{"EB53}}
+ \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmap\symbol{"EB54}}
+ \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmap\symbol{"EB55}}
+ \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmap\symbol{"EB56}}
+ \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmap\symbol{"EB57}}
+ \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmap\symbol{"EB58}}
+ \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmap\symbol{"EB59}}
+ \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmap\symbol{"EB5A}}
+ \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmap\symbol{"EB5B}}
+ \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmap\symbol{"EB5C}}
+ \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmap\symbol{"EB5D}}
+ \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmap\symbol{"EB5E}}
+ \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmap\symbol{"EB5F}}
+ \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmap\symbol{"EB60}}
+ \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmap\symbol{"EB61}}
+ \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmap\symbol{"EB62}}
+ \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmap\symbol{"EB63}}
+ \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmap\symbol{"EB64}}
+ \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmap\symbol{"EB65}}
+ \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmap\symbol{"EB66}}
+ \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmap\symbol{"EB67}}
+ \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmap\symbol{"EB68}}
+ \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmap\symbol{"EB69}}
+ \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmap\symbol{"EB6A}}
+ \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmap\symbol{"EB6B}}
+ \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmap\symbol{"EB6C}}
+ \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmap\symbol{"EB6D}}
+ \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmap\symbol{"EB6E}}
+ \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmap\symbol{"EB6F}}
+ \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmap\symbol{"EB70}}
+ \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmap\symbol{"EB71}}
+ \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmap\symbol{"EB72}}
+ \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmap\symbol{"EB73}}
+ \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmap\symbol{"EB74}}
+ \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmap\symbol{"EB75}}
+ \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmap\symbol{"EB76}}
+ \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmap\symbol{"EB77}}
+ \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmap\symbol{"EB78}}
+ \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmap\symbol{"EB79}}
+ \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmap\symbol{"EB7A}}
+ \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmap\symbol{"EB7B}}
+ \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmap\symbol{"EB7C}}
+ \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmap\symbol{"EB7D}}
+ \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmap\symbol{"EB7E}}
+ \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmap\symbol{"EB7F}}
+ \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmap\symbol{"EB80}}
+ \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmap\symbol{"EB81}}
+ \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmap\symbol{"EB82}}
+ \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmap\symbol{"EB83}}
+ \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmap\symbol{"EB84}}
+ \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmap\symbol{"EB85}}
+ \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmap\symbol{"EB86}}
+ \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmap\symbol{"EB87}}
+ \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmap\symbol{"EB88}}
+ \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmap\symbol{"EB89}}
+ \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmap\symbol{"EB8A}}
+ \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmap\symbol{"EB8B}}
+ \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmap\symbol{"EB8C}}
+ \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmap\symbol{"EB8D}}
+ \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmap\symbol{"EB8E}}
+ \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmap\symbol{"EB8F}}
+ \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmap\symbol{"EB90}}
+ \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmap\symbol{"EB91}}
+ \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmap\symbol{"EB92}}
+ \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmap\symbol{"EB93}}
+ \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmap\symbol{"EB94}}
+ \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmap\symbol{"EB95}}
+ \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmap\symbol{"EB96}}
+ \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmap\symbol{"EB97}}
+ \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmap\symbol{"EB98}}
+ \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmap\symbol{"EB99}}
+ \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmap\symbol{"EB9A}}
+ \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmap\symbol{"EB9B}}
+ \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmap\symbol{"EB9C}}
+ \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmap\symbol{"EB9D}}
+ \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmap\symbol{"EB9E}}
+ \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmap\symbol{"EB9F}}
+ \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmap\symbol{"EBA0}}
+ \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmap\symbol{"EBA1}}
+ \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmap\symbol{"EBA2}}
+ \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmap\symbol{"EBA3}}
+ \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmap\symbol{"EBA4}}
+ \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmap\symbol{"EBA5}}
+ \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmap\symbol{"EBA6}}
+ \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmap\symbol{"EBA7}}
+ \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmap\symbol{"EBA8}}
+ \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmap\symbol{"EBA9}}
+ \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmap\symbol{"EBAA}}
+ \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmap\symbol{"EBAB}}
+ \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmap\symbol{"EBAC}}
+ \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmap\symbol{"EBAD}}
+ \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmap\symbol{"EBAE}}
+ \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmap\symbol{"EBAF}}
+ \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmap\symbol{"EBB0}}
+ \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmap\symbol{"EBB1}}
+ \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmap\symbol{"EBB2}}
+ \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmap\symbol{"EBB3}}
+ \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmap\symbol{"EBB4}}
+ \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmap\symbol{"EBB5}}
+ \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmap\symbol{"EBB6}}
+ \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmap\symbol{"EBB7}}
+ \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmap\symbol{"EBB8}}
+ \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmap\symbol{"EBB9}}
+ \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmap\symbol{"EBBA}}
+ \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmap\symbol{"EBBB}}
+ \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmap\symbol{"EBBC}}
+ \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmap\symbol{"EBBD}}
+ \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmap\symbol{"EBBE}}
+ \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmap\symbol{"EBBF}}
+ \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmap\symbol{"EBC0}}
+ \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmap\symbol{"EBC1}}
+ \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmap\symbol{"EBC2}}
+ \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmap\symbol{"EBC3}}
+ \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmap\symbol{"EBC4}}
+ \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmap\symbol{"EBC5}}
+ \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmap\symbol{"EBC6}}
+ \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmap\symbol{"EBC7}}
+ \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmap\symbol{"EBC8}}
+ \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmap\symbol{"EBC9}}
+ \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmap\symbol{"EBCA}}
+ \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmap\symbol{"EBCB}}
+ \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmap\symbol{"EBCC}}
+ \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmap\symbol{"EBCD}}
+ \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmap\symbol{"EBCE}}
+ \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmap\symbol{"EBCF}}
+ \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmap\symbol{"EBD0}}
+ \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmap\symbol{"EBD1}}
+ \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmap\symbol{"EBD2}}
+ \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmap\symbol{"EBD3}}
+ \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmap\symbol{"EBD4}}
+ \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmap\symbol{"EBD5}}
+ \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmap\symbol{"EBD6}}
+ \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmap\symbol{"EBD7}}
+ \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmap\symbol{"EBD8}}
+ \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmap\symbol{"EBD9}}
+ \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmap\symbol{"EBDA}}
+ \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmap\symbol{"EBDB}}
+ \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmap\symbol{"EBDC}}
+ \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmap\symbol{"EBDD}}
+ \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmap\symbol{"EBDE}}
+ \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmap\symbol{"EBDF}}
+ \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmap\symbol{"EBE0}}
+ \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmap\symbol{"EBE1}}
+ \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmap\symbol{"EBE2}}
+ \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmap\symbol{"EBE3}}
+ \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmap\symbol{"EBE4}}
+ \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmap\symbol{"EBE5}}
+ \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmap\symbol{"EBE6}}
+ \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmap\symbol{"EBE7}}
+ \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmap\symbol{"EBE8}}
+ \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmap\symbol{"EBE9}}
+ \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmap\symbol{"EBEA}}
+ \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmap\symbol{"EBEB}}
+ \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmap\symbol{"EBEC}}
+ \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmap\symbol{"EBED}}
+ \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmap\symbol{"EBEE}}
+ \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmap\symbol{"EBEF}}
+ \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmap\symbol{"EBF0}}
+ \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmap\symbol{"EBF1}}
+ \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmap\symbol{"EBF2}}
+ \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmap\symbol{"EBF3}}
+ \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmap\symbol{"EBF4}}
+ \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmap\symbol{"EBF5}}
+ \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF6}}
+ \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF7}}
+ \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmap\symbol{"EBF8}}
+ \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmap\symbol{"EBF9}}
+ \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmap\symbol{"EBFA}}
+ \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmap\symbol{"EBFB}}
+ \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmap\symbol{"EBFC}}
+ \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmap\symbol{"EBFD}}
+ \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmap\symbol{"EBFE}}
+ \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmap\symbol{"EBFF}}
+ \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmap\symbol{"EC00}}
+ \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmap\symbol{"EC01}}
+ \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmap\symbol{"EC02}}
+ \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmap\symbol{"EC03}}
+ \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmap\symbol{"EC04}}
+ \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmap\symbol{"EC05}}
+ \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmap\symbol{"EC06}}
+ \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmap\symbol{"EC07}}
+ \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmap\symbol{"EC08}}
+ \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmap\symbol{"EC09}}
+ \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmap\symbol{"EC0A}}
+ \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmap\symbol{"EC0B}}
+ \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmap\symbol{"EC0C}}
+ \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmap\symbol{"EC0D}}
+ \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmap\symbol{"EC0E}}
+ \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmap\symbol{"EC0F}}
+ \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmap\symbol{"EC10}}
+ \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmap\symbol{"EC11}}
+ \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmap\symbol{"EC12}}
+ \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmap\symbol{"EC13}}
+ \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmap\symbol{"EC14}}
+ \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmap\symbol{"EC15}}
+ \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmap\symbol{"EC16}}
+ \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmap\symbol{"EC17}}
+ \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmap\symbol{"EC18}}
+ \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmap\symbol{"EC19}}
+ \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmap\symbol{"EC1A}}
+ \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmap\symbol{"EC1B}}
+ \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmap\symbol{"EC1C}}
+ \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmap\symbol{"EC1D}}
+ \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmap\symbol{"EC1E}}
+ \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmap\symbol{"EC1F}}
+ \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmap\symbol{"EC20}}
+ \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmap\symbol{"EC21}}
+ \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmap\symbol{"EC22}}
+ \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmap\symbol{"EC23}}
+ \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmap\symbol{"EC24}}
+ \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmap\symbol{"EC25}}
+ \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmap\symbol{"EC26}}
+ \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmap\symbol{"EC27}}
+ \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmap\symbol{"EC28}}
+ \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmap\symbol{"EC29}}
+ \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmap\symbol{"EC2A}}
+ \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmap\symbol{"EC2B}}
+ \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmap\symbol{"EC2C}}
+ \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmap\symbol{"EC2D}}
+ \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmap\symbol{"EC2E}}
+ \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmap\symbol{"EC2F}}
+ \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmap\symbol{"EC30}}
+ \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmap\symbol{"EC31}}
+ \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmap\symbol{"EC32}}
+ \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmap\symbol{"EC33}}
+ \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmap\symbol{"EC34}}
+ \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmap\symbol{"EC35}}
+ \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmap\symbol{"EC36}}
+ \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmap\symbol{"EC37}}
+ \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmap\symbol{"EC38}}
+ \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmap\symbol{"EC39}}
+ \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmap\symbol{"EC3A}}
+ \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmap\symbol{"EC3B}}
+ \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmap\symbol{"EC3C}}
+ \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmap\symbol{"EC3D}}
+ \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmap\symbol{"EC3E}}
+ \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmap\symbol{"EC3F}}
+ \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmap\symbol{"EC40}}
+ \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmap\symbol{"EC41}}
+ \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmap\symbol{"EC42}}
+ \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmap\symbol{"EC43}}
+ \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmap\symbol{"EC44}}
+ \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmap\symbol{"EC45}}
+ \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmap\symbol{"EC46}}
+ \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmap\symbol{"EC47}}
+ \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmap\symbol{"EC48}}
+ \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmap\symbol{"EC49}}
+ \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmap\symbol{"EC4A}}
+ \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmap\symbol{"EC4B}}
+ \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmap\symbol{"EC4C}}
+ \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmap\symbol{"EC4D}}
+ \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmap\symbol{"EC4E}}
+ \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmap\symbol{"EC4F}}
+ \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmap\symbol{"EC50}}
+ \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmap\symbol{"EC51}}
+ \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmap\symbol{"EC52}}
+ \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmap\symbol{"EC53}}
+ \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmap\symbol{"EC54}}
+ \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmap\symbol{"EC55}}
+ \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmap\symbol{"EC56}}
+ \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmap\symbol{"EC57}}
+ \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmap\symbol{"EC58}}
+ \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmap\symbol{"EC59}}
+ \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmap\symbol{"EC5A}}
+ \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmap\symbol{"EC5B}}
+ \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmap\symbol{"EC5C}}
+ \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmap\symbol{"EC5D}}
+ \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmap\symbol{"EC5E}}
+ \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmap\symbol{"EC5F}}
+ \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmap\symbol{"EC60}}
+ \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmap\symbol{"EC61}}
+ \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmap\symbol{"EC62}}
+ \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmap\symbol{"EC63}}
+ \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmap\symbol{"EC64}}
+ \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmap\symbol{"EC65}}
+ \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmap\symbol{"EC66}}
+ \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmap\symbol{"EC67}}
+ \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmap\symbol{"EC68}}
+ \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmap\symbol{"EC69}}
+ \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmap\symbol{"EC6A}}
+ \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmap\symbol{"EC6B}}
+ \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmap\symbol{"EC6C}}
+ \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmap\symbol{"EC6D}}
+ \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmap\symbol{"EC6E}}
+ \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmap\symbol{"EC6F}}
+ \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmap\symbol{"EC70}}
+ \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmap\symbol{"EC71}}
+ \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmap\symbol{"EC72}}
+ \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmap\symbol{"EC73}}
+ \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmap\symbol{"EC74}}
+ \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmap\symbol{"EC75}}
+ \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmap\symbol{"EC76}}
+ \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmap\symbol{"EC77}}
+ \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmap\symbol{"EC78}}
+ \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmap\symbol{"EC79}}
+ \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmap\symbol{"EC7A}}
+ \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmap\symbol{"EC7B}}
+ \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmap\symbol{"EC7C}}
+ \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmap\symbol{"EC7D}}
+ \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmap\symbol{"EC7E}}
+ \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmap\symbol{"EC7F}}
+ \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmap\symbol{"EC80}}
+ \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmap\symbol{"EC81}}
+ \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmap\symbol{"EC82}}
+ \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmap\symbol{"EC83}}
+ \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmap\symbol{"EC84}}
+ \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmap\symbol{"EC85}}
+ \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmap\symbol{"EC86}}
+ \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmap\symbol{"EC87}}
+ \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmap\symbol{"EC88}}
+ \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmap\symbol{"EC89}}
+ \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmap\symbol{"EC8A}}
+ \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmap\symbol{"EC8B}}
+ \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmap\symbol{"EC8C}}
+ \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmap\symbol{"EC8D}}
+ \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmap\symbol{"EC8E}}
+ \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmap\symbol{"EC8F}}
+ \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmap\symbol{"EC90}}
+ \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmap\symbol{"EC91}}
+ \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmap\symbol{"EC92}}
+ \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmap\symbol{"EC93}}
+ \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmap\symbol{"EC94}}
+ \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmap\symbol{"EC95}}
+ \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmap\symbol{"EC96}}
+ \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmap\symbol{"EC97}}
+ \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmap\symbol{"EC98}}
+ \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmap\symbol{"EC99}}
+ \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmap\symbol{"EC9A}}
+ \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmap\symbol{"EC9B}}
+ \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmap\symbol{"EC9C}}
+ \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmap\symbol{"EC9D}}
+ \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmap\symbol{"EC9E}}
+ \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmap\symbol{"EC9F}}
+ \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmap\symbol{"ECA0}}
+ \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmap\symbol{"ECA1}}
+ \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmap\symbol{"ECA2}}
+ \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmap\symbol{"ECA3}}
+ \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmap\symbol{"ECA4}}
+ \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmap\symbol{"ECA5}}
+ \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmap\symbol{"ECA6}}
+ \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmap\symbol{"ECA7}}
+ \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmap\symbol{"ECA8}}
+ \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmap\symbol{"ECA9}}
+ \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmap\symbol{"ECAA}}
+ \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmap\symbol{"ECAB}}
+ \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmap\symbol{"ECAC}}
+ \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmap\symbol{"ECAD}}
+ \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmap\symbol{"ECAE}}
+ \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmap\symbol{"ECAF}}
+ \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmap\symbol{"ECB0}}
+ \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmap\symbol{"ECB1}}
+ \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmap\symbol{"ECB2}}
+ \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmap\symbol{"ECB3}}
+ \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmap\symbol{"ECB4}}
+ \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmap\symbol{"ECB5}}
+ \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmap\symbol{"ECB6}}
+ \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmap\symbol{"ECB7}}
+ \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmap\symbol{"ECB8}}
+ \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmap\symbol{"ECB9}}
+ \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmap\symbol{"ECBA}}
+ \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmap\symbol{"ECBB}}
+ \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmap\symbol{"ECBC}}
+ \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmap\symbol{"ECBD}}
+ \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmap\symbol{"ECBE}}
+ \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmap\symbol{"ECBF}}
+ \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmap\symbol{"ECC0}}
+ \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmap\symbol{"ECC1}}
+ \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmap\symbol{"ECC2}}
+ \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmap\symbol{"ECC3}}
+ \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmap\symbol{"ECC4}}
+ \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmap\symbol{"ECC5}}
+ \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmap\symbol{"ECC6}}
+ \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmap\symbol{"ECC7}}
+ \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmap\symbol{"ECC8}}
+ \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmap\symbol{"ECC9}}
+ \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmap\symbol{"ECCA}}
+ \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmap\symbol{"ECCB}}
+ \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmap\symbol{"ECCC}}
+ \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmap\symbol{"ECCD}}
+ \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmap\symbol{"ECCE}}
+ \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmap\symbol{"ECCF}}
+ \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmap\symbol{"ECD0}}
+ \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmap\symbol{"ECD1}}
+ \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmap\symbol{"ECD2}}
+ \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmap\symbol{"ECD3}}
+ \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmap\symbol{"ECD4}}
+ \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmap\symbol{"ECD5}}
+ \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmap\symbol{"ECD6}}
+ \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmap\symbol{"ECD7}}
+ \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmap\symbol{"ECD8}}
+ \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmap\symbol{"ECD9}}
+ \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmap\symbol{"ECDA}}
+ \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmap\symbol{"ECDB}}
+ \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmap\symbol{"ECDC}}
+ \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmap\symbol{"ECDD}}
+ \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmap\symbol{"ECDE}}
+ \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmap\symbol{"ECDF}}
+ \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmap\symbol{"ECE0}}
+ \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmap\symbol{"ECE1}}
+ \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmap\symbol{"ECE2}}
+ \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmap\symbol{"ECE3}}
+ \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmap\symbol{"ECE4}}
+ \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmap\symbol{"ECE5}}
+ \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmap\symbol{"ECE6}}
+ \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmap\symbol{"ECE7}}
+ \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmap\symbol{"ECE8}}
+ \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmap\symbol{"ECE9}}
+ \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmap\symbol{"ECEA}}
+ \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmap\symbol{"ECEB}}
+ \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmap\symbol{"ECEC}}
+ \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmap\symbol{"ECED}}
+ \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmap\symbol{"ECEE}}
+ \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmap\symbol{"ECEF}}
+ \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmap\symbol{"ECF0}}
+ \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmap\symbol{"ECF1}}
+ \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmap\symbol{"ECF2}}
+ \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmap\symbol{"ECF3}}
+ \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmap\symbol{"ECF4}}
+ \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmap\symbol{"ECF5}}
+ \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmap\symbol{"ECF6}}
+ \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmap\symbol{"ECF7}}
+ \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmap\symbol{"ECF8}}
+ \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmap\symbol{"ECF9}}
+ \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmap\symbol{"ECFA}}
+ \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmap\symbol{"ECFB}}
+ \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmap\symbol{"ECFC}}
+ \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmap\symbol{"ECFD}}
+ \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmap\symbol{"ECFE}}
+ \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmap\symbol{"ECFF}}
+ \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmap\symbol{"ED00}}
+ \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmap\symbol{"ED01}}
+ \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmap\symbol{"ED02}}
+ \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmap\symbol{"ED03}}
+ \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmap\symbol{"ED04}}
+ \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmap\symbol{"ED05}}
+ \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmap\symbol{"ED06}}
+ \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmap\symbol{"ED07}}
+ \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmap\symbol{"ED08}}
+ \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmap\symbol{"ED09}}
+ \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmap\symbol{"ED0A}}
+ \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmap\symbol{"ED0B}}
+ \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmap\symbol{"ED0C}}
+ \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmap\symbol{"ED0D}}
+ \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmap\symbol{"ED0E}}
+ \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmap\symbol{"ED0F}}
+ \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmap\symbol{"ED10}}
+ \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmap\symbol{"ED11}}
+ \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmap\symbol{"ED12}}
+ \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmap\symbol{"ED13}}
+ \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmap\symbol{"ED14}}
+ \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmap\symbol{"ED15}}
+ \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmap\symbol{"ED16}}
+ \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmap\symbol{"ED17}}
+ \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmap\symbol{"ED18}}
+ \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmap\symbol{"ED19}}
+ \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmap\symbol{"ED1A}}
+ \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmap\symbol{"ED1B}}
+ \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmap\symbol{"ED1C}}
+ \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmap\symbol{"ED1D}}
+ \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmap\symbol{"ED1E}}
+ \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmap\symbol{"ED1F}}
+ \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmap\symbol{"ED20}}
+ \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmap\symbol{"ED21}}
+ \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmap\symbol{"ED22}}
+ \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmap\symbol{"ED23}}
+ \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmap\symbol{"ED24}}
+ \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmap\symbol{"ED25}}
+ \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmap\symbol{"ED26}}
+ \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmap\symbol{"ED27}}
+ \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmap\symbol{"ED28}}
+ \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmap\symbol{"ED29}}
+ \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmap\symbol{"ED2A}}
+ \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmap\symbol{"ED2B}}
+ \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmap\symbol{"ED2C}}
+ \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmap\symbol{"ED2D}}
+ \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmap\symbol{"ED2E}}
+ \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmap\symbol{"ED2F}}
+ \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmap\symbol{"ED30}}
+ \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmap\symbol{"ED31}}
+ \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmap\symbol{"ED32}}
+ \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmap\symbol{"ED33}}
+ \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmap\symbol{"ED34}}
+ \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmap\symbol{"ED35}}
+ \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmap\symbol{"ED36}}
+ \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmap\symbol{"ED37}}
+ \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmap\symbol{"ED38}}
+ \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmap\symbol{"ED39}}
+ \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmap\symbol{"ED3A}}
+ \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmap\symbol{"ED3B}}
+ \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmap\symbol{"ED3C}}
+ \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmap\symbol{"ED3D}}
+ \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmap\symbol{"ED3E}}
+ \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmap\symbol{"ED3F}}
+ \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmap\symbol{"ED40}}
+ \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmap\symbol{"ED41}}
+ \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmap\symbol{"ED42}}
+ \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmap\symbol{"ED43}}
+ \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmap\symbol{"ED44}}
+ \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmap\symbol{"ED45}}
+ \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmap\symbol{"ED46}}
+ \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmap\symbol{"ED47}}
+ \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmap\symbol{"ED48}}
+ \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmap\symbol{"ED49}}
+ \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmap\symbol{"ED4A}}
+ \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmap\symbol{"ED4B}}
+ \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmap\symbol{"ED4C}}
+ \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmap\symbol{"ED4D}}
+ \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmap\symbol{"ED4E}}
+ \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmap\symbol{"ED4F}}
+ \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmap\symbol{"ED50}}
+ \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmap\symbol{"ED51}}
+ \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmap\symbol{"ED52}}
+ \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmap\symbol{"ED53}}
+ \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmap\symbol{"ED54}}
+ \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmap\symbol{"ED55}}
+ \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmap\symbol{"ED56}}
+ \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmap\symbol{"ED57}}
+ \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmap\symbol{"ED58}}
+ \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmap\symbol{"ED59}}
+ \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmap\symbol{"ED5A}}
+ \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmap\symbol{"ED5B}}
+ \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmap\symbol{"ED5C}}
+ \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmap\symbol{"ED5D}}
+ \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmap\symbol{"ED5E}}
+ \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmap\symbol{"ED5F}}
+ \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmap\symbol{"ED60}}
+ \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmap\symbol{"ED61}}
+ \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmap\symbol{"ED62}}
+ \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmap\symbol{"ED63}}
+ \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmap\symbol{"ED64}}
+ \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmap\symbol{"ED65}}
+ \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmap\symbol{"ED66}}
+ \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmap\symbol{"ED67}}
+ \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmap\symbol{"ED68}}
+ \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmap\symbol{"ED69}}
+ \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmap\symbol{"ED6A}}
+ \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmap\symbol{"ED6B}}
+ \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmap\symbol{"ED6C}}
+ \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmap\symbol{"ED6D}}
+ \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmap\symbol{"ED6E}}
+ \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmap\symbol{"ED6F}}
+ \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmap\symbol{"ED70}}
+ \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmap\symbol{"ED71}}
+ \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmap\symbol{"ED72}}
+ \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmap\symbol{"ED73}}
+ \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmap\symbol{"ED74}}
+ \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmap\symbol{"ED75}}
+ \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmap\symbol{"ED76}}
+ \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmap\symbol{"ED77}}
+ \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmap\symbol{"ED78}}
+ \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmap\symbol{"ED79}}
+ \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmap\symbol{"ED7A}}
+ \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmap\symbol{"ED7B}}
+ \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmap\symbol{"ED7C}}
+ \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmap\symbol{"ED7D}}
+ \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmap\symbol{"ED7E}}
+ \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmap\symbol{"ED7F}}
+ \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmap\symbol{"ED80}}
+ \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmap\symbol{"ED81}}
+ \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmap\symbol{"ED82}}
+ \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmap\symbol{"ED83}}
+ \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmap\symbol{"ED84}}
+ \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmap\symbol{"ED85}}
+ \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmap\symbol{"ED86}}
+ \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmap\symbol{"ED87}}
+ \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmap\symbol{"ED88}}
+ \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmap\symbol{"ED89}}
+ \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmap\symbol{"ED8A}}
+ \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmap\symbol{"ED8B}}
+ \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmap\symbol{"ED8C}}
+ \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmap\symbol{"ED8D}}
+ \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmap\symbol{"ED8E}}
+ \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmap\symbol{"ED8F}}
+ \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmap\symbol{"ED90}}
+ \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmap\symbol{"ED91}}
+ \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmap\symbol{"ED92}}
+ \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmap\symbol{"ED93}}
+ \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmap\symbol{"ED94}}
+ \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmap\symbol{"ED95}}
+ \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmap\symbol{"ED96}}
+ \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmap\symbol{"ED97}}
+ \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmap\symbol{"ED98}}
+ \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmap\symbol{"ED99}}
+ \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmap\symbol{"ED9A}}
+ \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmap\symbol{"ED9B}}
+ \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmap\symbol{"ED9C}}
+ \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmap\symbol{"ED9D}}
+ \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmap\symbol{"ED9E}}
+ \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmap\symbol{"ED9F}}
+ \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmap\symbol{"EDA0}}
+ \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmap\symbol{"EDA1}}
+ \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmap\symbol{"EDA2}}
+ \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmap\symbol{"EDA3}}
+ \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmap\symbol{"EDA4}}
+ \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmap\symbol{"EDA5}}
+ \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmap\symbol{"EDA6}}
+ \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmap\symbol{"EDA7}}
+ \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmap\symbol{"EDA8}}
+ \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmap\symbol{"EDA9}}
+ \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmap\symbol{"EDAA}}
+ \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmap\symbol{"EDAB}}
+ \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmap\symbol{"EDAC}}
+ \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmap\symbol{"EDAD}}
+ \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmap\symbol{"EDAE}}
+ \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmap\symbol{"EDAF}}
+ \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmap\symbol{"EDB0}}
+ \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmap\symbol{"EDB1}}
+ \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmap\symbol{"EDB2}}
+ \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmap\symbol{"EDB3}}
+ \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmap\symbol{"EDB4}}
+ \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmap\symbol{"EDB5}}
+ \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmap\symbol{"EDB6}}
+ \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmap\symbol{"EDB7}}
+ \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmap\symbol{"EDB8}}
+ \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmap\symbol{"EDB9}}
+ \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmap\symbol{"EDBA}}
+ \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmap\symbol{"EDBB}}
+ \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmap\symbol{"EDBC}}
+ \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmap\symbol{"EDBD}}
+ \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmap\symbol{"EDBE}}
+ \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmap\symbol{"EDBF}}
+ \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmap\symbol{"EDC0}}
+ \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmap\symbol{"EDC1}}
+ \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmap\symbol{"EDC2}}
+ \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmap\symbol{"EDC3}}
+ \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmap\symbol{"EDC4}}
+ \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmap\symbol{"EDC5}}
+ \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmap\symbol{"EDC6}}
+ \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmap\symbol{"EDC7}}
+ \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmap\symbol{"EDC8}}
+ \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmap\symbol{"EDC9}}
+ \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmap\symbol{"EDCA}}
+ \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmap\symbol{"EDCB}}
+ \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmap\symbol{"EDCC}}
+ \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmap\symbol{"EDCD}}
+ \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmap\symbol{"EDCE}}
+ \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmap\symbol{"EDCF}}
+ \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmap\symbol{"EDD0}}
+ \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmap\symbol{"EDD1}}
+ \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmap\symbol{"EDD2}}
+ \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmap\symbol{"EDD3}}
+ \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmap\symbol{"EDD4}}
+ \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmap\symbol{"EDD5}}
+ \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmap\symbol{"EDD6}}
+ \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmap\symbol{"EDD7}}
+ \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmap\symbol{"EDD8}}
+ \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmap\symbol{"EDD9}}
+ \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmap\symbol{"EDDA}}
+ \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmap\symbol{"EDDB}}
+ \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmap\symbol{"EDDC}}
+ \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmap\symbol{"EDDD}}
+ \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmap\symbol{"EDDE}}
+ \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmap\symbol{"EDDF}}
+ \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmap\symbol{"EDE0}}
+ \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmap\symbol{"EDE1}}
+ \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmap\symbol{"EDE2}}
+ \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmap\symbol{"EDE3}}
+ \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmap\symbol{"EDE4}}
+ \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmap\symbol{"EDE5}}
+ \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmap\symbol{"EDE6}}
+ \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmap\symbol{"EDE7}}
+ \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmap\symbol{"EDE8}}
+ \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmap\symbol{"EDE9}}
+ \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmap\symbol{"EDEA}}
+ \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmap\symbol{"EDEB}}
+ \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmap\symbol{"EDEC}}
+ \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmap\symbol{"EDED}}
+ \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmap\symbol{"EDEE}}
+ \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmap\symbol{"EDEF}}
+ \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmap\symbol{"EDF0}}
+ \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmap\symbol{"EDF1}}
+ \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmap\symbol{"EDF2}}
+ \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmap\symbol{"EDF3}}
+ \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmap\symbol{"EDF4}}
+ \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmap\symbol{"EDF5}}
+ \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmap\symbol{"EDF6}}
+ \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmap\symbol{"EDF7}}
+ \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmap\symbol{"EDF8}}
+ \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmap\symbol{"EDF9}}
+ \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmap\symbol{"EDFA}}
+ \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmap\symbol{"EDFB}}
+ \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmap\symbol{"EDFC}}
+ \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmap\symbol{"EDFD}}
+ \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmap\symbol{"EDFE}}
+ \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmap\symbol{"EDFF}}
+ \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmap\symbol{"EE00}}
+ \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmap\symbol{"EE01}}
+ \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmap\symbol{"EE02}}
+ \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmap\symbol{"EE03}}
+ \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmap\symbol{"EE04}}
+ \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmap\symbol{"EE05}}
+ \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmap\symbol{"EE06}}
+ \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmap\symbol{"EE07}}
+ \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmap\symbol{"EE08}}
+ \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmap\symbol{"EE09}}
+ \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmap\symbol{"EE0A}}
+ \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmap\symbol{"EE0B}}
+ \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmap\symbol{"EE0C}}
+ \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmap\symbol{"EE0D}}
+ \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmap\symbol{"EE0E}}
+ \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmap\symbol{"EE0F}}
+ \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmap\symbol{"EE10}}
+ \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmap\symbol{"EE11}}
+ \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmap\symbol{"EE12}}
+ \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmap\symbol{"EE13}}
+ \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmap\symbol{"EE14}}
+ \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmap\symbol{"EE15}}
+ \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmap\symbol{"EE16}}
+ \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmap\symbol{"EE17}}
+ \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmap\symbol{"EE18}}
+ \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmap\symbol{"EE19}}
+ \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmap\symbol{"EE1A}}
+ \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmap\symbol{"EE1B}}
+ \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmap\symbol{"EE1C}}
+ \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmap\symbol{"EE1D}}
+ \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmap\symbol{"EE1E}}
+ \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmap\symbol{"EE1F}}
+ \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmap\symbol{"EE20}}
+ \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmap\symbol{"EE21}}
+ \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmap\symbol{"EE22}}
+ \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmap\symbol{"EE23}}
+ \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmap\symbol{"EE24}}
+ \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmap\symbol{"EE25}}
+ \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmap\symbol{"EE26}}
+ \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmap\symbol{"EE27}}
+ \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmap\symbol{"EE28}}
+ \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmap\symbol{"EE29}}
+ \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmap\symbol{"EE2A}}
+ \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmap\symbol{"EE2B}}
+ \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmap\symbol{"EE2C}}
+ \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmap\symbol{"EE2D}}
+ \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmap\symbol{"EE2E}}
+ \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmap\symbol{"EE2F}}
+ \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmap\symbol{"EE30}}
+ \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmap\symbol{"EE31}}
+ \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmap\symbol{"EE32}}
+ \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmap\symbol{"EE33}}
+ \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmap\symbol{"EE34}}
+ \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmap\symbol{"EE35}}
+ \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmap\symbol{"EE36}}
+ \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmap\symbol{"EE37}}
+ \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmap\symbol{"EE38}}
+ \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmap\symbol{"EE39}}
+ \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmap\symbol{"EE3A}}
+ \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmap\symbol{"EE3B}}
+ \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmap\symbol{"EE3C}}
+ \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmap\symbol{"EE3D}}
+ \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmap\symbol{"EE3E}}
+ \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmap\symbol{"EE3F}}
+ \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmap\symbol{"EE40}}
+ \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmap\symbol{"EE41}}
+ \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmap\symbol{"EE42}}
+ \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmap\symbol{"EE43}}
+ \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmap\symbol{"EE44}}
+ \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmap\symbol{"EE45}}
+ \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmap\symbol{"EE46}}
+ \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmap\symbol{"EE47}}
+ \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmap\symbol{"EE48}}
+ \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmap\symbol{"EE49}}
+ \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmap\symbol{"EE4A}}
+ \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmap\symbol{"EE4B}}
+ \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmap\symbol{"EE4C}}
+ \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmap\symbol{"EE4D}}
+ \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmap\symbol{"EE4E}}
+ \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmap\symbol{"EE4F}}
+ \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmap\symbol{"EE50}}
+ \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EE51}}
+ \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmap\symbol{"EE52}}
+ \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmap\symbol{"EE53}}
+ \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmap\symbol{"EE54}}
+ \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmap\symbol{"EE55}}
+ \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmap\symbol{"EE56}}
+ \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmap\symbol{"EE57}}
+ \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmap\symbol{"EE58}}
+ \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmap\symbol{"EE59}}
+ \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmap\symbol{"EE5A}}
+ \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmap\symbol{"EE5B}}
+ \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmap\symbol{"EE5C}}
+ \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmap\symbol{"EE5D}}
+ \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmap\symbol{"EE5E}}
+ \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmap\symbol{"EE5F}}
+ \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmap\symbol{"EE60}}
+ \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmap\symbol{"EE61}}
+ \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmap\symbol{"EE62}}
+ \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmap\symbol{"EE63}}
+ \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmap\symbol{"EE64}}
+ \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmap\symbol{"EE65}}
+ \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmap\symbol{"EE66}}
+ \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmap\symbol{"EE67}}
+ \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmap\symbol{"EE68}}
+ \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmap\symbol{"EE69}}
+ \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmap\symbol{"EE6A}}
+ \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmap\symbol{"EE6B}}
+ \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmap\symbol{"EE6C}}
+ \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmap\symbol{"EE6D}}
+ \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmap\symbol{"EE6E}}
+ \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmap\symbol{"EE6F}}
+ \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmap\symbol{"EE70}}
+ \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmap\symbol{"EE71}}
+ \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmap\symbol{"EE72}}
+ \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmap\symbol{"EE73}}
+ \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmap\symbol{"EE74}}
+ \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmap\symbol{"EE75}}
+ \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmap\symbol{"EE76}}
+ \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmap\symbol{"EE77}}
+ \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmap\symbol{"EE78}}
+ \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmap\symbol{"EE79}}
+ \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmap\symbol{"EE7A}}
+ \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmap\symbol{"EE7B}}
+ \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmap\symbol{"EE7C}}
+ \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmap\symbol{"EE7D}}
+ \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmap\symbol{"EE7E}}
+ \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmap\symbol{"EE7F}}
+ \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmap\symbol{"EE80}}
+ \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmap\symbol{"EE81}}
+ \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmap\symbol{"EE82}}
+ \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmap\symbol{"EE83}}
+ \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmap\symbol{"EE84}}
+ \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmap\symbol{"EE85}}
+ \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmap\symbol{"EE86}}
+ \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmap\symbol{"EE87}}
+ \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmap\symbol{"EE88}}
+ \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmap\symbol{"EE89}}
+ \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmap\symbol{"EE8A}}
+ \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmap\symbol{"EE8B}}
+ \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmap\symbol{"EE8C}}
+ \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmap\symbol{"EE8D}}
+ \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmap\symbol{"EE8E}}
+ \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmap\symbol{"EE8F}}
+ \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmap\symbol{"EE90}}
+ \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmap\symbol{"EE91}}
+ \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmap\symbol{"EE92}}
+ \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmap\symbol{"EE93}}
+ \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmap\symbol{"EE94}}
+ \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmap\symbol{"EE95}}
+ \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmap\symbol{"EE96}}
+ \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmap\symbol{"EE97}}
+ \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmap\symbol{"EE98}}
+ \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmap\symbol{"EE99}}
+ \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmap\symbol{"EE9A}}
+ \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmap\symbol{"EE9B}}
+ \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmap\symbol{"EE9C}}
+ \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmap\symbol{"EE9D}}
+ \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmap\symbol{"EE9E}}
+ \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmap\symbol{"EE9F}}
+ \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmap\symbol{"EEA0}}
+ \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmap\symbol{"EEA1}}
+ \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmap\symbol{"EEA2}}
+ \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmap\symbol{"EEA3}}
+ \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmap\symbol{"EEA4}}
+ \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmap\symbol{"EEA5}}
+ \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmap\symbol{"EEA6}}
+ \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmap\symbol{"EEA7}}
+ \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmap\symbol{"EEA8}}
+ \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmap\symbol{"EEA9}}
+ \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmap\symbol{"EEAA}}
+ \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmap\symbol{"EEAB}}
+ \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmap\symbol{"EEAC}}
+ \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmap\symbol{"EEAD}}
+ \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmap\symbol{"EEAE}}
+ \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmap\symbol{"EEAF}}
+ \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmap\symbol{"EEB0}}
+ \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmap\symbol{"EEB1}}
+ \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmap\symbol{"EEB2}}
+ \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmap\symbol{"EEB3}}
+ \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmap\symbol{"EEB4}}
+ \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmap\symbol{"EEB5}}
+ \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmap\symbol{"EEB6}}
+ \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmap\symbol{"EEB7}}
+ \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmap\symbol{"EEB8}}
+ \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmap\symbol{"EEB9}}
+ \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmap\symbol{"EEBA}}
+ \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmap\symbol{"EEBB}}
+ \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmap\symbol{"EEBC}}
+ \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmap\symbol{"EEBD}}
+ \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmap\symbol{"EEBE}}
+ \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmap\symbol{"EEBF}}
+ \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmap\symbol{"EEC0}}
+ \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmap\symbol{"EEC1}}
+ \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmap\symbol{"EEC2}}
+ \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmap\symbol{"EEC3}}
+ \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmap\symbol{"EEC4}}
+ \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmap\symbol{"EEC5}}
+ \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmap\symbol{"EEC6}}
+ \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmap\symbol{"EEC7}}
+ \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmap\symbol{"EEC8}}
+ \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmap\symbol{"EEC9}}
+ \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmap\symbol{"EECA}}
+ \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmap\symbol{"EECB}}
+ \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmap\symbol{"EECC}}
+ \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmap\symbol{"EECD}}
+ \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmap\symbol{"EECE}}
+ \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmap\symbol{"EECF}}
+ \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmap\symbol{"EED0}}
+ \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmap\symbol{"EED1}}
+ \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmap\symbol{"EED2}}
+ \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmap\symbol{"EED3}}
+ \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmap\symbol{"EED4}}
+ \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmap\symbol{"EED5}}
+ \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmap\symbol{"EED6}}
+ \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmap\symbol{"EED7}}
+ \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmap\symbol{"EED8}}
+ \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmap\symbol{"EED9}}
+ \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmap\symbol{"EEDA}}
+ \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmap\symbol{"EEDB}}
+ \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmap\symbol{"EEDC}}
+ \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmap\symbol{"EEDD}}
+ \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmap\symbol{"EEDE}}
+ \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmap\symbol{"EEDF}}
+ \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmap\symbol{"EEE0}}
+ \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmap\symbol{"EEE1}}
+ \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmap\symbol{"EEE2}}
+ \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmap\symbol{"EEE3}}
+ \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmap\symbol{"EEE4}}
+ \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmap\symbol{"EEE5}}
+ \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmap\symbol{"EEE6}}
+ \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmap\symbol{"EEE7}}
+ \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmap\symbol{"EEE8}}
+ \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmap\symbol{"EEE9}}
+ \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmap\symbol{"EEEA}}
+ \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmap\symbol{"EEEB}}
+ \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmap\symbol{"EEEC}}
+ \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmap\symbol{"EEED}}
+ \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmap\symbol{"EEEE}}
+ \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmap\symbol{"EEEF}}
+ \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmap\symbol{"EEF0}}
+ \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmap\symbol{"EEF1}}
+ \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmap\symbol{"EEF2}}
+ \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmap\symbol{"EEF3}}
+ \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmap\symbol{"EEF4}}
+ \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmap\symbol{"EEF5}}
+ \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmap\symbol{"EEF6}}
+ \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmap\symbol{"EEF7}}
+ \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmap\symbol{"EEF8}}
+ \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmap\symbol{"EEF9}}
+ \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmap\symbol{"EEFA}}
+ \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmap\symbol{"EEFB}}
+ \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmap\symbol{"EEFC}}
+ \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmap\symbol{"EEFD}}
+ \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmap\symbol{"EEFE}}
+ \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmap\symbol{"EEFF}}
+ \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmap\symbol{"EF00}}
+ \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmap\symbol{"EF01}}
+ \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmap\symbol{"EF02}}
+ \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmap\symbol{"EF03}}
+ \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmap\symbol{"EF04}}
+ \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmap\symbol{"EF05}}
+ \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmap\symbol{"EF06}}
+ \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmap\symbol{"EF07}}
+ \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmap\symbol{"EF08}}
+ \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmap\symbol{"EF09}}
+ \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmap\symbol{"EF0A}}
+ \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmap\symbol{"EF0B}}
+ \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmap\symbol{"EF0C}}
+ \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmap\symbol{"EF0D}}
+ \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmap\symbol{"EF0E}}
+ \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmap\symbol{"EF0F}}
+ \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmap\symbol{"EF10}}
+ \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmap\symbol{"EF11}}
+ \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmap\symbol{"EF12}}
+ \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmap\symbol{"EF13}}
+ \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmap\symbol{"EF14}}
+ \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmap\symbol{"EF15}}
+ \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmap\symbol{"EF16}}
+ \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmap\symbol{"EF17}}
+ \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmap\symbol{"EF18}}
+ \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmap\symbol{"EF19}}
+ \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmap\symbol{"EF1A}}
+ \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmap\symbol{"EF1B}}
+ \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmap\symbol{"EF1C}}
+ \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmap\symbol{"EF1D}}
+ \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmap\symbol{"EF1E}}
+ \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmap\symbol{"EF1F}}
+ \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmap\symbol{"EF20}}
+ \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmap\symbol{"EF21}}
+ \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmap\symbol{"EF22}}
+ \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmap\symbol{"EF23}}
+ \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmap\symbol{"EF24}}
+ \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmap\symbol{"EF25}}
+ \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmap\symbol{"EF26}}
+ \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmap\symbol{"EF27}}
+ \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmap\symbol{"EF28}}
+ \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmap\symbol{"EF29}}
+ \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmap\symbol{"EF2A}}
+ \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmap\symbol{"EF2B}}
+ \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmap\symbol{"EF2C}}
+ \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmap\symbol{"EF2D}}
+ \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmap\symbol{"EF2E}}
+ \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmap\symbol{"EF2F}}
+ \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmap\symbol{"EF30}}
+ \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmap\symbol{"EF31}}
+ \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmap\symbol{"EF32}}
+ \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmap\symbol{"EF33}}
+ \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmap\symbol{"EF34}}
+ \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmap\symbol{"EF35}}
+ \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmap\symbol{"EF36}}
+ \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmap\symbol{"EF37}}
+ \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmap\symbol{"EF38}}
+ \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmap\symbol{"EF39}}
+ \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmap\symbol{"EF3A}}
+ \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmap\symbol{"EF3B}}
+ \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmap\symbol{"EF3C}}
+ \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmap\symbol{"EF3D}}
+ \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmap\symbol{"EF3E}}
+ \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmap\symbol{"EF3F}}
+ \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmap\symbol{"EF40}}
+ \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmap\symbol{"EF41}}
+ \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmap\symbol{"EF42}}
+ \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmap\symbol{"EF43}}
+ \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmap\symbol{"EF44}}
+ \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmap\symbol{"EF45}}
+ \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmap\symbol{"EF46}}
+ \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmap\symbol{"EF47}}
+ \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmap\symbol{"EF48}}
+ \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmap\symbol{"EF49}}
+ \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmap\symbol{"EF4A}}
+ \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmap\symbol{"EF4B}}
+ \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmap\symbol{"EF4C}}
+ \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmap\symbol{"EF4D}}
+ \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmap\symbol{"EF4E}}
+ \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmap\symbol{"EF4F}}
+ \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmap\symbol{"EF50}}
+ \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmap\symbol{"EF51}}
+ \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmap\symbol{"EF52}}
+ \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmap\symbol{"EF53}}
+ \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmap\symbol{"EF54}}
+ \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmap\symbol{"EF55}}
+ \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmap\symbol{"EF56}}
+ \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmap\symbol{"EF57}}
+ \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmap\symbol{"EF58}}
+ \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmap\symbol{"EF59}}
+ \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmap\symbol{"EF5A}}
+ \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmap\symbol{"EF5B}}
+ \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmap\symbol{"EF5C}}
+ \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmap\symbol{"EF5D}}
+ \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmap\symbol{"EF5E}}
+ \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmap\symbol{"EF5F}}
+ \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmap\symbol{"EF60}}
+ \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmap\symbol{"EF61}}
+ \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmap\symbol{"EF62}}
+ \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmap\symbol{"EF63}}
+ \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmap\symbol{"EF64}}
+ \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmap\symbol{"EF65}}
+ \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmap\symbol{"EF66}}
+ \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmap\symbol{"EF67}}
+ \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmap\symbol{"EF68}}
+ \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmap\symbol{"EF69}}
+ \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmap\symbol{"EF6A}}
+ \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmap\symbol{"EF6B}}
+ \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmap\symbol{"EF6C}}
+ \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmap\symbol{"EF6D}}
+ \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmap\symbol{"EF6E}}
+ \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmap\symbol{"EF6F}}
+ \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmap\symbol{"EF70}}
+ \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmap\symbol{"EF71}}
+ \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmap\symbol{"EF72}}
+ \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmap\symbol{"EF73}}
+ \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmap\symbol{"EF74}}
+ \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmap\symbol{"EF75}}
+ \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmap\symbol{"EF76}}
+ \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmap\symbol{"EF77}}
+ \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmap\symbol{"EF78}}
+ \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmap\symbol{"EF79}}
+ \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmap\symbol{"EF7A}}
+ \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmap\symbol{"EF7B}}
+ \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmap\symbol{"EF7C}}
+ \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmap\symbol{"EF7D}}
+ \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmap\symbol{"EF7E}}
+ \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmap\symbol{"EF7F}}
+ \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmap\symbol{"EF80}}
+ \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmap\symbol{"EF81}}
+ \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmap\symbol{"EF82}}
+ \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmap\symbol{"EF83}}
+ \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmap\symbol{"EF84}}
+ \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmap\symbol{"EF85}}
+ \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmap\symbol{"EF86}}
+ \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmap\symbol{"EF87}}
+ \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmap\symbol{"EF88}}
+ \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmap\symbol{"EF89}}
+ \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmap\symbol{"EF8A}}
+ \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmap\symbol{"EF8B}}
+ \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmap\symbol{"EF8C}}
+ \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmap\symbol{"EF8D}}
+ \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmap\symbol{"EF8E}}
+ \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmap\symbol{"EF8F}}
+ \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmap\symbol{"EF90}}
+ \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmap\symbol{"EF91}}
+ \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmap\symbol{"EF92}}
+ \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmap\symbol{"EF93}}
+ \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmap\symbol{"EF94}}
+ \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmap\symbol{"EF95}}
+ \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmap\symbol{"EF96}}
+ \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmap\symbol{"EF97}}
+ \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmap\symbol{"EF98}}
+ \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmap\symbol{"EF99}}
+ \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmap\symbol{"EF9A}}
+ \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmap\symbol{"EF9B}}
+ \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmap\symbol{"EF9C}}
+ \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmap\symbol{"EF9D}}
+ \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmap\symbol{"EF9E}}
+ \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmap\symbol{"EF9F}}
+ \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmap\symbol{"EFA0}}
+ \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmap\symbol{"EFA1}}
+ \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmap\symbol{"EFA2}}
+ \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmap\symbol{"EFA3}}
+ \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmap\symbol{"EFA4}}
+ \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmap\symbol{"EFA5}}
+ \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmap\symbol{"EFA6}}
+ \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmap\symbol{"EFA7}}
+ \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmap\symbol{"EFA8}}
+ \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmap\symbol{"EFA9}}
+ \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmap\symbol{"EFAA}}
+ \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmap\symbol{"EFAB}}
+ \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmap\symbol{"EFAC}}
+ \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmap\symbol{"EFAD}}
+ \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmap\symbol{"EFAE}}
+ \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmap\symbol{"EFAF}}
+ \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmap\symbol{"EFB0}}
+ \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmap\symbol{"EFB1}}
+ \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmap\symbol{"EFB2}}
+ \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmap\symbol{"EFB3}}
+ \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmap\symbol{"EFB4}}
+ \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmap\symbol{"EFB5}}
+ \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmap\symbol{"EFB6}}
+ \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmap\symbol{"EFB7}}
+ \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmap\symbol{"EFB8}}
+ \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmap\symbol{"EFB9}}
+ \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmap\symbol{"EFBA}}
+ \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmap\symbol{"EFBB}}
+ \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmap\symbol{"EFBC}}
+ \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmap\symbol{"EFBD}}
+ \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmap\symbol{"EFBE}}
+ \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmap\symbol{"EFBF}}
+ \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmap\symbol{"EFC0}}
+ \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmap\symbol{"EFC1}}
+ \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmap\symbol{"EFC2}}
+ \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmap\symbol{"EFC3}}
+ \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmap\symbol{"EFC4}}
+ \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmap\symbol{"EFC5}}
+ \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmap\symbol{"EFC6}}
+ \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmap\symbol{"EFC7}}
+ \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmap\symbol{"EFC8}}
+ \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmap\symbol{"EFC9}}
+ \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmap\symbol{"EFCA}}
+ \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmap\symbol{"EFCB}}
+ \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmap\symbol{"EFCC}}
+ \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmap\symbol{"EFCD}}
+ \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmap\symbol{"EFCE}}
+ \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmap\symbol{"EFCF}}
+ \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmap\symbol{"EFD0}}
+ \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmap\symbol{"EFD1}}
+ \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmap\symbol{"EFD2}}
+ \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmap\symbol{"EFD3}}
+ \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmap\symbol{"EFD4}}
+ \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmap\symbol{"EFD5}}
+ \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmap\symbol{"EFD6}}
+ \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmap\symbol{"EFD7}}
+ \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmap\symbol{"EFD8}}
+ \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmap\symbol{"EFD9}}
+ \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmap\symbol{"EFDA}}
+ \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmap\symbol{"EFDB}}
+ \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmap\symbol{"EFDC}}
+ \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmap\symbol{"EFDD}}
+ \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmap\symbol{"EFDE}}
+ \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmap\symbol{"EFDF}}
+ \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmap\symbol{"EFE0}}
+ \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmap\symbol{"EFE1}}
+ \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmap\symbol{"EFE2}}
+ \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmap\symbol{"EFE3}}
+ \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmap\symbol{"EFE4}}
+ \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmap\symbol{"EFE5}}
+ \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFE6}}
+ \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFE7}}
+ \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFE8}}
+ \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFE9}}
+ \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFEA}}
+ \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFEB}}
+ \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFEC}}
+ \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFED}}
+ \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"EFEE}}
+ \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"EFEF}}
+ \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"EFF0}}
+ \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"EFF1}}
+ \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"EFF2}}
+ \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"EFF3}}
+ \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"EFF4}}
+ \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"EFF5}}
+ \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"EFF6}}
+ \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"EFF7}}
+ \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"EFF8}}
+ \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"EFF9}}
+ \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"EFFA}}
+ \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"EFFB}}
+ \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"EFFC}}
+ \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"EFFD}}
+ \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"EFFE}}
+ \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"EFFF}}
+ \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F000}}
+ \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F001}}
+ \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F002}}
+ \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F003}}
+ \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F004}}
+ \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F005}}
+ \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F006}}
+ \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F007}}
+ \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F008}}
+ \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F009}}
+ \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F00A}}
+ \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F00B}}
+ \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F00C}}
+ \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F00D}}
+ \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F00E}}
+ \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F00F}}
+ \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F010}}
+ \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F011}}
+ \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F012}}
+ \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F013}}
+ \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F014}}
+ \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F015}}
+ \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F016}}
+ \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F017}}
+ \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F018}}
+ \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F019}}
+ \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F01A}}
+ \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F01B}}
+ \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F01C}}
+ \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F01D}}
+ \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F01E}}
+ \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F01F}}
+ \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F020}}
+ \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F021}}
+ \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F022}}
+ \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F023}}
+ \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F024}}
+ \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F025}}
+ \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F026}}
+ \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F027}}
+ \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F028}}
+ \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F029}}
+ \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F02A}}
+ \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F02B}}
+ \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F02C}}
+ \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F02D}}
+ \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F02E}}
+ \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F02F}}
+ \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F030}}
+ \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F031}}
+ \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F032}}
+ \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F033}}
+ \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F034}}
+ \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F035}}
+ \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F036}}
+ \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F037}}
+ \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F038}}
+ \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F039}}
+ \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F03A}}
+ \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F03B}}
+ \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F03C}}
+ \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F03D}}
+ \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F03E}}
+ \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F03F}}
+ \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F040}}
+ \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F041}}
+ \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F042}}
+ \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F043}}
+ \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F044}}
+ \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F045}}
+ \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F046}}
+ \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F047}}
+ \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F048}}
+ \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F049}}
+ \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F04A}}
+ \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F04B}}
+ \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F04C}}
+ \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F04D}}
+ \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F04E}}
+ \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F04F}}
+ \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F050}}
+ \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F051}}
+ \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F052}}
+ \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F053}}
+ \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F054}}
+ \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F055}}
+ \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F056}}
+ \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F057}}
+ \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F058}}
+ \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F059}}
+ \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F05A}}
+ \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F05B}}
+ \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F05C}}
+ \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F05D}}
+ \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F05E}}
+ \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F05F}}
+ \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F060}}
+ \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F061}}
+ \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F062}}
+ \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F063}}
+ \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F064}}
+ \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F065}}
+ \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F066}}
+ \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F067}}
+ \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F068}}
+ \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F069}}
+ \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F06A}}
+ \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F06B}}
+ \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F06C}}
+ \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F06D}}
+ \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F06E}}
+ \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F06F}}
+ \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F070}}
+ \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F071}}
+ \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F072}}
+ \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F073}}
+ \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F074}}
+ \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F075}}
+ \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F076}}
+ \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F077}}
+ \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F078}}
+ \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F079}}
+ \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F07A}}
+ \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F07B}}
+ \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F07C}}
+ \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F07D}}
+ \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F07E}}
+ \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F07F}}
+ \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F080}}
+ \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F081}}
+ \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F082}}
+ \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F083}}
+ \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F084}}
+ \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F085}}
+ \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F086}}
+ \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F087}}
+ \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F088}}
+ \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F089}}
+ \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F08A}}
+ \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F08B}}
+ \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F08C}}
+ \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F08D}}
+ \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F08E}}
+ \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F08F}}
+ \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F090}}
+ \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F091}}
+ \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F092}}
+ \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F093}}
+ \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F094}}
+ \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F095}}
+ \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F096}}
+ \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F097}}
+ \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F098}}
+ \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F099}}
+ \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F09A}}
+ \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F09B}}
+ \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F09C}}
+ \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F09D}}
+ \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F09E}}
+ \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F09F}}
+ \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0A0}}
+ \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0A1}}
+ \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0A2}}
+ \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0A3}}
+ \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0A4}}
+ \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0A5}}
+ \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0A6}}
+ \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0A7}}
+ \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0A8}}
+ \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0A9}}
+ \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0AA}}
+ \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0AB}}
+ \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0AC}}
+ \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0AD}}
+ \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0AE}}
+ \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0AF}}
+ \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0B0}}
+ \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0B1}}
+ \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0B2}}
+ \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0B3}}
+ \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0B4}}
+ \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0B5}}
+ \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0B6}}
+ \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0B7}}
+ \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0B8}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0B9}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0BA}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0BB}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0BC}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0BD}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0BE}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0BF}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0C0}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0C1}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0C2}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0C3}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0C4}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0C5}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0C6}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0C7}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0C8}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0C9}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0CA}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0CB}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0CC}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0CD}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0CE}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0CF}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0D0}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0D1}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0D2}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0D3}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0D4}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0D5}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0D6}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0D7}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0D8}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0D9}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0DA}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0DB}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0DC}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0DD}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0DE}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0DF}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0E0}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0E1}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0E2}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0E3}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0E4}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0E5}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0E6}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0E7}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0E8}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0E9}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0EA}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0EB}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0EC}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0ED}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0EE}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0EF}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0F0}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0F1}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0F2}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0F3}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0F4}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0F5}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F0F6}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F0F7}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F0F8}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F0F9}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F0FA}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F0FB}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F0FC}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F0FD}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F0FE}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F0FF}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F100}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F101}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F102}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F103}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F104}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F105}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F106}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F107}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F108}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F109}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F10A}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F10B}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F10C}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F10D}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F10E}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F10F}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F110}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F111}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F112}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F113}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F114}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F115}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F116}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F117}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F118}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F119}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F11A}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F11B}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F11C}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F11D}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F11E}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F11F}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F120}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F121}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F122}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F123}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F124}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F125}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F126}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F127}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F128}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F129}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F12A}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F12B}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F12C}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F12D}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F12E}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F12F}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F130}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F131}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F132}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F133}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F134}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F135}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F136}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F137}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F138}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F139}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F13A}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F13B}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F13C}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F13D}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F13E}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F13F}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F140}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F141}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F142}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F143}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F144}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F145}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F146}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F147}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F148}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F149}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F14A}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F14B}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F14C}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F14D}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F14E}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F14F}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F150}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F151}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F152}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F153}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F154}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F155}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F156}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F157}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F158}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F159}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F15A}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F15B}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F15C}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F15D}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F15E}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F15F}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F160}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F161}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F162}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F163}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F164}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F165}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F166}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F167}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F168}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F169}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F16A}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F16B}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F16C}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F16D}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F16E}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F16F}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F170}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F171}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F172}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F173}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F174}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F175}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F176}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F177}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F178}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F179}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F17A}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F17B}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F17C}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F17D}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F17E}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F17F}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F180}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F181}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F182}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F183}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F184}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F185}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F186}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F187}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F188}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F189}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F18A}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F18B}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F18C}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F18D}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F18E}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F18F}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F190}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F191}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F192}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F193}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F194}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F195}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F196}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F197}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F198}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F199}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F19A}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F19B}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F19C}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F19D}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F19E}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F19F}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1A0}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1A1}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1A2}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1A3}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1A4}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1A5}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1A6}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1A7}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1A8}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1A9}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1AA}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1AB}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1AC}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1AD}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1AE}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1AF}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1B0}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1B1}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1B2}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1B3}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1B4}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1B5}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1B6}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1B7}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1B8}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1B9}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1BA}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1BB}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1BC}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1BD}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1BE}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1BF}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1C0}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1C1}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1C2}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1C3}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1C4}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1C5}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1C6}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1C7}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1C8}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1C9}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1CA}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1CB}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1CC}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1CD}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1CE}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1CF}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1D0}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1D1}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1D2}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1D3}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1D4}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1D5}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1D6}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1D7}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1D8}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1D9}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1DA}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1DB}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1DC}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1DD}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1DE}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1DF}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1E0}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1E1}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1E2}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1E3}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1E4}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1E5}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1E6}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1E7}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1E8}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1E9}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1EA}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1EB}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1EC}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1ED}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1EE}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1EF}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1F0}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1F1}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1F2}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1F3}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F1F4}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F1F5}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F1F6}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F1F7}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F1F8}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F1F9}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F1FA}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F1FB}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F1FC}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F1FD}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F1FE}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F1FF}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F200}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F201}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F202}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F203}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F204}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F205}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F206}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F207}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F208}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F209}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F20A}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F20B}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F20C}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F20D}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F20E}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F20F}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F210}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F211}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F212}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F213}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F214}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F215}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F216}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F217}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F218}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F219}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F21A}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F21B}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F21C}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F21D}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F21E}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F21F}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F220}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F221}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F222}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F223}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F224}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F225}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F226}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F227}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F228}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F229}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F22A}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F22B}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F22C}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F22D}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F22E}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F22F}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F230}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F231}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F232}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F233}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F234}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F235}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F236}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F237}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F238}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F239}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F23A}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F23B}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F23C}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F23D}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F23E}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F23F}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F240}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F241}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F242}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F243}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F244}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F245}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F246}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F247}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F248}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F249}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F24A}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F24B}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F24C}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F24D}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F24E}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F24F}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F250}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F251}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F252}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F253}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F254}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F255}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F256}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F257}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F258}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F259}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F25A}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F25B}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F25C}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F25D}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F25E}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F25F}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F260}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F261}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F262}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F263}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F264}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F265}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F266}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F267}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F268}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F269}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F26A}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F26B}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F26C}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F26D}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F26E}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F26F}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F270}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F271}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F272}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F273}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F274}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F275}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F276}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F277}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F278}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F279}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F27A}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F27B}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F27C}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F27D}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F27E}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F27F}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F280}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F281}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F282}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F283}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F284}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F285}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F286}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F287}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F288}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F289}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F28A}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F28B}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F28C}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F28D}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F28E}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F28F}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F290}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F291}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F292}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F293}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F294}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F295}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F296}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F297}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F298}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F299}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F29A}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F29B}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F29C}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F29D}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F29E}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F29F}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2A0}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A1}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A2}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2A3}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2A4}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2A5}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2A6}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2A7}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2A8}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2A9}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2AA}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2AB}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2AC}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2AD}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2AE}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2AF}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2B0}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B1}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B2}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2B3}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2B4}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2B5}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2B6}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2B7}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2B8}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2B9}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2BA}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2BB}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2BC}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2BD}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2BE}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2BF}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2C0}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C1}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C2}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2C3}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2C4}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2C5}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2C6}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2C7}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2C8}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2C9}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2CA}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2CB}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2CC}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2CD}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2CE}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2CF}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2D0}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D1}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D2}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2D3}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2D4}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2D5}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2D6}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2D7}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2D8}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2D9}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2DA}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2DB}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2DC}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2DD}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2DE}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2DF}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2E0}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E1}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E2}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2E3}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2E4}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2E5}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2E6}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2E7}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2E8}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2E9}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2EA}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2EB}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2EC}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2ED}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2EE}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2EF}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2F0}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F1}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F2}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2F3}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2F4}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2F5}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2F6}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2F7}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2F8}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F2F9}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F2FA}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F2FB}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F2FC}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F2FD}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F2FE}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F2FF}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F300}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F301}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F302}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F303}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F304}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F305}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F306}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F307}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F308}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F309}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F30A}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F30B}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F30C}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F30D}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F30E}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F30F}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F310}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F311}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F312}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F313}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F314}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F315}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F316}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F317}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F318}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F319}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F31A}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F31B}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F31C}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F31D}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F31E}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F31F}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F320}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F321}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F322}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F323}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F324}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F325}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F326}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F327}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F328}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F329}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F32A}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F32B}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F32C}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F32D}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F32E}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F32F}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F330}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F331}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F332}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F333}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F334}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F335}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F336}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F337}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F338}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F339}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F33A}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F33B}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F33C}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F33D}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F33E}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F33F}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F340}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F341}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F342}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F343}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F344}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F345}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F346}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F347}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F348}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F349}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F34A}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F34B}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F34C}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F34D}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F34E}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F34F}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F350}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F351}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F352}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F353}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F354}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F355}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F356}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F357}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F358}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F359}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F35A}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F35B}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F35C}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F35D}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F35E}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F35F}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F360}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F361}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F362}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F363}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F364}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F365}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F366}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F367}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F368}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F369}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F36A}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F36B}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F36C}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F36D}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F36E}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F36F}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F370}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F371}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F372}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F373}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F374}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F375}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F376}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F377}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F378}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F379}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F37A}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F37B}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F37C}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F37D}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F37E}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F37F}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F380}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F381}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F382}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F383}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F384}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F385}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F386}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F387}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F388}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F389}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F38A}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F38B}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F38C}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F38D}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F38E}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F38F}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F390}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F391}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F392}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F393}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F394}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F395}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F396}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F397}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F398}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F399}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F39A}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F39B}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F39C}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F39D}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F39E}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F39F}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3A0}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A1}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A2}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3A3}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3A4}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3A5}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3A6}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3A7}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3A8}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3A9}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3AA}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3AB}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3AC}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3AD}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3AE}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3AF}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3B0}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B1}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B2}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3B3}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3B4}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3B5}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3B6}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3B7}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3B8}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3B9}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3BA}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3BB}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3BC}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3BD}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3BE}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3BF}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3C0}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C1}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C2}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3C3}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3C4}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3C5}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3C6}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3C7}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3C8}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3C9}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3CA}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3CB}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3CC}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3CD}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3CE}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3CF}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3D0}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D1}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D2}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3D3}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3D4}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3D5}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3D6}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3D7}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3D8}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3D9}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3DA}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3DB}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3DC}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3DD}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3DE}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3DF}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3E0}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E1}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E2}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3E3}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3E4}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3E5}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3E6}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3E7}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3E8}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3E9}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3EA}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3EB}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3EC}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3ED}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3EE}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3EF}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3F0}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F1}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F2}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3F3}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3F4}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3F5}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3F6}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3F7}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3F8}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F3F9}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F3FA}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F3FB}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F3FC}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F3FD}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F3FE}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F3FF}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F400}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F401}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F402}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F403}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F404}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F405}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F406}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F407}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F408}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F409}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F40A}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F40B}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F40C}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F40D}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F40E}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F40F}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F410}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F411}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F412}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F413}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F414}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F415}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F416}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F417}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F418}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F419}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F41A}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F41B}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F41C}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F41D}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F41E}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F41F}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F420}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F421}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F422}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F423}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F424}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F425}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F426}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F427}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F428}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F429}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F42A}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F42B}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F42C}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F42D}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F42E}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F42F}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F430}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F431}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F432}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F433}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F434}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F435}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F436}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F437}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F438}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F439}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F43A}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F43B}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F43C}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F43D}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F43E}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F43F}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F440}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F441}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F442}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F443}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F444}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F445}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F446}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F447}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F448}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F449}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F44A}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F44B}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F44C}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F44D}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F44E}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F44F}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F450}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F451}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F452}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F453}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F454}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F455}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F456}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F457}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F458}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F459}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F45A}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F45B}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F45C}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F45D}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F45E}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F45F}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F460}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F461}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F462}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F463}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F464}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F465}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F466}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F467}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F468}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F469}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F46A}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F46B}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F46C}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F46D}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F46E}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F46F}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F470}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F471}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F472}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F473}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F474}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F475}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F476}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F477}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F478}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F479}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F47A}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F47B}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F47C}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F47D}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F47E}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F47F}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F480}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F481}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F482}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F483}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F484}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F485}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F486}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F487}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F488}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F489}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F48A}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F48B}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F48C}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F48D}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F48E}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F48F}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F490}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F491}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F492}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F493}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F494}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F495}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F496}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F497}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F498}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F499}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F49A}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F49B}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F49C}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F49D}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F49E}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F49F}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4A0}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A1}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A2}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4A3}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4A4}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4A5}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4A6}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4A7}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4A8}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4A9}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4AA}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4AB}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4AC}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4AD}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4AE}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4AF}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4B0}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B1}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B2}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4B3}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4B4}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4B5}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4B6}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4B7}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4B8}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4B9}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4BA}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4BB}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BC}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4BD}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4BE}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4BF}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4C0}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C1}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C2}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4C3}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4C4}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4C5}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4C6}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4C7}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4C8}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4C9}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4CA}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4CB}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4CC}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4CD}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4CE}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4CF}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4D0}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D1}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D2}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4D3}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4D4}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4D5}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4D6}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4D7}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4D8}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4D9}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4DA}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4DB}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4DC}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4DD}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4DE}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4DF}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4E0}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E1}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E2}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4E3}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4E4}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4E5}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4E6}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4E7}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4E8}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4E9}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4EA}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4EB}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4EC}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4ED}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4EE}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4EF}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4F0}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F1}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F2}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4F3}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4F4}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4F5}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4F6}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4F7}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4F8}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F4F9}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F4FA}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F4FB}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F4FC}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F4FD}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F4FE}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F4FF}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F500}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F501}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F502}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F503}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F504}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F505}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F506}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F507}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F508}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F509}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F50A}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F50B}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F50C}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F50D}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F50E}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F50F}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F510}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F511}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F512}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F513}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F514}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F515}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F516}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F517}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F518}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F519}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F51A}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F51B}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F51C}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F51D}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F51E}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F51F}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F520}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F521}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F522}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F523}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F524}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F525}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F526}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F527}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F528}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F529}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F52A}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F52B}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F52C}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F52D}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F52E}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F52F}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F530}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F531}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F532}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F533}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F534}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F535}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F536}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F537}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F538}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F539}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F53A}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F53B}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F53C}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F53D}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F53E}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F53F}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F540}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F541}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F542}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F543}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F544}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F545}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F546}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F547}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F548}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F549}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F54A}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F54B}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F54C}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F54D}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F54E}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F54F}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F550}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F551}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F552}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F553}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F554}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F555}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F556}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F557}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F558}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F559}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F55A}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F55B}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F55C}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F55D}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F55E}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F55F}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F560}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F561}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F562}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F563}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F564}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F565}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F566}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F567}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F568}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F569}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F56A}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F56B}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F56C}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F56D}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F56E}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F56F}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F570}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F571}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F572}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F573}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F574}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F575}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F576}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F577}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F578}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F579}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F57A}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F57B}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F57C}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F57D}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F57E}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F57F}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F580}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F581}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F582}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F583}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F584}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F585}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F586}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F587}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F588}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F589}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F58A}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F58B}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F58C}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F58D}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F58E}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F58F}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F590}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F591}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F592}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F593}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F594}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F595}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F596}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F597}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F598}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F599}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F59A}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F59B}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F59C}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F59D}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F59E}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F59F}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5A0}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5A1}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A2}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5A3}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5A4}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5A5}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5A6}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5A7}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5A8}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5A9}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5AA}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5AB}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5AC}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5AD}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5AE}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5AF}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5B0}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5B1}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B2}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5B3}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5B4}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5B5}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5B6}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5B7}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5B8}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5B9}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5BA}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5BB}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5BC}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5BD}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5BE}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5BF}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5C0}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5C1}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C2}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5C3}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5C4}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5C5}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5C6}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5C7}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5C8}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5C9}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5CA}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5CB}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5CC}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5CD}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5CE}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5CF}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5D0}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5D1}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5D2}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5D3}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5D4}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5D5}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5D6}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5D7}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5D8}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5D9}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5DA}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5DB}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5DC}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5DD}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5DE}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5DF}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5E0}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5E1}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5E2}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5E3}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5E4}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5E5}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5E6}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5E7}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5E8}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5E9}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5EA}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5EB}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5EC}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5ED}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5EE}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5EF}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5F0}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5F1}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5F2}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5F3}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5F4}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5F5}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5F6}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5F7}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5F8}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F5F9}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F5FA}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F5FB}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F5FC}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F5FD}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F5FE}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F5FF}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F600}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F601}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F602}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F603}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F604}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F605}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F606}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F607}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F608}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F609}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F60A}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F60B}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F60C}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F60D}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F60E}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F60F}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F610}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F611}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F612}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F613}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F614}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F615}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F616}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F617}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F618}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F619}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F61A}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F61B}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F61C}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F61D}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F61E}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F61F}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F620}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F621}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F622}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F623}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F624}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F625}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F626}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F627}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F628}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F629}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F62A}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F62B}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F62C}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F62D}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F62E}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F62F}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F630}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F631}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F632}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F633}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F634}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F635}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F636}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F637}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F638}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F639}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F63A}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F63B}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F63C}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F63D}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F63E}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F63F}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F640}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F641}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F642}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F643}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F644}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F645}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F646}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F647}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F648}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F649}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F64A}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F64B}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F64C}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F64D}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F64E}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F64F}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F650}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F651}} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd
index ff3efff72a1..b7fdf3bc904 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconseight.fd}[2024/06/28 Font definitions for U/simpleiconseight.]
+ \ProvidesFile{usimpleiconseight.fd}[2024/07/12 Font definitions for U/simpleiconseight.]
\DeclareFontFamily{U}{simpleiconseight}{}
\DeclareFontShape{U}{simpleiconseight}{m}{n}{<-> SimpleIcons--simpleiconseight}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd
index 6a5beab8d94..6af1a1e8100 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsfive.fd}[2024/06/28 Font definitions for U/simpleiconsfive.]
+ \ProvidesFile{usimpleiconsfive.fd}[2024/07/12 Font definitions for U/simpleiconsfive.]
\DeclareFontFamily{U}{simpleiconsfive}{}
\DeclareFontShape{U}{simpleiconsfive}{m}{n}{<-> SimpleIcons--simpleiconsfive}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd
index 0a7243d82dc..3324eae514f 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsfour.fd}[2024/06/28 Font definitions for U/simpleiconsfour.]
+ \ProvidesFile{usimpleiconsfour.fd}[2024/07/12 Font definitions for U/simpleiconsfour.]
\DeclareFontFamily{U}{simpleiconsfour}{}
\DeclareFontShape{U}{simpleiconsfour}{m}{n}{<-> SimpleIcons--simpleiconsfour}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd
index ac517dfbeb9..6fbec07c5eb 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsnine.fd}[2024/06/28 Font definitions for U/simpleiconsnine.]
+ \ProvidesFile{usimpleiconsnine.fd}[2024/07/12 Font definitions for U/simpleiconsnine.]
\DeclareFontFamily{U}{simpleiconsnine}{}
\DeclareFontShape{U}{simpleiconsnine}{m}{n}{<-> SimpleIcons--simpleiconsnine}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd
index 02a61ee583c..525eb910e67 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsone.fd}[2024/06/28 Font definitions for U/simpleiconsone.]
+ \ProvidesFile{usimpleiconsone.fd}[2024/07/12 Font definitions for U/simpleiconsone.]
\DeclareFontFamily{U}{simpleiconsone}{}
\DeclareFontShape{U}{simpleiconsone}{m}{n}{<-> SimpleIcons--simpleiconsone}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd
index a6814e863e2..704d6dfe38c 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsoneone.fd}[2024/06/28 Font definitions for U/simpleiconsoneone.]
+ \ProvidesFile{usimpleiconsoneone.fd}[2024/07/12 Font definitions for U/simpleiconsoneone.]
\DeclareFontFamily{U}{simpleiconsoneone}{}
\DeclareFontShape{U}{simpleiconsoneone}{m}{n}{<-> SimpleIcons--simpleiconsoneone}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd
index 38f8ce8c094..95c0687d34a 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsonethree.fd}[2024/06/28 Font definitions for U/simpleiconsonethree.]
+ \ProvidesFile{usimpleiconsonethree.fd}[2024/07/12 Font definitions for U/simpleiconsonethree.]
\DeclareFontFamily{U}{simpleiconsonethree}{}
\DeclareFontShape{U}{simpleiconsonethree}{m}{n}{<-> SimpleIcons--simpleiconsonethree}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd
index 08e3f61c4eb..24f46e9ff7c 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsonetwo.fd}[2024/06/28 Font definitions for U/simpleiconsonetwo.]
+ \ProvidesFile{usimpleiconsonetwo.fd}[2024/07/12 Font definitions for U/simpleiconsonetwo.]
\DeclareFontFamily{U}{simpleiconsonetwo}{}
\DeclareFontShape{U}{simpleiconsonetwo}{m}{n}{<-> SimpleIcons--simpleiconsonetwo}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd
index 3b245deb708..fa32daf5d99 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsonezero.fd}[2024/06/28 Font definitions for U/simpleiconsonezero.]
+ \ProvidesFile{usimpleiconsonezero.fd}[2024/07/12 Font definitions for U/simpleiconsonezero.]
\DeclareFontFamily{U}{simpleiconsonezero}{}
\DeclareFontShape{U}{simpleiconsonezero}{m}{n}{<-> SimpleIcons--simpleiconsonezero}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd
index 001d65682b3..e2d5c58f188 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsseven.fd}[2024/06/28 Font definitions for U/simpleiconsseven.]
+ \ProvidesFile{usimpleiconsseven.fd}[2024/07/12 Font definitions for U/simpleiconsseven.]
\DeclareFontFamily{U}{simpleiconsseven}{}
\DeclareFontShape{U}{simpleiconsseven}{m}{n}{<-> SimpleIcons--simpleiconsseven}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd
index c6ab5c27b32..e05549bde9b 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconssix.fd}[2024/06/28 Font definitions for U/simpleiconssix.]
+ \ProvidesFile{usimpleiconssix.fd}[2024/07/12 Font definitions for U/simpleiconssix.]
\DeclareFontFamily{U}{simpleiconssix}{}
\DeclareFontShape{U}{simpleiconssix}{m}{n}{<-> SimpleIcons--simpleiconssix}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd
index 092129425b1..a653873414c 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconsthree.fd}[2024/06/28 Font definitions for U/simpleiconsthree.]
+ \ProvidesFile{usimpleiconsthree.fd}[2024/07/12 Font definitions for U/simpleiconsthree.]
\DeclareFontFamily{U}{simpleiconsthree}{}
\DeclareFontShape{U}{simpleiconsthree}{m}{n}{<-> SimpleIcons--simpleiconsthree}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd
index 0719f7e0f46..19d30bd3fcc 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd
+++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd
@@ -1,5 +1,5 @@
- \ProvidesFile{usimpleiconstwo.fd}[2024/06/28 Font definitions for U/simpleiconstwo.]
+ \ProvidesFile{usimpleiconstwo.fd}[2024/07/12 Font definitions for U/simpleiconstwo.]
\DeclareFontFamily{U}{simpleiconstwo}{}
\DeclareFontShape{U}{simpleiconstwo}{m}{n}{<-> SimpleIcons--simpleiconstwo}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/spbmark/spbmark.sty b/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
index fa10c8410f6..4046c8bf9c0 100644
--- a/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
+++ b/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
@@ -8,8 +8,8 @@
% The latest version of this license is in
% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2018/12/31]
-\RequirePackage{xparse,l3keys2e}
-\ProvidesExplPackage{spbmark}{2024/06/21}{1.46k}
+\RequirePackage{xparse}
+\ProvidesExplPackage{spbmark}{2024/07/14}{1.46n}
{Customize superscripts and subscripts}
\cs_generate_variant:Nn \box_set_ht:Nn { cv }
@@ -34,15 +34,13 @@
\cs_set_eq:NN \spbset \spb_set:n
\cs_new_protected:Npn \spb_mark_core_set_trad:n #1
{
- \cs_set:cpn { spb@text#1script@core }
- { \use:c { spb@text#1script@save } }
- \cs_set:cpn { spb@math@#1@core }
- { \use:c { spb@math@#1@save } }
+ \cs_set_eq:cc { spb@text#1script@core } { spb@text#1script@save }
+ \cs_set_eq:cc { spb@math@#1@core } { spb@math@#1@save }
}
\cs_new_protected:Npn \spb_mark_core_set_none:n #1
{
- \cs_set:cpn { spb@text#1script@core } { \relax }
- \cs_set:cpn { spb@math@#1@core } { \relax }
+ \cs_set_eq:cN { spb@text#1script@core } \use:n
+ \cs_set_eq:cN { spb@math@#1@core } \use:n
}
\keys_define:nn { spbmark/option }
@@ -130,7 +128,12 @@
{ \tl_set_eq:NN \fnmarkfont \ftntm@font }
{ \tl_set_eq:NN \fnmarkfont \normalfont }
-\ProcessKeysOptions{spbmark/option}
+\cs_if_exist:NTF \ProcessKeyOptions
+ { \ProcessKeyOptions[spbmark/option] }
+ {
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{spbmark/option}
+ }
\tl_new:N \g__spb_mark_case_init_tl
\cs_new_protected:Npn \spb_local_case_init:nnn #1#2#3
diff --git a/Master/texmf-dist/tex/latex/synthslant/synthslant.sty b/Master/texmf-dist/tex/latex/synthslant/synthslant.sty
index 0cd75e5e330..42c27c2a428 100644
--- a/Master/texmf-dist/tex/latex/synthslant/synthslant.sty
+++ b/Master/texmf-dist/tex/latex/synthslant/synthslant.sty
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -29,8 +29,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{synthslant}
- [2024/05/07 v0.1 Synthetically Slant glyphs]
+ [2024/07/08 v0.1a Synthetically Slant glyphs]
+\RequirePackage{etoolbox}
\RequirePackage{iftex}
\RequirePackage{xkeyval}
@@ -60,12 +61,16 @@
\ExplSyntaxOn
\fp_compare:nNnTF {\synthslant} < {.0}
- {\PackageError{synthslant}{\string\synthslant\space <\space 0}
- {Pass\space a\space value\space that\space is\space non-negative.}}
+ {\PackageError{synthslant}
+ {\string\synthslant\space <\space 0}
+ {Pass\space a\space value\space that\space
+ is\space nonnegative.}}
{}
\fp_compare:nNnTF {\synthnegslant} > {.0}
- {\PackageError{synthslant}{\string\synthnegslant\space >\space 0}
- {Pass\space a\space value\space that\space is\space non-positive.}}
+ {\PackageError{synthslant}
+ {\string\synthnegslant\space >\space 0}
+ {Pass\space a\space value\space that\space
+ is\space nonpositive.}}
{}
\ExplSyntaxOff
@@ -136,13 +141,15 @@
\box_set_dp:Nn \l_tmpa_box {\z@}
\fp_compare:nNnTF {#1} >= {.0}
{
- \box_set_wd:Nn \l_tmpa_box {\l_tmpa_dim - #1\l_tmpb_dim}
+ \box_set_wd:Nn \l_tmpa_box
+ {\l_tmpa_dim - #1\l_tmpb_dim}
}
{
\draw_suspend_begin:
\kern#1\l_tmpb_dim
\draw_suspend_end:
- \box_set_wd:Nn \l_tmpa_box {\l_tmpa_dim + #1\l_tmpb_dim}
+ \box_set_wd:Nn \l_tmpa_box
+ {\l_tmpa_dim + #1\l_tmpb_dim}
}
\draw_box_use:N \l_tmpa_box
\draw_end:
@@ -181,7 +188,8 @@
\ExplSyntaxOn
\newcommand*{\synthslantbox@fontspect@shear@box}[2]{
\begingroup
- \expandafter\fontspec[FakeSlant = #1]{\l_fontspec_family_tl}
+ \expandafter
+ \fontspec[FakeSlant=#1]{\l_fontspec_family_tl}
#2
\endgroup
}
@@ -242,8 +250,9 @@
\ifnum\synthslant@engine=4% fontspec
\newrobustcmd*{\synthslantbox}[2]{%
- \edef\synthslant@slant@value{#1}% definition for compatibility of both branches
- \synthslantbox@fontspect@shear@box{\synthslant@slant@value}{#2}%
+ \edef\synthslant@slant@value{#1}
+ \synthslantbox@fontspect@shear@box{\synthslant@slant@value}
+ {#2}%
}
\else
\newrobustcmd*{\synthslantbox}[2]{%
@@ -262,7 +271,8 @@
\NewDocumentEnvironment{slantenvironment}{}
{\upshape
\ifcsdef{microtypecontext}
- {\expandafter\microtypecontext\expandafter{\slantcontext}}
+ {\expandafter\microtypecontext
+ \expandafter{\slantcontext}}
{}}
{\ifcsdef{endmicrotypecontext}
{\endmicrotypecontext}
@@ -285,7 +295,8 @@
\NewDocumentEnvironment{negslantenvironment}{}
{\itshape
\ifcsdef{microtypecontext}
- {\expandafter\microtypecontext\expandafter{\negslantcontext}}
+ {\expandafter\microtypecontext
+ \expandafter{\negslantcontext}}
{}}
{\ifcsdef{endmicrotypecontext}
{\endmicrotypecontext}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
index 90ece8e5a5a..cade134ab2d 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbbreakable.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\RequirePackage{pdfcol}
\pdfcolInitStack{tcb@breakable}
@@ -82,6 +82,7 @@
\reserved@a%
\@endpefalse%
\global\@newlistfalse%
+ \tcb@set@savebox@construction@true%
\let\tcbbreak\tcb@@break%
\iftcb@usecolorstack%
\pdfcolSwitchStack{tcb@breakable}%
@@ -551,7 +552,7 @@
\let\tcb@before@middle=\@empty%
\let\tcb@before@last=\@empty%
\iftcb@multicol%
- \long\def\tcb@after@first{\par}% using \columnbreak here kills multicols' algortihm sometimes
+ \long\def\tcb@after@first{\par}% using \columnbreak here kills multicols' algorithm sometimes
\long\def\tcb@after@middle{\par\vfill}%
\else%
\long\def\tcb@after@first{\par\pagebreak\tcb@enlbreak@next}%
@@ -827,7 +828,7 @@
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
- \tcb@drawing@env@begin%
+ \begin{tcb@drawing}%
\tcb@extensions@preframe%
% draw frame and interior
\tcb@adraw@frame%
@@ -842,7 +843,7 @@
\tcb@tdraw@upper%
\tcb@tdraw@lower%
\tcb@extensions@final%
- \tcb@drawing@env@end%
+ \end{tcb@drawing}%
\endgroup%
}
@@ -857,7 +858,7 @@
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
- \tcb@drawing@env@begin%
+ \begin{tcb@drawing}%
\tcb@extensions@preframe%
% draw frame and interior
\tcb@adraw@frame%
@@ -868,7 +869,7 @@
\tcb@tdraw@title%
\tcb@tdraw@upper%
\tcb@extensions@final%
- \tcb@drawing@env@end%
+ \end{tcb@drawing}%
\endgroup%
}
@@ -883,7 +884,7 @@
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
- \tcb@drawing@env@begin%
+ \begin{tcb@drawing}%
\tcb@extensions@preframe%
% draw frame and interior
\tcb@adraw@frame%
@@ -897,7 +898,7 @@
\tcb@tdraw@title%
\tcb@tdraw@lower%
\tcb@extensions@final%
- \tcb@drawing@env@end%
+ \end{tcb@drawing}%
\endgroup%
}
@@ -912,7 +913,7 @@
\csname tcb@break@ch@\tcb@split@state\endcsname%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
- \tcb@drawing@env@begin%
+ \begin{tcb@drawing}%
\tcb@extensions@preframe%
% draw frame and interior
\tcb@adraw@frame%
@@ -923,7 +924,7 @@
\tcb@tdraw@title%
\tcb@tdraw@lower%
\tcb@extensions@final%
- \tcb@drawing@env@end%
+ \end{tcb@drawing}%
\endgroup%
}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
index 3eff9746f86..a550de9fff3 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbdocumentation.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{listings,skins,external,raster}
@@ -199,10 +199,6 @@
keywords bold/true/.code={\let\tcb@doc@bfseries\bfseries},
keywords bold/false/.code={\let\tcb@doc@bfseries\mdseries},
doc key prefix/.store in=\kvtcb@doc@keyprefix,
- index key formatter/.code={\let\kvtcb@doc@format@key=#1},
- index keys formatter/.code={\let\kvtcb@doc@format@keys=#1},
- index key formatter/.default=\@firstofone,
- index keys formatter/.default=\@firstofone,
}
@@ -337,6 +333,43 @@
\ExplSyntaxOn
+\tcbset{
+ index~key~formatter / .code =
+ {
+ \__tcobox_store_formatter_in:nN {#1} \kvtcb@doc@format@key
+ },
+ index~key~formatter / .default = \use:n,
+ index~keys~formatter / .code =
+ {
+ \__tcobox_store_formatter_in:nN {#1} \kvtcb@doc@format@keys
+ },
+ index~keys~formatter / .default = \use:n,
+ page~ref~formatter / .code =
+ {
+ \__tcobox_store_formatter_in:nN {#1} \kvtcb@doc@format@page
+ },
+ page~ref~formatter / .default = \use:n,
+}
+
+
+\cs_if_exist:NF \__tcobox_store_formatter_in:nN
+ {
+ \cs_new_protected:Npn \__tcobox_store_formatter_in:nN #1#2
+ {
+ \__tcobox_if_single_cs:nTF {#1}
+ { \cs_set_eq:NN #2 #1 }
+ {
+ \tcb@error
+ {
+ Invalid~formatter~ "\tl_to_str:n {#1}" ~passed~to \MessageBreak
+ "\pgfkeyscurrentkey". \MessageBreak
+ A~formatter~should~be~a~single~command~taking~one \MessageBreak
+ mandatory~argument
+ }
+ }
+ }
+ }
+
\cs_new_nopar:Npn \__tcobox_new_bool_key:Nn #1 #2
{
@@ -879,7 +912,7 @@
\IfBooleanTF{#2}{}{%
\ifnum\getpagerefnumber{#1:#3}=\thepage\relax%
\else%
- \textsuperscript{{\fontfamily{pzd}\fontencoding{U}\fontseries{m}\fontshape{n}\selectfont\char213}%
+ \kvtcb@doc@format@page{{\fontfamily{pzd}\fontencoding{U}\fontseries{m}\fontshape{n}\selectfont\char213}%
\,\kvtcb@text@pageshort\,\pageref*{#1:#3}}%
\fi}}%
}
@@ -1027,6 +1060,7 @@
doc key prefix={/},
index key formatter,
index keys formatter,
+ page ref formatter=\textsuperscript,
}
% deprecated
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
index 0bfa994f68e..060f1bb9a0e 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbexternal.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbexternal.code.tex: Code for externalization
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{pro@cessing}
@@ -111,14 +111,14 @@
\def\tcbexternal@pdfmissing@warning{%
\tcb@warning{File '\tcbexternal@job@pdf' missing.
- Compilation error or shell-escape wasn't enabled or a subdirectory could'nt be generated}%
+ Compilation error or shell-escape wasn't enabled or a subdirectory couldn't be generated}%
\message{Load '\tcbexternal@job@source' instead}%
\tcbexternal@inputsource%
}
\def\tcbexternal@pdfmissing@error{%
\tcb@error{File '\tcbexternal@job@pdf' missing.
- Compilation error or shell-escape wasn't enabled or a subdirectory could'nt be generated}{}%
+ Compilation error or shell-escape wasn't enabled or a subdirectory couldn't be generated}{}%
}
\def\tcbexternal@inputpdf{%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
index 0e34e15ad5a..e133063705f 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbfitting.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbfitting.code.tex: Code for fit boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
index b3edf95636c..6a60587177c 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbhooks.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbset{%
before upper app/.code={\appto\kvtcb@before@upper{#1}},%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
index 195076eee16..9a869f870f6 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistings.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\RequirePackage{listings}[2007/02/22]
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex
index 48241a94d57..f3ffb31b906 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingscore.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{pro@cessing}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
index 0c9b2b7e8c2..0fb3fd8d22a 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcblistingsutf8.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{listings}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
index 81180a8eb89..49059a0863a 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbmagazine.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbmagazine.code.tex: Code for box sets and magazine styles
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{breakable}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
index cae9e8d7070..d21bc110367 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbminted.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbminted.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\RequirePackage{minted}[2021/12/24]
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex
index 49abfc651a3..3fcec6b22c3 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbposter.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbposter.code.tex: Code for posters
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{breakable,magazine,skins,fitting}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex
index ce0ae430757..a5bdabc874b 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbprocessing.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbprocessing.code.tex: Code for conditional processing
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
index 35510300920..e3645497e90 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbraster.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\newcounter{tcbrastercolumn}
\newcounter{tcbrasterrow}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
index 3fbad785842..5e3faed9dde 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskins.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,15 +17,10 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
-\RequirePackage{tikz}[2010/10/13]
\RequirePackage{tikzfill.image}
-\newenvironment{tikzpicture@tcb@hooked}{%
- \edef\tcb@tikzpicture@begin{\noexpand\tikzpicture[\expandonce\tcb@tikz@option@hook]}%
- \tcb@tikzpicture@begin\tcb@tikz@begin@hook}{\tcb@tikz@end@hook\endtikzpicture}
-
\def\tcb@creategeonodes@true{%
\begin{scope}[every node/.style={line width=0mm,inner sep=0mm,outer sep=0mm,draw=none,fill=none,rectangle}]
\node[name=frame,at={(0,0)},above right,minimum width=\tcb@width,minimum height=\tcb@height]{};
@@ -438,7 +433,7 @@
\tcbset{%
base@unbroken/.style={%
- clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,%
+ clear@spec,geometry nodes,%
set@outerboundary=\tcb@boundaryframe@standard,%
shape@of@skin=unbroken,%
set@extensions@preframe={\kvtcb@shadow},%
@@ -446,7 +441,7 @@
set@extensions@final={\tcb@apply@finish}%
},%
base@first/.style={%
- clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,%
+ clear@spec,geometry nodes,%
set@outerboundary=\tcb@boundaryframe@pathfirst,%
shape@of@skin=first,%
set@extensions@preframe={\kvtcb@shadow},%
@@ -454,7 +449,7 @@
set@extensions@final={\tcb@apply@finish}%
},%
base@middle/.style={%
- clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,%
+ clear@spec,geometry nodes,%
set@outerboundary=\tcb@boundaryframe@pathmiddle,%
shape@of@skin=middle,%
set@extensions@preframe={\kvtcb@shadow},%
@@ -462,7 +457,7 @@
set@extensions@final={\tcb@apply@finish}%
},%
base@last/.style={%
- clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,%
+ clear@spec,geometry nodes,%
set@outerboundary=\tcb@boundaryframe@pathlast,%
shape@of@skin=last,%
set@extensions@preframe={\kvtcb@shadow},%
@@ -885,7 +880,7 @@
segmentation code={\tcb@drawspec@widgetsegment},%
skin first=widgetmiddle,skin middle=widgetmiddle,skin last=widgetlast}
-\tcb@new@skin{spartan}{graphical environment=tikzpicture@tcb@hooked,geometry nodes=true,shape@of@skin=unbroken,%
+\tcb@new@skin{spartan}{geometry nodes=true,shape@of@skin=unbroken,%
set@extensions@preframe=,set@extensions@postframe={\tcb@apply@underlay},set@extensions@final=,%
frame engine=spartan,interior titled engine=spartan,interior engine=spartan,title engine=spartan,segmentation engine=spartan,%
set@outerboundary=\tcb@boundaryframe@standard,%
@@ -893,7 +888,7 @@
\tcbset{spartan/.style={skin=spartan}}
-\tcb@new@skin{draft}{clear@spec,graphical environment=tikzpicture@tcb@hooked,geometry nodes,shape@of@skin=unbroken,%
+\tcb@new@skin{draft}{clear@spec,geometry nodes,shape@of@skin=unbroken,%
frame engine=empty,interior titled engine=empty,interior engine=empty,segmentation engine=path,title empty,%
segmentation style={draw=black,dashed},
set@extensions@postframe=,
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
index 551971a0df2..6a54fca567f 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{skins}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
index f53eda79a52..cfbc1ba796c 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbtheorems.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\RequirePackage{amsmath}
@@ -138,7 +138,7 @@
% insert box with name and number
\mode_leave_vertical:
\box_use_drop:N \l__tcobox_tmpa_box
- % insert formated title
+ % insert formatted title
\group_begin:
\__tcobox_theo_format_description:n{#3}
\group_end:
@@ -260,11 +260,31 @@
description~font/.default =,
description~formatter/.code =
{
- \cs_set_eq:NN \__tcobox_theo_format_description:n #1
+ \__tcobox_store_formatter_in:nN {#1} \__tcobox_theo_format_description:n
},
description~formatter/.default = \__tcobox_theo_format_description_standard:n,
}
+
+\cs_if_exist:NF \__tcobox_store_formatter_in:nN
+ {
+ \cs_new_protected:Npn \__tcobox_store_formatter_in:nN #1#2
+ {
+ \__tcobox_if_single_cs:nTF {#1}
+ { \cs_set_eq:NN #2 #1 }
+ {
+ \tcb@error
+ {
+ Invalid~formatter~ "\tl_to_str:n {#1}" ~passed~to \MessageBreak
+ "\pgfkeyscurrentkey". \MessageBreak
+ A~formatter~should~be~a~single~command~taking~one \MessageBreak
+ mandatory~argument
+ }
+ }
+ }
+ }
+
+
\ExplSyntaxOff
@@ -298,16 +318,16 @@
ams equation*/.style={ams equation* upper,ams equation* lower},%
ams align upper/.style={before upper*=\tcb@hack@amsmath\align,after upper*=\endalign},%
ams align lower/.style={before lower*=\tcb@hack@amsmath\align,after lower*=\endalign},%
- ams align/.style={ams align upper,ams align lower},%
+ ams align/.style={ams align upper},%
ams align* upper/.style={before upper*=\tcb@hack@amsmath\csname align*\endcsname,after upper*=\endalign},%
ams align* lower/.style={before lower*=\tcb@hack@amsmath\csname align*\endcsname,after lower*=\endalign},%
- ams align*/.style={ams align* upper,ams align* lower},%
+ ams align*/.style={ams align* upper},%
ams gather upper/.style={before upper*=\tcb@hack@amsmath\gather,after upper*=\endgather},%
ams gather lower/.style={before lower*=\tcb@hack@amsmath\gather,after lower*=\endgather},%
- ams gather/.style={ams gather upper,ams gather lower},%
+ ams gather/.style={ams gather upper},%
ams gather* upper/.style={before upper*=\tcb@hack@amsmath\csname gather*\endcsname,after upper*=\endgather},%
ams gather* lower/.style={before lower*=\tcb@hack@amsmath\csname gather*\endcsname,after lower*=\endgather},%
- ams gather*/.style={ams gather* upper,ams gather* lower},%
+ ams gather*/.style={ams gather* upper},%
ams nodisplayskip upper/.style={before upper=\vskip-\abovedisplayskip},%
ams nodisplayskip lower/.style={before lower=\vskip-\abovedisplayskip},%
ams nodisplayskip/.style={ams nodisplayskip upper,ams nodisplayskip lower},%
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex
index e177bb33d49..51a4c9d6d05 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbvignette.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbvignette.code.tex: Code for ornamental frames
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\tcbuselibrary{skins}
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
index cf60ef07315..5223be23ea1 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcbxparse.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcbxparse.code.tex: Code for xparse features
%%
%% -------------------------------------------------------------------------------------------
@@ -18,6 +18,6 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{6.2.0}
+\tcb@set@library@version{6.3.0}
\RequirePackage{xparse}[2013/12/31]
diff --git a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
index be2dc7e19be..23f0d51569f 100644
--- a/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
+++ b/Master/texmf-dist/tex/latex/tcolorbox/tcolorbox.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.2.0 (2024/01/10)
+%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -17,11 +17,12 @@
%%
%% This work consists of all files listed in README
%%
-\NeedsTeXFormat{LaTeX2e}[2021-11-15]
-\ProvidesPackage{tcolorbox}[2024/01/10 version 6.2.0 text color boxes]
-\def\tcb@version{6.2.0}
+\NeedsTeXFormat{LaTeX2e}[2023-11-01]
+\ProvidesPackage{tcolorbox}[2024/07/10 version 6.3.0 text color boxes]
+\def\tcb@version{6.3.0}
-\RequirePackage{pgf}[2008/01/15]
+%\RequirePackage{pgf}[2008/01/15]
+\RequirePackage{tikz}[2023/01/15]
\RequirePackage{verbatim}[2003/08/22]
\RequirePackage{environ}[2013/04/01]
\RequirePackage{etoolbox}[2011/01/03]
@@ -57,6 +58,7 @@
\ExplSyntaxOn
\bool_new:N \l__tcobox_prevent_init_overwrite_bool
+\bool_new:N \l__tcobox_savebox_construction_bool
\box_new:N \l__tcobox_tmpa_box
\dim_new:N \l__tcobox_tmpa_dim
\fp_new:N \l__tcobox_tmpa_fp
@@ -561,7 +563,7 @@
toggle left and right/evenpage/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@evenpage\tcbset{check odd page}},
toggle left and right/forced/.code={\let\tcb@lrtoggle=\tcb@lrtoggle@forced},
toggle left and right/.default=evenpage,
- graphical environment/.store in=\kvtcb@graphenv,
+ graphical environment/.style=,% deprecated
%
frame engine/.is choice,
frame engine/standard/.style={frame code=\tcb@drawframe@standard},
@@ -1003,22 +1005,13 @@
IfBooleanF/.code~n~args={2}{\IfBooleanF{#1}{\pgfkeysalso{#2}}},
}
-\IfFormatAtLeastTF{2023-06-01}
- {
- \def\tcb@set@parbox@indent@{
- \exp_args:Nne \hook_gput_next_code:nn {para/begin}
- { \__tcobox_set_parbox_indent:n { \thetcolorboxnumber } }
- \let\tcb@set@parbox@indent\@empty
- }
- }
- {
- % Note: To be removed in future
- \def\tcb@set@parbox@indent@{
- \vspace{-\parskip}
- \noindent
- \let\tcb@set@parbox@indent\@empty
- }
- }
+
+\def\tcb@set@parbox@indent@{
+ \exp_args:Nne \hook_gput_next_code:nn {para/begin}
+ { \__tcobox_set_parbox_indent:n { \thetcolorboxnumber } }
+ \let\tcb@set@parbox@indent\@empty
+}
+
\cs_new_protected:Npn \__tcobox_set_parbox_indent:n #1
{
@@ -1027,12 +1020,20 @@
{ \int_compare_p:nNn { #1 } = { \thetcolorboxnumber } }
% and if inside a "tcb@savebox" env (upper or lower part is non-empty),
% hence not at the time of using saved \tcb@upperbox or \tcb@lowerbox
- { \cs_if_exist_p:N \tcbbreak }
+ { \l__tcobox_savebox_construction_bool }
{
\OmitIndent
}
}
+
+\def\tcb@set@savebox@construction@true
+ {
+ \bool_set_true:N \l__tcobox_savebox_construction_bool
+ }
+\bool_set_false:N \l__tcobox_savebox_construction_bool
+
+
\ExplSyntaxOff
\def\tcb@parbox@true@indent{}%
@@ -1045,6 +1046,7 @@
\let\tcb@parboxrestore=\@parboxrestore
\def\tcb@parbox@false@settings{%
+ \@nobreakfalse%
\let\par\@@par%
\linewidth\hsize%
\@totalleftmargin\z@%
@@ -1082,6 +1084,7 @@
\reserved@a
\@endpefalse%
\global\@newlistfalse%
+ \tcb@set@savebox@construction@true%
\let\tcbbreak\@@par%
\csname tcb@parbox@use@\kvtcb@parbox\endcsname%
\tcb@minipage{#2}%
@@ -2025,17 +2028,42 @@
\fi%
}
-\def\tcb@drawing@env@begin{%
- \csname tcb@before@\tcb@split@state\endcsname%
- \begin{\kvtcb@graphenv}%
- \tcb@bbdraw%
- \tcb@apply@graph@patches%
-}
-\def\tcb@drawing@env@end{%
- \end{\kvtcb@graphenv}%
- \csname tcb@after@\tcb@split@state\endcsname%
-}
+\let\tcb@tikz@option@hook\@empty
+\let\tcb@tikz@begin@hook\@empty
+\let\tcb@tikz@end@hook\@empty
+
+\ExplSyntaxOn
+
+\NewSocket{tagsupport/tcb/drawing/begin}{0}
+\NewSocket{tagsupport/tcb/drawing/end}{0}
+\NewSocketPlug{tagsupport/tcb/drawing/begin}{suspend}
+ {\tag_mc_end_push:\tag_mc_begin:n{artifact}}
+\NewSocketPlug{tagsupport/tcb/drawing/end}{resume}
+ {\tag_mc_end:\tag_mc_begin_pop:n{}}
+\AssignSocketPlug{tagsupport/tcb/drawing/begin}{suspend}
+\AssignSocketPlug{tagsupport/tcb/drawing/end}{resume}
+
+\NewDocumentEnvironment{ tcb@drawing }{ }
+ {
+ \use:c{ tcb@before@\tcb@split@state }
+ \exp_last_unbraced:NnNo \begin{tikzpicture}[\tcb@tikz@option@hook]
+ \UseTaggingSocket{tcb/drawing/begin}
+ \SuspendTagging{tcb/drawing}
+ \tcb@tikz@begin@hook
+ \tcb@bbdraw
+ \tcb@apply@graph@patches
+ }
+ {
+ \tcb@tikz@end@hook
+ \ResumeTagging{tcb/drawing}
+ \UseTaggingSocket{tcb/drawing/end}
+ \end{tikzpicture}
+ \use:c{ tcb@after@\tcb@split@state }
+ }
+
+\ExplSyntaxOff
+
\def\tcb@set@normal@unbroken@beforeafter{%
\let\tcb@before@unbroken=\kvtcb@beforebox%
@@ -2077,7 +2105,8 @@
\tcb@ch%
\tcbdimto\tcb@innerheight{\tcb@height-\kvtcb@top@rule-\kvtcb@bottom@rule-\tcb@h@padtitle}%
\tcbdimto\tcbtextheight{\tcb@innerheight-\kvtcb@boxsep*2-\kvtcb@top-\kvtcb@bottom}%
- \tcb@drawing@env@begin%
+ \begin{tcb@drawing}%
+ %\tcb@drawing@env@begin%
\pgfsetbaseline{\the\dimexpr\kvtcb@baseline-\kvtcb@bbbottom\relax}%
\tcb@extensions@preframe%
% draw frame and interior
@@ -2097,7 +2126,8 @@
\tcb@tdraw@upper%
\iftcb@hasLower\tcb@tdraw@lower\fi%
\tcb@extensions@final%
- \tcb@drawing@env@end%
+ %\tcb@drawing@env@end%
+ \end{tcb@drawing}%
}
\let\tcb@drawcolorbox@standalone=\tcb@drawcolorbox
@@ -2255,6 +2285,9 @@
}
\def\tcb@proc@counter@auto#1{%
+ \ifcsdef{c@tcb@cnt@#1}
+ {\tcb@error{Auto counter for environment '#1' already defined}{}}
+ {}%
\newcounter{tcb@cnt@#1}%
\csxdef{tcb@cnt@#1}{tcb@cnt@#1}%
\tcb@proc@counter@autoanduse{#1}%
@@ -2297,6 +2330,33 @@
\ExplSyntaxOn
+\prg_new_conditional:Npnn \__tcobox_if_single_cs:n #1 { p, TF }
+ {
+ \bool_lazy_and:nnTF
+ { \tl_if_single_p:n { #1 } }
+ { \token_if_cs_p:N #1 }
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+
+\msg_new:nnn { tcolorbox } { invalid-box-name }
+ {
+ Invalid~box~name~`` \tl_to_str:n {#1} ''.~
+ A~single~command~is~expected~after~space~trimming.~
+ I'll~drop~this~box~definition.
+ }
+
+\cs_new:Npn \__tcobox_set_backslash_removed:Nn #1#2
+ {
+ \__tcobox_if_single_cs:nTF { #2 }
+ {
+ \tl_set:Ne #1 { \exp_last_unbraced:Ne \cs_to_str:N { \tl_trim_spaces:n { #2 } } }
+ }
+ {
+ \msg_error:nnn { tcolorbox } { invalid-box-name } { #2 }
+ }
+ }
+
\cs_new:Npn \__tcobox_process_newtcolorbox:nn #1#2
{
\bool_lazy_and:nnF
@@ -2312,14 +2372,6 @@
}
-\cs_new:Npn \__tcobox_set_backslash_removed:Nn #1#2
- {
- \tl_set:Nn #1 { #2 }
- \tl_trim_spaces:N #1
- \tl_set:Ne #1 { \exp_last_unbraced:NV \cs_to_str:N #1 }
- }
-
-
\NewDocumentCommand \__tcobox_new_tcolorbox:w { m +O{} >{\TrimSpaces} m o +o +m }
{
\__tcobox_process_newtcolorbox:nn { #2 }{ #3 }
@@ -2740,7 +2792,7 @@
\tcb@new@skin{standard}{frame engine=standard,interior titled engine=standard,
interior engine=standard,segmentation engine=standard,title engine=standard,
- graphical environment=pgfpicture,geometry nodes=false,
+ geometry nodes=false,
set@extensions@preframe=,set@extensions@postframe={\tcb@apply@overlay},set@extensions@final=,%
set@outerboundary=\tcb@boundaryframe@standard,%
shape@of@skin=unbroken,
diff --git a/Master/texmf-dist/tex/latex/texvc/texvc.sty b/Master/texmf-dist/tex/latex/texvc/texvc.sty
index cab243cbfe3..7d7ec136ac0 100644
--- a/Master/texmf-dist/tex/latex/texvc/texvc.sty
+++ b/Master/texmf-dist/tex/latex/texvc/texvc.sty
@@ -6,7 +6,7 @@
%%
%% texvc.dtx (with options: `package')
%% This is a generated file.
-%% Copyright (C) 2015 by Moritz Schubotz
+%% Copyright (C) 2015-2018 by Moritz Schubotz
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3 of this license or (at your option) any later
@@ -16,7 +16,7 @@
%% LaTeX version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{texvc}
-[2018/03/04 v1.1 Bugfixes]
+[2020/02/09 v1.2 Document deprecations]
\RequirePackage{amsmath}
\RequirePackage{amsfonts}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index bd8d4dd3eaf..3a0f4f28413 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2017/04/15]
\ProvidesClass{thuthesis}
-[2024/05/20 7.5.1 Tsinghua University Thesis Template]
+[2024/07/01 7.5.2 Tsinghua University Thesis Template]
\newcommand\thu@error[1]{%
\ClassError{thuthesis}{#1}{}%
}
@@ -61,7 +61,7 @@
}
\hyphenation{Thu-Thesis}
\def\thuthesis{ThuThesis}
-\def\version{7.5.1}
+\def\version{7.5.2}
\RequirePackage{kvdefinekeys}
\RequirePackage{kvsetkeys}
\RequirePackage{kvoptions}
@@ -296,6 +296,13 @@
},
default = print,
},
+ eqn-paren-style = {
+ name = eqn@paren@style,
+ choices = {
+ full,
+ half,
+ }
+ },
}
\newif\ifthu@degree@graduate
\newcommand\thu@set@graduate{%
@@ -1656,10 +1663,23 @@
\endgroup
}
\allowdisplaybreaks[4]
+\newcommand\thu@eqn@left@paren{(}
+\newcommand\thu@eqn@right@paren{)}
+\newcommand\thu@set@eqn@paren@style{%
+ \ifthu@eqn@paren@style@full
+ \renewcommand\thu@eqn@left@paren{(}%
+ \renewcommand\thu@eqn@right@paren{)}%
+ \else
+ \renewcommand\thu@eqn@left@paren{(}%
+ \renewcommand\thu@eqn@right@paren{)}%
+ \fi
+}
+\thu@set@eqn@paren@style
+\thu@option@hook{eqn-paren-style}{\thu@set@eqn@paren@style}
\newcommand\thu@put@parentheses[1]{%
\ifthu@language@chinese
\unskip
- (#1)%
+ \thu@eqn@left@paren#1\thu@eqn@right@paren
\else
(#1)%
\fi
@@ -3827,9 +3847,11 @@
}
\newenvironment{translation-index}{}{}
\AtEndOfPackageFile*{bibunits}{
+ \newcounter{thu@translation@index}%
\renewenvironment{translation-index}{%
+ \global\advance\c@thu@translation@index\@ne
\begin{bibunit}%
- \renewcommand\@bibunitname{\jobname-index}%
+ \renewcommand\@bibunitname{\jobname-index-\arabic{thu@translation@index}}%
\renewcommand\bibname{书面翻译对应的原文索引}%
\thu@set@survey@bibheading
}{%
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty b/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty
index 0a11787d21e..597a0508506 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty
@@ -1,5 +1,5 @@
% encoding : utf8
-% tkz-elements.sty v2.25c
+% tkz-elements.sty v2.30c
% Copyright 2024 Alain Matthes
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -11,7 +11,7 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\ProvidesPackage{tkz-elements}[2024/04/27 v2.25c Graphic Object Library]
+\ProvidesPackage{tkz-elements}[2024/07/16 version 2.30c Graphic Object Library]
\RequirePackage{luacode}
\directlua{require "tkz_elements_main"}
@@ -34,20 +34,19 @@
V={}}
\luacode}
{\endluacode}
-
+ % new version of the next macro proposed by Sanskar Singh
\def\tkzGetNodes{\directlua{%
- for K,V in pairs(z) do
- local n,sd,ft
- n = string.len(K)
- if n >1 then
- _,_,ft, sd = string.find( K , "(.+)(.)" )
- if sd == "p" then K=ft.."'" end
- _,_,xft, xsd = string.find( ft , "(.+)(.)" )
- if xsd == "p" then K=xft.."'".."'" end
- end
- tex.print("\\coordinate ("..K..") at ("..V.re..","..V.im..") ;\\\\")
-end}
-}
+ for K,V in pairs(z) do
+ local n,sd,ft
+ n = string.len(K)
+ if n >1 then
+ _,_,ft, sd = string.find( K , "(.+)(.)" )
+ if sd == "p" then K=ft.."'" end
+ _,_,xft, xsd = string.find( ft , "(.+)(.)" )
+ if xsd == "p" then K=xft.."'".."'" end
+ end
+ tex.sprint("\string\\coordinate ("..K..") at ("..V.re..","..V.im..") ; \string\r")
+end}}
\def\tkzUseLua#1{\directlua{tex.print(tostring(#1))}}
\makeatletter
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua
index 1999b8a0732..e17ccb2ebb4 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua
@@ -1,6 +1,6 @@
-- tkz_elements-circles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua
index b6a1bf7a5a2..3ded691d539 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua
@@ -1,6 +1,6 @@
-- tkz_elements_class.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- from class.lua (Simple Lua Classes from Lua-users wiki)
-- Compatible with Lua 5.1 (not 5.0).
-- http://lua-users.org/wiki/SimpleLuaClasses DavidManura
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua
index a98cf40a63c..7581c19d7a9 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua
@@ -1,6 +1,6 @@
-- tkz_elements-ellipses.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua
index 40f2a4ebbf7..88f9040b7f0 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_circles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua
index 69dcd6ace32..fe253e9aa23 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua
@@ -1,6 +1,6 @@
-- tkz_elements_intersections.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua
index 401ad46dda1..a5504593c06 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_lines.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua
index a71c0f7c278..c3f7e54ffd3 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_maths.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua
index 43712140477..c80420090f4 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_matrices.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua
index f1c4dc5d412..e2366e25e3d 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_points.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua
index 5e92b4d5987..0f74d28fe98 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_regular.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua
index d4523d1826b..02d3058a161 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_triangles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -259,6 +259,15 @@ function feuerbach_tr_ (a,b,c)
intersection_cc_ (e,m,jb,hb),
intersection_cc_ (e,m,jc,hc)
end
+
+function similar_ (a,b,c)
+ local x,y,z,g
+ g = centroid_ (a,b,c)
+ x = homothety_ (g,-2,a)
+ y = homothety_ (g,-2,b)
+ z = homothety_ (g,-2,c)
+ return x,y,z
+end
--------------------
-- ellipse --
--------------------
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua
index 9304768f311..797365f33f4 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua
@@ -1,6 +1,6 @@
-- tkz_elements_lines.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -324,11 +324,25 @@ function line: mediator ()
m = midpoint_ (self.pa,self.pb)
return line : new (rotation_ (m,-math.pi/2,self.pb),rotation_ (m,math.pi/2,self.pb))
end
+
+function line : perpendicular_bisector ()
+ local m
+ m = midpoint_ (self.pa,self.pb)
+ return line : new (rotation_ (m,-math.pi/2,self.pb),rotation_ (m,math.pi/2,self.pb))
+end
+
-------------------
-- Result -> circle
-------------------
-function line: circle ()
+function line: circle (swap)
+ if swap == nil then
+ swap = false
+ end
+ if swap then
+ return circle : new (self.pb,self.pa)
+ else
return circle : new (self.pa,self.pb)
+ end
end
function line: circle_swap ()
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua
index 10ee2195196..142f00c8ed0 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua
@@ -1,6 +1,6 @@
-- tkz_elements-main.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua
index 981ac680946..035e8a0a33e 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua
@@ -1,6 +1,6 @@
-- tkz_elements_matrices.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua
index 94c9c555c08..daa3e21872b 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_maths.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua
index fd0a3533a3d..d471976d066 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua
@@ -1,6 +1,6 @@
-- tkz_elements_parallelogram.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua
index 4eb4b549d15..e29779ef791 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua
@@ -1,6 +1,6 @@
-- tkz_elements_point.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua
index e77e0af5615..6625b9d7898 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua
@@ -1,6 +1,6 @@
-- tkz_elements_quadrilateral.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua
index 2c07f78399d..fdc30845018 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua
@@ -1,6 +1,6 @@
-- tkz_elements-rectangle.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua
index 0641a858ded..a4527c779b9 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua
@@ -1,6 +1,6 @@
-- tkz_elements_regular.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua
index 1852c0ded40..93860b825c9 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua
@@ -1,6 +1,6 @@
-- tkz_elements-square.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua
index c6dd2c37573..84b10273dad 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua
@@ -1,6 +1,6 @@
-- tkz_elements_triangles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -57,19 +57,19 @@ end
-- points --
-----------------------
function triangle: trilinear (a,b,c)
- return barycenter_ ( {self.pa,a*self.a },{self.pb,b*self.b},{self.pc,c*self.c} )
+ return barycenter_ ({self.pa,a*self.a},{self.pb,b*self.b},{self.pc,c*self.c})
end
function triangle: barycentric (a,b,c)
- return barycenter_ ( {self.pa,a },{self.pb,b},{self.pc,c} )
+ return barycenter_ ({self.pa,a},{self.pb,b},{self.pc,c})
end
function triangle: bevan_point ()
- return circum_center_ ( self : excentral_tr())
+ return circum_center_ ( excentral_tr_ ( self.pa , self.pb , self.pc))
end
function triangle: mittenpunkt_point ()
- return lemoine_point_ ( self : excentral_tr())
+ return lemoine_point_ ( excentral_tr_ ( self.pa , self.pb , self.pc))
end
function triangle: gergonne_point ()
@@ -322,13 +322,20 @@ function triangle : cevian_circle (p)
pta,ptb,ptc = cevian_ (self.pa,self.pb,self.pc,p)
return circle : new (circum_circle_ (pta,ptb,ptc),pta)
end
+
+function triangle : symmedial_circle ()
+ local pta,ptb,ptc,p
+ p = lemoine_point_ ( self.pa , self.pb , self.pc)
+ pta,ptb,ptc = cevian_ (self.pa,self.pb,self.pc,p)
+ return circle : new (circum_circle_ (pta,ptb,ptc),pta)
+end
- function triangle : conway_circle ()
- local i,t
- i = in_center_ (self.pa,self.pb,self.pc)
- t = report_ (self.pb,self.pa,length(self.pb,self.pc),self.pa)
- return circle : new (i,t)
- end
+function triangle : conway_circle ()
+ local i,t
+ i = in_center_ (self.pa,self.pb,self.pc)
+ t = report_ (self.pb,self.pa,length(self.pb,self.pc),self.pa)
+ return circle : new (i,t)
+end
function triangle : pedal_circle (pt)
local x,y,z,c
@@ -338,7 +345,13 @@ function triangle : pedal_circle (pt)
c = circum_center_ (x,y,z)
return circle : new (c,x)
end
-
+
+function triangle: bevan_circle ()
+ local o,r,s,t
+ o = circum_center_ ( excentral_tr_ ( self.pa , self.pb , self.pc))
+ r,s,t = excentral_tr_ ( self.pa , self.pb , self.pc)
+return circle : new (o, r)
+end
-------------------
-- Result -> triangle
-------------------
@@ -392,6 +405,12 @@ function triangle: symmedian ()
return triangle : new (cevian_ (self.pa,self.pb,self.pc,p))
end
+function triangle: symmedial ()
+ local p
+ p = lemoine_point_ ( self.pa , self.pb , self.pc)
+ return triangle : new (cevian_ (self.pa,self.pb,self.pc,p))
+end
+
function triangle: euler ()
return triangle : new (euler_points_ (self.pa,self.pb,self.pc) )
end
@@ -403,6 +422,10 @@ function triangle: pedal (pt)
z = projection_ (self.pa,self.pb,pt)
return triangle : new (x,y,z)
end
+
+function triangle: similar ()
+ return triangle : new (similar_ (self.pa,self.pb,self.pc) )
+end
-------------------
-- Result -> ellipse
-------------------
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua
index 8b26fe4bd32..0dcbbfde61d 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua
@@ -1,6 +1,6 @@
-- tkz_elements_vectors.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty b/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty
index 3de4286c8e4..ce321f6d4be 100644
--- a/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty
+++ b/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty
@@ -2,9 +2,10 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-grapheur}[2024/06/22 0.1.5.Des outils en TikZ pour travailler comme avec un grapheur]
+\ProvidesPackage{tkz-grapheur}[2024/07/13 0.1.6.Des outils en TikZ pour travailler comme avec un grapheur]
%====HISTORIQUE
+% v 0.1.6 Asymptote verticale + Monte Carlo + Méthode intégrales (rectangles, etc)
% v 0.1.5 Correction d'un bug avec les valeurs manuelles + Nœud pour une image + [en] version !
% v 0.1.4 Ajout des placements de textes
% v 0.1.3 Régressions, avec xintreg (désactivable)
@@ -49,7 +50,7 @@
\if@lngenglish
\sisetup{mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true}
\else
- \sisetup{locale=FR,output-decimal-marker={,},mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true}
+ \sisetup{locale=FR,output-decimal-marker={,},mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true,group-minimum-digits=4}
\fi
\fi
@@ -106,6 +107,7 @@
%====STYLES DE BASE
\tikzset{pflnoeud/.style={}}
\tikzset{pflpoint/.style={line width=0.95pt}}
+\tikzset{pflpointmc/.style={radius=0.875pt}}
\tikzset{pflpointc/.style={radius=1.75pt}}
\tikzset{pflpointnuage/.style={radius=1.75pt}}
\tikzset{pflcadre/.style={line width=0.8pt,gray}}
@@ -1012,6 +1014,103 @@
\end{scope}
}
+%====MONTE CARLO
+\defKV[graphiquetikzmontecarlo]{%
+ Couleurs=\def\graphtikzmccols{#1},%
+ BornesX=\def\graphtikzmcxbornes{#1},%
+ BornesY=\def\graphtikzmcybornes{#1}
+}
+
+\setKVdefault[graphiquetikzmontecarlo]{%
+ Couleurs={blue/red},%
+ BornesX={\pflxmin,\pflxmax},%
+ BornesY={\pflymin,\pflymax}
+}
+
+\NewDocumentCommand\SimulerMonteCarlo{ O{} D<>{f} m O{\nbptsmcok} O{\nbptsmcko} }{%
+ \restoreKV[graphiquetikzmontecarlo]%
+ \setKV[graphiquetikzmontecarlo]{#1}%
+ \StrCut{\graphtikzmccols}{/}{\tmpMCcolOK}{\tmpMCcolKO}%
+ \StrCut{\graphtikzmcxbornes}{,}{\tmpMCxmin}{\tmpMCxmax}%
+ \StrCut{\graphtikzmcybornes}{,}{\tmpMCymin}{\tmpMCymax}%
+ \xdef#4{0}%
+ \xdef#5{0}%
+ \xdef\nbptsmc{#3}%
+ \foreach \i in {1,...,#3}{%
+ \xdef\tmpMCrandX{\xintfloateval{random()*((\tmpMCxmax)-(\tmpMCxmin))+(\tmpMCxmin)}}%
+ \xdef\tmpMCrandY{\xintfloateval{random()*((\tmpMCymax)-(\tmpMCymin))+(\tmpMCymin)}}%
+ \xdef\tmpMCrandfX{\xintfloateval{#2(\tmpMCrandX)}}%
+ \xintifboolexpr{ \tmpMCrandfX > \tmpMCrandY }%
+ {%
+ \xdef#4{\xinteval{#4+1}}%
+ \filldraw[\tmpMCcolOK] (\tmpMCrandX,\tmpMCrandY) circle[pflpointmc] ;
+ }%
+ {%
+ \xdef#5{\xinteval{#5+1}}%
+ \filldraw[\tmpMCcolKO] (\tmpMCrandX,\tmpMCrandY) circle[pflpointmc] ;
+ }%
+ }%
+}
+
+%====MÉTHODES INTÉGRALES
+
+\defKV[graphiquetikzintegr]{%
+ Couleur=\def\graphtikzintgrcol{#1},%
+ CouleurRemplissage=\def\graphtikzintgrcolrempl{#1},%
+ NbSubDiv=\def\graphtikzintgrnb{#1},%
+ Methode=\def\graphtikzintgrtype{#1},%
+ Opacite=\def\graphtikzintgropac{#1}
+}
+
+\setKVdefault[graphiquetikzintegr]{%
+ Couleur=red,%
+ NbSubDiv=10,%
+ Methode=RectanglesGauche,%
+ Remplir=true,%
+ CouleurRemplissage={\graphtikzintgrcol!25},%
+ Opacite=0.25
+}
+
+\NewDocumentCommand\RepresenterMethodeIntegrale{ O{} D<>{f} m m }{%opts+nom_fct+a+b
+ \useKVdefault[graphiquetikzintegr]%
+ \setKV[graphiquetikzintegr]{#1}%
+ \ifboolKV[graphiquetikzintegr]{Remplir}%
+ {%
+ \tikzset{pflfigureintegr/.style={pfltrait,\graphtikzintgrcol,fill=\graphtikzintgrcolrempl,fill opacity=\graphtikzintgropac}}%
+ }%
+ {%
+ \tikzset{pflfigureintegr/.style={pfltrait,\graphtikzintgrcol}}%
+ }%
+ \tikzset{figureintegr/.style={pfltrait,\graphtikzintgrcol,fill=\graphtikzintgrcolrempl,fill opacity=\graphtikzintgropac}}%
+ \def\TmpH{(#4-#3)/\graphtikzintgrnb}
+ %rectangles gauches
+ \IfEq{\graphtikzintgrtype}{RectanglesGauche}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) ;
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{RectanglesDroite}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) ;
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{RectanglesMilieu}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+0.5)*\TmpH)}}) ;
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{Trapezes}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) -- ({#3+\i*\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{0}) -- cycle ;
+ }%
+ {}%
+}
+
+
%====INTÉGRALES
%v2 avec modification de la clé [Type=...] ?
\defKV[GraphiqueTikzIntegr]{%
@@ -1961,6 +2060,16 @@
\end{scope}
}
+%====asymptote
+\NewDocumentCommand\TracerAsymptote{ O{} m D<>{} }{%
+ \restoreKV[GraphiquetikzDroite]%
+ \setKV[GraphiquetikzDroite]{#1}%
+ %tracé
+ \draw[pfltrait,{\useKV[GraphiquetikzDroite]{Couleur}},#3] ({#2},{\pflymin})--({#2},{\pflymax}) ;
+}
+
+
+%====MinMax
\defKV[GraphiqueTikzMinMax]{%
Pas=\def\pflminmaxstep{#1},%
Methode=\def\pflminmaxmethode{#1},%
@@ -2117,6 +2226,7 @@
\tikzset{tkzgrphnode/.style={}}
\tikzset{tkzgrphpoint/.style={line width=0.95pt}}
\tikzset{tkzgrphpointc/.style={radius=1.75pt}}
+\tikzset{tkzgrphpointmc/.style={radius=0.875pt}}
\tikzset{tkzgrphscatter/.style={radius=1.75pt}}
\tikzset{tkzgrphframe/.style={line width=0.8pt,gray}}
\tikzset{tkzgrphcurve/.style={line width=1.05pt}}
@@ -3898,11 +4008,11 @@
}
%====droite
-\defKV[GraphiquetikzDroite]{%
+\defKV[GraphicTikzLine]{%
Name=\def\pfldroitename{#1}
}
-\setKVdefault[GraphiquetikzDroite]{%
+\setKVdefault[GraphicTikzLine]{%
Slope=false,%
Color=black,%
Start={\pflxmin},%
@@ -3911,15 +4021,15 @@
}
\NewDocumentCommand\DrawLine{ O{} m m D<>{} }{%
- \restoreKV[GraphiquetikzDroite]%
- \setKV[GraphiquetikzDroite]{#1}%
+ \restoreKV[GraphicTikzLine]%
+ \setKV[GraphicTikzLine]{#1}%
%1er point
\path #2;%
\pgfgetlastxy{\macrox}{\macroy}%
\xdef\pfldtetikzxA{\xintfloateval{(\ConvertPtToCm{\macrox})/(\pflxunit)}}%
\xdef\pfldtetikzyA{\xintfloateval{(\ConvertPtToCm{\macroy})/(\pflyunit)}}%
%2ème point si besoin
- \ifboolKV[GraphiquetikzDroite]{Slope}%
+ \ifboolKV[GraphicTikzLine]{Slope}%
{%
\xdef\pfldtepente{\xintfloateval{#3}}%
}%
@@ -3936,24 +4046,33 @@
{%
\IfEq{\pfldroitename}{}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},#4] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},#4] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},#4,name path global=\pfldroitename] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},#4,name path global=\pfldroitename] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
}%
}%
{%
\IfEq{\pfldroitename}{}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},domain={\useKV[GraphiquetikzDroite]{Start}}:{\useKV[GraphiquetikzDroite]{End}},samples=2,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},domain={\useKV[GraphicTikzLine]{Start}}:{\useKV[GraphicTikzLine]{End}},samples=2,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},domain={\useKV[GraphiquetikzDroite]{Start}}:{\useKV[GraphiquetikzDroite]{End}},samples=2,name path global=\pfldroitename,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},domain={\useKV[GraphicTikzLine]{Start}}:{\useKV[GraphicTikzLine]{End}},samples=2,name path global=\pfldroitename,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
}%
}%
\end{scope}
}
+%====asymptote
+\NewDocumentCommand\DrawAsymptote{ O{} m D<>{} }{%
+ \restoreKV[GraphicTikzLine]%
+ \setKV[GraphicTikzLine]{#1}%
+ %tracé
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},#3] ({#2},{\pflymin})--({#2},{\pflymax}) ;
+}
+
+%====minmax
\defKV[GraphicTikzMinMax]{%
Pas=\def\pflminmaxstep{#1},%
Method=\def\pflminmaxmethode{#1},%
@@ -4061,4 +4180,42 @@
\draw #2 node[tkzgrphnode,font=\pflnodefonte,text=\pflnodecol,\pfnodepos] {#3} ;
}
+%====MONTE CARLO
+\defKV[GraphicTikzmontecarlo]{%
+ Colors=\def\graphtikzmccols{#1},%
+ BoundsX=\def\graphtikzmcxbornes{#1},%
+ BoundsY=\def\graphtikzmcybornes{#1}
+}
+
+\setKVdefault[GraphicTikzmontecarlo]{%
+ Colors={blue/red},%
+ BoundsX={\pflxmin,\pflxmax},%
+ BoundsY={\pflymin,\pflymax}
+}
+
+\NewDocumentCommand\SimulateMonteCarlo{ O{} D<>{f} m O{\nbptsmcok} O{\nbptsmcko} }{%
+ \restoreKV[GraphicTikzmontecarlo]%
+ \setKV[GraphicTikzmontecarlo]{#1}%
+ \StrCut{\graphtikzmccols}{/}{\tmpMCcolOK}{\tmpMCcolKO}%
+ \StrCut{\graphtikzmcxbornes}{,}{\tmpMCxmin}{\tmpMCxmax}%
+ \StrCut{\graphtikzmcybornes}{,}{\tmpMCymin}{\tmpMCymax}%
+ \xdef#4{0}%
+ \xdef#5{0}%
+ \xdef\nbptsmc{#3}%
+ \foreach \i in {1,...,#3}{%
+ \xdef\tmpMCrandX{\xintfloateval{random()*((\tmpMCxmax)-(\tmpMCxmin))+(\tmpMCxmin)}}%
+ \xdef\tmpMCrandY{\xintfloateval{random()*((\tmpMCymax)-(\tmpMCymin))+(\tmpMCymin)}}%
+ \xdef\tmpMCrandfX{\xintfloateval{#2(\tmpMCrandX)}}%
+ \xintifboolexpr{ \tmpMCrandfX > \tmpMCrandY }%
+ {%
+ \xdef#4{\xinteval{#4+1}}%
+ \filldraw[\tmpMCcolOK] (\tmpMCrandX,\tmpMCrandY) circle[tkzgrphpointmc] ;
+ }%
+ {%
+ \xdef#5{\xinteval{#5+1}}%
+ \filldraw[\tmpMCcolKO] (\tmpMCrandX,\tmpMCrandY) circle[tkzgrphpointmc] ;
+ }%
+ }%
+}
+
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
index 0a7b2a9723d..62af9069e55 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 3.39 (2024-06-27),
+%% This is file `beamercolorthemeTUDa.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa2008.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa2008.sty
index 60b262bbef0..14a86607d18 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa2008.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa2008.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa2008.sty' version 3.39 (2024-06-27)
+%% This is file `beamercolorthemeTUDa2008.sty' version 3.41 (2024-07-02)
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
index 54fcdc35796..c2ec43d33ea 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 3.39 (2024-06-27)
+%% This is file `beamerfontthemeTUDa.sty' version 3.41 (2024-07-02)
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa2008.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa2008.sty
index dd6dd37d5ae..4ac32a79cda 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa2008.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa2008.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa2008.sty' version 3.39 (2024-06-27)
+%% This is file `beamerfontthemeTUDa2008.sty' version 3.41 (2024-07-02)
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
index 7b187cc3e7e..f2a82c86a5f 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 3.39 (2024-06-27)
+%% This is file `beamerinnerthemeTUDa.sty' version 3.41 (2024-07-02)
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2008.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2008.sty
index 52fdc3b0ba9..55644e97664 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2008.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2008.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa2008.sty' version 3.39 (2024-06-27),
+%% This is file `beamerinnerthemeTUDa2008.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2023.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2023.sty
index e2edb462c50..e4780a9fefd 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2023.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa2023.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa2023.sty' version 3.39 (2024-06-27),
+%% This is file `beamerinnerthemeTUDa2023.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
index 54d0a141f4e..38f1a7b00a2 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 3.39 (2024-06-27),
+%% This is file `beamerouterthemeTUDa.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa2008.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa2008.sty
index 61e65d351ea..b74da09f609 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa2008.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa2008.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa2008.sty' version 3.39 (2024-06-27),
+%% This is file `beamerouterthemeTUDa2008.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty
index 0f3b3f84891..e84e7fa228e 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa-mecheng.sty' version 3.39 (2024-06-27),
+%% This is file `beamerthemeTUDa-mecheng.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
index bccd070c5fe..beb85e6785d 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 3.39 (2024-06-27),
+%% This is file `beamerthemeTUDa.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2008.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2008.sty
index 25a6b83e7de..f3c3064841c 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2008.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2008.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa2008.sty' version 3.39 (2024-06-27),
+%% This is file `beamerthemeTUDa2008.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
\ProvidesPackage{beamerthemeTUDa2008}
[\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt Design of 2008]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2023.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2023.sty
index a828f2edb2e..7095ba69f12 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2023.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa2023.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa2023.sty' version 3.39 (2024-06-27)
+%% This is file `beamerthemeTUDa2023.sty' version 3.41 (2024-07-02)
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo
index f26920e488f..55147ed57f1 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a0paper.clo' version 3.39 (2024-06-27),
+%% This is file `tuda-a0paper.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,16 +25,18 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
-\ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
+\ProvidesExplFile{tuda-a0paper.clo}{2024-07-01}{3.40}{tuda-ci~size~adjustments~for~a0paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
- \cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}}
- \cs_set:Nn \ptxcd_titleinfo_fontsize: {{28pt}{35pt}}
- \cs_set:Nn \ptxcd_titlethanks_fontsize: {{24pt}{30pt}}
+ \cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}}
+ \cs_set:Nn \ptxcd_titleinfo_fontsize: {{28pt}{35pt}}
+ \cs_set:Nn \ptxcd_titlethanks_fontsize: {{24pt}{30pt}}
}
\cs_set:Nn \ptxcd_setup_base_sizes: {
- \tl_if_empty:NT \g_ptxcd_fontsize_tl {\tl_gset:Nn \g_ptxcd_fontsize_tl {30pt}}
- \dim_gset:Nn \g_ptxcd_margin_dim {30mm}
+ \tl_if_empty:NT \g_ptxcd_fontsize_tl {
+ \tl_gset:Nn \g_ptxcd_fontsize_tl {30pt}
+ }
+ \dim_gset:Nn \g_ptxcd_margin_dim {30mm}
}
\endinput
+%%
+%% End of file `tuda-a0paper.clo'.
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo
index a09b5483935..4a89742e12c 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a1paper.clo' version 3.39 (2024-06-27),
+%% This is file `tuda-a1paper.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,16 +25,18 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
-\ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a1paper}
+\ProvidesExplFile{tuda-a1paper.clo}{2024-07-01}{3.40}{tuda-ci~size~adjustments~for~a1paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
- \cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}}
- \cs_set:Nn \ptxcd_titleinfo_fontsize: {{35pt}{42pt}}
- \cs_set:Nn \ptxcd_titlethanks_fontsize: {{22pt}{26pt}}
+ \cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}}
+ \cs_set:Nn \ptxcd_titleinfo_fontsize: {{35pt}{42pt}}
+ \cs_set:Nn \ptxcd_titlethanks_fontsize: {{22pt}{26pt}}
}
\cs_set:Nn \ptxcd_setup_base_sizes: {
- \tl_if_empty:NT \g_ptxcd_fontsize_tl {\tl_gset:Nn \g_ptxcd_fontsize_tl {25pt}}
- \dim_gset:Nn \g_ptxcd_margin_dim {30mm}
+ \tl_if_empty:NT \g_ptxcd_fontsize_tl {
+ \tl_gset:Nn \g_ptxcd_fontsize_tl {25pt}
+ }
+ \dim_gset:Nn \g_ptxcd_margin_dim {30mm}
}
\endinput
+%%
+%% End of file `tuda-a1paper.clo'.
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo
index 6b39a2e0c1b..57121954a49 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a2paper.clo' version 3.39 (2024-06-27),
+%% This is file `tuda-a2paper.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,16 +25,18 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
-\ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
+\ProvidesExplFile{tuda-a2paper.clo}{2024-07-01}{3.40}{tuda-ci~size~adjustments~for~a2paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
- \cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}}
- \cs_set:Nn \ptxcd_titleinfo_fontsize: {{22pt}{28pt}}
- \cs_set:Nn \ptxcd_titlethanks_fontsize: {{14pt}{20pt}}
+ \cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}}
+ \cs_set:Nn \ptxcd_titleinfo_fontsize: {{22pt}{28pt}}
+ \cs_set:Nn \ptxcd_titlethanks_fontsize: {{14pt}{20pt}}
}
\cs_set:Nn \ptxcd_setup_base_sizes: {
- \tl_if_empty:NT \g_ptxcd_fontsize_tl {\tl_gset:Nn \g_ptxcd_fontsize_tl {25pt}}
+ \tl_if_empty:NT \g_ptxcd_fontsize_tl {
+ \tl_gset:Nn \g_ptxcd_fontsize_tl {25pt}
+ }
\dim_gset:Nn \g_ptxcd_margin_dim {30mm}
}
\endinput
+%%
+%% End of file `tuda-a2paper.clo'.
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo
index 1669e7082ae..e841639ad03 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a3paper.clo' version 3.39 (2024-06-27),
+%% This is file `tuda-a3paper.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,16 +25,18 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
-\ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper}
+\ProvidesExplFile{tuda-a3paper.clo}{2024-07-01}{3.40}{tuda-ci~size~adjustments~for~a3paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
- \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}}
- \cs_set:Nn \ptxcd_titleinfo_fontsize: {{16pt}{20pt}}
- \cs_set:Nn \ptxcd_titlethanks_fontsize: {{12pt}{16pt}}
+ \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}}
+ \cs_set:Nn \ptxcd_titleinfo_fontsize: {{16pt}{20pt}}
+ \cs_set:Nn \ptxcd_titlethanks_fontsize: {{12pt}{16pt}}
}
\cs_set:Nn \ptxcd_setup_base_sizes: {
- \tl_if_empty:NT \g_ptxcd_fontsize_tl {\tl_gset:Nn \g_ptxcd_fontsize_tl {17pt}}
- \dim_gset:Nn \g_ptxcd_margin_dim {15mm}
+ \tl_if_empty:NT \g_ptxcd_fontsize_tl {
+ \tl_gset:Nn \g_ptxcd_fontsize_tl {17pt}
+ }
+ \dim_gset:Nn \g_ptxcd_margin_dim {15mm}
}
\endinput
+%%
+%% End of file `tuda-a3paper.clo'.
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo
index 70605e9f31a..646a994a6ad 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a4paper.clo' version 3.39 (2024-06-27),
+%% This is file `tuda-a4paper.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,16 +25,18 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
-\ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper}
+\ProvidesExplFile{tuda-a4paper.clo}{2024-07-01}{3.40}{tuda-ci~size~adjustments~for~a4paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
- \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}}
- \cs_set:Nn \ptxcd_titleinfo_fontsize: {{12pt}{14pt}}
- \cs_set:Nn \ptxcd_titlethanks_fontsize: {{10pt}{11.5pt}}
+ \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}}
+ \cs_set:Nn \ptxcd_titleinfo_fontsize: {{12pt}{14pt}}
+ \cs_set:Nn \ptxcd_titlethanks_fontsize: {{10pt}{11.5pt}}
}
\cs_set:Nn \ptxcd_setup_base_sizes: {
- \tl_if_empty:NT \g_ptxcd_fontsize_tl {\tl_gset:Nn \g_ptxcd_fontsize_tl {14pt}}
- \dim_gset:Nn \g_ptxcd_margin_dim {15mm}
+ \tl_if_empty:NT \g_ptxcd_fontsize_tl {
+ \tl_gset:Nn \g_ptxcd_fontsize_tl {14pt}
+ }
+ \dim_gset:Nn \g_ptxcd_margin_dim {15mm}
}
\endinput
+%%
+%% End of file `tuda-a4paper.clo'.
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo
index dff190b3e70..8c0ef0e94f7 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a5paper.clo' version 3.39 (2024-06-27),
+%% This is file `tuda-a5paper.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,16 +25,18 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
-\ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper}
+\ProvidesExplFile{tuda-a5paper.clo}{2024-07-01}{3.40}{tuda-ci~size~adjustments~for~a5paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
- \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}}
- \cs_set:Nn \ptxcd_titleinfo_fontsize: {{10pt}{11.5pt}}
- \cs_set:Nn \ptxcd_titlethanks_fontsize: {{10pt}{11.5pt}}
+ \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}}
+ \cs_set:Nn \ptxcd_titleinfo_fontsize: {{10pt}{11.5pt}}
+ \cs_set:Nn \ptxcd_titlethanks_fontsize: {{10pt}{11.5pt}}
}
\cs_set:Nn \ptxcd_setup_base_sizes: {
- \tl_if_empty:NT \g_ptxcd_fontsize_tl {\tl_gset:Nn \g_ptxcd_fontsize_tl {10pt}}
- \dim_gset:Nn \g_ptxcd_margin_dim {12mm}
+ \tl_if_empty:NT \g_ptxcd_fontsize_tl {
+ \tl_gset:Nn \g_ptxcd_fontsize_tl {10pt}
+ }
+ \dim_gset:Nn \g_ptxcd_margin_dim {12mm}
}
\endinput
+%%
+%% End of file `tuda-a5paper.clo'.
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty b/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty
index 5e5bae21f01..b0a32c7502f 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty
@@ -1,4 +1,4 @@
-%% This is file `tuda-pgfplots.sty' version 3.39 (2024-06-27),
+%% This is file `tuda-pgfplots.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
% Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt
% The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme
\ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
index 184616df31b..df4840467e0 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 3.39 (2024-06-27),
+%% This is file `tudabeamer.cls' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{tudabeamer}
[\filedate\space\fileversion\space]
@@ -124,9 +124,9 @@
\bool_if:NT \g_ptxcd_pdfa_bool {\PassOptionsToPackage{RGB}{xcolor}}
\bool_if:NT \g_ptxcd_pdfa_bool {
-\RequirePackage{scrlfile}
-\PreventPackageFromLoading{hyperref}
-\def\hypersetup#1{}
+ \RequirePackage{scrlfile}
+ \PreventPackageFromLoading{hyperref}
+ \def\hypersetup#1{}
}
\ExplSyntaxOff
@@ -137,7 +137,16 @@
\bool_if:NT \g_ptxcd_pdfa_bool {
\UnPreventPackageFromLoading{hyperref}
\PassOptionsToPackage{a-2b}{pdfx}
+% Workaround posted by David Carlisle on tex.stackexchange
+% Thanks to Ulrike Fischer for mentioning it in #472
+ \let \__ptxcd_grouplevel_before_pdfx: \currentgrouplevel
+ \chardef\currentgrouplevel0
+ \ExplSyntaxOff
\RequirePackage{pdfx}
+ \ExplSyntaxOn
+ \let \currentgrouplevel \__ptxcd_grouplevel_before_pdfx:
+ \cs_undefine:N \__ptxcd_grouplevel_before_pdfx:
+% end of the workaround
}
\hypersetup{hidelinks, unicode}
@@ -242,7 +251,7 @@
\let\accentfont\normalfont%
\file_if_exist:nT {\g__ptxcd_config_prefix_tl beamerthemeTUDa-\g_ptxcd_department_str.sty}
- {\usepackage{\g__ptxcd_config_prefix_tl beamerthemeTUDa-\g_ptxcd_department_str}}
+ {\RequirePackage{\g__ptxcd_config_prefix_tl beamerthemeTUDa-\g_ptxcd_department_str}}
\ExplSyntaxOff
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
index 6fe3861ef1a..44f09edb861 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 3.39 (2024-06-27),
+%% This is file `tudacolors.def' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\ProvidesFile{tudacolors.def}
[\filedate\space\fileversion\space Color definitions for tuda-ci]
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
index 1e85a053000..448483daaf7 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 3.39 (2024-06-27),
+%% This is file `tudacolors.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls
index cb57b6249c0..366b9668261 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaexercise.cls' version 3.39 (2024-06-27),
+%% This is file `tudaexercise.cls' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplClass{tudaexercise}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
index cc05ff24044..9fb3ad06005 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 3.39 (2024-06-27),
+%% This is file `tudafonts.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudafonts}
[\filedate\space\fileversion\space
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls
index 46da40287a7..52b86eb3321 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaleaflet.cls' version 3.39 (2024-06-27),
+%% This is file `tudaleaflet.cls' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt}
@@ -88,7 +88,7 @@
\RequirePackage{scrextend}
\RequirePackage{scrlayer}
\PassOptionsToPackage{cmyk}{tudacolors}
-\usepackage[paper=leaflet]{tudarules}
+\RequirePackage[paper=leaflet]{tudarules}
\setlength{\headheight}{1cm}%to add headline
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
index 462cfed709d..9eb3a15953a 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 3.39 (2024-06-27),
+%% This is file `tudaletter.cls' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplClass{tudaletter}
@@ -121,6 +121,11 @@
% Load the TUDa-colorscheme
\RequirePackage{tudacolors}
+\RequirePackage{tudafonts}
+\RequirePackage{graphicx}
+\RequirePackage{afterpage}
+\RequirePackage{ragged2e}
+
\bool_if:NTF \g__ptxcd_letter_premium_bool
{ \cs_new:Nn \ptxcd_premiumcolor: {accentcolor}
@@ -132,10 +137,6 @@
\let\ptxcd_use_premiumcolor_text:\relax
}
-\RequirePackage{tudafonts}
-\RequirePackage{graphicx}
-\RequirePackage{afterpage}
-\RequirePackage{ragged2e}
%%%%%Briefbogen
@@ -171,32 +172,50 @@
\geometry{top=30mm}
}
-\@setplength{firstheadhpos}{\c_ptxcd_HeadMargin_dim}
-\@setplength{firstheadvpos}{\c_ptxcd_HeadMargin_dim}
-\@setplength{firstheadwidth}{\dim_eval:n {\paperwidth - 2\c_ptxcd_HeadMargin_dim}}
+\if_bool:N \g_ptxcd_pdfx_bool
+ \PassOptionsToPackage{a-2b}{pdfx}
+% Workaround posted by David Carlisle on tex.stackexchange
+% Thanks to Ulrike Fischer for mentioning it in #472
+ \let \__ptxcd_grouplevel_before_pdfx: \currentgrouplevel
+ \chardef\currentgrouplevel0
+ \ExplSyntaxOff
+ \RequirePackage{pdfx}
+ \ExplSyntaxOn
+ \let \currentgrouplevel \__ptxcd_grouplevel_before_pdfx:
+ \cs_undefine:N \__ptxcd_grouplevel_before_pdfx:
+% end of the workaround
+\else:
+ \PassOptionsToPackage{hidelinks, unicode}{hyperref}
+ \RequirePackage{hyperref}
+\fi:
+
+\RequirePackage[paper=a4]{tudarules}% might load pgfcore, so it has to be loaded after pdfx
+
+\setplength{firstheadhpos}{\c_ptxcd_HeadMargin_dim}
+\setplength{firstheadvpos}{\c_ptxcd_HeadMargin_dim}
+\setplength{firstheadwidth}{\dim_eval:n {\paperwidth - 2\c_ptxcd_HeadMargin_dim}}
-\@setplength{firstfootvpos}{\dim_eval:n {\paperheight -17mm}}
-\@setplength{firstfoothpos}{\useplength{firstheadhpos}}
-\@setplength{firstfootwidth}{\useplength{firstheadwidth}}
+\setplength{firstfootvpos}{\dim_eval:n {\paperheight -17mm}}
+\setplength{firstfoothpos}{\useplength{firstheadhpos}}
+\setplength{firstfootwidth}{\useplength{firstheadwidth}}
-\@setplength{toaddrhpos}{\c_ptxcd_LeftMargin_dim}
-\@setplength{toaddrvpos}{50mm}
-\@setplength{backaddrheight}{4mm}
-\@setplength{toaddrindent}{0mm}
+\setplength{toaddrhpos}{\c_ptxcd_LeftMargin_dim}
+\setplength{toaddrvpos}{50mm}
+\setplength{backaddrheight}{4mm}
+\setplength{toaddrindent}{0mm}
-\@setplength{refhpos}{\c_ptxcd_LeftMargin_dim}
-\@setplength{refvpos}{106mm}
+\setplength{refhpos}{\c_ptxcd_LeftMargin_dim}
+\setplength{refvpos}{106mm}
-\@setplength{subjectaftervskip}{2\baselineskip}
-\@setplength{lochpos}{\c_ptxcd_HeadMargin_dim}
-\@setplength{locvpos}{\dimexpr\useplength{refvpos}+\useplength{subjectaftervskip}+1.4\baselineskip\relax}
-\@setplength{refaftervskip}{0pt}
-\@setplength{subjectbeforevskip}{0pt}
-\@setplength{locwidth}{\dimexpr\paperwidth-154,5mm -\c_ptxcd_HeadMargin_dim\relax}
-\@setplength{locheight}{\dimexpr\paperheight-\useplength{locvpos}-\c_ptxcd_BottomMargin_dim\relax}
+\setplength{subjectaftervskip}{2\baselineskip}
+\setplength{lochpos}{\c_ptxcd_HeadMargin_dim}
+\setplength{locvpos}{\dimexpr\useplength{refvpos}+\useplength{subjectaftervskip}+1.4\baselineskip\relax}
+\setplength{refaftervskip}{0pt}
+\setplength{subjectbeforevskip}{0pt}
+\setplength{locwidth}{\dimexpr\paperwidth-154,5mm -\c_ptxcd_HeadMargin_dim\relax}
+\setplength{locheight}{\dimexpr\paperheight-\useplength{locvpos}-\c_ptxcd_BottomMargin_dim\relax}
-\RequirePackage[paper=a4]{tudarules}
\bool_if:NTF \g__ptxcd_letter_headrule_bool {
\ptxcd_makeheadrule[width=\useplength{firstheadwidth},color=identbarcolor]{ptxcd_LetterheadRule}
@@ -461,7 +480,16 @@
%pdfa
\if_bool:N \g_ptxcd_pdfx_bool
\PassOptionsToPackage{a-2b}{pdfx}
+% Workaround posted by David Carlisle on tex.stackexchange
+% Thanks to Ulrike Fischer for mentioning it in #472
+ \let \__ptxcd_grouplevel_before_pdfx: \currentgrouplevel
+ \chardef\currentgrouplevel0
+ \ExplSyntaxOff
\RequirePackage{pdfx}
+ \ExplSyntaxOn
+ \let \currentgrouplevel \__ptxcd_grouplevel_before_pdfx:
+ \cs_undefine:N \__ptxcd_grouplevel_before_pdfx:
+% end of the workaround
%%hyperref
\hypersetup{hidelinks, unicode}
\iow_new:N \ptxcd_xmpdata_stream
@@ -521,8 +549,6 @@
} {See~ TUDa-CI~ or~ pdfx~ documentation~ for~ details.}
\else:
- \PassOptionsToPackage{hidelinks, unicode}{hyperref}
- \RequirePackage{hyperref}
\hypersetup{pdfcreator=LaTeX~using~TUDa-CI}
\msg_new:nnnn {tudapub} {metadata-to-hypersetup} {
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo b/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo
index f88ea788df1..216642a28ce 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudalettersize10pt.clo' version 3.39 (2024-06-27),
+%% This is file `tudalettersize10pt.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -37,9 +37,11 @@
%%
\ProvidesFile{%
tudalettersize10pt.clo%
-}[tudaletter font size class option]
-
-\def\normalsize{%
+}[
+ tudaletter font size class option (10pt)
+]
+\let\normalsize\@undefined
+\DeclareRobustCommand\normalsize{%
\@setfontsize\normalsize\@xpt\@xipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -49,9 +51,11 @@
}
\def\datasize{%
\normalsize
- \@setfontsize\normalsize\@xpt\@xiiipt
+ \@setfontsize\normalsize
+ \@xpt\@xiiipt
}
-\def\small{%
+\let\small\@undefined
+\DeclareRobustCommand\small{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -62,7 +66,8 @@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip
}
-\def\footnotesize{%
+\let\footnotesize\@undefined
+\DeclareRobustCommand\footnotesize{%
\@setfontsize\footnotesize{7.5pt}\@xpt%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -73,21 +78,28 @@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip
}
-\def\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
-\def\tiny{\@setfontsize\tiny\@vipt\@viipt}
-\def\large{\@setfontsize\large\@xiipt{14}}
-\def\Large{\@setfontsize\Large\@xivpt{18}}
-\def\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-\def\huge{\@setfontsize\huge\@xxpt{25}}
-\def\Huge{\@setfontsize\Huge\@xxvpt{30}}
+\let\scriptsize\@undefined
+\let\tiny\@undefined
+\let\large\@undefined
+\let\Large\@undefined
+\let\LARGE\@undefined
+\let\huge\@undefined
+\let\Huge\@undefined
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+\DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+\DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+\DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
\normalsize
\setlength\footnotesep {6.65\p@}
\setlength{\skip\footins} {9\p@ \@plus 4\p@ \@minus 2\p@}
-\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@}
\setlength\textfloatsep {20\p@ \@plus 2\p@ \@minus 4\p@}
+\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@}
+\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@}
\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@}
\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@}
-\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@}
\setlength\@fptop {0\p@ \@plus 1fil}
\setlength\@fpsep {8\p@ \@plus 2fil}
\setlength\@fpbot {0\p@ \@plus 1fil}
@@ -96,32 +108,32 @@
\setlength\@dblfpbot {0\p@ \@plus 1fil}
\setlength\partopsep {2\p@ \@plus 1\p@ \@minus 1\p@}
\def\@listi{\leftmargin\leftmargini
- \parsep 4\p@ \@plus2\p@ \@minus\p@
- \topsep 8\p@ \@plus2\p@ \@minus4\p@
- \itemsep4\p@ \@plus2\p@ \@minus\p@}
+ \parsep 4\p@ \@plus2\p@ \@minus\p@
+ \topsep 8\p@ \@plus2\p@ \@minus4\p@
+ \itemsep \parsep}
\let\@listI\@listi
\def\@listii {\leftmargin\leftmarginii
- \labelwidth\leftmarginii
- \advance\labelwidth-\labelsep
- \topsep 4\p@ \@plus2\p@ \@minus\p@
- \parsep 2\p@ \@plus\p@ \@minus\p@
- \itemsep \parsep}
+ \labelwidth\leftmarginii
+ \advance\labelwidth-\labelsep
+ \topsep 4\p@ \@plus2\p@ \@minus\p@
+ \parsep 2\p@ \@plus\p@ \@minus\p@
+ \itemsep \parsep}
\def\@listiii{\leftmargin\leftmarginiii
- \labelwidth\leftmarginiii
- \advance\labelwidth-\labelsep
- \topsep 2\p@ \@plus\p@\@minus\p@
- \parsep \z@
- \partopsep \p@ \@plus\z@ \@minus\p@
- \itemsep \topsep}
+ \labelwidth\leftmarginiii
+ \advance\labelwidth-\labelsep
+ \topsep 2\p@ \@plus\p@\@minus\p@
+ \parsep \z@
+ \partopsep \p@ \@plus\z@ \@minus\p@
+ \itemsep \topsep}
\def\@listiv {\leftmargin\leftmarginiv
- \labelwidth\leftmarginiv
- \advance\labelwidth-\labelsep}
+ \labelwidth\leftmarginiv
+ \advance\labelwidth-\labelsep}
\def\@listv {\leftmargin\leftmarginv
- \labelwidth\leftmarginv
- \advance\labelwidth-\labelsep}
+ \labelwidth\leftmarginv
+ \advance\labelwidth-\labelsep}
\def\@listvi {\leftmargin\leftmarginvi
- \labelwidth\leftmarginvi
- \advance\labelwidth-\labelsep}
+ \labelwidth\leftmarginvi
+ \advance\labelwidth-\labelsep}
%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg
index 3f139d6117a..d1d70773e85 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudamecheng.cfg' version 3.39 (2024-06-27),
+%% This is file `tudamecheng.cfg' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\RequirePackage{expl3}
\ProvidesExplFile{tudamecheng.cfg}
{\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
index 48b515d833c..0286215cb05 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 3.39 (2024-06-27),
+%% This is file `tudaposter.cls' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
index a8347aac903..976d2a943ca 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 3.39 (2024-06-27),
+%% This is file `tudapub.cls' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplClass{tudapub}
@@ -224,11 +224,6 @@
}
}
-\bool_if:NT \g_ptxcd_pdfx_bool {
- \PassOptionsToPackage{RGB}{xcolor}
- \msg_info:nn {tudapub} {colors-to-rgb}
-}
-
\exp_args:Nx \tl_if_eq:nnT {\prop_item:Nn \g_ptxcd_clsopts_prop {fontsize}} {9pt}
{
\prop_if_in:NnF \g_ptxcd_unknown_clsopts_prop {DIV}
@@ -254,6 +249,64 @@
\LoadClass{\g_ptxcd_pub_class_tl}
+\RequirePackage{tudafonts}
+\RequirePackage{tudacolors}
+\RequirePackage[draft=false]{scrlayer-scrpage}
+\RequirePackage{graphicx}
+
+\bool_if:NTF \g_ptxcd_pdfx_bool {
+ \PassOptionsToPackage{RGB}{xcolor}
+ \msg_info:nn {tudapub} {colors-to-rgb}
+
+ %only apply the hack if pdfx is older than the working version
+ \PassOptionsToPackage{a-2b}{pdfx}
+% Workaround posted by David Carlisle on tex.stackexchange
+% Thanks to Ulrike Fischer for mentioning it in #472
+ \let \__ptxcd_grouplevel_before_pdfx: \currentgrouplevel
+ \chardef\currentgrouplevel0
+ \ExplSyntaxOff
+ \RequirePackage{pdfx}
+ \ExplSyntaxOn
+ \let \currentgrouplevel \__ptxcd_grouplevel_before_pdfx:
+ \cs_undefine:N \__ptxcd_grouplevel_before_pdfx:
+% end of the workaround
+
+ \msg_new:nnn{tudapub} {prefer-lualatex} {
+ You~use~pdfa-mode~in~#1.\\
+ This~can~lead~to~incompatiblities~especially~with~older~compiler~versions.\\
+ You~should~prefer~using~lualatex.
+ }
+ \msg_new:nnnn{tudapub} {outdated-package-pdfa} {
+ Your~Version~of~the~#1-package~is~too~old~to~support~all~methods~required~by~tudapubs~pdfa-mode.\\
+ Either~update~your~TeX-distribution~or~switch~to~pdfa=false.
+ }{See~DEMO-tudapub~for~further~information.}
+
+
+ \sys_if_engine_pdftex:T {
+ \msg_warning:nnn{tudapub} {prefer-lualatex} {PDFTeX}
+ }
+
+ \sys_if_engine_xetex:T {
+ \msg_warning:nnn{tudapub} {prefer-lualatex} {XeTeX}
+ }
+
+ \@ifpackagelater{xmpincl}{2021/09/22}{
+ }{
+ \msg_error:nn{tudapub} {outdated-package-pdfa} {xmpincl}
+ }
+
+ \@ifpackagelater{pdfx}{2018/12/01}{
+ }{
+ \msg_error:nn{tudapub} {outdated-package-pdfa} {pdfx}
+ }
+} {
+ \PassOptionsToPackage{hidelinks, unicode}{hyperref}
+ \RequirePackage{hyperref}
+}
+
+\RequirePackage{tudarules}
+\RequirePackage{trimclip}
+\RequirePackage{bookmark}
\prop_map_inline:Nn \g_ptxcd_unknown_clsopts_prop {
\cs_if_exist:cT {KV@KOMA.\g_ptxcd_pub_class_tl.cls@#1} {
@@ -299,12 +352,6 @@
}
-\usepackage{tudarules}
-
-
-%,~ subsection,~
-\usepackage{tudafonts}
-
%Margin & titlefontsize setup setup
\bool_new:N \g_ptxcd_marginpar_bool
@@ -386,8 +433,7 @@
%%%%%Anfang Randeinstellungen Geometry
-%Has to be loaded here due to headwidth options
-\usepackage[draft=false]{scrlayer-scrpage}
+
\AddToHook{begindocument}[tudapub:BCOR-titlepage]{
\bool_if:NT \g_ptxcd_BCOR_titlepage_bool
@@ -464,7 +510,6 @@
-
\newcommand*{\institution}[1]{
\def\ptxcd_institution{#1}
}
@@ -472,7 +517,6 @@
\cs_new:Nn \ptxcd_titlerule_sep: {\the\dp\strutbox}
-\usepackage{tudacolors}
\setkomafont{disposition}{\sffamily\bfseries}
\setkomafont{pageheadfoot}{\sffamily\small}
@@ -600,7 +644,6 @@
\newcommand{\titleimage}[1]{\tl_gset:Nn \g_ptxcd_titleimage_code_tl {#1}}
\box_new:N \l__ptxcd_titlegraphic_box
-\RequirePackage{trimclip}
\NewDocumentCommand{\titlegraphic}{sm}{
\IfBooleanTF{#1}{
@@ -640,7 +683,7 @@
You~selected~an~unknown~language~#1.\\
The~Variable~#2~does~not~have~a~predefined~value.\\
Ensure~to~redefine~#2~to~match~your~language.\\
- Otherwise~the~ngerman~vaue~#3~will~be~used.
+ Otherwise~the~german~vaue~#3~will~be~used.
}
\cs_new:Nn \ptxcd_define_captionFallback:Nn {
@@ -870,43 +913,8 @@
\DeclareNewPageStyleByLayers{title.TUDa}{title.TUDa.background,title.TUDa.rule,title.TUDa.image}
%Logos
-\RequirePackage{graphicx}
\if_bool:N \g_ptxcd_pdfx_bool
-
- \msg_new:nnn{tudapub} {prefer-lualatex} {
- You~use~pdfa-mode~in~#1.\\
- This~can~lead~to~incompatiblities~especially~with~older~compiler~versions.\\
- You~should~prefer~using~lualatex.
- }
- %only apply the hack if pdfx is older than the working version
- \PassOptionsToPackage{a-2b}{pdfx}
- \RequirePackage{pdfx}
-
- \msg_new:nnnn{tudapub} {outdated-package-pdfa} {
- Your~Version~of~the~#1-package~is~too~old~to~support~all~methods~required~by~tudapubs~pdfa-mode.\\
- Either~update~your~TeX-distribution~or~switch~to~pdfa=false.
- }{See~DEMO-tudapub~for~further~information.}
-
-
- \sys_if_engine_pdftex:T {
- \msg_warning:nnn{tudapub} {prefer-lualatex} {PDFTeX}
- }
-
- \sys_if_engine_xetex:T {
- \msg_warning:nnn{tudapub} {prefer-lualatex} {XeTeX}
- }
-
- \@ifpackagelater{xmpincl}{2021/09/22}{
- }{
- \msg_error:nn{tudapub} {outdated-package-pdfa} {xmpincl}
- }
-
- \@ifpackagelater{pdfx}{2018/12/01}{
- }{
- \msg_error:nn{tudapub} {outdated-package-pdfa} {pdfx}
- }
-
%%hyperref
\hypersetup{hidelinks, unicode}
\iow_new:N \ptxcd_xmpdata_stream
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
index 4957df601a1..98182d08c18 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 3.39 (2024-06-27),
+%% This is file `tudarules.sty' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
index ed1da3000fa..71e8123ef10 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 3.39 (2024-06-27),
+%% This is file `tudasciposter.cls' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
@@ -123,16 +123,36 @@
\PassOptionsToPackage{DIV=10}{typearea}
\LoadClass[parskip=full-]{scrartcl}
\RequirePackage{tudafonts}
-\RequirePackage{tikz}
-\usetikzlibrary{calc}
+\RequirePackage{calc}
+\RequirePackage[margin=0pt]{geometry}
+\RequirePackage{tudacolors}
+
+\ExplSyntaxOn
+
+\if_bool:N \g_ptxcd_pdfa_bool
+\PassOptionsToPackage{a-2b}{pdfx}
+\IfFormatAtLeastTF{2020/10/01}{}{\endinput}
+% Workaround posted by David Carlisle on tex.stackexchange
+% Thanks to Ulrike Fischer for mentioning it in #472
+ \let \__ptxcd_grouplevel_before_pdfx: \currentgrouplevel
+ \chardef\currentgrouplevel0
+ \ExplSyntaxOff
+ \RequirePackage{pdfx}
+ \ExplSyntaxOn
+ \let \currentgrouplevel \__ptxcd_grouplevel_before_pdfx:
+ \cs_undefine:N \__ptxcd_grouplevel_before_pdfx:
+% end of the workaround
+\fi:
+
+\ExplSyntaxOff
\RequirePackage{tcolorbox}
\tcbuselibrary{poster}
-\RequirePackage[margin=0pt]{geometry}
-\ExplSyntaxOn
-
+\RequirePackage[mode=tikz]{tudarules}
+\RequirePackage{qrcode}
+\ExplSyntaxOn
%Font adjusments
\renewcommand*{\familydefault}{\sfdefault}
@@ -150,9 +170,7 @@
% end of font adjustments
-\RequirePackage[mode=tikz]{tudarules}
-\RequirePackage{tudacolors}
-\RequirePackage{qrcode}
+
\dim_const:Nn \c_ptxcd_headrule_ht_dim {\c_ptxcd_rulesep_dim +\c_ptxcd_largerule_dim + \c_ptxcd_smallrule_dim}
%Setup title
@@ -231,8 +249,6 @@
%%%%%%%%%%%%%%%%%%%
%PDFA
\if_bool:N \g_ptxcd_pdfa_bool
-\PassOptionsToPackage{a-2b}{pdfx}
-\RequirePackage{pdfx}
%%hyperref
\hypersetup{hidelinks, unicode, hyperfootnotes=false}
\iow_new:N \ptxcd_xmpdata_stream
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo b/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo
index a4c1136f9c2..4f618069923 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudasize9pt.clo' version 3.39 (2024-06-27),
+%% This is file `tudasize9pt.clo' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
index 13d35721c52..54ffeeacd0a 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 3.39 (2024-06-27),
+%% This is file `tudathesis.cfg' version 3.41 (2024-07-02),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.39}
-\def\filedate{2024-06-27}
+\def\fileversion{3.41}
+\def\filedate{2024-07-02}
\RequirePackage{expl3}
\ProvidesExplFile{tudathesis.cfg}
{\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)}
@@ -56,8 +56,9 @@
}
{
\ptxcd_declare_caption:Nnn \departmentname {Fachbereich} {department}
- \ptxcd_declare_caption:Nnn \ptxcd_departmentprefix: {im~ \departmentname}{in~the~\departmentname{}~ of}
\ptxcd_declare_caption:Nnn \departmentfullname {\departmentname{}~ \ptxcd_department:} { \ptxcd_department:{}~ \text_titlecase:n{\departmentname}}
+ \ptxcd_declare_caption:Nnn \ptxcd_departmentprefix: {im~ \departmentname}{in~the~\departmentname{}~ of}
+ \ptxcd_declare_caption:Nnn \ptxcd_in_department {\ptxcd_departmentprefix:{}~\ptxcd_department:}{\ptxcd_departmentprefix:{}~\ptxcd_department:}
}
{\bool_if:NTF \g_ptxcd_dr_bool
{
@@ -203,7 +204,7 @@
\IfBooleanTF{#1}{
\tl_gset:Nn \ptxcd_department: {#3}
\tl_gset:Nn \ptxcd_in_department{#3}
- \IfNoValueTF {\tl_gset:Nn \ptxcd_box_department {#3}} {\tl_gset:Nn \ptxcd_box_department{#2}}
+ \IfNoValueTF {#2} {\tl_gset:Nn \ptxcd_box_department {#3}} {\tl_gset:Nn \ptxcd_box_department{#2}}
\clist_remove_all:Nn \g_ptxcd_Required_title_data_clist {department}
}{
\tl_gset:Nn \g_ptxcd_department_choice_tl {#3}
@@ -373,7 +374,7 @@
{\keys_set:nn {ptxcd/thesis} {printid=#1}}
\lowertitleback{
\urlstyle{same}
- \selectlanguage{ngerman}
+ \selectlanguage{german}
Bitte~zitieren~Sie~dieses~Dokument~als:
\tl_if_empty:NF \g_ptxcd_thesis_urn_tl {\\URN:~urn:nbn:de:tuda-tuprints-\g_ptxcd_thesis_urn_tl}\\
URL:~\url{https://tuprints.ulb.tu-darmstadt.de/\g_ptxcd_thesis_tuprints_tl}\\
@@ -530,7 +531,7 @@
\selectfont
{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
\usekomafont{subject}
- \bool_if:NT \g_ptxcd_dr_bool {\selectlanguage{ngerman}}
+ \bool_if:NT \g_ptxcd_dr_bool {\selectlanguage{german}}
\tl_if_empty:NF \g_ptxcd_titleintro_tl {\g_ptxcd_titleintro_tl\par}
\tl_if_empty:NF \g_ptxcd_thesis_drtext_tl {\g_ptxcd_thesis_drtext_tl\par}
{%
@@ -644,7 +645,7 @@
{\keys_set:nn {ptxcd/thesis} {affidavit=#2}}%
}%
\clearpage
-\begin{otherlanguage}{ngerman}
+\begin{otherlanguage}{german}
\bool_if:NTF \g_ptxcd_dr_bool {
\g__ptxcd_affidavit_dr_tl
} {
@@ -742,7 +743,7 @@
Use~"ignore-title-language"~Option~to~ignore~this~message~at~your~own~risk.
}
-\PassOptionsToPackage{ngerman}{babel}
+\PassOptionsToPackage{german}{babel}
\AtBeginDocument{
\@ifpackageloaded{babel}{}{
\msg_new:nnnn{tudapub/thesis} {missing-babel} {
diff --git a/Master/texmf-dist/tex/latex/typog/typog.sty b/Master/texmf-dist/tex/latex/typog/typog.sty
index bbb03cb5cbe..d58f381051a 100644
--- a/Master/texmf-dist/tex/latex/typog/typog.sty
+++ b/Master/texmf-dist/tex/latex/typog/typog.sty
@@ -11,11 +11,11 @@
%% Copyright (C) 2024 by Ch. L. Spiel
%%
%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
+%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,13 +25,15 @@
%% This work consists of the files typog.dtx and typog.ins
%% and the derived files typog.sty, slant-angle.mp,
%% crooked-paragraphs.mp, smooth-parshapes.mp, title.mp,
-%% typog-example.tex, typog-nomt.tex, typog-grep.pl,
+%% typog-example.tex, typog-minimal-test.tex,
+%% typog-without-microtype-test.tex
+%% typog-grep.pl.in, typog-grep.pl,
%% typog-grep.pod, and teximan2latex.sed.
%%
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{typog}
- [2024/05/07 v0.3 TypoGraphic extensions]
+ [2024/07/08 v0.4 TypoGraphic extensions]
\RequirePackage{etoolbox}
\RequirePackage{everyhook}
@@ -40,10 +42,11 @@
\newcommand*{\typog@TYPOG}{}
\newcommand*{\typoglogo}{\textsf{T\itcorr*{-5}\textsl{y}poG}}
\newif\iftypog@debug
-\newcommand*{\typog@typeout}[1]
- {\iftypog@debug
- \typeout{typog: #1}%
- \fi}
+\newcommand*{\typog@typeout}[1]{\typeout{typog: #1}}
+
+\newcommand*{\typog@debug@typeout}[1]{\iftypog@debug\typog@typeout{#1}\fi}
+
+\newcounter{typog@@iteration}
\ExplSyntaxOn
\let\typog@trim@spaces=\tl_trim_spaces:o
@@ -85,20 +88,34 @@
\fi
}
-\newmuskip\typog@mathitalicscorrection
-\newlength{\typog@textitalicscorrection}
-\newlength{\typog@ligaturekern}
-\newlength{\typog@raisecapitaldash}
-\newlength{\typog@raisecapitalguillemets}
-\newlength{\typog@raisecapitalhyphen}
-\newlength{\typog@raisecapitaltimes}
-\newlength{\typog@raiseguillemets}
-\newlength{\typog@raisefiguredash}
-\newlength{\typog@slashkern}
-\newcommand*{\typog@breakpenalty}{\exhyphenpenalty}
+\newmuskip\typog@config@mathitalicscorrection
+
+\newdimen{\typog@adjust@labelitemi}
+\newdimen{\typog@adjust@labelitemii}
+\newdimen{\typog@adjust@labelitemiii}
+\newdimen{\typog@adjust@labelitemiv}
+\newdimen{\typog@adjust@lowercase@labelitemi}
+\newdimen{\typog@adjust@lowercase@labelitemii}
+\newdimen{\typog@adjust@lowercase@labelitemiii}
+\newdimen{\typog@adjust@lowercase@labelitemiv}
+\newdimen{\typog@adjust@uppercase@labelitemi}
+\newdimen{\typog@adjust@uppercase@labelitemii}
+\newdimen{\typog@adjust@uppercase@labelitemiii}
+\newdimen{\typog@adjust@uppercase@labelitemiv}
+
+\newlength{\typog@config@textitalicscorrection}
+\newlength{\typog@config@ligaturekern}
+\newlength{\typog@config@raisecapitaldash}
+\newlength{\typog@config@raisecapitalguillemets}
+\newlength{\typog@config@raisecapitalhyphen}
+\newlength{\typog@config@raisecapitaltimes}
+\newlength{\typog@config@raiseguillemets}
+\newlength{\typog@config@raisefiguredash}
+\newlength{\typog@config@slashkern}
+\newcommand*{\typog@config@breakpenalty}{\exhyphenpenalty}
\newlength{\typog@dim@unit}
\setlength{\typog@dim@unit}{.001em}
-\newcommand*{\typog@trackingttspacing}{300, 90, 60}
+\newcommand*{\typog@config@trackingttspacing}{300, 90, 60}
\newcommand*{\typog@default@shrink@i}{5}
\newcommand*{\typog@default@shrink@ii}{10}
\newcommand*{\typog@default@shrink@iii}{20}
@@ -122,77 +139,99 @@
\newcommand*{\typog@set@shrink@limits}
{\edef\typog@@star{*}%
- \edef\typog@@limit{\typog@triple@get@i{\typog@shrinklimits}}%
+ \edef\typog@@limit{\typog@triple@get@i{\typog@config@shrinklimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@shrink@i{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@ii{\typog@shrinklimits}}%
+ \edef\typog@@limit{\typog@triple@get@ii{\typog@config@shrinklimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@shrink@ii{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@iii{\typog@shrinklimits}}%
+ \edef\typog@@limit{\typog@triple@get@iii{\typog@config@shrinklimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@shrink@iii{\number\typog@@limit}\fi}
\newcommand*{\typog@set@stretch@limits}
{\edef\typog@@star{*}%
- \edef\typog@@limit{\typog@triple@get@i{\typog@stretchlimits}}%
+ \edef\typog@@limit{\typog@triple@get@i{\typog@config@stretchlimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@stretch@i{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@ii{\typog@stretchlimits}}%
+ \edef\typog@@limit{\typog@triple@get@ii{\typog@config@stretchlimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@stretch@ii{\number\typog@@limit}\fi
- \edef\typog@@limit{\typog@triple@get@iii{\typog@stretchlimits}}%
+ \edef\typog@@limit{\typog@triple@get@iii{\typog@config@stretchlimits}}%
\unless\ifx\typog@@limit\typog@@star\edef\typog@stretch@iii{\number\typog@@limit}\fi}
\DeclareOptionX<typog>{breakpenalty}%
- {\renewcommand*{\typog@breakpenalty}{#1}}
+ {\renewcommand*{\typog@config@breakpenalty}{#1}}
\DeclareOptionX<typog>{debug}{\typog@debugtrue}
\DeclareOptionX<typog>{mathitalicscorrection}[.4mu]%
- {\typog@mathitalicscorrection=#1\relax}%
+ {\typog@config@mathitalicscorrection=#1\relax}%
\DeclareOptionX<typog>{nodebug}{\typog@debugfalse}
\DeclareOptionX<typog>{textitalicscorrection}[.02em]%
- {\setlength{\typog@textitalicscorrection}{#1}}
+ {\setlength{\typog@config@textitalicscorrection}{#1}}
\DeclareOptionX<typog>{ligaturekern}[.033333em]%
- {\setlength{\typog@ligaturekern}{#1}}
+ {\setlength{\typog@config@ligaturekern}{#1}}
+\DeclareOptionX<typog>{lowercaselabelitemadjustments}%
+ {\typog@debug@typeout{lowercaselabelitemadjustments={#1}}
+ \def\typog@@do##1{\addtocounter{typog@@iteration}{1}
+ \global\setlength{\csname typog@adjust@lowercase@labelitem\romannumeral\thetypog@@iteration\endcsname}{##1}}
+ \setcounter{typog@@iteration}{0}
+ \forcsvlist{\typog@@do}{#1}}
+\newcommand*{\typog@config@lowercaselabelitemadjustments}
+ {\the\typog@adjust@lowercase@labelitemi,\space
+ \the\typog@adjust@lowercase@labelitemii,\space
+ \the\typog@adjust@lowercase@labelitemiii,\space
+ \the\typog@adjust@lowercase@labelitemiv}
\DeclareOptionX<typog>{raisecapitaldash}[\z@]%
- {\setlength{\typog@raisecapitaldash}{#1}}
+ {\setlength{\typog@config@raisecapitaldash}{#1}}
\DeclareOptionX<typog>{raisecapitalguillemets}[\z@]%
- {\setlength{\typog@raisecapitalguillemets}{#1}}
+ {\setlength{\typog@config@raisecapitalguillemets}{#1}}
\DeclareOptionX<typog>{raisecapitalhyphen}[\z@]%
- {\setlength{\typog@raisecapitalhyphen}{#1}}
+ {\setlength{\typog@config@raisecapitalhyphen}{#1}}
\DeclareOptionX<typog>{raisecapitaltimes}[\z@]%
- {\setlength{\typog@raisecapitaltimes}{#1}}
+ {\setlength{\typog@config@raisecapitaltimes}{#1}}
\DeclareOptionX<typog>{raiseguillemets}[\z@]%
- {\setlength{\typog@raiseguillemets}{#1}}
+ {\setlength{\typog@config@raiseguillemets}{#1}}
\DeclareOptionX<typog>{raisefiguredash}[\z@]%
- {\setlength{\typog@raisefiguredash}{#1}}
+ {\setlength{\typog@config@raisefiguredash}{#1}}
\DeclareOptionX<typog>{raise*}[\z@]%
- {\setlength{\typog@raisecapitaldash}{#1}%
- \setlength{\typog@raisecapitalhyphen}{#1}%
- \setlength{\typog@raisecapitaltimes}{#1}%
- \setlength{\typog@raisefiguredash}{#1}}
+ {\setlength{\typog@config@raisecapitaldash}{#1}%
+ \setlength{\typog@config@raisecapitalhyphen}{#1}%
+ \setlength{\typog@config@raisecapitaltimes}{#1}%
+ \setlength{\typog@config@raisefiguredash}{#1}}
\DeclareOptionX<typog>{shrinklimits}%
[\typog@default@shrink@i, \typog@default@shrink@ii, \typog@default@shrink@iii]%
{\typog@require@preloaded@microtype
\ifx\@onlypreamble\@notprerr
\PackageWarning{typog}{option `shrinklimits' can only be used in the preamble}%
\else
- \edef\typog@shrinklimits{#1}%
+ \edef\typog@config@shrinklimits{#1}%
\typog@set@shrink@limits
\fi}
\DeclareOptionX<typog>{slashkern}[.05em]%
- {\setlength{\typog@slashkern}{#1}}
+ {\setlength{\typog@config@slashkern}{#1}}
\DeclareOptionX<typog>{stretchlimits}%
[\typog@default@stretch@i, \typog@default@stretch@ii, \typog@default@stretch@iii]%
{\typog@require@preloaded@microtype
\ifx\@onlypreamble\@notprerr
\PackageWarning{typog}{option `stretchlimits' can only be used in the preamble}%
\else
- \edef\typog@stretchlimits{#1}%
+ \edef\typog@config@stretchlimits{#1}%
\typog@set@stretch@limits
\fi}
-\DeclareOptionX<typog>{trackingttspacing}[\typog@trackingttspacing]%
+\DeclareOptionX<typog>{trackingttspacing}[\typog@config@trackingttspacing]%
{\typog@require@preloaded@microtype
\ifx\@onlypreamble\@notprerr
\PackageWarning{typog}{option `trackingttspacing' can only be used in the preamble}%
\else
- \typog@typeout{trackingttspacing=#1}%
+ \typog@debug@typeout{trackingttspacing=#1}%
\SetTracking[outer spacing={#1}]{encoding=*, family=tt*}{0}%
\fi}
+\DeclareOptionX<typog>{uppercaselabelitemadjustments}%
+ {\typog@debug@typeout{uppercaselabelitemadjustments={#1}}
+ \def\typog@@do##1{\addtocounter{typog@@iteration}{1}
+ \setlength{\csname typog@adjust@uppercase@labelitem\romannumeral\thetypog@@iteration\endcsname}{##1}}
+ \setcounter{typog@@iteration}{0}
+ \forcsvlist{\typog@@do}{#1}}
+\newcommand*{\typog@config@uppercaselabelitemadjustments}
+ {\the\typog@adjust@uppercase@labelitemi,\space
+ \the\typog@adjust@uppercase@labelitemii,\space
+ \the\typog@adjust@uppercase@labelitemiii,\space
+ \the\typog@adjust@uppercase@labelitemiv}
\newcommand*{\typog@initialize@options}
{\ExecuteOptionsX<typog>{
@@ -220,7 +259,30 @@
\fi
\ignorespaces}
{\ignorespacesafterend}
-\NewDocumentCommand{\typogget}{m}{\csname typog@#1\endcsname}
+\NewDocumentCommand{\typogget}{m}{\csname typog@config@#1\endcsname}
+
+\ExplSyntaxOn
+\cs_generate_variant:Nn \seq_set_split:Nnn {Nne}
+\cs_new:Npn \typog_get_nth_csname:cnn #1#2#3
+ {
+ \seq_set_split:Nne \l_tmpa_seq {,} {\cs:w typog@config@#2 \cs_end:}
+ \cs_gset:cpn {#1} {\seq_item:Nn \l_tmpa_seq {#3}}
+ }
+\cs_new:Npn \typog_get_nth_dimen:nnn #1#2#3
+ {
+ \seq_set_split:Nne \l_tmpa_seq {,} {\cs:w typog@config@#2 \cs_end:}
+ \dim_set:Nn {#1} {\seq_item:Nn \l_tmpa_seq {#3}}
+ }
+\NewDocumentCommand{\typoggetnth}{m m m}{
+ \token_if_dim_register:NTF {#1}
+ {
+ \typog_get_nth_dimen:nnn {#1} {#2} {#3}
+ }
+ {
+ \typog_get_nth_csname:cnn {#1} {#2} {#3}
+ }
+}
+\ExplSyntaxOff
\ExplSyntaxOn
\newcommand*{\typog@round@dim@to@tenths}[1]
@@ -250,6 +312,7 @@
\newcommand*{\typog@default@inspect@id@prefix}{a-}
\newcounter{typog@inspect@count}
+
\define@key[typog]{typoginspect}{tracingboxes}[\maxdimen]%
{\def\typog@@typoginspect@tracingboxes{#1}}
\NewDocumentEnvironment{typoginspect}{O{} m}
@@ -258,11 +321,16 @@
\edef\typog@@arg{#2}%
\ifx\typog@@arg\empty
\stepcounter{typog@inspect@count}%
- \edef\typog@@id{\typog@default@inspect@id@prefix\arabic{typog@inspect@count}}%
+ \edef\typog@@id{\typog@default@inspect@id@prefix
+ \arabic{typog@inspect@count}}%
\else
\edef\typog@@id{\typog@trim@spaces{\typog@@arg}}%
\fi
- \typeout{<typog-inspect id="\typog@@id" job="\jobname" line="\the\inputlineno" page="\the\value{page}">}%
+ \typeout{<typog-inspect\space
+ id="\typog@@id"\space
+ job="\jobname"\space
+ line="\the\inputlineno"\space
+ page="\the\value{page}">}%
\hbadness=\m@ne
\vbadness=\m@ne
\tracingnone
@@ -306,7 +374,7 @@
\newcommand*{\typog@hyphen}{\char`-}
\NewDocumentCommand{\nolig}{s o}
- {\dimen0=\IfNoValueTF{#2}{\typog@ligaturekern}{#2\typog@dim@unit}%
+ {\dimen0=\IfNoValueTF{#2}{\typog@config@ligaturekern}{#2\typog@dim@unit}%
\IfBooleanTF{#1}%
{\kern\dimen0\ignorespaces}%
{\discretionary{\typog@hyphen}{}{\kern\dimen0}%
@@ -329,7 +397,7 @@
}
\newcommand*{\typog@itcorr@text@unconditional}[1]
- {\kern#1\typog@textitalicscorrection}
+ {\kern#1\typog@config@textitalicscorrection}
\newcommand*{\typog@itcorr@text}[1]
{\def\typog@@strength{#1}%
\dimen0=\fontdimen1\font
@@ -339,7 +407,7 @@
\kern\typog@@strength\dimen0
\fi}
\newcommand*{\typog@itcorr@math}[1]
- {\mkern#1\typog@mathitalicscorrection}
+ {\mkern#1\typog@config@mathitalicscorrection}
\NewDocumentCommand{\itcorr}{s m}
{\ifmmode
\typog@itcorr@math{#2}%
@@ -354,11 +422,11 @@
\newcommand*{\typog@forwardslash}{\char`/}
\NewDocumentCommand{\kernedslash}{s}
- {\hspace*{\typog@slashkern}%
+ {\hspace*{\typog@config@slashkern}%
\typog@forwardslash
\IfBooleanTF{#1}%
- {\hspace*{\typog@slashkern}\ignorespaces}%
- {\typog@breakpoint\typog@allowhyphenation\hspace*{\typog@slashkern}}}
+ {\hspace*{\typog@config@slashkern}\ignorespaces}%
+ {\typog@breakpoint\typog@allowhyphenation\hspace*{\typog@config@slashkern}}}
\typog@register@pdfsubstitute{
\def\kernedslash#1{\if*\detokenize{#1}/\ignorespaces\else/#1\fi}%
}
@@ -373,7 +441,7 @@
\def\typog@@optarg{#2}%
\hspace*{#3\typog@dim@unit}%
\raisebox{\ifx\typog@@optarg\typog@@auto
- \typog@raisecapitalhyphen
+ \typog@config@raisecapitalhyphen
\else
\typog@@optarg\typog@dim@unit
\fi}{\typog@hyphen}%
@@ -400,9 +468,9 @@
}
\newcommand*{\typog@breakpoint}
- {\penalty\typog@breakpenalty}
+ {\penalty\typog@config@breakpenalty}
\NewDocumentCommand{\capitalhyphen}{s}
- {\raisebox{\typog@raisecapitalhyphen}{\typog@hyphen}%
+ {\raisebox{\typog@config@raisecapitalhyphen}{\typog@hyphen}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -416,7 +484,7 @@
}
\NewDocumentCommand{\capitalendash}{s}
- {\raisebox{\typog@raisecapitaldash}{\textendash}%
+ {\raisebox{\typog@config@raisecapitaldash}{\textendash}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -432,7 +500,7 @@
}
\NewDocumentCommand{\capitalemdash}{s}
- {\raisebox{\typog@raisecapitaldash}{\textemdash}%
+ {\raisebox{\typog@config@raisecapitaldash}{\textemdash}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -446,7 +514,7 @@
}
\NewDocumentCommand{\figuredash}{s}
- {\raisebox{\typog@raisefiguredash}{\textendash}%
+ {\raisebox{\typog@config@raisefiguredash}{\textendash}%
\IfBooleanTF{#1}%
{\ignorespaces}%
{\typog@breakpoint\typog@allowhyphenation}}
@@ -454,9 +522,9 @@
\NewDocumentCommand{\capitaltimes}{}
{\ifmmode
- \mathbin{\raisebox{\typog@raisecapitaltimes}{$\m@th\times$}}%
+ \mathbin{\raisebox{\typog@config@raisecapitaltimes}{$\m@th\times$}}%
\else
- \raisebox{\typog@raisecapitaltimes}{\texttimes}%
+ \raisebox{\typog@config@raisecapitaltimes}{\texttimes}%
\fi}
\typog@register@pdfsubstitute{
\RenewExpandableDocumentCommand{\capitaltimes}{}{\texttimes}
@@ -464,37 +532,247 @@
\NewDocumentCommand{\singleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raiseguillemets}{\guilsinglleft}}
+ \raisebox{\typog@config@raiseguillemets}{\guilsinglleft}}
\typog@register@pdfsubstitute{\let\singleguillemetleft\guilsinglleft}
\NewDocumentCommand{\singleguillemetright}{}
- {\raisebox{\typog@raiseguillemets}{\guilsinglright}%
+ {\raisebox{\typog@config@raiseguillemets}{\guilsinglright}%
\typog@allowhyphenation}
\typog@register@pdfsubstitute{\let\singleguillemetright\guilsinglright}
\NewDocumentCommand{\doubleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raiseguillemets}{\guillemotleft}}
+ \raisebox{\typog@config@raiseguillemets}{\guillemotleft}}
\typog@register@pdfsubstitute{\let\doubleguillemetleft\guillemotleft}
\NewDocumentCommand{\doubleguillemetright}{}
- {\raisebox{\typog@raiseguillemets}{\guillemotright}%
+ {\raisebox{\typog@config@raiseguillemets}{\guillemotright}%
\typog@allowhyphenation}
\typog@register@pdfsubstitute{\let\doubleguillemetright\guillemotright}
\NewDocumentCommand{\Singleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raisecapitalguillemets}{\guilsinglleft}}
+ \raisebox{\typog@config@raisecapitalguillemets}{\guilsinglleft}}
\typog@register@pdfsubstitute{\let\Singleguillemetleft\guilsinglleft}
\NewDocumentCommand{\Singleguillemetright}{}
- {\raisebox{\typog@raisecapitalguillemets}{\guilsinglright}%
+ {\raisebox{\typog@config@raisecapitalguillemets}{\guilsinglright}%
\typog@allowhyphenation}
\typog@register@pdfsubstitute{\let\Singleguillemetright\guilsinglright}
\NewDocumentCommand{\Doubleguillemetleft}{}
{\typog@allowhyphenation
- \raisebox{\typog@raisecapitalguillemets}{\guillemotleft}}
+ \raisebox{\typog@config@raisecapitalguillemets}{\guillemotleft}}
\typog@register@pdfsubstitute{\let\Doubleguillemetleft\guillemotleft}
\NewDocumentCommand{\Doubleguillemetright}{}
- {\raisebox{\typog@raisecapitalguillemets}{\guillemotright}%
+ {\raisebox{\typog@config@raisecapitalguillemets}{\guillemotright}%
\typog@allowhyphenation}
\typog@register@pdfsubstitute{\let\Doubleguillemetright\guillemotright}
+\newcommand*{\@typog@uppercase@adjust@labelitem}[1]
+ {\@typog@maybe@patch@itemize
+ \ifstrequal{#1}{*}
+ {\setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@uppercase@labelitemi}
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@uppercase@labelitemii}
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@uppercase@labelitemiii}
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@uppercase@labelitemiv}}
+ {\ifcase #1% 0
+ \relax % outside of any itemize environment
+ \or % 1
+ \setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@uppercase@labelitemi}
+ \or % 2
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@uppercase@labelitemii}
+ \or % 3
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@uppercase@labelitemiii}
+ \or % 4
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@uppercase@labelitemiv}
+ \else
+ \PackageError{typog}
+ {Itemize level out of range}
+ {Valid levels are 1, 2, 3, 4, and *}
+ \fi}}
+
+\newcommand*{\@typog@lowercase@adjust@labelitem}[1]
+ {\@typog@maybe@patch@itemize
+ \ifstrequal{#1}{*}
+ {\setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@lowercase@labelitemi}
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@lowercase@labelitemii}
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@lowercase@labelitemiii}
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@lowercase@labelitemiv}}
+ {\ifcase #1% 0
+ \relax % outside of any itemize environment
+ \or % 1
+ \setlength{\typog@adjust@labelitemi}
+ {\typog@adjust@lowercase@labelitemi}
+ \or % 2
+ \setlength{\typog@adjust@labelitemii}
+ {\typog@adjust@lowercase@labelitemii}
+ \or % 3
+ \setlength{\typog@adjust@labelitemiii}
+ {\typog@adjust@lowercase@labelitemiii}
+ \or % 4
+ \setlength{\typog@adjust@labelitemiv}
+ {\typog@adjust@lowercase@labelitemiv}
+ \else
+ \PackageError{typog}
+ {Itemize level out of range}
+ {Valid levels are 1, 2, 3, 4, and *}
+ \fi}}
+
+\newcommand*{\@typog@noadjust@labelitem}[1]
+ {\ifstrequal{#1}{*}
+ {\setlength{\typog@adjust@labelitemi}{\z@}
+ \setlength{\typog@adjust@labelitemii}{\z@}
+ \setlength{\typog@adjust@labelitemiii}{\z@}
+ \setlength{\typog@adjust@labelitemiv}{\z@}}
+ {\ifcase #1% 0
+ \relax % outside of any itemize environment
+ \or % 1
+ \setlength{\typog@adjust@labelitemi}{\z@}
+ \or % 2
+ \setlength{\typog@adjust@labelitemii}{\z@}
+ \or % 3
+ \setlength{\typog@adjust@labelitemiii}{\z@}
+ \or % 4
+ \setlength{\typog@adjust@labelitemiv}{\z@}
+ \else
+ \PackageError{typog}
+ {Itemize level out of range}
+ {Valid levels are 1, 2, 3, 4, and *}
+ \fi}}
+
+\NewDocumentCommand{\uppercaseadjustlabelitems}{m}
+ {\AfterPreamble{%
+ \ifblank{#1}
+ {\@typog@uppercase@adjust@labelitem{\@itemdepth}}
+ {\forcsvlist{\@typog@uppercase@adjust@labelitem}{#1}}%
+ \ignorespaces}}
+
+\NewDocumentCommand{\lowercaseadjustlabelitems}{m}
+ {\AfterPreamble{%
+ \ifblank{#1}
+ {\@typog@lowercase@adjust@labelitem{\@itemdepth}}
+ {\forcsvlist{\@typog@lowercase@adjust@labelitem}{#1}}%
+ \ignorespaces}}
+
+\NewDocumentCommand{\noadjustlabelitems}{m}
+ {\ifblank{#1}
+ {\@typog@noadjust@labelitem{\@itemdepth}}
+ {\forcsvlist{\@typog@noadjust@labelitem}{#1}}%
+ \ignorespaces}
+
+\newcommand*{\@typog@itemize@patch}
+ {\letcs{\@typog@old@itemitem}{\@itemitem}
+ \edef\@itemitem{@typog@labelitem\romannumeral\the\@itemdepth}
+ \expandafter\def\csname\@itemitem\endcsname
+ {\raisebox{\csname typog@adjust@labelitem\romannumeral\the\@itemdepth\endcsname}
+ {\@typog@old@itemitem}}}
+
+\newcommand*{\@typog@patch@itemize}
+ {\ifdefined\enit@itemize@i
+ \patchcmd{\enit@itemize@i}
+ {\expandafter}
+ {\@typog@itemize@patch\expandafter}
+ {\typog@debug@typeout{patching enumitem \string\enit@itemize@i\space succeeded}}
+ {\PackageError{typog}
+ {Patching enumitem macro \string\enit@itemize@i\space failed}
+ {}}
+ \else
+ \patchcmd{\itemize}
+ {\expandafter}
+ {\@typog@itemize@patch\expandafter}
+ {\typog@debug@typeout{patching \string\itemize\space succeeded}}
+ {\PackageError{typog}
+ {Patching plain LaTeX macro \string\itemize\space failed}
+ {}}
+ \fi}
+
+\newbool{@typog@itemize@has@been@patched}
+\newcommand*{\@typog@maybe@patch@itemize}
+ {\ifbool{@typog@itemize@has@been@patched}
+ {\relax}
+ {\@typog@patch@itemize
+ \booltrue{@typog@itemize@has@been@patched}}}
+
+\newcommand*{\typog@hairline@width}{.125pt}
+\newcommand*{\typogadjuststairsfor}[5]
+ {\dimen0=1pt%
+ \count0=#3\relax
+ \unless\ifodd\count0
+ \advance\count0 by 1%
+ \fi
+ \setcounter{typog@@iteration}{1}%
+ \setbox0=\hbox{#4}%
+ \setbox1=\hbox{}%
+ \loop
+ \ifnum\thetypog@@iteration=\numexpr\count0 / 2\relax
+ \dimen1=2\dimen0
+ \else
+ \dimen1=\dimen0
+ \fi
+ \dimen2=\dimexpr#2 * (\thetypog@@iteration - \count0 / 2)\relax
+ \setbox1=\hbox{\unhbox1\raisebox{\dimen2}{\kern\dimen1 #5\kern\dimen1}}%
+ \addtocounter{typog@@iteration}{1}%
+ \unless\ifnum\thetypog@@iteration>\count0
+ \repeat
+ \mbox{\rlap{\raisebox{\fpeval{#1}\ht0}{\rule{\wd1}{\typog@hairline@width}}}\box1}}
+
+\NewDocumentCommand{\typogadjuststairs}{O{.5} m m m}
+ {\begingroup
+ \unless\ifdim #2>\z@
+ \PackageError{typog}
+ {\string\typogadjuststairs\space non-positive step-size}
+ {step-size must be a positive dimension}%
+ \fi
+ \ifnum #3<1
+ \PackageError{typog}
+ {\string\typogadjuststairs\space too few number-of-steps}
+ {number-of-steps must at least be 1}%
+ \fi
+ \ifblank{#4}
+ {\PackageError{typog}
+ {sample must not be empty}
+ {supply either some uppercase or some lowercase letters}}
+ {}%
+ \def\arraystretch{1}%
+ \begin{tabular}{@{}c@{}}
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemi} \\
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemii} \\
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemiii} \\
+ \typogadjuststairsfor{#1}{#2}{#3}{#4}{\labelitemiv}
+ \end{tabular}
+ \endgroup}
+
+\newcommand*{\typog@uppercase@adjusted@labelitems}
+ {\hbox{\raisebox{\typog@adjust@uppercase@labelitemi}{\labelitemi}%
+ \raisebox{\typog@adjust@uppercase@labelitemii}{\labelitemii}%
+ \raisebox{\typog@adjust@uppercase@labelitemiii}{\labelitemiii}%
+ \raisebox{\typog@adjust@uppercase@labelitemiv}{\labelitemiv}}}
+\NewDocumentCommand{\typoguppercaseadjustcheck}{O{.5} m}
+ {\setbox0=\hbox{#2}%
+ \setbox1=\typog@uppercase@adjusted@labelitems
+ \mbox{\rlap{\raisebox{\fpeval{#1}\ht0}
+ {\rule{\wd1}{\typog@hairline@width}}}%
+ \box1}}
+
+\newcommand*{\typog@lowercase@adjusted@labelitems}
+ {\hbox{\raisebox{\typog@adjust@lowercase@labelitemi}{\labelitemi}%
+ \raisebox{\typog@adjust@lowercase@labelitemii}{\labelitemii}%
+ \raisebox{\typog@adjust@lowercase@labelitemiii}{\labelitemiii}%
+ \raisebox{\typog@adjust@lowercase@labelitemiv}{\labelitemiv}}}
+\NewDocumentCommand{\typoglowercaseadjustcheck}{O{.5} m}
+ {\setbox0=\hbox{#2}%
+ \setbox1=\typog@lowercase@adjusted@labelitems
+ \mbox{\rlap{\raisebox{\fpeval{#1}\ht0}
+ {\rule{\wd1}{\typog@hairline@width}}}%
+ \box1}}
+
\NewDocumentEnvironment{lastlineraggedleftpar}{}
{\lastlinefit=0%
\setlength{\leftskip}{\z@ \@plus 1fil}%
@@ -844,7 +1122,7 @@
\NewDocumentCommand{\vtietop}{O{3}}
{\setcounter{typog@mean@penalty}
{\typog@geometric@mean{\@M}{\clubpenalty}}%
- \typog@typeout{vtietop: penalties \the\@M--\the\value{typog@mean@penalty}--\the\clubpenalty}%
+ \typog@debug@typeout{vtietop: penalties \the\@M--\the\value{typog@mean@penalty}--\the\clubpenalty}%
\unless\ifnum\clubpenalty<\@M
\PackageWarning{typog}{vtietop: clubpenalty=\the\clubpenalty\space>= 10000}%
\fi
@@ -911,7 +1189,7 @@
\NewDocumentCommand{\vtiebot}{O{3}}
{\setcounter{typog@mean@penalty}
{\typog@geometric@mean{\@M}{\widowpenalty}}%
- \typog@typeout{vtiebot: penalties \the\@M--\the\value{typog@mean@penalty}--\the\widowpenalty}%
+ \typog@debug@typeout{vtiebot: penalties \the\@M--\the\value{typog@mean@penalty}--\the\widowpenalty}%
\unless\ifnum\widowpenalty<\@M
\PackageWarning{typog}{vtiebot: widowpenalty=\the\widowpenalty\space>= 10000}%
\fi
@@ -969,7 +1247,7 @@
\NewDocumentCommand{\typog@vtiebotdisp}{m}
{\setcounter{typog@mean@penalty}
{\typog@geometric@mean{\@M}{\displaywidowpenalty}}%
- \typog@typeout{vtiebotdisp: penalties \the\@M--\the\value{typog@mean@penalty}--\the\displaywidowpenalty}%
+ \typog@debug@typeout{vtiebotdisp: penalties \the\@M--\the\value{typog@mean@penalty}--\the\displaywidowpenalty}%
\unless\ifnum\displaywidowpenalty<\@M
\PackageWarning{typog}{vtiebotdisp: displaywidowpenalty=\the\displaywidowpenalty\space>= 10000}%
\fi
@@ -1047,9 +1325,9 @@
\int_set:Nn \l_tmpb_int {\typog@setbaselineskip@iter@limit}
\dim_set:Nn \l_tmpa_dim {\glueexpr #1}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
initial\space baselineskip:\space \the\baselineskip}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
target\space baselineskip:\space \dim_use:N \l_tmpa_dim}
\dim_compare:nNnTF {\baselineskip} > {\c_zero_dim}
@@ -1102,10 +1380,10 @@
{}
}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
final\space \string\setstretch\space argument:\space
\fp_use:N \l_tmpa_fp}
- \typog@typeout{\string\setbaselineskip:\space
+ \typog@debug@typeout{\string\setbaselineskip:\space
final\space baselineskip:\space \the\baselineskip}
}
@@ -1123,7 +1401,7 @@
\dim_new:N \typogfontsize
\AfterEndPreamble{
\dim_set:Nn \typogfontsize {\fontdimen6\font}
- \typog@typeout{\string\typogfontsize =
+ \typog@debug@typeout{\string\typogfontsize =
\dim_use:N \typogfontsize\space
(at\space begin\space of\space document)}
}
@@ -1205,13 +1483,13 @@
\skip1=#2\relax
\skip2=#3\relax
\skip3=#4\relax
- \typog@typeout{smoothraggedrightshapetriplet: skip0=\the\skip0}%
- \typog@typeout{smoothraggedrightshapetriplet: skip1=\the\skip1}%
- \typog@typeout{smoothraggedrightshapetriplet: skip2=\the\skip2}%
- \typog@typeout{smoothraggedrightshapetriplet: skip3=\the\skip3}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip0=\the\skip0}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip1=\the\skip1}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip2=\the\skip2}%
+ \typog@debug@typeout{smoothraggedrightshapetriplet: skip3=\the\skip3}%
\unless\ifnum\typog@mod{\typog@triplet@max@lines}{3}=0
\PackageError{typog}
- {Line number of triplet generator %
+ {Line number of triplet generator\space
(\typog@triplet@max@lines) not divisible by 3}
{}
\fi
@@ -1240,15 +1518,15 @@
\skip3=#4\relax
\skip4=#5\relax
\skip5=#6\relax
- \typog@typeout{smoothraggedrightshapequintuplet: skip0=\the\skip0}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip1=\the\skip1}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip2=\the\skip2}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip3=\the\skip3}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip4=\the\skip4}%
- \typog@typeout{smoothraggedrightshapequintuplet: skip5=\the\skip5}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip0=\the\skip0}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip1=\the\skip1}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip2=\the\skip2}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip3=\the\skip3}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip4=\the\skip4}%
+ \typog@debug@typeout{smoothraggedrightshapequintuplet: skip5=\the\skip5}%
\unless\ifnum\typog@mod{\typog@quintuplet@max@lines}{5}=0
\PackageError{typog}
- {Line number of quintuplet generator %
+ {Line number of quintuplet generator\space
(\typog@quintuplet@max@lines) not divisible by 5}
{}
\fi
@@ -1279,17 +1557,17 @@
\skip5=#6\relax
\skip6=#7\relax
\skip7=#8\relax
- \typog@typeout{smoothraggedrightshapeseptuplet: skip0=\the\skip0}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip1=\the\skip1}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip2=\the\skip2}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip3=\the\skip3}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip4=\the\skip4}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip5=\the\skip5}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip6=\the\skip6}%
- \typog@typeout{smoothraggedrightshapeseptuplet: skip7=\the\skip7}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip0=\the\skip0}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip1=\the\skip1}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip2=\the\skip2}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip3=\the\skip3}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip4=\the\skip4}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip5=\the\skip5}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip6=\the\skip6}%
+ \typog@debug@typeout{smoothraggedrightshapeseptuplet: skip7=\the\skip7}%
\unless\ifnum\typog@mod{\typog@septuplet@max@lines}{7}=0
\PackageError{typog}
- {Line number of septuplet generator %
+ {Line number of septuplet generator\space
(\typog@septuplet@max@lines) not divisible by 7}
{}
\fi
@@ -1340,7 +1618,7 @@
\typog@fuzzwidth=\smoothraggedrightfuzzfactor\smoothraggedrightragwidth
\ifcase\typog@@generatorchoice
\typog@fuzzwidth=.25\smoothraggedrightragwidth
- \typog@typeout{smoothraggedright: generator=triplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
+ \typog@debug@typeout{smoothraggedright: generator=triplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
\smoothraggedrightshapetriplet[leftskip=\typog@@smoothraggedrightleftskip,
parindent=\glueexpr\smoothraggedrightparindent + \parindent,
#1]%
@@ -1351,7 +1629,7 @@
+ \glueexpr \z@ \@plus \typog@fuzzwidth \@minus \typog@fuzzwidth\relax}% (2)
\or
\typog@fuzzwidth=.125\smoothraggedrightragwidth
- \typog@typeout{smoothraggedright: generator=quintuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
+ \typog@debug@typeout{smoothraggedright: generator=quintuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
\smoothraggedrightshapequintuplet[leftskip=\typog@@smoothraggedrightleftskip,
parindent=\glueexpr\smoothraggedrightparindent + \parindent,
#1]%
@@ -1366,7 +1644,7 @@
+ \glueexpr \z@ \@plus \typog@fuzzwidth\relax}% (1)
\or
\typog@fuzzwidth=.08333\smoothraggedrightragwidth
- \typog@typeout{smoothraggedright: generator=septuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
+ \typog@debug@typeout{smoothraggedright: generator=septuplet, typog@fuzzwidth=\the\typog@fuzzwidth}%
\smoothraggedrightshapeseptuplet[leftskip=\typog@@smoothraggedrightleftskip,
parindent=\glueexpr\smoothraggedrightparindent + \parindent,
#1]%
diff --git a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
index 703a54d6c3a..eb32a214ace 100644
--- a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
+++ b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
@@ -8,46 +8,41 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017 Universite Laval
+%% Copyright (C) 2012-2024 Universite Laval
%%
%% This file may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in:
%%
-%% http://www.latex-project.org/lppl.txt
+%% https://www.latex-project.org/lppl.txt
%%
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2006/05/20 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Universite Laval
-%% <ulthese-dev@bibl.ulaval.ca>.
+%% The Current Maintainer of this work is Vincent Goulet for
+%% Universite Laval <ulthese-dev@bibl.ulaval.ca>.
%%
-%% This work consists of the files ulthese.dtx and ulthese.ins and the
-%% derived files listed in the README.md file.
+%% This work consists of the files ulthese.dtx, ulthese.ins, and the
+%% derived files listed in the file README.md.
%%
-\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+\NeedsTeXFormat{LaTeX2e}[2021/06/01]
\ProvidesClass{ulthese}%
- [2021/08/09 v5.3a Universite Laval thesis and memoir class]
-\RequirePackage{ifxetex}
+ [2024/07/02 v6.0 Thesis class for Universite Laval]
\newif\ifUL@babel \UL@babeltrue % charger babel?
\newif\ifUL@natbib \UL@natbibtrue % charger natbib?
\newif\ifUL@hyperref \UL@hyperreftrue % charger hyperref?
-\newif\ifUL@chapterbib \UL@chapterbibfalse % charger chapterbib?
-\newif\ifUL@sectionbib \UL@sectionbibfalse % option sectionbib de chapterbib?
-\newif\ifUL@isthesis % programme est une thèse?
-\newif\ifUL@iscotutelle \UL@iscotutellefalse % thèse en cotutelle?
+\newif\ifUL@isthesis % programme est une these?
+\newif\ifUL@iscotutelle \UL@iscotutellefalse % these en cotutelle?
\newif\ifUL@isexam \UL@isexamfalse % examen de doctorat?
-\newif\ifUL@isessay \UL@isessayfalse % essai de maîtrise?
+\newif\ifUL@isessay \UL@isessayfalse % essai de maitrise?
\newif\ifUL@isresearch \UL@isresearchfalse % projet de recherche?
\newif\ifUL@isworkterm \UL@isworktermfalse % rapport de stage?
\newif\ifUL@hassubtitle \UL@hassubtitlefalse % document a un sous-titre?
-\newif\ifUL@hastitlepage \UL@hastitlepagefalse % page titre utilisée?
+\newif\ifUL@hastitlepage \UL@hastitlepagefalse % page titre utilisee?
\DeclareOption{nonatbib}{\UL@natbibfalse}
-\DeclareOption{bibchapitre}{\UL@chapterbibtrue}
-\DeclareOption{bibsection}{\UL@chapterbibtrue\UL@sectionbibtrue}
\DeclareOption{nobabel}{\UL@babelfalse}
\DeclareOption{nohyperref}{\UL@hyperreffalse}
\newcommand*{\UL@ptsize}{}
@@ -90,10 +85,6 @@
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
\newcommand*{\UL@degree}{Ma\^itre en architecture (M.~Arch.)}}
-\DeclareOption{MA}{%
- \UL@isthesisfalse
- \renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre \`es arts (M.A.)}}
\DeclareOption{LLM}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
@@ -106,14 +97,10 @@
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
\newcommand*{\UL@degree}{Ma\^itre en musique (M.~Mus.)}}
-\DeclareOption{MPht}{%
- \UL@isthesisfalse
- \renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre en physioth\'erapie (M.~Pht.)}}
-\DeclareOption{MSc}{%
+\DeclareOption{MPsEd}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre \`es sciences (M.~Sc.)}}
+ \newcommand*{\UL@degree}{Ma\^itre en psycho\'education (M.~Ps.~\'ed.)}}
\DeclareOption{MScGeogr}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
@@ -122,10 +109,18 @@
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
\newcommand*{\UL@degree}{Ma\^itre en service social (M.~Serv.~soc.)}}
-\DeclareOption{MPsEd}{%
+\DeclareOption{MTravSoc}{%
\UL@isthesisfalse
\renewcommand*{\UL@typenum}{0}
- \newcommand*{\UL@degree}{Ma\^itre en psycho\'education (M.~Ps.~\'ed.)}}
+ \newcommand*{\UL@degree}{Ma\^itre en travail social (M.~Trav.~soc.)}}
+\DeclareOption{MA}{%
+ \UL@isthesisfalse
+ \renewcommand*{\UL@typenum}{0}
+ \newcommand*{\UL@degree}{Ma\^itre \`es arts (M.A.)}}
+\DeclareOption{MSc}{%
+ \UL@isthesisfalse
+ \renewcommand*{\UL@typenum}{0}
+ \newcommand*{\UL@degree}{Ma\^itre \`es sciences (M.~Sc.)}}
\DeclareOption{multifacultaire}{%
\ifUL@isthesis
\renewcommand*{\UL@typenum}{1}
@@ -221,32 +216,22 @@
\fi
\fi
\LoadClass[oneside]{memoir}
-\ifxetex
+\iftutex
+ \RequirePackage[babel=true]{microtype}
\RequirePackage{fontspec}
- \defaultfontfeatures{Ligatures=TeX}
\else
+ \RequirePackage[babel=true]{microtype}
+ \RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}
\fi
\ifUL@natbib
- \ifUL@sectionbib
- \PassOptionsToPackage{sectionbib}{natbib}
- \fi
\RequirePackage[round,semicolon,authoryear]{natbib}
\fi
-\ifUL@chapterbib
- \ifUL@sectionbib
- \ifUL@natbib\else
- \PassOptionsToPackage{sectionbib}{chapterbib}
- \fi
- \fi
- \RequirePackage{chapterbib}
-\fi
\ifUL@babel
\RequirePackage{babel}
\RequirePackage[autolanguage]{numprint}
\fi
\ifUL@hyperref
- \RequirePackage{etoolbox}
\AtEndPreamble{\RequirePackage{hyperref}}
\else
\AtBeginDocument{%
@@ -258,7 +243,6 @@
\PassOptionsToPackage{colorlinks,allcolors=ULlinkcolor}{hyperref}
\RequirePackage{graphicx}
\RequirePackage{xcolor}
-\RequirePackage{textcomp}
\AtBeginDocument{%
\@ifpackageloaded{geometry}{%
\ClassError{ulthese}{%
@@ -522,6 +506,3 @@
\parsep 6\p@ \@plus\p@}%
\item[]}{\endlist}
\setsecnumdepth{subsection}
-\endinput
-%%
-%% End of file `ulthese.cls'.
diff --git a/Master/texmf-dist/tex/latex/unbtex/unbtex.cls b/Master/texmf-dist/tex/latex/unbtex/unbtex.cls
index 39f277761d9..332fdce505a 100644
--- a/Master/texmf-dist/tex/latex/unbtex/unbtex.cls
+++ b/Master/texmf-dist/tex/latex/unbtex/unbtex.cls
@@ -1,7 +1,7 @@
%%
%% UnBTeX: A class for bachelor, master, and doctoral thesis at the
%% University of Brasilia (UnB), Brazil
-%% Version 1.5.1 2024/03/02
+%% Version 1.5.2 2024/07/04
%% Copyright (C) 2021-2024 by Henrique C. Ferreira <hcferreira@unb.br>
%%
%% This class file may be distributed and/or modified under the conditions
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{unbtex}[2024/03/02 v1.5.1 Modelo da Universidade de Brasília baseado em abnTeX2]
+\ProvidesClass{unbtex}[2024/07/04 v1.5.2 Modelo da Universidade de Brasília baseado em abnTeX2]
% ------------------------------------------------------------------------
% Opções para a classe
@@ -118,9 +118,20 @@
\setlength{\parindent}{3em} % Tamanho da indentação da primeira linha do parágrafo
\frenchspacing % Retira espaço extra entre as frases (após o ponto final)
\setlength{\parskip}{3pt plus 1pt minus 1pt} % Espaço entre parágrafos
+\pdfminorversion=7 % Configuração da versão do arquivo pdf produzido
+
+% Configurações das margens e cabeçalho
+\AtBeginDocument{
+\setlrmarginsandblock{3cm}{2cm}{*} % Margens esquerda e direita
+\setulmarginsandblock{3cm}{2cm}{*} % Margens superior e inferior
+\checkandfixthelayout[nearest] % Implementa as margens
+\pagestyle{myheadings} % Cabeçalho com linha e numeração da página
+}
+
+% Espaçamento para notas de rodapé
\setlength{\skip\footins}{20pt plus 2pt minus 2pt} % Espaço entre o texto e as notas de rodapé
\addtolength{\footnotesep}{2pt} % Espaço entre as notas de rodapé
-\pdfminorversion=7 % Configuração da versão do arquivo pdf produzido
+\renewcommand*{\footnoterule}{\kern-3pt \hrule width 5cm \kern 2.6pt} % Tamanho do traço superior (5cm)
% Ajusta espaço entre texto e figuras/tabelas
\setlength{\textfloatsep}{18pt plus 2pt minus 2pt} % Espaçamento entre texto e floats no topo/base da página
@@ -137,9 +148,6 @@
\renewcommand{\thefigure}{\thechapter.\arabic{figure}}\numberwithin{figure}{chapter}
\renewcommand{\thetable}{\thechapter.\arabic{table}}\numberwithin{table}{chapter}
-% Configuração do cabeçalho das páginas
-\pagestyle{myheadings} % Cabeçalho com linha e numeração da página
-
% Modifica o tamanho da fonte e espaçamento entre linhas no ambiente verbatim
\RequirePackage{fvextra}
\renewenvironment{verbatim}{\VerbatimEnvironment
@@ -385,16 +393,15 @@
\urlstyle{same}
}
% Gera as referências bibliográficas de acordo com as normas da ABNT
+\newcommand{\bibhang}[1]{\setlength{\bibindent}{#1}}
\IfStrEq{\bibsty}{alf}{% Estilo autor-data
-\newcommand{\recuo}{3em} % Indentação da lista de referências
-\RequirePackage[alf,recuo=\recuo,abnt-etal-list=0,abnt-etal-cite=3,abnt-emphasize=bf,bibjustif]{abntex2cite}
+\RequirePackage[alf,abnt-etal-list=0,abnt-etal-cite=3,abnt-emphasize=bf,bibjustif]{abntex2cite}
\renewcommand{\@biblabel}[1]{}%
\IfStrEq{\idioma}{brazil} % Seleciona o arquivo de estilo de citação
{\bibliographystyle{unbtexcite/unbtex-alf-pt}}{\bibliographystyle{unbtexcite/unbtex-alf-en}}
}{%
\IfStrEq{\bibsty}{num}{% Estilo numérico
-\newcommand{\recuo}{2.2em} % Aumente este valor se o número de referências for superior a 100
-\RequirePackage[num,recuo=\recuo,abnt-etal-list=0,abnt-emphasize=bf,bibjustif]{abntex2cite}
+\RequirePackage[num,abnt-etal-list=0,abnt-emphasize=bf,bibjustif]{abntex2cite}
\RequirePackage{cite} % Para ordenar, comprimir e colocar entre colchetes os números nas citações
\renewcommand{\@biblabel}[1]%
{%
@@ -408,7 +415,7 @@
{\setlength{\ABCIauxlen}{\minimumbiblabelwidth-\ABCIauxlen}}%
{\setlength{\ABCIauxlen}{0cm}}%
%{\biblabeltext\hspace{\ABCIauxlen}}%
-\parbox[t]{\recuo}{\raggedleft\biblabeltext\hspace{\ABCIauxlen}}%
+\parbox[t]{\bibindent}{\raggedleft\biblabeltext\hspace{\ABCIauxlen}}%
}}%
\renewcommand{\citeonline}[2][] % Redefine \citeonline como \cite
{\ifthenelse{\equal{#1}{}}{\cite{#2}}{\cite[#1]{#2}}}
@@ -465,19 +472,36 @@
indent=0pt,
entrynumberformat=\entrynumberwithprefix{\figurename},
dynnumwidth,
- %numsep=0em
]{tocline}{figure}
\DeclareTOCStyleEntry[
indent=0pt,
entrynumberformat=\entrynumberwithprefix{\tablename},
dynnumwidth,
- %numsep=0em
]{tocline}{table}
\newcommand\entrynumberwithprefix[2]{#1~#2\thinspace\hfill}
% ---
% ---
+% Citacao direta com mais de 3 linhas - ABNT NBR 10520/2002 - 5.3
+% Corrige tamanho do recuo do ambiente citacao do abntex2 para 4cm
+% ---
+\ifthenelse{\equal{\ABNTEXistwocolumn}{true}}{%
+ \setlength{\ABNTEXcitacaorecuo}{1.8cm}
+}{% else
+ \setlength{\ABNTEXcitacaorecuo}{4cm}
+}
+\renewenvironment*{citacao}[1][default]{%
+ \begin{adjustwidth}{\ABNTEXcitacaorecuo}{0mm}%
+ \ABNTEXfontereduzida%
+ \begin{SingleSpace}%
+ \ifthenelse{\not\equal{#1}{default}}{\itshape\selectlanguage{#1}}{}%
+}{%
+ \end{SingleSpace}%
+ \end{adjustwidth}}
+% ---
+
+% ---
% Define o texto dos rótulos de acordo com o idioma principal selecionado
% ---
\AtBeginDocument{
@@ -611,13 +635,14 @@
\renewcommand{\imprimircapa}{%
\hypersetup{pageanchor=false}
\setlrmargins{*}{*}{1} % Margens laterais iguais para a capa
-\checkandfixthelayout[nearest]
+\setulmarginsandblock{3cm}{2cm}{*}
+\checkandfixthelayout[fixed]
\begin{capa}%
\center
\AddToShipoutPicture*{\BackgroundPic}
\vspace*{7.5cm}
- {\LARGE{\sffamily{\bfseries\instituicaoi \\ \instituicaoii \\
- \abntex@ifnotempty{\instituicaoiii}{\instituicaoiii}}}\par}
+ {\LARGE\sffamily\bfseries\instituicaoi \\ \instituicaoii \\
+ \abntex@ifnotempty{\instituicaoiii}{\instituicaoiii}\par}
\vfill
\begin{center}
% Define o tamanho da fonte do título
@@ -641,7 +666,7 @@
% Reestabelece as margens
\setlrmarginsandblock{3cm}{2cm}{*}
\setulmarginsandblock{3cm}{2cm}{*}
-\checkandfixthelayout[fixed]
+\checkandfixthelayout[nearest]
\cleardoublepage
\hypersetup{pageanchor=true}
}
@@ -652,8 +677,7 @@
\put(0,0){%
\parbox[b][\paperheight]{\paperwidth}{%
\vfill
- \centering
- \includegraphics[width=\paperwidth,height=\paperheight,keepaspectratio]{capa_fundo.pdf}%
+ \centering \includegraphics[width=\paperwidth,height=\paperheight,keepaspectratio]{capa_fundo.pdf}%
\vfill
}
}
@@ -665,8 +689,8 @@
% ---
\renewcommand{\folhaderostocontent}{%
\begin{center}
- {\LARGE{\sffamily{\bfseries\instituicaoi \\ \instituicaoii \\
- \abntex@ifnotempty{\instituicaoiii}{\instituicaoiii}}}\par}
+ {\LARGE\sffamily\bfseries \instituicaoi \\ \instituicaoii \\
+ \abntex@ifnotempty{\instituicaoiii}{\instituicaoiii}\par}
\vfill\vfill
\begin{center}
@@ -712,7 +736,7 @@
\ifthenelse{\equal{\imprimirpublicacao}{}}{}{
\begin{OnehalfSpace}
{\noindent\sffamily\large REFERÊNCIA BIBLIOGRÁFICA}\par
-\noindent\MakeUppercase\autorisobrenome, \autorinome \ifthenelse{\equal{\autoriinome}{}}{.}{;~\MakeUppercase\autoriisobrenome, \autoriinome.} {\bfseries\StrDel{\imprimirtitulo}{\\ }}. \begin{otherlanguage*}{brazil}\imprimirtipotrabalho\ (\imprimircurso)\ifthenelse{\equal{\imprimirpublicacao}{}}{}{,~\imprimirpublicacao} -- \ifthenelse{\equal{\instituicaoiii}{}}{}{\instituicaoiii,~}\instituicaoii, \instituicaoi, \imprimirlocal, \thelastpage~p. \imprimirano.\end{otherlanguage*}
+\noindent\MakeUppercase\autorisobrenome, \autorinome \ifthenelse{\equal{\autoriinome}{}}{.}{;~\MakeUppercase\autoriisobrenome, \autoriinome.} {\bfseries\StrDel{\imprimirtitulo}{\\}}. \begin{otherlanguage*}{brazil}\imprimirtipotrabalho\ (\imprimircurso)\ifthenelse{\equal{\imprimirpublicacao}{}}{}{,~\imprimirpublicacao} -- \ifthenelse{\equal{\instituicaoiii}{}}{}{\instituicaoiii,~}\instituicaoii, \instituicaoi, \imprimirlocal, \thelastpage~p. \imprimirano.\end{otherlanguage*}
\end{OnehalfSpace}}
\IfInteger{\imprimircutter}{\setlength{\fboxsep}{10pt}}{\setlength{\fboxsep}{18pt}}
\vspace*{\fill}
@@ -724,7 +748,7 @@
\IfInteger{\imprimircutter}{\begin{tabular}{p{1.25cm} p{10.25cm}}}{} \cutter
\autorisobrenome, \autorinome. \\
\IfInteger{\imprimircutter}{\StrChar{\autorisobrenome}{1}\imprimircutter\StrChar{\imprimirtitulo}{1}[\SUBtemp]\MakeLowercase{\SUBtemp}}{} \cutter
-\hspace*{2em}\noindent \StrDel{\imprimirtitulo}{\\ } ~/ \begin{otherlanguage*}{brazil}{\autorinome\ \autorisobrenome; \ifthenelse{\equal{\autoriinome}{}}{}{\autoriinome\ \autoriisobrenome;} \MakeLowercase\orientname\ \orientnome\ \orientsobrenome \ifthenelse{\equal{\coorientnome}{}}{.}{;~\MakeLowercase\coorientname\ \coorientnome\ \coorientsobrenome.} \texttt{-{}-} \imprimirlocal, \imprimirano.}\end{otherlanguage*} \\ \cutter
+\hspace*{2em}\noindent \StrDel{\imprimirtitulo}{\\} ~/ \begin{otherlanguage*}{brazil}{\autorinome\ \autorisobrenome; \ifthenelse{\equal{\autoriinome}{}}{}{\autoriinome\ \autoriisobrenome;} \MakeLowercase\orientname\ \orientnome\ \orientsobrenome \ifthenelse{\equal{\coorientnome}{}}{.}{;~\MakeLowercase\coorientname\ \coorientnome\ \coorientsobrenome.} \texttt{-{}-} \imprimirlocal, \imprimirano.}\end{otherlanguage*} \\ \cutter
\hspace*{2em}\noindent \thelastpage~p. \\ \cutter
\\ \cutter
\hspace*{2em}\noindent\begin{otherlanguage*}{brazil}\imprimirtipotrabalho\ (\imprimircurso)\ \texttt{-{}-} \instituicaoi, \imprimirano.\end{otherlanguage*} \\ \cutter
@@ -742,18 +766,19 @@
% ---
% Imprime folha de aprovação
% ---
+\newcommand{\signlinewidth}[1]{\setlength{\ABNTEXsignwidth}{#1}}
\newcommand{\imprimirfolhadeaprovacao}{%
\begin{folhadeaprovacao}
\begin{center}
- {\Large{\sffamily{\bfseries\instituicaoi \\ \instituicaoii \\
- \abntex@ifnotempty{\instituicaoiii}{\instituicaoiii}}}\par}
+ {\Large\sffamily\bfseries\instituicaoi \\ \instituicaoii \\
+ \abntex@ifnotempty{\instituicaoiii}{\instituicaoiii}\par}
\vfill
\begin{center}
% Define o tamanho da fonte do título
- \autotitle[1]{\bfseries\StrDel{\imprimirtitulo}{\\ }}
+ \autotitle[1]{\bfseries\StrDel{\imprimirtitulo}{\\}}
\ifthenelse{\equal{\titleformat}{\large}}
- {\color{verdeunb}\Large\bfseries \StrDel{\imprimirtitulo}{\\ }\par}
- {\color{verdeunb}\titleformat\bfseries \StrDel{\imprimirtitulo}{\\ }\par}
+ {\color{verdeunb}\Large\bfseries \StrDel{\imprimirtitulo}{\\}\par}
+ {\color{verdeunb}\titleformat\bfseries \StrDel{\imprimirtitulo}{\\}\par}
\end{center}
\vfill
@@ -781,10 +806,6 @@
\abntex@ifnotempty{\membrodabancaivnome}{\assinatura{\textbf{\membrodabancaivnome} \\ \membrodabancaivfuncaonome}}
\abntex@ifnotempty{\membrodabancavnome}{\assinatura{\textbf{\membrodabancavnome} \\ \membrodabancavfuncaonome}}
}
-%\vfill
-% \begin{center}
-% {\sffamily\large\imprimirlocal \\ \imprimirano\par}
-% \end{center}
\end{center}
\end{folhadeaprovacao}
}
diff --git a/Master/texmf-dist/tex/latex/xcharter-math/xcharter-otf.sty b/Master/texmf-dist/tex/latex/xcharter-math/xcharter-otf.sty
index 98a1b1b2f59..12f4ecab35d 100644
--- a/Master/texmf-dist/tex/latex/xcharter-math/xcharter-otf.sty
+++ b/Master/texmf-dist/tex/latex/xcharter-math/xcharter-otf.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\def\fileversion{0.62}
-\def\filedate{2024-03-01}
+\def\fileversion{0.63}
+\def\filedate{2024-07-10}
\ProvidesPackage{xcharter-otf}[\filedate\space\fileversion]
% Ensure luatex or xetex engine
diff --git a/Master/texmf-dist/tex/lualatex/longmath/longmath.lua b/Master/texmf-dist/tex/lualatex/longmath/longmath.lua
index 56c64c8cdb1..05524096cac 100644
--- a/Master/texmf-dist/tex/lualatex/longmath/longmath.lua
+++ b/Master/texmf-dist/tex/lualatex/longmath/longmath.lua
@@ -1,5 +1,5 @@
--
--- longmath.lua is part of longmath version 0.1.
+-- longmath.lua is part of longmath version 1.0.
--
-- (c) 2024 Hans-Jürgen Matschull
--
@@ -141,15 +141,16 @@ local function set_delim( head, level, ht, dp )
if brks then brks = brks[type] end
if type and auto and brks then
delim_set( delim, brks[level] )
- elseif type and brks then
- level = nil
- for l = 1, #brks do if delim_eq( brks[l], delim ) then level = l break end end
else
level = nil
end
local scale = node.get_attribute( hbox, attr_info )
- hbox.height, hbox.depth = ht * scale // 1000, dp * scale // 1000
- if delim_eq( delim, delim_null ) then hbox.width = hbox.width * 2 end
+ hbox.height, hbox.depth = ht * scale // 1000, dp * scale // 1000
+ if delim_eq( delim, delim_null ) then
+ hbox.width = -2 * tex.dimen.nulldelimiterspace
+ else
+ hbox.width = -tex.dimen.nulldelimiterspace
+ end
return level
end
diff --git a/Master/texmf-dist/tex/lualatex/longmath/longmath.sty b/Master/texmf-dist/tex/lualatex/longmath/longmath.sty
index 2b4848db3c0..47a99ce8fa5 100644
--- a/Master/texmf-dist/tex/lualatex/longmath/longmath.sty
+++ b/Master/texmf-dist/tex/lualatex/longmath/longmath.sty
@@ -1,5 +1,5 @@
%%
-%% longmath.sty is part of longmath version 0.1.
+%% longmath.sty is part of longmath version 1.0.
%%
%% (c) 2024 Hans-Jürgen Matschull
%%
@@ -18,7 +18,7 @@
%% see README for a list of files belonging to longmath.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{longmath}[2024/03/25]
+\ProvidesPackage{longmath}[2024/07/04]
\RequirePackage{luatexbase}
@@ -89,8 +89,7 @@
\setattribute\longmath@info{\mathstyle} \special{\longmath@comm}
\longmath@type\bgroup \longmath@left . \aftergroup\egroup \aftergroup\endgroup
\begingroup \setattribute\longmath@info{\ifnum \longmath@yscale < 1 \longmath@xscale \else \longmath@yscale \fi}
- \hbox to -\nulldelimiterspace{} \endgroup
- \longmath@right }
+ \hbox{} \endgroup \longmath@right }
% magic number to identify the variable delimiter.
@@ -174,13 +173,13 @@
}
% End of longmath environment.
-% If the width of the box is smaller than the requsted width, just use it as is.
+% If the width of the box is smaller than the requested width, just use it as is.
% Otherwise, modify the requested width if the * version was used.
% Then \unhbox the content into a paragraph with the requested width.
% \box0 and \box1 are used to adapt the baselineskip to the math style.
% \leftskip and \rightskip are set such that lines are centered but not justified.
% The glue is removed from the beginning of the first line with \hskip,
-% and from the end of the last line with \parfilskip.
+% and from the end of the last line with \parfilskip.
% If \longmath@extra is non-zero, Lua will stack the lines of the paragraph.
\def\longmath@end{$\egroup
\ifdim \wd\longmath@box < \dimexpr \longmath@width + \longmath@extra \relax
diff --git a/Master/texmf-dist/tex/lualatex/tango/tango.cls b/Master/texmf-dist/tex/lualatex/tango/tango.cls
new file mode 100644
index 00000000000..f188200b4ca
--- /dev/null
+++ b/Master/texmf-dist/tex/lualatex/tango/tango.cls
@@ -0,0 +1,2182 @@
+\NeedsTeXFormat{LaTeX2e}%
+\ProvidesClass{tango}%
+[2024/07/15 v0.8.0 tango document class. Michel Bovani]% %
+%
+% Ensure luatex engine
+\RequirePackage{iftex}[2019/10/24]
+\RequireLuaTeX
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand\TgoTempa{}
+\newcommand\TgoTempb{}
+\newcommand\TgoTempc{}
+\newcommand\TgoSmallerSize{}
+\newcommand\TgoStatementNumberSuffix{}
+\newcommand\TgoStatementNumberPrefix{}
+\newcommand\TgoStatementSuffix{}
+\newcommand\TgoStatementName{}
+\newcommand\TgoTheoremName{Theorem}
+\newcommand\TgoDefinitionName{Definition}
+\newcommand\TgoPropositionName{Proposition}
+\newcommand\TgoLemmaName{Lemma}
+\newcommand\TgoCorollaryName{Corollary}
+\newcommand\TgoRemarkName{Remark}
+\newcommand\TgoExampleName{Example}
+\newcommand\TgoContentsName{Contents}
+\newcommand\TgoExerciseName{Exercise}
+\newcommand\TgoExercisesSubsectionName{Exercises}
+\newcommand\TgoExercisesSectionName{Exercises}
+\newcommand\TgoPublicationClass{article}
+\newcommand\TgoStatementIndent{\indent}
+\newif\ifTgoFrenchLanguage
+\newif\ifTgoNGermanLanguage
+\newif\ifTgoGermanLanguage
+\newif\ifTgoNAustrianLanguage
+\newif\ifTgoNSwissGermanLanguage
+\newif\ifTgoItalianLanguage
+\newif\ifTgoSpanishLanguage
+\newif\ifTgoEnglishLanguage
+\newif\ifTgoBritishLanguage
+\newif\ifTgoAmericanLanguage
+\newif\ifTgoCanadianLanguage
+\newif\ifTgoAustralianLanguage
+\newif\ifTgoNewZealandLanguage
+\newif\ifTgoNoStatement
+\newif\ifTgoBook
+\newif\ifTgoOneSide\TgoOneSidetrue
+\newif\ifTgoAfourPaperOutput\TgoAfourPaperOutputtrue
+\newif\ifTgoLetterOutput
+\newif\ifTgoBigTabletOutput
+\newif\ifTgoAfivePaperOutput
+\newif\ifTgoTabletOutput
+\newif\ifTgoSmallTabletOutput
+\newif\ifTgoeReaderOutput
+\newif\ifTgoSmartphoneOutput
+\newif\ifTgoSmallerSizeCommand
+\newif\ifTgoTitleIndentZero\TgoTitleIndentZerotrue
+\newcommand\TgoChapterTitleFont{RobotoCondensedBold}
+\NewDocumentCommand\TgoStatementNameOffset{}{}
+\NewDocumentCommand\SetTgoBaseFonts{}{%
+ \setmainfont{erewhon}%
+ \setmathfont{Erewhon Math}%
+ }%
+ \newlength\TgoAfterChapterSkip
+ \newlength\TgoStandardMargin
+ \newlength\TgoStatementParindent
+ \newlength\TgoTitleIndent
+ %%%
+\AddToHook{package/xcolor/after}
+{%
+\definecolor{ColorOne}{rgb}{0.15,0.15,0.15}
+\definecolor{ColorTwo}{rgb}{0.93,0.93,0.93}
+}
+\AddToHook{class/article/after}{%
+\TgoTenPointsFonts}
+\AddToHook{class/book/after}{%
+\TgoTenPointsFonts}
+%%
+%
+ %%
+ \DeclareKeys[tango]{
+ %%%%%% languages,%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ french.code= {%
+ \TgoFrenchLanguagetrue
+ \TgoTitleIndentZerofalse
+ },
+ ngerman.code= {%
+ \TgoNGermanLanguagetrue
+ },
+ german.code= {%
+ \TgoGermanLanguagetrue
+ },
+naustrian.code= {%
+ \TgoNAustrianLanguagetrue
+ },
+nswissgerman.code= {%
+ \TgoNSwissGermanLanguagetrue
+ },
+ italian.code= {%
+ \TgoItalianLanguagetrue
+ },
+ spanish.code= {%
+ \TgoSpanishLanguagetrue
+ },
+english.code= {%
+ \TgoEnglishLanguagetrue
+ },
+british.code= {%
+ \TgoBritishLanguagetrue
+ },
+american.code= {%
+ \TgoAmericanLanguagetrue
+ },
+canadian.code= {%
+ \TgoCanadianLanguagetrue
+ },
+australian.code= {%
+ \TgoAustralianLanguagetrue
+ },
+newzealand.code= {%
+ \TgoNewZealandLanguagetrue
+ },
+ %%%%%% Default Statements %%%%%%%%%%%%%%%%%%%%%%%%
+ no-statement.if = TgoNoStatement,
+ %%%%%% No Hyperref %%%%%%%%%%%%%%%%%%%%%%%%%%%
+ no-hyperref.if = TgoNoHyperref,
+ %%%%%% Parindentzero %%%%%%%%%%%%%%%%%%%%%%%%%%%
+ no-indent.if = TgoParindentZero,
+ indent.ifnot = TgoParindentZero,
+%%%%%% Parindentzero %%%%%%%%%%%%%%%%%%%%%%%%%%%
+ no-titleindent.if = TgoTitleIndentZero,
+ titleindent.ifnot = TgoTitleIndentZero,
+ %%%%%% ThmNamePos left/right %%%%%%%%%%%%%%%%%%%%%%%
+ ThmNamePos.choice:,
+ ThmNamePos / left.code:n =
+ {
+ \RenewDocumentCommand\TgoStatementNameOffset{}{}
+ },
+ ThmNamePos / right.code:n =
+ {
+ \RenewDocumentCommand\TgoStatementNameOffset{}{\hspace*{\fill}}
+ },
+%%%% book or article %%%%%%%%%%%%%%%%%%%%%%%%%%%
+PubliClass.choice:,
+PubliClass / article.code:n =
+{%
+\renewcommand\TgoPublicationClass{article}
+\TgoBookfalse
+},
+PubliClass / book.code:n =
+{%
+\renewcommand\TgoPublicationClass{book}
+\TgoBooktrue
+},
+%%%% oneside or two sides %%%%%%%%%%%%%%%%%%%%%%%%
+oneside.if = TgoOneSide ,
+twoside.ifnot = TgoOneSide ,
+%%%% Font Size %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FontSize.choice:,
+FontSize / 9pt.code:n =
+{
+\RemoveFromHook{class/article/after}
+\AddToHook{class/article/after}{%
+\TgoNinePointsFonts}
+\RemoveFromHook{class/book/after}
+\AddToHook{class/book/after}{%
+\TgoNinePointsFonts}
+},
+FontSize / 10pt.code:n =
+{
+\RemoveFromHook{class/article/after}
+\AddToHook{class/article/after}{%
+\TgoTenPointsFonts}
+\RemoveFromHook{class/book/after}
+\AddToHook{class/book/after}{%
+\TgoTenPointsFonts}
+},
+FontSize / 11pt.code:n =
+{
+\RemoveFromHook{class/article/after}
+\AddToHook{class/article/after}{%
+\TgoElevenPointsFonts}
+\RemoveFromHook{class/book/after}
+\AddToHook{class/book/after}{%
+\TgoElevenPointsFonts}
+},
+FontSize / 12pt.code:n =
+{
+\RemoveFromHook{class/article/after}
+\AddToHook{class/article/after}{%
+\TgoTwelvePointsFonts}
+\RemoveFromHook{class/book/after}
+\AddToHook{class/book/after}{%
+\TgoTwelvePointsFonts}
+},
+FontSize / unknown.code:n =
+{
+ \ClassWarning{tango}{\MessageBreak Value #1 is unknown \MessageBreak
+ Possible choices are 9pt, 10pt, 11pt and 12pt.
+ \MessageBreak Selecting 10pt.}
+},
+%%%% ColorTheme %%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ColorTheme.choice:,
+ColorTheme / Blue.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+ \definecolor{ColorOne}{rgb}{0.08, 0.05, 0.55}
+ \definecolor{ColorTwo}{rgb}{0.87, 0.94, 0.97}
+ }
+},
+ ColorTheme / Navy.code:n =
+ {%
+ \RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+ \definecolor{ColorOne}{rgb}{0.07, 0.37, 0.65}
+ \definecolor{ColorTwo}{rgb}{0.87, 0.95, 0.97}
+ }
+ },
+ColorTheme / USAF.code:n =
+ {%
+ \RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+ \definecolor{ColorOne}{rgb}{0.24, 0.41, 0.54}
+ \definecolor{ColorTwo}{rgb}{0.92, 0.94, 0.96}
+ }
+ },
+ ColorTheme / Azur.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.15, 0.32, 0.75}
+\definecolor{ColorTwo}{rgb}{0.88, 0.94, 0.97}
+}
+},
+ ColorTheme / Red.code:n =
+ {%
+ \RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.75,0.05,0.1}
+\definecolor{ColorTwo}{rgb}{1,0.94,0.9}
+}
+ },
+ ColorTheme / Framboise.code:n =
+ {%
+ \RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.64, 0.25, 0.45}
+\definecolor{ColorTwo}{rgb}{1, 0.95, 0.94}
+}
+ },
+ ColorTheme / Brique.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.68, 0.1, 0.0}
+\definecolor{ColorTwo}{rgb}{1, 0.95, 0.89}
+}
+},
+ ColorTheme / Sienne.code:n =
+ {%
+ \RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.55, 0.27, 0.1}
+\definecolor{ColorTwo}{rgb}{1, 0.95, 0.87}
+ }
+ },
+ ColorTheme / Caramel.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.66, 0.26, 0.0}
+\definecolor{ColorTwo}{rgb}{1, 0.96, 0.86}
+}
+},
+ ColorTheme / Olive.code:n =
+ {%
+ \RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.28, 0.43, 0.03}
+\definecolor{ColorTwo}{rgb}{0.95, 0.98, 0.9}
+}
+ },
+ ColorTheme / Tannen.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.09, 0.44, 0.28}
+\definecolor{ColorTwo}{rgb}{0.92, 0.97, 0.94}
+}
+},
+ ColorTheme / GrayGray.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.25,0.25,0.25}
+\definecolor{ColorTwo}{rgb}{0.95,0.95,0.95}
+}
+},
+ ColorTheme / BlackAndWhite.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0,0,0}
+\definecolor{ColorTwo}{rgb}{1,1,1}
+}
+},
+ ColorTheme / Ink.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.25, 0.25, 0.33}
+\definecolor{ColorTwo}{rgb}{0.94, 0.95, 0.97}
+}
+},
+ ColorTheme / Steel.code:n =
+{%
+\RemoveFromHook{package/xcolor/after}
+ \AddToHook{package/xcolor/after}%
+{ %
+\definecolor{ColorOne}{rgb}{0.27, 0.25, 0.2}
+\definecolor{ColorTwo}{rgb}{0.96, 0.96, 0.93}
+}
+},
+ ColorTheme / unknown.code:n =
+ {
+ \ClassWarning{tango}{\MessageBreak “ColorTheme” #1 is unknown!\MessageBreak
+Possible choices are: \MessageBreak
+Blue, Navy, USAF, Azur, Red, Framboise, Brique,
+ \MessageBreak Sienne, Caramel, Olive, Tannen, GrayGray, BlackAndWhite, Ink and Steel.
+\MessageBreak Stay in GrayGray}
+},
+%%%% User defined colors %%%%%%%%%%%%%%%%%%%%%%%%
+ColorOne.code = \AddToHook{package/xcolor/after}{\definecolor{ColorOne}#1},
+ColorTwo.code = \AddToHook{package/xcolor/after}{\definecolor{ColorTwo}#1},
+ColorOneNamed.code = \AddToHook{package/xcolor/after}{\colorlet{ColorOne}{#1}},
+ColorTwoNamed.code = \AddToHook{package/xcolor/after}{\colorlet{ColorTwo}{#1}},
+%%%% Output %%%%%%%%%%%%%%%%%%%%%%%%%%
+ Output.choice:,
+ Output / A4paper.code:n =
+ {
+\TgoAfourPaperOutputtrue
+ },
+Output / Letter.code:n =
+{
+\TgoLetterOutputtrue
+\TgoBigTabletOutputtrue
+\TgoAfourPaperOutputfalse
+},
+Output / BigTablet.code:n =
+ {
+\TgoBigTabletOutputtrue
+\TgoAfourPaperOutputfalse
+ },
+Output / A5paper.code:n =
+ {
+\TgoAfivePaperOutputtrue
+\TgoTabletOutputtrue
+\TgoAfourPaperOutputfalse
+ },
+Output / Tablet.code:n =
+ {
+\TgoTabletOutputtrue
+\TgoAfourPaperOutputfalse
+ },
+Output / SmallTablet.code:n =
+ {
+\TgoSmallTabletOutputtrue
+\TgoAfourPaperOutputfalse
+ },
+Output / eReader.code:n =
+ {
+\TgoeReaderOutputtrue
+\TgoAfourPaperOutputfalse
+ },
+Output / Smartphone.code:n =
+ {
+\TgoSmartphoneOutputtrue
+\TgoAfourPaperOutputfalse
+ },
+ Output / unknown.code:n =
+ {
+ \ClassWarning{tango}{\MessageBreak Value #1 is unknown \MessageBreak
+ Possible choices are A4paper, A5paper, Letter, BigTablet,\MessageBreak
+ Tablet, SmallTablet, eReader and Smartphone.
+ \MessageBreak Selecting A4paper.}
+\TgoAfourPaperOutputtrue
+ },
+ %%%%% Stylistic Set %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ StylisticSet.multichoice:,
+ StylisticSet / upint.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{RawFeature=+ss03}}
+ },
+ StylisticSet / leqslant.code:n =
+ {
+\AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{RawFeature=+ss04}}
+ },
+StylisticSet / smaller.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{RawFeature=+ss05}}
+ },
+StylisticSet / subsetneq.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{RawFeature=+ss06}}
+ },
+StylisticSet / parallelslant.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{RawFeature=+ss07}}
+ },
+ %%%%%%% Character Variants %%%%%%%%%%%%%%%%%%%%%%%%%%
+ CharacterVariant.multichoice:,
+ CharacterVariant / zero.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=0}}
+ },
+ CharacterVariant / hslash.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{CharacterVariant=1}}
+ },
+ CharacterVariant / emptyset.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{CharacterVariant=2}}
+ },
+ CharacterVariant / epsilon.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=3}}
+ },
+ CharacterVariant / kappa.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=4}}
+ },
+ CharacterVariant / pi.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=5}}
+ },
+ CharacterVariant / phi.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=6}}
+ },
+ CharacterVariant / rho.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=7}}
+ },
+ CharacterVariant / sigma.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=8}}
+ },
+ CharacterVariant / theta.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+{ \defaultfontfeatures+[Erewhon Math]{CharacterVariant=9}}
+ },
+CharacterVariant / Theta.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{CharacterVariant=10}}
+ },
+CharacterVariant / partial.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ {\defaultfontfeatures+[Erewhon Math]{CharacterVariant=11}}
+ },
+CharacterVariant / Ecal.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=20}}
+ },
+CharacterVariant / Qcal.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=21}}
+ },
+CharacterVariant / Tcal.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+ { \defaultfontfeatures+[Erewhon Math]{CharacterVariant=22}}
+ },
+ %%%%%%% Numbers %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ Numbers.choice:,
+ Numbers / MathOldStyle.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+{\defaultfontfeatures+[Erewhon Math]{Numbers=OldStyle}}
+ },
+ Numbers / TextOldStyle.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+{ \defaultfontfeatures+[erewhon]{Numbers=OldStyle}}
+ },
+Numbers / OldStyle.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+{ \defaultfontfeatures+{Numbers=OldStyle}
+ \defaultfontfeatures+[Erewhon Math]{RawFeature=-onum}}
+ },
+ Numbers / FullOldStyle.code:n =
+ {
+ \AddToHook{package/fontspec/after}%
+{ \defaultfontfeatures+{Numbers=OldStyle}}
+ },
+ %%%% usage
+ french.usage=load,
+ no-statement.usage=load,
+ no-hyperref.usage=load,
+ indent.usage=load,
+no-indent.usage=load,
+ThmNamePos.usage=general,
+oneside.usage=load,
+twoside.usage=load,
+PubliClass.usage=load,
+FontSize.usage=general,
+ColorTheme.usage=general,
+ColorOne.usage=general,
+ColorTwo.usage=general,
+Output.usage=load,
+StylisticSet.usage=load,
+CharacterVariant.usage=load,
+Numbers.usage=load
+}
+%%%%%
+\ProcessKeyOptions[tango]
+%%%%%
+\NewDocumentCommand\tgosetup{}{\SetKeys[tango]}
+%%%%%%%%
+%%%%%%% 10pt %%%%%%%%%%%%%
+\NewDocumentCommand\TgoTenPointsFonts{}{%
+\renewcommand\TgoSmallerSize{%
+\TgoSmallerSizeCommandtrue%
+\tgosetup{FontSize=9pt}%
+\TgoSmallerSizeCommandfalse%
+}%
+\renewcommand\normalsize{%
+ \fontsize{10}{12.7}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip{0pt plus 3pt}%
+ \setlength\belowdisplayshortskip{4.5pt plus 2.5pt minus 1.5pt}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+ \let\@listi\@listI%
+ }%
+\normalsize%
+\ifTgoSmallerSizeCommand%
+\else%
+\setlength\TgoStandardMargin{1.5em}%
+\fi%
+\ifx\MakeRobust\@undefined \else%
+ \MakeRobust\normalsize%
+\fi%
+\DeclareRobustCommand\small{%
+ \fontsize{9}{11.45}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip {0pt plus 3pt}%
+ \setlength\belowdisplayshortskip {4pt plus 2pt minus 2pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 6\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus2\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength \belowdisplayskip {\abovedisplayskip}%
+ \let\@listi\@listI%
+ }%
+\DeclareRobustCommand\footnotesize{%
+ \fontsize{8}{10.2}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 2pt minus 4pt}%
+ \setlength\abovedisplayshortskip{0pt plus 1 pt}%
+ \setlength\belowdisplayshortskip{3pt plus 2pt minus 1 pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 4\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength \belowdisplayskip {\abovedisplayskip}%
+ }%
+\DeclareRobustCommand\scriptsize{\fontsize{7}{8.9}\selectfont}%
+\DeclareRobustCommand\tiny{\fontsize{5}{6.4}\selectfont}%
+\DeclareRobustCommand\large{\fontsize{11.5}{14.6}\selectfont}%
+\DeclareRobustCommand\Large{\fontsize{14}{17}\selectfont}%
+\DeclareRobustCommand\LARGE{\fontsize{17}{20}\selectfont}%
+\DeclareRobustCommand\huge{\fontsize{20}{23}\selectfont}%
+\DeclareRobustCommand\Huge{\fontsize{24}{27}\selectfont}%
+\DeclareRobustCommand\HUGE{\fontsize{58}{58}\selectfont}%
+}%
+%%%%%%%%%%%%%% 11pt %%%%%%%%%%%%%%%%%%%%%%
+\NewDocumentCommand\TgoElevenPointsFonts{}{%
+\renewcommand\TgoSmallerSize{%
+\TgoSmallerSizeCommandtrue%
+\tgosetup{FontSize=10pt}%
+\TgoSmallerSizeCommandfalse%
+}%
+\renewcommand\normalsize{%
+ \fontsize{11}{13.9}\selectfont%
+ \setlength\abovedisplayskip {6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip{0pt plus 3pt}%
+ \setlength\belowdisplayshortskip {4.5pt plus 2.5pt minus 2 pt}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+ \let\@listi\@listI}%
+\normalsize%
+\ifTgoSmallerSizeCommand%
+\else%
+\setlength\TgoStandardMargin{1.5em}%
+\fi%
+\ifx\MakeRobust\@undefined \else%
+ \MakeRobust\normalsize%
+\fi%
+\DeclareRobustCommand\small{%
+ \fontsize{10}{12.7}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip{0pt plus 3pt}%
+ \setlength\belowdisplayshortskip {4pt plus 2 pt minus 2pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 6\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus2\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+ \let\@listi\@listI%
+ }%
+\DeclareRobustCommand\footnotesize{%
+ \fontsize{9}{11.35}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 2pt minus 4pt}%
+ \setlength\abovedisplayshortskip{0pt plus 1pt}%
+ \setlength\belowdisplayshortskip{3pt plus 2pt minus 1pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 4\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+}%
+\DeclareRobustCommand\scriptsize{\fontsize{8}{10.2}\selectfont}%
+\DeclareRobustCommand\tiny{\fontsize{6}{7.6}\selectfont}%
+\DeclareRobustCommand\large{\fontsize{13}{15.85}\selectfont}%
+\DeclareRobustCommand\Large{\fontsize{15}{18}\selectfont}%
+\DeclareRobustCommand\LARGE{\fontsize{18}{21}\selectfont}%
+\DeclareRobustCommand\huge{\fontsize{21}{24}\selectfont}%
+\DeclareRobustCommand\Huge{\fontsize{24}{27}\selectfont}%
+\DeclareRobustCommand\HUGE{\fontsize{60}{60}\selectfont}%
+}%
+%%%%%%% 12pt %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NewDocumentCommand\TgoTwelvePointsFonts{}{%
+\renewcommand\TgoSmallerSize{%
+\TgoSmallerSizeCommandtrue%
+\tgosetup{FontSize=11pt}%
+\TgoSmallerSizeCommandfalse%
+}%
+\renewcommand\normalsize{%
+ \fontsize{12}{15.1}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip{0pt plus 3pt}%
+ \setlength\belowdisplayshortskip {4.5pt plus 2.5pt minus2pt}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+ \let\@listi\@listI}%
+\normalsize%
+\ifTgoSmallerSizeCommand%
+\else%
+\setlength\TgoStandardMargin{1.5em}%
+\fi%
+\ifx\MakeRobust\@undefined \else%
+ \MakeRobust\normalsize%
+\fi%
+\DeclareRobustCommand\small{%
+ \fontsize{11}{13.9}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip{0pt plus 3pt}%
+ \setlength\belowdisplayshortskip{4pt plus 2pt minus 2pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 6\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus2\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+ \let\@listi\@listI%
+ }%
+\DeclareRobustCommand\footnotesize{%
+ \fontsize{10}{12.7}\selectfont%
+ \setlength\abovedisplayskip {6pt plus 2pt minus 4pt}%
+ \setlength\abovedisplayshortskip{0pt plus 1pt}%
+ \setlength\belowdisplayshortskip{3pt plus 2pt minus 1pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 4\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+}%
+\DeclareRobustCommand\scriptsize{\fontsize{9}{11.45}\selectfont}%
+\DeclareRobustCommand\tiny{\fontsize{7}{8.9}\selectfont}%
+\DeclareRobustCommand\large{\fontsize{14.2}{16.85}\selectfont}%
+\DeclareRobustCommand\Large{\fontsize{16.5}{19.2}\selectfont}%
+\DeclareRobustCommand\LARGE{\fontsize{19.2}{22}\selectfont}%
+\DeclareRobustCommand\huge{\fontsize{22}{25}\selectfont}%
+\DeclareRobustCommand\Huge{\fontsize{25}{28}\selectfont}%
+\DeclareRobustCommand\HUGE{\fontsize{63}{63}\selectfont}%
+}%
+%%
+%%%%%%% 9pt %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NewDocumentCommand\TgoNinePointsFonts{}{%
+\renewcommand\TgoSmallerSize{}
+\renewcommand\normalsize{%
+ \fontsize{9}{11.45}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip{0pt plus 3pt}%
+ \setlength\belowdisplayshortskip{4.5pt plus 2.5pt minus 2pt}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+ \let\@listi\@listI}%
+\normalsize%
+\setlength\TgoStandardMargin{1.5em}%
+\ifx\MakeRobust\@undefined\else%
+ \MakeRobust\normalsize%
+\fi%
+\DeclareRobustCommand\small{%
+ \fontsize{8}{10.25}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 3pt minus 2pt}%
+ \setlength\abovedisplayshortskip{0pt plus 3pt}%
+ \setlength\belowdisplayshortskip{4pt plus 2pt minus 2pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 6\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus2\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+ \let\@listi\@listI%
+ }%
+\DeclareRobustCommand\footnotesize{%
+ \fontsize{7}{9}\selectfont%
+ \setlength\abovedisplayskip{6pt plus 2pt minus 4pt}%
+ \setlength\abovedisplayshortskip{0pt plus 1pt}%
+ \setlength\belowdisplayshortskip{3pt plus 2pt minus 1pt}%
+ \def\@listi{\leftmargin\leftmargini%
+ \topsep 4\p@ \@plus2\p@ \@minus2\p@%
+ \parsep 2\p@ \@plus\p@ \@minus\p@%
+ \itemsep \parsep}%
+ \setlength\belowdisplayskip{\abovedisplayskip}%
+}%
+\DeclareRobustCommand\scriptsize{\fontsize{6}{7.7}\selectfont}%
+\DeclareRobustCommand\tiny{\fontsize{5}{6.4}\selectfont}%
+\DeclareRobustCommand\large{\fontsize{10.3}{13}\selectfont}%
+\DeclareRobustCommand\Large{\fontsize{12.7}{15.4}\selectfont}%
+\DeclareRobustCommand\LARGE{\fontsize{15.2}{17.3}\selectfont}%
+\DeclareRobustCommand\huge{\fontsize{18}{20}\selectfont}%
+\DeclareRobustCommand\Huge{\fontsize{20}{24}\selectfont}%
+\DeclareRobustCommand\HUGE{\fontsize{52}{52}\selectfont}%
+}%
+%%
+%%
+\ifTgoOneSide%
+ \LoadClass[oneside]{\TgoPublicationClass}%
+ \else%
+ \LoadClass[twoside]{\TgoPublicationClass}%
+\fi%
+%%%%%%%%%%%
+\RequirePackage{xcolor}
+%%%%
+\RequirePackage{mathtools}
+\RequirePackage{amsthm}
+%%%%
+\RequirePackage{graphicx,microtype,geometry,enumitem,float,afterpage}
+%
+\RequirePackage{titletoc}
+%
+\RequirePackage[pagestyles,toctitles,newlinetospace,clearempty,noindentafter]{titlesec}
+%
+%
+\assignpagestyle{\chapter}{empty}
+\assignpagestyle{\part}{empty}
+\RequirePackage{ccaption,caption}
+\DeclareCaptionLabelFormat{tango}{\sffamily\fontseries{sb}\selectfont#1\nobreakspace#2}
+\captionsetup{font={sf,small},labelformat=tango,labelfont={color=ColorOne}}
+\newfixedcaption{\tgofigcaption}{figure}
+\newfixedcaption{\tgotabcaption}{table}
+ %%% Fontes
+ %%
+ \RequirePackage{fontspec}
+\RequirePackage{unicode-math}[2020/01/31]
+ \defaultfontfeatures+{Ligatures=TeX,RawFeature={+pnum}}
+%
+ \SetTgoBaseFonts
+ %%
+ \thinmuskip=2.5mu
+ \medmuskip=3mu plus 1mu minus 3mu
+ \thickmuskip=4mu plus 3mu minus 0.5mu
+ %%
+\setmonofont{Inconsolatazi4}[Scale=MatchLowercase]
+%
+ \setsansfont{NotoSans}[%
+ Scale=0.9,
+ Ligatures=TeX,
+ UprightFeatures={
+Font=NotoSansMedium
+},
+ItalicFeatures={
+Font=NotoSansMediumItalic
+},
+BoldFeatures={
+Font=NotoSansBold
+},
+BoldItalicFeatures={
+Font=NotoSansBoldItalic
+},
+FontFace={ul}{n}{Font=NotoSansThin},
+FontFace={ul}{it}{Font=NotoSansThinItalic},
+FontFace={el}{n}{Font=NotoSansExtraLight},
+FontFace={el}{it}{Font=NotoSansExtraLightItalic},
+FontFace={l}{n}{Font=NotoSansLight},
+FontFace={l}{it}{Font=NotoSansLightItalic},
+FontFace={sl}{n}{Font=NotoSansRegular},
+FontFace={sl}{it}{Font=NotoSansItalic},
+FontFace={sb}{n}{Font=NotoSansSemiBold},
+FontFace={sb}{it}{Font=NotoSansSemiBoldItalic},
+FontFace={eb}{n}{Font=NotoSansExtraBold},
+FontFace={eb}{it}{Font=NotoSansExtraBoldItalic},
+FontFace={ub}{n}{Font=NotoSansBlack},
+FontFace={ub}{it}{Font=NotoSansBlackItalic},
+]
+%%
+\DeclareFontSeriesDefault[sf]{md}{sl}
+%
+%
+\RequirePackage{fourier-orns}%
+%
+%% OTF Fonts Commands
+%%
+\NewDocumentCommand{\superiors}{}{\addfontfeature{RawFeature=+sups}}
+\NewDocumentCommand{\scinferiors}{}{\addfontfeature{RawFeature=+sinf}}
+\NewDocumentCommand{\smartfracs}{}{\addfontfeature{RawFeature=+frac}}
+\NewDocumentCommand{\fullsc}{m}{{\addfontfeature{RawFeature=+c2sc}\MakeUppercase{#1}}}
+\DeclareTextFontCommand{\textsup}{\superiors}
+\DeclareTextFontCommand{\textscinf}{\scinferiors}
+\DeclareTextFontCommand{\smartfrac}{\smartfracs}
+\NewDocumentCommand{\olddigits}{}{\addfontfeature{RawFeature={-lnum,+onum}}}
+\NewDocumentCommand{\propdigits}{}{\addfontfeature{RawFeature={-tnum,+pnum}}}
+\NewDocumentCommand{\liningdigits}{}{\addfontfeature{RawFeature={-onum,+lnum}}}
+\NewDocumentCommand{\tabulardigits}{}{\addfontfeature{RawFeature={-pnum,+tnum}}}
+%
+ %
+ %%%%%%%% My taylor is rich %%%%%%%%%%%
+%
+\RequirePackage{iflang}
+\RequirePackage{babel}
+\IfLanguageName{nil}{%
+\ClassError{tango}{No language option is given}
+{%
+You *must* pass at least one language\MessageBreak
+option for babel to the tango class.}
+}{}
+%
+%
+\ifTgoFrenchLanguage
+\frenchsetup{StandardLists,og=«, fg=»,PartNameFull=false,
+SmallCapsFigTabCaptions=false,
+CustomiseFigTabCaptions=false}
+\addto\captionsfrench{% DF
+\renewcommand\TgoTheoremName{Théorème}
+\renewcommand\TgoDefinitionName{Définition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemme}
+\renewcommand\TgoCorollaryName{Corollaire}
+\renewcommand\TgoRemarkName{Remarque}
+\renewcommand\TgoExampleName{Exemple}
+\renewcommand\TgoContentsName{Sommaire}
+\renewcommand\TgoExerciseName{Exercice}
+\renewcommand\TgoExercisesSubsectionName{Exercices}
+\renewcommand\TgoExercisesSectionName{Exercices}
+}
+\fi
+%%%
+\ifTgoNGermanLanguage
+\addto\captionsngerman{%
+\renewcommand\TgoTheoremName{Satz}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Korollar}%% ????
+\renewcommand\TgoRemarkName{Bemerkung}
+\renewcommand\TgoExampleName{Beispiel}
+\renewcommand\TgoContentsName{Inhaltsverzeichnis}
+\renewcommand\TgoExerciseName{Übung}
+\renewcommand\TgoExercisesSubsectionName{Übungen}
+\renewcommand\TgoExercisesSectionName{Übungen}
+}
+\fi
+%
+%%%
+\ifTgoGermanLanguage
+\addto\captionsgerman{%
+\renewcommand\TgoTheoremName{Satz}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Korollar}%% ????
+\renewcommand\TgoRemarkName{Bemerkung}
+\renewcommand\TgoExampleName{Beispiel}
+\renewcommand\TgoContentsName{Inhaltsverzeichnis}
+\renewcommand\TgoExerciseName{Übung}
+\renewcommand\TgoExercisesSubsectionName{Übungen}
+\renewcommand\TgoExercisesSectionName{Übungen}
+}
+\fi
+%
+%%%
+\ifTgoNAustrianLanguage
+\addto\captionsnaustrian{%
+\renewcommand\TgoTheoremName{Satz}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Korollar}%% ????
+\renewcommand\TgoRemarkName{Bemerkung}
+\renewcommand\TgoExampleName{Beispiel}
+\renewcommand\TgoContentsName{Inhaltsverzeichnis}
+\renewcommand\TgoExerciseName{Übung}
+\renewcommand\TgoExercisesSubsectionName{Übungen}
+\renewcommand\TgoExercisesSectionName{Übungen}
+}
+\fi
+%
+%%%
+\ifTgoNSwissGermanLanguage
+\addto\captionsnswissgerman{%
+\renewcommand\TgoTheoremName{Satz}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Korollar}%% ????
+\renewcommand\TgoRemarkName{Bemerkung}
+\renewcommand\TgoExampleName{Beispiel}
+\renewcommand\TgoContentsName{Inhaltsverzeichnis}
+\renewcommand\TgoExerciseName{Übung}
+\renewcommand\TgoExercisesSubsectionName{Übungen}
+\renewcommand\TgoExercisesSectionName{Übungen}
+}
+\fi
+%
+%%%
+\ifTgoItalianLanguage
+\addto\captionsitalian{%
+\renewcommand\TgoTheoremName{Teorema}
+\renewcommand\TgoDefinitionName{Definizione}
+\renewcommand\TgoPropositionName{Proposizione}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Corollario}
+\renewcommand\TgoRemarkName{Nota}%%????
+\renewcommand\TgoExampleName{Esempio}
+\renewcommand\TgoContentsName{Sommario}%%Contenuti????
+\renewcommand\TgoExerciseName{Esercizio}
+\renewcommand\TgoExercisesSubsectionName{Esercizi}
+\renewcommand\TgoExercisesSectionName{Esercizi}
+}
+\fi
+%
+%%%
+\ifTgoSpanishLanguage
+\addto\captionsspanish{%
+\renewcommand\TgoTheoremName{Teorema}
+\renewcommand\TgoDefinitionName{Definición}
+\renewcommand\TgoPropositionName{Proposición}
+\renewcommand\TgoLemmaName{Lema}
+\renewcommand\TgoCorollaryName{Corolario}
+\renewcommand\TgoRemarkName{Osservación}%%????
+\renewcommand\TgoExampleName{Ejemplo}
+\renewcommand\TgoContentsName{Sumario}%%????
+\renewcommand\TgoExerciseName{Ejercicio}
+\renewcommand\TgoExercisesSubsectionName{Ejercicios}
+\renewcommand\TgoExercisesSectionName{Ejercicios}
+}
+\fi
+%
+%%%
+\ifTgoEnglishLanguage
+\addto\captionsenglish{%
+\renewcommand\TgoTheoremName{Theorem}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Corollary}
+\renewcommand\TgoRemarkName{Remark}
+\renewcommand\TgoExampleName{Example}
+\renewcommand\TgoContentsName{Contents}
+\renewcommand\TgoExerciseName{Exercise}
+\renewcommand\TgoExercisesSubsectionName{Exercises}
+\renewcommand\TgoExercisesSectionName{Exercises}
+}
+\fi
+%
+%%%
+\ifTgoBritishLanguage
+\addto\captionsbritish{%
+\renewcommand\TgoTheoremName{Theorem}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Corollary}
+\renewcommand\TgoRemarkName{Remark}
+\renewcommand\TgoExampleName{Example}
+\renewcommand\TgoContentsName{Contents}
+\renewcommand\TgoExerciseName{Exercise}
+\renewcommand\TgoExercisesSubsectionName{Exercises}
+\renewcommand\TgoExercisesSectionName{Exercises}
+}
+\fi
+%
+%%%
+\ifTgoAmericanLanguage
+\addto\captionsamerican{%
+\renewcommand\TgoTheoremName{Theorem}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Corollary}
+\renewcommand\TgoRemarkName{Remark}
+\renewcommand\TgoExampleName{Example}
+\renewcommand\TgoContentsName{Contents}
+\renewcommand\TgoExerciseName{Exercise}
+\renewcommand\TgoExercisesSubsectionName{Exercises}
+\renewcommand\TgoExercisesSectionName{Exercises}
+}
+\fi
+%
+%%%
+\ifTgoCanadianLanguage
+\addto\captionscanadian{%
+\renewcommand\TgoTheoremName{Theorem}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Corollary}
+\renewcommand\TgoRemarkName{Remark}
+\renewcommand\TgoExampleName{Example}
+\renewcommand\TgoContentsName{Contents}
+\renewcommand\TgoExerciseName{Exercise}
+\renewcommand\TgoExercisesSubsectionName{Exercises}
+\renewcommand\TgoExercisesSectionName{Exercises}
+}
+\fi
+%
+%%%
+\ifTgoAustralianLanguage
+\addto\captionsaustralian{%
+\renewcommand\TgoTheoremName{Theorem}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Corollary}
+\renewcommand\TgoRemarkName{Remark}
+\renewcommand\TgoExampleName{Example}
+\renewcommand\TgoContentsName{Contents}
+\renewcommand\TgoExerciseName{Exercise}
+\renewcommand\TgoExercisesSubsectionName{Exercises}
+\renewcommand\TgoExercisesSectionName{Exercises}
+}
+\fi
+%
+%%%
+\ifTgoNewZealandLanguage
+\addto\captionsnewzealand{%
+\renewcommand\TgoTheoremName{Theorem}
+\renewcommand\TgoDefinitionName{Definition}
+\renewcommand\TgoPropositionName{Proposition}
+\renewcommand\TgoLemmaName{Lemma}
+\renewcommand\TgoCorollaryName{Corollary}
+\renewcommand\TgoRemarkName{Remark}
+\renewcommand\TgoExampleName{Example}
+\renewcommand\TgoContentsName{Contents}
+\renewcommand\TgoExerciseName{Exercise}
+\renewcommand\TgoExercisesSubsectionName{Exercises}
+\renewcommand\TgoExercisesSectionName{Exercises}
+}
+\fi
+%
+%%% Last package
+\ifTgoNoHyperref
+\else
+\RequirePackage[colorlinks,linkcolor=ColorOne,urlcolor=ColorOne]{hyperref}
+\fi
+%%
+ %%%
+%%%%%%% parindent %%%%%%%%%%%%%%%%%%%%%%%%
+\setlength\parindent{\TgoStandardMargin}
+\setlength{\parskip}{0pt plus 1pt}
+\ifTgoSmartphoneOutput
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{3pt plus 2pt minus1pt}
+\else
+\ifTgoParindentZero
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{3pt plus 1pt}
+\fi\fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand\TgoCurrentLists{}
+%\ifTgoFrenchLanguage
+%\setlength{\TgoTitleIndent}{\parindent}
+%\else
+%\setlength{\TgoTitleIndent}{0em}
+%\fi
+\ifTgoTitleIndentZero
+\setlength{\TgoTitleIndent}{0em}
+\else
+\setlength{\TgoTitleIndent}{\parindent}
+\fi
+%
+%
+\renewcommand\labelitemi{\textbullet}
+\renewcommand\labelitemii{\textopenbullet}
+\renewcommand\labelitemiii{\starredbullet}
+\renewcommand\labelitemiv{\textperiodcentered}
+%%%%%
+\NewDocumentCommand\renewtgolabels{%
+s E{1234}{ {} {} {} {} }%
+}
+{%
+\IfBooleanTF{#1}%
+{%
+\IfBlankTF{#2}%
+{\renewcommand\labelitemi{\textbullet}}%
+{\renewcommand\labelitemi{#2}}%
+\IfBlankTF{#3}%
+{\renewcommand\labelitemii{\textopenbullet}}%
+{\renewcommand\labelitemii{#3}}%
+\IfBlankTF{#4}%
+{\renewcommand\labelitemiii{\starredbullet}}%
+{\renewcommand\labelitemiii{#4}}%
+\IfBlankTF{#5}%
+{\renewcommand\labelitemiv{\textperiodcentered}}%
+{\renewcommand\labelitemiv{#5}}%
+}%
+{%
+\IfBlankF{#2}{\renewcommand\labelitemi{#2}}%
+\IfBlankF{#3}{\renewcommand\labelitemii{#3}}%
+\IfBlankF{#4}{\renewcommand\labelitemiii{#4}}%
+\IfBlankF{#5}{\renewcommand\labelitemiv{#5}}%
+}%
+\TgoCurrentLists%
+}%
+\NewDocumentCommand\tgosmartlists{}
+{%
+\RenewDocumentCommand\TgoCurrentLists{}{\tgosmartlists}
+\setlength{\leftmargini}{\TgoStandardMargin}
+\setlength{\leftmarginii}{\TgoStandardMargin}
+\setlength{\leftmarginiii}{\TgoStandardMargin}
+\setlength{\leftmarginiv}{\TgoStandardMargin}
+\setlist{
+ itemsep=0.3ex plus 0.1ex minus 0.1ex,
+ parsep=0.3ex plus 0.1ex minus 0.1ex,
+ topsep=0.3ex plus 0.2ex minus 0.1ex,
+ partopsep=0.3ex plus 0.1ex minus 0.1ex
+}
+\setlist[itemize]{nosep, leftmargin=\TgoStandardMargin, align=left, labelsep=0.5em, labelindent=\TgoStandardMargin+\parindent,
+itemindent=*}
+%
+\setlist[itemize,1]{leftmargin=0em, align=left, labelsep=0.5em, labelindent=\parindent, itemindent=* }
+%
+\setlist[enumerate]{nosep, leftmargin=\TgoStandardMargin, align=left, labelsep=0.5em,
+labelindent=\TgoStandardMargin+\parindent,widest=0, itemindent=*}
+%
+\setlist[enumerate,1]{leftmargin=0em, align=left, labelsep=0.5em, labelindent=\parindent, itemindent=* }
+%
+}
+%%%
+\NewDocumentCommand\tgostandardlists{}
+{%
+\RenewDocumentCommand\TgoCurrentLists{}{\tgostandardlists}
+\setlength{\leftmargini}{\TgoStandardMargin}
+\setlength{\leftmarginii}{\TgoStandardMargin}
+\setlength{\leftmarginiii}{\TgoStandardMargin}
+\setlength{\leftmarginiv}{\TgoStandardMargin}
+\setlist{
+ itemsep=0.4ex plus 0.2ex minus 0.2ex,
+ parsep=0.4ex plus 0.2ex minus 0.2ex,
+ topsep=0.8ex plus 0.4ex minus 0.4ex,
+ partopsep=0.4ex plus 0.2ex minus 0.2ex
+}
+\setlist[itemize]{leftmargin=\TgoStandardMargin, align=left, labelindent=0em,
+labelwidth=0.75\TgoStandardMargin, labelsep=0.25\TgoStandardMargin, itemindent=!}
+%%
+\setlist[itemize,1]{leftmargin=2\TgoStandardMargin, align=left, labelindent=\TgoStandardMargin, labelwidth=0.75\TgoStandardMargin, labelsep=0.25\TgoStandardMargin, itemindent=!}
+%
+\setlist[enumerate]{leftmargin=\TgoStandardMargin, align=left, labelindent=0em,
+labelwidth=0.75\TgoStandardMargin, labelsep=0.25\TgoStandardMargin, itemindent=!}
+%
+\setlist[enumerate,1]{leftmargin=2\TgoStandardMargin, align=left, labelindent=\TgoStandardMargin, labelwidth=0.75\TgoStandardMargin, labelsep=0.25\TgoStandardMargin, itemindent=!}
+}
+\renewcommand{\labelenumii}{\alph{enumii}.}
+
+\tgostandardlists
+%
+%
+%\NewDocumentCommand\testlists{}{
+%\setlength{\leftmargini}{\TgoStandardMargin}
+%\setlength{\leftmarginii}{\TgoStandardMargin}
+%\setlength{\leftmarginiii}{\TgoStandardMargin}
+%\setlength{\leftmarginiv}{\TgoStandardMargin}
+%\setlist{
+% itemsep=0.4ex plus 0.2ex minus 0.2ex,
+% parsep=0.4ex plus 0.2ex minus 0.2ex,
+% topsep=0.8ex plus 0.4ex minus 0.4ex,
+% partopsep=0.4ex plus 0.2ex minus 0.2ex
+%}
+%\setlist[itemize]{nosep, leftmargin=\TgoStandardMargin, align=left, labelsep=0.5em, labelindent=\TgoStandardMargin+\parindent,
+%itemindent=*}
+%%
+%\setlist[itemize,1]{leftmargin=0em, align=left, labelsep=0.5em, labelindent=\parindent, itemindent=* }
+%%
+%\setlist[enumerate]{nosep, leftmargin=\TgoStandardMargin, align=left, labelsep=0.5em,
+%labelindent=\TgoStandardMargin+\parindent,widest=0, itemindent=*}
+%%
+%\setlist[enumerate,1]{leftmargin=0em, align=left, labelsep=0.5em, labelindent=\parindent, itemindent=* }
+%%
+%}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newpagestyle{tango}{
+ \ifTgoOneSide
+\ifTgoBook
+ \sethead {\sffamily\addfontfeature{RawFeature=+c2sc}\MakeUppercase\chaptertitle}{}
+ {\sffamily\thepage} % all
+ \else
+ \sethead{\sffamily\addfontfeature{RawFeature=+c2sc}\MakeUppercase\sectiontitle}{}
+ {\sffamily\thepage}% all
+ \fi
+\else
+\ifTgoBook
+\sethead[\sffamily\thepage]
+[\sffamily\addfontfeature{RawFeature=+c2sc}\MakeUppercase\chaptertitle][] % even
+ {}{\sffamily\addfontfeature{RawFeature=+c2sc}\MakeUppercase\sectiontitle}
+ {\sffamily\thepage} % odd
+\else
+ \sethead[\sffamily\thepage][\sffamily\addfontfeature{RawFeature=+c2sc}\MakeUppercase\sectiontitle][] % even
+ {}{\sffamily\addfontfeature{RawFeature=+c2sc}\MakeUppercase\sectiontitle}
+ {\sffamily\thepage}% odd
+\fi
+\fi}
+ %%%%%%%%%%%%
+\pagestyle{tango}
+%%%%%%%%%%%%%%
+%%% Mise en forme des titres %%%%%%%%%%%%%%%
+\setcounter{secnumdepth}{2}
+%%%
+\ifTgoBook
+\newcommand\TgoChapterBox[1]{%
+{\filright\sffamily\addfontfeature{RawFeature=-onum}\fontseries{eb}\selectfont\HUGE\hspace*{-0.06em}\thechapter}%
+\quad\parbox{0.75\textwidth}{\filright#1}
+}
+\titleformat{\part}[display]{\centering\color{ColorOne}\sffamily
+\addfontfeature{RawFeature=-onum}\fontseries{eb}\selectfont\Huge}
+{\LARGE\partname~\thepart}{\baselineskip}{}
+%%
+\titleformat{name=\chapter}[block]{\filright\color{ColorOne}\fontspec{\TgoChapterTitleFont}\addfontfeature{RawFeature=-onum}\huge}
+{}{0em}{\TgoChapterBox}
+%%%
+\titleformat{name=\chapter,numberless}[block]{\filright\color{ColorOne}\fontspec{\TgoChapterTitleFont}\addfontfeature{RawFeature=-onum}\huge}
+{}{0em}{}
+\fi%
+\titleformat{\section}{\color{ColorOne}\sffamily\addfontfeature{RawFeature=-onum}%
+\fontseries{b}\selectfont\large}{\thesection}{1em}{\uppercase}%
+\titleformat{\subsection}{\color{ColorOne}\sffamily\fontseries{sb}\selectfont\large}{\thesubsection}{1em}{}%
+\titleformat{\subsubsection}{\color{ColorOne}\sffamily\fontseries{sb}\selectfont}{\thesubsubsection}{0.7em}{}%
+\titleformat{\paragraph}[runin]{\itshape}{\theparagraph.}{0.5em}{}[. — ]%
+\titleformat{\subparagraph}[runin]{}{\thesubparagraph.}{0.5em}{}[. — ]%
+\titlespacing{\chapter}{\TgoTitleIndent}{0pt}{6ex}%
+\titlespacing{\section}{\TgoTitleIndent}{12pt plus 5pt minus 4pt}{6pt plus 3pt minus 2pt}%
+\titlespacing{\subsection}{\TgoTitleIndent}{12pt plus 5pt minus 4pt}{6pt plus 3pt minus 2pt}%
+\titlespacing{\subsubsection}{\TgoTitleIndent}{7pt plus 3pt minus 2pt}{3pt plus 2pt minus 1pt}%
+\titlespacing{\paragraph}{\TgoTitleIndent}{7pt plus 3pt minus 2pt}{3pt plus 1pt minus 1pt}%
+\titlespacing{\subparagraph}{\TgoTitleIndent}{4pt plus 2pt minus 2pt}{3pt plus 1pt minus 1pt}%
+%
+\ifTgoBook
+\NewCommandCopy{\tgotitle}{\chapter}
+\else%%article
+\NewDocumentCommand\tgotitle{s m}{%
+\IfBooleanTF{#1}{%
+\clearpage\thispagestyle{empty}
+% \vspace*{5\p@}%
+ {\parindent=0pt \raggedright
+ \normalfont
+ \interlinepenalty\@M
+\advance\leftskip by \TgoTitleIndent
+\fontspec{\TgoChapterTitleFont}\huge\color{ColorOne}#2
+\par} \vspace {\TgoAfterChapterSkip}\par}
+ {%
+\clearpage\thispagestyle{empty}
+% \vspace*{5\p@}%
+ {\parindent=0pt \raggedright
+ \normalfont
+ \interlinepenalty\@M
+\advance\leftskip by \TgoTitleIndent
+\fontspec{\TgoChapterTitleFont}\huge\color{ColorOne}#2
+\par} \vspace {\TgoAfterChapterSkip}\par}
+ }
+ \fi
+%%%%%%%
+%%%%%%%Table des matières
+%%%%%%%
+\ifTgoBook\else
+\RenewDocumentCommand\tableofcontents{}{%
+{\color{ColorOne}\parskip=0pt%
+\noindent\titlerule[1.3pt]%
+\vspace{-1\baselineskip}\vspace{1.6pt} \par %
+\noindent\titlerule[.5pt]%
+}%
+ \vspace{-10pt}\par%
+ \section*{\contentsname}
+ \@starttoc{toc}%
+{\color{ColorOne}\parskip=0pt%
+\noindent\titlerule[0.5pt]%
+\vspace{-1\baselineskip}\vspace{2.4pt} \par %
+\noindent\titlerule[1.3pt]%
+}%
+\par %
+\vspace{2\baselineskip}%
+\par %
+ }%
+ \fi
+ \IfPackageLoadedTF{hyperref}%
+{%
+\NewCommandCopy{\TgoOriginalToc}{\tableofcontents}%
+\RenewDocumentCommand\tableofcontents{}{{\hypersetup{hidelinks}\TgoOriginalToc}}%
+}%
+{}
+%%
+%%
+\ifTgoBook
+\NewDocumentCommand\tgoshorttoc{}{}
+\titlecontents{part}
+ [50pt] % ie, 1.5em (chapter) + 2.3em
+ {\large\sffamily\fontseries{sb}\selectfont\color{ColorOne}}
+ {\contentslabel{50pt}}
+ {\hspace*{-50pt}}
+ {\titlerule*[1pc]{}\contentspage}
+\titlecontents{chapter}
+ [16pt] % ie, 1.5em (chapter) + 2.3em
+ {\sffamily\fontseries{b}\selectfont\color{ColorOne}}
+ {\contentslabel{16pt}}
+ {\hspace*{-6pt}}
+ {\titlerule*[1pc]{}\contentspage}
+\titlecontents{section}
+ [3.6em] % ie, 1.5em (chapter) + 2.3em
+ {\sffamily\fontseries{m}\selectfont}
+ {\contentslabel{2.5em}}
+ {\hspace*{-2.5em}}
+ {\titlerule*[1pc]{.}\contentspage}
+\titlecontents{subsection}
+ [6.4em] % ie, 1.5em (chapter) + 2.3em
+ {\sffamily\fontseries{l}\selectfont}
+ {\contentslabel{3.2em}}
+ {\hspace*{-3.2em}}
+ {\titlerule*[1pc]{.}\contentspage}
+ \else
+ \NewCommandCopy{\tgoshorttoc}{\tableofcontents}
+ \RenewDocumentCommand\tableofcontents{}{}
+ \ifTgoFrenchLanguage
+ \renewcommand{\frenchcontentsname}{\TgoContentsName}
+\fi
+ \setcounter{tocdepth}{2}
+ \titlecontents{section}
+ [1.7em] % ie, 1.5em (chapter) + 2.3em
+ {\sffamily\fontseries{sb}\selectfont}
+ {\contentslabel{2.em}}
+ {\hspace*{-2.em}}
+ {\titlerule*[1pc]{}\contentspage}
+\titlecontents{subsection}
+ [4em] % ie, 1.5em (chapter) + 2.3em
+ {\sffamily}
+ {\contentslabel{2.7em}}
+ {\hspace*{-2.7em}}
+ {\titlerule*[1pc]{.}\contentspage}
+\titlecontents{subsubsection}
+ [6em] % ie, 1.5em (chapter) + 2.3em
+ {\sffamily\fontseries{l}\selectfont}
+ {\contentslabel{3.5em}}
+ {\hspace*{-3.5em}}
+ {\titlerule*[1pc]{.}\contentspage}
+ \fi
+%
+%%Init
+\NewDocumentCommand\AfourCommand{+m}{}
+%
+\NewDocumentCommand\LetterCommand{+m}{}
+%
+\NewDocumentCommand\BigTabletCommand{+m}{}
+%
+\NewDocumentCommand\TabletCommand{+m}{}
+%
+\NewDocumentCommand\AfiveCommand{+m}{}
+%
+\NewDocumentCommand\SmallTabletCommand{+m}{}
+%
+\NewDocumentCommand\eReaderCommand{+m}{}
+%
+\NewDocumentCommand\SmartphoneCommand{+m}{}
+%
+\NewDocumentCommand\XAfourCommand{+m}{}
+%
+\NewDocumentCommand\XLetterCommand{+m}{}
+%
+\NewDocumentCommand\XBigTabletCommand{+m}{}
+%
+\NewDocumentCommand\XTabletCommand{+m}{}
+%
+\NewDocumentCommand\XAfiveCommand{+m}{}
+%
+\NewDocumentCommand\XSmallTabletCommand{+m}{}
+%
+\NewDocumentCommand\XeReaderCommand{+m}{}
+%
+\NewDocumentCommand\XSmartphoneCommand{+m}{}
+ %
+%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%Output Format %%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%%%% Afour %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+\ifTgoAfourPaperOutput
+%
+\RenewDocumentCommand\AfourCommand{+m}{#1}
+%
+\RenewDocumentCommand\XLetterCommand{+m}{#1}
+%
+\RenewDocumentCommand\XBigTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfiveCommand{+m}{#1}
+%
+\RenewDocumentCommand\XTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmallTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XeReaderCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmartphoneCommand{+m}{#1}
+ %
+ %%
+%\ifTgoOneSide
+\geometry{paperwidth=21cm,paperheight=29.7cm,
+heightrounded,top=2cm,inner=2.75cm,outer=2.75cm,bottom=3.6cm,
+headheight=16pt,headsep=21pt,footskip=50pt}
+%\else
+%\geometry{paperwidth=21cm,paperheight=29.7cm,
+%heightrounded,top=2cm,inner=2.3cm,outer=3.2cm,bottom=3.6cm,
+%headheight=16pt,headsep=21pt,footskip=50pt}
+%\fi
+%
+\setlength{\TgoAfterChapterSkip}{21pt}
+%
+\NewDocumentCommand\tgocover{O{A4Cover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\emergencystretch=2.5em
+\tolerance800
+\clubpenalty1000
+\widowpenalty1000%
+%
+\fi
+%%%%%%%
+%%%%%% Big Tablet or Letter %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifTgoBigTabletOutput
+%
+\ifTgoLetterOutput
+%
+\RenewDocumentCommand\LetterCommand{+m}{#1}
+%
+\RenewDocumentCommand\XBigTabletCommand{+m}{#1}
+%
+\else
+%
+\RenewDocumentCommand\BigTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XLetterCommand{+m}{#1}
+%
+\fi
+%
+\RenewDocumentCommand\XAfourCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfiveCommand{+m}{#1}
+%
+\RenewDocumentCommand\XTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmallTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XeReaderCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmartphoneCommand{+m}{#1}
+ %
+%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%
+%
+%%
+\ifTgoLetterOutput
+%\ifTgoOneSide
+\geometry{paperwidth=8.5in,paperheight=11in,
+heightrounded,top=1.9cm,inner=2.8cm,outer=2.8cm,bottom=3cm,
+headheight=16pt,headsep=20pt,footskip=14pt}
+%\else
+%\geometry{paperwidth=8.5in,paperheight=11in,
+%heightrounded,top=1.9cm,inner=2.4cm,outer=3.2cm,bottom=3.6cm,
+%headheight=16pt,headsep=20pt,footskip=14pt}
+%\fi
+%
+\setlength{\TgoAfterChapterSkip}{22pt}
+%
+\NewDocumentCommand\tgocover{O{LetterCover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\emergencystretch=2.5em
+\tolerance800
+\clubpenalty1000
+\widowpenalty1000%
+%
+\else
+%
+\setlength{\TgoAfterChapterSkip}{21pt}
+%
+\geometry{paperwidth=19.8cm,paperheight=26.4cm,
+heightrounded,top=1.8cm,inner=2.4cm,outer=2.4cm,bottom=2.7cm,
+headheight=16pt,headsep=14pt,footskip=14pt}
+%
+\NewDocumentCommand\tgocover{O{BigTabletCover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\emergencystretch=2.5em
+\tolerance800
+\clubpenalty1000
+\widowpenalty1000%
+\fi
+\fi
+%%%%%%%
+%%%%%% Tablet or A5%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifTgoTabletOutput
+%
+\ifTgoAfivePaperOutput
+\RenewDocumentCommand\AfiveCommand{+m}{#1}
+%
+\RenewDocumentCommand\XTabletCommand{+m}{#1}
+%
+\else
+%
+\RenewDocumentCommand\TabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfiveCommand{+m}{#1}
+%
+\fi
+%
+\RenewDocumentCommand\XLetterCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfourCommand{+m}{#1}
+%
+\RenewDocumentCommand\XBigTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmallTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XeReaderCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmartphoneCommand{+m}{#1}
+ %
+%
+%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%
+%
+%%
+\ifTgoAfivePaperOutput
+%\ifTgoOneSide
+\geometry{paperwidth=14.85cm,paperheight=21cm,
+heightrounded,top=1.2cm,inner=1.8cm,outer=1.8cm,bottom=2.4cm,
+headheight=16pt,headsep=11pt,footskip=14pt}
+%\else
+%\geometry{paperwidth=14.85cm,paperheight=21cm,
+%heightrounded,top=1.3cm,inner=1.5cm,outer=2.1cm,bottom=2.4cm,
+%headheight=16pt,headsep=11pt,footskip=14pt}
+%\fi
+%
+\setlength{\TgoAfterChapterSkip}{15pt}
+%
+\NewDocumentCommand\tgocover{O{A5Cover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\emergencystretch=2.5em
+\tolerance800
+\clubpenalty1000
+\widowpenalty1000%
+%%
+\else
+%%%
+\geometry{paperwidth=16cm,paperheight=22.88cm,
+heightrounded,top=1.2cm,inner=1.4cm,outer=1.4cm,bottom=1.8cm,
+headheight=16pt,headsep=11pt,footskip=14pt}
+%
+\setlength{\TgoAfterChapterSkip}{18pt}
+%
+\NewDocumentCommand\tgocover{O{TabletCover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\emergencystretch=2.5em
+\tolerance800
+\clubpenalty1000
+\widowpenalty1000%
+\fi
+\fi
+%%%%%% Small Tablet%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifTgoSmallTabletOutput
+%
+\RenewDocumentCommand\SmallTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfourCommand{+m}{#1}
+%
+\RenewDocumentCommand\XLetterCommand{+m}{#1}
+%
+\RenewDocumentCommand\XBigTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfiveCommand{+m}{#1}
+%
+\RenewDocumentCommand\XTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XeReaderCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmartphoneCommand{+m}{#1}
+ %
+%%%%%%%%%%%%%%%%%%%%%
+\setlength{\TgoAfterChapterSkip}{11pt}
+%%
+ \geometry{paperwidth=12cm,paperheight=18.24cm,
+heightrounded,top=1.1cm,inner=0.75cm,outer=0.75cm,bottom=1.3cm,
+headheight=14pt,headsep=6pt,footskip=13pt}
+%
+\NewDocumentCommand\tgocover{O{SmallTabletCover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\emergencystretch=2.5em
+\tolerance800
+\clubpenalty1000
+\widowpenalty1000%
+\fi
+%%%%%% eReader %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifTgoeReaderOutput
+%
+\RenewDocumentCommand\eReaderCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfourCommand{+m}{#1}
+%
+\RenewDocumentCommand\XLetterCommand{+m}{#1}
+%
+\RenewDocumentCommand\XBigTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfiveCommand{+m}{#1}
+%
+\RenewDocumentCommand\XTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmallTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmartphoneCommand{+m}{#1}
+ %
+%%%%%%%%%%%%%%%%%%%%%
+\setlength{\TgoAfterChapterSkip}{3pt}
+%%%%%%%%%%%
+%
+%
+\geometry{paperwidth=10.7cm,paperheight=14.4cm,
+heightrounded,top=0.82cm,left=0.5cm,right=0.5cm,bottom=0.8cm,
+headheight=18pt,headsep=5pt,footskip=10pt}
+%%
+%
+\NewDocumentCommand\tgocover{O{eReaderCover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\sloppy
+\fi
+%%%%%%%% Smartphone %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifTgoSmartphoneOutput
+%
+\RenewDocumentCommand\SmartphoneCommand{+m}{#1}
+%
+\RenewDocumentCommand\XLetterCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfourCommand{+m}{#1}
+%
+\RenewDocumentCommand\XBigTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XAfiveCommand{+m}{#1}
+%
+\RenewDocumentCommand\XTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XSmallTabletCommand{+m}{#1}
+%
+\RenewDocumentCommand\XeReaderCommand{+m}{#1}
+ %
+%%%%%%%%%%%%%%%%%%%%%
+\setlength{\TgoAfterChapterSkip}{7pt}%
+%%%%%%%%%%%
+%
+%%
+\geometry{paperwidth=10cm,paperheight=18cm,
+heightrounded,top=1.1cm,inner=0.32cm,outer=0.32cm,bottom=1cm,
+headheight=14pt,headsep=10pt,footskip=17pt}
+%
+\NewDocumentCommand\tgocover{O{SmartphoneCover}}{\InputIfFileExists{#1}{}{%
+\ClassWarning{tango}{Fichier #1.tex absent}}}
+\flushbottom\sloppy
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\setlength{\abovecaptionskip}{4pt plus 1pt minus 1pt}
+\setlength{\belowcaptionskip}{4pt plus 1 pt minus 1pt}
+%
+%
+\setlength{\textfloatsep}{10pt plus 4 pt minus 3pt}
+\setlength{\intextsep}{4pt plus 2pt minus 1 pt}
+%
+%%%Environnements %%%%%%%%%%%%%%%%%%%
+%
+%%%%%% Stolen to amsthm %%%%%%%%%%%%%%%
+%
+\RenewDocumentCommand\qedsymbol{}{{\ensuremath{\color{ColorOne}\rule{7pt}{7pt}}}}%
+\RenewDocumentEnvironment{proof}{o}{%
+\IfValueTF{#1}%
+{\renewcommand\TgoTempa{#1}}
+{\renewcommand\TgoTempa{\proofname}}
+\pushQED{\qed}%
+\par\nobreak\addvspace{6pt plus 3pt minus 2pt}%
+{\color{ColorOne}\sffamily\fontseries{m}\selectfont\itshape%
+ \TgoTempa}\par\nobreak
+ }%
+{\popQED\par\addvspace{6pt plus 3pt minus 2pt}}
+%%%%
+%%%%
+\newcounter{tgoexo}%
+%%
+\NewDocumentCommand\exo{s d<> o}{%
+\IfValueTF{#2}%
+{%
+\renewcommand\TgoTempa{#2}%
+}%
+{%
+\renewcommand\TgoTempa{\TgoExerciseName}%
+}%
+\IfBooleanTF{#1}%
+{%
+\renewcommand\TgoTempb{\TgoTempa}%
+}%
+{%
+\refstepcounter{tgoexo}%
+\renewcommand\TgoTempb{\TgoTempa~\thetgoexo}%
+}%
+\IfValueTF{#3}%
+{%
+\renewcommand\TgoTempc{\TgoTempb\space(#3)}%
+}%
+{%
+\renewcommand\TgoTempc{\TgoTempb}%
+}%
+\@afterindenttrue
+\vspace{5pt plus 2pt minus 2pt}
+\par%
+\textsf{\fontseries{sb}\selectfont\TgoTempc}%
+\par\nobreak\vspace{0pt plus 1pt}\par%
+}%
+%
+\newsavebox{\TgoBox}
+%%%%
+%
+\NewDocumentCommand\sec@exo{m}{%
+\titleformat{\subsection}[block]{\filcenter\color{ColorOne}\sffamily\addfontfeature{RawFeature=-onum}%
+\fontseries{b}\selectfont}{\thesubsection}{1em}{\MakeUppercase}%
+\titlespacing{\subsection}{0em}{10pt plus 10pt minus 4pt}{8pt plus 5pt minus 3pt}%
+\subsection*{#1}
+\addcontentsline{toc}{subsection}{\protect\numberline{}#1}
+}
+%
+\NewDocumentCommand\secexo{O{\TgoExercisesSubsectionName}}{%
+\sec@exo{#1}
+\tgostandardlists
+}%
+\ExpandArgs{c}\NewDocumentCommand{secexo*}{O{\TgoExercisesSubsectionName}}{%
+\sec@exo{#1}
+\TgoSmallerSize
+\tgostandardlists
+}%
+\NewDocumentCommand\endsecexo{}
+{\renewtgolabels\par\addvspace{10pt plus 3pt minus 2pt}\par}%
+%
+\ExpandArgs{c}\NewDocumentCommand{endsecexo*}{}
+{\renewtgolabels\par\addvspace{10pt plus 3pt minus 2pt}\par}%
+%
+\NewDocumentCommand\chap@exo{m}{%
+\titleformat{\section}[block]{\filcenter\color{ColorOne}\sffamily\addfontfeature{RawFeature=-onum}%
+\fontseries{b}\selectfont\large}{\thesection}{1em}{\MakeUppercase}%
+\tgostandardlists
+\titlespacing{\section}{0em}{18pt plus 10pt minus 4pt}{8pt plus 5pt minus 3pt}%
+\section*{#1}
+\addcontentsline{toc}{section}{\protect\numberline{}#1}
+}
+%
+\NewDocumentCommand\chapexo{O{\TgoExercisesSectionName}}{%
+\chap@exo{#1}
+}%
+\ExpandArgs{c}\NewDocumentCommand{chapexo*}{O{\TgoExercisesSectionName}}{%
+\chap@exo{#1}
+\TgoSmallerSize
+}%
+\NewDocumentCommand\endchapexo{}
+{\renewlabelitems\par\addvspace{18pt plus 3pt minus 2pt}\par}%
+%
+\ExpandArgs{c}\NewDocumentCommand{endchapexo*}{}
+{\renewlabelitems\par\addvspace{18pt plus 3pt minus 2pt}\par}%
+%%%%
+%%
+\NewDocumentEnvironment{example}{O{\TgoExampleName}}{%
+\par\addvspace{6pt plus 3pt minus 2pt}%
+{\sffamily\itshape #1}\par\nobreak%
+\@afterheading}%
+{\par\addvspace{6pt plus 3pt minus 2pt}\par}
+%%%
+\NewDocumentEnvironment{remark}{O{\TgoRemarkName}}{%
+\par\addvspace{6pt plus 3pt minus 2pt}%
+{\sffamily\itshape #1. \textemdash~}\ignorespaces}%
+{\par\addvspace{6pt plus 3pt minus 2pt}}
+%%%
+%%%
+\NewDocumentEnvironment{alert}{O{\caution}}{%
+\par\addvspace{6pt plus 3pt minus 2pt}\noindent%
+{\color{ColorOne}\Large #1}\hspace{1ex}\ignorespaces}%
+{\par\addvspace{6pt plus 3pt minus 2pt}}
+%
+%%
+\NewDocumentCommand\newstatement{s m m m o}{%
+\setlength\TgoStatementParindent{\parindent}
+\ExpandArgs{c}\NewDocumentCommand{#2}{d<> o}%
+{% beginning env commands
+\refstepcounter{#3}
+\IfBooleanTF{#1}
+{%
+\renewcommand\TgoTempa{#3}
+\renewcommand\TgoTempb{subsection}
+\ifx\TgoTempa\TgoTempb
+\ifTgoTitleIndentZero
+\renewcommand\TgoStatementIndent{\noindent}
+\setlength\TgoStatementParindent{0em}
+\fi
+\renewcommand\TgoStatementNumberPrefix{\large\fontseries{sb}\selectfont%
+\UseName{the#3}\hspace{1em}}%
+\else
+\renewcommand\TgoTempb{subsubsection}
+\ifx\TgoTempa\TgoTempb
+\ifTgoTitleIndentZero
+\renewcommand\TgoStatementIndent{\noindent}
+\setlength\TgoStatementParindent{0em}
+\fi
+\fi
+\renewcommand\TgoStatementNumberPrefix{\fontseries{sb}\selectfont%
+\UseName{the#3}\hspace{1em}}%
+\fi
+\renewcommand\TgoStatementNumberSuffix{}%
+}
+{
+\renewcommand\TgoStatementNumberSuffix{~\UseName{the#3}}%
+\renewcommand\TgoStatementNumberPrefix{}%
+}
+\IfValueTF{##2}%
+{%
+\renewcommand\TgoStatementSuffix{~{\normalshape(##2)}}%
+}%
+{%
+\renewcommand\TgoStatementSuffix{}%
+}%
+\renewcommand\TgoStatementName{#4}
+\IfValueT{##1}{%
+\renewcommand\TgoStatementName{##1}
+}
+\par%
+\addvspace{8pt plus 3pt minus 2pt}%
+\begin{lrbox}{\TgoBox}%
+\par%
+%\begin{minipage}{\linewidth-\fboxsep-\TgoStatementParindent}\IfValueT{#5}{#5}%
+\begin{minipage}{\linewidth-\TgoStatementParindent}\IfValueT{#5}{#5}%
+}%
+\ExpandArgs{c}\NewDocumentCommand{end#2}{}
+{% end env commands
+\end{minipage}\end{lrbox}
+\TgoStatementIndent\parbox{\linewidth-\TgoStatementParindent}{
+{\color{ColorOne}\sffamily\fontseries{m}\selectfont\scshape\TgoStatementNameOffset%
+\TgoStatementNumberPrefix\fontseries{sb}\selectfont\TgoStatementName%
+\TgoStatementNumberSuffix\TgoStatementSuffix\par\nobreak}%
+\vspace{2pt}\par%
+\addtolength\leftskip{-\fboxsep}
+\addtolength\rightskip{-\fboxsep}
+\colorbox{ColorTwo}{%
+\usebox{\TgoBox}}}%
+\par\addvspace{6pt plus 3pt minus 2pt}\par%
+}%
+\ExpandArgs{c}\NewDocumentCommand{#2*}{d<> o}%
+{% beginning env commands
+\IfValueTF{##2}%
+{%
+\renewcommand\TgoStatementSuffix{~{\normalshape(##2)}}%
+}%
+{%
+\renewcommand\TgoStatementSuffix{}%
+}%
+\renewcommand\TgoStatementName{#4}
+\IfValueT{##1}{%
+\renewcommand\TgoStatementName{##1}
+}
+\par%
+\addvspace{8pt plus 3pt minus 2pt}%
+\begin{lrbox}{\TgoBox}%
+\par%
+%\begin{minipage}{\linewidth-\fboxsep-\TgoStatementParindent}\IfValueT{#5}{#5}%
+\begin{minipage}{\linewidth-\TgoStatementParindent}\IfValueT{#5}{#5}
+}%
+\ExpandArgs{c}\NewDocumentCommand{end#2*}{}
+{% end env commands
+\end{minipage}\end{lrbox}
+\TgoStatementIndent\parbox{\linewidth-\TgoStatementParindent}{
+{\color{ColorOne}\sffamily\fontseries{m}\selectfont\scshape\TgoStatementNameOffset%
+\fontseries{sb}\selectfont\TgoStatementName\TgoStatementSuffix\par\nobreak}%
+\vspace{2pt}\par%
+\addtolength\leftskip{-\fboxsep}
+\addtolength\rightskip{-\fboxsep}
+\colorbox{ColorTwo}{%
+\usebox{\TgoBox}}}%
+\par\addvspace{6pt plus 3pt minus 2pt}\par%
+}%
+}%%%%
+%%%%%%%%%%%%
+%%%%%%%%%%%%%
+%%%%%%%%%%%%
+\NewDocumentCommand\renewstatement{s m m m o}{%
+\setlength\TgoStatementParindent{\parindent}
+\ExpandArgs{c}\RenewDocumentCommand{#2}{d<> o}%
+{% beginning env commands
+\refstepcounter{#3}
+\IfBooleanTF{#1}
+{%
+\renewcommand\TgoTempa{#3}
+\renewcommand\TgoTempb{subsection}
+\ifx\TgoTempa\TgoTempb
+\ifTgoTitleIndentZero
+\renewcommand\TgoStatementIndent{\noindent}
+\setlength\TgoStatementParindent{0em}
+\fi
+\renewcommand\TgoStatementNumberPrefix{\large\fontseries{sb}\selectfont%
+\UseName{the#3}\hspace{1em}}%
+\else
+\renewcommand\TgoTempb{subsubsection}
+\ifx\TgoTempa\TgoTempb
+\ifTgoTitleIndentZero
+\renewcommand\TgoStatementIndent{\noindent}
+\setlength\TgoStatementParindent{0em}
+\fi
+\fi
+\renewcommand\TgoStatementNumberPrefix{\fontseries{sb}\selectfont%
+\UseName{the#3}\hspace{1em}}%
+\fi
+\renewcommand\TgoStatementNumberSuffix{}%
+}
+{
+\renewcommand\TgoStatementNumberSuffix{~\UseName{the#3}}%
+\renewcommand\TgoStatementNumberPrefix{}%
+}
+\IfValueTF{##2}%
+{%
+\renewcommand\TgoStatementSuffix{~{\normalshape(##2)}}%
+}%
+{%
+\renewcommand\TgoStatementSuffix{}%
+}%
+\renewcommand\TgoStatementName{#4}
+\IfValueT{##1}{%
+\renewcommand\TgoStatementName{##1}
+}
+\par%
+\addvspace{8pt plus 3pt minus 2pt}%
+\begin{lrbox}{\TgoBox}%
+\par%
+%\begin{minipage}{\linewidth-\fboxsep-\TgoStatementParindent}\IfValueT{#5}{#5}%
+\begin{minipage}{\linewidth-\TgoStatementParindent}\IfValueT{#5}{#5}
+}%
+\ExpandArgs{c}\RenewDocumentCommand{end#2}{}
+{% end env commands
+\end{minipage}\end{lrbox}
+\TgoStatementIndent\parbox{\linewidth-\TgoStatementParindent}{
+{\color{ColorOne}\sffamily\fontseries{m}\selectfont\scshape\TgoStatementNameOffset%
+\TgoStatementNumberPrefix\fontseries{sb}\selectfont\TgoStatementName%
+\TgoStatementNumberSuffix\TgoStatementSuffix\par\nobreak}%
+\vspace{2pt}\par%
+\addtolength\leftskip{-\fboxsep}
+\addtolength\rightskip{-\fboxsep}
+\colorbox{ColorTwo}{%
+\usebox{\TgoBox}}}%
+\par\addvspace{6pt plus 3pt minus 2pt}\par%
+}%
+\ExpandArgs{c}\RenewDocumentCommand{#2*}{d<> o}%
+{% beginning env commands
+\IfValueTF{##2}%
+{%
+\renewcommand\TgoStatementSuffix{~{\normalshape(##2)}}%
+}%
+{%
+\renewcommand\TgoStatementSuffix{}%
+}%
+\renewcommand\TgoStatementName{#4}
+\IfValueT{##1}{%
+\renewcommand\TgoStatementName{##1}
+}
+\par%
+\addvspace{8pt plus 3pt minus 2pt}%
+\begin{lrbox}{\TgoBox}%
+\par%
+%\begin{minipage}{\linewidth-\fboxsep-\TgoStatementParindent}\IfValueT{#5}{#5}%
+\begin{minipage}{\linewidth-\TgoStatementParindent}\IfValueT{#5}{#5}
+}%
+\ExpandArgs{c}\RenewDocumentCommand{end#2*}{}
+{% end env commands
+\end{minipage}\end{lrbox}
+\TgoStatementIndent\parbox{\linewidth-\TgoStatementParindent}{
+{\color{ColorOne}\sffamily\fontseries{m}\selectfont\scshape\TgoStatementNameOffset%
+\fontseries{sb}\selectfont\TgoStatementName\TgoStatementSuffix\par\nobreak}%
+\vspace{2pt}\par%
+\addtolength\leftskip{-\fboxsep}
+\addtolength\rightskip{-\fboxsep}
+\colorbox{ColorTwo}{%
+\usebox{\TgoBox}}}%
+\par\addvspace{6pt plus 3pt minus 2pt}\par%
+}%
+}%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifTgoNoStatement
+\else
+\newcounter{thm}
+\newstatement{thm}{thm}{\TgoTheoremName}[\itshape]
+\newcounter{defin}
+\newstatement{defin}{defin}{\TgoDefinitionName}
+\newcounter{coro}
+\newstatement{coro}{coro}{\TgoCorollaryName}
+\newcounter{propo}
+\newstatement{propo}{propo}{\TgoPropositionName}[\itshape]
+\newcounter{lem}
+\newstatement{lem}{lem}{\TgoLemmaName}
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+\AtBeginDocument{%
+ \Umathchardef\Bbbbackslash = 0 0 "E020 \relax
+ \Umathchardef\varemptyset = 0 0 "E021 \relax
+ \Umathchardef\mupvarzero = 0 0 "E022 \relax
+ \Umathchardef\mbfvarzero = 0 0 "E023 \relax
+ \Umathchardef\mupvarpartial = 0 0 "E030 \relax
+ \Umathchardef\mupvarvarpi = 0 0 "E032 \relax
+ \Umathchardef\mbfvarpartial = 0 0 "E040 \relax
+ \Umathchardef\mbfvarvarrho = 0 0 "E041 \relax
+ \Umathchardef\mbfvarvarpi = 0 0 "E042 \relax
+ \Umathchardef\mbfvec = 0 0 "E044 \relax
+ \Umathchardef\mbfwp = 0 0 "E045 \relax
+ \Umathchardef\mbfdotlessi = 0 0 "E046 \relax
+ \Umathchardef\mbfdotlessj = 0 0 "E047 \relax
+ \Umathchardef\mbfhbar = 0 0 "E048 \relax
+ \Umathchardef\mbfell = 0 0 "E049 \relax
+ \Umathchardef\mbftriangleleft = 0 0 "E04E \relax
+ \Umathchardef\mbftriangleright = 0 0 "E04F \relax
+ \Umathchardef\mbfitvarpartial = 0 0 "E060 \relax
+ \Umathchardef\mbfitvarvarrho = 0 0 "E061 \relax
+ \Umathchardef\mbfitvarvarpi = 0 0 "E062 \relax
+ \Umathchardef\mbfitwp = 0 0 "E065 \relax
+ \Umathchardef\mbfimath = 0 0 "E066 \relax
+ \Umathchardef\mbfjmath = 0 0 "E067 \relax
+ \Umathchardef\mbfithbar = 0 0 "E068 \relax
+ \Umathchardef\mbfitell = 0 0 "E069 \relax
+ \Umathchardef\mitvarpartial = 0 0 "E070 \relax
+ \Umathchardef\mitvarvarrho = 0 0 "E071 \relax
+ \Umathchardef\mitvarvarpi = 0 0 "E072 \relax
+ \Umathchardef\mithbar = 0 0 "E078 \relax
+ \Umathchardef\mapstochar = 3 0 "E08D \relax
+ \Umathchardef\lhook = 3 0 "E08E \relax
+ \Umathchardef\rhook = 3 0 "E08F \relax
+ \Umathchardef\parallelslant = 3 0 "E090 \relax
+ \Umathchardef\nparallelslant = 3 0 "E091 \relax
+ \Umathchardef\shortparallelslant = 3 0 "E092 \relax
+ \Umathchardef\nshortparallelslant = 3 0 "E093 \relax
+ \Umathchardef\lesseqslantgtr = 3 0 "E094 \relax
+ \Umathchardef\gtreqslantless = 3 0 "E095 \relax
+ \Umathchardef\lesseqqslantgtr = 3 0 "E096 \relax
+ \Umathchardef\gtreqqslantless = 3 0 "E097 \relax
+ \Umathchardef\nleqqslant = 3 0 "E098 \relax
+ \Umathchardef\ngeqqslant = 3 0 "E099 \relax
+ \Umathchardef\varsymscrE = 0 0 "E07D \relax
+ \Umathchardef\varsymscrQ = 0 0 "E07E \relax
+ \Umathchardef\varsymscrT = 0 0 "E07F \relax
+ \Umathchardef\varsymbfscrE = 0 0 "E06D \relax
+ \Umathchardef\varsymbfscrQ = 0 0 "E06E \relax
+ \Umathchardef\varsymbfscrT = 0 0 "E06F \relax
+ % \widearc and\overrightarc
+ \newcommand*{\widearc}{\Umathaccent 0 0 "E540 }%
+ \newcommand*{\overrightarc}{\Umathaccent 0 0 "20D5 }%
+ % From FourierOrns
+ \Umathchardef\forbidden = 0 0 "E0B0 \relax
+ \Umathchardef\beware = 0 0 "E0B1 \relax
+ \Umathchardef\boom = 0 0 "E0B2 \relax
+ \Umathchardef\thething = 0 0 "E0B4 \relax
+ \Umathchardef\xswordsup = 0 0 "E0B5 \relax
+ \Umathchardef\xswordsdown = 0 0 "E0B6 \relax
+ % amssymb
+ \IfPackageLoadedTF{amssymb}%
+ {\ClassWarning{tango}{%
+ Tango provides all AMS symbols.\MessageBreak
+ Loading amssymb.sty is not advisable.\MessageBreak
+ Reported}%
+ }%
+ {% AMS Symbols not referenced in unicode-math-table.tex
+ % \Umathchardef\<cmd> = <math type> <family> <slot>
+ % <math type> : \mathord=0 \mathrel=3 ; <family>=0
+ \Umathchardef\circledR = 0 0 "24C7 \relax
+ \Umathchardef\circledS = 0 0 "24C8 \relax
+ \Umathchardef\diagup = 0 0 "27CB \relax
+ \Umathchardef\diagdown = 0 0 "27CD \relax
+ \Umathchardef\shortmid = 3 0 "E0A2 \relax
+ \Umathchardef\shortparallel = 3 0 "E0A3 \relax
+ \Umathchardef\nshortmid = 3 0 "E0A4 \relax
+ \Umathchardef\nshortparallel = 3 0 "E0A5 \relax
+ \Umathchardef\lvertneqq = 3 0 "E0A6 \relax
+ \Umathchardef\gvertneqq = 3 0 "E0A7 \relax
+ \Umathchardef\nleqslant = 3 0 "E0A8 \relax
+ \Umathchardef\ngeqslant = 3 0 "E0A9 \relax
+ \Umathchardef\nleqq = 3 0 "E0AA \relax
+ \Umathchardef\ngeqq = 3 0 "E0AB \relax
+ \Umathchardef\varsubsetneq = 3 0 "E0AC \relax
+ \Umathchardef\varsupsetneq = 3 0 "E0AD \relax
+ \Umathchardef\nsubseteqq = 3 0 "E0AE \relax
+ \Umathchardef\nsupseteqq = 3 0 "E0AF \relax
+ \Umathchardef\varsubsetneqq = 3 0 "E09C \relax
+ \Umathchardef\varsupsetneqq = 3 0 "E09D \relax
+ \Umathchardef\npreceq = 3 0 "E09E \relax
+ \Umathchardef\nsucceq = 3 0 "E09F \relax
+ \let\centerdot\cdotp
+ \let\restriction\upharpoonright
+ \let\doteqdot\Doteq
+ \let\doublecup\Cup
+ \let\doublecap\Cap
+ \let\llless\lll
+ \let\gggtr\ggg
+ \let\circlearrowleft\acwopencirclearrow
+ \let\circlearrowright\cwopencirclearrow
+ \let\lozenge\mdlgwhtlozenge
+ \let\blacklozenge\mdlgblklozenge
+ \let\square\mdlgwhtsquare
+ \let\blacksquare\mdlgblksquare
+ \let\dashleftarrow\leftdasharrow
+ \let\dashrightarrow\rightdasharrow
+ \let\ntriangleleft\nvartriangleleft
+ \let\ntriangleright\nvartriangleright
+ \let\varpropto\propto
+ \let\thicksim\sim
+ \let\thickapprox\approx
+ \let\smallsmile\smile
+ \let\smallfrown\frown
+ }%
+ % latexsym
+ \IfPackageLoadedTF{latexsym}%
+ {\ClassWarning{tango}{%
+ Tango provides all LaTeX symbols.\MessageBreak
+ Loading latexsym.sty is not advisable.\MessageBreak
+ Reported}%
+ }%
+ {\let\lhd\vartriangleleft
+ \let\rhd\vartriangleright
+ \let\unlhd\trianglelefteq
+ \let\unrhd\trianglerighteq
+ \let\leadsto\rightcurvedarrow
+ \let\Box\lgwhtsquare
+ \let\Diamond\mdlgwhtdiamond
+ }%
+}
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index a68edaf9fdb..773a8bbfb7f 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
@@ -11,8 +11,8 @@
luatexbase.provides_module {
name = "luamplib",
- version = "2.32.3",
- date = "2024/06/21",
+ version = "2.34.0",
+ date = "2024/07/17",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -60,6 +60,7 @@ luamplib.showlog = luamplib.showlog or false
local tableconcat = table.concat
local tableinsert = table.insert
+local tableunpack = table.unpack
local texsprint = tex.sprint
local texgettoks = tex.gettoks
local texgetbox = tex.getbox
@@ -316,6 +317,7 @@ local function reporterror (result, prevlog)
end
end
+if not math.initialseed then math.randomseed(currenttime) end
local function luamplibload (name)
local mpx = mplib.new {
ini_version = true,
@@ -330,7 +332,7 @@ local function luamplibload (name)
local preamble = tableconcat{
format(preamble, replacesuffix(name,"mp")),
luamplib.preambles.mplibcode,
- luamplib.legacy_verbatimtex and luamplib.preambles.legacyverbatimtex or "",
+ luamplib.legacyverbatimtex and luamplib.preambles.legacyverbatimtex or "",
luamplib.textextlabel and luamplib.preambles.textextlabel or "",
}
local result, log
@@ -353,7 +355,7 @@ local function process (data, instancename)
currentformat,
luamplib.numbersystem or "scaled",
tostring(luamplib.textextlabel),
- tostring(luamplib.legacy_verbatimtex),
+ tostring(luamplib.legacyverbatimtex),
}
has_instancename = false
end
@@ -579,7 +581,7 @@ function luamplib.runscript (code)
return buffer
end
buffer = {}
- mpprint(buffer, table.unpack(res))
+ mpprint(buffer, tableunpack(res))
return tableconcat(buffer)
end
return ""
@@ -593,7 +595,7 @@ local function protecttexcontents (str)
:gsub("%s+", " ")
end
-luamplib.legacy_verbatimtex = true
+luamplib.legacyverbatimtex = true
function luamplib.maketext (str, what)
if str and str ~= "" then
@@ -603,7 +605,7 @@ function luamplib.maketext (str, what)
not str:find("\\begin%s*{document}") and
not str:find("\\documentstyle"..name_e) and
not str:find("\\usepackage"..name_e) then
- if luamplib.legacy_verbatimtex then
+ if luamplib.legacyverbatimtex then
if luamplib.in_the_fig then
return process_verbatimtex_infig(str)
else
@@ -659,15 +661,14 @@ luamplib.shadecolor = function (str)
run_tex_code({
[[\color_export:nnN{]], str, [[}{backend}\mplib_@tempa]],
},ccexplat)
- local name = get_macro'mplib_@tempa':match'{(.-)}{.+}'
+ local name, value = get_macro'mplib_@tempa':match'{(.-)}{(.-)}'
local t, obj = res:explode()
if pdfmode then
obj = format("%s 0 R", ltx.pdf.object_id( t[1]:sub(2,-1) ))
else
obj = t[2]
end
- local value = t[3]:match"%[(.-)%]" or t[3]
- return format('(%s) withprescript"mplib_spotcolor=%s:%s"', value,obj,name)
+ return format('(1) withprescript"mplib_spotcolor=%s:%s:%s"', value,obj,name)
end
return colorsplit(res)
end
@@ -965,7 +966,7 @@ function luamplib.glyph (f, c)
if not gid then return mperr"cannot get GID (glyph id)" end
local fac = 1000 / (shapedata.units or 1000)
local t = shapedata.glyphs[gid].segments
- if not t then return "image(fill fullcircle scaled 0;)" end
+ if not t then return "image()" end
for i,v in ipairs(t) do
if type(v) == "table" then
for ii,vv in ipairs(v) do
@@ -1215,7 +1216,7 @@ function luamplib.outlinetext (text)
local id = tonumber(fmt:match"mplibtexboxid=(%d+):")
local box = texgetbox(id)
local res = outline_horz({ }, box, box.head, 0, 0)
- if #res == 0 then res = { "mpliboutlinepic[1]:=image(fill fullcircle scaled 0;);" } end
+ if #res == 0 then res = { "mpliboutlinepic[1]:=image();" } end
return tableconcat(res) .. format("mpliboutlinenum:=%i;", #res)
end
@@ -1416,6 +1417,47 @@ vardef mplibtransformmatrix (text e) =
& decimal ypart t & ","
& "}");
enddef;
+primarydef p withfademethod s =
+ if picture p:
+ image(
+ draw p;
+ draw center p withprescript "mplibfadestate=stop";
+ )
+ else:
+ p withprescript "mplibfadestate=stop"
+ fi
+ withprescript "mplibfadetype=" & s
+ withprescript "mplibfadebbox=" &
+ decimal xpart llcorner p & ":" &
+ decimal ypart llcorner p & ":" &
+ decimal xpart urcorner p & ":" &
+ decimal ypart urcorner p
+enddef;
+def withfadeopacity (expr a,b) =
+ withprescript "mplibfadeopacity=" &
+ decimal a & ":" &
+ decimal b
+enddef;
+def withfadevector (expr a,b) =
+ withprescript "mplibfadevector=" &
+ decimal xpart a & ":" &
+ decimal ypart a & ":" &
+ decimal xpart b & ":" &
+ decimal ypart b
+enddef;
+let withfadecenter = withfadevector;
+def withfaderadius (expr a,b) =
+ withprescript "mplibfaderadius=" &
+ decimal a & ":" &
+ decimal b
+enddef;
+def withfadebbox (expr a,b) =
+ withprescript "mplibfadebbox=" &
+ decimal xpart a & ":" &
+ decimal ypart a & ":" &
+ decimal xpart b & ":" &
+ decimal ypart b
+enddef;
]],
legacyverbatimtex = [[
def specialVerbatimTeX (text t) = runscript("luamplibprefig{"&t&"}") enddef;
@@ -1469,7 +1511,7 @@ luamplib.everyendmplib = setmetatable({ [""] = "" },{ __index = function(t) retu
function luamplib.process_mplibcode (data, instancename)
texboxes.localid = 4096
- if luamplib.legacy_verbatimtex then
+ if luamplib.legacyverbatimtex then
luamplib.figid, tex_code_pre_mplib = 1, {}
end
@@ -1530,15 +1572,6 @@ local function script2table(s)
return t
end
-local function getobjects(result,figure,f)
- return figure:objects()
-end
-
-function luamplib.convert (result, flusher)
- luamplib.flush(result, flusher)
- return true -- done
-end
-
local figcontents = { post = { } }
local function put2output(a,...)
figcontents[#figcontents+1] = type(a) == "string" and format(a,...) or a
@@ -1556,96 +1589,6 @@ local function pdf_literalcode (fmt,...)
put2output{-2, format(fmt,...)}
end
-local function pdf_textfigure(font,size,text,width,height,depth)
- text = text:gsub(".",function(c)
- return format("\\hbox{\\char%i}",string.byte(c)) -- kerning happens in metapost : false
- end)
- put2output("\\mplibtextext{%s}{%f}{%s}{%s}{%s}",font,size,text,0,0)
-end
-
-local bend_tolerance = 131/65536
-
-local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
-
-local function pen_characteristics(object)
- local t = mplib.pen_info(object)
- rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
- divider = sx*sy - rx*ry
- return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
-end
-
-local function concat(px, py) -- no tx, ty here
- return (sy*px-ry*py)/divider,(sx*py-rx*px)/divider
-end
-
-local function curved(ith,pth)
- local d = pth.left_x - ith.right_x
- if abs(ith.right_x - ith.x_coord - d) <= bend_tolerance and abs(pth.x_coord - pth.left_x - d) <= bend_tolerance then
- d = pth.left_y - ith.right_y
- if abs(ith.right_y - ith.y_coord - d) <= bend_tolerance and abs(pth.y_coord - pth.left_y - d) <= bend_tolerance then
- return false
- end
- end
- return true
-end
-
-local function flushnormalpath(path,open)
- local pth, ith
- for i=1,#path do
- pth = path[i]
- if not ith then
- pdf_literalcode("%f %f m",pth.x_coord,pth.y_coord)
- elseif curved(ith,pth) then
- pdf_literalcode("%f %f %f %f %f %f c",ith.right_x,ith.right_y,pth.left_x,pth.left_y,pth.x_coord,pth.y_coord)
- else
- pdf_literalcode("%f %f l",pth.x_coord,pth.y_coord)
- end
- ith = pth
- end
- if not open then
- local one = path[1]
- if curved(pth,one) then
- pdf_literalcode("%f %f %f %f %f %f c",pth.right_x,pth.right_y,one.left_x,one.left_y,one.x_coord,one.y_coord )
- else
- pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
- end
- elseif #path == 1 then -- special case .. draw point
- local one = path[1]
- pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
- end
-end
-
-local function flushconcatpath(path,open)
- pdf_literalcode("%f %f %f %f %f %f cm", sx, rx, ry, sy, tx ,ty)
- local pth, ith
- for i=1,#path do
- pth = path[i]
- if not ith then
- pdf_literalcode("%f %f m",concat(pth.x_coord,pth.y_coord))
- elseif curved(ith,pth) then
- local a, b = concat(ith.right_x,ith.right_y)
- local c, d = concat(pth.left_x,pth.left_y)
- pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(pth.x_coord, pth.y_coord))
- else
- pdf_literalcode("%f %f l",concat(pth.x_coord, pth.y_coord))
- end
- ith = pth
- end
- if not open then
- local one = path[1]
- if curved(pth,one) then
- local a, b = concat(pth.right_x,pth.right_y)
- local c, d = concat(one.left_x,one.left_y)
- pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(one.x_coord, one.y_coord))
- else
- pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
- end
- elseif #path == 1 then -- special case .. draw point
- local one = path[1]
- pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
- end
-end
-
local function start_pdf_code()
if pdfmode then
pdf_literalcode("q")
@@ -1719,31 +1662,43 @@ pdfetcs.pgfextgs = "pgf@sys@addpdfresource@extgs@plain"
pdfetcs.pgfpattern = "pgf@sys@addpdfresource@patterns@plain"
pdfetcs.pgfcolorspace = "pgf@sys@addpdfresource@colorspaces@plain"
-local function update_pdfobjs (os)
- local on = pdfobjs[os]
+local function update_pdfobjs (os, stream)
+ local key = os
+ if stream then key = key..stream end
+ local on = pdfobjs[key]
if on then
return on,false
end
if pdfmode then
- on = pdf.immediateobj(os)
+ if stream then
+ on = pdf.immediateobj("stream",stream,os)
+ else
+ on = pdf.immediateobj(os)
+ end
else
on = pdfetcs.cnt or 1
- texsprint(format("\\special{pdf:obj @mplibpdfobj%s %s}",on,os))
+ if stream then
+ texsprint(format("\\special{pdf:stream @mplibpdfobj%s (%s) <<%s>>}",on,stream,os))
+ else
+ texsprint(format("\\special{pdf:obj @mplibpdfobj%s %s}",on,os))
+ end
pdfetcs.cnt = on + 1
end
- pdfobjs[os] = on
+ pdfobjs[key] = on
return on,true
end
+pdfetcs.resfmt = pdfmode and "%s 0 R" or "@mplibpdfobj%s"
if pdfmode then
pdfetcs.getpageres = pdf.getpageresources or function() return pdf.pageresources end
- pdfetcs.setpageres = pdf.setpageresources or function(s) pdf.pageresources = s end
- pdfetcs.initialize_resources = function (name)
+ local getpageres = pdfetcs.getpageres
+ local setpageres = pdf.setpageresources or function(s) pdf.pageresources = s end
+ local initialize_resources = function (name)
local tabname = format("%s_res",name)
pdfetcs[tabname] = { }
if luatexbase.callbacktypes.finish_pdffile then -- ltluatex
local obj = pdf.reserveobj()
- pdfetcs.setpageres(format("%s/%s %i 0 R", pdfetcs.getpageres() or "", name, obj))
+ setpageres(format("%s/%s %i 0 R", getpageres() or "", name, obj))
luatexbase.add_to_callback("finish_pdffile", function()
pdf.immediateobj(obj, format("<<%s>>", tableconcat(pdfetcs[tabname])))
end,
@@ -1753,18 +1708,18 @@ if pdfmode then
pdfetcs.fallback_update_resources = function (name, res)
local tabname = format("%s_res",name)
if not pdfetcs[tabname] then
- pdfetcs.initialize_resources(name)
+ initialize_resources(name)
end
if luatexbase.callbacktypes.finish_pdffile then
local t = pdfetcs[tabname]
t[#t+1] = res
else
- local tpr, n = pdfetcs.getpageres() or "", 0
+ local tpr, n = getpageres() or "", 0
tpr, n = tpr:gsub(format("/%s<<",name), "%1"..res)
if n == 0 then
tpr = format("%s/%s<<%s>>", tpr, name, res)
end
- pdfetcs.setpageres(tpr)
+ setpageres(tpr)
end
end
else
@@ -1774,6 +1729,7 @@ else
"\\special{pdf:obj @MPlibCS<<>>}",
"\\special{pdf:obj @MPlibPt<<>>}",
}
+ pdfetcs.resadded = { }
end
local transparancy_modes = { [0] = "Normal",
@@ -1783,13 +1739,10 @@ local transparancy_modes = { [0] = "Normal",
"Hue", "Saturation", "Color", "Luminosity",
"Compatible",
}
-
-local function update_tr_res(mode,opaq)
- local os = format("<</BM /%s/ca %.3f/CA %.3f/AIS false>>",mode,opaq,opaq)
- local on, new = update_pdfobjs(os)
+local function add_extgs_resources (on, new)
+ local key = format("MPlibTr%s", on)
if new then
- local key = format("MPlibTr%s", on)
- local val = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on)
+ local val = format(pdfetcs.resfmt, on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/ExtGState}{", key, "}{", val, "}"
@@ -1819,22 +1772,29 @@ local function update_tr_res(mode,opaq)
end
if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfextgs) then
texsprint"\\special{pdf:put @resources <</ExtGState @MPlibTr>>}"
+ pdfetcs.resadded.ExtGState = "@MPlibTr"
end
- return on
+ return key
end
-
local function do_preobj_TR(object,prescript)
if object.postscript == "collect" then return end
local opaq = prescript and prescript.tr_transparency
- local tron_no
if opaq then
+ local key, on, os, new
local mode = prescript.tr_alternative or 1
- mode = transparancy_modes[tonumber(mode)]
- tron_no = update_tr_res(mode, opaq)
- start_pdf_code()
- pdf_literalcode("/MPlibTr%i gs",tron_no)
+ mode = transparancy_modes[tonumber(mode)] or mode
+ for i,v in ipairs{ {mode,opaq},{"Normal",1} } do
+ mode, opaq = v[1], v[2]
+ os = format("<</BM /%s/ca %.3f/CA %.3f/AIS false>>",mode,opaq,opaq)
+ on, new = update_pdfobjs(os)
+ key = add_extgs_resources(on,new)
+ if i == 1 then
+ pdf_literalcode("/%s gs",key)
+ else
+ return format("/%s gs",key)
+ end
+ end
end
- return tron_no
end
local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,steps,fractions)
@@ -1848,7 +1808,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
encode[2*i-1] = 0
encode[2*i] = 1
os = fun2fmt:format(domain,tableconcat(ca[i],' '),tableconcat(cb[i],' '))
- list[i] = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s",update_pdfobjs(os))
+ list[i] = format(pdfetcs.resfmt, update_pdfobjs(os))
end
os = tableconcat {
"<</FunctionType 3",
@@ -1860,7 +1820,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
else
os = fun2fmt:format(domain,tableconcat(ca[1],' '),tableconcat(cb[1],' '))
end
- local objref = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s",update_pdfobjs(os))
+ local objref = format(pdfetcs.resfmt, update_pdfobjs(os))
os = tableconcat {
format("<</ShadingType %i", shtype),
format("/ColorSpace %s", colorspace),
@@ -1870,8 +1830,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
}
local on, new = update_pdfobjs(os)
if new then
- local key = format("MPlibSh%s", on)
- local val = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on)
+ local key, val = format("MPlibSh%s", on), format(pdfetcs.resfmt, on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/Shading}{", key, "}{", val, "}"
@@ -1887,6 +1846,7 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
end
if not pdfmode and not pdfmanagement then
texsprint"\\special{pdf:put @resources <</Shading @MPlibSh>>}"
+ pdfetcs.resadded.Shading = "@MPlibSh"
end
return on
end
@@ -1968,15 +1928,14 @@ local function do_preobj_SH(object,prescript)
local script = object.prescript:explode"\13+"
for i=#script,1,-1 do
if script[i]:find"mplib_spotcolor" then
- local name, value
- objref, name = script[i]:match"=(.-):(.+)"
- value = script[i+1]:match"=(.+)"
+ local t, name, value = script[i]:explode"="[2]:explode":"
+ value, objref, name = t[1], t[2], t[3]
if not names[name] then
pos = pos+1
names[name] = pos
names[#names+1] = name
end
- local t = { }
+ t = { }
for j=1,names[name] do t[#t+1] = 0 end
t[#t+1] = value
tableinsert(#ca == #cb and ca or cb, t)
@@ -2032,7 +1991,66 @@ local function do_preobj_SH(object,prescript)
return shade_no
end
-patterns = { }
+pdfetcs.patterns = { }
+local patterns = pdfetcs.patterns
+local function gather_resources (do_pattern, optres)
+ local t = { }
+ local names = {"ExtGState","ColorSpace","Shading"}
+ if do_pattern then
+ names[#names+1] = "Pattern"
+ end
+ if pdfmode then
+ if pdfmanagement then
+ for _,v in ipairs(names) do
+ local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
+ if pp and pp:find"__prop_pair" then
+ t[#t+1] = format("/%s %s 0 R", v, ltx.pdf.object_id("__pdf/Page/Resources/"..v))
+ end
+ end
+ else
+ local res = pdfetcs.getpageres() or ""
+ run_tex_code[[\mplibtmptoks\expandafter{\the\pdfvariable pageresources}]]
+ res = (res .. texgettoks'mplibtmptoks'):explode()
+ res = tableconcat(res," "):explode"/+"
+ for _,v in ipairs(res) do
+ if do_pattern or not v:find"Pattern" and not optres:find(v) then
+ t[#t+1] = "/" .. v
+ end
+ end
+ end
+ else
+ if pdfmanagement then
+ for _,v in ipairs(names) do
+ local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
+ if pp and pp:find"__prop_pair" then
+ run_tex_code {
+ "\\mplibtmptoks\\expanded{{",
+ format("/%s \\csname pdf_object_ref:n\\endcsname{__pdf/Page/Resources/%s}",v,v),
+ "}}",
+ }
+ t[#t+1] = texgettoks'mplibtmptoks'
+ end
+ end
+ elseif is_defined(pdfetcs.pgfextgs) then
+ run_tex_code ({
+ "\\mplibtmptoks\\expanded{{",
+ "\\ifpgf@sys@pdf@extgs@exists /ExtGState @pgfextgs\\fi",
+ "\\ifpgf@sys@pdf@colorspaces@exists /ColorSpace @pgfcolorspaces\\fi",
+ do_pattern and "\\ifpgf@sys@pdf@patterns@exists /Pattern @pgfpatterns \\fi" or "",
+ "}}",
+ }, catat11)
+ t[#t+1] = texgettoks'mplibtmptoks'
+ elseif do_pattern then
+ for _,v in ipairs(names) do
+ local vv = pdfetcs.resadded[v]
+ if vv then
+ t[#t+1] = format("/%s %s", v, vv)
+ end
+ end
+ end
+ end
+ return t
+end
function luamplib.registerpattern ( boxid, name, opts )
local box = texgetbox(boxid)
local wd = format("%.3f",box.width/factor)
@@ -2065,27 +2083,10 @@ function luamplib.registerpattern ( boxid, name, opts )
format("/YStep %s", opts.ystep or hd),
format("/Matrix [%s %s %s]", opts.matrix or "1 0 0 1", opts.xshift or 0, opts.yshift or 0),
}
+ local optres = opts.resources or ""
+ local t = gather_resources(false, optres)
+ optres = optres .. tableconcat(t)
if pdfmode then
- local optres, t = opts.resources or "", { }
- if pdfmanagement then
- for _,v in ipairs{"ExtGState","ColorSpace","Shading"} do
- local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
- if pp and pp:find"__prop_pair" then
- t[#t+1] = format("/%s %s 0 R", v, ltx.pdf.object_id("__pdf/Page/Resources/"..v))
- end
- end
- else
- local res = pdfetcs.getpageres() or ""
- run_tex_code[[\mplibtmptoks\expandafter{\the\pdfvariable pageresources}]]
- res = (res .. texgettoks'mplibtmptoks'):explode()
- res = tableconcat(res," "):explode"/+"
- for _,v in ipairs(res) do
- if not v:find"Pattern" and not optres:find(v) then
- t[#t+1] = "/" .. v
- end
- end
- end
- optres = optres .. tableconcat(t)
if opts.bbox then
attr[#attr+1] = format("/BBox [%s]", opts.bbox)
end
@@ -2094,29 +2095,6 @@ function luamplib.registerpattern ( boxid, name, opts )
else
local objname = "@mplibpattern"..name
local metric = format("bbox %s", opts.bbox or format("0 0 %s %s",wd,hd))
- local optres, t = opts.resources or "", { }
- if pdfmanagement then
- for _,v in ipairs{"ExtGState","ColorSpace","Shading"} do
- local pp = get_macro(format("g__pdfdict_/g__pdf_Core/Page/Resources/%s_prop",v))
- if pp and pp:find"__prop_pair" then
- run_tex_code {
- "\\mplibtmptoks\\expanded{{",
- format("/%s \\csname pdf_object_ref:n\\endcsname{__pdf/Page/Resources/%s}",v,v),
- "}}",
- }
- t[#t+1] = texgettoks'mplibtmptoks'
- end
- end
- elseif is_defined(pdfetcs.pgfextgs) then
- run_tex_code ({
- "\\mplibtmptoks\\expanded{{",
- "\\ifpgf@sys@pdf@extgs@exists /ExtGState @pgfextgs\\fi",
- "\\ifpgf@sys@pdf@colorspaces@exists /ColorSpace @pgfcolorspaces\\fi",
- "}}",
- }, catat11)
- t[#t+1] = texgettoks'mplibtmptoks'
- end
- optres = optres .. tableconcat(t)
texsprint {
[[\ifvmode\nointerlineskip\fi]],
format([[\hbox to0pt{\vbox to0pt{\hsize=\wd %i\vss\noindent]], boxid), -- force horiz mode?
@@ -2135,8 +2113,7 @@ end
local function pattern_colorspace (cs)
local on, new = update_pdfobjs(format("[/Pattern %s]", cs))
if new then
- local key = format("MPlibCS%i",on)
- local val = pdfmode and format("%i 0 R",on) or format("@mplibpdfobj%i",on)
+ local key, val = format("MPlibCS%i",on), format(pdfetcs.resfmt,on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/ColorSpace}{", key, "}{", val, "}"
@@ -2154,6 +2131,7 @@ local function pattern_colorspace (cs)
end
if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfcolorspace) then
texsprint"\\special{pdf:put @resources <</ColorSpace @MPlibCS>>}"
+ pdfetcs.resadded.ColorSpace = "@MPlibCS"
end
return on
end
@@ -2208,10 +2186,233 @@ local function do_preobj_PAT(object, prescript)
end
if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfpattern) then
texsprint"\\special{pdf:put @resources <</Pattern @MPlibPt>>}"
+ pdfetcs.resadded.Pattern = "@MPlibPt"
end
patt.done = true
end
+pdfetcs.fading = { }
+local function do_preobj_FADE (object, prescript)
+ local fd_type = prescript and prescript.mplibfadetype
+ local fd_stop = prescript and prescript.mplibfadestate
+ if not fd_type then
+ return fd_stop -- returns "stop" (if picture) or nil
+ end
+ local bbox = prescript.mplibfadebbox:explode":"
+ local dx, dy = -bbox[1], -bbox[2]
+ local vec = prescript.mplibfadevector; vec = vec and vec:explode":"
+ if not vec then
+ if fd_type == "linear" then
+ vec = {bbox[1], bbox[2], bbox[3], bbox[2]} -- left to right
+ else
+ local centerx, centery = (bbox[1]+bbox[3])/2, (bbox[2]+bbox[4])/2
+ vec = {centerx, centery, centerx, centery} -- center for both circles
+ end
+ end
+ local coords = { vec[1]+dx, vec[2]+dy, vec[3]+dx, vec[4]+dy }
+ if fd_type == "linear" then
+ coords = format("%f %f %f %f", tableunpack(coords))
+ elseif fd_type == "circular" then
+ local width, height = bbox[3]-bbox[1], bbox[4]-bbox[2]
+ local radius = (prescript.mplibfaderadius or "0:"..math.sqrt(width^2+height^2)/2):explode":"
+ tableinsert(coords, 3, radius[1])
+ tableinsert(coords, radius[2])
+ coords = format("%f %f %f %f %f %f", tableunpack(coords))
+ else
+ err("unknown fading method '%s'", fd_type)
+ end
+ bbox = format("0 0 %f %f", bbox[3]+dx, bbox[4]+dy)
+ fd_type = fd_type == "linear" and 2 or 3
+ local opaq = (prescript.mplibfadeopacity or "1:0"):explode":"
+ local on, os, new
+ on = sh_pdfpageresources(fd_type, "0 1", "/DeviceGray", {{opaq[1]}}, {{opaq[2]}}, coords, 1)
+ os = format("<</PatternType 2/Shading %s>>", format(pdfetcs.resfmt, on))
+ on = update_pdfobjs(os)
+ local streamtext = format("q /Pattern cs/MPlibFd%s scn %s re f Q", on, bbox)
+ os = format("<</Pattern<</MPlibFd%s %s>>>>", on, format(pdfetcs.resfmt, on))
+ on = update_pdfobjs(os)
+ local resources = "/Resources " .. format(pdfetcs.resfmt, on)
+ on = update_pdfobjs"<</S/Transparency/CS/DeviceGray>>"
+ local attr = tableconcat{
+ "/Subtype/Form",
+ format("/BBox[%s]", bbox),
+ format("/Matrix[1 0 0 1 %f %f]", -dx, -dy),
+ resources,
+ "/Group ", format(pdfetcs.resfmt, on),
+ }
+ on = update_pdfobjs(attr, streamtext)
+ os = "<</SMask<</S/Luminosity/G " .. format(pdfetcs.resfmt, on) .. ">>>>"
+ on, new = update_pdfobjs(os)
+ local key = add_extgs_resources(on,new)
+ start_pdf_code()
+ pdf_literalcode("/%s gs", key)
+ if fd_stop then return "standalone" end
+ return "start"
+end
+
+pdfetcs.tr_group = { }
+local function do_preobj_GRP (object, prescript)
+ local grstate = prescript and prescript.gr_state
+ if not grstate then return end
+ local trgroup = pdfetcs.tr_group
+ if grstate == "start" then
+ trgroup.isolated, trgroup.knockout = false, false
+ for _,v in ipairs(prescript.gr_type:explode",+") do
+ trgroup[v] = true
+ end
+ local p = object.path
+ trgroup.bbox = {
+ math.min(p[1].x_coord, p[2].x_coord, p[3].x_coord, p[4].x_coord),
+ math.min(p[1].y_coord, p[2].y_coord, p[3].y_coord, p[4].y_coord),
+ math.max(p[1].x_coord, p[2].x_coord, p[3].x_coord, p[4].x_coord),
+ math.max(p[1].y_coord, p[2].y_coord, p[3].y_coord, p[4].y_coord),
+ }
+ put2output[[\begingroup\setbox\mplibscratchbox\hbox\bgroup]]
+ elseif grstate == "stop" then
+ local llx,lly,urx,ury = tableunpack(trgroup.bbox)
+ local grattr = format("/Group<</S/Transparency/I %s/K %s>>",trgroup.isolated,trgroup.knockout)
+ local res = tableconcat(gather_resources(true))
+ put2output(tableconcat{
+ "\\egroup",
+ format("\\wd\\mplibscratchbox %fbp", urx-llx),
+ format("\\ht\\mplibscratchbox %fbp", ury-lly),
+ "\\dp\\mplibscratchbox 0pt",
+ })
+ if pdfmode then
+ put2output(tableconcat{
+ "\\saveboxresource type 2 attr{/Type/XObject/Subtype/Form/FormType 1",
+ format("/BBox[%f %f %f %f]", llx,lly,urx,ury),
+ grattr, "} resources{", res, "}\\mplibscratchbox",
+ [[\setbox\mplibscratchbox\hbox{\useboxresource\lastsavedboxresourceindex}]],
+ [[\wd\mplibscratchbox 0pt\ht\mplibscratchbox 0pt\dp\mplibscratchbox 0pt]],
+ [[\box\mplibscratchbox\endgroup]],
+ })
+ else
+ trgroup.cnt = (trgroup.cnt or 0) + 1
+ local objname = format("@mplibtrgr%s", trgroup.cnt)
+ put2output(tableconcat{
+ "\\special{pdf:bxobj ", objname, " bbox ", format("%f %f %f %f", llx,lly,urx,ury), "}",
+ "\\unhbox\\mplibscratchbox",
+ "\\special{pdf:put @resources <<", res, ">>}",
+ "\\special{pdf:exobj <<", grattr, ">>}",
+ "\\special{pdf:uxobj ", objname, "}\\endgroup",
+ })
+ end
+ end
+ return grstate
+end
+
+local function stop_special_effects(fade,opaq,over)
+ if fade then -- fading
+ stop_pdf_code()
+ end
+ if opaq then -- opacity
+ pdf_literalcode(opaq)
+ end
+ if over then -- color
+ put2output"\\special{pdf:ec}"
+ end
+end
+
+local function getobjects(result,figure,f)
+ return figure:objects()
+end
+
+function luamplib.convert (result, flusher)
+ luamplib.flush(result, flusher)
+ return true -- done
+end
+
+local function pdf_textfigure(font,size,text,width,height,depth)
+ text = text:gsub(".",function(c)
+ return format("\\hbox{\\char%i}",string.byte(c)) -- kerning happens in metapost : false
+ end)
+ put2output("\\mplibtextext{%s}{%f}{%s}{%s}{%s}",font,size,text,0,0)
+end
+
+local bend_tolerance = 131/65536
+
+local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
+
+local function pen_characteristics(object)
+ local t = mplib.pen_info(object)
+ rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
+ divider = sx*sy - rx*ry
+ return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
+end
+
+local function concat(px, py) -- no tx, ty here
+ return (sy*px-ry*py)/divider,(sx*py-rx*px)/divider
+end
+
+local function curved(ith,pth)
+ local d = pth.left_x - ith.right_x
+ if abs(ith.right_x - ith.x_coord - d) <= bend_tolerance and abs(pth.x_coord - pth.left_x - d) <= bend_tolerance then
+ d = pth.left_y - ith.right_y
+ if abs(ith.right_y - ith.y_coord - d) <= bend_tolerance and abs(pth.y_coord - pth.left_y - d) <= bend_tolerance then
+ return false
+ end
+ end
+ return true
+end
+
+local function flushnormalpath(path,open)
+ local pth, ith
+ for i=1,#path do
+ pth = path[i]
+ if not ith then
+ pdf_literalcode("%f %f m",pth.x_coord,pth.y_coord)
+ elseif curved(ith,pth) then
+ pdf_literalcode("%f %f %f %f %f %f c",ith.right_x,ith.right_y,pth.left_x,pth.left_y,pth.x_coord,pth.y_coord)
+ else
+ pdf_literalcode("%f %f l",pth.x_coord,pth.y_coord)
+ end
+ ith = pth
+ end
+ if not open then
+ local one = path[1]
+ if curved(pth,one) then
+ pdf_literalcode("%f %f %f %f %f %f c",pth.right_x,pth.right_y,one.left_x,one.left_y,one.x_coord,one.y_coord )
+ else
+ pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
+ end
+ elseif #path == 1 then -- special case .. draw point
+ local one = path[1]
+ pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
+ end
+end
+
+local function flushconcatpath(path,open)
+ pdf_literalcode("%f %f %f %f %f %f cm", sx, rx, ry, sy, tx ,ty)
+ local pth, ith
+ for i=1,#path do
+ pth = path[i]
+ if not ith then
+ pdf_literalcode("%f %f m",concat(pth.x_coord,pth.y_coord))
+ elseif curved(ith,pth) then
+ local a, b = concat(ith.right_x,ith.right_y)
+ local c, d = concat(pth.left_x,pth.left_y)
+ pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(pth.x_coord, pth.y_coord))
+ else
+ pdf_literalcode("%f %f l",concat(pth.x_coord, pth.y_coord))
+ end
+ ith = pth
+ end
+ if not open then
+ local one = path[1]
+ if curved(pth,one) then
+ local a, b = concat(pth.right_x,pth.right_y)
+ local c, d = concat(one.left_x,one.left_y)
+ pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(one.x_coord, one.y_coord))
+ else
+ pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+ end
+ elseif #path == 1 then -- special case .. draw point
+ local one = path[1]
+ pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+ end
+end
+
function luamplib.flush (result,flusher)
if result then
local figures = result.fig
@@ -2241,6 +2442,8 @@ function luamplib.flush (result,flusher)
prescript = prescript and script2table(prescript) -- prescript is now a table
local cr_over = do_preobj_CR(object,prescript) -- color
local tr_opaq = do_preobj_TR(object,prescript) -- opacity
+ local fading_ = do_preobj_FADE(object,prescript) -- fading
+ local trgroup = do_preobj_GRP(object,prescript) -- transparency group
if prescript and prescript.mplibtexboxid then
put_tex_boxes(object,prescript)
elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then --skip
@@ -2262,7 +2465,7 @@ function luamplib.flush (result,flusher)
pdf_literalcode("%f %f %f %f %f %f cm",ot[3],ot[4],ot[5],ot[6],ot[1],ot[2])
pdf_textfigure(object.font,object.dsize,object.text,object.width,object.height,object.depth)
stop_pdf_code()
- else
+ elseif not trgroup and fading_ ~= "stop" then
local evenodd, collect, both = false, false, false
local postscript = object.postscript
if not object.istext then
@@ -2286,8 +2489,6 @@ function luamplib.flush (result,flusher)
savedhtap[#savedhtap+1] = object.htap or false
end
else
- local shade_no = do_preobj_SH(object,prescript) -- shading
- local pattern_ = do_preobj_PAT(object,prescript) -- pattern
local ml = object.miterlimit
if ml and ml ~= miterlimit then
miterlimit = ml
@@ -2314,6 +2515,8 @@ function luamplib.flush (result,flusher)
pdf_literalcode("[] 0 d")
dashed = false
end
+ local shade_no = do_preobj_SH(object,prescript) -- shading
+ local pattern_ = do_preobj_PAT(object,prescript) -- pattern
local path = object.path
local transformed, penwidth = false, 1
local open = path and path[1].left_type and path[#path].right_type
@@ -2404,11 +2607,21 @@ function luamplib.flush (result,flusher)
end
end
end
- if tr_opaq then -- opacity
- stop_pdf_code()
+ if fading_ == "start" then
+ pdfetcs.fading.specialeffects = {fading_, tr_opaq, cr_over}
+ elseif trgroup == "start" then
+ pdfetcs.tr_group.specialeffects = {fading_, tr_opaq, cr_over}
+ elseif fading_ == "stop" then
+ local se = pdfetcs.fading.specialeffects
+ if se then stop_special_effects(se[1], se[2], se[3]) end
+ elseif trgroup == "stop" then
+ local se = pdfetcs.tr_group.specialeffects
+ if se then stop_special_effects(se[1], se[2], se[3]) end
+ else
+ stop_special_effects(fading_, tr_opaq, cr_over)
end
- if cr_over then -- color
- put2output"\\special{pdf:ec}"
+ if fading_ or trgroup then -- extgs resetted
+ miterlimit, linecap, linejoin, dashed = -1, -1, -1, false
end
end
end
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index 3d20838d3f0..f74e1b5939a 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
@@ -14,7 +14,7 @@
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2024/06/21 v2.32.3 mplib package for LuaTeX]
+ [2024/07/17 v2.34.0 mplib package for LuaTeX]
\ifx\newluafunction\@undefined
\input ltluatex
\fi
@@ -100,16 +100,16 @@
\long\def\mplibdomainmpfig#1\endmpfig{%
\endgroup
\directlua{
- local legacy = luamplib.legacy_verbatimtex
+ local legacy = luamplib.legacyverbatimtex
local everympfig = luamplib.everymplib["\mpfiginstancename"] or ""
local everyendmpfig = luamplib.everyendmplib["\mpfiginstancename"] or ""
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
luamplib.everymplib["\mpfiginstancename"] = ""
luamplib.everyendmplib["\mpfiginstancename"] = ""
luamplib.process_mplibcode(
"beginfig(0) "..everympfig.." "..[===[\unexpanded{#1}]===].." "..everyendmpfig.." endfig;",
"\mpfiginstancename")
- luamplib.legacy_verbatimtex = legacy
+ luamplib.legacyverbatimtex = legacy
luamplib.everymplib["\mpfiginstancename"] = everympfig
luamplib.everyendmplib["\mpfiginstancename"] = everyendmpfig
}%
@@ -123,14 +123,14 @@
\long\def\mplibdoprempfig#1\endmpfig{%
\endgroup
\directlua{
- local legacy = luamplib.legacy_verbatimtex
+ local legacy = luamplib.legacyverbatimtex
local everympfig = luamplib.everymplib["\mpfiginstancename"]
local everyendmpfig = luamplib.everyendmplib["\mpfiginstancename"]
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
luamplib.everymplib["\mpfiginstancename"] = ""
luamplib.everyendmplib["\mpfiginstancename"] = ""
luamplib.process_mplibcode([===[\unexpanded{#1}]===],"\mpfiginstancename")
- luamplib.legacy_verbatimtex = legacy
+ luamplib.legacyverbatimtex = legacy
luamplib.everymplib["\mpfiginstancename"] = everympfig
luamplib.everyendmplib["\mpfiginstancename"] = everyendmpfig
}%
@@ -197,9 +197,9 @@
\def\mpliblegacybehavior#1{\directlua{
local s = string.lower("#1")
if s == "enable" or s == "true" or s == "yes" then
- luamplib.legacy_verbatimtex = true
+ luamplib.legacyverbatimtex = true
else
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
end
}}
\def\mplibverbatim#1{\directlua{
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
index 76ebf8716c8..6ef3ff1751e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-27c}[2024-02-19 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-27c}[2024-05-27 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -359,10 +359,24 @@
\setfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
+\DeclareDocumentCommand \providejfontfamily { m O{} m O{} } {
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+ \providefontfamily #1 [#2,#4] {#3}
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
\newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
}
+\DeclareDocumentCommand \renewjfontface { m O{} m O{} } {
+ \renewjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \setjfontface { m O{} m O{} } {
+ \setjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \providejfontface { m O{} m O{} } {
+ \providejfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
\prop_new:N \l__ltj_fontspec_tmp_prop
\prop_new:N \g__ltj_fontspec_fontopts_prop
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty
index 1415cee1274..51af33447ce 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-29c}[2024-05-05 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-29c}[2024-05-27 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -359,10 +359,24 @@
\setfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
+\DeclareDocumentCommand \providejfontfamily { m O{} m O{} } {
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+ \providefontfamily #1 [#2,#4] {#3}
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
\newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
}
+\DeclareDocumentCommand \renewjfontface { m O{} m O{} } {
+ \renewjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \setjfontface { m O{} m O{} } {
+ \setjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \providejfontface { m O{} m O{} } {
+ \providejfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
\prop_new:N \l__ltj_fontspec_tmp_prop
\prop_new:N \g__ltj_fontspec_fontopts_prop
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty
index e763d91ad7d..02a79ad6ca2 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-29e}[2024-05-14 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-29e}[2024-05-27 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -359,10 +359,24 @@
\setfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
+\DeclareDocumentCommand \providejfontfamily { m O{} m O{} } {
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+ \providefontfamily #1 [#2,#4] {#3}
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
\newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
}
+\DeclareDocumentCommand \renewjfontface { m O{} m O{} } {
+ \renewjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \setjfontface { m O{} m O{} } {
+ \setjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \providejfontface { m O{} m O{} } {
+ \providejfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
\prop_new:N \l__ltj_fontspec_tmp_prop
\prop_new:N \g__ltj_fontspec_fontopts_prop
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
index a83c9305c93..69e709f02ee 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2022-08-24 v1.2k-ltj-14 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2024-05-16 v1.2k-ltj-15 Macros for vertical writing]
\RequirePackage{luatexja}
\newcount\ltj@ext@dir
\let\ltj@lltjext@orig@tabular=\tabular
@@ -541,17 +541,11 @@
\else \let\box@dir\utod
\fi
\fi
-\ifltj@ltfilehook@avail % LaTeX2e >= 2020-10-01
\@defaultunitsset\@picht{#3}\unitlength
\@defaultunitsset\@picwd{#2}\unitlength
\setbox\@picbox\hbox to\@picwd\bgroup\box@dir
\@defaultunitsset\@tempdimc{#4}\unitlength\hskip-\@tempdimc
\@defaultunitsset\@tempdimc{#5}\unitlength\lower\@tempdimc\hbox\bgroup
-\else % <= 2020-02-02
- \@picwd=#2\unitlength \@picht=#3\unitlength
- \setbox\@picbox\hbox to\@picwd\bgroup\box@dir
- \hskip-#4\unitlength\lower#5\unitlength\hbox\bgroup
-\fi
\ltj@@pic@reset@blshift
\ignorespaces}
\def\endpicture{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
index 7e091d161d1..9f6e4d0a365 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
@@ -12,45 +12,14 @@
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2022-10-15 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2024-05-16 LaTeX support of LuaTeX-ja]
\endlinechar=13
%%% LaTeX version detection
-\newif\ifltj@ltfilehook@avail
-\@ifl@t@r\fmtversion{2020-10-01}{%
- \@ifl@t@r\fmtversion{2020-10-02}%
- {\ltj@ltfilehook@availtrue}
- {%
- \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi
- \else\ltj@ltfilehook@availtrue\fi
- }%
-}{}
-\@ifl@t@r\fmtversion{2021-05-01}{\count@=1 }{\count@=0 }
-\ifnum \count@<1
-%%%% \shipout
- \newluafunction\ltj@@lua@shipout@inner
- \directlua{
- local t = lua.get_functions_table()
- local getbox, setbox = tex.getbox, tex.setbox
- local shipout_lthook = luatexja.direction.shipout_lthook
- t[\the\ltj@@lua@shipout@inner]=function ()
- local a = shipout_lthook(getbox(\the\ltj@afbox))
- if a then setbox(\the\ltj@afbox, a) end
- end
- }
- \protected\luadef\ltj@@lua@shipout\ltj@@lua@shipout@inner
- \def\ltj@shipout@{\ltj@@lua@shipout\primitive\shipout\box\ltj@afbox}%
- \protected\def\ltj@shipout{\ltj@afterbox\ltj@shipout@}
- \ifprimitive\shipout\let\shipout\ltj@shipout\fi
- \ifcsname tex_shipout:D\endcsname
- \expandafter\let\csname tex_shipout:D\endcsname\ltj@shipout
- \fi
-\else
- \directlua{%
- luatexbase.add_to_callback('pre_shipout_filter',luatexja.direction.shipout_lthook, 'ltj.direction', 1)
- }
-\fi
+\directlua{%
+ luatexbase.add_to_callback('pre_shipout_filter',luatexja.direction.shipout_lthook, 'ltj.direction', 1)
+}
%%% patch for LaTeX
\usepackage{lltjfont}
@@ -59,36 +28,30 @@
\RequirePackage{lltjp-atbegshi}
%%% patching commands
-\ifltj@ltfilehook@avail
- %% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code>
- %% no-starred version: do nothing if the <package> is loaded
- %% starred version: do <code> right away if the <package> is loaded
- \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage}
- \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage}
- \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15
- \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}}
- \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}}
- \long\def\@@ltj@ExecuteAfterPackage#1#2{%
- \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}%
- }
- \long\def\@@ltj@ExecuteBeforePackage#1#2{%
- \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}%
- }
- }{
- \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
- \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
- \long\def\@@ltj@ExecuteAfterPackage@star#1#2{%
- \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
- }
- \long\def\@@ltj@ExecuteBeforePackage@star#1#2{%
- \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
- }
+%% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code>
+%% no-starred version: do nothing if the <package> is loaded
+%% starred version: do <code> right away if the <package> is loaded
+\def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage}
+\def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage}
+\@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15
+ \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}}
+ \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}}
+ \long\def\@@ltj@ExecuteAfterPackage#1#2{%
+ \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}%
}
-\else
- \RequirePackage{filehook}
- \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile
- \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile
-\fi
+ \long\def\@@ltj@ExecuteBeforePackage#1#2{%
+ \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}%
+ }
+}{
+ \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+ \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+ \long\def\@@ltj@ExecuteAfterPackage@star#1#2{%
+ \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
+ }
+ \long\def\@@ltj@ExecuteBeforePackage@star#1#2{%
+ \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
+ }
+}
\def\ltj@pkgpatch@im#1{\@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%]
\def\ltj@pkgpatch@im@#1[#2]{\ltj@ExecuteAfterPackage*{#1}{\ltj@pkgpatch@im@@{#2}}}
\def\ltj@pkgpatch@im@@#1{%
@@ -101,11 +64,7 @@
}
\def\ltj@pkgpatch#1{\@ifnextchar[{\ltj@pkgpatch@{#1}}{\ltj@pkgpatch@{#1}[lltjp-#1]}}%]
-\ifltj@ltfilehook@avail
- \def\ltj@pkgpatch@@{\AddToHook{begindocument/before}[luatexja.autopatch]}
-\else
- \def\ltj@pkgpatch@@{\gpreto\@begindocumenthook}
-\fi
+\def\ltj@pkgpatch@@{\AddToHook{begindocument/before}[luatexja.autopatch]}
\def\ltj@pkgpatch@#1[#2]{%
\ltj@pkgpatch@@{%
\@ifpackageloaded{#1}{\@ifpackageloaded{#2}{}{\RequirePackage{#2}}}{}%
@@ -121,18 +80,12 @@
\ltj@pkgpatch{tascmac}
\ltj@pkgpatch{ascmac}[lltjp-tascmac]
\ltj@pkgpatch@im{stfloats}
-\ifltj@ltfilehook@avail\else
- \ltj@pkgpatch{preview} %% at \begin{document}
- % (preview package has delayed option)
-\fi
\ltj@pkgpatch{array} %% at \begin{document}
\ltj@pkgpatch{collcell} %% at \begin{document}
\ltj@pkgpatch@im{unicode-math}
\ltj@pkgpatch@im{siunitx}
\ltj@pkgpatch@im{microtype}
-\ifltj@ltfilehook@avail\else\ltj@pkgpatch@im{everyshi}\fi
-
\RequirePackage{lltjp-geometry}
\ltj@ExecuteBeforePackage{breqn}{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
index 43ecac806c2..8f5632be4e3 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
@@ -156,16 +156,17 @@ function set_box_stack_level(head, mode)
if ltjs.list_dir == dir_tate then
for p in traverse_glyph(to_direct(head)) do
if getlang(p)==lang_ja and has_attr(p, attr_icflag, 0) then
- local pf = ltjf_replace_altfont(attr_curtfnt, getchar(p), p)
+ local pc = ltjs_orig_char_table[p] or getchar(p)
+ local pf = ltjf_replace_altfont(attr_curtfnt, pc, p)
if ltjf_font_metric_table[pf].vert_activated then
- local pc = ltjf_font_metric_table[pf].vform[pc]; if pc then setchar(p, pc) end
+ pc = ltjf_font_metric_table[pf].vform[pc]; if pc then setchar(p, pc) end
end
end
end
else
for p in traverse_glyph(to_direct(head)) do
if getlang(p)==lang_ja and has_attr(p, attr_icflag, 0) then
- ltjf_replace_altfont(attr_curjfnt, getchar(p), p)
+ ltjf_replace_altfont(attr_curjfnt, ltjs_orig_char_table[p] or getchar(p), p)
end
end
end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
index 88352dd5b24..2b65eb5e5c7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
@@ -15,7 +15,7 @@ do
end
local cidfont_data = {}
local cache_chars = {}
-local cache_ver = 13
+local cache_ver = 14
local identifiers = fonts.hashes.identifiers
local cid_reg, cid_order, cid_supp, cid_name
@@ -147,7 +147,7 @@ do
descender = 655360*0.12,
},
embedding = "no", cache = "yes", factor = 0, hfactor = 0, vfactor = 0,
- tounicode = 1,
+ tounicode = 1, filename="",
properties = { language = "dflt", script = "dflt" },
}
cidfont_data[cid_name] = k
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index a54ede6758b..f9ae793bb40 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -27,7 +27,7 @@
\newif\ifltj@disablejfam
%%%% VERSION
-\def\LuaTeXjaversion{20240514.0}
+\def\LuaTeXjaversion{20240714.0}
%% Check if LaTeX is used.
\begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index bb63ac68774..00c858e3493 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2022-01-23 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2024-05-16 Default font settings of LuaTeX-ja]
\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi
\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi
@@ -18,13 +18,8 @@
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
\kanjifamily{mc}
-\ifnum\ltj@@latex@plv<1500 % <=2020-10-01
- \kanjiseries{m}
- \kanjishape{n}
-\else % >=2021-06-01
- \def\k@series{m}
- \def\k@shape{n}
-\fi
+\def\k@series{m}
+\def\k@shape{n}
\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY3}{}{}
\DeclareKanjiSubstitution{JY3}{mc}{m}{n}
@@ -37,12 +32,7 @@
\newcommand\kanjiencodingdefault{JY3}
\newcommand\kanjifamilydefault{\mcdefault}
\newcommand\kanjiseriesdefault{\mddefault}
-\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
- %% LaTeX 2020-02-02
- \newcommand\kanjishapedefault{\shapedefault}
-\else%% LaTeX 2019-10-01
- \newcommand\kanjishapedefault{\updefault}
-\fi
+\newcommand\kanjishapedefault{\shapedefault}
\DeclareKanjiFamily{JY3}{mc}{}
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
@@ -90,57 +80,36 @@
\DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
\fi
-\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
-%%%% LaTeX >= 2020-02-02
\edef\bfseries@mc{\bfdefault}
\edef\bfseries@gt{\bfdefault}
\def\bfseries@jtt{\bfseries@mc}
\edef\mdseries@mc{\mddefault}
\edef\mdseries@gt{\mddefault}
\def\mdseries@jtt{\mdseries@mc}
-\fi
\newif\if@ltj@match@family
\@ltj@match@familyfalse
\def\verbatim@font{\normalfont\ttfamily\kanjifamily\jttdefault\selectfont}
-\def\@ltj@hook@family#1#2{% #1: csname #2: contents
- \ifltj@ltfilehook@avail % LaTeX 2020-10-01
- \AddToHook{#1}{#2}%
- \else\ifcsname @#1hook\endcsname % LaTeX 2020-02-02
- \csappto{@#1hook}{#2}%
- \else % LaTeX 2019-10-01
- \ifcsname #1 \endcsname
- \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
- \else
- \PackageWarningNoLine{luatexja}{%
- Patching to \expandafter\string\csname #1\endcsname\space failed%
- }%
- \fi
- \fi\fi
-}
-\@ltj@hook@family{rmfamily}{%
+\AddToHook{rmfamily}{%
\if@ltj@match@family
\prepare@family@series@update@kanji{mc}\mcdefault
\fi
}
-\@ltj@hook@family{sffamily}{%
+\AddToHook{sffamily}{%
\if@ltj@match@family
\prepare@family@series@update@kanji{gt}\gtdefault
\fi
}
-\@ltj@hook@family{ttfamily}{%
+\AddToHook{ttfamily}{%
\if@ltj@match@family
\prepare@family@series@update@kanji{jtt}\jttdefault
\fi
}
-\let\@ltj@hook@family\@undefined
-\ifltj@ltfilehook@avail % 2020-10-01
- \expandafter\def\expandafter\kanjiseriesdefault
- \expandafter{\kanjiseriesdefault\@empty}
- \let\kanjiseriesdefault@kernel\kanjiseriesdefault
-\fi
+\expandafter\def\expandafter\kanjiseriesdefault
+ \expandafter{\kanjiseriesdefault\@empty}
+\let\kanjiseriesdefault@kernel\kanjiseriesdefault
%%% \eminnershape
\expandafter\patchcmd\csname em \endcsname{\itshape}{\gtfamily\itshape}{}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 2efc9435ab8..52ac44d5ccb 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
@@ -3,31 +3,10 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2023-04-13 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2023-05-16 Patch to NFSS2 for LuaTeX-ja]
%%%%%%%% LaTeX2e version detection
-\newcount\ltj@@latex@plv \ltj@@latex@plv=-1
-\ifltj@ltfilehook@avail
-\ExplSyntaxOn
- \cs_if_exist:NTF \__shipout_execute_main_cont:Nnnn
- {\ltj@@latex@plv=1500}% 2021-06-01
- {\ifnum\patch@level>2\relax \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}% 2020-10-01
-\ExplSyntaxOff
-\else\ifdefined\@rmfamilyhook % 2020-02-02
- \ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2
- \@latex@error
- {Please update LaTeX2e!^^J\space\space
- At least LaTeX2e 2020-02-02 patch level 3 is required}%
- {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
- \else
- \ltj@@latex@plv=300
- \unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
- \ltj@@latex@plv=501
- \else\unless\ifx\series@maybe@drop@one@m\@undefined % patch level 5
- \ltj@@latex@plv=500
- \fi\fi
- \fi
-\fi\fi
+\newcount\ltj@@latex@plv \ltj@@latex@plv=1500
%% patching \DeclareTextComposite
\def\ltj@chardef@text@cmd#1{%
@@ -400,59 +379,7 @@
\directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}%
}%
\fi}
-\ifnum\ltj@@latex@plv<1500 % <=2020-10-01
-\protected\def\ltj@selectfont@patch{%
- \ltj@@start@time@measure{selectfont}%
- \let\tmp@error@fontshape\error@fontshape
- \let\error@fontshape\error@kfontshape
- \ltj@@is@kyenc{\k@encoding}\ifin@%
- \let\cy@encoding\k@encoding
- \ensure@KanjiEncodingPair{t}%
- \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}%
- \else
- \ltj@@is@ktenc{\k@encoding}\ifin@%
- \let\ct@encoding\k@encoding
- \ensure@KanjiEncodingPair{y}%
- \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}%
- \else
- \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
- \fi
- \fi
- \global\let\ltj@afont@name=\font@name
- \ltj@selectfont@tate\ltj@selectfont@yoko
-%
- \edef\tmp@item{{\k@encoding}}\expandafter\def\expandafter\k@encoding\tmp@item
- \kenc@update
- \global\let\font@name=\ltj@afont@name
- \let\error@fontshape\tmp@error@fontshape
- \if@knjcmd \@knjcmdfalse
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax
- \else
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\selectfont
- % 警告: 再び \selectfont を呼んでいる.無限ループの可能性あり
- \fi
- \else
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\selectfont
- % 警告: 再び \selectfont を呼んでいる.無限ループの可能性あり
- \fi
- \fi
- \global\let\font@name=\ltj@afont@name
- \ltj@@stop@time@measure{selectfont}%
-}
-\RequirePackage{everysel}
-\let\ltj@@EverySelectfont@Init=\@EverySelectfont@Init
-\expandafter\expandafter\expandafter\let
-\expandafter\expandafter\csname ltj@@orig@selectfont\endcsname\csname selectfont\space\endcsname
-\@EverySelectfont@Init% for LaTeX2e <=2020-10-01
-\def\@EverySelectfont@Init{%
- \expandafter\let\csname selectfont\space \endcsname \ltj@@orig@selectfont
- \ltj@@EverySelectfont@Init
-}
-\EverySelectfont{\ltj@selectfont@patch}
-\else % LaTeX2e >=2021-06-01
+
\AddToHook{selectfont}[luatexja]{%
\ltj@@start@time@measure{selectfont}%
\ifx\delayed@k@adjustment\@empty
@@ -514,7 +441,6 @@
\global\let\font@name=\ltj@afont@name
\ltj@@stop@time@measure{selectfont}%
}
-\fi
\bgroup
\def\ltj@@dir@patch#1#2#3{%
@@ -721,8 +647,6 @@
}
%%%%%%
-\ifnum\ltj@@latex@plv>0
-%%%% LaTeX >= 2020-02-02
\newif\if@shape@roman@kanji
\def\merge@kanji@series#1{%
@@ -740,76 +664,11 @@
\@nil
}
-\ifnum\ltj@@latex@plv>500 % !!! pl5 + develop
\def\set@target@series@kanji#1{%
\edef\k@series{#1}%
\series@maybe@drop@one@m\k@series\k@series
}
-\else\ifnum\ltj@@latex@plv>300 % !!! pl5
- \def\set@target@series@kanji#1{%
- \edef\k@series{#1}%
- \expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series
- }
-\else % !!! pl 3, 4
- \def\set@target@series@kanji#1{%
- \edef\k@series{#1}%
- \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}%
- }
-\fi\fi
-\ifnum\ltj@@latex@plv<1500% <=2020-10-01
-\def\merge@kanji@series@#1#2#3\@nil{%
- \def\reserved@a{#3}%
- \ifx\reserved@a\@empty
- \set@target@series@kanji{#2}%
- \else
- \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
- \maybe@load@fontshape\endgroup
- \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}%
- \ifcsname \reserved@a \endcsname
- \set@target@series@kanji{#1}%
- \else
- \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname
- \set@target@series@kanji{#2}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \else
- \set@target@series@kanji{#3}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \fi
- \fi
- \fi
-}
-\def\merge@kanji@shape@#1#2#3\@nil{%
- \def\reserved@a{#3}%
- \ifx\reserved@a\@empty
- \if@shape@roman@kanji
- \set@safe@kanji@shape{#2}{}%
- \else
- \edef\k@shape{#2}%
- \fi
- \else
- \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
- \maybe@load@fontshape\endgroup
- \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}%
- \ifcsname \reserved@a\endcsname
- \edef\k@shape{#1}%
- \else
- \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname
- \edef\k@shape{#2}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \else
- \if@shape@roman@kanji
- \set@safe@kanji@shape{#3}%
- {{\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}}%
- \else
- \edef\k@shape{#3}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \fi
- \fi
- \fi
- \fi
-}
-\else % >=2021-06-01
\def\merge@kanji@series@#1#2#3\@nil{%
\def\reserved@a{#3}%
\ifx\reserved@a\@empty
@@ -892,20 +751,8 @@
\fi
}
\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution
-\fi
\newif\if@forced@series@kanji
-\ifnum\ltj@@latex@plv=300 % 2020-02-02 pl3, 4
- \DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}}
- \DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}}
- \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
- \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
-\else\ifnum\ltj@@latex@plv<1500% >=2020-02-02 pl5 and <=2020-10-01
- \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
- \DeclareRobustCommand\kanjiseries[1]{\@forced@series@kanjifalse\merge@kanji@series{#1}}
- \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
- \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@series@kanjitrue\edef\k@series{#1}}
-\else% >=2021-06-01
\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse
\expandafter\def\expandafter\delayed@f@adjustment\expandafter
{\delayed@f@adjustment\delayed@merge@font@series{#1}}}
@@ -919,22 +766,9 @@
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\edef\k@series{#1}}}
\let\delayed@k@adjustment\@empty
-\fi\fi
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}%
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}%
-\ifnum\ltj@@latex@plv<1500% <=2020-10-01
- \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}}
- \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}}
- \DeclareRobustCommand\fontshape[1]{%
- \@shape@roman@kanjitrue
- \merge@font@shape{#1}\merge@kanji@shape{#1}%
- \@shape@roman@kanjifalse
- }
- \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}}
- \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}}
- \DeclareRobustCommand\fontshapeforce[1]{\set@safe@kanji@shape{#1}{}\romanshapeforce{#1}}
-\else% >=2021-06-01
\DeclareRobustCommand\romanshape[1]{%
\expandafter\def\expandafter\delayed@f@adjustment\expandafter
{\delayed@f@adjustment\delayed@merge@font@shape{#1}}}
@@ -956,9 +790,6 @@
\romanshapeforce{#1}%
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}}
-\fi
-\ifnum\ltj@@latex@plv>1499
-%%%% LaTeX >= 2021-06-01
\DeclareRobustCommand\usekanji[4]{%
\kanjiencoding{#1}\edef\k@family{#2}%
\set@target@series@kanji{#3}\edef\k@shape{#4}%
@@ -969,42 +800,6 @@
\set@target@series{#3}\edef\f@shape{#4}%
\let\delayed@f@adjustment\@empty
\selectfont\ignorespaces}
-\else\ifnum\ltj@@latex@plv>1000
-%%%% 2021-10-01 PL3 <= LaTeX < 2021-06-01
-\DeclareRobustCommand\usekanji[4]{%
- \kanjiencoding{#1}\edef\k@family{#2}%
- \set@target@series@kanji{#3}\edef\k@shape{#4}%
- \selectfont\ignorespaces}
-\DeclareRobustCommand\useroman[4]{%
- \romanencoding{#1}\edef\f@family{#2}%
- \set@target@series{#3}\edef\f@shape{#4}%
- \selectfont\ignorespaces}
-\else
-%%%% 2020-10-01 <= LaTeX < 2020-10-01 PL3
-\DeclareRobustCommand\usekanji[4]{%
- \kanjiencoding{#1}\edef\k@family{#2}\edef\k@series{#3}\edef\k@shape{#4}%
- \selectfont\ignorespaces}
-\DeclareRobustCommand\useroman[4]{%
- \romanencoding{#1}\edef\f@family{#2}\edef\f@series{#3}\edef\f@shape{#4}%
- \selectfont\ignorespaces}
-\fi\fi
-%%%% LaTeX >= 2020-02-02 END
-\else
-%%%% LaTeX 2019-10-01
-\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
-\DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}}
-\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
-\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}}
-\DeclareRobustCommand\fontshape[1]{\set@safe@kanji@shape{#1}{}\romanshape{#1}}
-\DeclareRobustCommand\usekanji[4]{%
- \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
- \selectfont\ignorespaces}
-\DeclareRobustCommand\useroman[4]{%
- \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
- \selectfont\ignorespaces}
-%%%% LaTeX 2019-10-01 END
-\fi
%%%%
\def\set@safe@kanji@shape#1#2{%
@@ -1026,8 +821,6 @@
\else\useroman{#1}{#2}{#3}{#4}%
\fi}
-\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
-%%%% LaTeX >= 2020-02-02
\let\prepare@family@series@update@kanji=\prepare@family@series@update
\patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{}
\patchcmd\prepare@family@series@update@kanji{\if@forced@series}{\if@forced@series@kanji}{}{}
@@ -1049,34 +842,16 @@
\patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{}
\def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
-\def\@ltj@hook@series@default#1#2#3{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{#1/defaults}{#2}%
- \else\ifcsname @set#1defaultshook\endcsname %after 2020-04-07
- \expandafter\g@addto@macro\csname @set#1defaultshook\endcsname{#2}%
- \else % 2020-02-02
- \expandafter\patchcmd\csname #1 \endcsname{#3}{#3#2}{}{}%
- \fi\fi
-}
-\@ltj@hook@series@default{bfseries}{%
+\AddToHook{bfseries/defaults}{%
\let\bfseries@mc\bfdef@ult
\let\bfseries@gt\bfdef@ult
\let\bfseries@jtt\bfdef@ult
-}{%
- \let\bfseries@rm\bfdef@ult
- \let\bfseries@sf\bfdef@ult
- \let\bfseries@tt\bfdef@ult
}
-\@ltj@hook@series@default{mdseries}{%
+\AddToHook{mdseries/defaults}{%
\let\mdseries@mc\mddef@ult
\let\mdseries@gt\mddef@ult
\let\mdseries@jtt\mddef@ult
-}{%
- \let\mdseries@rm\mddef@ult
- \let\mdseries@sf\mddef@ult
- \let\mdseries@tt\mddef@ult
}
-\let\@ltj@hook@series@default\@undefined
\expandafter\patchcmd\csname bfseries \endcsname{%
\ifx\f@family\rmdef@ult \fontseries\bfseries@rm
@@ -1105,105 +880,41 @@
\fi\fi\fi
}{}{}
-\def\@ltj@hook@series#1#2{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{#1}{#2}%
- \else % 2020-02-02
- \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
- \fi
-}
-\@ltj@hook@series{bfseries}{%
+\AddToHook{bfseries}{%
\ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc
\else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt
\else\ifx\k@family\jttdef@ult\kanjiseries\bfseries@jtt
\else \kanjiseries\bfdefault
\fi\fi\fi
}
-\@ltj@hook@series{mdseries}{%
+\AddToHook{mdseries}{%
\ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc
\else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt
\else\ifx\k@family\jttdef@ult\kanjiseries\mdseries@jtt
\else \kanjiseries\mddefault
\fi\fi\fi
}
-\let\@ltj@hook@series\@undefined
-\def\@ltj@hook@efd#1#2{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{expand@font@defaults}{#1}%
- \else\ifdefined\@expandfontdefaultshook %after 2020-04-07
- \g@addto@macro\@expandfontdefaultshook{#1#2}%
- \else % 2020-02-02
- \appto\expand@font@defaults{#1#2}%
- \fi\fi
-}
-\@ltj@hook@efd{%
+\AddToHook{expand@font@defaults}{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
\edef\jttdef@ult{\jttdefault}%
-}{\edef\kanjidef@ult{\kanjifamilydefault}}
-\let\@ltj@hook@efd\@undefined
+ \edef\kanjidef@ult{\kanjifamilydefault}}
-\ifltj@ltfilehook@avail % 2020-10-01
- \appto\init@series@setup{%
- \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
- \mdseries
- \let\kanjiseriesdefault\k@series
- \fi
- }
-\else
- \appto\init@series@setup{%
- \ifx\kanjidef@ult\mcdef@ult \mcfamily
- \else\ifx\kanjidef@ult\gtdef@ult \gtfamily
- \else\ifx\kanjidef@ult\jttdef@ult \jttfamily
- \fi\fi\fi
- }
-\fi
-
-\def\@ltj@hook@dfh#1{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{normalfont}{#1}%
- \else\ifdefined\@defaultfamilyhook
- \g@addto@macro\@defaultfamilyhook{#1}%
- \else % 2020-02-02
- \expandafter\patchcmd\csname normalfont \endcsname{\selectfont}{#1\selectfont}{}{}%
- \let\reset@font\normalfont
- \fi\fi
+\appto\init@series@setup{%
+ \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
+ \mdseries
+ \let\kanjiseriesdefault\k@series
+ \fi
}
-\ifnum\ltj@@latex@plv>1499
-\@ltj@hook@dfh{%
+\AddToHook{normalfont}{%
\kanjiencoding{\kanjiencodingdefault}%
\edef\k@family{\kanjifamilydefault}%
\edef\k@series{\kanjiseriesdefault}%
\edef\k@shape{\kanjishapedefault}%
\let\delayed@k@adjustment\empty
}
-\else
-\@ltj@hook@dfh{%
- \kanjiencoding{\kanjiencodingdefault}%
- \edef\k@family{\kanjifamilydefault}%
- \edef\k@series{\kanjiseriesdefault}%
- \edef\k@shape{\kanjishapedefault}%
-}
-\fi
-\let\@ltj@hook@dfh\@undefined
-%%%% LaTeX >= 2020-02-02 END
-\else
-%%%% LaTeX 2019-10-01
-\DeclareRobustCommand\normalfont{%
- \useroman\encodingdefault\familydefault\seriesdefault\shapedefault
- \usekanji\kanjiencodingdefault\kanjifamilydefault\kanjiseriesdefault\kanjishapedefault}
-\let\reset@font\normalfont
-%%%% LaTeX 2019-10-01 END
-\fi
-
-
-
-\ifdefined\prepare@family@series@update@kanji\else
-%%%% LaTeX 2019-10-01
-\def\prepare@family@series@update@kanji#1{\kanjifamily}
-\fi
\DeclareRobustCommand\mcfamily{%
\unless\ifltj@disablejfam\not@math@alphabet\mcfamily\mathmc\fi
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
index 9575dc3c049..80051535716 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-array}[2019-07-18 Patch to array for LuaTeX-ja]
+\ProvidesPackage{lltjp-array}[2024-06-10 Patch to array for LuaTeX-ja]
\RequirePackage{etoolbox,array}
@@ -11,7 +11,14 @@
\ignorespaces\@sharp\unskip
}{%
\ltj@sharp
-}{}{}
+}{}{% >=2024-06-01
+ \def\ltj@sharp{\relax\pltx@next@inhibitglue\ltjfakeboxbdd\ignorespaces\@sharp\textonly@unskip\ltjfakeboxbdd}
+ \patchcmd\insert@column{%
+ \ignorespaces\@sharp\textonly@unskip
+ }{%
+ \ltj@sharp
+ }{}{}
+}
\@ifpackageloaded{lltjext}{}{%
%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
index 67b0f5de7f7..641fa4a34df 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-geometry}[2021-10-24 Patch to geometry for LuaTeX-ja with vertical writing mode]
+\ProvidesPackage{lltjp-geometry}[2024-05-16 Patch to geometry for LuaTeX-ja with vertical writing mode]
\RequirePackage{expl3}
\ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi
\newif\if@ltj@@geometry@tate
@@ -31,15 +31,6 @@
%============================================
\unless\ifdefined\ltj@ExecuteAfterPackage
-\expandafter\newif\csname ifltj@ltfilehook@avail\endcsname
-\@ifl@t@r\fmtversion{2020-10-01}{%
- \@ifl@t@r\fmtversion{2020-10-02}{\ltj@ltfilehook@availtrue}
- {%
- \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi
- \else\ltj@ltfilehook@availtrue\fi
- }%
-}{}
-\ifltj@ltfilehook@avail
%% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code>
%% no-starred version: do nothing if the <package> is loaded
%% starred version: do <code> right away if the <package> is loaded
@@ -64,11 +55,6 @@
\@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
}
}
-\else
- \RequirePackage{filehook}
- \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile
- \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile
-\fi
\fi
%============================================
@@ -89,12 +75,8 @@
\else
\@gobble\iftrue\csname iftdir\endcsname \bool_set_true:N \l_tmpa_bool \fi
\fi
-\ifltj@ltfilehook@avail
- \prop_map_inline:Nn \g__hook_begindocument_code_prop
- { \tl_if_in:nnT {#2} {\tate} {\bool_set_true:N \l_tmpa_bool} }
-\else
- \tl_if_in:NnT \@begindocumenthook {\tate} {\bool_set_true:N \l_tmpa_bool}
-\fi
+\prop_map_inline:Nn \g__hook_begindocument_code_prop
+ { \tl_if_in:nnT {#2} {\tate} {\bool_set_true:N \l_tmpa_bool} }
\bool_if:NT \l_tmpa_bool {
\if@ltj@@geometry@forceoff
\@ltj@@geometry@tatefalse
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
index 9c4526c3fdb..292cbf00bfe 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
@@ -1,5 +1,5 @@
%
-% lltjp-siunitx.sty 2022-12-14
+% lltjp-siunitx.sty 2024-06-10
%
\NeedsTeXFormat{LaTeX2e}
@@ -7,7 +7,6 @@
\RequirePackage{siunitx}
\makeatletter
\ExplSyntaxOn
-\cs_if_exist:NTF \siunitx_print_text:n {% siunitx v3.00
\cs_set_protected:Npn \siunitx_print_text:n #1
{
\text
@@ -32,104 +31,26 @@
}
}
\cs_set_eq:NN \ltj_orig__siunitx_table_collect_begin:w \__siunitx_table_collect_begin:w
-\cs_set_protected:Npn \__siunitx_table_collect_begin:w #1 \relax
- { \ltj_orig__siunitx_table_collect_begin:w }
-\RenewDocumentCommand \tablenum { O { } m }
- {
- \mode_leave_vertical:
- \group_begin:
- \keys_set:nn { siunitx } {#1}
- \siunitx_cell_begin:w
- \relax \ignorespaces #2
- \siunitx_cell_end:
- \group_end:
- }
-}% siunitx v3.00 end
-{% siunitx v2.xx
-\cs_generate_variant:Nn \tl_if_in:NnT { coT }
-\cs_new:Nn \__ltj_siunix_patch_inner:n {
- \cs_if_exist:cT { #1_tl } {
- \tl_if_in:coT { #1_tl } { \tex_char:D } {
- \tl_replace_all:cnn { #1_tl } { \tex_char:D } { \ltjalchar }
- }
+\cs_set_protected:Npn \__siunitx_table_collect_begin:w #1 {
+ \token_if_eq_meaning:NNTF #1 \relax
+ {\ltj_orig__siunitx_table_collect_begin:w }
+ {\ltj_orig__siunitx_table_collect_begin:w #1 }
}
-}
-\cs_new:Nn \__ltj_siunix_patch_inner_math:n {
- \__ltj_siunix_patch_inner:n { l__siunitx_#1_math }
- \__ltj_siunix_patch_inner:n { l__siunitx_#1_text }
-}
-\AtBeginDocument {
- \__ltj_siunix_patch_inner:n { c__siunitx_minus }
- \__ltj_siunix_patch_inner:n { c__siunitx_mu }
- \__ltj_siunix_patch_inner_math:n { angstrom }
- \__ltj_siunix_patch_inner_math:n { arcminute }
- \__ltj_siunix_patch_inner_math:n { arcsecond }
- \__ltj_siunix_patch_inner_math:n { ohm }
-}
-
-%%%% new table column: S and s
-\bool_new:N \l__ltj_siunitx_table_collect_relax_bool
-\cs_set_protected:Npn \__siunitx_table_collect_begin_s: {
- \bool_set_false:N \l__ltj_siunitx_table_collect_relax_bool
- \cs_set_eq:NN \__siunitx_table_collect_token:N
- \__siunitx_table_collect_token_s:N
- \cs_set_eq:NN \__siunitx_table_print: \__siunitx_table_print_s:
- \__siunitx_table_collect_init_s:
- \__siunitx_table_collect_get:
-}
-
-\cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
+\cs_set_protected:Npn \__siunitx_table_collect_token:N #1
{
- \token_if_eq_meaning:NNTF #1 \tex_relax:D {
- \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool {
- \__siunitx_table_collect_not_braced_aux_i:N #1
- } {
- \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool
- }
- } {
- \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
- \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
- \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
+ \__siunitx_table_collect_search:NnF #1
{
- \token_if_eq_meaning:NNF #1 \tex_unskip:D
- { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+ \ignorespaces { \__siunitx_table_collect_ignore_spaces:N #1}
+ \pltx@next@inhibitglue { \__siunitx_table_collect_loop:}
+ \ltjfakeboxbdd { \__siunitx_table_collect_loop:}
+ \textonly@unskip { \__siunitx_table_collect_loop:}
+ \unskip { \__siunitx_table_collect_loop:}
+ \end { \tabularnewline \end }
+ \relax { \__siunitx_table_collect_relax:N #1 }
+ \tabularnewline { \tabularnewline }
+ \siunitx_cell_end: { \siunitx_cell_end:}
}
- }}}
- \__siunitx_table_collect_next:
- }
-
-\AtBeginDocument
- {
- \@ifpackageloaded { mdwtab }
- {
- \cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
- {
- \token_if_eq_meaning:NNTF #1 \tex_relax:D {
- \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool {
- \__siunitx_table_collect_not_braced_aux_i:N #1
- } {
- \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool
- }
- } {
- \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
- \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
- \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
- {
- \token_if_eq_meaning:NNF #1 \tex_unskip:D
- {
- \token_if_eq_meaning:NNF #1 \tab@setcr
- {
- \token_if_eq_meaning:NNF #1 \@maybe@unskip
- { \__siunitx_table_collect_not_braced_aux_i:N #1 }
- }
- }
- }
- }}}
- \__siunitx_table_collect_next:
- }
- }
- { }
- }
+ { \__siunitx_table_collect_token_aux:N #1 }
}
\ExplSyntaxOff
\endinput
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua
index ebb29abb15c..452656845c4 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua
@@ -156,7 +156,7 @@ local function cssquery()
-- make sure we deal with a string
value = tostring(value)
-- make the search string safe for pattern matching
- local escaped_search = search:gsub("([%(%)%.%%%+%–%*%?%[%^%$])", "%%%1")
+ local escaped_search = search:gsub("([%(%)%.%%%+%-%#%*%?%[%^%$])", "%%%1")
if modifier == "" then
return value == search
elseif modifier == "|" then
@@ -434,6 +434,18 @@ local function cssquery()
return querylist
end
+ --- Remove selector from the CSS list object.
+ -- All actions that literaly match the given selector will be removed.
+ function CssQuery:remove_selector(
+ selector -- CSS selector to be removed
+ )
+ for pos, obj in ipairs(self.querylist) do
+ if obj.source == selector then
+ table.remove(self.querylist, pos)
+ end
+ end
+ end
+
--- It tests list of queries agaings a DOM element and executes the
--- coresponding function that is saved for the matched query.
-- @return nothing
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua
index 73689add5a1..dca38df0db5 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua
@@ -6,16 +6,20 @@ local dom = {}
local xml
local handler
local css_query
+local html
if kpse then
xml = require("luaxml-mod-xml")
handler = require("luaxml-mod-handler")
css_query = require("luaxml-cssquery")
+ html = require("luaxml-mod-html")
else
xml = require("luaxml.mod-xml")
handler = require("luaxml.mod-handler")
css_query = require("luaxml.cssquery")
+ html = require("luaxml.mod-html")
end
+local HtmlParser = html.HtmlParser
local void = {area = true, base = true, br = true, col = true, hr = true, img = true, input = true, link = true, meta = true, param = true}
@@ -91,9 +95,14 @@ local function serialize_dom(parser, current,level, output)
local format = get_action(typ, "start")
insert(format, el, prepare_attributes(attr))
end
- local function text(typ, text)
+ local function text(typ, text, parent)
+ local parent = parent or {}
local format = get_action(typ, "text")
- insert(format, escape_element(text))
+ if parent.verbatim then
+ insert(format, text)
+ else
+ insert(format, escape_element(text))
+ end
end
local function stop(typ, el)
local format = get_action(typ, "stop")
@@ -141,7 +150,7 @@ local function serialize_dom(parser, current,level, output)
end
start(xtype, name, attributes)
- text(xtype,text_content)
+ text(xtype,text_content, (current or {})._parent)
local children = root._children or {}
for _, child in ipairs(children) do
output = serialize_dom(parser,child, level + 1, output)
@@ -411,8 +420,8 @@ local parse = function(
return strings
end
- --- Get table with the inner text of an element -- leading and trailing spaces are removed and elements that contain only white space are ignored.
- --- @return table
+ --- Get table with the inner text of an element - leading and trailing spaces are removed and elements that contain only white space are ignored.
+ -- @return table
function DOM_Object:stripped_strings(
current --- [optional] element to be selected
)
@@ -612,11 +621,83 @@ local parse = function(
-- include the methods to all xml nodes
save_methods(parser._handler.root)
-- parser:
- return parser
+ return parser, DOM_Object
+end
+
+-- table of elements that should be kept without XML escaping in the DOM serialization
+local verbatim_elements = {script=true, style=true}
+
+local function html_to_dom(html_object)
+ -- convert parsed HTML DOM to the XML DOM
+ local dom, DOM_Object = parse("") -- use empty text to just initialize the DOM object
+ -- use root of the DOM object as the original parent
+ local current_parent = dom._handler.root
+
+ local function create_node(tbl)
+ -- create node suitable for LuaXML DOM object
+ tbl._children = {}
+ -- this should copy methods from the DOM object to the newly created object
+ tbl.__index = DOM_Object
+ return setmetatable(tbl, DOM_Object)
+ end
+
+ local function build_tree(object)
+ -- convert tree produced by the HTML parser to LuaXML DOM
+ local typ = object._type
+ -- process particular node types from the HTML parser
+ if typ == "doctype" then
+ current_parent:add_child_node(create_node {_name=object.name, _type="DTD"})
+ elseif typ == "comment" then
+ current_parent:add_child_node(create_node {_text=object.text, _type="COMMENT"})
+ elseif typ == "element" then
+ local attributes = {}
+ -- convert attributes to the form expected by the DOM object
+ for _, attr in ipairs(object.attr) do
+ attributes[attr.name] = attr.value
+ end
+ local element = current_parent:create_element(object.tag, attributes)
+ -- disable escaping of text in dom:serialize() for <script> or <style> elements
+ if verbatim_elements[string.lower(object.tag)] then element.verbatim = true end
+ current_parent:add_child_node(element)
+ -- set the current element as parent for the processing of children
+ local old_parent = current_parent
+ current_parent = element
+ -- process children
+ for k,v in ipairs(object.children) do
+ build_tree(v)
+ end
+ -- restore original parent
+ current_parent = old_parent
+ elseif typ == "text" then
+ local text = current_parent:create_text_node(object.text)
+ current_parent:add_child_node(text)
+ else
+ -- for other node types, just process the children
+ for k,v in ipairs(object.children) do
+ build_tree(v)
+ end
+ end
+
+ end
+ build_tree(html_object)
+ return dom
+end
+
+--- Parse HTML text as a DOM object.
+-- It supports all methods as the object returned by the parse() function.
+-- @param html_str string with the HTML code to be parsed
+-- @return DOM_Object
+local function html_parse(html_str)
+ local html_obj = HtmlParser:init(html_str)
+ local html_dom = html_obj:parse()
+ return html_to_dom(html_dom)
end
+
+
--- @export
return {
parse = parse,
- serialize_dom= serialize_dom
+ serialize_dom= serialize_dom,
+ html_parse = html_parse
}
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua
new file mode 100644
index 00000000000..71bfc81dd1b
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua
@@ -0,0 +1,88 @@
+--- Convert 8-bit encodings to UTF-8
+--- @module luaxml-encodings
+-- this table is generated automatically by this command:
+-- texlua encodings/make_encodings.lua
+local encodings = {
+ ['ibm866'] = 'АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёЄєЇїЎў°∙·√№¤■ ',
+ ['iso-8859-5'] = '�������������������������������� ЁЂЃЄЅІЇЈЉЊЋЌ­ЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя№ёђѓєѕіїјљњћќ§ўџ',
+ ['macintosh'] = 'ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄€‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ',
+ ['windows-1251'] = 'ЂЃ‚ѓ„…†‡€‰Љ‹ЊЌЋЏђ‘’“”•–—�™љ›њќћџ ЎўЈ¤Ґ¦§Ё©Є«¬­®Ї°±Ііґµ¶·ё№є»јЅѕїАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя',
+ ['iso-8859-13'] = '�������������������������������� ”¢£¤„¦§Ø©Ŗ«¬­®Æ°±²³“µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž’',
+ ['iso-8859-6'] = '�������������������������������� ���¤�������،­�������������؛���؟�ءآأؤإئابةتثجحخدذرزسشصضطظعغ�����ـفقكلمنهوىيًٌٍَُِّْ',
+ ['iso-8859-8'] = '�������������������������������� �¢£¤¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾��������������������������������‗אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏',
+ ['iso-8859-4'] = '�������������������������������� ĄĸŖ¤ĨĻ§¨ŠĒĢŦ­Ž¯°ą˛ŗ´ĩļˇ¸šēģŧŊžŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎĪĐŅŌĶÔÕÖ×ØŲÚÛÜŨŪßāáâãäåæįčéęëėíîīđņōķôõö÷øųúûüũū˙',
+ ['koi8-r'] = '─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ё╓╔╕╖╗╘╙╚╛╜╝╞╟╠╡Ё╢╣╤╥╦╧╨╩╪╫╬©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ',
+ ['iso-8859-7'] = '�������������������������������� ‘’£€₯¦§¨©ͺ«¬­�―°±²³΄΅Ά·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ',
+ ['iso-8859-3'] = '�������������������������������� Ħ˘£¤�Ĥ§¨İŞĞĴ­�Ż°ħ²³´µĥ·¸ışğĵ½�żÀÁÂ�ÄĊĈÇÈÉÊËÌÍÎÏ�ÑÒÓÔĠÖ×ĜÙÚÛÜŬŜßàáâ�äċĉçèéêëìíîï�ñòóôġö÷ĝùúûüŭŝ˙',
+ ['windows-1256'] = '€پ‚ƒ„…†‡ˆ‰ٹ‹Œچژڈگ‘’“”•–—ک™ڑ›œ‌‍ں ،¢£¤¥¦§¨©ھ«¬­®¯°±²³´µ¶·¸¹؛»¼½¾؟ہءآأؤإئابةتثجحخدذرزسشصض×طظعغـفقكàلâمنهوçèéêëىيîïًٌٍَôُِ÷ّùْûü‎‏ے',
+ ['windows-1258'] = '€�‚ƒ„…†‡ˆ‰�‹Œ����‘’“”•–—˜™�›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ',
+ ['iso-8859-14'] = '�������������������������������� Ḃḃ£ĊċḊ§Ẁ©ẂḋỲ­®ŸḞḟĠġṀṁ¶ṖẁṗẃṠỳẄẅṡÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏŴÑÒÓÔÕÖṪØÙÚÛÜÝŶßàáâãäåæçèéêëìíîïŵñòóôõöṫøùúûüýŷÿ',
+ ['windows-1252'] = '€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ',
+ ['iso-8859-15'] = '�������������������������������� ¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ',
+ ['x-mac-cyrillic'] = 'АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°Ґ£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµґЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю€',
+ ['windows-1254'] = '€�‚ƒ„…†‡ˆ‰Š‹Œ����‘’“”•–—˜™š›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ',
+ ['windows-1255'] = '€�‚ƒ„…†‡ˆ‰�‹�����‘’“”•–—˜™�›���� ¡¢£₪¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾¿ְֱֲֳִֵֶַָֹֺֻּֽ־ֿ׀ׁׂ׃װױײ׳״�������אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏',
+ ['windows-1250'] = '€�‚�„…†‡�‰Š‹ŚŤŽŹ�‘’“”•–—�™š›śťžź ˇ˘Ł¤Ą¦§¨©Ş«¬­®Ż°±˛ł´µ¶·¸ąş»Ľ˝ľżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙',
+ ['koi8-u'] = '─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ёє╔ії╗╘╙╚╛ґў╞╟╠╡ЁЄ╣ІЇ╦╧╨╩╪ҐЎ©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ',
+ ['iso-8859-10'] = '�������������������������������� ĄĒĢĪĨĶ§ĻĐŠŦŽ­ŪŊ°ąēģīĩķ·ļđšŧž―ūŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎÏÐŅŌÓÔÕÖŨØŲÚÛÜÝÞßāáâãäåæįčéęëėíîïðņōóôõöũøųúûüýþĸ',
+ ['windows-1257'] = '€�‚�„…†‡�‰�‹�¨ˇ¸�‘’“”•–—�™�›�¯˛� �¢£¤�¦§Ø©Ŗ«¬­®Æ°±²³´µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž˙',
+ ['windows-1253'] = '€�‚ƒ„…†‡�‰�‹�����‘’“”•–—�™�›���� ΅Ά£¤¥¦§¨©�«¬­®―°±²³΄µ¶·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ',
+ ['iso-8859-2'] = '�������������������������������� Ą˘Ł¤ĽŚ§¨ŠŞŤŹ­ŽŻ°ą˛ł´ľśˇ¸šşťź˝žżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙',
+ ['windows-874'] = '€����…�����������‘’“”•–—�������� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛',
+ ['iso-8859-16'] = '�������������������������������� ĄąŁ€„Š§š©Ș«Ź­źŻ°±ČłŽ”¶·žčș»ŒœŸżÀÁÂĂÄĆÆÇÈÉÊËÌÍÎÏĐŃÒÓÔŐÖŚŰÙÚÛÜĘȚßàáâăäćæçèéêëìíîïđńòóôőöśűùúûüęțÿ',
+}
+
+
+local utfchar = utf8.char
+
+--- Try to find an encoding in HTML string
+---@param str string HTML document
+---@param len number count of characters from the start of the string where it should search for the encoding metadata
+---@return string encoding identifier, or nil and message if no encoding was found
+local function find_html_encoding(str, len)
+ -- try to find encoding in the html document
+ -- we limit search length, because encoding should be in the document head, ideally near the start
+ local len = len or 4096
+ local sub = str:sub(1, len)
+ for meta in sub:gmatch("<meta (.-)>") do
+ local charset = meta:match("charset%s*=%s*[\"']?(.-)[\"']")
+ if charset then return string.lower(charset) end
+ end
+ return nil, "Cannot find the document encoding"
+end
+
+local function load_mapping(enc_name)
+ local enc_name = enc_name or ""
+ local enc = encodings[enc_name]
+ if not enc then return nil, "Cannot load encoding " .. enc_name end
+ local mapping,i = {}, 128
+ for pos, codepoint in utf8.codes(enc) do
+ mapping[i] = utfchar(codepoint)
+ i = i + 1
+ end
+ return mapping
+end
+
+--- Convert string to utf-8
+---@param text string for converting
+---@param mapping table
+---@return string converted string
+local function recode(text, mapping)
+ return text:gsub("(.)", function(char)
+ local charpoint = string.byte(char)
+ if charpoint > 127 then
+ return mapping[charpoint]
+ else
+ return false
+ end
+ end)
+end
+
+
+return {
+ encodings = encodings,
+ find_html_encoding = find_html_encoding,
+ load_mapping = load_mapping,
+ recode = recode
+}
+
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua
index 69e32b16e22..d8c2b7e9327 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua
@@ -1,3 +1,6 @@
+--- HTML parsing module for LuaXML
+-- @module luaxml-mod-html
+-- @author Michal Hoftich <michal.h21@gmail.com
-- Copyright Michal Hoftich, 2022
-- HTML parser inspired by https://browser.engineering/html.html
-- but then redone using https://html.spec.whatwg.org/multipage/parsing.html
@@ -1540,9 +1543,14 @@ local function is_formatting_element(name)
return formatting_element_names[name]
end
-local special_elements = {}
+local function hash_from_array(tbl)
+ local t = {}
+ for _, v in ipairs(tbl) do t[v] = true end
+ return t
+end
+
-local special_elements_list = {"address", "applet", "area", "article", "aside",
+local special_elements_list = hash_from_array {"address", "applet", "area", "article", "aside",
"base", "basefont", "bgsound", "blockquote", "body", "br", "button", "caption",
"center", "col", "colgroup", "dd", "details", "dir", "div", "dl", "dt",
"embed", "fieldset", "figcaption", "figure", "footer", "form", "frame",
@@ -1555,13 +1563,9 @@ local special_elements_list = {"address", "applet", "area", "article", "aside",
"mi","mo","mn","ms","mtext", "annotation-xml","foreignObject","desc", "title"
}
-for k,v in ipairs(special_elements_list) do
- special_elements[v] = true
-end
-
local function is_special(name)
- return special_elements[name]
+ return special_elements_list[name]
end
-- these lists are used in HtmlParser:generate_implied_endtags()
@@ -1649,8 +1653,12 @@ local HtmlTreeStates = {}
+--- @type HtmlParser
local HtmlParser = {}
+--- Initialize the HTML Object
+---@param body string HTML to be parsed
+---@return table initialized object
function HtmlParser:init(body)
local o ={}
setmetatable(o, self)
@@ -1686,10 +1694,11 @@ for _,v in ipairs(self_closing_tags_list) do self_closing_tags[v] = true end
-
+--- Execute the HTML parser
+--- @return table Root node of the HTML DOM
function HtmlParser:parse()
-- we assume utf8 input, you must convert it yourself if the source is
- -- in a different encoding
+ -- in a different encoding. for example using luaxml-encodings library
self.text = {}
self.state = self.default_state
-- this should enable us to pass over some characters that we want to ignore
@@ -1791,6 +1800,7 @@ function HtmlParser:emit(token)
elseif token_type == "start_tag" then
self:add_text()
-- self:start_attribute()
+ self:reset_insertion_mode()
self:start_tag()
-- print("Emit start tag", table.concat(token.name))
-- save last attribute
@@ -1882,8 +1892,139 @@ function HtmlParser:set_xmlns(node, parent)
end
end
+function HtmlParser:pop_element()
+ -- close the current element and add it to the DOM
+ local el = self:close_element()
+ local parent = self:get_parent()
+ parent:add_child(el)
+ return el
+end
+
+local close_p_at_start = hash_from_array {"address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "search", "section", "summary", "ul", "pre", "listing", "form", "table", "xmp", "hr"}
+
+local close_headers = hash_from_array {"h1", "h2", "h3", "h4", "h5", "h6"}
+
+local body_modes = hash_from_array {"in_body", "in_cell", "in_row", "in_select", "in_table", "in_table_body", "in_frameset"}
+
+local list_items = hash_from_array {"li", "dt", "dd"}
+
+local close_address_at_end = hash_from_array{"address", "article", "aside", "blockquote", "button", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol", "pre", "search", "section", "summary", "ul", "form"}
+
+
+function HtmlParser:close_unfinished(name)
+ -- close all unfinished elements until the element with the given name is found
+ for i = #self.unfinished, 1, -1 do
+ local el = self:pop_element()
+ if el.tag == name then
+ break
+ end
+ end
+end
+
+
+function HtmlParser:close_paragraph()
+ -- close currently open <p> elements
+ self:close_unfinished("p")
+end
+
+function HtmlParser:current_element_name()
+ -- return name of the current element
+ return self:get_parent().tag
+end
+
+local not_specials = hash_from_array { "address", "div", "p"}
+
+local function handle_list_item(self, name)
+ -- we handle li, dt and dd. dt and dd should close each other, li closes only itself
+ local names = {dt = true, dd = true}
+ if name == "li" then names = {li=true} end
+ for i = #self.unfinished, 1, -1 do
+ local current = self.unfinished[i]
+ local current_tag = current.tag
+ if names[current_tag] then
+ self:generate_implied_endtags(nil, {current.tag})
+ for j = #self.unfinished, i, -1 do
+ self:pop_element()
+ end
+ break
+ elseif is_special(current_tag) and not not_specials[name] then
+ break
+ end
+ end
+end
+
+local close_paragraph = function(self)
+ if is_in_button_scope(self, "p") then
+ self:close_paragraph()
+ end
+end
+
+function HtmlParser:handle_insertion_mode(token)
+ -- simple handling of https://html.spec.whatwg.org/multipage/parsing.html#tree-construction
+ -- we don't support most rules, just the most important for avoiding mismatched tags
+
+ if body_modes[self.insertion_mode] then
+ if token.type == "start_tag" then
+ local name = table.concat(token.name)
+ if close_p_at_start[name] then close_paragraph(self) end
+ if close_headers[name] then
+ close_paragraph(self)
+ -- close current element if it is already header
+ if close_headers[self:current_element_name()] then
+ self:pop_element()
+ end
+ elseif name == "pre" or name == "listing" then
+ -- we should ignore next "\n" char token
+ elseif name == "image" then
+ -- image tag is an error, change to <img>
+ token.name = {"img"}
+ elseif list_items[name] then
+ handle_list_item(self, name)
+ close_paragraph(self)
+ end
+ elseif token.type == "end_tag" then
+ local name = table.concat(token.name)
+ if close_address_at_end[name] then
+ if is_in_scope(self, name, {}) then
+ self:close_unfinished(name)
+ else
+ token.type = "ignore"
+ end
+ elseif name == "p" then
+ if not is_in_button_scope(self, "p") then
+ local parent = self:get_parent()
+ local node = Element:init("p", parent)
+ table.insert(self.unfinished, node)
+ end
+ -- use self:close_paragraph() instead of close_paragraph() because we don't need to check scope at this point
+ self:close_paragraph()
+ elseif name == "br" then
+ token.type = "start_tag"
+ elseif close_headers[name] then
+ local header_in_scope = false
+ -- detect, if there are any open h1-h6 tag and close it
+ for el, _ in pairs(close_headers) do
+ if is_in_scope(self, el, {}) then
+ header_in_scope = el
+ break
+ end
+ end
+ if not header_in_scope then
+ token.type = "ignore"
+ else
+ self:close_unfinished(header_in_scope)
+ end
+ end
+ end
+ end
+end
+
+local rawtext_elements = hash_from_array {"style", "textarea", "xmp"}
+
+
function HtmlParser:start_tag()
local token = self.current_token
+ self:handle_insertion_mode(token)
if token.type == "start_tag" then
-- close all currently opened attributes
self:start_attribute()
@@ -1894,18 +2035,18 @@ function HtmlParser:start_tag()
node.attr = token.attr
node.self_closing = token.self_closing
self:set_xmlns(node)
- --
+ -- in this handler we should close <p> or <li> elements without explicit closing tags
if token.self_closing -- <img />
or self_closing_tags[name] -- void elements
then
- parent:add_child(node)
+ parent:add_child(node, node.tag)
else
-- add to the unfinished list
table.insert(self.unfinished, node)
end
if name == "title" then
self.element_state = "rcdata"
- elseif name == "style" then
+ elseif rawtext_elements[name] then
self.element_state = "rawtext"
elseif name == "script" then
self.element_state = "script_data"
@@ -1916,11 +2057,13 @@ end
function HtmlParser:end_tag()
-- close current opened element
local token = self.current_token
+ self:handle_insertion_mode(token)
if token.type == "end_tag" then
if #self.unfinished==0 then return nil end
- local node = self:close_element()
- local parent = self:get_parent()
- parent:add_child(node)
+ -- close the current element only if the token is in the current scope
+ if is_in_scope(self, table.concat(token.name), {}) then
+ self:pop_element()
+ end
end
end
@@ -1964,6 +2107,21 @@ function HtmlParser:adjusted_current_node()
end
+local simple_modes = {
+ body = "in_body",
+ td = "in_cell",
+ th = "in_cell",
+ tr = "in_row",
+ tbody = "in_table_body",
+ thead = "in_table_body",
+ tfoot = "in_table_body",
+ caption = "in_caption",
+ colgroup = "in_column_group",
+ table = "in_table",
+ template = "current_template_insertion_mode",
+ frameset = "in_frameset"
+}
+
function HtmlParser:reset_insertion_mode()
-- https://html.spec.whatwg.org/multipage/parsing.html#reset-the-insertion-mode-appropriately
local last = false
@@ -1977,16 +2135,33 @@ function HtmlParser:reset_insertion_mode()
if name == "head" and last == true then
self:switch_insertion("in_head")
return
- elseif name == "body" then
- self:switch_insertion("in_body")
- return
elseif name == "html" then
- if self.head_pointer then
+ if not self.head_pointer then
self:switch_insertion("before_head")
return
else
self:switch_insertion("after_head")
+ return
+ end
+ elseif name == "select" then
+ if not last then
+ for x = position -1, 1, -1 do
+ if x == 1 then break end
+ local ancestor = self.unfinished[x]
+ local ancestor_name = ancestor.tag
+ if ancestor_name == "template" then
+ break
+ elseif ancestor_name == "table" then
+ self:switch_insertion("in_select_in_table")
+ return
+ end
+ end
end
+ self:switch_insertion("in_select")
+ return
+ elseif simple_modes[name] then
+ self:switch_insertion(simple_modes[name])
+ return
elseif last == true then
self:switch_insertion("in_body")
return
@@ -2006,8 +2181,8 @@ function HtmlParser:generate_implied_endtags(included, ignored)
local current = self:current_node() or {}
-- keep removing elements while they are in the "included" list
if included[current.tag] then
- table.remove(self.unfinished)
- self:generate_implied_endtags(ignored)
+ self:pop_element()
+ self:generate_implied_endtags(included, ignored)
end
end
@@ -2023,9 +2198,7 @@ function HtmlParser:finish()
self:start_tag("html")
end
while #self.unfinished > 0 do
- local node = self:close_element()
- local parent = self:get_parent()
- parent:add_child(node)
+ self:pop_element()
end
-- return root element
return self.Document -- self:close_element()
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua
index 0e6399ab135..5c5ff007770 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua
@@ -1,2234 +1,2233 @@
-local utf8 = require "utf8"
return {
-["Subset"]="⋐",
-["Chi"]="Χ",
-["tprime"]="‴",
-["lneq"]="⪇",
-["RightUpTeeVector"]="⥜",
-["cscr"]="𝒸",
-["leftrightarrows"]="⇆",
-["LeftRightVector"]="⥎",
-["Laplacetrf"]="ℒ",
-["boxHd"]="╤",
-["GreaterSlantEqual"]="⩾",
-["sqsub"]="⊏",
-["nvdash"]="⊬",
-["boxHu"]="╧",
-["vcy"]="в",
-["DiacriticalDoubleAcute"]="˝",
-["nvHarr"]="⤄",
-["lnapprox"]="⪉",
-["fscr"]="𝒻",
-["OverBracket"]="⎴",
-["pm"]="±",
-["ovbar"]="⌽",
-["larrhk"]="↩",
-["atilde"]="ã",
-["Igrave"]="Ì",
-["profsurf"]="⌓",
-["Sigma"]="Σ",
-["rHar"]="⥤",
-["Gcedil"]="Ģ",
-["sect"]="§",
-["nmid"]="∤",
-["escr"]="ℯ",
-["delta"]="δ",
-["male"]="♂",
-["Integral"]="∫",
-["RightUpVectorBar"]="⥔",
-["alefsym"]="ℵ",
-["nsqsube"]="⋢",
-["Nacute"]="Ń",
-["mcomma"]="⨩",
-["ApplyFunction"]=utf8.char(0x2061),
-["rfisht"]="⥽",
-["phmmat"]="ℳ",
-["rarrw"]="↝",
-["backepsilon"]="϶",
-["hscr"]="𝒽",
-["middot"]="·",
-["ldrushar"]="⥋",
-["supne"]="⊋",
-["Longleftrightarrow"]="⟺",
-["Oacute"]="Ó",
-["af"]="⁡",
+["Implies"]="⇒",
+["longrightarrow"]="⟶",
+["precneqq"]="⪵",
+["geqslant"]="⩾",
+["Product"]="∏",
+["Scirc"]="Ŝ",
+["lvnE"]="≨︀",
+["dotminus"]="∸",
+["sscr"]="𝓈",
+["capdot"]="⩀",
+["dlcrop"]="⌍",
+["omacr"]="ō",
+["sext"]="✶",
+["xutri"]="△",
+["xrArr"]="⟹",
+["glE"]="⪒",
+["NotSupersetEqual"]="⊉",
+["backsim"]="∽",
["sup"]="⊃",
-["lozenge"]="◊",
-["scy"]="с",
-["gscr"]="ℊ",
-["smallsetminus"]="∖",
+["realpart"]="ℜ",
["hardcy"]="ъ",
-["DoubleVerticalBar"]="∥",
-["Yuml"]="Ÿ",
-["plusdu"]="⨥",
-["NotSucceedsSlantEqual"]="⋡",
-["nwnear"]="⤧",
-["lfloor"]="⌊",
-["rcy"]="р",
-["jscr"]="𝒿",
-["AMP"]="&",
-["acute"]="´",
-["uacute"]="ú",
-["Or"]="⩔",
-["rdldhar"]="⥩",
-["langd"]="⦑",
-["Iacute"]="Í",
-["spar"]="∥",
-["ucy"]="у",
-["rsh"]="↱",
-["Kcedil"]="Ķ",
-["iscr"]="𝒾",
-["lambda"]="λ",
-["lbrkslu"]="⦍",
-["napE"]="⩰̸",
-["shcy"]="ш",
-["nsupE"]="⫆̸",
-["Ycirc"]="Ŷ",
-["sect"]="§",
-["precnapprox"]="⪹",
-["iocy"]="ё",
-["dzcy"]="џ",
+["sqcap"]="⊓",
+["brvbar"]="¦",
+["LT"]="<",
+["udarr"]="⇅",
+["lozf"]="⧫",
+["Eogon"]="Ę",
+["frac18"]="⅛",
+["lesssim"]="≲",
+["wedbar"]="⩟",
+["EmptyVerySmallSquare"]="▫",
+["aring"]="å",
+["lesdoto"]="⪁",
+["ltquest"]="⩻",
+["LeftUpTeeVector"]="⥠",
+["FilledSmallSquare"]="◼",
+["mho"]="℧",
+["NotGreaterTilde"]="≵",
+["xharr"]="⟷",
+["NotSucceedsEqual"]="⪰̸",
+["sqsupset"]="⊐",
+["Ccedil"]="Ç",
+["aacute"]="á",
+["succcurlyeq"]="≽",
+["gneq"]="⪈",
+["forall"]="∀",
+["rightharpoonup"]="⇀",
+["leftarrow"]="←",
+["ang"]="∠",
+["mapstoup"]="↥",
+["xscr"]="𝓍",
+["NotTildeEqual"]="≄",
+["ograve"]="ò",
+["boxdl"]="┐",
+["DownLeftVectorBar"]="⥖",
+["nsup"]="⊅",
+["shchcy"]="щ",
+["demptyv"]="⦱",
+["apos"]="'",
+["between"]="≬",
+["leftrightsquigarrow"]="↭",
+["gtcc"]="⪧",
+["grave"]="`",
+["bigodot"]="⨀",
+["oline"]="‾",
+["angmsdad"]="⦫",
+["NotCongruent"]="≢",
+["gtquest"]="⩼",
+["fltns"]="▱",
+["smeparsl"]="⧤",
+["Eta"]="Η",
+["ltdot"]="⋖",
+["rhard"]="⇁",
+["rscr"]="𝓇",
["ETH"]="Ð",
-["GreaterTilde"]="≳",
-["coprod"]="∐",
-["rpar"]=")",
-["lthree"]="⋋",
-["ImaginaryI"]="ⅈ",
-["DoubleUpDownArrow"]="⇕",
-["intercal"]="⊺",
-["spadesuit"]="♠",
-["boxVH"]="╬",
-["smashp"]="⨳",
-["nu"]="ν",
-["Agrave"]="À",
-["boxtimes"]="⊠",
-["sext"]="✶",
-["nsub"]="⊄",
-["oelig"]="œ",
-["GreaterEqual"]="≥",
-["TRADE"]="™",
-["dtrif"]="▾",
-["nless"]="≮",
-["mu"]="μ",
-["larrsim"]="⥳",
-["GreaterEqualLess"]="⋛",
-["Uuml"]="Ü",
-["LeftArrowBar"]="⇤",
-["ntrianglerighteq"]="⋭",
-["DiacriticalDot"]="˙",
-["LongLeftArrow"]="⟵",
-["agrave"]="à",
-["lmoustache"]="⎰",
-["nvDash"]="⊭",
-["para"]="¶",
-["nlt"]="≮",
-["Eacute"]="É",
-["spades"]="♠",
-["lrcorner"]="⌟",
-["checkmark"]="✓",
-["lessdot"]="⋖",
-["opar"]="⦷",
-["nVDash"]="⊯",
-["pertenk"]="‱",
-["range"]="⦥",
-["Pr"]="⪻",
-["Gammad"]="Ϝ",
-["ape"]="≊",
-["Longleftarrow"]="⟸",
-["boxV"]="║",
-["rightthreetimes"]="⋌",
+["iocy"]="ё",
+["semi"]=";",
+["nexists"]="∄",
+["approxeq"]="≊",
+["compfn"]="∘",
+["sstarf"]="⋆",
+["angrtvbd"]="⦝",
["gnap"]="⪊",
-["vzigzag"]="⦚",
-["Ecirc"]="Ê",
-["npar"]="∦",
-["notinvb"]="⋷",
-["Tau"]="Τ",
-["blank"]="␣",
-["Kappa"]="Κ",
-["rmoust"]="⎱",
-["GJcy"]="Ѓ",
-["ufisht"]="⥾",
-["NotLeftTriangleBar"]="⧏̸",
-["bigvee"]="⋁",
-["lrhar"]="⇋",
-["supset"]="⊃",
-["uwangle"]="⦧",
-["UpTeeArrow"]="↥",
-["supE"]="⫆",
-["imof"]="⊷",
-["leg"]="⋚",
-["notniva"]="∌",
-["nvgt"]=">⃒",
-["rthree"]="⋌",
-["yfr"]="𝔶",
-["uHar"]="⥣",
-["nshortmid"]="∤",
-["biguplus"]="⨄",
-["barvee"]="⊽",
-["iff"]="⇔",
-["boxvH"]="╪",
-["simrarr"]="⥲",
-["Egrave"]="È",
-["ntilde"]="ñ",
-["VerticalTilde"]="≀",
-["sigmaf"]="ς",
-["khcy"]="х",
-["planck"]="ℏ",
-["NotNestedGreaterGreater"]="⪢̸",
-["NonBreakingSpace"]=" ",
-["OpenCurlyQuote"]="‘",
-["supsim"]="⫈",
-["cudarrl"]="⤸",
-["theta"]="θ",
-["notindot"]="⋵̸",
-["Omicron"]="Ο",
-["ccedil"]="ç",
-["colone"]="≔",
-["bscr"]="𝒷",
-["Dagger"]="‡",
-["comma"]=",",
+["mDDot"]="∺",
+["udblac"]="ű",
["Acirc"]="Â",
-["plankv"]="ℏ",
-["boxdr"]="┌",
-["rarrap"]="⥵",
-["rmoustache"]="⎱",
-["LeftAngleBracket"]="⟨",
-["Cacute"]="Ć",
-["blk34"]="▓",
-["rfloor"]="⌋",
-["awconint"]="∳",
-["sfrown"]="⌢",
-["middot"]="·",
-["ascr"]="𝒶",
-["dot"]="˙",
-["caron"]="ˇ",
-["image"]="ℑ",
-["esdot"]="≐",
-["ohbar"]="⦵",
-["rarrb"]="⇥",
-["submult"]="⫁",
-["plusb"]="⊞",
-["oopf"]="𝕠",
-["breve"]="˘",
-["conint"]="∮",
-["angrt"]="∟",
-["nbump"]="≎̸",
-["raquo"]="»",
-["Iuml"]="Ï",
-["Rcedil"]="Ŗ",
-["minus"]="−",
-["nsucceq"]="⪰̸",
-["telrec"]="⌕",
-["CHcy"]="Ч",
-["nrightarrow"]="↛",
-["NotRightTriangle"]="⋫",
-["zfr"]="𝔷",
-["succ"]="≻",
-["Aacute"]="Á",
-["NestedLessLess"]="≪",
-["RightTeeArrow"]="↦",
-["homtht"]="∻",
-["Cup"]="⋓",
-["lcub"]="{",
-["race"]="∽̱",
-["THORN"]="Þ",
-["propto"]="∝",
-["odblac"]="ő",
-["mumap"]="⊸",
-["filig"]="fi",
-["ecir"]="≖",
-["DoubleRightArrow"]="⇒",
-["npreceq"]="⪯̸",
-["female"]="♀",
-["LeftFloor"]="⌊",
-["gtrarr"]="⥸",
-["dotsquare"]="⊡",
-["map"]="↦",
-["OverBrace"]="⏞",
-["zopf"]="𝕫",
-["rang"]="⟩",
-["laquo"]="«",
-["elsdot"]="⪗",
-["frac56"]="⅚",
-["Iuml"]="Ï",
-["ocirc"]="ô",
-["clubs"]="♣",
-["IOcy"]="Ё",
-["scnE"]="⪶",
-["deg"]="°",
-["simgE"]="⪠",
-["nap"]="≉",
-["blacktriangle"]="▴",
-["edot"]="ė",
-["epsiv"]="ϵ",
-["napprox"]="≉",
-["NotGreaterSlantEqual"]="⩾̸",
-["prap"]="⪷",
-["lnap"]="⪉",
-["circledS"]="Ⓢ",
-["lang"]="⟨",
-["qprime"]="⁗",
-["aelig"]="æ",
-["ncongdot"]="⩭̸",
-["supdsub"]="⫘",
-["nltrie"]="⋬",
-["xopf"]="𝕩",
+["UnderParenthesis"]="⏝",
+["nisd"]="⋺",
+["lneq"]="⪇",
+["Dagger"]="‡",
+["qscr"]="𝓆",
+["gneqq"]="≩",
+["doteqdot"]="≑",
+["DoubleVerticalBar"]="∥",
+["emptyset"]="∅",
+["lEg"]="⪋",
+["subseteq"]="⊆",
+["dwangle"]="⦦",
+["dotplus"]="∔",
+["NotPrecedesSlantEqual"]="⋠",
+["bnot"]="⌐",
["LeftDownVector"]="⇃",
-["duarr"]="⇵",
-["urcorner"]="⌝",
-["nvltrie"]="⊴⃒",
-["Pi"]="Π",
+["leg"]="⋚",
+["Therefore"]="∴",
+["Omega"]="Ω",
+["acE"]="∾̳",
+["Auml"]="Ä",
+["xvee"]="⋁",
["Eacute"]="É",
-["nGtv"]="≫̸",
-["icirc"]="î",
-["twoheadleftarrow"]="↞",
+["LeftFloor"]="⌊",
+["swnwar"]="⤪",
+["Jukcy"]="Є",
+["nless"]="≮",
+["NotSquareSupersetEqual"]="⋣",
+["larrfs"]="⤝",
+["gcy"]="г",
+["solbar"]="⌿",
+["rharul"]="⥬",
+["dscy"]="ѕ",
+["yen"]="¥",
+["ForAll"]="∀",
+["DownArrow"]="↓",
+["qprime"]="⁗",
+["NegativeThickSpace"]="​",
+["part"]="∂",
+["Iukcy"]="І",
+["ltcc"]="⪦",
+["xlArr"]="⟸",
+["fcy"]="ф",
+["gl"]="≷",
+["rsh"]="↱",
+["lrhar"]="⇋",
["divide"]="÷",
-["yopf"]="𝕪",
-["ntlg"]="≸",
-["Darr"]="↡",
+["bemptyv"]="⦰",
+["rx"]="℞",
+["ecy"]="э",
+["ApplyFunction"]="⁡",
+["divideontimes"]="⋇",
+["prod"]="∏",
+["boxHU"]="╩",
+["HARDcy"]="Ъ",
+["mstpos"]="∾",
+["llcorner"]="⌞",
+["rsquor"]="’",
+["NotTildeFullEqual"]="≇",
+["mlcp"]="⫛",
+["cemptyv"]="⦲",
+["Proportional"]="∝",
+["DiacriticalDoubleAcute"]="˝",
+["dcy"]="д",
+["Yacute"]="Ý",
+["egsdot"]="⪘",
["hslash"]="ℏ",
-["Coproduct"]="∐",
-["profline"]="⌒",
-["imagline"]="ℐ",
-["chcy"]="ч",
-["ccedil"]="ç",
-["PrecedesEqual"]="⪯",
-["jcirc"]="ĵ",
-["nang"]="∠⃒",
-["Icirc"]="Î",
-["nbumpe"]="≏̸",
-["incare"]="℅",
-["tint"]="∭",
-["nhArr"]="⇎",
-["emsp13"]=" ",
-["blacktriangleleft"]="◂",
-["Star"]="⋆",
-["hkswarow"]="⤦",
-["NegativeThickSpace"]="​",
-["eDot"]="≑",
-["Euml"]="Ë",
-["scaron"]="š",
-["RightDownVectorBar"]="⥕",
-["cent"]="¢",
-["jukcy"]="є",
-["backsimeq"]="⋍",
-["Ncy"]="Н",
-["DD"]="ⅅ",
-["circledast"]="⊛",
-["ccirc"]="ĉ",
-["rsaquo"]="›",
-["YIcy"]="Ї",
-["iquest"]="¿",
-["NotExists"]="∄",
-["iukcy"]="і",
-["Tab"]=" ",
-["Equilibrium"]="⇌",
-["nLt"]="≪⃒",
-["yen"]="¥",
-["CircleDot"]="⊙",
-["CircleMinus"]="⊖",
-["topf"]="𝕥",
-["equivDD"]="⩸",
-["DoubleLeftRightArrow"]="⇔",
-["ngsim"]="≵",
-["upuparrows"]="⇈",
-["ll"]="≪",
-["cirscir"]="⧂",
-["ShortLeftArrow"]="←",
-["angmsdag"]="⦮",
-["shortmid"]="∣",
-["ngeqslant"]="⩾̸",
-["subset"]="⊂",
-["curvearrowleft"]="↶",
-["gdot"]="ġ",
-["circledcirc"]="⊚",
-["Pcy"]="П",
-["asymp"]="≈",
-["boxUr"]="╙",
-["uopf"]="𝕦",
-["frac15"]="⅕",
-["Iacute"]="Í",
-["Utilde"]="Ũ",
-["Congruent"]="≡",
-["nhpar"]="⫲",
-["capbrcup"]="⩉",
-["ordf"]="ª",
-["SOFTcy"]="Ь",
-["nlArr"]="⇍",
-["not"]="¬",
-["ffllig"]="ffl",
-["nprec"]="⊀",
-["Hat"]="^",
+["infin"]="∞",
["Auml"]="Ä",
-["ntriangleleft"]="⋪",
-["longmapsto"]="⟼",
-["nvrtrie"]="⊵⃒",
-["timesb"]="⊠",
-["lsh"]="↰",
-["Jcy"]="Й",
-["gcirc"]="ĝ",
-["Oacute"]="Ó",
-["vartriangleright"]="⊳",
-["NotRightTriangleEqual"]="⋭",
-["Rightarrow"]="⇒",
-["ast"]="*",
-["hamilt"]="ℋ",
-["Ncedil"]="Ņ",
-["apE"]="⩰",
-["macr"]="¯",
-["cwconint"]="∲",
-["Kcy"]="К",
-["Ucirc"]="Û",
-["hcirc"]="ĥ",
-["yacy"]="я",
-["uml"]="¨",
-["popf"]="𝕡",
-["bumpE"]="⪮",
-["varnothing"]="∅",
-["RightUpVector"]="↾",
-["curren"]="¤",
-["Scedil"]="Ş",
-["FilledVerySmallSquare"]="▪",
-["dollar"]="$",
-["Lcy"]="Л",
-["longrightarrow"]="⟶",
-["LeftTee"]="⊣",
-["excl"]="!",
-["acirc"]="â",
-["wp"]="℘",
-["lcaron"]="ľ",
-["NotGreaterFullEqual"]="≧̸",
-["CounterClockwiseContourIntegral"]="∳",
-["sup2"]="²",
-["rnmid"]="⫮",
-["Lcedil"]="Ļ",
-["ddotseq"]="⩷",
-["tbrk"]="⎴",
-["mlcp"]="⫛",
-["rarrhk"]="↪",
-["Tilde"]="∼",
-["Mcy"]="М",
-["aring"]="å",
-["rarrsim"]="⥴",
-["nopf"]="𝕟",
-["aelig"]="æ",
-["order"]="ℴ",
-["diamondsuit"]="♦",
-["nvsim"]="∼⃒",
-["lhard"]="↽",
-["commat"]="@",
-["qint"]="⨌",
-["lsquo"]="‘",
-["sqcaps"]="⊓︀",
-["circlearrowleft"]="↺",
-["NotElement"]="∉",
-["measuredangle"]="∡",
-["Atilde"]="Ã",
-["CapitalDifferentialD"]="ⅅ",
-["kgreen"]="ĸ",
-["Cscr"]="𝒞",
+["Wcirc"]="Ŵ",
+["larrtl"]="↢",
+["Aacute"]="Á",
+["LeftTriangleEqual"]="⊴",
+["NegativeMediumSpace"]="​",
+["TripleDot"]="⃛",
+["utdot"]="⋰",
+["isinv"]="∈",
+["looparrowright"]="↬",
+["loang"]="⟬",
+["multimap"]="⊸",
["NotLessEqual"]="≰",
-["trpezium"]="⏢",
-["ne"]="≠",
-["NotSuperset"]="⊃⃒",
-["nearrow"]="↗",
-["ncong"]="≇",
-["doteqdot"]="≑",
-["supmult"]="⫂",
-["longleftrightarrow"]="⟷",
-["Rarr"]="↠",
-["DoubleUpArrow"]="⇑",
-["Dscr"]="𝒟",
-["mp"]="∓",
-["jmath"]="ȷ",
-["erarr"]="⥱",
-["searrow"]="↘",
-["Sup"]="⋑",
-["lvnE"]="≨︀",
-["ffilig"]="ffi",
-["NotSquareSupersetEqual"]="⋣",
-["bullet"]="•",
-["bigstar"]="★",
-["cylcty"]="⌭",
-["nvle"]="≤⃒",
-["TildeFullEqual"]="≅",
-["lopf"]="𝕝",
-["sqsupseteq"]="⊒",
-["lt"]="<",
-["geqslant"]="⩾",
+["midcir"]="⫰",
+["nge"]="≱",
["quot"]="\"",
-["le"]="≤",
-["square"]="□",
-["sigma"]="σ",
-["prE"]="⪳",
-["rtrie"]="⊵",
-["triangleq"]="≜",
+["REG"]="®",
+["div"]="÷",
+["complexes"]="ℂ",
+["lhblk"]="▄",
+["gvnE"]="≩︀",
+["leftharpoonup"]="↼",
+["it"]="⁢",
+["clubsuit"]="♣",
+["iff"]="⇔",
+["Hacek"]="ˇ",
+["CircleTimes"]="⊗",
+["Cacute"]="Ć",
+["rarrtl"]="↣",
+["RightDownVector"]="⇂",
+["rarrfs"]="⤞",
+["UpArrowBar"]="⤒",
+["male"]="♂",
+["RightTriangle"]="⊳",
+["GreaterTilde"]="≳",
+["Barwed"]="⌆",
+["ltlarr"]="⥶",
+["Zdot"]="Ż",
+["parsim"]="⫳",
+["Ugrave"]="Ù",
+["Dot"]="¨",
+["circleddash"]="⊝",
+["rsaquo"]="›",
+["hyphen"]="‐",
+["angrt"]="∟",
+["RightTriangleEqual"]="⊵",
+["Darr"]="↡",
+["ulcrop"]="⌏",
+["olcir"]="⦾",
+["gimel"]="ℷ",
+["gel"]="⋛",
+["SquareSubset"]="⊏",
+["Uacute"]="Ú",
+["gt"]=">",
+["lnap"]="⪉",
+["Union"]="⋃",
+["nu"]="ν",
+["and"]="∧",
+["ltcir"]="⩹",
["Fscr"]="ℱ",
+["ee"]="ⅇ",
+["laquo"]="«",
+["Hfr"]="ℌ",
+["prec"]="≺",
+["imagline"]="ℐ",
+["precnsim"]="⋨",
+["zhcy"]="ж",
+["mu"]="μ",
+["rlarr"]="⇄",
+["pound"]="£",
+["origof"]="⊶",
+["rfloor"]="⌋",
+["lnsim"]="⋦",
+["nVdash"]="⊮",
+["otimes"]="⊗",
+["iuml"]="ï",
+["Cscr"]="𝒞",
+["lsime"]="⪍",
+["ngeqq"]="≧̸",
+["Del"]="∇",
+["Coproduct"]="∐",
+["NotSubsetEqual"]="⊈",
+["HilbertSpace"]="ℋ",
+["frac58"]="⅝",
+["cap"]="∩",
+["roang"]="⟭",
+["intlarhk"]="⨗",
+["DownTee"]="⊤",
+["thickapprox"]="≈",
+["prnap"]="⪹",
+["laquo"]="«",
+["lesdot"]="⩿",
+["inodot"]="ı",
+["Hscr"]="ℋ",
+["YIcy"]="Ї",
+["ctdot"]="⋯",
+["thetav"]="ϑ",
+["DoubleUpDownArrow"]="⇕",
+["succ"]="≻",
+["nbumpe"]="≏̸",
+["ReverseElement"]="∋",
+["Oacute"]="Ó",
+["equest"]="≟",
+["Lt"]="≪",
+["Nacute"]="Ń",
["DiacriticalTilde"]="˜",
-["SucceedsSlantEqual"]="≽",
-["mopf"]="𝕞",
-["Ecaron"]="Ě",
-["UpArrowDownArrow"]="⇅",
-["ges"]="⩾",
-["nsqsupe"]="⋣",
-["ubrcy"]="ў",
-["Gscr"]="𝒢",
-["HARDcy"]="Ъ",
-["jopf"]="𝕛",
-["gtquest"]="⩼",
-["iinfin"]="⧜",
-["twixt"]="≬",
+["Escr"]="ℰ",
+["boxvH"]="╪",
+["Ifr"]="ℑ",
+["mp"]="∓",
+["ell"]="ℓ",
+["Iacute"]="Í",
+["NotNestedGreaterGreater"]="⪢̸",
+["raquo"]="»",
+["Zcy"]="З",
+["micro"]="µ",
+["dzigrarr"]="⟿",
+["rtrif"]="▸",
+["Uuml"]="Ü",
+["nvHarr"]="⤄",
+["leqslant"]="⩽",
+["tritime"]="⨻",
+["nlarr"]="↚",
+["NotRightTriangle"]="⋫",
+["apid"]="≋",
+["succeq"]="⪰",
+["NotEqualTilde"]="≂̸",
+["varphi"]="ϕ",
+["Vert"]="‖",
+["int"]="∫",
+["lurdshar"]="⥊",
+["lneqq"]="≨",
+["Jsercy"]="Ј",
+["Superset"]="⊃",
+["subsetneqq"]="⫋",
+["gap"]="⪆",
+["ssmile"]="⌣",
+["Ugrave"]="Ù",
+["IOcy"]="Ё",
+["ltimes"]="⋉",
+["UnderBracket"]="⎵",
+["subseteqq"]="⫅",
+["Dscr"]="𝒟",
+["dtrif"]="▾",
+["raquo"]="»",
+["hbar"]="ℏ",
+["ge"]="≥",
+["cudarrr"]="⤵",
+["icy"]="и",
+["plusdo"]="∔",
+["bull"]="•",
+["weierp"]="℘",
+["mapsto"]="↦",
+["Uring"]="Ů",
+["supplus"]="⫀",
+["Succeeds"]="≻",
+["Ascr"]="𝒜",
+["cdot"]="ċ",
+["nwarr"]="↖",
+["target"]="⌖",
+["dharr"]="⇂",
+["curlyvee"]="⋎",
+["supE"]="⫆",
+["emsp13"]=" ",
["ltrie"]="⊴",
+["olarr"]="↺",
+["RightTeeVector"]="⥛",
+["Vvdash"]="⊪",
+["larrsim"]="⥳",
+["varsubsetneq"]="⊊︀",
+["Not"]="⫬",
+["CenterDot"]="·",
+["PlusMinus"]="±",
+["aring"]="å",
+["Nscr"]="𝒩",
+["delta"]="δ",
+["npre"]="⪯̸",
+["Vcy"]="В",
+["NotVerticalBar"]="∤",
+["scpolint"]="⨓",
+["rcedil"]="ŗ",
+["Lmidot"]="Ŀ",
+["DScy"]="Ѕ",
+["nsubseteq"]="⊈",
+["ngE"]="≧̸",
+["NotSquareSubsetEqual"]="⋢",
+["edot"]="ė",
+["Ucy"]="У",
+["lessapprox"]="⪅",
+["niv"]="∋",
+["Kscr"]="𝒦",
+["LeftVectorBar"]="⥒",
+["nhpar"]="⫲",
+["scedil"]="ş",
+["Uacute"]="Ú",
+["ntrianglelefteq"]="⋬",
+["Otilde"]="Õ",
+["iexcl"]="¡",
+["lbrke"]="⦋",
+["simdot"]="⩪",
+["sigmaf"]="ς",
+["Bfr"]="𝔅",
+["pitchfork"]="⋔",
+["ngeqslant"]="⩾̸",
+["Pscr"]="𝒫",
+["gsime"]="⪎",
+["Ouml"]="Ö",
+["rarrsim"]="⥴",
+["subE"]="⫅",
+["otimesas"]="⨶",
+["lfloor"]="⌊",
+["prop"]="∝",
+["imacr"]="ī",
+["blacktriangleleft"]="◂",
+["Ntilde"]="Ñ",
+["llarr"]="⇇",
+["nsucc"]="⊁",
+["PartialD"]="∂",
+["Iacute"]="Í",
+["gdot"]="ġ",
+["Afr"]="𝔄",
+["Igrave"]="Ì",
["csub"]="⫏",
-["Hscr"]="ℋ",
-["leftharpoondown"]="↽",
+["Mscr"]="ℳ",
+["Scy"]="С",
+["bsime"]="⋍",
+["nequiv"]="≢",
+["scnap"]="⪺",
+["Tab"]=" ",
+["Equal"]="⩵",
+["blacklozenge"]="⧫",
+["nrarrc"]="⤳̸",
+["divide"]="÷",
["RightUpDownVector"]="⥏",
-["LongLeftRightArrow"]="⟷",
-["Im"]="ℑ",
-["dcaron"]="ď",
+["iinfin"]="⧜",
+["precnapprox"]="⪹",
+["dArr"]="⇓",
+["orslope"]="⩗",
+["Rcy"]="Р",
+["sqsub"]="⊏",
+["OverBracket"]="⎴",
+["sum"]="∑",
+["ncedil"]="ņ",
+["ltrPar"]="⦖",
+["ii"]="ⅈ",
+["Gcirc"]="Ĝ",
+["SucceedsTilde"]="≿",
+["RightFloor"]="⌋",
+["osol"]="⊘",
["barwedge"]="⌅",
-["nexist"]="∄",
-["blacktriangledown"]="▾",
-["fork"]="⋔",
-["rhard"]="⇁",
-["cent"]="¢",
-["RightTriangle"]="⊳",
-["Eta"]="Η",
-["dotminus"]="∸",
-["nles"]="⩽̸",
-["larrtl"]="↢",
-["LeftTriangleEqual"]="⊴",
-["hopf"]="𝕙",
-["gammad"]="ϝ",
-["gsime"]="⪎",
-["llhard"]="⥫",
-["precapprox"]="⪷",
-["profalar"]="⌮",
-["lnE"]="≨",
-["ddagger"]="‡",
-["leq"]="≤",
-["smile"]="⌣",
-["robrk"]="⟧",
-["Jscr"]="𝒥",
-["triangleleft"]="◃",
-["acd"]="∿",
-["prod"]="∏",
-["atilde"]="ã",
-["seArr"]="⇘",
-["therefore"]="∴",
-["iopf"]="𝕚",
-["solbar"]="⌿",
-["kcedil"]="ķ",
-["NotHumpEqual"]="≏̸",
-["nspar"]="∦",
-["frac14"]="¼",
-["nsime"]="≄",
-["DoubleLongLeftArrow"]="⟸",
-["sccue"]="≽",
-["models"]="⊧",
-["SupersetEqual"]="⊇",
-["iquest"]="¿",
-["oline"]="‾",
-["lparlt"]="⦓",
-["triplus"]="⨹",
-["nequiv"]="≢",
-["nlE"]="≦̸",
-["nldr"]="‥",
-["equals"]="=",
-["Agrave"]="À",
-["ccaron"]="č",
-["Yacute"]="Ý",
-["Oslash"]="Ø",
-["udarr"]="⇅",
-["ang"]="∠",
-["dopf"]="𝕕",
-["comp"]="∁",
-["caps"]="∩︀",
-["bowtie"]="⋈",
-["glj"]="⪤",
-["ltquest"]="⩻",
-["cirmid"]="⫯",
-["ordm"]="º",
-["esim"]="≂",
-["reals"]="ℝ",
-["LeftTriangle"]="⊲",
-["flat"]="♭",
-["eopf"]="𝕖",
-["lap"]="⪅",
-["not"]="¬",
-["ENG"]="Ŋ",
-["DiacriticalAcute"]="´",
-["sharp"]="♯",
-["longleftarrow"]="⟵",
-["dblac"]="˝",
-["UpArrow"]="↑",
-["npre"]="⪯̸",
-["bopf"]="𝕓",
-["DScy"]="Ѕ",
+["twoheadrightarrow"]="↠",
+["Gscr"]="𝒢",
+["acy"]="а",
+["dtdot"]="⋱",
+["rbrke"]="⦌",
+["imath"]="ı",
+["Hcirc"]="Ĥ",
+["num"]="#",
+["nprec"]="⊀",
+["smallsetminus"]="∖",
+["lesges"]="⪓",
+["LeftUpVector"]="↿",
+["gtdot"]="⋗",
+["theta"]="θ",
+["kappav"]="ϰ",
+["jmath"]="ȷ",
+["Lscr"]="ℒ",
+["Aogon"]="Ą",
+["ltrif"]="◂",
+["DownArrowUpArrow"]="⇵",
+["prap"]="⪷",
+["Racute"]="Ŕ",
+["curlyeqprec"]="⋞",
["bepsi"]="϶",
-["angrtvb"]="⊾",
-["ccaps"]="⩍",
-["UnderParenthesis"]="⏝",
-["subne"]="⊊",
-["succnsim"]="⋩",
-["Bumpeq"]="≎",
-["xvee"]="⋁",
-["colon"]=":",
-["deg"]="°",
-["fnof"]="ƒ",
-["Uarr"]="↟",
-["Zcaron"]="Ž",
-["copf"]="𝕔",
-["Theta"]="Θ",
-["omicron"]="ο",
-["ntriangleright"]="⋫",
-["DoubleLongRightArrow"]="⟹",
-["UnderBrace"]="⏟",
-["GT"]=">",
-["lEg"]="⪋",
-["supplus"]="⫀",
-["acute"]="´",
+["blacktriangle"]="▴",
+["nvap"]="≍⃒",
+["Supset"]="⋑",
+["angmsd"]="∡",
+["boxul"]="┘",
+["LessSlantEqual"]="⩽",
["GT"]=">",
-["upsilon"]="υ",
-["sc"]="≻",
-["xrarr"]="⟶",
-["eng"]="ŋ",
-["it"]="⁢",
-["Ntilde"]="Ñ",
-["Mu"]="Μ",
-["CircleTimes"]="⊗",
-["NotTildeTilde"]="≉",
-["NotLessLess"]="≪̸",
-["vellip"]="⋮",
-["cularrp"]="⤽",
-["UnderBracket"]="⎵",
-["aopf"]="𝕒",
-["itilde"]="ĩ",
-["latail"]="⤙",
-["Nu"]="Ν",
-["Ascr"]="𝒜",
-["complement"]="∁",
-["gjcy"]="ѓ",
-["radic"]="√",
-["maltese"]="✠",
-["glE"]="⪒",
-["plusmn"]="±",
-["curvearrowright"]="↷",
-["gt"]=">",
-["Colone"]="⩴",
-["Bscr"]="ℬ",
-["ic"]="⁣",
-["clubsuit"]="♣",
-["djcy"]="ђ",
-["Oopf"]="𝕆",
-["ltrPar"]="⦖",
-["ngtr"]="≯",
-["eqcirc"]="≖",
-["Hacek"]="ˇ",
-["vdash"]="⊢",
-["NotCupCap"]="≭",
-["Gdot"]="Ġ",
-["jsercy"]="ј",
-["marker"]="▮",
+["nexist"]="∄",
+["ccupssm"]="⩐",
+["Eacute"]="É",
+["ddarr"]="⇊",
+["ntlg"]="≸",
+["Iscr"]="ℐ",
+["Jcirc"]="Ĵ",
+["Sacute"]="Ś",
+["capand"]="⩄",
+["gesdoto"]="⪂",
+["olcross"]="⦻",
+["amalg"]="⨿",
+["rarrlp"]="↬",
+["NotLeftTriangle"]="⋪",
+["reals"]="ℝ",
+["bigcup"]="⋃",
+["NJcy"]="Њ",
+["Odblac"]="Ő",
+["hArr"]="⇔",
+["RightArrowLeftArrow"]="⇄",
+["SOFTcy"]="Ь",
+["Lambda"]="Λ",
+["RightCeiling"]="⌉",
+["Vdash"]="⊩",
+["elinters"]="⏧",
+["lsimg"]="⪏",
["Nopf"]="ℕ",
-["Wfr"]="𝔚",
-["boxHD"]="╦",
-["mho"]="℧",
-["ulcrop"]="⌏",
-["DifferentialD"]="ⅆ",
-["aacute"]="á",
-["lpar"]="(",
+["Esim"]="⩳",
+["vzigzag"]="⦚",
+["acd"]="∿",
+["ccedil"]="ç",
+["lbarr"]="⤌",
+["nmid"]="∤",
+["Backslash"]="∖",
+["Laplacetrf"]="ℒ",
+["npr"]="⊀",
+["nap"]="≉",
+["nsupseteqq"]="⫆̸",
+["igrave"]="ì",
+["LJcy"]="Љ",
+["lessgtr"]="≶",
["angle"]="∠",
-["rharu"]="⇀",
-["Breve"]="˘",
-["Dot"]="¨",
-["rect"]="▭",
-["NotNestedLessLess"]="⪡̸",
-["boxplus"]="⊞",
-["NotSucceeds"]="⊁",
-["gnapprox"]="⪊",
-["DownLeftTeeVector"]="⥞",
-["Xfr"]="𝔛",
-["Lang"]="⟪",
-["Element"]="∈",
-["sung"]="♪",
-["RightVectorBar"]="⥓",
-["simne"]="≆",
-["LeftVector"]="↼",
-["Idot"]="İ",
+["lAarr"]="⇚",
+["notin"]="∉",
+["orv"]="⩛",
+["gtreqqless"]="⪌",
+["CircleMinus"]="⊖",
+["Diamond"]="⋄",
+["map"]="↦",
+["nvsim"]="∼⃒",
+["pi"]="π",
+["pluscir"]="⨢",
+["boxVH"]="╬",
["QUOT"]="\"",
-["nsmid"]="∤",
-["fjlig"]="fj",
-["Ufr"]="𝔘",
-["cuvee"]="⋎",
+["duarr"]="⇵",
+["lgE"]="⪑",
+["lmoust"]="⎰",
+["lsquo"]="‘",
+["rightrightarrows"]="⇉",
+["times"]="×",
+["iuml"]="ï",
+["andslope"]="⩘",
+["order"]="ℴ",
+["Sub"]="⋐",
+["capcap"]="⩋",
+["nabla"]="∇",
+["ntriangleleft"]="⋪",
+["blk14"]="░",
+["Kopf"]="𝕂",
+["lArr"]="⇐",
+["Qopf"]="ℚ",
+["circledS"]="Ⓢ",
+["omid"]="⦶",
+["ord"]="⩝",
+["lvertneqq"]="≨︀",
+["updownarrow"]="↕",
+["yacute"]="ý",
+["ni"]="∋",
+["hamilt"]="ℋ",
+["Jopf"]="𝕁",
+["CupCap"]="≍",
+["lbrack"]="[",
+["preccurlyeq"]="≼",
+["Ropf"]="ℝ",
+["lessdot"]="⋖",
+["blank"]="␣",
+["SucceedsEqual"]="⪰",
+["triangleleft"]="◃",
+["ring"]="˚",
+["omega"]="ω",
+["bowtie"]="⋈",
+["Sqrt"]="√",
+["uuml"]="ü",
+["Udblac"]="Ű",
+["diams"]="♦",
+["Oslash"]="Ø",
["real"]="ℜ",
-["luruhar"]="⥦",
-["NotRightTriangleBar"]="⧐̸",
-["target"]="⌖",
-["lharu"]="↼",
-["CloseCurlyQuote"]="’",
-["rAtail"]="⤜",
-["nparallel"]="∦",
-["brvbar"]="¦",
-["Vfr"]="𝔙",
-["wedbar"]="⩟",
-["REG"]="®",
-["boxur"]="└",
-["Rcaron"]="Ř",
-["Rang"]="⟫",
-["sqsubseteq"]="⊑",
-["div"]="÷",
-["boxul"]="┘",
-["Cdot"]="Ċ",
-["vsupnE"]="⫌︀",
-["zeetrf"]="ℨ",
-["Sfr"]="𝔖",
-["roang"]="⟭",
-["LessTilde"]="≲",
-["equiv"]="≡",
-["frac12"]="½",
-["eacute"]="é",
-["rrarr"]="⇉",
-["nearhk"]="⤤",
-["Zopf"]="ℤ",
-["SucceedsTilde"]="≿",
+["egrave"]="è",
+["prurel"]="⊰",
+["LeftUpDownVector"]="⥑",
+["TildeEqual"]="≃",
+["cuwed"]="⋏",
+["times"]="×",
["ap"]="≈",
-["lfisht"]="⥼",
-["timesd"]="⨰",
-["UpDownArrow"]="↕",
-["xuplus"]="⨄",
-["cularr"]="↶",
-["iprod"]="⨼",
-["AElig"]="Æ",
-["rationals"]="ℚ",
-["geqq"]="≧",
-["Tfr"]="𝔗",
-["Yopf"]="𝕐",
-["rtimes"]="⋊",
-["Tcaron"]="Ť",
-["srarr"]="→",
-["diam"]="⋄",
-["mid"]="∣",
-["imath"]="ı",
-["PlusMinus"]="±",
-["isin"]="∈",
-["vprop"]="∝",
-["RightArrowLeftArrow"]="⇄",
-["NotSubset"]="⊂⃒",
-["bigtriangledown"]="▽",
-["ldsh"]="↲",
-["Qfr"]="𝔔",
-["nvap"]="≍⃒",
-["vert"]="|",
-["Xopf"]="𝕏",
-["lBarr"]="⤎",
-["egsdot"]="⪘",
-["Tcedil"]="Ţ",
-["xi"]="ξ",
-["LeftUpVectorBar"]="⥘",
-["circ"]="ˆ",
-["ocir"]="⊚",
-["gtlPar"]="⦕",
-["Rfr"]="ℜ",
-["RightTriangleBar"]="⧐",
-["nwarhk"]="⤣",
-["zhcy"]="ж",
-["Iukcy"]="І",
-["plusdo"]="∔",
+["lowast"]="∗",
+["Lopf"]="𝕃",
+["bdquo"]="„",
+["blacktriangledown"]="▾",
+["vBarv"]="⫩",
+["Longleftarrow"]="⟸",
+["lesg"]="⋚︀",
+["Popf"]="ℙ",
+["iogon"]="į",
+["vellip"]="⋮",
+["Ntilde"]="Ñ",
+["cwconint"]="∲",
["boxv"]="│",
-["minusb"]="⊟",
-["Ncaron"]="Ň",
-["angmsdaa"]="⦨",
-["varsubsetneqq"]="⫋︀",
-["cirfnint"]="⨐",
-["LongRightArrow"]="⟶",
-["ddarr"]="⇊",
-["piv"]="ϖ",
-["fopf"]="𝕗",
-["Ofr"]="𝔒",
-["fflig"]="ff",
-["Jukcy"]="Є",
-["xhArr"]="⟺",
-["ncy"]="н",
-["Scaron"]="Š",
-["TildeEqual"]="≃",
-["subrarr"]="⥹",
-["iacute"]="í",
-["ogt"]="⧁",
-["nvge"]="≥⃒",
-["vee"]="∨",
-["UnderBar"]="_",
-["andslope"]="⩘",
-["gopf"]="𝕘",
-["Pfr"]="𝔓",
-["die"]="¨",
+["boxbox"]="⧉",
+["langd"]="⦑",
+["diam"]="⋄",
+["boxHu"]="╧",
+["acute"]="´",
["Uopf"]="𝕌",
+["Fcy"]="Ф",
+["vee"]="∨",
+["eqslantless"]="⪕",
+["NotLeftTriangleEqual"]="⋬",
+["OverBrace"]="⏞",
+["beta"]="β",
+["Otilde"]="Õ",
+["fjlig"]="fj",
+["uacute"]="ú",
+["CirclePlus"]="⊕",
+["Mellintrf"]="ℳ",
+["Vopf"]="𝕍",
+["Gcy"]="Г",
+["searhk"]="⤥",
+["boxur"]="└",
+["LeftTeeVector"]="⥚",
+["nsubE"]="⫅̸",
+["gvertneqq"]="≩︀",
+["eqcirc"]="≖",
+["nrightarrow"]="↛",
+["DJcy"]="Ђ",
+["tdot"]="⃛",
+["Dcy"]="Д",
+["Sopf"]="𝕊",
+["range"]="⦥",
+["agrave"]="à",
+["gtrsim"]="≳",
["RightArrowBar"]="⇥",
-["orarr"]="↻",
-["Precedes"]="≺",
-["oror"]="⩖",
-["straightepsilon"]="ϵ",
-["cong"]="≅",
-["TScy"]="Ц",
-["nleftarrow"]="↚",
-["DZcy"]="Џ",
-["horbar"]="―",
+["larrlp"]="↫",
+["le"]="≤",
+["xi"]="ξ",
+["gla"]="⪥",
+["GT"]=">",
+["leftarrowtail"]="↢",
+["commat"]="@",
+["rightarrowtail"]="↣",
+["approx"]="≈",
+["sdot"]="⋅",
["Topf"]="𝕋",
-["Cayleys"]="ℭ",
-["leqq"]="≦",
-["curlyeqprec"]="⋞",
-["nLeftarrow"]="⇍",
-["pcy"]="п",
-["realine"]="ℛ",
-["nlsim"]="≴",
+["Ecy"]="Э",
+["eplus"]="⩱",
+["cir"]="○",
["Rarrtl"]="⤖",
-["CupCap"]="≍",
-["vDash"]="⊨",
-["shortparallel"]="∥",
-["ExponentialE"]="ⅇ",
-["Sopf"]="𝕊",
-["iiota"]="℩",
-["Nfr"]="𝔑",
-["pointint"]="⨕",
-["NotGreaterLess"]="≹",
-["olcross"]="⦻",
-["kcy"]="к",
-["complexes"]="ℂ",
-["varepsilon"]="ϵ",
-["Fouriertrf"]="ℱ",
-["rho"]="ρ",
-["Lsh"]="↰",
-["exponentiale"]="ⅇ",
-["hookrightarrow"]="↪",
-["Ropf"]="ℝ",
-["lAtail"]="⤛",
-["Kfr"]="𝔎",
-["bsim"]="∽",
-["jcy"]="й",
-["frac34"]="¾",
-["DotDot"]="⃜",
+["Emacr"]="Ē",
+["Dcaron"]="Ď",
+["Sc"]="⪼",
+["cent"]="¢",
+["rtri"]="▹",
+["cedil"]="¸",
+["spades"]="♠",
+["upsilon"]="υ",
+["boxminus"]="⊟",
+["angmsdaa"]="⦨",
+["zdot"]="ż",
+["Bcy"]="Б",
+["Zscr"]="𝒵",
+["looparrowleft"]="↫",
+["Dfr"]="𝔇",
+["Bumpeq"]="≎",
+["nLeftarrow"]="⇍",
+["equiv"]="≡",
+["Ccaron"]="Č",
+["UpperLeftArrow"]="↖",
+["SubsetEqual"]="⊆",
+["nrArr"]="⇏",
+["loarr"]="⇽",
+["minusdu"]="⨪",
+["sup3"]="³",
+["Zopf"]="ℤ",
+["elsdot"]="⪗",
+["NotLessLess"]="≪̸",
+["eta"]="η",
+["ubrcy"]="ў",
+["Yscr"]="𝒴",
+["subset"]="⊂",
+["Cfr"]="ℭ",
+["harrcir"]="⥈",
+["supsetneq"]="⊋",
+["LeftUpVectorBar"]="⥘",
+["LT"]="<",
+["DoubleLeftArrow"]="⇐",
+["circledcirc"]="⊚",
+["bkarow"]="⤍",
+["rangd"]="⦒",
+["downharpoonright"]="⇂",
+["Wopf"]="𝕎",
+["ast"]="*",
+["planck"]="ℏ",
+["gtrdot"]="⋗",
+["Ffr"]="𝔉",
+["rArr"]="⇒",
+["VeryThinSpace"]=" ",
+["Ecaron"]="Ě",
+["RightVectorBar"]="⥓",
+["divonx"]="⋇",
+["Xopf"]="𝕏",
+["nsubset"]="⊂⃒",
+["Otimes"]="⨷",
+["bot"]="⊥",
+["nsime"]="≄",
["thorn"]="þ",
-["ThickSpace"]="  ",
-["SquareUnion"]="⊔",
-["frac58"]="⅝",
-["dfisht"]="⥿",
-["MediumSpace"]=" ",
-["Lfr"]="𝔏",
-["Qopf"]="ℚ",
+["subsetneq"]="⊊",
+["nltri"]="⋪",
+["Cayleys"]="ℭ",
+["Efr"]="𝔈",
+["Intersection"]="⋂",
+["UnderBar"]="_",
+["fpartint"]="⨍",
+["Iuml"]="Ï",
+["rsquo"]="’",
+["ecir"]="≖",
+["nis"]="⋼",
+["fscr"]="𝒻",
+["hellip"]="…",
+["ogt"]="⧁",
["ntgl"]="≹",
-["LessFullEqual"]="≦",
-["malt"]="✠",
-["mcy"]="м",
-["NotGreaterEqual"]="≱",
-["bottom"]="⊥",
-["NotSucceedsEqual"]="⪰̸",
-["lcedil"]="ļ",
-["infintie"]="⧝",
-["Lcaron"]="Ľ",
-["NotSquareSubset"]="⊏̸",
-["brvbar"]="¦",
-["fallingdotseq"]="≒",
-["AElig"]="Æ",
-["swarhk"]="⤦",
-["Ifr"]="ℑ",
-["pi"]="π",
-["lcy"]="л",
-["copy"]="©",
-["dlcorn"]="⌞",
-["oacute"]="ó",
-["gtreqless"]="⋛",
-["neArr"]="⇗",
+["frac14"]="¼",
+["squf"]="▪",
+["circ"]="ˆ",
+["prE"]="⪳",
+["ordf"]="ª",
["ZHcy"]="Ж",
-["Vdashl"]="⫦",
-["darr"]="↓",
-["circeq"]="≗",
+["NegativeVeryThinSpace"]="​",
+["quot"]="\"",
+["excl"]="!",
+["sqcaps"]="⊓︀",
+["gfr"]="𝔤",
+["varsigma"]="ς",
+["nwarrow"]="↖",
+["reg"]="®",
+["longmapsto"]="⟼",
+["And"]="⩓",
+["cuvee"]="⋎",
+["zwj"]="‍",
+["plankv"]="ℏ",
+["varepsilon"]="ϵ",
+["Aopf"]="𝔸",
+["UpTee"]="⊥",
+["lescc"]="⪨",
+["ltri"]="◃",
+["iiint"]="∭",
+["ccups"]="⩌",
+["alefsym"]="ℵ",
+["succneqq"]="⪶",
+["hscr"]="𝒽",
+["Or"]="⩔",
["yuml"]="ÿ",
-["Jfr"]="𝔍",
-["Product"]="∏",
-["boxDL"]="╗",
-["el"]="⪙",
-["supe"]="⊇",
-["frac13"]="⅓",
-["Barwed"]="⌆",
-["larrpl"]="⤹",
-["SHCHcy"]="Щ",
-["LeftUpDownVector"]="⥑",
-["Diamond"]="⋄",
-["DownLeftVectorBar"]="⥖",
-["Cross"]="⨯",
-["ncup"]="⩂",
-["supnE"]="⫌",
-["lne"]="⪇",
-["micro"]="µ",
-["lowbar"]="_",
-["perp"]="⊥",
-["sqcap"]="⊓",
-["Gfr"]="𝔊",
-["raemptyv"]="⦳",
-["gesl"]="⋛︀",
-["drcrop"]="⌌",
-["boxUL"]="╝",
-["becaus"]="∵",
-["gne"]="⪈",
-["scap"]="⪸",
-["swarrow"]="↙",
-["nesim"]="≂̸",
-["DoubleDot"]="¨",
-["Mopf"]="𝕄",
-["apid"]="≋",
-["InvisibleComma"]="⁣",
-["Backslash"]="∖",
-["mnplus"]="∓",
-["niv"]="∋",
-["Hfr"]="ℌ",
-["rarrlp"]="↬",
-["Because"]="∵",
-["parsl"]="⫽",
-["sup1"]="¹",
-["Lt"]="≪",
-["par"]="∥",
-["Iota"]="Ι",
-["beth"]="ℶ",
-["Lopf"]="𝕃",
+["rcub"]="}",
+["lt"]="<",
+["vArr"]="⇕",
+["EqualTilde"]="≂",
+["vDash"]="⊨",
+["RightArrow"]="→",
+["dlcorn"]="⌞",
+["Barv"]="⫧",
+["nsc"]="⊁",
+["Proportion"]="∷",
+["iota"]="ι",
+["gscr"]="ℊ",
+["abreve"]="ă",
+["ThickSpace"]="  ",
+["szlig"]="ß",
+["lhard"]="↽",
+["emptyv"]="∅",
+["Tau"]="Τ",
+["sharp"]="♯",
+["bNot"]="⫭",
+["LongLeftRightArrow"]="⟷",
+["frac23"]="⅔",
+["NotEqual"]="≠",
+["scE"]="⪴",
+["jfr"]="𝔧",
+["bscr"]="𝒷",
+["uhblk"]="▀",
+["frac35"]="⅗",
+["TSHcy"]="Ћ",
+["ntrianglerighteq"]="⋭",
+["Tcedil"]="Ţ",
+["NotGreaterFullEqual"]="≧̸",
+["asympeq"]="≍",
+["oror"]="⩖",
+["ecirc"]="ê",
+["ohbar"]="⦵",
+["Rho"]="Ρ",
+["iacute"]="í",
+["ascr"]="𝒶",
+["RightUpVector"]="↾",
+["Ocirc"]="Ô",
+["cedil"]="¸",
+["sect"]="§",
+["angmsdab"]="⦩",
+["FilledVerySmallSquare"]="▪",
+["curlywedge"]="⋏",
+["lesdotor"]="⪃",
+["esdot"]="≐",
+["eqvparsl"]="⧥",
["Cap"]="⋒",
-["Aring"]="Å",
-["rarr"]="→",
-["Efr"]="𝔈",
-["bigcup"]="⋃",
-["DownLeftRightVector"]="⥐",
-["lesges"]="⪓",
-["NegativeThinSpace"]="​",
-["DownRightTeeVector"]="⥟",
-["npolint"]="⨔",
-["gEl"]="⪌",
-["lltri"]="◺",
-["ogon"]="˛",
-["LessEqualGreater"]="⋚",
-["sqsupset"]="⊐",
-["NotSubsetEqual"]="⊈",
-["Ubrcy"]="Ў",
-["ShortDownArrow"]="↓",
-["ugrave"]="ù",
-["Dcaron"]="Ď",
-["subE"]="⫅",
-["divide"]="÷",
-["bigotimes"]="⨂",
-["dscy"]="ѕ",
-["wreath"]="≀",
-["Jopf"]="𝕁",
-["pre"]="⪯",
-["tdot"]="⃛",
-["Cfr"]="ℭ",
-["Uogon"]="Ų",
-["softcy"]="ь",
-["isinE"]="⋹",
-["Dstrok"]="Đ",
-["Jsercy"]="Ј",
-["capdot"]="⩀",
-["realpart"]="ℜ",
-["hearts"]="♥",
-["Atilde"]="Ã",
-["LeftArrowRightArrow"]="⇆",
-["upharpoonleft"]="↿",
-["Iopf"]="𝕀",
-["Intersection"]="⋂",
-["midcir"]="⫰",
-["ocirc"]="ô",
-["sdot"]="⋅",
-["Dfr"]="𝔇",
-["gla"]="⪥",
-["DiacriticalGrave"]="`",
+["dscr"]="𝒹",
+["rbrace"]="}",
+["nsccue"]="⋡",
+["neArr"]="⇗",
+["rightthreetimes"]="⋌",
+["plusmn"]="±",
["Ubreve"]="Ŭ",
-["int"]="∫",
-["PrecedesSlantEqual"]="≼",
-["Square"]="□",
-["Acy"]="А",
+["ifr"]="𝔦",
+["Poincareplane"]="ℌ",
+["leftrightarrows"]="⇆",
+["scnsim"]="⋩",
+["cscr"]="𝒸",
+["NotHumpEqual"]="≏̸",
+["capbrcup"]="⩉",
+["curarr"]="↷",
+["notinvb"]="⋷",
+["LeftArrow"]="←",
+["Gopf"]="𝔾",
+["ldrushar"]="⥋",
+["nscr"]="𝓃",
+["Gg"]="⋙",
+["ouml"]="ö",
+["nsce"]="⪰̸",
+["cupbrcap"]="⩈",
+["nLt"]="≪⃒",
+["bullet"]="•",
+["nsqsupe"]="⋣",
+["rect"]="▭",
+["lbrace"]="{",
+["Fopf"]="𝔽",
+["COPY"]="©",
+["epar"]="⋕",
+["mscr"]="𝓂",
+["odsold"]="⦼",
+["cupor"]="⩅",
+["not"]="¬",
+["subsim"]="⫇",
+["hoarr"]="⇿",
+["Scedil"]="Ş",
+["eacute"]="é",
+["emsp"]=" ",
+["uml"]="¨",
+["igrave"]="ì",
+["pscr"]="𝓅",
+["LeftTee"]="⊣",
+["Cedilla"]="¸",
+["Iopf"]="𝕀",
+["HumpEqual"]="≏",
+["les"]="⩽",
+["Rcedil"]="Ŗ",
+["lsquor"]="‚",
+["raemptyv"]="⦳",
+["NotSucceedsSlantEqual"]="⋡",
+["SuchThat"]="∋",
+["vert"]="|",
+["backcong"]="≌",
["Hopf"]="ℍ",
-["precsim"]="≾",
-["nleq"]="≰",
-["urcorn"]="⌝",
-["hyphen"]="‐",
-["FilledSmallSquare"]="◼",
-["zdot"]="ż",
-["ndash"]="–",
-["hbar"]="ℏ",
-["Wopf"]="𝕎",
-["Esim"]="⩳",
-["subsetneq"]="⊊",
-["boxhD"]="╥",
-["searhk"]="⤥",
-["late"]="⪭",
+["CircleDot"]="⊙",
+["Kappa"]="Κ",
+["conint"]="∮",
+["DZcy"]="Џ",
+["prsim"]="≾",
+["Copf"]="ℂ",
+["curvearrowright"]="↷",
+["twixt"]="≬",
+["curren"]="¤",
+["rtriltri"]="⧎",
+["jscr"]="𝒿",
+["cupcup"]="⩊",
+["Lcedil"]="Ļ",
+["supseteqq"]="⫆",
+["bfr"]="𝔟",
+["lesseqqgtr"]="⪋",
+["leftleftarrows"]="⇇",
+["Bopf"]="𝔹",
+["acute"]="´",
["blacktriangleright"]="▸",
-["auml"]="ä",
-["NotLessTilde"]="≴",
-["Bfr"]="𝔅",
-["grave"]="`",
-["ltlarr"]="⥶",
-["Aogon"]="Ą",
-["sdote"]="⩦",
-["gtrsim"]="≳",
-["nvinfin"]="⧞",
-["lgE"]="⪑",
-["mdash"]="—",
-["Vopf"]="𝕍",
-["leftrightarrow"]="↔",
-["RBarr"]="⤐",
-["amalg"]="⨿",
-["preccurlyeq"]="≼",
-["EqualTilde"]="≂",
-["scpolint"]="⨓",
-["NotHumpDownHump"]="≎̸",
-["uparrow"]="↑",
-["downarrow"]="↓",
-["boxdL"]="╕",
-["Hstrok"]="Ħ",
-["Ccaron"]="Č",
-["succsim"]="≿",
-["RightFloor"]="⌋",
-["DownBreve"]="̑",
-["succapprox"]="⪸",
-["dsol"]="⧶",
-["napid"]="≋̸",
-["nprcue"]="⋠",
+["frac34"]="¾",
+["Gbreve"]="Ğ",
+["Updownarrow"]="⇕",
+["iscr"]="𝒾",
+["sigmav"]="ς",
+["trade"]="™",
+["minusb"]="⊟",
+["GJcy"]="Ѓ",
+["TildeFullEqual"]="≅",
+["DoubleRightTee"]="⊨",
+["nang"]="∠⃒",
+["ddotseq"]="⩷",
+["copy"]="©",
["Eopf"]="𝔼",
-["ell"]="ℓ",
-["cupdot"]="⊍",
-["Not"]="⫬",
-["zigrarr"]="⇝",
-["downharpoonright"]="⇂",
-["nisd"]="⋺",
-["lotimes"]="⨴",
-["plusmn"]="±",
-["ngE"]="≧̸",
-["odash"]="⊝",
-["emptyset"]="∅",
+["Psi"]="Ψ",
+["UpperRightArrow"]="↗",
+["geqq"]="≧",
+["subedot"]="⫃",
+["nvlArr"]="⤂",
+["Ncedil"]="Ņ",
+["vsupne"]="⊋︀",
+["supset"]="⊃",
["squarf"]="▪",
-["NotGreaterTilde"]="≵",
-["NotTildeFullEqual"]="≇",
-["DownArrowUpArrow"]="⇵",
-["nwarrow"]="↖",
-["looparrowright"]="↬",
+["LeftDoubleBracket"]="⟦",
+["utrif"]="▴",
["Dopf"]="𝔻",
-["oplus"]="⊕",
-["UpEquilibrium"]="⥮",
-["leftthreetimes"]="⋋",
-["DoubleLeftTee"]="⫤",
-["nabla"]="∇",
-["RuleDelayed"]="⧴",
-["euml"]="ë",
-["varsupsetneqq"]="⫌︀",
-["upsi"]="υ",
-["supsup"]="⫖",
-["bsol"]="\\",
-["Copf"]="ℂ",
-["DDotrahd"]="⤑",
-["Upsilon"]="Υ",
-["UpperRightArrow"]="↗",
-["nedot"]="≐̸",
-["NotEqual"]="≠",
-["bumpeq"]="≏",
-["emsp14"]=" ",
-["frac38"]="⅜",
-["DownTeeArrow"]="↧",
-["Bopf"]="𝔹",
-["capand"]="⩄",
-["nleqq"]="≦̸",
-["ratio"]="∶",
-["eplus"]="⩱",
-["nge"]="≱",
-["laquo"]="«",
-["urtri"]="◹",
-["LeftUpVector"]="↿",
-["gl"]="≷",
-["Gt"]="≫",
-["andd"]="⩜",
+["ape"]="≊",
+["gEl"]="⪌",
+["COPY"]="©",
+["afr"]="𝔞",
+["Acy"]="А",
+["ldquor"]="„",
+["because"]="∵",
+["Pr"]="⪻",
+["OverBar"]="‾",
+["lang"]="⟨",
+["mopf"]="𝕞",
+["crarr"]="↵",
+["Epsilon"]="Ε",
+["Nfr"]="𝔑",
+["kjcy"]="ќ",
+["TildeTilde"]="≈",
+["bsim"]="∽",
+["lcy"]="л",
+["larrb"]="⇤",
+["ncong"]="≇",
+["ENG"]="Ŋ",
+["brvbar"]="¦",
+["Rightarrow"]="⇒",
+["nopf"]="𝕟",
+["Wfr"]="𝔚",
+["ljcy"]="љ",
+["diamondsuit"]="♦",
+["latail"]="⤙",
+["lambda"]="λ",
+["frac14"]="¼",
+["mcy"]="м",
+["nparsl"]="⫽⃥",
+["lBarr"]="⤎",
+["subdot"]="⪽",
+["frac12"]="½",
+["kopf"]="𝕜",
+["LeftCeiling"]="⌈",
+["erarr"]="⥱",
+["pre"]="⪯",
+["varr"]="↕",
+["Pi"]="Π",
+["sub"]="⊂",
+["ncy"]="н",
+["marker"]="▮",
+["rpargt"]="⦔",
+["supe"]="⊇",
+["veebar"]="⊻",
+["checkmark"]="✓",
+["nbsp"]=" ",
+["sqsupseteq"]="⊒",
+["upharpoonright"]="↾",
+["lopf"]="𝕝",
+["Omicron"]="Ο",
+["ccaps"]="⩍",
+["lrhard"]="⥭",
["Lstrok"]="Ł",
-["gamma"]="γ",
-["Sc"]="⪼",
-["Aopf"]="𝔸",
-["pluscir"]="⨢",
-["Itilde"]="Ĩ",
-["DoubleRightTee"]="⊨",
-["pluse"]="⩲",
-["iiint"]="∭",
-["dotplus"]="∔",
-["vrtri"]="⊳",
-["Proportion"]="∷",
-["bne"]="=⃥",
-["cuepr"]="⋞",
+["Mfr"]="𝔐",
+["njcy"]="њ",
+["ocy"]="о",
+["Zcaron"]="Ž",
+["NotSucceeds"]="⊁",
+["rarrbfs"]="⤠",
+["gtrapprox"]="⪆",
+["oS"]="Ⓢ",
+["diamond"]="⋄",
+["gesdot"]="⪀",
+["urcorner"]="⌝",
+["lotimes"]="⨴",
+["pertenk"]="‱",
+["rfisht"]="⥽",
+["Zfr"]="ℨ",
+["Map"]="⤅",
+["cross"]="✗",
+["DifferentialD"]="ⅆ",
+["boxtimes"]="⊠",
+["horbar"]="―",
+["lg"]="≶",
+["orarr"]="↻",
+["Vbar"]="⫫",
+["ropf"]="𝕣",
+["NotDoubleVerticalBar"]="∦",
+["Sfr"]="𝔖",
+["Iuml"]="Ï",
+["leftharpoondown"]="↽",
+["atilde"]="ã",
+["VerticalTilde"]="≀",
+["DoubleContourIntegral"]="∯",
+["longleftarrow"]="⟵",
+["Im"]="ℑ",
+["RightUpVectorBar"]="⥔",
+["nGg"]="⋙̸",
+["scap"]="⪸",
+["nrarr"]="↛",
+["ycy"]="ы",
+["ucirc"]="û",
+["qopf"]="𝕢",
+["oopf"]="𝕠",
+["yacute"]="ý",
+["Xfr"]="𝔛",
+["fork"]="⋔",
+["in"]="∈",
+["xcap"]="⋂",
+["check"]="✓",
+["jcy"]="й",
+["Phi"]="Φ",
+["doteq"]="≐",
["vBar"]="⫨",
-["yucy"]="ю",
-["PrecedesTilde"]="≾",
-["varr"]="↕",
-["leftarrowtail"]="↢",
-["rangle"]="⟩",
-["subsub"]="⫕",
-["rightarrowtail"]="↣",
-["oslash"]="ø",
-["mapstodown"]="↧",
-["sqsube"]="⊑",
-["NewLine"]="\n",
-["Vdash"]="⊩",
-["num"]="#",
-["umacr"]="ū",
-["InvisibleTimes"]="⁢",
-["bemptyv"]="⦰",
+["frown"]="⌢",
["Iogon"]="Į",
-["ssmile"]="⌣",
-["timesbar"]="⨱",
-["Tstrok"]="Ŧ",
-["Icy"]="И",
-["zacute"]="ź",
-["Cedilla"]="¸",
-["daleth"]="ℸ",
-["semi"]=";",
-["ssetmn"]="∖",
-["subdot"]="⪽",
-["Bernoullis"]="ℬ",
-["otimesas"]="⨶",
-["circleddash"]="⊝",
-["circlearrowright"]="↻",
-["NotLeftTriangleEqual"]="⋬",
-["NotTilde"]="≁",
-["npart"]="∂̸",
-["Gbreve"]="Ğ",
-["gtrless"]="≷",
-["pound"]="£",
-["curlyeqsucc"]="⋟",
-["blacklozenge"]="⧫",
-["ldca"]="⤶",
-["nsucc"]="⊁",
-["top"]="⊤",
-["ufr"]="𝔲",
-["sscr"]="𝓈",
-["eDDot"]="⩷",
-["Updownarrow"]="⇕",
-["loz"]="◊",
-["Gcy"]="Г",
-["boxdl"]="┐",
+["gnsim"]="⋧",
+["nsupset"]="⊃⃒",
+["equals"]="=",
+["angmsdac"]="⦪",
+["odash"]="⊝",
+["Hstrok"]="Ħ",
+["homtht"]="∻",
+["maltese"]="✠",
+["esim"]="≂",
+["realine"]="ℛ",
+["straightepsilon"]="ϵ",
+["utri"]="▵",
+["primes"]="ℙ",
+["dbkarow"]="⤏",
+["NotLessTilde"]="≴",
+["nvrArr"]="⤃",
+["cularrp"]="⤽",
+["supsup"]="⫖",
+["rang"]="⟩",
+["nshortmid"]="∤",
+["NotCupCap"]="≭",
+["gnE"]="≩",
+["otilde"]="õ",
+["LeftTriangle"]="⊲",
+["oelig"]="œ",
+["curarrm"]="⤼",
+["orderof"]="ℴ",
+["DoubleLongLeftArrow"]="⟸",
+["OverParenthesis"]="⏜",
+["amacr"]="ā",
+["copysr"]="℗",
+["acirc"]="â",
+["LeftArrowRightArrow"]="⇆",
+["filig"]="fi",
+["uopf"]="𝕦",
+["rlhar"]="⇌",
+["dharl"]="⇃",
+["rAarr"]="⇛",
+["rarrw"]="↝",
+["isin"]="∈",
+["simg"]="⪞",
+["NoBreak"]="⁠",
+["rAtail"]="⤜",
+["ndash"]="–",
+["IJlig"]="IJ",
+["dfr"]="𝔡",
+["ohm"]="Ω",
+["breve"]="˘",
+["ccedil"]="ç",
+["topf"]="𝕥",
+["nvDash"]="⊭",
+["RBarr"]="⤐",
+["clubs"]="♣",
["napos"]="ʼn",
-["Sqrt"]="√",
-["xsqcup"]="⨆",
-["Implies"]="⇒",
-["uring"]="ů",
-["thetav"]="ϑ",
-["iiiint"]="⨌",
-["nLeftrightarrow"]="⇎",
-["lobrk"]="⟦",
-["xfr"]="𝔵",
-["Abreve"]="Ă",
-["micro"]="µ",
-["quatint"]="⨖",
-["congdot"]="⩭",
-["nrtrie"]="⋭",
-["Fcy"]="Ф",
-["hksearow"]="⤥",
-["LowerLeftArrow"]="↙",
-["rdca"]="⤷",
-["OverBar"]="‾",
-["frac12"]="½",
-["imacr"]="ī",
-["boxVL"]="╣",
-["sfr"]="𝔰",
-["ensp"]=" ",
-["dwangle"]="⦦",
-["boxh"]="─",
-["Eogon"]="Ę",
+["ngtr"]="≯",
+["Tstrok"]="Ŧ",
+["lrarr"]="⇆",
+["eqslantgtr"]="⪖",
+["efr"]="𝔢",
+["gne"]="⪈",
+["csube"]="⫑",
+["Xi"]="Ξ",
+["sopf"]="𝕤",
+["LeftVector"]="↼",
+["ggg"]="⋙",
+["Ubrcy"]="Ў",
+["die"]="¨",
+["topbot"]="⌶",
+["Rfr"]="ℜ",
+["ofcir"]="⦿",
["imped"]="Ƶ",
-["Ecy"]="Э",
-["lates"]="⪭︀",
-["phi"]="φ",
-["minusd"]="∸",
-["planckh"]="ℎ",
-["Ocirc"]="Ô",
-["lE"]="≦",
-["sum"]="∑",
-["lrtri"]="⊿",
-["ruluhar"]="⥨",
-["lAarr"]="⇚",
-["DownArrow"]="↓",
-["zscr"]="𝓏",
-["questeq"]="≟",
-["ngeqq"]="≧̸",
-["And"]="⩓",
-["Dcy"]="Д",
-["angrtvbd"]="⦝",
-["rarrpl"]="⥅",
-["thkap"]="≈",
-["Otimes"]="⨷",
-["lesssim"]="≲",
-["gE"]="≧",
-["ouml"]="ö",
-["nsubseteq"]="⊈",
-["bigcirc"]="◯",
+["plusmn"]="±",
+["nles"]="⩽̸",
+["pcy"]="п",
+["permil"]="‰",
+["notinE"]="⋹̸",
+["bigoplus"]="⨁",
+["boxplus"]="⊞",
+["doublebarwedge"]="⌆",
+["ccaron"]="č",
+["asymp"]="≈",
+["sup1"]="¹",
+["bumpeq"]="≏",
+["nrtrie"]="⋭",
+["larrbfs"]="⤟",
+["emacr"]="ē",
+["gtrless"]="≷",
+["Kfr"]="𝔎",
+["plus"]="+",
+["risingdotseq"]="≓",
+["notindot"]="⋵̸",
+["Subset"]="⋐",
+["CloseCurlyDoubleQuote"]="”",
+["nlsim"]="≴",
+["dcaron"]="ď",
["boxVR"]="╠",
-["Vert"]="‖",
-["naturals"]="ℕ",
-["plussim"]="⨦",
-["wscr"]="𝓌",
-["raquo"]="»",
-["bigodot"]="⨀",
-["dashv"]="⊣",
-["hairsp"]=" ",
-["inodot"]="ı",
-["vnsup"]="⊃⃒",
+["lne"]="⪇",
+["Pfr"]="𝔓",
+["rightsquigarrow"]="↝",
+["phone"]="☎",
+["DiacriticalDot"]="˙",
+["Congruent"]="≡",
+["SquareIntersection"]="⊓",
+["ordf"]="ª",
+["loz"]="◊",
["cire"]="≗",
-["vartriangleleft"]="⊲",
-["rbrke"]="⦌",
-["boxuL"]="╛",
-["sce"]="⪰",
-["nrtri"]="⋫",
-["loarr"]="⇽",
-["ShortRightArrow"]="→",
-["xscr"]="𝓍",
-["Bcy"]="Б",
-["HumpEqual"]="≏",
-["lmidot"]="ŀ",
-["DownLeftVector"]="↽",
-["leftharpoonup"]="↼",
+["ecaron"]="ě",
+["nsub"]="⊄",
+["Fouriertrf"]="ℱ",
+["Qfr"]="𝔔",
+["dblac"]="˝",
+["sc"]="≻",
+["xrarr"]="⟶",
+["ImaginaryI"]="ⅈ",
+["angmsdag"]="⦮",
+["wopf"]="𝕨",
+["middot"]="·",
+["gsiml"]="⪐",
+["biguplus"]="⨄",
+["Prime"]="″",
+["bigcirc"]="◯",
+["vsubnE"]="⫋︀",
+["lrtri"]="⊿",
+["nparallel"]="∦",
["lbbrk"]="❲",
-["rarrtl"]="↣",
-["SucceedsEqual"]="⪰",
-["HumpDownHump"]="≎",
-["Vee"]="⋁",
-["Gopf"]="𝔾",
-["otilde"]="õ",
-["ofr"]="𝔬",
-["Sub"]="⋐",
-["gnE"]="≩",
-["SquareSuperset"]="⊐",
-["leftrightharpoons"]="⇋",
-["tosa"]="⤩",
-["Ucirc"]="Û",
-["mscr"]="𝓂",
-["Exists"]="∃",
-["langle"]="⟨",
-["rfr"]="𝔯",
-["THORN"]="Þ",
-["gtreqqless"]="⪌",
-["eqvparsl"]="⧥",
-["NotCongruent"]="≢",
-["phiv"]="ϕ",
-["lsquor"]="‚",
-["prec"]="≺",
-["igrave"]="ì",
-["Fopf"]="𝔽",
-["nwArr"]="⇖",
-["nscr"]="𝓃",
-["gescc"]="⪩",
-["intprod"]="⨼",
-["larrlp"]="↫",
-["AMP"]="&",
-["psi"]="ψ",
-["mDDot"]="∺",
-["VDash"]="⊫",
-["Lleftarrow"]="⇚",
-["mfr"]="𝔪",
+["dotsquare"]="⊡",
+["rceil"]="⌉",
["gesles"]="⪔",
-["kscr"]="𝓀",
-["Omega"]="Ω",
-["bumpe"]="≏",
-["NotDoubleVerticalBar"]="∦",
-["frac18"]="⅛",
-["ecolon"]="≕",
-["compfn"]="∘",
-["supdot"]="⪾",
-["Alpha"]="Α",
-["rsquor"]="’",
+["roarr"]="⇾",
+["simplus"]="⨤",
+["lagran"]="ℒ",
+["pr"]="≺",
+["mnplus"]="∓",
+["Iota"]="Ι",
+["NestedLessLess"]="≪",
+["utilde"]="ũ",
+["mldr"]="…",
+["bigstar"]="★",
+["micro"]="µ",
["percnt"]="%",
-["pfr"]="𝔭",
-["frasl"]="⁄",
-["lscr"]="𝓁",
-["aleph"]="ℵ",
-["swArr"]="⇙",
-["uuml"]="ü",
-["uacute"]="ú",
-["scE"]="⪴",
-["hellip"]="…",
+["fllig"]="fl",
+["euml"]="ë",
+["circledR"]="®",
+["lltri"]="◺",
+["IEcy"]="Е",
+["notniva"]="∌",
+["or"]="∨",
+["curvearrowleft"]="↶",
+["gnapprox"]="⪊",
+["NotLessSlantEqual"]="⩽̸",
+["Cconint"]="∰",
+["NotSucceedsTilde"]="≿̸",
+["gammad"]="ϝ",
+["rightharpoondown"]="⇁",
+["CounterClockwiseContourIntegral"]="∳",
+["supdot"]="⪾",
+["upsi"]="υ",
+["nvle"]="≤⃒",
+["beth"]="ℶ",
+["nhArr"]="⇎",
+["Gamma"]="Γ",
+["complement"]="∁",
+["xoplus"]="⨁",
+["chi"]="χ",
+["backepsilon"]="϶",
+["nsube"]="⊈",
+["aopf"]="𝕒",
+["para"]="¶",
+["drbkarow"]="⤐",
+["Dstrok"]="Đ",
+["isinE"]="⋹",
+["Ecirc"]="Ê",
+["aelig"]="æ",
["ulcorner"]="⌜",
-["prnap"]="⪹",
-["Gg"]="⋙",
-["wedge"]="∧",
-["SquareSubset"]="⊏",
-["qscr"]="𝓆",
-["kfr"]="𝔨",
-["RightTee"]="⊢",
-["eqsim"]="≂",
-["rbrksld"]="⦎",
-["ohm"]="Ω",
-["lozf"]="⧫",
-["cups"]="∪︀",
-["epsilon"]="ε",
-["ncap"]="⩃",
-["Leftarrow"]="⇐",
-["ultri"]="◸",
-["egrave"]="è",
-["vBarv"]="⫩",
-["bNot"]="⫭",
-["nfr"]="𝔫",
-["rsqb"]="]",
-["OpenCurlyDoubleQuote"]="“",
-["rsquo"]="’",
-["Del"]="∇",
-["smtes"]="⪬︀",
-["varphi"]="ϕ",
-["CirclePlus"]="⊕",
-["prcue"]="≼",
-["curren"]="¤",
-["nltri"]="⋪",
-["oscr"]="ℴ",
-["Wcirc"]="Ŵ",
-["prime"]="′",
-["ifr"]="𝔦",
-["apos"]="'",
-["UpTee"]="⊥",
-["lescc"]="⪨",
-["NegativeMediumSpace"]="​",
-["DownTee"]="⊤",
-["NotSquareSubsetEqual"]="⋢",
-["LowerRightArrow"]="↘",
-["wr"]="≀",
+["Lcaron"]="Ľ",
+["bopf"]="𝕓",
+["midast"]="*",
+["barvee"]="⊽",
+["nvgt"]=">⃒",
+["bnequiv"]="≡⃥",
+["caron"]="ˇ",
["andand"]="⩕",
-["gvnE"]="≩︀",
-["lfr"]="𝔩",
-["lowast"]="∗",
-["gfr"]="𝔤",
-["digamma"]="ϝ",
-["cemptyv"]="⦲",
-["ubreve"]="ŭ",
-["dstrok"]="đ",
+["eparsl"]="⧣",
+["xhArr"]="⟺",
+["Yuml"]="Ÿ",
+["fallingdotseq"]="≒",
+["vltri"]="⊲",
+["gtrarr"]="⥸",
+["nGtv"]="≫̸",
+["congdot"]="⩭",
+["lfisht"]="⥼",
+["nrtri"]="⋫",
+["prnsim"]="⋨",
+["nsupE"]="⫆̸",
+["Colone"]="⩴",
+["SquareSuperset"]="⊐",
+["boxUL"]="╝",
+["Rrightarrow"]="⇛",
+["nleftrightarrow"]="↮",
+["Conint"]="∯",
+["ffilig"]="ffi",
+["nleqq"]="≦̸",
+["drcrop"]="⌌",
+["boxh"]="─",
+["Lang"]="⟪",
+["ldrdhar"]="⥧",
+["rbrack"]="]",
+["nvinfin"]="⧞",
+["succsim"]="≿",
+["boxhu"]="┴",
+["tau"]="τ",
+["incare"]="℅",
+["flat"]="♭",
+["angst"]="Å",
+["Oslash"]="Ø",
+["Vfr"]="𝔙",
+["tscy"]="ц",
+["lates"]="⪭︀",
+["eopf"]="𝕖",
+["Because"]="∵",
+["frac25"]="⅖",
+["daleth"]="ℸ",
+["ic"]="⁣",
+["ensp"]=" ",
+["lrm"]="‎",
+["DoubleLeftRightArrow"]="⇔",
+["kappa"]="κ",
+["fopf"]="𝕗",
+["cularr"]="↶",
+["shy"]="­",
+["yen"]="¥",
+["glj"]="⪤",
+["dzcy"]="џ",
["expectation"]="ℰ",
-["sime"]="≃",
-["ltrif"]="◂",
-["iacute"]="í",
-["chi"]="χ",
+["dash"]="‐",
+["female"]="♀",
+["UnderBrace"]="⏟",
+["rotimes"]="⨵",
+["caps"]="∩︀",
+["copf"]="𝕔",
+["lparlt"]="⦓",
+["NotLess"]="≮",
+["simrarr"]="⥲",
+["dtri"]="▿",
+["supne"]="⊋",
+["block"]="█",
+["siml"]="⪝",
+["blk12"]="▒",
+["natural"]="♮",
+["frac34"]="¾",
+["frac38"]="⅜",
+["Ufr"]="𝔘",
+["gg"]="≫",
+["Square"]="□",
+["lt"]="<",
["erDot"]="≓",
-["Vcy"]="В",
+["RightAngleBracket"]="⟩",
+["LeftDownTeeVector"]="⥡",
+["NotGreaterGreater"]="≫̸",
+["uogon"]="ų",
+["ocirc"]="ô",
+["sung"]="♪",
+["dollar"]="$",
+["Scaron"]="Š",
+["top"]="⊤",
+["iopf"]="𝕚",
+["udhar"]="⥮",
+["gjcy"]="ѓ",
+["ncap"]="⩃",
+["circlearrowleft"]="↺",
+["bernou"]="ℬ",
+["angmsdaf"]="⦭",
+["ldsh"]="↲",
+["isins"]="⋴",
+["RoundImplies"]="⥰",
+["bigtriangledown"]="▽",
+["LeftAngleBracket"]="⟨",
+["HorizontalLine"]="─",
+["Vdashl"]="⫦",
+["rHar"]="⥤",
+["Tcaron"]="Ť",
+["LeftDownVectorBar"]="⥙",
+["jopf"]="𝕛",
+["LeftRightVector"]="⥎",
+["LessGreater"]="≶",
+["npart"]="∂̸",
+["nsmid"]="∤",
+["RightTriangleBar"]="⧐",
+["nesim"]="≂̸",
+["deg"]="°",
+["LeftTeeArrow"]="↤",
+["NotHumpDownHump"]="≎̸",
+["tridot"]="◬",
+["lceil"]="⌈",
+["ExponentialE"]="ⅇ",
+["tosa"]="⤩",
+["gopf"]="𝕘",
+["ContourIntegral"]="∮",
+["late"]="⪭",
+["bbrk"]="⎵",
+["half"]="½",
["boxhd"]="┬",
-["DoubleDownArrow"]="⇓",
-["lArr"]="⇐",
-["demptyv"]="⦱",
-["smt"]="⪪",
-["intcal"]="⊺",
-["in"]="∈",
-["capcup"]="⩇",
-["kjcy"]="ќ",
-["Ccirc"]="Ĉ",
-["bnequiv"]="≡⃥",
-["Emacr"]="Ē",
-["siml"]="⪝",
-["jfr"]="𝔧",
-["gesdoto"]="⪂",
-["efr"]="𝔢",
-["precneqq"]="⪵",
-["because"]="∵",
-["Udblac"]="Ű",
-["lg"]="≶",
-["boxvr"]="├",
-["fpartint"]="⨍",
-["rbbrk"]="❳",
-["LT"]="<",
-["cap"]="∩",
-["circledR"]="®",
-["notinvc"]="⋶",
-["zwj"]="‍",
-["nle"]="≰",
-["hfr"]="𝔥",
-["bigsqcup"]="⨆",
-["nGg"]="⋙̸",
-["doublebarwedge"]="⌆",
+["hopf"]="𝕙",
+["Ouml"]="Ö",
+["Atilde"]="Ã",
+["planckh"]="ℎ",
+["MinusPlus"]="∓",
+["uharl"]="↿",
+["aleph"]="ℵ",
+["boxHD"]="╦",
+["lesseqgtr"]="⋚",
+["colon"]=":",
+["SquareSupersetEqual"]="⊒",
+["isinsv"]="⋳",
+["lnapprox"]="⪉",
+["PrecedesSlantEqual"]="≼",
+["boxuL"]="╛",
+["csup"]="⫐",
+["hstrok"]="ħ",
+["leftrightharpoons"]="⇋",
+["boxuR"]="╘",
+["DD"]="ⅅ",
+["Longrightarrow"]="⟹",
+["epsilon"]="ε",
+["NotTildeTilde"]="≉",
+["nfr"]="𝔫",
+["Vscr"]="𝒱",
+["Ncy"]="Н",
+["boxUl"]="╜",
+["searr"]="↘",
+["ddagger"]="‡",
+["KHcy"]="Х",
+["NotSuperset"]="⊃⃒",
+["Uparrow"]="⇑",
+["nsqsube"]="⋢",
+["Imacr"]="Ī",
+["nspar"]="∦",
+["supsetneqq"]="⫌",
+["Sscr"]="𝒮",
+["lobrk"]="⟦",
+["mfr"]="𝔪",
+["acirc"]="â",
+["subne"]="⊊",
+["Icirc"]="Î",
+["Re"]="ℜ",
+["nearrow"]="↗",
["YUcy"]="Ю",
-["empty"]="∅",
-["nacute"]="ń",
-["Acirc"]="Â",
-["bigtriangleup"]="△",
-["hybull"]="⁃",
-["Ycy"]="Ы",
-["isindot"]="⋵",
-["iota"]="ι",
-["numero"]="№",
-["cfr"]="𝔠",
-["llarr"]="⇇",
-["lrhard"]="⥭",
-["cross"]="✗",
+["eqsim"]="≂",
+["UnionPlus"]="⊎",
+["topcir"]="⫱",
+["boxVL"]="╣",
+["Xscr"]="𝒳",
+["QUOT"]="\"",
+["RightDownVectorBar"]="⥕",
+["epsi"]="ε",
+["natur"]="♮",
+["leftthreetimes"]="⋋",
+["hercon"]="⊹",
+["lHar"]="⥢",
+["Aring"]="Å",
+["Kcedil"]="Ķ",
+["kfr"]="𝔨",
+["Oacute"]="Ó",
["zwnj"]="‌",
+["plusdu"]="⨥",
+["Kcy"]="К",
+["sqcup"]="⊔",
+["zscr"]="𝓏",
+["Assign"]="≔",
+["zopf"]="𝕫",
+["lstrok"]="ł",
+["zigrarr"]="⇝",
+["ShortDownArrow"]="↓",
+["simlE"]="⪟",
+["mid"]="∣",
["zeta"]="ζ",
-["precnsim"]="⋨",
-["zcy"]="з",
+["gE"]="≧",
+["zeetrf"]="ℨ",
+["qfr"]="𝔮",
["zcaron"]="ž",
-["xodot"]="⨀",
-["RightDownTeeVector"]="⥝",
-["ljcy"]="љ",
+["Yacute"]="Ý",
+["hksearow"]="⤥",
+["Atilde"]="Ã",
+["zacute"]="ź",
+["bsemi"]="⁏",
+["bigtriangleup"]="△",
+["yuml"]="ÿ",
+["yucy"]="ю",
["yscr"]="𝓎",
+["yopf"]="𝕪",
["yicy"]="ї",
-["Rcy"]="Р",
-["nsubset"]="⊂⃒",
-["yen"]="¥",
-["ycy"]="ы",
-["simeq"]="≃",
-["dharr"]="⇂",
-["ycirc"]="ŷ",
-["hArr"]="⇔",
-["yacute"]="ý",
-["yacute"]="ý",
+["urcorn"]="⌝",
+["Aacute"]="Á",
+["backsimeq"]="⋍",
+["ShortUpArrow"]="↑",
["xwedge"]="⋀",
-["xoplus"]="⨁",
-["nparsl"]="⫽⃥",
-["PartialD"]="∂",
-["YAcy"]="Я",
-["xrArr"]="⟹",
-["xotime"]="⨂",
-["sstarf"]="⋆",
-["yuml"]="ÿ",
-["Int"]="∬",
-["bsolb"]="⧅",
+["Jcy"]="Й",
+["nltrie"]="⋬",
+["starf"]="★",
+["zfr"]="𝔷",
+["comma"]=",",
+["xsqcup"]="⨆",
+["boxVr"]="╟",
+["cirscir"]="⧂",
+["ucirc"]="û",
+["Cross"]="⨯",
+["naturals"]="ℕ",
+["quaternions"]="ℍ",
+["xopf"]="𝕩",
+["xodot"]="⨀",
["xnis"]="⋻",
-["xmap"]="⟼",
-["hercon"]="⊹",
-["xlArr"]="⟸",
-["xharr"]="⟷",
-["rbrack"]="]",
+["lsaquo"]="‹",
+["xlarr"]="⟵",
+["Zacute"]="Ź",
+["vdash"]="⊢",
+["submult"]="⫁",
+["Oscr"]="𝒪",
["xdtri"]="▽",
-["diamond"]="⋄",
+["LowerRightArrow"]="↘",
["xcup"]="⋃",
-["subsup"]="⫓",
-["lneqq"]="≨",
-["dharl"]="⇃",
-["Scy"]="С",
-["wopf"]="𝕨",
-["rightleftharpoons"]="⇌",
-["wfr"]="𝔴",
-["nsupseteqq"]="⫆̸",
-["boxuR"]="╘",
-["permil"]="‰",
+["Ycy"]="Ы",
+["timesb"]="⊠",
+["Ucirc"]="Û",
+["eth"]="ð",
+["wscr"]="𝓌",
+["ratail"]="⤚",
+["wr"]="≀",
+["Ograve"]="Ò",
+["wp"]="℘",
+["euml"]="ë",
+["yfr"]="𝔶",
+["rangle"]="⟩",
+["hearts"]="♥",
["wedgeq"]="≙",
-["eparsl"]="⧣",
-["RoundImplies"]="⥰",
-["afr"]="𝔞",
-["vsubne"]="⊊︀",
-["sup2"]="²",
+["wedge"]="∧",
+["gtcir"]="⩺",
+["par"]="∥",
+["swarr"]="↙",
+["phiv"]="ϕ",
+["NotElement"]="∉",
+["alpha"]="α",
+["SquareUnion"]="⊔",
+["parsl"]="⫽",
["vscr"]="𝓋",
+["rharu"]="⇀",
+["vrtri"]="⊳",
+["comp"]="∁",
+["Agrave"]="À",
+["rdca"]="⤷",
+["vprop"]="∝",
+["Tscr"]="𝒯",
["vopf"]="𝕧",
-["lbrace"]="{",
+["ldca"]="⤶",
["vnsub"]="⊂⃒",
-["vltri"]="⊲",
-["Uacute"]="Ú",
-["vfr"]="𝔳",
-["sacute"]="ś",
-["njcy"]="њ",
-["frac35"]="⅗",
-["squf"]="▪",
+["gbreve"]="ğ",
+["NotSquareSubset"]="⊏̸",
+["verbar"]="|",
+["YAcy"]="Я",
["veeeq"]="≚",
-["lsime"]="⪍",
-["mapstoleft"]="↤",
+["downharpoonleft"]="⇃",
+["Star"]="⋆",
+["xfr"]="𝔵",
+["nges"]="⩾̸",
+["GreaterGreater"]="⪢",
+["vartriangleright"]="⊳",
+["rcy"]="р",
+["vartheta"]="ϑ",
+["varsupsetneqq"]="⫌︀",
+["dashv"]="⊣",
["varsupsetneq"]="⊋︀",
-["varsubsetneq"]="⊊︀",
-["Tcy"]="Т",
-["cwint"]="∱",
-["varsigma"]="ς",
-["LessGreater"]="≶",
+["Ncaron"]="Ň",
+["varsubsetneqq"]="⫋︀",
["varrho"]="ϱ",
-["varpropto"]="∝",
-["pr"]="≺",
-["backprime"]="‵",
+["triangledown"]="▿",
+["varpi"]="ϖ",
+["sol"]="/",
+["ssetmn"]="∖",
+["varnothing"]="∅",
["varkappa"]="ϰ",
-["Poincareplane"]="ℌ",
-["roplus"]="⨮",
-["Edot"]="Ė",
-["copysr"]="℗",
+["vangrt"]="⦜",
+["Leftarrow"]="⇐",
+["Qscr"]="𝒬",
+["uwangle"]="⦧",
+["rarrap"]="⥵",
["uuml"]="ü",
-["dfr"]="𝔡",
["uuarr"]="⇈",
-["uogon"]="ų",
-["Uscr"]="𝒰",
-["gel"]="⋛",
-["olarr"]="↺",
-["lsaquo"]="‹",
-["omacr"]="ō",
-["utdot"]="⋰",
-["or"]="∨",
-["Ocirc"]="Ô",
-["ClockwiseContourIntegral"]="∲",
-["SmallCircle"]="∘",
-["gtcc"]="⪧",
["uscr"]="𝓊",
+["urtri"]="◹",
+["uring"]="ů",
+["sect"]="§",
+["quatint"]="⨖",
["urcrop"]="⌎",
-["ContourIntegral"]="∮",
-["szlig"]="ß",
-["egs"]="⪖",
-["Ucy"]="У",
-["ange"]="⦤",
-["upharpoonright"]="↾",
-["xcap"]="⋂",
+["wfr"]="𝔴",
+["duhar"]="⥯",
+["upuparrows"]="⇈",
+["macr"]="¯",
+["SmallCircle"]="∘",
+["upsih"]="ϒ",
+["uplus"]="⊎",
+["shy"]="­",
+["uparrow"]="↑",
["uml"]="¨",
-["nsubseteqq"]="⫅̸",
+["eDot"]="≑",
+["blk34"]="▓",
+["umacr"]="ū",
+["ultri"]="◸",
+["rbbrk"]="❳",
["ulcorn"]="⌜",
-["uhblk"]="▀",
-["scirc"]="ŝ",
-["shy"]="­",
-["uharl"]="↿",
+["uharr"]="↾",
["ugrave"]="ù",
-["lstrok"]="ł",
-["Gamma"]="Γ",
-["udhar"]="⥮",
-["udblac"]="ű",
-["ucirc"]="û",
-["loang"]="⟬",
-["uarr"]="↑",
+["Ograve"]="Ò",
+["nsupseteq"]="⊉",
+["ufisht"]="⥾",
+["Breve"]="˘",
+["ucy"]="у",
+["cylcty"]="⌭",
+["ubreve"]="ŭ",
+["SHcy"]="Ш",
+["boxdR"]="╒",
+["awint"]="⨑",
+["uHar"]="⥣",
["uArr"]="⇑",
-["twoheadrightarrow"]="↠",
+["REG"]="®",
+["twoheadleftarrow"]="↞",
["tstrok"]="ŧ",
+["iprod"]="⨼",
["tshcy"]="ћ",
-["tscy"]="ц",
-["angsph"]="∢",
-["kappa"]="κ",
["tscr"]="𝓉",
-["tritime"]="⨻",
-["trisb"]="⧍",
+["trpezium"]="⏢",
+["ycirc"]="ŷ",
+["larrhk"]="↩",
+["triplus"]="⨹",
["triminus"]="⨺",
-["trie"]="≜",
-["tridot"]="◬",
-["aacute"]="á",
+["Rsh"]="↱",
+["becaus"]="∵",
+["Acirc"]="Â",
["trianglerighteq"]="⊵",
-["RightTeeVector"]="⥛",
["triangleright"]="▹",
+["hkswarow"]="⤦",
+["triangleq"]="≜",
+["AElig"]="Æ",
["trianglelefteq"]="⊴",
+["varpropto"]="∝",
["triangle"]="▵",
-["NegativeVeryThinSpace"]="​",
-["triangledown"]="▿",
-["dash"]="‐",
-["trade"]="™",
+["tprime"]="‴",
["topfork"]="⫚",
-["Upsi"]="ϒ",
-["topcir"]="⫱",
-["loplus"]="⨭",
-["Zdot"]="Ż",
-["lbrke"]="⦋",
-["angmsd"]="∡",
-["dArr"]="⇓",
-["topbot"]="⌶",
["toea"]="⤨",
-["iexcl"]="¡",
-["acirc"]="â",
-["easter"]="⩮",
-["CloseCurlyDoubleQuote"]="”",
-["cupcup"]="⩊",
-["rlhar"]="⇌",
-["nsimeq"]="≄",
-["Uparrow"]="⇑",
-["tau"]="τ",
-["npr"]="⊀",
-["phone"]="☎",
-["emacr"]="ē",
-["SHcy"]="Ш",
-["gtdot"]="⋗",
-["ReverseUpEquilibrium"]="⥯",
+["ac"]="∾",
+["timesd"]="⨰",
+["UpArrowDownArrow"]="⇅",
+["timesbar"]="⨱",
+["llhard"]="⥫",
+["CHcy"]="Ч",
+["odblac"]="ő",
+["THORN"]="Þ",
+["notni"]="∌",
+["nbump"]="≎̸",
+["eqcolon"]="≕",
["tilde"]="˜",
-["angmsdac"]="⦪",
-["duhar"]="⥯",
-["approxeq"]="≊",
-["NotSupersetEqual"]="⊉",
-["thorn"]="þ",
-["thksim"]="∼",
-["subsim"]="⫇",
-["bnot"]="⌐",
+["simgE"]="⪠",
+["intercal"]="⊺",
+["thetasym"]="ϑ",
+["xcirc"]="◯",
["thinsp"]=" ",
["thicksim"]="∼",
-["gt"]=">",
-["UpperLeftArrow"]="↖",
-["thetasym"]="ϑ",
-["simlE"]="⪟",
-["bbrktbrk"]="⎶",
-["Jcirc"]="Ĵ",
-["cedil"]="¸",
-["NotLessSlantEqual"]="⩽̸",
-["rx"]="℞",
-["infin"]="∞",
-["curlyvee"]="⋎",
-["LeftArrow"]="←",
-["tfr"]="𝔱",
-["blacksquare"]="▪",
-["emptyv"]="∅",
-["Mellintrf"]="ℳ",
-["aogon"]="ą",
-["succnapprox"]="⪺",
-["tcy"]="т",
-["ecaron"]="ě",
+["LeftArrowBar"]="⇤",
+["Uuml"]="Ü",
+["DownTeeArrow"]="↧",
+["cent"]="¢",
+["hookleftarrow"]="↩",
+["odiv"]="⨸",
+["therefore"]="∴",
+["ClockwiseContourIntegral"]="∲",
+["Ofr"]="𝔒",
+["auml"]="ä",
+["frac12"]="½",
+["nRightarrow"]="⇏",
+["kcedil"]="ķ",
+["DownRightVectorBar"]="⥗",
+["boxDL"]="╗",
["tcedil"]="ţ",
-["boxhU"]="╨",
-["boxVl"]="╢",
-["gacute"]="ǵ",
-["tcaron"]="ť",
-["boxDr"]="╓",
-["bump"]="≎",
-["blk12"]="▒",
-["RightArrow"]="→",
-["els"]="⪕",
-["apacir"]="⩯",
-["acy"]="а",
-["omid"]="⦶",
-["boxbox"]="⧉",
-["iecy"]="е",
-["szlig"]="ß",
-["upsih"]="ϒ",
-["swnwar"]="⤪",
-["Icirc"]="Î",
-["swarr"]="↙",
-["times"]="×",
-["Ograve"]="Ò",
-["hoarr"]="⇿",
-["NotTildeEqual"]="≄",
-["IEcy"]="Е",
-["iexcl"]="¡",
-["bdquo"]="„",
-["TildeTilde"]="≈",
+["boxUr"]="╙",
+["icirc"]="î",
+["lmoustache"]="⎰",
+["prime"]="′",
+["ngeq"]="≱",
["nshortparallel"]="∦",
-["subedot"]="⫃",
-["supsetneq"]="⊋",
-["CenterDot"]="·",
-["lessapprox"]="⪅",
-["LeftVectorBar"]="⥒",
-["bigoplus"]="⨁",
-["supseteqq"]="⫆",
-["drcorn"]="⌟",
-["hstrok"]="ħ",
-["HorizontalLine"]="─",
-["curarrm"]="⤼",
-["lopar"]="⦅",
+["szlig"]="ß",
+["Egrave"]="È",
+["sqsubset"]="⊏",
+["NotRightTriangleEqual"]="⋭",
+["swarrow"]="↙",
+["Ucirc"]="Û",
+["DownArrowBar"]="⤓",
+["Lfr"]="𝔏",
["wcirc"]="ŵ",
+["LessLess"]="⪡",
+["Tilde"]="∼",
+["empty"]="∅",
+["swarhk"]="⤦",
+["DownLeftVector"]="↽",
+["Uscr"]="𝒰",
+["khcy"]="х",
+["gesl"]="⋛︀",
+["supsub"]="⫔",
+["malt"]="✠",
+["cirmid"]="⫯",
+["PrecedesTilde"]="≾",
+["lharul"]="⥪",
+["rightleftharpoons"]="⇌",
+["Ccedil"]="Ç",
+["plusb"]="⊞",
+["nsupe"]="⊉",
+["geq"]="≥",
+["dHar"]="⥥",
+["lcedil"]="ļ",
+["ange"]="⦤",
+["supseteq"]="⊇",
+["Upsi"]="ϒ",
+["mapstodown"]="↧",
+["profalar"]="⌮",
+["cupdot"]="⊍",
+["mapstoleft"]="↤",
+["xotime"]="⨂",
+["tbrk"]="⎴",
+["supmult"]="⫂",
+["disin"]="⋲",
["suphsub"]="⫗",
-["Otilde"]="Õ",
-["EmptySmallSquare"]="◻",
+["eg"]="⪚",
["supedot"]="⫄",
-["Kopf"]="𝕂",
-["boxminus"]="⊟",
-["csupe"]="⫒",
-["Ffr"]="𝔉",
-["origof"]="⊶",
-["sup3"]="³",
-["boxH"]="═",
-["vsubnE"]="⫋︀",
-["Hcirc"]="Ĥ",
-["block"]="█",
+["NonBreakingSpace"]=" ",
+["Euml"]="Ë",
["bsolhsub"]="⟈",
-["Supset"]="⋑",
-["GreaterFullEqual"]="≧",
+["supdsub"]="⫘",
+["sup3"]="³",
+["DoubleLeftTee"]="⫤",
+["angrtvb"]="⊾",
+["supsim"]="⫈",
+["sup2"]="²",
+["sup2"]="²",
+["circledast"]="⊛",
+["rfr"]="𝔯",
+["darr"]="↓",
+["rarrhk"]="↪",
+["macr"]="¯",
["sup1"]="¹",
-["llcorner"]="⌞",
-["sopf"]="𝕤",
-["larrbfs"]="⤟",
-["succneqq"]="⪶",
-["part"]="∂",
-["eacute"]="é",
-["COPY"]="©",
-["frac23"]="⅔",
-["dbkarow"]="⤏",
-["succeq"]="⪰",
-["notni"]="∌",
-["Euml"]="Ë",
-["harrcir"]="⥈",
-["leftrightsquigarrow"]="↭",
-["xcirc"]="◯",
-["caret"]="⁁",
-["les"]="⩽",
-["lharul"]="⥪",
-["bsime"]="⋍",
-["DoubleLeftArrow"]="⇐",
-["ecirc"]="ê",
-["subsetneqq"]="⫋",
-["crarr"]="↵",
-["cuwed"]="⋏",
-["Ugrave"]="Ù",
-["Gcirc"]="Ĝ",
-["LeftTriangleBar"]="⧏",
+["aacute"]="á",
+["oscr"]="ℴ",
+["lharu"]="↼",
+["telrec"]="⌕",
+["Dashv"]="⫤",
+["succnsim"]="⋩",
+["AElig"]="Æ",
+["Vee"]="⋁",
+["succnapprox"]="⪺",
+["CapitalDifferentialD"]="ⅅ",
["gsim"]="≳",
-["RightTriangleEqual"]="⊵",
-["lacute"]="ĺ",
-["Ccedil"]="Ç",
-["ee"]="ⅇ",
-["heartsuit"]="♥",
-["coloneq"]="≔",
-["subseteq"]="⊆",
-["NotSucceedsTilde"]="≿̸",
+["succapprox"]="⪸",
+["rmoustache"]="⎱",
+["DotEqual"]="≐",
+["subsup"]="⫓",
+["Gcedil"]="Ģ",
+["questeq"]="≟",
+["lthree"]="⋋",
+["cong"]="≅",
+["lcub"]="{",
+["radic"]="√",
+["subrarr"]="⥹",
+["nvlt"]="<⃒",
["subplus"]="⪿",
-["cupcap"]="⩆",
-["Amacr"]="Ā",
-["angst"]="Å",
-["supsetneqq"]="⫌",
-["sube"]="⊆",
-["imagpart"]="ℑ",
-["Lambda"]="Λ",
-["Afr"]="𝔄",
-["sub"]="⊂",
+["bigsqcup"]="⨆",
+["downarrow"]="↓",
+["auml"]="ä",
+["boxdL"]="╕",
+["boxvr"]="├",
+["lbrkslu"]="⦍",
+["bigwedge"]="⋀",
+["apacir"]="⩯",
+["Wscr"]="𝒲",
+["iecy"]="е",
+["VerticalSeparator"]="❘",
+["Yfr"]="𝔜",
["strns"]="¯",
["straightphi"]="ϕ",
-["boxvL"]="╡",
-["dagger"]="†",
-["eta"]="η",
-["KHcy"]="Х",
-["Yfr"]="𝔜",
-["lbrack"]="[",
-["VerticalBar"]="∣",
-["rightleftarrows"]="⇄",
-["fltns"]="▱",
-["verbar"]="|",
-["RightAngleBracket"]="⟩",
-["DownRightVector"]="⇁",
-["Lacute"]="Ĺ",
-["sol"]="/",
-["lrm"]="‎",
-["lesdot"]="⩿",
-["nleqslant"]="⩽̸",
-["capcap"]="⩋",
+["kcy"]="к",
+["aogon"]="ą",
+["star"]="☆",
+["caret"]="⁁",
+["cups"]="∪︀",
+["iquest"]="¿",
+["spar"]="∥",
+["NotExists"]="∄",
+["Gt"]="≫",
["squ"]="□",
-["xutri"]="△",
-["TSHcy"]="Ћ",
-["gap"]="⪆",
-["gtrdot"]="⋗",
-["scnap"]="⪺",
-["bkarow"]="⤍",
-["NotPrecedes"]="⊀",
-["suphsol"]="⟉",
+["sqsupe"]="⊒",
+["subnE"]="⫋",
["sqsup"]="⊐",
-["epsi"]="ε",
-["sqsubset"]="⊏",
-["check"]="✓",
-["UpArrowBar"]="⤒",
-["NotPrecedesEqual"]="⪯̸",
-["csube"]="⫑",
-["nsupset"]="⊃⃒",
-["lesdoto"]="⪁",
+["sqsubseteq"]="⊑",
+["ffr"]="𝔣",
+["UpTeeArrow"]="↥",
+["middot"]="·",
+["DoubleLongRightArrow"]="⟹",
+["sqsube"]="⊑",
+["sce"]="⪰",
+["Sup"]="⋑",
+["cacute"]="ć",
+["GreaterFullEqual"]="≧",
+["pfr"]="𝔭",
+["Lleftarrow"]="⇚",
+["heartsuit"]="♥",
+["precsim"]="≾",
+["nsucceq"]="⪰̸",
["sqcups"]="⊔︀",
-["suplarr"]="⥻",
-["nsim"]="≁",
-["NotEqualTilde"]="≂̸",
-["nearr"]="↗",
-["SquareIntersection"]="⊓",
-["intlarhk"]="⨗",
-["Ecirc"]="Ê",
-["vangrt"]="⦜",
-["fllig"]="fl",
-["Leftrightarrow"]="⇔",
-["primes"]="ℙ",
-["nvlArr"]="⤂",
+["Igrave"]="Ì",
+["iquest"]="¿",
+["Pcy"]="П",
+["thksim"]="∼",
+["djcy"]="ђ",
+["hfr"]="𝔥",
+["spadesuit"]="♠",
+["rbrkslu"]="⦐",
+["shcy"]="ш",
+["barwed"]="⌅",
+["rpar"]=")",
+["iiiint"]="⨌",
+["solb"]="⧄",
+["Integral"]="∫",
+["napE"]="⩰̸",
+["softcy"]="ь",
+["NotRightTriangleBar"]="⧐̸",
+["Mu"]="Μ",
+["frasl"]="⁄",
+["Icy"]="И",
+["dfisht"]="⥿",
["smte"]="⪬",
-["ltri"]="◃",
-["Tscr"]="𝒯",
+["smt"]="⪪",
+["bottom"]="⊥",
+["oacute"]="ó",
+["ofr"]="𝔬",
["smid"]="∣",
-["smeparsl"]="⧤",
-["rarrc"]="⤳",
-["divideontimes"]="⋇",
-["eth"]="ð",
-["boxvR"]="╞",
-["copy"]="©",
-["nges"]="⩾̸",
-["fcy"]="ф",
-["ShortUpArrow"]="↑",
-["simplus"]="⨤",
-["frac45"]="⅘",
-["nexists"]="∄",
-["LeftTeeArrow"]="↤",
-["leftleftarrows"]="⇇",
-["simg"]="⪞",
-["euro"]="€",
-["simdot"]="⩪",
-["sim"]="∼",
-["sigmav"]="ς",
-["iuml"]="ï",
-["updownarrow"]="↕",
-["shy"]="­",
-["solb"]="⧄",
+["ReverseUpEquilibrium"]="⥯",
+["smashp"]="⨳",
+["slarr"]="←",
+["simne"]="≆",
+["LeftRightArrow"]="↔",
+["thkap"]="≈",
+["nlArr"]="⇍",
+["chcy"]="ч",
+["not"]="¬",
+["kgreen"]="ĸ",
+["simeq"]="≃",
+["LongRightArrow"]="⟶",
+["sime"]="≃",
+["sigma"]="σ",
+["odot"]="⊙",
+["amp"]="&",
+["Longleftrightarrow"]="⟺",
+["Upsilon"]="Υ",
+["upharpoonleft"]="↿",
+["bigotimes"]="⨂",
+["parallel"]="∥",
+["ffllig"]="ffl",
+["shortparallel"]="∥",
+["boxdr"]="┌",
+["shortmid"]="∣",
+["Euml"]="Ë",
+["UpDownArrow"]="↕",
+["lcaron"]="ľ",
+["sfrown"]="⌢",
+["harr"]="↔",
+["dsol"]="⧶",
+["Beta"]="Β",
+["srarr"]="→",
+["boxHd"]="╤",
["nesear"]="⤨",
-["Umacr"]="Ū",
-["uharr"]="↾",
-["Therefore"]="∴",
-["Barv"]="⫧",
-["amacr"]="ā",
["setmn"]="∖",
+["DoubleDot"]="¨",
["setminus"]="∖",
-["Sscr"]="𝒮",
+["andd"]="⩜",
+["leftrightarrow"]="↔",
["seswar"]="⤩",
-["ccupssm"]="⩐",
-["searr"]="↘",
+["eogon"]="ę",
+["bne"]="=⃥",
+["DownBreve"]="̑",
+["nLtv"]="≪̸",
+["nprcue"]="⋠",
+["SucceedsSlantEqual"]="≽",
+["downdownarrows"]="⇊",
+["seArr"]="⇘",
+["Utilde"]="Ũ",
+["Gammad"]="Ϝ",
+["sdote"]="⩦",
+["iexcl"]="¡",
+["nvdash"]="⊬",
+["csupe"]="⫒",
["sdotb"]="⊡",
-["icirc"]="î",
-["amp"]="&",
-["gcy"]="г",
-["Aacute"]="Á",
-["boxvh"]="┼",
-["bfr"]="𝔟",
-["OverParenthesis"]="⏜",
-["sqsupe"]="⊒",
-["amp"]="&",
-["frac14"]="¼",
-["ZeroWidthSpace"]="​",
-["Colon"]="∷",
-["Proportional"]="∝",
-["thickapprox"]="≈",
-["subseteqq"]="⫅",
-["IJlig"]="IJ",
-["scedil"]="ş",
-["lrarr"]="⇆",
-["angmsdaf"]="⦭",
-["downharpoonleft"]="⇃",
+["scsim"]="≿",
+["bcy"]="б",
+["NotTilde"]="≁",
+["minus"]="−",
+["scnE"]="⪶",
+["scirc"]="ŝ",
+["oplus"]="⊕",
+["para"]="¶",
+["Ycirc"]="Ŷ",
+["notinva"]="∉",
+["nLl"]="⋘̸",
+["Aring"]="Å",
+["THORN"]="Þ",
+["numero"]="№",
+["scaron"]="š",
+["bsol"]="\\",
+["harrw"]="↭",
+["exponentiale"]="ⅇ",
+["eDDot"]="⩷",
+["AMP"]="&",
+["gamma"]="γ",
+["opar"]="⦷",
+["cwint"]="∱",
+["GreaterEqual"]="≥",
+["bigcap"]="⋂",
+["rtimes"]="⋊",
+["integers"]="ℤ",
+["easter"]="⩮",
["RightDoubleBracket"]="⟧",
-["half"]="½",
-["larr"]="←",
["sbquo"]="‚",
-["Vscr"]="𝒱",
-["nVdash"]="⊮",
-["DownRightVectorBar"]="⥗",
-["RightDownVector"]="⇂",
-["disin"]="⋲",
-["nsce"]="⪰̸",
-["rbrace"]="}",
-["MinusPlus"]="∓",
-["rtrif"]="▸",
-["parsim"]="⫳",
-["supseteq"]="⊇",
-["Superset"]="⊃",
-["Verbar"]="‖",
+["cfr"]="𝔠",
+["ruluhar"]="⥨",
+["image"]="ℑ",
+["nleqslant"]="⩽̸",
+["Yopf"]="𝕐",
+["apE"]="⩰",
+["NotPrecedesEqual"]="⪯̸",
+["rsqb"]="]",
+["rtrie"]="⊵",
+["rthree"]="⋌",
+["amp"]="&",
+["eng"]="ŋ",
+["ll"]="≪",
+["rrarr"]="⇉",
+["RightTee"]="⊢",
+["ETH"]="Ð",
+["ReverseEquilibrium"]="⇋",
+["langle"]="⟨",
["Zeta"]="Ζ",
-["nsccue"]="⋡",
-["bsemi"]="⁏",
-["ldquor"]="„",
-["curarr"]="↷",
-["rscr"]="𝓇",
-["rppolint"]="⨒",
-["rpargt"]="⦔",
-["rotimes"]="⨵",
-["Equal"]="⩵",
-["ropf"]="𝕣",
-["ropar"]="⦆",
-["roarr"]="⇾",
-["odot"]="⊙",
-["natural"]="♮",
-["slarr"]="←",
-["angmsdae"]="⦬",
-["acE"]="∾̳",
+["roplus"]="⨮",
+["there4"]="∴",
+["DownRightTeeVector"]="⥟",
+["npar"]="∦",
+["robrk"]="⟧",
+["exist"]="∃",
+["lfr"]="𝔩",
+["VDash"]="⊫",
+["rnmid"]="⫮",
+["rmoust"]="⎱",
["rlm"]="‏",
-["COPY"]="©",
-["iogon"]="į",
-["nleftrightarrow"]="↮",
-["reg"]="®",
-["risingdotseq"]="≓",
-["rightsquigarrow"]="↝",
-["dtri"]="▿",
-["Larr"]="↞",
-["icy"]="и",
-["gimel"]="ℷ",
+["Ccirc"]="Ĉ",
+["imagpart"]="ℑ",
+["Equilibrium"]="⇌",
+["dd"]="ⅆ",
+["cuepr"]="⋞",
+["Agrave"]="À",
+["cuesc"]="⋟",
+["square"]="□",
+["notnivc"]="⋽",
+["rbrksld"]="⦎",
["cup"]="∪",
-["DJcy"]="Ђ",
-["gtrapprox"]="⪆",
-["rightharpoonup"]="⇀",
-["prsim"]="≾",
-["rightharpoondown"]="⇁",
-["frac16"]="⅙",
-["nbsp"]=" ",
-["cedil"]="¸",
-["numsp"]=" ",
+["OpenCurlyDoubleQuote"]="“",
+["Lacute"]="Ĺ",
+["NewLine"]="\n",
+["Sigma"]="Σ",
+["Abreve"]="Ă",
+["rightleftarrows"]="⇄",
+["tint"]="∭",
+["angmsdae"]="⦬",
+["Leftrightarrow"]="⇔",
+["rdquor"]="”",
+["Verbar"]="‖",
+["Gfr"]="𝔊",
["rightarrow"]="→",
["rhov"]="ϱ",
-["rdquo"]="”",
-["rharul"]="⥬",
-["frac34"]="¾",
-["ldrdhar"]="⥧",
-["gnsim"]="⋧",
-["rtriltri"]="⧎",
-["emsp"]=" ",
-["rlarr"]="⇄",
-["Oslash"]="Ø",
-["LeftDownTeeVector"]="⥡",
+["Alpha"]="Α",
+["rho"]="ρ",
+["DownLeftTeeVector"]="⥞",
+["ntriangleright"]="⋫",
["reg"]="®",
-["LeftTeeVector"]="⥚",
-["gsiml"]="⪐",
-["QUOT"]="\"",
-["blk14"]="░",
-["rightrightarrows"]="⇉",
-["NotGreaterGreater"]="≫̸",
-["Xscr"]="𝒳",
-["Re"]="ℜ",
-["Ouml"]="Ö",
+["Int"]="∬",
+["agrave"]="à",
+["Ecirc"]="Ê",
+["NotReverseElement"]="∌",
+["backprime"]="‵",
+["Jfr"]="𝔍",
["rdsh"]="↳",
-["and"]="∧",
-["larrb"]="⇤",
-["TripleDot"]="⃛",
-["bcy"]="б",
-["diams"]="♦",
-["veebar"]="⊻",
-["rcub"]="}",
-["Scirc"]="Ŝ",
-["ac"]="∾",
-["rceil"]="⌉",
-["rcedil"]="ŗ",
-["cupbrcap"]="⩈",
-["rcaron"]="ř",
-["cuesc"]="⋟",
-["HilbertSpace"]="ℋ",
-["plus"]="+",
-["rbrkslu"]="⦐",
-["LessLess"]="⪡",
-["macr"]="¯",
-["notinE"]="⋹̸",
+["jsercy"]="ј",
+["Bscr"]="ℬ",
+["boxH"]="═",
+["leq"]="≤",
+["NotPrecedes"]="⊀",
+["coloneq"]="≔",
+["boxvh"]="┼",
+["larr"]="←",
+["ncup"]="⩂",
+["EmptySmallSquare"]="◻",
+["vartriangleleft"]="⊲",
+["iacute"]="í",
+["nVDash"]="⊯",
+["lap"]="⪅",
+["precapprox"]="⪷",
+["ecolon"]="≕",
+["lsqb"]="[",
["rbarr"]="⤍",
-["abreve"]="ă",
-["sqcup"]="⊔",
-["ratail"]="⤚",
-["VeryThinSpace"]=" ",
-["Uarrocir"]="⥉",
-["rarrfs"]="⤞",
-["Odblac"]="Ő",
-["Imacr"]="Ī",
-["ordm"]="º",
-["odsold"]="⦼",
-["NJcy"]="Њ",
-["Yacute"]="Ý",
-["rarrbfs"]="⤠",
-["prop"]="∝",
-["notin"]="∉",
-["vsupne"]="⊋︀",
-["bigcap"]="⋂",
-["Phi"]="Φ",
-["Ograve"]="Ò",
-["Yscr"]="𝒴",
-["approx"]="≈",
-["racute"]="ŕ",
-["ggg"]="⋙",
-["lmoust"]="⎰",
+["yacy"]="я",
+["efDot"]="≒",
+["ratio"]="∶",
+["wreath"]="≀",
+["nearhk"]="⤤",
+["rarrpl"]="⥅",
+["nvge"]="≥⃒",
+["searrow"]="↘",
+["thorn"]="þ",
+["rdquo"]="”",
+["LessFullEqual"]="≦",
+["nvrtrie"]="⊵⃒",
+["nsubseteqq"]="⫅̸",
+["nedot"]="≐̸",
+["VerticalLine"]="|",
+["lsh"]="↰",
+["DownRightVector"]="⇁",
+["ecirc"]="ê",
+["andv"]="⩚",
+["trie"]="≜",
+["race"]="∽̱",
["rBarr"]="⤏",
-["gneqq"]="≩",
-["isinv"]="∈",
-["harr"]="↔",
-["rArr"]="⇒",
-["rAarr"]="⇛",
-["quot"]="\"",
+["lbrksld"]="⦏",
+["emsp14"]=" ",
+["RuleDelayed"]="⧴",
+["vsubne"]="⊊︀",
+["ShortLeftArrow"]="←",
+["gtlPar"]="⦕",
["quest"]="?",
-["iuml"]="ï",
-["LeftRightArrow"]="↔",
-["LeftDoubleBracket"]="⟦",
-["gesdot"]="⪀",
-["Ntilde"]="Ñ",
-["boxUR"]="╚",
-["exist"]="∃",
-["subnE"]="⫋",
-["ograve"]="ò",
-["qopf"]="𝕢",
-["Zacute"]="Ź",
-["qfr"]="𝔮",
-["dcy"]="д",
-["NotReverseElement"]="∌",
-["DotEqual"]="≐",
-["VerticalLine"]="|",
-["pscr"]="𝓅",
-["prurel"]="⊰",
-["cdot"]="ċ",
-["bprime"]="‵",
-["ltdot"]="⋖",
-["prnsim"]="⋨",
-["curlywedge"]="⋏",
-["prnE"]="⪵",
-["REG"]="®",
-["sup3"]="³",
+["dot"]="˙",
+["RightVector"]="⇀",
+["rppolint"]="⨒",
+["Hat"]="^",
+["zcy"]="з",
+["suplarr"]="⥻",
+["boxhU"]="╨",
+["puncsp"]=" ",
+["GreaterLess"]="≷",
+["psi"]="ψ",
+["ncaron"]="ň",
+["SupersetEqual"]="⊇",
+["propto"]="∝",
["preceq"]="⪯",
-["LeftDownVectorBar"]="⥙",
-["ForAll"]="∀",
+["frac56"]="⅚",
+["NotLessGreater"]="≸",
+["jukcy"]="є",
+["swArr"]="⇙",
+["profline"]="⌒",
+["prnE"]="⪵",
+["larrpl"]="⤹",
+["af"]="⁡",
+["profsurf"]="⌓",
+["Larr"]="↞",
["forkv"]="⫙",
-["varpi"]="ϖ",
-["nrArr"]="⇏",
+["prcue"]="≼",
+["RightUpTeeVector"]="⥜",
["pound"]="£",
+["ugrave"]="ù",
+["popf"]="𝕡",
+["frac78"]="⅞",
+["suphsol"]="⟉",
+["loplus"]="⨭",
+["pointint"]="⨕",
+["cupcap"]="⩆",
+["LessTilde"]="≲",
+["pm"]="±",
+["blacksquare"]="▪",
["plustwo"]="⨧",
-["shchcy"]="щ",
-["cacute"]="ć",
-["Dashv"]="⫤",
-["lHar"]="⥢",
-["NotLeftTriangle"]="⋪",
-["gbreve"]="ğ",
-["boxDl"]="╖",
-["Beta"]="Β",
-["ReverseEquilibrium"]="⇋",
+["copy"]="©",
+["plussim"]="⨦",
+["Lcy"]="Л",
+["pluse"]="⩲",
+["ropar"]="⦆",
+["OpenCurlyQuote"]="‘",
["plusacir"]="⨣",
-["eqslantgtr"]="⪖",
-["ecy"]="э",
-["pitchfork"]="⋔",
-["ctdot"]="⋯",
-["odiv"]="⨸",
-["lesseqqgtr"]="⪋",
-["GreaterLess"]="≷",
-["Ocy"]="О",
-["weierp"]="℘",
-["Uring"]="Ů",
-["period"]=".",
-["nis"]="⋼",
-["cudarrr"]="⤵",
-["boxHU"]="╩",
-["Ouml"]="Ö",
-["Assign"]="≔",
-["Lscr"]="ℒ",
-["parallel"]="∥",
-["there4"]="∴",
-["cupor"]="⩅",
-["nwarr"]="↖",
-["para"]="¶",
-["ouml"]="ö",
-["otimes"]="⊗",
-["drbkarow"]="⤐",
-["puncsp"]=" ",
-["otilde"]="õ",
-["Vvdash"]="⊪",
-["osol"]="⊘",
+["Exists"]="∃",
+["piv"]="ϖ",
+["phmmat"]="ℳ",
+["angzarr"]="⍼",
+["vsupnE"]="⫌︀",
+["phi"]="φ",
+["perp"]="⊥",
+["rdldhar"]="⥩",
+["ccirc"]="ĉ",
+["Tfr"]="𝔗",
+["Tcy"]="Т",
+["circeq"]="≗",
+["InvisibleTimes"]="⁢",
+["OElig"]="Œ",
+["trisb"]="⧍",
+["Rcaron"]="Ř",
+["olt"]="⧀",
+["UpArrow"]="↑",
+["DDotrahd"]="⤑",
+["Uarrocir"]="⥉",
+["lacute"]="ĺ",
["oslash"]="ø",
-["dd"]="ⅆ",
-["NotPrecedesSlantEqual"]="⋠",
-["orv"]="⩛",
-["orslope"]="⩗",
-["KJcy"]="Ќ",
-["larrfs"]="⤝",
-["orderof"]="ℴ",
-["asympeq"]="≍",
-["ord"]="⩝",
-["NotLess"]="≮",
-["NotGreater"]="≯",
-["ThinSpace"]=" ",
-["ominus"]="⊖",
+["Uarr"]="↟",
+["bsolb"]="⧅",
+["gt"]=">",
+["ordm"]="º",
+["Itilde"]="Ĩ",
+["ordm"]="º",
+["Jscr"]="𝒥",
+["Rarr"]="↠",
+["measuredangle"]="∡",
["DoubleLongLeftRightArrow"]="⟺",
-["lesseqgtr"]="⋚",
+["lmidot"]="ŀ",
+["period"]=".",
["operp"]="⦹",
-["quaternions"]="ℍ",
-["boxdR"]="╒",
-["omega"]="ω",
-["Kscr"]="𝒦",
-["lessgtr"]="≶",
-["utilde"]="ũ",
-["olt"]="⧀",
-["Rho"]="Ρ",
-["olcir"]="⦾",
-["oint"]="∮",
+["bprime"]="‵",
+["numsp"]=" ",
+["ominus"]="⊖",
+["nldr"]="‥",
["ograve"]="ò",
-["Succeeds"]="≻",
-["Igrave"]="Ì",
-["eogon"]="ę",
-["Uacute"]="Ú",
-["bbrk"]="⎵",
-["ocy"]="о",
-["bcong"]="≌",
+["omicron"]="ο",
+["nearr"]="↗",
+["jcirc"]="ĵ",
+["nlE"]="≦̸",
+["deg"]="°",
+["frac13"]="⅓",
+["tcy"]="т",
+["lowbar"]="_",
+["vfr"]="𝔳",
+["ogon"]="˛",
+["sim"]="∼",
+["ocirc"]="ô",
+["Icirc"]="Î",
+["ocir"]="⊚",
+["ZeroWidthSpace"]="​",
["oast"]="⊛",
+["smile"]="⌣",
+["bigvee"]="⋁",
["oacute"]="ó",
-["cir"]="○",
-["angmsdab"]="⦩",
-["Iscr"]="ℐ",
-["ldquo"]="“",
-["RightVector"]="⇀",
-["euml"]="ë",
-["between"]="≬",
-["oS"]="Ⓢ",
-["downdownarrows"]="⇊",
-["nvlt"]="<⃒",
-["lurdshar"]="⥊",
-["starf"]="★",
-["xlarr"]="⟵",
-["Aring"]="Å",
-["Xi"]="Ξ",
-["gtcir"]="⩺",
-["Nscr"]="𝒩",
-["elinters"]="⏧",
-["ntrianglelefteq"]="⋬",
-["Vbar"]="⫫",
+["Egrave"]="È",
+["nwnear"]="⤧",
+["nwarhk"]="⤣",
+["rationals"]="ℚ",
+["DiacriticalGrave"]="`",
+["npreceq"]="⪯̸",
+["rarrc"]="⤳",
+["Uogon"]="Ų",
+["InvisibleComma"]="⁣",
+["nvltrie"]="⊴⃒",
+["digamma"]="ϝ",
+["cirE"]="⧃",
+["AMP"]="&",
+["Theta"]="Θ",
+["frac15"]="⅕",
+["fnof"]="ƒ",
+["icirc"]="î",
+["Cdot"]="Ċ",
+["ngsim"]="≵",
+["sube"]="⊆",
+["tcaron"]="ť",
["ntilde"]="ñ",
-["andv"]="⩚",
-["Rsh"]="↱",
-["angmsdad"]="⦫",
-["nsup"]="⊅",
-["nbsp"]=" ",
-["SquareSupersetEqual"]="⊒",
-["ETH"]="Ð",
-["nsube"]="⊈",
-["DoubleContourIntegral"]="∯",
-["nsubE"]="⫅̸",
-["angmsdah"]="⦯",
-["NotLessGreater"]="≸",
-["awint"]="⨑",
-["rtri"]="▹",
-["nsc"]="⊁",
-["boxvl"]="┤",
-["beta"]="β",
-["LessSlantEqual"]="⩽",
-["supsub"]="⫔",
-["agrave"]="à",
-["LeftUpTeeVector"]="⥠",
-["nrarrw"]="↝̸",
-["ltcc"]="⪦",
-["nrarrc"]="⤳̸",
-["frac78"]="⅞",
-["nvrArr"]="⤃",
-["igrave"]="ì",
-["barwed"]="⌅",
-["Mscr"]="ℳ",
-["nrarr"]="↛",
-["SubsetEqual"]="⊆",
-["notnivc"]="⋽",
-["notnivb"]="⋾",
-["succcurlyeq"]="≽",
-["eth"]="ð",
-["notinva"]="∉",
-["Otilde"]="Õ",
-["star"]="☆",
-["rangd"]="⦒",
-["Psi"]="Ψ",
-["nsupe"]="⊉",
-["mapstoup"]="↥",
-["LJcy"]="Љ",
-["looparrowleft"]="↫",
-["nlarr"]="↚",
-["Ll"]="⋘",
-["ordf"]="ª",
-["ni"]="∋",
+["ufr"]="𝔲",
+["Mcy"]="М",
["Delta"]="Δ",
-["NotVerticalBar"]="∤",
-["backcong"]="≌",
-["NoBreak"]="⁠",
+["vnsup"]="⊃⃒",
+["lAtail"]="⤛",
+["DoubleUpArrow"]="⇑",
+["aelig"]="æ",
+["lscr"]="𝓁",
+["Rscr"]="ℛ",
+["capcup"]="⩇",
+["npolint"]="⨔",
+["gesdotol"]="⪄",
+["uacute"]="ú",
+["bumpE"]="⪮",
+["drcorn"]="⌟",
+["notnivb"]="⋾",
+["notinvc"]="⋶",
+["ovbar"]="⌽",
+["Mopf"]="𝕄",
+["NotGreater"]="≯",
+["boxDr"]="╓",
+["lrcorner"]="⌟",
+["nleq"]="≰",
+["nleftarrow"]="↚",
+["nle"]="≰",
+["boxvl"]="┤",
+["Downarrow"]="⇓",
+["hcirc"]="ĥ",
["nharr"]="↮",
+["tfr"]="𝔱",
+["nlt"]="≮",
+["gacute"]="ǵ",
+["colone"]="≔",
+["Rang"]="⟫",
["ngt"]="≯",
-["Pscr"]="𝒫",
-["laemptyv"]="⦴",
-["utrif"]="▴",
-["ngeq"]="≱",
-["ncedil"]="ņ",
-["ncaron"]="ň",
-["boxhu"]="┴",
-["NotSquareSuperset"]="⊐̸",
-["bull"]="•",
+["ntilde"]="ñ",
+["vcy"]="в",
+["boxvL"]="╡",
+["NotLeftTriangleBar"]="⧏̸",
+["NestedGreaterGreater"]="≫",
+["xmap"]="⟼",
+["napid"]="≋̸",
+["LeftTriangleBar"]="⧏",
["SquareSubsetEqual"]="⊑",
-["VerticalSeparator"]="❘",
-["natur"]="♮",
-["ffr"]="𝔣",
-["rdquor"]="”",
-["lagran"]="ℒ",
-["nRightarrow"]="⇏",
-["nLtv"]="≪̸",
-["nLl"]="⋘̸",
-["Epsilon"]="Ε",
-["csup"]="⫐",
-["leftarrow"]="←",
-["nGt"]="≫⃒",
-["multimap"]="⊸",
-["mstpos"]="∾",
-["SuchThat"]="∋",
-["mldr"]="…",
-["midast"]="*",
-["Sum"]="∑",
-["vartheta"]="ϑ",
-["mapsto"]="↦",
-["nsupseteq"]="⊉",
-["Oscr"]="𝒪",
-["forall"]="∀",
-["aring"]="å",
-["ltimes"]="⋉",
-["ltcir"]="⩹",
-["lt"]="<",
-["ii"]="ⅈ",
-["equest"]="≟",
-["scsim"]="≿",
-["lsqb"]="[",
-["lsimg"]="⪏",
-["Egrave"]="È",
-["Downarrow"]="⇓",
-["lsim"]="≲",
-["eqslantless"]="⪕",
-["ucirc"]="û",
-["Auml"]="Ä",
-["lnsim"]="⋦",
-["uplus"]="⊎",
-["lhblk"]="▄",
-["Ugrave"]="Ù",
-["dlcrop"]="⌍",
-["OElig"]="Œ",
-["lesg"]="⋚︀",
-["lesdotor"]="⪃",
-["eg"]="⪚",
-["lvertneqq"]="≨︀",
-["leqslant"]="⩽",
-["ccups"]="⩌",
-["lceil"]="⌈",
-["auml"]="ä",
-["RightCeiling"]="⌉",
-["lbrksld"]="⦏",
-["lbarr"]="⤌",
+["eacute"]="é",
+["ne"]="≠",
+["ncongdot"]="⩭̸",
+["boxvR"]="╞",
+["PrecedesEqual"]="⪯",
+["Omacr"]="Ō",
+["egs"]="⪖",
+["ouml"]="ö",
+["nbsp"]=" ",
+["xuplus"]="⨄",
+["napprox"]="≉",
+["CloseCurlyQuote"]="’",
+["nacute"]="ń",
+["Chi"]="Χ",
+["subsub"]="⫕",
+["gescc"]="⪩",
+["gcirc"]="ĝ",
+["Lsh"]="↰",
+["sfr"]="𝔰",
+["circlearrowright"]="↻",
+["rcaron"]="ř",
+["ThinSpace"]=" ",
+["otilde"]="õ",
+["TRADE"]="™",
+["cudarrl"]="⤸",
["lat"]="⪫",
-["Rscr"]="ℛ",
-["Zcy"]="З",
-["bigwedge"]="⋀",
-["Prime"]="″",
+["nLeftrightarrow"]="⇎",
+["leqq"]="≦",
+["dagger"]="†",
+["dstrok"]="đ",
+["sacute"]="ś",
+["Amacr"]="Ā",
+["mumap"]="⊸",
+["models"]="⊧",
+["DiacriticalAcute"]="´",
+["minusd"]="∸",
+["hybull"]="⁃",
+["ijlig"]="ij",
+["fflig"]="ff",
+["NotGreaterEqual"]="≱",
+["Colon"]="∷",
+["boxV"]="║",
+["DotDot"]="⃜",
+["mdash"]="—",
+["hairsp"]=" ",
+["bcong"]="≌",
+["mcomma"]="⨩",
+["cirfnint"]="⨐",
+["TScy"]="Ц",
+["luruhar"]="⥦",
+["awconint"]="∳",
+["nsim"]="≁",
+["els"]="⪕",
+["imof"]="⊷",
+["lpar"]="(",
+["lozenge"]="◊",
+["oint"]="∮",
+["Umacr"]="Ū",
+["Sum"]="∑",
+["lopar"]="⦅",
+["racute"]="ŕ",
+["LessEqualGreater"]="⋚",
+["Wedge"]="⋀",
+["bbrktbrk"]="⎶",
+["RightDownTeeVector"]="⥝",
+["HumpDownHump"]="≎",
+["rarrb"]="⇥",
+["longleftrightarrow"]="⟷",
+["lnE"]="≨",
+["NotGreaterSlantEqual"]="⩾̸",
+["Nu"]="Ν",
+["NotNestedLessLess"]="⪡̸",
+["UpEquilibrium"]="⥮",
+["boxhD"]="╥",
+["el"]="⪙",
["boxDR"]="╔",
-["scnsim"]="⋩",
-["efDot"]="≒",
-["kopf"]="𝕜",
-["minusdu"]="⨪",
-["kappav"]="ϰ",
+["Gdot"]="Ġ",
+["itilde"]="ĩ",
+["isindot"]="⋵",
+["GreaterEqualLess"]="⋛",
+["Ll"]="⋘",
+["nrarrw"]="↝̸",
+["supnE"]="⫌",
+["epsiv"]="ϵ",
+["Element"]="∈",
+["gtreqless"]="⋛",
+["laemptyv"]="⦴",
+["nGt"]="≫⃒",
+["angsph"]="∢",
+["lE"]="≦",
+["kscr"]="𝓀",
+["Ocy"]="О",
+["LowerLeftArrow"]="↙",
+["dopf"]="𝕕",
+["iukcy"]="і",
+["atilde"]="ã",
+["DoubleRightArrow"]="⇒",
+["oslash"]="ø",
+["rarr"]="→",
+["intprod"]="⨼",
+["hookrightarrow"]="↪",
+["intcal"]="⊺",
+["infintie"]="⧝",
+["escr"]="ℯ",
+["iiota"]="℩",
+["curren"]="¤",
+["Bernoullis"]="ℬ",
+["angmsdah"]="⦯",
+["ShortRightArrow"]="→",
+["boxUR"]="╚",
+["ges"]="⩾",
+["DoubleDownArrow"]="⇓",
+["NotSquareSuperset"]="⊐̸",
+["lsim"]="≲",
+["bump"]="≎",
+["curlyeqsucc"]="⋟",
+["SHCHcy"]="Щ",
+["frac45"]="⅘",
+["qint"]="⨌",
+["Precedes"]="≺",
+["RightTeeArrow"]="↦",
+["frac16"]="⅙",
+["euro"]="€",
+["smtes"]="⪬︀",
+["eth"]="ð",
+["ldquo"]="“",
+["equivDD"]="⩸",
+["Oopf"]="𝕆",
["boxVh"]="╫",
-["Uuml"]="Ü",
-["centerdot"]="·",
-["isinsv"]="⋳",
-["isins"]="⋴",
-["bot"]="⊥",
-["integers"]="ℤ",
-["Racute"]="Ŕ",
-["ijlig"]="ij",
-["bernou"]="ℬ",
-["Cconint"]="∰",
-["doteq"]="≐",
-["hookleftarrow"]="↩",
-["epar"]="⋕",
-["harrw"]="↭",
-["dzigrarr"]="⟿",
-["Zscr"]="𝒵",
-["alpha"]="α",
-["times"]="×",
+["GreaterSlantEqual"]="⩾",
+["KJcy"]="Ќ",
["egrave"]="è",
-["UnionPlus"]="⊎",
-["Qscr"]="𝒬",
-["Omacr"]="Ō",
-["Zfr"]="ℨ",
-["gneq"]="⪈",
-["divonx"]="⋇",
-["gesdotol"]="⪄",
-["gvertneqq"]="≩︀",
-["geq"]="≥",
-["utri"]="▵",
-["ge"]="≥",
-["vArr"]="⇕",
-["Rrightarrow"]="⇛",
-["frac25"]="⅖",
-["LeftCeiling"]="⌈",
-["GreaterGreater"]="⪢",
-["LT"]="<",
-["Longrightarrow"]="⟹",
-["eqcolon"]="≕",
-["ofcir"]="⦿",
-["boxUl"]="╜",
-["Wscr"]="𝒲",
-["Sacute"]="Ś",
-["Union"]="⋃",
-["gg"]="≫",
-["DownArrowBar"]="⤓",
-["Escr"]="ℰ",
-["ecirc"]="ê",
-["Lmidot"]="Ŀ",
-["Wedge"]="⋀",
-["frown"]="⌢",
-["ring"]="˚",
-["dtdot"]="⋱",
-["Ccedil"]="Ç",
-["Conint"]="∯",
-["dscr"]="𝒹",
-["Map"]="⤅",
-["EmptyVerySmallSquare"]="▫",
-["backsim"]="∽",
-["angzarr"]="⍼",
-["dHar"]="⥥",
-["Mfr"]="𝔐",
-["cirE"]="⧃",
-["Popf"]="ℙ",
-["NestedGreaterGreater"]="≫",
-["ReverseElement"]="∋",
-["boxVr"]="╟",
+["NotGreaterLess"]="≹",
+["boxVl"]="╢",
+["MediumSpace"]=" ",
+["LongLeftArrow"]="⟵",
+["uarr"]="↑",
+["Ocirc"]="Ô",
+["Idot"]="İ",
+["bumpe"]="≏",
+["nwArr"]="⇖",
+["NegativeThinSpace"]="​",
+["coprod"]="∐",
+["VerticalBar"]="∣",
+["sccue"]="≽",
+["boxDl"]="╖",
+["NotSubset"]="⊂⃒",
+["Edot"]="Ė",
+["scy"]="с",
+["Cup"]="⋓",
+["centerdot"]="·",
+["nsimeq"]="≄",
+["DownLeftRightVector"]="⥐",
}
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua
index b6841fea5fb..4b51eed1170 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua
@@ -198,6 +198,10 @@ local function add_action(selector, template, parameters, csspar)
end
+local function reset_actions(selector, csspar)
+ local css = csspar or css
+ css:remove_selector(selector)
+end
--- Transform XML string
@@ -243,7 +247,7 @@ end
local Transformer
--- Make new Transformer object
--- @return Tranformer object
+-- @return Transformer object
local function new()
local self = setmetatable({}, Transformer)
self.css = cssquery()
@@ -289,6 +293,12 @@ function Transformer:add_custom_action(selector, fn )
add_custom_action(selector, fn, self.css)
end
+--- Remove all actions that match the given selector
+---@param selector string
+function Transformer:reset_actions(selector)
+ reset_actions(selector, self.css)
+end
+
-- all methods that use transformation functions must
-- correctly handle the cssquery object that this library uses
@@ -338,6 +348,7 @@ local M = {
print_tex = print_tex,
add_action = add_action,
add_custom_action = add_custom_action,
+ reset_actions = reset_actions,
simple_content = simple_content,
load_file = load_file,
process_dom = process_dom,
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua b/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua
index 36cef293ed9..25b351f7e40 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua
@@ -253,7 +253,9 @@ function Parser:parsestring(line, stopper)
end
line = ssub(line, 2)
end
- return rtrim(buf), line
+ buf = rtrim(buf)
+ local val = tonumber(buf) or buf
+ return val, line
end
local function isemptyline(line)
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index f9154d8103b..92e02be8018 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -20,7 +20,7 @@
-- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--
--- Copyright (C) 2016-2024 Vít Starý Novotný
+-- Copyright (C) 2016-2024 Vít Starý Novotný, Andrej Genčur
--
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -58,11 +58,11 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "3.6.1-0-g5a45a922",
+ version = "3.6.2-0-g6c30af7e",
comment = "A module for the conversion from markdown to plain TeX",
- author = "John MacFarlane, Hans Hagen, Vít Starý Novotný",
+ author = "John MacFarlane, Hans Hagen, Vít Starý Novotný, Andrej Genčur",
copyright = {"2009-2016 John MacFarlane, Hans Hagen",
- "2016-2023 Vít Starý Novotný"},
+ "2016-2024 Vít Starý Novotný, Andrej Genčur"},
license = "LPPL 1.3c"
}
@@ -5182,7 +5182,7 @@ function M.reader.new(writer, options)
+ #parsers.link_text
* Cg(Cc("link_text"), "link_type")
- parsers.note_opening = #(parsers.circumflex * parsers.shortcut_link)
+ parsers.note_opening = #(parsers.circumflex * parsers.link_text)
* Cg(Cc("note_inline"), "link_type")
parsers.raw_note_opening = #( parsers.lbracket
@@ -5495,9 +5495,10 @@ function M.reader.new(writer, options)
end
for i,value in ipairs(t) do
- if not value.is_closing or
- value.type ~= "delimiter" or
- not (value.element == "link" or value.element == "image" or value.element == "note") then
+ if not value.is_closing
+ or value.type ~= "delimiter"
+ or not (value.element == "link" or value.element == "image" or value.element == "note")
+ or value.removed then
goto continue
end
@@ -6462,7 +6463,7 @@ M.extensions.citations = function(citation_nbsps)
)
* citation_name
* (parsers.internal_punctuation - parsers.semicolon)^-1
- * ( parsers.spnlc
+ * ( parsers.spnlc / function(_) return end
* citation_body_postnote
+ Cc("")
* parsers.spnlc
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex
index 237b9f39c38..1d8fd1a0aae 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex
@@ -18,7 +18,7 @@
\newread\testread
\openin\testread=\contentsfile\relax
\ifeof\testread % First run
-\else % Second run
+\else\closein\testread % Second run
% Fix page numbers in the PDF bootmarks with 'Page Labels'
\def\tocpages{1} % Most programs have one-page Table-of-Contents
\def\tocstart{2} % so we start with (fake) page 2 for the rest
diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
index 5cea6b85ea4..8d8de14d2e9 100644
--- a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
@@ -1,20 +1,19 @@
-% tex4ht.env-unix (2023-12-11-15:24), generated from tex4ht-env.tex
-% (can be used as ~/.tex4ht)
-% Copyright 2009-2023 TeX Users Group
+% tex4ht.env-unix (2024-07-07-08:55), generated from tex4ht-env.tex
+% Copyright 2009-2024 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
% version 1.3c of this license or (at your option) any
% later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
+% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions
% of LaTeX version 2005/12/01 or later.
%
% This work has the LPPL maintenance status "maintained".
%
% The Current Maintainer of this work
-% is the TeX4ht Project <http://tug.org/tex4ht>.
+% is the TeX4ht Project <https://tug.org/tex4ht>.
%
% If you modify this program, changing the
% version identification would be appreciated.%
diff --git a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
index 53358dd2cec..64ab2a452f7 100644
--- a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
@@ -1,19 +1,19 @@
-% tex4ht.env-win32 (2023-12-11-15:24), generated from tex4ht-env.tex
-% Copyright 2009-2023 TeX Users Group
+% tex4ht.env-win32 (2024-07-07-08:55), generated from tex4ht-env.tex
+% Copyright 2009-2024 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
% version 1.3c of this license or (at your option) any
% later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
+% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions
% of LaTeX version 2005/12/01 or later.
%
% This work has the LPPL maintenance status "maintained".
%
% The Current Maintainer of this work
-% is the TeX4ht Project <http://tug.org/tex4ht>.
+% is the TeX4ht Project <https://tug.org/tex4ht>.
%
% If you modify this program, changing the
% version identification would be appreciated.%
diff --git a/Master/texmf-dist/web2c/updmap.cfg b/Master/texmf-dist/web2c/updmap.cfg
index 16990717ae8..85aac71c5ee 100644
--- a/Master/texmf-dist/web2c/updmap.cfg
+++ b/Master/texmf-dist/web2c/updmap.cfg
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Tue May 7 01:40:22 2024
+# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Tue Jul 9 01:40:24 2024
# $Id: updmap-hdr.cfg 54473 2020-03-22 10:53:53Z hironobu $
#
# The updmap.cfg in the TEXMFDIST tree is generated by tlmgr by
@@ -258,6 +258,7 @@ Map frcursive.map
Map GaramondLibre.map
Map garuda-c90.map
Map gelasio.map
+Map GelasioMath.map
Map gentium-type1.map
Map gfsartemisia.map
Map gfsbaskerville.map